fix(chapi-ast-c): fix macro expansion declaration in C.g4 #24

The macro expansion declaration in C.g4 was not correctly defined. This commit fixes the issue by updating the grammar rules.
phodal · Jan 31, 2024 · 84d5421 · 84d5421
1 parent 56c876f
commit 84d5421
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/chapi-ast-c/src/main/antlr/C.g4 b/chapi-ast-c/src/main/antlr/C.g4
@@ -61,7 +61,7 @@ primaryExpression
     | '__builtin_offsetof' '(' typeName ',' unaryExpression ')'
     // for macro support
     | typeQualifier? (typeKeywords | Identifier | '==' | '!=') (Identifier | typeKeywords)* pointer?
-    | (directDeclarator | StringLiteral)+
+    | StringLiteral? (directDeclarator | StringLiteral)+
     | Ellipsis
     ;
 
@@ -471,9 +471,9 @@ macroStatement
 
 singleLineMacroDeclaration
     : '#' include (StringLiteral | ('<' includeIdentifier '>' ))                         #includeDeclaration
-    | '#' macroKeywords expression* '#' macroKeywords identifierList?                    #macroExpansionDeclaration
     | '#' macroKeywords                                                                  #defineDeclaration
     | '#' '#'? Identifier                                                                #macroCastDeclaration
+    | '#' macroKeywords expression* '#' macroKeywords identifierList?                    #macroExpansionDeclaration
     ;
 
 macroKeywords