[c] Fix for #3601 -- fix parsing of all preprocessor directives (#3608)

* Fix for #3601 * Add test of preprocessor directives.
antlr · Jul 15, 2023 · 3f44239 · 3f44239
1 parent bca917e
commit 3f44239
Show file tree

Hide file tree

Showing 2 changed files with 1,251 additions and 31 deletions.
diff --git a/c/C.g4 b/c/C.g4
@@ -847,15 +847,10 @@ SChar
     |   '\\\r\n' // Added line
     ;
 
-ComplexDefine
-    :   '#' Whitespace? 'define'  ~[#\r\n]*
-        -> skip
-    ;
+MultiLineMacro:
+	'#' (~[\n]*? '\\' '\r'? '\n')+ ~ [\n]+ -> channel (HIDDEN);
 
-IncludeDirective
-    :   '#' Whitespace? 'include' Whitespace? ('"' ~[\r\n]* '"' | '<' ~[\r\n]* '>' ) Whitespace? Newline
-        -> skip
-    ;
+Directive: '#' ~ [\n]* -> channel (HIDDEN);
 
 // ignore the following asm blocks:
 /*
@@ -866,44 +861,26 @@ IncludeDirective
  */
 AsmBlock
     :   'asm' ~'{'* '{' ~'}'* '}'
-	-> skip
-    ;
-
-// ignore the lines generated by c preprocessor
-// sample line : '#line 1 "/home/dm/files/dk1.h" 1'
-LineAfterPreprocessing
-    :   '#line' Whitespace* ~[\r\n]*
-        -> skip
-    ;
-
-LineDirective
-    :   '#' Whitespace? DecimalConstant Whitespace? StringLiteral ~[\r\n]*
-        -> skip
-    ;
-
-PragmaDirective
-    :   '#' Whitespace? 'pragma' Whitespace ~[\r\n]*
-        -> skip
+	-> channel(HIDDEN)
     ;
 
 Whitespace
-    :   [ \t]+
-        -> skip
+    :   [ \t]+ -> channel(HIDDEN)
     ;
 
 Newline
     :   (   '\r' '\n'?
         |   '\n'
         )
-        -> skip
+        -> channel(HIDDEN)
     ;
 
 BlockComment
     :   '/*' .*? '*/'
-        -> skip
+        -> channel(HIDDEN)
     ;
 
 LineComment
     :   '//' ~[\r\n]*
-        -> skip
+        -> channel(HIDDEN)
     ;