Browse Source

pastojs: clean up

mattias 4 years ago
parent
commit
2b0cbde8fd

+ 2 - 3
compiler/packages/pastojs/src/fppas2js.pp

@@ -16720,6 +16720,7 @@ begin
   if (not (AContext.PasElement is TPasMembersType)) // rtti of members is added separate
       and HasTypeInfo(El,AContext) then
     begin
+    // writeln('TPasToJSConverter.ConvertArrayType ',GetObjPath(El),' ',GetObjPath(AContext.PasElement));
     Call:=nil;
     try
       Call:=CreateRTTIAnonymousArray(El,AContext);
@@ -20499,15 +20500,13 @@ begin
     NewEl:=nil;
     P:=TPasElement(Members[i]);
     C:=P.ClassType;
-    writeln('AAA1 TPasToJSConverter.CreateRTTIMembers ',GetObjPath(P));
+    //writeln('TPasToJSConverter.CreateRTTIMembers ',GetObjPath(P));
     if C.InheritsFrom(TPasType) and HasTypeInfo(TPasType(P),MembersFuncContext) then
       begin
-        writeln('AAA2 TPasToJSConverter.CreateRTTIMembers ',GetObjPath(P));
       // published subtype
       if aResolver.IsAnonymousElType(TPasType(P)) then
         begin
         // published anonymous eltype
-          writeln('AAA3 TPasToJSConverter.CreateRTTIMembers ',GetObjPath(P));
         if C.InheritsFrom(TPasArrayType) then
           NewEl:=CreateRTTIAnonymousArray(TPasArrayType(P),MembersFuncContext);
         end;

+ 2 - 1
compiler/packages/pastojs/tests/tcmodules.pas

@@ -825,6 +825,7 @@ type
     Procedure TestRTTI_Class_OtherUnit_TypeAlias;
     Procedure TestRTTI_Class_OmitRTTI;
     Procedure TestRTTI_Class_Field_AnonymousArrayOfSelfClass;
+    Procedure TestRTTI_Class_Field_AnonymousArrayOfSelfClass2;
     Procedure TestRTTI_IndexModifier;
     Procedure TestRTTI_StoredModifier;
     Procedure TestRTTI_DefaultValue;
@@ -29943,7 +29944,7 @@ begin
   Add([
   'interface',
   'type',
-  '  {$M+1}',
+  '  {$M+}',
   '  TBird = class',
   '  published',
   '    Swarm: array of TBird;',