Browse Source

* ppudump: Fixed json and xml output of inline types in array declaration.

git-svn-id: trunk@26277 -
yury 11 years ago
parent
commit
eea69a2947
2 changed files with 3 additions and 2 deletions
  1. 1 1
      compiler/utils/ppuutils/ppudump.pp
  2. 2 1
      compiler/utils/ppuutils/ppuout.pp

+ 1 - 1
compiler/utils/ppuutils/ppudump.pp

@@ -2824,7 +2824,7 @@ begin
              writeln([space,'            Range : ',arrdef.RangeLow,' to ',arrdef.RangeHigh]);
              writeln([space,'            Range : ',arrdef.RangeLow,' to ',arrdef.RangeHigh]);
              write  ([space,'          Options : ']);
              write  ([space,'          Options : ']);
              readarraydefoptions(arrdef);
              readarraydefoptions(arrdef);
-             readsymtable('symbols');
+             readsymtable('symbols', arrdef);
            end;
            end;
 
 
          ibprocdef :
          ibprocdef :

+ 2 - 1
compiler/utils/ppuutils/ppuout.pp

@@ -319,7 +319,7 @@ type
   TPpuArrayOptions = set of TPpuArrayOption;
   TPpuArrayOptions = set of TPpuArrayOption;
 
 
   { TPpuArrayDef }
   { TPpuArrayDef }
-  TPpuArrayDef = class(TPpuDef)
+  TPpuArrayDef = class(TPpuContainerDef)
   protected
   protected
     procedure WriteDef(Output: TPpuOutput); override;
     procedure WriteDef(Output: TPpuOutput); override;
   public
   public
@@ -760,6 +760,7 @@ end;
 constructor TPpuArrayDef.Create(AParent: TPpuContainerDef);
 constructor TPpuArrayDef.Create(AParent: TPpuContainerDef);
 begin
 begin
   inherited Create(AParent);
   inherited Create(AParent);
+  ItemsName:='Types';
   DefType:=dtArray;
   DefType:=dtArray;
   ElType:=TPpuRef.Create;
   ElType:=TPpuRef.Create;
   RangeType:=TPpuRef.Create;
   RangeType:=TPpuRef.Create;