refactor(chapi-ast-c): modify singleLineMacroDeclaration

Refactor singleLineMacroDeclaration in C.g4 to improve readability and maintainability. Removed unnecessary code and added optional parameters for better flexibility.
phodal · Jan 31, 2024 · 16e7574 · 16e7574
1 parent 7a07305
commit 16e7574
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/chapi-ast-c/src/main/antlr/C.g4 b/chapi-ast-c/src/main/antlr/C.g4
@@ -475,10 +475,10 @@ macroStatement
 
 singleLineMacroDeclaration
     : include (StringLiteral | Identifier | ('<' includeIdentifier '>' ))            #includeDeclaration
-    | macroKeywords Identifier? expression* '#' macroKeywords identifierList?        #ifdefDeclaration
     // #define LUAI_USER_ALIGNMENT_T	union { double u; void *s; long l; }
-    | macroKeywords                                                                  #defineDeclaration
-    | 'define' Identifier structOrUnionSpecifier                                     #macroFunctionDeclaration
+    | macroKeywords Identifier? (structOrUnionSpecifier | expression)*
+                ('#' macroKeywords)? identifierList?                                  #ifdefDeclaration
+//    | macroKeywords                                                                  #defineDeclaration
     | '#'? Identifier                                                                #macroCastDeclaration
 //    | 'define' expression* '#' 'undef' identifierList?                               #macroExpansionDeclaration
 //    | macroKeywords expression* '#' macroKeywords identifierList?                    #macroExpansionDeclaration2