@@ -132,7 +132,6 @@ declSection : labelDeclSection
132
132
| constSection
133
133
| typeSection
134
134
| varSection
135
- | exportedProcHeading
136
135
| methodDecl
137
136
| procDecl
138
137
| exportsSection
@@ -240,7 +239,7 @@ subRangeType : constExpression ('..' constExpression)?
240
239
;
241
240
enumType : ' (' ident (' =' expression)? (' ,' ident (' =' expression)? )* ' )'
242
241
;
243
- typeId : namespacedQualifiedIdent
242
+ typeId : qualifiedIdent
244
243
;
245
244
//****************************
246
245
// section generics
@@ -452,7 +451,7 @@ customAttributeList : (customAttributeDecl)*
452
451
;
453
452
customAttributeDecl : ' [ ' customAttributeIdent (' (' (expressionList)? ' )' )? ' ] ' -> ^(TkCustomAttribute ' [ ' customAttributeIdent (' (' (expressionList)? ' )' )? ' ] ' )
454
453
;
455
- customAttributeIdent : namespacedQualifiedIdent (' : ' namespacedQualifiedIdent )?
454
+ customAttributeIdent : qualifiedIdent (' : ' qualifiedIdent )?
456
455
;
457
456
//****************************
458
457
//section expression
@@ -487,7 +486,7 @@ stringFactor : ControlString (QuotedString ControlString)* (Quot
487
486
setSection : ' [ ' (expression ((' ,' | ' .. ' ) expression)*)? ' ] '
488
487
;
489
488
490
- designator : (' inherited' )? ( (namespacedQualifiedIdent | typeId) )? (designatorItem)*
489
+ designator : (' inherited' )? ( (qualifiedIdent | typeId) )? (designatorItem)*
491
490
;
492
491
designatorItem : ' ^ '
493
492
| (' .' | ' @' ) ident //CHANGED added ' @'
@@ -618,13 +617,15 @@ methodDirective : reintroduceDirective // 1
618
617
| hintingDirective ' ;' // 4 (niet abstract)
619
618
| oldCallConventionDirective // 1
620
619
| dispIDDirective
620
+ | externalDirective
621
621
;
622
622
functionDirective : overloadDirective // 1
623
623
| inlineDirective // 1
624
624
| callConvention // 1
625
625
| oldCallConventionDirective // 1
626
626
| hintingDirective ' ;' // 1
627
627
| (callConventionNoSemi)? externalDirective // 1
628
+ | externalDirective
628
629
| ' unsafe' ' ;' // 1 .net?
629
630
;
630
631
reintroduceDirective : ' reintroduce' ' ;'
@@ -686,7 +687,7 @@ ident : TkIdentifier
686
687
usedKeywordsAsNames : (NAME | READONLY | ADD | AT | MESSAGE | POINTER | INDEX | DEFAULT | STRING | CONTINUE)
687
688
| (READ | WRITE | REGISTER | VARIANT | OPERATOR | REMOVE | LOCAL | REFERENCE | CONTAINS | FINAL)
688
689
| (BREAK | EXIT | STRICT | OUT | OBJECT | EXPORT | ANSISTRING | IMPLEMENTS | STORED )
689
- | (UNSAFE | STATIC)
690
+ | (UNSAFE | STATIC | DQ | DW | VARARGS | VARIANT | VIRTUAL | WRITE | WRITEONLY | FALSE | TRUE )
690
691
;
691
692
keywordsAsIdentifier : (ABSOLUTE | ABSTRACT | ADD | AND | ANSISTRING | ARRAY | AS | ASM | ASSEMBLER | ASSEMBLY)
692
693
| (AT | AUTOMATED | BEGIN | BREAK | CASE | CDECL | CLASS | CONST | CONSTRUCTOR | CONTAINS)
@@ -717,8 +718,6 @@ intRealNum : TkRealNum
717
718
intNum : TkIntNum
718
719
| TkHexNum
719
720
;
720
- namespacedQualifiedIdent : (namespaceName ' .' )? qualifiedIdent
721
- ;
722
721
namespaceName : ident (' .' ident)*
723
722
;
724
723
qualifiedIdent : (ident ' .' )* ident //must stay the way it is, with ' .' for proper class method identyfication
0 commit comments