[-] fix parsing of custom attribute vs interface guid

le30r · Feb 17, 2020 · 68954bf · 68954bf
1 parent b962498
commit 68954bf
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/plugin/src/lang/parser/pascal.bnf b/plugin/src/lang/parser/pascal.bnf
@@ -609,7 +609,7 @@ private classParentWORec        ::= ClassParent
 ClassParent                     ::= "(" TypeID? classParentRest ")" {pin = 1}
 private classParentRest         ::= ("," TypeID)* //{pin=1 recoverWhile=rec_classparent_rest}
 
-private interfaceGuid       ::= "[" quotedString "]" {pin=1}
+private interfaceGuid       ::= "[" quotedString "]"
 private interfaceKey        ::= INTERFACE | DISPINTERFACE | (OBJC_PROTOCOL [EXTERNAL [externalSpecifier]])
 
 ClassTypeTypeDecl           ::= CLASS OF TypeID {pin(".*")="class of" name="metaclass declaration"}

diff --git a/plugin/src/lang/parser/syn.bnf b/plugin/src/lang/parser/syn.bnf
@@ -622,7 +622,7 @@ private classParentWORec        ::= ClassParent
 ClassParent                     ::= "(" TypeID? classParentRest ")" {pin = 1}
 private classParentRest         ::= ("," TypeID)* //{pin=1 recoverWhile=rec_classparent_rest}
 
-private interfaceGuid       ::= "[" quotedString "]" {pin=1}
+private interfaceGuid       ::= "[" quotedString "]"
 private interfaceKey        ::= INTERFACE | DISPINTERFACE | (OBJC_PROTOCOL [EXTERNAL [externalSpecifier]])
 
 ClassTypeTypeDecl           ::= CLASS OF TypeID {pin(".*")="class of" name="metaclass declaration"}

diff --git a/testData/annotator/interfaces.pas b/testData/annotator/interfaces.pas
@@ -15,6 +15,14 @@ interface
         procedure proc; virtual;
     end;
 
+    IEnum<T> = interface
+        [CustomAttribute('virtual T __fastcall GetCurrentT(void) = 0')]
+        function GetCurrent: T;
+        [CustomAttribute2('__property T Current = {read=GetCurrentT}')]
+        property Current: T read GetCurrent;
+    end;
+
+
     [CustomAttribute, CustomAttribute2('', '', False)]
     TA = class
     private