fix(chapi-ast-c): modify grammar rules for single line macro declarations #24

This commit modifies the grammar rules for single line macro declarations in the chapi-ast-c project. The changes include adding support for various types of macro declarations and expressions. The modifications aim to improve the parsing of macros in the code.

Author: phodal

README.md

@@ -98,11 +98,28 @@ Algol Family [https://wiki.c2.com/?AlgolFamily](https://wiki.c2.com/?AlgolFamily
 
 Since Macro can be everywhere, If your code includes lots of Macro, it will be slow.
 
+Test in Lua 5.3.5: with 17402 C line, 3298 C Header line.
+
 |       | without Macro | simple Macro (with postfixCall) | full Macro (maybe) | 
 |-------|---------------|---------------------------------|--------------------|
-| time1 | 100425ms      | 185662ms                        |                    | 
-| time2 | 96674ms       | 201791ms                        |                    |
-| time3 | 95434ms       | 184508ms                        |                    |
+| time1 | 100425ms      | 185662ms                        | 158849ms           | 
+| time2 | 96674ms       | 201791ms                        | 173202ms           |
+| time3 | 95434ms       | 184508ms                        | 149230ms           |
+
+Known issues: line break in Macro will cause parse error.
+
+For example:
+
+```c
+#if LUA_VERSION_NUM < 503
+        lua_pushnumber(L,
+#else
+        lua_pushinteger(L,
+#endif
+             (int64_t)c->p[8]);
+        mp_cur_consume(c,9);
+        break;
+```
 
 ### Kotlin
 

chapi-ast-c/src/main/antlr/C.g4

@@ -35,8 +35,8 @@ grammar C;
 
 compilationUnit
     // statement for macro support
-    : (externalDeclaration)* EOF
-//    | (externalDeclaration | statement | macroPostixCall)* EOF
+//    : (externalDeclaration)* EOF
+    : (externalDeclaration | statement | macroPostixCall)* EOF
     ;
 
 MultiLineMacro
@@ -489,42 +489,42 @@ logicals : logicalOrExpression (',' logicalOrExpression)* ;
 Directive: '#' ~ [\n]* -> channel (HIDDEN);
 
 macroStatement
-//    : '#' singleLineMacroDeclaration*
-    : '#' include (StringLiteral | Identifier | ('<' includeIdentifier '>' ))          #includeDeclaration
-    ;
-
-//singleLineMacroDeclaration
-//    : include (StringLiteral | Identifier | ('<' includeIdentifier '>' ))             #includeDeclaration
-//    | ('ifdef' | 'ifndef' | 'if') Identifier statement* ('#' 'else' statement*)? '#' 'endif'
-//                                                                                      #ifdefDeclaration
-//    | 'define' Identifier defineMacro                                                 #defineDeclaration
-////    | macroKeywords (assignmentExpression)*
-////                ('#' macroKeywords)? identifierList?                                  #macroDefineDeclaration
-//    | '#'? Identifier                                                                 #macroCastDeclaration
-//    | macroKeywords macroFunctionExpression?                                          #macroStatementDeclaration
-//    ;
-//
-//defineMacro
-//    : expressionStatement?                                        #macroAssignDeclaration
-//    | postixCall Identifier postixCall                            #macroAliasDeclaration
-//    | structOrUnionSpecifier                                      #macroStructureDeclaration
-//    ;
-//
-//
-//macroFunctionExpression
-//    : Identifier
-//    | Identifier '(' ( parameterTypeList| (macroType (',' macroType)*) ) ')'
-//    | assignmentExpression
-//    ;
-//
-//macroType
-//    : typeQualifier? (typeKeywords | Identifier | '==' | '!=' | comparator) (Identifier | typeKeywords)* pointer?
-//    | expressionStatement
-//    ;
-//
-//macroKeywords
-//    :  'if' | 'undef' | 'else' | 'pragma' | 'endif' | 'ifdef' | 'ifndef' | 'elif' | 'define' | 'ifndef' | 'error'
-//    ;
+    : '#' singleLineMacroDeclaration*
+//    : '#' include (StringLiteral | Identifier | ('<' includeIdentifier '>' ))          #includeDeclaration
+    ;
+
+singleLineMacroDeclaration
+    : include (StringLiteral | Identifier | ('<' includeIdentifier '>' ))             #includeDeclaration
+    | ('ifdef' | 'ifndef' | 'if') Identifier statement* ('#' 'else' statement*)? '#' 'endif'
+                                                                                      #ifdefDeclaration
+    | 'define' Identifier defineMacro                                                 #defineDeclaration
+//    | macroKeywords (assignmentExpression)*
+//                ('#' macroKeywords)? identifierList?                                  #macroDefineDeclaration
+    | '#'? Identifier                                                                 #macroCastDeclaration
+    | macroKeywords macroFunctionExpression?                                          #macroStatementDeclaration
+    ;
+
+defineMacro
+    : expressionStatement?                                        #macroAssignDeclaration
+    | postixCall Identifier postixCall                            #macroAliasDeclaration
+    | structOrUnionSpecifier                                      #macroStructureDeclaration
+    ;
+
+
+macroFunctionExpression
+    : Identifier
+    | Identifier '(' ( parameterTypeList| (macroType (',' macroType)*) ) ')'
+    | assignmentExpression
+    ;
+
+macroType
+    : typeQualifier? (typeKeywords | Identifier | '==' | '!=' | comparator) (Identifier | typeKeywords)* pointer?
+    | expressionStatement
+    ;
+
+macroKeywords
+    :  'if' | 'undef' | 'else' | 'pragma' | 'endif' | 'ifdef' | 'ifndef' | 'elif' | 'define' | 'ifndef' | 'error'
+    ;
 
 labeledStatement
     : Identifier ':' statement?
@@ -1023,15 +1023,6 @@ fragment Nondigit
     : [a-zA-Z_]
     ;
 
-
-MacroId
-    : UpperedId (UpperedId)*
-    ;
-
-fragment UpperedId
-    : [A-Z_]
-    ;
-
 fragment Digit
     : [0-9]
     ;