Support GCC C language.

Fix #85
uw-pluverse · Aug 5, 2020 · 7b8ae56 · 7b8ae56
1 parent aaa9448
commit 7b8ae56
Show file tree

Hide file tree

Showing 10 changed files with 154 additions and 112 deletions.
diff --git a/benchmark/toys/delta_1/golden_reduction_progress.txt b/benchmark/toys/delta_1/golden_reduction_progress.txt
@@ -26,7 +26,7 @@ translationUnit {id=1}
     |   |               |___Token:) {id=346,slot_type=RightParen}
     |   |___Token:; {id=336,slot_type=Semi}
     |___functionDefinition {id=5,slot_type=translationUnit_2}
-        |___(?) {id=6,slot_type=optional__functionDefinition_1}
+        |___(?) {id=6,slot_type=optional__functionDefinition_2}
         |   |___(+) {id=329,slot_type=declarationSpecifiers}
         |       |___Token:int {id=332,slot_type=declarationSpecifier}
         |___directDeclarator {id=282,slot_type=declarator}

diff --git a/benchmark/toys/parentheses/golden_reduction_progress.txt b/benchmark/toys/parentheses/golden_reduction_progress.txt
@@ -26,7 +26,7 @@ translationUnit {id=1}
     |   |               |___Token:) {id=332,slot_type=RightParen}
     |   |___Token:; {id=322,slot_type=Semi}
     |___functionDefinition {id=5,slot_type=translationUnit_2}
-        |___(?) {id=6,slot_type=optional__functionDefinition_1}
+        |___(?) {id=6,slot_type=optional__functionDefinition_2}
         |   |___(+) {id=315,slot_type=declarationSpecifiers}
         |       |___Token:int {id=318,slot_type=declarationSpecifier}
         |___directDeclarator {id=268,slot_type=declarator}

diff --git a/src/org/perses/grammar/c/OrigC.g4 b/src/org/perses/grammar/c/OrigC.g4
@@ -312,6 +312,7 @@ functionSpecifier
     :   ('inline'
     |   '_Noreturn'
     |   '__inline__' // GCC extension
+//    |   '__inline' // GCC extension
     |   '__stdcall')
     |   gccAttributeSpecifier
     |   '__declspec' '(' Identifier ')'
@@ -536,7 +537,7 @@ externalDeclaration
     ;
 
 functionDefinition
-    :   declarationSpecifiers? declarator declarationList? compoundStatement
+    :   Extension_gcc? declarationSpecifiers? declarator declarationList? compoundStatement
     ;
 
 declarationList

diff --git a/test/org/perses/antlr/golden_pnfc_rule_hierarchy.txt b/test/org/perses/antlr/golden_pnfc_rule_hierarchy.txt
@@ -1227,7 +1227,7 @@ optional__enumerator_2
         enumerator_1
     transitive sub-rule names:
         enumerator_1
-optional__functionDefinition_1
+optional__functionDefinition_2
     epsilonable: true
     immediate sub-rule names:
         declarationSpecifiers
@@ -1247,7 +1247,7 @@ optional__functionDefinition_1
         typeQualifier
         typeSpecifier
         typedefName
-optional__functionDefinition_2
+optional__functionDefinition_3
     epsilonable: true
     immediate sub-rule names:
         declarationList