diff options
| author | mattias <mattias@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2021-03-29 09:26:54 +0000 |
|---|---|---|
| committer | mattias <mattias@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2021-03-29 09:26:54 +0000 |
| commit | 2a3002d7c0b27c3cc8c58f3df492480b81fa4479 (patch) | |
| tree | db01fd565484fdc7f4a2597003550d791369ab5b /packages/pastojs | |
| parent | 3148f1c98d49c18c0405f79b07f5aaa942b4dc95 (diff) | |
| download | fpc-2a3002d7c0b27c3cc8c58f3df492480b81fa4479.tar.gz | |
pastojs: clean up
git-svn-id: https://svn.freepascal.org/svn/fpc/trunk@49079 3ad0048d-3df7-0310-abae-a5850022a9f2
Diffstat (limited to 'packages/pastojs')
| -rw-r--r-- | packages/pastojs/src/fppas2js.pp | 5 | ||||
| -rw-r--r-- | packages/pastojs/tests/tcmodules.pas | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/packages/pastojs/src/fppas2js.pp b/packages/pastojs/src/fppas2js.pp index 4ad7623078..567dfa8839 100644 --- a/packages/pastojs/src/fppas2js.pp +++ b/packages/pastojs/src/fppas2js.pp @@ -16773,6 +16773,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); @@ -20562,15 +20563,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; diff --git a/packages/pastojs/tests/tcmodules.pas b/packages/pastojs/tests/tcmodules.pas index 2194b08311..47dfa9014d 100644 --- a/packages/pastojs/tests/tcmodules.pas +++ b/packages/pastojs/tests/tcmodules.pas @@ -830,6 +830,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; @@ -29990,7 +29991,7 @@ begin Add([ 'interface', 'type', - ' {$M+1}', + ' {$M+}', ' TBird = class', ' published', ' Swarm: array of TBird;', |