ECC: CParser remove \ in string.
authorjlin16 <jlin16@7335b38e-4728-0410-8992-fb3ffe349368>
Mon, 28 Jan 2008 09:59:52 +0000 (09:59 +0000)
committerjlin16 <jlin16@7335b38e-4728-0410-8992-fb3ffe349368>
Mon, 28 Jan 2008 09:59:52 +0000 (09:59 +0000)
FDF parser: ignore string in comment.

git-svn-id: https://buildtools.tianocore.org/svn/buildtools/trunk/BaseTools@981 7335b38e-4728-0410-8992-fb3ffe349368

Source/Python/Ecc/C.g
Source/Python/Ecc/CLexer.py
Source/Python/Ecc/CParser.py
Source/Python/Ecc/CodeFragmentCollector.py
Source/Python/GenFds/FdfParser.py

index c61758c..8112800 100644 (file)
@@ -129,7 +129,7 @@ declaration
 \r
 declaration_specifiers\r
        :   (   storage_class_specifier\r
-               |   type_specifier pointer?\r
+               |   type_specifier\r
         |   type_qualifier\r
         )+\r
        ;\r
@@ -160,6 +160,7 @@ type_specifier
        | 'double'\r
        | 'signed'\r
        | 'unsigned'\r
+       | 'BOOLEAN'\r
        | s=struct_or_union_specifier {self.StoreStructUnionDefinition($s.start.line, $s.start.charPositionInLine, $s.stop.line, $s.stop.charPositionInLine, $s.text)}\r
        | e=enum_specifier {self.StoreEnumerationDefinition($e.start.line, $e.start.charPositionInLine, $e.stop.line, $e.stop.charPositionInLine, $e.text)}\r
        | (IDENTIFIER declarator)=> type_id\r
@@ -223,6 +224,7 @@ type_qualifier
        | 'IN'\r
        | 'OUT'\r
        | 'OPTIONAL'\r
+       | 'CONST'\r
        ;\r
 \r
 declarator\r
@@ -258,7 +260,9 @@ parameter_list
        ;\r
 \r
 parameter_declaration\r
-       : declaration_specifiers (declarator|abstract_declarator)+ ('OPTIONAL')?\r
+       : declaration_specifiers (declarator|abstract_declarator)* ('OPTIONAL')?\r
+       //accomerdate user-defined type only, no declarator follow.\r
+       | IDENTIFIER\r
        ;\r
 \r
 identifier_list\r
index 4e3160f..ce50e7e 100644 (file)
@@ -1,4 +1,4 @@
-# $ANTLR 3.0.1 C.g 2008-01-25 19:33:36
+# $ANTLR 3.0.1 C.g 2008-01-28 16:35:59
 
 from antlr3 import *
 from antlr3.compat import set, frozenset
@@ -21,6 +21,7 @@ T81=81
 T41=41
 FloatTypeSuffix=16
 T62=62
+T109=109
 DECIMAL_LITERAL=7
 IntegerTypeSuffix=14
 T68=68
@@ -85,6 +86,7 @@ LETTER=11
 Exponent=15
 T95=95
 T50=50
+T108=108
 BS=20
 T92=92
 T43=43
@@ -107,7 +109,7 @@ T54=54
 EOF=-1
 T104=104
 T47=47
-Tokens=108
+Tokens=110
 T53=53
 OctalEscape=17
 T99=99
@@ -564,9 +566,10 @@ class CLexer(Lexer):
         try:
             self.type = T43
 
-            # C.g:25:5: ( '{' )
-            # C.g:25:7: '{'
-            self.match(u'{')
+            # C.g:25:5: ( 'BOOLEAN' )
+            # C.g:25:7: 'BOOLEAN'
+            self.match("BOOLEAN")
+
 
 
 
@@ -586,9 +589,9 @@ class CLexer(Lexer):
         try:
             self.type = T44
 
-            # C.g:26:5: ( '}' )
-            # C.g:26:7: '}'
-            self.match(u'}')
+            # C.g:26:5: ( '{' )
+            # C.g:26:7: '{'
+            self.match(u'{')
 
 
 
@@ -608,10 +611,9 @@ class CLexer(Lexer):
         try:
             self.type = T45
 
-            # C.g:27:5: ( 'struct' )
-            # C.g:27:7: 'struct'
-            self.match("struct")
-
+            # C.g:27:5: ( '}' )
+            # C.g:27:7: '}'
+            self.match(u'}')
 
 
 
@@ -631,9 +633,9 @@ class CLexer(Lexer):
         try:
             self.type = T46
 
-            # C.g:28:5: ( 'union' )
-            # C.g:28:7: 'union'
-            self.match("union")
+            # C.g:28:5: ( 'struct' )
+            # C.g:28:7: 'struct'
+            self.match("struct")
 
 
 
@@ -654,9 +656,10 @@ class CLexer(Lexer):
         try:
             self.type = T47
 
-            # C.g:29:5: ( ':' )
-            # C.g:29:7: ':'
-            self.match(u':')
+            # C.g:29:5: ( 'union' )
+            # C.g:29:7: 'union'
+            self.match("union")
+
 
 
 
@@ -676,10 +679,9 @@ class CLexer(Lexer):
         try:
             self.type = T48
 
-            # C.g:30:5: ( 'enum' )
-            # C.g:30:7: 'enum'
-            self.match("enum")
-
+            # C.g:30:5: ( ':' )
+            # C.g:30:7: ':'
+            self.match(u':')
 
 
 
@@ -699,9 +701,9 @@ class CLexer(Lexer):
         try:
             self.type = T49
 
-            # C.g:31:5: ( 'const' )
-            # C.g:31:7: 'const'
-            self.match("const")
+            # C.g:31:5: ( 'enum' )
+            # C.g:31:7: 'enum'
+            self.match("enum")
 
 
 
@@ -722,9 +724,9 @@ class CLexer(Lexer):
         try:
             self.type = T50
 
-            # C.g:32:5: ( 'volatile' )
-            # C.g:32:7: 'volatile'
-            self.match("volatile")
+            # C.g:32:5: ( 'const' )
+            # C.g:32:7: 'const'
+            self.match("const")
 
 
 
@@ -745,9 +747,9 @@ class CLexer(Lexer):
         try:
             self.type = T51
 
-            # C.g:33:5: ( 'IN' )
-            # C.g:33:7: 'IN'
-            self.match("IN")
+            # C.g:33:5: ( 'volatile' )
+            # C.g:33:7: 'volatile'
+            self.match("volatile")
 
 
 
@@ -768,9 +770,9 @@ class CLexer(Lexer):
         try:
             self.type = T52
 
-            # C.g:34:5: ( 'OUT' )
-            # C.g:34:7: 'OUT'
-            self.match("OUT")
+            # C.g:34:5: ( 'IN' )
+            # C.g:34:7: 'IN'
+            self.match("IN")
 
 
 
@@ -791,9 +793,9 @@ class CLexer(Lexer):
         try:
             self.type = T53
 
-            # C.g:35:5: ( 'OPTIONAL' )
-            # C.g:35:7: 'OPTIONAL'
-            self.match("OPTIONAL")
+            # C.g:35:5: ( 'OUT' )
+            # C.g:35:7: 'OUT'
+            self.match("OUT")
 
 
 
@@ -814,9 +816,9 @@ class CLexer(Lexer):
         try:
             self.type = T54
 
-            # C.g:36:5: ( 'EFIAPI' )
-            # C.g:36:7: 'EFIAPI'
-            self.match("EFIAPI")
+            # C.g:36:5: ( 'OPTIONAL' )
+            # C.g:36:7: 'OPTIONAL'
+            self.match("OPTIONAL")
 
 
 
@@ -837,9 +839,10 @@ class CLexer(Lexer):
         try:
             self.type = T55
 
-            # C.g:37:5: ( '(' )
-            # C.g:37:7: '('
-            self.match(u'(')
+            # C.g:37:5: ( 'CONST' )
+            # C.g:37:7: 'CONST'
+            self.match("CONST")
+
 
 
 
@@ -859,9 +862,10 @@ class CLexer(Lexer):
         try:
             self.type = T56
 
-            # C.g:38:5: ( ')' )
-            # C.g:38:7: ')'
-            self.match(u')')
+            # C.g:38:5: ( 'EFIAPI' )
+            # C.g:38:7: 'EFIAPI'
+            self.match("EFIAPI")
+
 
 
 
@@ -881,9 +885,9 @@ class CLexer(Lexer):
         try:
             self.type = T57
 
-            # C.g:39:5: ( '[' )
-            # C.g:39:7: '['
-            self.match(u'[')
+            # C.g:39:5: ( '(' )
+            # C.g:39:7: '('
+            self.match(u'(')
 
 
 
@@ -903,9 +907,9 @@ class CLexer(Lexer):
         try:
             self.type = T58
 
-            # C.g:40:5: ( ']' )
-            # C.g:40:7: ']'
-            self.match(u']')
+            # C.g:40:5: ( ')' )
+            # C.g:40:7: ')'
+            self.match(u')')
 
 
 
@@ -925,9 +929,9 @@ class CLexer(Lexer):
         try:
             self.type = T59
 
-            # C.g:41:5: ( '*' )
-            # C.g:41:7: '*'
-            self.match(u'*')
+            # C.g:41:5: ( '[' )
+            # C.g:41:7: '['
+            self.match(u'[')
 
 
 
@@ -947,10 +951,9 @@ class CLexer(Lexer):
         try:
             self.type = T60
 
-            # C.g:42:5: ( '...' )
-            # C.g:42:7: '...'
-            self.match("...")
-
+            # C.g:42:5: ( ']' )
+            # C.g:42:7: ']'
+            self.match(u']')
 
 
 
@@ -970,9 +973,9 @@ class CLexer(Lexer):
         try:
             self.type = T61
 
-            # C.g:43:5: ( '+' )
-            # C.g:43:7: '+'
-            self.match(u'+')
+            # C.g:43:5: ( '*' )
+            # C.g:43:7: '*'
+            self.match(u'*')
 
 
 
@@ -992,9 +995,10 @@ class CLexer(Lexer):
         try:
             self.type = T62
 
-            # C.g:44:5: ( '-' )
-            # C.g:44:7: '-'
-            self.match(u'-')
+            # C.g:44:5: ( '...' )
+            # C.g:44:7: '...'
+            self.match("...")
+
 
 
 
@@ -1014,9 +1018,9 @@ class CLexer(Lexer):
         try:
             self.type = T63
 
-            # C.g:45:5: ( '/' )
-            # C.g:45:7: '/'
-            self.match(u'/')
+            # C.g:45:5: ( '+' )
+            # C.g:45:7: '+'
+            self.match(u'+')
 
 
 
@@ -1036,9 +1040,9 @@ class CLexer(Lexer):
         try:
             self.type = T64
 
-            # C.g:46:5: ( '%' )
-            # C.g:46:7: '%'
-            self.match(u'%')
+            # C.g:46:5: ( '-' )
+            # C.g:46:7: '-'
+            self.match(u'-')
 
 
 
@@ -1058,10 +1062,9 @@ class CLexer(Lexer):
         try:
             self.type = T65
 
-            # C.g:47:5: ( '++' )
-            # C.g:47:7: '++'
-            self.match("++")
-
+            # C.g:47:5: ( '/' )
+            # C.g:47:7: '/'
+            self.match(u'/')
 
 
 
@@ -1081,10 +1084,9 @@ class CLexer(Lexer):
         try:
             self.type = T66
 
-            # C.g:48:5: ( '--' )
-            # C.g:48:7: '--'
-            self.match("--")
-
+            # C.g:48:5: ( '%' )
+            # C.g:48:7: '%'
+            self.match(u'%')
 
 
 
@@ -1104,9 +1106,9 @@ class CLexer(Lexer):
         try:
             self.type = T67
 
-            # C.g:49:5: ( 'sizeof' )
-            # C.g:49:7: 'sizeof'
-            self.match("sizeof")
+            # C.g:49:5: ( '++' )
+            # C.g:49:7: '++'
+            self.match("++")
 
 
 
@@ -1127,9 +1129,10 @@ class CLexer(Lexer):
         try:
             self.type = T68
 
-            # C.g:50:5: ( '.' )
-            # C.g:50:7: '.'
-            self.match(u'.')
+            # C.g:50:5: ( '--' )
+            # C.g:50:7: '--'
+            self.match("--")
+
 
 
 
@@ -1149,9 +1152,9 @@ class CLexer(Lexer):
         try:
             self.type = T69
 
-            # C.g:51:5: ( '->' )
-            # C.g:51:7: '->'
-            self.match("->")
+            # C.g:51:5: ( 'sizeof' )
+            # C.g:51:7: 'sizeof'
+            self.match("sizeof")
 
 
 
@@ -1172,9 +1175,9 @@ class CLexer(Lexer):
         try:
             self.type = T70
 
-            # C.g:52:5: ( '&' )
-            # C.g:52:7: '&'
-            self.match(u'&')
+            # C.g:52:5: ( '.' )
+            # C.g:52:7: '.'
+            self.match(u'.')
 
 
 
@@ -1194,9 +1197,10 @@ class CLexer(Lexer):
         try:
             self.type = T71
 
-            # C.g:53:5: ( '~' )
-            # C.g:53:7: '~'
-            self.match(u'~')
+            # C.g:53:5: ( '->' )
+            # C.g:53:7: '->'
+            self.match("->")
+
 
 
 
@@ -1216,9 +1220,9 @@ class CLexer(Lexer):
         try:
             self.type = T72
 
-            # C.g:54:5: ( '!' )
-            # C.g:54:7: '!'
-            self.match(u'!')
+            # C.g:54:5: ( '&' )
+            # C.g:54:7: '&'
+            self.match(u'&')
 
 
 
@@ -1238,10 +1242,9 @@ class CLexer(Lexer):
         try:
             self.type = T73
 
-            # C.g:55:5: ( '*=' )
-            # C.g:55:7: '*='
-            self.match("*=")
-
+            # C.g:55:5: ( '~' )
+            # C.g:55:7: '~'
+            self.match(u'~')
 
 
 
@@ -1261,10 +1264,9 @@ class CLexer(Lexer):
         try:
             self.type = T74
 
-            # C.g:56:5: ( '/=' )
-            # C.g:56:7: '/='
-            self.match("/=")
-
+            # C.g:56:5: ( '!' )
+            # C.g:56:7: '!'
+            self.match(u'!')
 
 
 
@@ -1284,9 +1286,9 @@ class CLexer(Lexer):
         try:
             self.type = T75
 
-            # C.g:57:5: ( '%=' )
-            # C.g:57:7: '%='
-            self.match("%=")
+            # C.g:57:5: ( '*=' )
+            # C.g:57:7: '*='
+            self.match("*=")
 
 
 
@@ -1307,9 +1309,9 @@ class CLexer(Lexer):
         try:
             self.type = T76
 
-            # C.g:58:5: ( '+=' )
-            # C.g:58:7: '+='
-            self.match("+=")
+            # C.g:58:5: ( '/=' )
+            # C.g:58:7: '/='
+            self.match("/=")
 
 
 
@@ -1330,9 +1332,9 @@ class CLexer(Lexer):
         try:
             self.type = T77
 
-            # C.g:59:5: ( '-=' )
-            # C.g:59:7: '-='
-            self.match("-=")
+            # C.g:59:5: ( '%=' )
+            # C.g:59:7: '%='
+            self.match("%=")
 
 
 
@@ -1353,9 +1355,9 @@ class CLexer(Lexer):
         try:
             self.type = T78
 
-            # C.g:60:5: ( '<<=' )
-            # C.g:60:7: '<<='
-            self.match("<<=")
+            # C.g:60:5: ( '+=' )
+            # C.g:60:7: '+='
+            self.match("+=")
 
 
 
@@ -1376,9 +1378,9 @@ class CLexer(Lexer):
         try:
             self.type = T79
 
-            # C.g:61:5: ( '>>=' )
-            # C.g:61:7: '>>='
-            self.match(">>=")
+            # C.g:61:5: ( '-=' )
+            # C.g:61:7: '-='
+            self.match("-=")
 
 
 
@@ -1399,9 +1401,9 @@ class CLexer(Lexer):
         try:
             self.type = T80
 
-            # C.g:62:5: ( '&=' )
-            # C.g:62:7: '&='
-            self.match("&=")
+            # C.g:62:5: ( '<<=' )
+            # C.g:62:7: '<<='
+            self.match("<<=")
 
 
 
@@ -1422,9 +1424,9 @@ class CLexer(Lexer):
         try:
             self.type = T81
 
-            # C.g:63:5: ( '^=' )
-            # C.g:63:7: '^='
-            self.match("^=")
+            # C.g:63:5: ( '>>=' )
+            # C.g:63:7: '>>='
+            self.match(">>=")
 
 
 
@@ -1445,9 +1447,9 @@ class CLexer(Lexer):
         try:
             self.type = T82
 
-            # C.g:64:5: ( '|=' )
-            # C.g:64:7: '|='
-            self.match("|=")
+            # C.g:64:5: ( '&=' )
+            # C.g:64:7: '&='
+            self.match("&=")
 
 
 
@@ -1468,9 +1470,10 @@ class CLexer(Lexer):
         try:
             self.type = T83
 
-            # C.g:65:5: ( '?' )
-            # C.g:65:7: '?'
-            self.match(u'?')
+            # C.g:65:5: ( '^=' )
+            # C.g:65:7: '^='
+            self.match("^=")
+
 
 
 
@@ -1490,9 +1493,9 @@ class CLexer(Lexer):
         try:
             self.type = T84
 
-            # C.g:66:5: ( '||' )
-            # C.g:66:7: '||'
-            self.match("||")
+            # C.g:66:5: ( '|=' )
+            # C.g:66:7: '|='
+            self.match("|=")
 
 
 
@@ -1513,10 +1516,9 @@ class CLexer(Lexer):
         try:
             self.type = T85
 
-            # C.g:67:5: ( '&&' )
-            # C.g:67:7: '&&'
-            self.match("&&")
-
+            # C.g:67:5: ( '?' )
+            # C.g:67:7: '?'
+            self.match(u'?')
 
 
 
@@ -1536,9 +1538,10 @@ class CLexer(Lexer):
         try:
             self.type = T86
 
-            # C.g:68:5: ( '|' )
-            # C.g:68:7: '|'
-            self.match(u'|')
+            # C.g:68:5: ( '||' )
+            # C.g:68:7: '||'
+            self.match("||")
+
 
 
 
@@ -1558,9 +1561,10 @@ class CLexer(Lexer):
         try:
             self.type = T87
 
-            # C.g:69:5: ( '^' )
-            # C.g:69:7: '^'
-            self.match(u'^')
+            # C.g:69:5: ( '&&' )
+            # C.g:69:7: '&&'
+            self.match("&&")
+
 
 
 
@@ -1580,10 +1584,9 @@ class CLexer(Lexer):
         try:
             self.type = T88
 
-            # C.g:70:5: ( '==' )
-            # C.g:70:7: '=='
-            self.match("==")
-
+            # C.g:70:5: ( '|' )
+            # C.g:70:7: '|'
+            self.match(u'|')
 
 
 
@@ -1603,10 +1606,9 @@ class CLexer(Lexer):
         try:
             self.type = T89
 
-            # C.g:71:5: ( '!=' )
-            # C.g:71:7: '!='
-            self.match("!=")
-
+            # C.g:71:5: ( '^' )
+            # C.g:71:7: '^'
+            self.match(u'^')
 
 
 
@@ -1626,9 +1628,10 @@ class CLexer(Lexer):
         try:
             self.type = T90
 
-            # C.g:72:5: ( '<' )
-            # C.g:72:7: '<'
-            self.match(u'<')
+            # C.g:72:5: ( '==' )
+            # C.g:72:7: '=='
+            self.match("==")
+
 
 
 
@@ -1648,9 +1651,10 @@ class CLexer(Lexer):
         try:
             self.type = T91
 
-            # C.g:73:5: ( '>' )
-            # C.g:73:7: '>'
-            self.match(u'>')
+            # C.g:73:5: ( '!=' )
+            # C.g:73:7: '!='
+            self.match("!=")
+
 
 
 
@@ -1670,10 +1674,9 @@ class CLexer(Lexer):
         try:
             self.type = T92
 
-            # C.g:74:5: ( '<=' )
-            # C.g:74:7: '<='
-            self.match("<=")
-
+            # C.g:74:5: ( '<' )
+            # C.g:74:7: '<'
+            self.match(u'<')
 
 
 
@@ -1693,10 +1696,9 @@ class CLexer(Lexer):
         try:
             self.type = T93
 
-            # C.g:75:5: ( '>=' )
-            # C.g:75:7: '>='
-            self.match(">=")
-
+            # C.g:75:5: ( '>' )
+            # C.g:75:7: '>'
+            self.match(u'>')
 
 
 
@@ -1716,9 +1718,9 @@ class CLexer(Lexer):
         try:
             self.type = T94
 
-            # C.g:76:5: ( '<<' )
-            # C.g:76:7: '<<'
-            self.match("<<")
+            # C.g:76:5: ( '<=' )
+            # C.g:76:7: '<='
+            self.match("<=")
 
 
 
@@ -1739,9 +1741,9 @@ class CLexer(Lexer):
         try:
             self.type = T95
 
-            # C.g:77:5: ( '>>' )
-            # C.g:77:7: '>>'
-            self.match(">>")
+            # C.g:77:5: ( '>=' )
+            # C.g:77:7: '>='
+            self.match(">=")
 
 
 
@@ -1762,9 +1764,9 @@ class CLexer(Lexer):
         try:
             self.type = T96
 
-            # C.g:78:5: ( 'case' )
-            # C.g:78:7: 'case'
-            self.match("case")
+            # C.g:78:5: ( '<<' )
+            # C.g:78:7: '<<'
+            self.match("<<")
 
 
 
@@ -1785,9 +1787,9 @@ class CLexer(Lexer):
         try:
             self.type = T97
 
-            # C.g:79:5: ( 'default' )
-            # C.g:79:7: 'default'
-            self.match("default")
+            # C.g:79:5: ( '>>' )
+            # C.g:79:7: '>>'
+            self.match(">>")
 
 
 
@@ -1808,9 +1810,9 @@ class CLexer(Lexer):
         try:
             self.type = T98
 
-            # C.g:80:5: ( 'if' )
-            # C.g:80:7: 'if'
-            self.match("if")
+            # C.g:80:5: ( 'case' )
+            # C.g:80:7: 'case'
+            self.match("case")
 
 
 
@@ -1831,9 +1833,9 @@ class CLexer(Lexer):
         try:
             self.type = T99
 
-            # C.g:81:5: ( 'else' )
-            # C.g:81:7: 'else'
-            self.match("else")
+            # C.g:81:5: ( 'default' )
+            # C.g:81:7: 'default'
+            self.match("default")
 
 
 
@@ -1854,9 +1856,9 @@ class CLexer(Lexer):
         try:
             self.type = T100
 
-            # C.g:82:6: ( 'switch' )
-            # C.g:82:8: 'switch'
-            self.match("switch")
+            # C.g:82:6: ( 'if' )
+            # C.g:82:8: 'if'
+            self.match("if")
 
 
 
@@ -1877,9 +1879,9 @@ class CLexer(Lexer):
         try:
             self.type = T101
 
-            # C.g:83:6: ( 'while' )
-            # C.g:83:8: 'while'
-            self.match("while")
+            # C.g:83:6: ( 'else' )
+            # C.g:83:8: 'else'
+            self.match("else")
 
 
 
@@ -1900,9 +1902,9 @@ class CLexer(Lexer):
         try:
             self.type = T102
 
-            # C.g:84:6: ( 'do' )
-            # C.g:84:8: 'do'
-            self.match("do")
+            # C.g:84:6: ( 'switch' )
+            # C.g:84:8: 'switch'
+            self.match("switch")
 
 
 
@@ -1923,9 +1925,9 @@ class CLexer(Lexer):
         try:
             self.type = T103
 
-            # C.g:85:6: ( 'for' )
-            # C.g:85:8: 'for'
-            self.match("for")
+            # C.g:85:6: ( 'while' )
+            # C.g:85:8: 'while'
+            self.match("while")
 
 
 
@@ -1946,9 +1948,9 @@ class CLexer(Lexer):
         try:
             self.type = T104
 
-            # C.g:86:6: ( 'goto' )
-            # C.g:86:8: 'goto'
-            self.match("goto")
+            # C.g:86:6: ( 'do' )
+            # C.g:86:8: 'do'
+            self.match("do")
 
 
 
@@ -1969,9 +1971,9 @@ class CLexer(Lexer):
         try:
             self.type = T105
 
-            # C.g:87:6: ( 'continue' )
-            # C.g:87:8: 'continue'
-            self.match("continue")
+            # C.g:87:6: ( 'for' )
+            # C.g:87:8: 'for'
+            self.match("for")
 
 
 
@@ -1992,9 +1994,9 @@ class CLexer(Lexer):
         try:
             self.type = T106
 
-            # C.g:88:6: ( 'break' )
-            # C.g:88:8: 'break'
-            self.match("break")
+            # C.g:88:6: ( 'goto' )
+            # C.g:88:8: 'goto'
+            self.match("goto")
 
 
 
@@ -2015,9 +2017,9 @@ class CLexer(Lexer):
         try:
             self.type = T107
 
-            # C.g:89:6: ( 'return' )
-            # C.g:89:8: 'return'
-            self.match("return")
+            # C.g:89:6: ( 'continue' )
+            # C.g:89:8: 'continue'
+            self.match("continue")
 
 
 
@@ -2032,17 +2034,63 @@ class CLexer(Lexer):
 
 
 
+    # $ANTLR start T108
+    def mT108(self, ):
+
+        try:
+            self.type = T108
+
+            # C.g:90:6: ( 'break' )
+            # C.g:90:8: 'break'
+            self.match("break")
+
+
+
+
+
+
+        finally:
+
+            pass
+
+    # $ANTLR end T108
+
+
+
+    # $ANTLR start T109
+    def mT109(self, ):
+
+        try:
+            self.type = T109
+
+            # C.g:91:6: ( 'return' )
+            # C.g:91:8: 'return'
+            self.match("return")
+
+
+
+
+
+
+        finally:
+
+            pass
+
+    # $ANTLR end T109
+
+
+
     # $ANTLR start IDENTIFIER
     def mIDENTIFIER(self, ):
 
         try:
             self.type = IDENTIFIER
 
-            # C.g:489:2: ( LETTER ( LETTER | '0' .. '9' )* )
-            # C.g:489:4: LETTER ( LETTER | '0' .. '9' )*
+            # C.g:493:2: ( LETTER ( LETTER | '0' .. '9' )* )
+            # C.g:493:4: LETTER ( LETTER | '0' .. '9' )*
             self.mLETTER()
 
-            # C.g:489:11: ( LETTER | '0' .. '9' )*
+            # C.g:493:11: ( LETTER | '0' .. '9' )*
             while True: #loop1
                 alt1 = 2
                 LA1_0 = self.input.LA(1)
@@ -2084,7 +2132,7 @@ class CLexer(Lexer):
     def mLETTER(self, ):
 
         try:
-            # C.g:494:2: ( '$' | 'A' .. 'Z' | 'a' .. 'z' | '_' )
+            # C.g:498:2: ( '$' | 'A' .. 'Z' | 'a' .. 'z' | '_' )
             # C.g:
             if self.input.LA(1) == u'$' or (u'A' <= self.input.LA(1) <= u'Z') or self.input.LA(1) == u'_' or (u'a' <= self.input.LA(1) <= u'z'):
                 self.input.consume();
@@ -2113,16 +2161,16 @@ class CLexer(Lexer):
         try:
             self.type = CHARACTER_LITERAL
 
-            # C.g:501:5: ( ( 'L' )? '\\'' ( EscapeSequence | ~ ( '\\'' | '\\\\' ) ) '\\'' )
-            # C.g:501:9: ( 'L' )? '\\'' ( EscapeSequence | ~ ( '\\'' | '\\\\' ) ) '\\''
-            # C.g:501:9: ( 'L' )?
+            # C.g:505:5: ( ( 'L' )? '\\'' ( EscapeSequence | ~ ( '\\'' | '\\\\' ) ) '\\'' )
+            # C.g:505:9: ( 'L' )? '\\'' ( EscapeSequence | ~ ( '\\'' | '\\\\' ) ) '\\''
+            # C.g:505:9: ( 'L' )?
             alt2 = 2
             LA2_0 = self.input.LA(1)
 
             if (LA2_0 == u'L') :
                 alt2 = 1
             if alt2 == 1:
-                # C.g:501:10: 'L'
+                # C.g:505:10: 'L'
                 self.match(u'L')
 
 
@@ -2130,7 +2178,7 @@ class CLexer(Lexer):
 
             self.match(u'\'')
 
-            # C.g:501:21: ( EscapeSequence | ~ ( '\\'' | '\\\\' ) )
+            # C.g:505:21: ( EscapeSequence | ~ ( '\\'' | '\\\\' ) )
             alt3 = 2
             LA3_0 = self.input.LA(1)
 
@@ -2139,18 +2187,18 @@ class CLexer(Lexer):
             elif ((u'\u0000' <= LA3_0 <= u'&') or (u'(' <= LA3_0 <= u'[') or (u']' <= LA3_0 <= u'\uFFFE')) :
                 alt3 = 2
             else:
-                nvae = NoViableAltException("501:21: ( EscapeSequence | ~ ( '\\'' | '\\\\' ) )", 3, 0, self.input)
+                nvae = NoViableAltException("505:21: ( EscapeSequence | ~ ( '\\'' | '\\\\' ) )", 3, 0, self.input)
 
                 raise nvae
 
             if alt3 == 1:
-                # C.g:501:23: EscapeSequence
+                # C.g:505:23: EscapeSequence
                 self.mEscapeSequence()
 
 
 
             elif alt3 == 2:
-                # C.g:501:40: ~ ( '\\'' | '\\\\' )
+                # C.g:505:40: ~ ( '\\'' | '\\\\' )
                 if (u'\u0000' <= self.input.LA(1) <= u'&') or (u'(' <= self.input.LA(1) <= u'[') or (u']' <= self.input.LA(1) <= u'\uFFFE'):
                     self.input.consume();
 
@@ -2183,16 +2231,16 @@ class CLexer(Lexer):
         try:
             self.type = STRING_LITERAL
 
-            # C.g:505:5: ( ( 'L' )? '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"' )
-            # C.g:505:8: ( 'L' )? '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"'
-            # C.g:505:8: ( 'L' )?
+            # C.g:509:5: ( ( 'L' )? '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"' )
+            # C.g:509:8: ( 'L' )? '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"'
+            # C.g:509:8: ( 'L' )?
             alt4 = 2
             LA4_0 = self.input.LA(1)
 
             if (LA4_0 == u'L') :
                 alt4 = 1
             if alt4 == 1:
-                # C.g:505:9: 'L'
+                # C.g:509:9: 'L'
                 self.match(u'L')
 
 
@@ -2200,7 +2248,7 @@ class CLexer(Lexer):
 
             self.match(u'"')
 
-            # C.g:505:19: ( EscapeSequence | ~ ( '\\\\' | '\"' ) )*
+            # C.g:509:19: ( EscapeSequence | ~ ( '\\\\' | '\"' ) )*
             while True: #loop5
                 alt5 = 3
                 LA5_0 = self.input.LA(1)
@@ -2212,13 +2260,13 @@ class CLexer(Lexer):
 
 
                 if alt5 == 1:
-                    # C.g:505:21: EscapeSequence
+                    # C.g:509:21: EscapeSequence
                     self.mEscapeSequence()
 
 
 
                 elif alt5 == 2:
-                    # C.g:505:38: ~ ( '\\\\' | '\"' )
+                    # C.g:509:38: ~ ( '\\\\' | '\"' )
                     if (u'\u0000' <= self.input.LA(1) <= u'!') or (u'#' <= self.input.LA(1) <= u'[') or (u']' <= self.input.LA(1) <= u'\uFFFE'):
                         self.input.consume();
 
@@ -2254,8 +2302,8 @@ class CLexer(Lexer):
         try:
             self.type = HEX_LITERAL
 
-            # C.g:508:13: ( '0' ( 'x' | 'X' ) ( HexDigit )+ ( IntegerTypeSuffix )? )
-            # C.g:508:15: '0' ( 'x' | 'X' ) ( HexDigit )+ ( IntegerTypeSuffix )?
+            # C.g:512:13: ( '0' ( 'x' | 'X' ) ( HexDigit )+ ( IntegerTypeSuffix )? )
+            # C.g:512:15: '0' ( 'x' | 'X' ) ( HexDigit )+ ( IntegerTypeSuffix )?
             self.match(u'0')
 
             if self.input.LA(1) == u'X' or self.input.LA(1) == u'x':
@@ -2267,7 +2315,7 @@ class CLexer(Lexer):
                 raise mse
 
 
-            # C.g:508:29: ( HexDigit )+
+            # C.g:512:29: ( HexDigit )+
             cnt6 = 0
             while True: #loop6
                 alt6 = 2
@@ -2278,7 +2326,7 @@ class CLexer(Lexer):
 
 
                 if alt6 == 1:
-                    # C.g:508:29: HexDigit
+                    # C.g:512:29: HexDigit
                     self.mHexDigit()
 
 
@@ -2293,14 +2341,14 @@ class CLexer(Lexer):
                 cnt6 += 1
 
 
-            # C.g:508:39: ( IntegerTypeSuffix )?
+            # C.g:512:39: ( IntegerTypeSuffix )?
             alt7 = 2
             LA7_0 = self.input.LA(1)
 
             if (LA7_0 == u'L' or LA7_0 == u'U' or LA7_0 == u'l' or LA7_0 == u'u') :
                 alt7 = 1
             if alt7 == 1:
-                # C.g:508:39: IntegerTypeSuffix
+                # C.g:512:39: IntegerTypeSuffix
                 self.mIntegerTypeSuffix()
 
 
@@ -2324,9 +2372,9 @@ class CLexer(Lexer):
         try:
             self.type = DECIMAL_LITERAL
 
-            # C.g:510:17: ( ( '0' | '1' .. '9' ( '0' .. '9' )* ) ( IntegerTypeSuffix )? )
-            # C.g:510:19: ( '0' | '1' .. '9' ( '0' .. '9' )* ) ( IntegerTypeSuffix )?
-            # C.g:510:19: ( '0' | '1' .. '9' ( '0' .. '9' )* )
+            # C.g:514:17: ( ( '0' | '1' .. '9' ( '0' .. '9' )* ) ( IntegerTypeSuffix )? )
+            # C.g:514:19: ( '0' | '1' .. '9' ( '0' .. '9' )* ) ( IntegerTypeSuffix )?
+            # C.g:514:19: ( '0' | '1' .. '9' ( '0' .. '9' )* )
             alt9 = 2
             LA9_0 = self.input.LA(1)
 
@@ -2335,21 +2383,21 @@ class CLexer(Lexer):
             elif ((u'1' <= LA9_0 <= u'9')) :
                 alt9 = 2
             else:
-                nvae = NoViableAltException("510:19: ( '0' | '1' .. '9' ( '0' .. '9' )* )", 9, 0, self.input)
+                nvae = NoViableAltException("514:19: ( '0' | '1' .. '9' ( '0' .. '9' )* )", 9, 0, self.input)
 
                 raise nvae
 
             if alt9 == 1:
-                # C.g:510:20: '0'
+                # C.g:514:20: '0'
                 self.match(u'0')
 
 
 
             elif alt9 == 2:
-                # C.g:510:26: '1' .. '9' ( '0' .. '9' )*
+                # C.g:514:26: '1' .. '9' ( '0' .. '9' )*
                 self.matchRange(u'1', u'9')
 
-                # C.g:510:35: ( '0' .. '9' )*
+                # C.g:514:35: ( '0' .. '9' )*
                 while True: #loop8
                     alt8 = 2
                     LA8_0 = self.input.LA(1)
@@ -2359,7 +2407,7 @@ class CLexer(Lexer):
 
 
                     if alt8 == 1:
-                        # C.g:510:35: '0' .. '9'
+                        # C.g:514:35: '0' .. '9'
                         self.matchRange(u'0', u'9')
 
 
@@ -2371,14 +2419,14 @@ class CLexer(Lexer):
 
 
 
-            # C.g:510:46: ( IntegerTypeSuffix )?
+            # C.g:514:46: ( IntegerTypeSuffix )?
             alt10 = 2
             LA10_0 = self.input.LA(1)
 
             if (LA10_0 == u'L' or LA10_0 == u'U' or LA10_0 == u'l' or LA10_0 == u'u') :
                 alt10 = 1
             if alt10 == 1:
-                # C.g:510:46: IntegerTypeSuffix
+                # C.g:514:46: IntegerTypeSuffix
                 self.mIntegerTypeSuffix()
 
 
@@ -2402,11 +2450,11 @@ class CLexer(Lexer):
         try:
             self.type = OCTAL_LITERAL
 
-            # C.g:512:15: ( '0' ( '0' .. '7' )+ ( IntegerTypeSuffix )? )
-            # C.g:512:17: '0' ( '0' .. '7' )+ ( IntegerTypeSuffix )?
+            # C.g:516:15: ( '0' ( '0' .. '7' )+ ( IntegerTypeSuffix )? )
+            # C.g:516:17: '0' ( '0' .. '7' )+ ( IntegerTypeSuffix )?
             self.match(u'0')
 
-            # C.g:512:21: ( '0' .. '7' )+
+            # C.g:516:21: ( '0' .. '7' )+
             cnt11 = 0
             while True: #loop11
                 alt11 = 2
@@ -2417,7 +2465,7 @@ class CLexer(Lexer):
 
 
                 if alt11 == 1:
-                    # C.g:512:22: '0' .. '7'
+                    # C.g:516:22: '0' .. '7'
                     self.matchRange(u'0', u'7')
 
 
@@ -2432,14 +2480,14 @@ class CLexer(Lexer):
                 cnt11 += 1
 
 
-            # C.g:512:33: ( IntegerTypeSuffix )?
+            # C.g:516:33: ( IntegerTypeSuffix )?
             alt12 = 2
             LA12_0 = self.input.LA(1)
 
             if (LA12_0 == u'L' or LA12_0 == u'U' or LA12_0 == u'l' or LA12_0 == u'u') :
                 alt12 = 1
             if alt12 == 1:
-                # C.g:512:33: IntegerTypeSuffix
+                # C.g:516:33: IntegerTypeSuffix
                 self.mIntegerTypeSuffix()
 
 
@@ -2461,8 +2509,8 @@ class CLexer(Lexer):
     def mHexDigit(self, ):
 
         try:
-            # C.g:515:10: ( ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) )
-            # C.g:515:12: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )
+            # C.g:519:10: ( ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) )
+            # C.g:519:12: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )
             if (u'0' <= self.input.LA(1) <= u'9') or (u'A' <= self.input.LA(1) <= u'F') or (u'a' <= self.input.LA(1) <= u'f'):
                 self.input.consume();
 
@@ -2488,7 +2536,7 @@ class CLexer(Lexer):
     def mIntegerTypeSuffix(self, ):
 
         try:
-            # C.g:519:2: ( ( 'u' | 'U' )? ( 'l' | 'L' ) | ( 'u' | 'U' ) ( 'l' | 'L' )? ( 'l' | 'L' )? )
+            # C.g:523:2: ( ( 'u' | 'U' )? ( 'l' | 'L' ) | ( 'u' | 'U' ) ( 'l' | 'L' )? ( 'l' | 'L' )? )
             alt16 = 2
             LA16_0 = self.input.LA(1)
 
@@ -2502,13 +2550,13 @@ class CLexer(Lexer):
             elif (LA16_0 == u'L' or LA16_0 == u'l') :
                 alt16 = 1
             else:
-                nvae = NoViableAltException("517:1: fragment IntegerTypeSuffix : ( ( 'u' | 'U' )? ( 'l' | 'L' ) | ( 'u' | 'U' ) ( 'l' | 'L' )? ( 'l' | 'L' )? );", 16, 0, self.input)
+                nvae = NoViableAltException("521:1: fragment IntegerTypeSuffix : ( ( 'u' | 'U' )? ( 'l' | 'L' ) | ( 'u' | 'U' ) ( 'l' | 'L' )? ( 'l' | 'L' )? );", 16, 0, self.input)
 
                 raise nvae
 
             if alt16 == 1:
-                # C.g:519:4: ( 'u' | 'U' )? ( 'l' | 'L' )
-                # C.g:519:4: ( 'u' | 'U' )?
+                # C.g:523:4: ( 'u' | 'U' )? ( 'l' | 'L' )
+                # C.g:523:4: ( 'u' | 'U' )?
                 alt13 = 2
                 LA13_0 = self.input.LA(1)
 
@@ -2540,7 +2588,7 @@ class CLexer(Lexer):
 
 
             elif alt16 == 2:
-                # C.g:520:4: ( 'u' | 'U' ) ( 'l' | 'L' )? ( 'l' | 'L' )?
+                # C.g:524:4: ( 'u' | 'U' ) ( 'l' | 'L' )? ( 'l' | 'L' )?
                 if self.input.LA(1) == u'U' or self.input.LA(1) == u'u':
                     self.input.consume();
 
@@ -2550,7 +2598,7 @@ class CLexer(Lexer):
                     raise mse
 
 
-                # C.g:520:15: ( 'l' | 'L' )?
+                # C.g:524:15: ( 'l' | 'L' )?
                 alt14 = 2
                 LA14_0 = self.input.LA(1)
 
@@ -2570,7 +2618,7 @@ class CLexer(Lexer):
 
 
 
-                # C.g:520:26: ( 'l' | 'L' )?
+                # C.g:524:26: ( 'l' | 'L' )?
                 alt15 = 2
                 LA15_0 = self.input.LA(1)
 
@@ -2607,12 +2655,12 @@ class CLexer(Lexer):
         try:
             self.type = FLOATING_POINT_LITERAL
 
-            # C.g:524:5: ( ( '0' .. '9' )+ '.' ( '0' .. '9' )* ( Exponent )? ( FloatTypeSuffix )? | '.' ( '0' .. '9' )+ ( Exponent )? ( FloatTypeSuffix )? | ( '0' .. '9' )+ Exponent ( FloatTypeSuffix )? | ( '0' .. '9' )+ ( Exponent )? FloatTypeSuffix )
+            # C.g:528:5: ( ( '0' .. '9' )+ '.' ( '0' .. '9' )* ( Exponent )? ( FloatTypeSuffix )? | '.' ( '0' .. '9' )+ ( Exponent )? ( FloatTypeSuffix )? | ( '0' .. '9' )+ Exponent ( FloatTypeSuffix )? | ( '0' .. '9' )+ ( Exponent )? FloatTypeSuffix )
             alt28 = 4
             alt28 = self.dfa28.predict(self.input)
             if alt28 == 1:
-                # C.g:524:9: ( '0' .. '9' )+ '.' ( '0' .. '9' )* ( Exponent )? ( FloatTypeSuffix )?
-                # C.g:524:9: ( '0' .. '9' )+
+                # C.g:528:9: ( '0' .. '9' )+ '.' ( '0' .. '9' )* ( Exponent )? ( FloatTypeSuffix )?
+                # C.g:528:9: ( '0' .. '9' )+
                 cnt17 = 0
                 while True: #loop17
                     alt17 = 2
@@ -2623,7 +2671,7 @@ class CLexer(Lexer):
 
 
                     if alt17 == 1:
-                        # C.g:524:10: '0' .. '9'
+                        # C.g:528:10: '0' .. '9'
                         self.matchRange(u'0', u'9')
 
 
@@ -2640,7 +2688,7 @@ class CLexer(Lexer):
 
                 self.match(u'.')
 
-                # C.g:524:25: ( '0' .. '9' )*
+                # C.g:528:25: ( '0' .. '9' )*
                 while True: #loop18
                     alt18 = 2
                     LA18_0 = self.input.LA(1)
@@ -2650,7 +2698,7 @@ class CLexer(Lexer):
 
 
                     if alt18 == 1:
-                        # C.g:524:26: '0' .. '9'
+                        # C.g:528:26: '0' .. '9'
                         self.matchRange(u'0', u'9')
 
 
@@ -2659,27 +2707,27 @@ class CLexer(Lexer):
                         break #loop18
 
 
-                # C.g:524:37: ( Exponent )?
+                # C.g:528:37: ( Exponent )?
                 alt19 = 2
                 LA19_0 = self.input.LA(1)
 
                 if (LA19_0 == u'E' or LA19_0 == u'e') :
                     alt19 = 1
                 if alt19 == 1:
-                    # C.g:524:37: Exponent
+                    # C.g:528:37: Exponent
                     self.mExponent()
 
 
 
 
-                # C.g:524:47: ( FloatTypeSuffix )?
+                # C.g:528:47: ( FloatTypeSuffix )?
                 alt20 = 2
                 LA20_0 = self.input.LA(1)
 
                 if (LA20_0 == u'D' or LA20_0 == u'F' or LA20_0 == u'd' or LA20_0 == u'f') :
                     alt20 = 1
                 if alt20 == 1:
-                    # C.g:524:47: FloatTypeSuffix
+                    # C.g:528:47: FloatTypeSuffix
                     self.mFloatTypeSuffix()
 
 
@@ -2688,10 +2736,10 @@ class CLexer(Lexer):
 
 
             elif alt28 == 2:
-                # C.g:525:9: '.' ( '0' .. '9' )+ ( Exponent )? ( FloatTypeSuffix )?
+                # C.g:529:9: '.' ( '0' .. '9' )+ ( Exponent )? ( FloatTypeSuffix )?
                 self.match(u'.')
 
-                # C.g:525:13: ( '0' .. '9' )+
+                # C.g:529:13: ( '0' .. '9' )+
                 cnt21 = 0
                 while True: #loop21
                     alt21 = 2
@@ -2702,7 +2750,7 @@ class CLexer(Lexer):
 
 
                     if alt21 == 1:
-                        # C.g:525:14: '0' .. '9'
+                        # C.g:529:14: '0' .. '9'
                         self.matchRange(u'0', u'9')
 
 
@@ -2717,27 +2765,27 @@ class CLexer(Lexer):
                     cnt21 += 1
 
 
-                # C.g:525:25: ( Exponent )?
+                # C.g:529:25: ( Exponent )?
                 alt22 = 2
                 LA22_0 = self.input.LA(1)
 
                 if (LA22_0 == u'E' or LA22_0 == u'e') :
                     alt22 = 1
                 if alt22 == 1:
-                    # C.g:525:25: Exponent
+                    # C.g:529:25: Exponent
                     self.mExponent()
 
 
 
 
-                # C.g:525:35: ( FloatTypeSuffix )?
+                # C.g:529:35: ( FloatTypeSuffix )?
                 alt23 = 2
                 LA23_0 = self.input.LA(1)
 
                 if (LA23_0 == u'D' or LA23_0 == u'F' or LA23_0 == u'd' or LA23_0 == u'f') :
                     alt23 = 1
                 if alt23 == 1:
-                    # C.g:525:35: FloatTypeSuffix
+                    # C.g:529:35: FloatTypeSuffix
                     self.mFloatTypeSuffix()
 
 
@@ -2746,8 +2794,8 @@ class CLexer(Lexer):
 
 
             elif alt28 == 3:
-                # C.g:526:9: ( '0' .. '9' )+ Exponent ( FloatTypeSuffix )?
-                # C.g:526:9: ( '0' .. '9' )+
+                # C.g:530:9: ( '0' .. '9' )+ Exponent ( FloatTypeSuffix )?
+                # C.g:530:9: ( '0' .. '9' )+
                 cnt24 = 0
                 while True: #loop24
                     alt24 = 2
@@ -2758,7 +2806,7 @@ class CLexer(Lexer):
 
 
                     if alt24 == 1:
-                        # C.g:526:10: '0' .. '9'
+                        # C.g:530:10: '0' .. '9'
                         self.matchRange(u'0', u'9')
 
 
@@ -2775,14 +2823,14 @@ class CLexer(Lexer):
 
                 self.mExponent()
 
-                # C.g:526:30: ( FloatTypeSuffix )?
+                # C.g:530:30: ( FloatTypeSuffix )?
                 alt25 = 2
                 LA25_0 = self.input.LA(1)
 
                 if (LA25_0 == u'D' or LA25_0 == u'F' or LA25_0 == u'd' or LA25_0 == u'f') :
                     alt25 = 1
                 if alt25 == 1:
-                    # C.g:526:30: FloatTypeSuffix
+                    # C.g:530:30: FloatTypeSuffix
                     self.mFloatTypeSuffix()
 
 
@@ -2791,8 +2839,8 @@ class CLexer(Lexer):
 
 
             elif alt28 == 4:
-                # C.g:527:9: ( '0' .. '9' )+ ( Exponent )? FloatTypeSuffix
-                # C.g:527:9: ( '0' .. '9' )+
+                # C.g:531:9: ( '0' .. '9' )+ ( Exponent )? FloatTypeSuffix
+                # C.g:531:9: ( '0' .. '9' )+
                 cnt26 = 0
                 while True: #loop26
                     alt26 = 2
@@ -2803,7 +2851,7 @@ class CLexer(Lexer):
 
 
                     if alt26 == 1:
-                        # C.g:527:10: '0' .. '9'
+                        # C.g:531:10: '0' .. '9'
                         self.matchRange(u'0', u'9')
 
 
@@ -2818,14 +2866,14 @@ class CLexer(Lexer):
                     cnt26 += 1
 
 
-                # C.g:527:21: ( Exponent )?
+                # C.g:531:21: ( Exponent )?
                 alt27 = 2
                 LA27_0 = self.input.LA(1)
 
                 if (LA27_0 == u'E' or LA27_0 == u'e') :
                     alt27 = 1
                 if alt27 == 1:
-                    # C.g:527:21: Exponent
+                    # C.g:531:21: Exponent
                     self.mExponent()
 
 
@@ -2848,8 +2896,8 @@ class CLexer(Lexer):
     def mExponent(self, ):
 
         try:
-            # C.g:531:10: ( ( 'e' | 'E' ) ( '+' | '-' )? ( '0' .. '9' )+ )
-            # C.g:531:12: ( 'e' | 'E' ) ( '+' | '-' )? ( '0' .. '9' )+
+            # C.g:535:10: ( ( 'e' | 'E' ) ( '+' | '-' )? ( '0' .. '9' )+ )
+            # C.g:535:12: ( 'e' | 'E' ) ( '+' | '-' )? ( '0' .. '9' )+
             if self.input.LA(1) == u'E' or self.input.LA(1) == u'e':
                 self.input.consume();
 
@@ -2859,7 +2907,7 @@ class CLexer(Lexer):
                 raise mse
 
 
-            # C.g:531:22: ( '+' | '-' )?
+            # C.g:535:22: ( '+' | '-' )?
             alt29 = 2
             LA29_0 = self.input.LA(1)
 
@@ -2879,7 +2927,7 @@ class CLexer(Lexer):
 
 
 
-            # C.g:531:33: ( '0' .. '9' )+
+            # C.g:535:33: ( '0' .. '9' )+
             cnt30 = 0
             while True: #loop30
                 alt30 = 2
@@ -2890,7 +2938,7 @@ class CLexer(Lexer):
 
 
                 if alt30 == 1:
-                    # C.g:531:34: '0' .. '9'
+                    # C.g:535:34: '0' .. '9'
                     self.matchRange(u'0', u'9')
 
 
@@ -2921,8 +2969,8 @@ class CLexer(Lexer):
     def mFloatTypeSuffix(self, ):
 
         try:
-            # C.g:534:17: ( ( 'f' | 'F' | 'd' | 'D' ) )
-            # C.g:534:19: ( 'f' | 'F' | 'd' | 'D' )
+            # C.g:538:17: ( ( 'f' | 'F' | 'd' | 'D' ) )
+            # C.g:538:19: ( 'f' | 'F' | 'd' | 'D' )
             if self.input.LA(1) == u'D' or self.input.LA(1) == u'F' or self.input.LA(1) == u'd' or self.input.LA(1) == u'f':
                 self.input.consume();
 
@@ -2948,7 +2996,7 @@ class CLexer(Lexer):
     def mEscapeSequence(self, ):
 
         try:
-            # C.g:538:5: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | OctalEscape )
+            # C.g:542:5: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | OctalEscape )
             alt31 = 2
             LA31_0 = self.input.LA(1)
 
@@ -2960,17 +3008,17 @@ class CLexer(Lexer):
                 elif ((u'0' <= LA31_1 <= u'7')) :
                     alt31 = 2
                 else:
-                    nvae = NoViableAltException("536:1: fragment EscapeSequence : ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | OctalEscape );", 31, 1, self.input)
+                    nvae = NoViableAltException("540:1: fragment EscapeSequence : ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | OctalEscape );", 31, 1, self.input)
 
                     raise nvae
 
             else:
-                nvae = NoViableAltException("536:1: fragment EscapeSequence : ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | OctalEscape );", 31, 0, self.input)
+                nvae = NoViableAltException("540:1: fragment EscapeSequence : ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | OctalEscape );", 31, 0, self.input)
 
                 raise nvae
 
             if alt31 == 1:
-                # C.g:538:8: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' )
+                # C.g:542:8: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' )
                 self.match(u'\\')
 
                 if self.input.LA(1) == u'"' or self.input.LA(1) == u'\'' or self.input.LA(1) == u'\\' or self.input.LA(1) == u'b' or self.input.LA(1) == u'f' or self.input.LA(1) == u'n' or self.input.LA(1) == u'r' or self.input.LA(1) == u't':
@@ -2985,7 +3033,7 @@ class CLexer(Lexer):
 
 
             elif alt31 == 2:
-                # C.g:539:9: OctalEscape
+                # C.g:543:9: OctalEscape
                 self.mOctalEscape()
 
 
@@ -3003,7 +3051,7 @@ class CLexer(Lexer):
     def mOctalEscape(self, ):
 
         try:
-            # C.g:544:5: ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) )
+            # C.g:548:5: ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) )
             alt32 = 3
             LA32_0 = self.input.LA(1)
 
@@ -3030,35 +3078,35 @@ class CLexer(Lexer):
                     else:
                         alt32 = 3
                 else:
-                    nvae = NoViableAltException("542:1: fragment OctalEscape : ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) );", 32, 1, self.input)
+                    nvae = NoViableAltException("546:1: fragment OctalEscape : ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) );", 32, 1, self.input)
 
                     raise nvae
 
             else:
-                nvae = NoViableAltException("542:1: fragment OctalEscape : ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) );", 32, 0, self.input)
+                nvae = NoViableAltException("546:1: fragment OctalEscape : ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) );", 32, 0, self.input)
 
                 raise nvae
 
             if alt32 == 1:
-                # C.g:544:9: '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' )
+                # C.g:548:9: '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' )
                 self.match(u'\\')
 
-                # C.g:544:14: ( '0' .. '3' )
-                # C.g:544:15: '0' .. '3'
+                # C.g:548:14: ( '0' .. '3' )
+                # C.g:548:15: '0' .. '3'
                 self.matchRange(u'0', u'3')
 
 
 
 
-                # C.g:544:25: ( '0' .. '7' )
-                # C.g:544:26: '0' .. '7'
+                # C.g:548:25: ( '0' .. '7' )
+                # C.g:548:26: '0' .. '7'
                 self.matchRange(u'0', u'7')
 
 
 
 
-                # C.g:544:36: ( '0' .. '7' )
-                # C.g:544:37: '0' .. '7'
+                # C.g:548:36: ( '0' .. '7' )
+                # C.g:548:37: '0' .. '7'
                 self.matchRange(u'0', u'7')
 
 
@@ -3067,18 +3115,18 @@ class CLexer(Lexer):
 
 
             elif alt32 == 2:
-                # C.g:545:9: '\\\\' ( '0' .. '7' ) ( '0' .. '7' )
+                # C.g:549:9: '\\\\' ( '0' .. '7' ) ( '0' .. '7' )
                 self.match(u'\\')
 
-                # C.g:545:14: ( '0' .. '7' )
-                # C.g:545:15: '0' .. '7'
+                # C.g:549:14: ( '0' .. '7' )
+                # C.g:549:15: '0' .. '7'
                 self.matchRange(u'0', u'7')
 
 
 
 
-                # C.g:545:25: ( '0' .. '7' )
-                # C.g:545:26: '0' .. '7'
+                # C.g:549:25: ( '0' .. '7' )
+                # C.g:549:26: '0' .. '7'
                 self.matchRange(u'0', u'7')
 
 
@@ -3087,11 +3135,11 @@ class CLexer(Lexer):
 
 
             elif alt32 == 3:
-                # C.g:546:9: '\\\\' ( '0' .. '7' )
+                # C.g:550:9: '\\\\' ( '0' .. '7' )
                 self.match(u'\\')
 
-                # C.g:546:14: ( '0' .. '7' )
-                # C.g:546:15: '0' .. '7'
+                # C.g:550:14: ( '0' .. '7' )
+                # C.g:550:15: '0' .. '7'
                 self.matchRange(u'0', u'7')
 
 
@@ -3112,8 +3160,8 @@ class CLexer(Lexer):
     def mUnicodeEscape(self, ):
 
         try:
-            # C.g:551:5: ( '\\\\' 'u' HexDigit HexDigit HexDigit HexDigit )
-            # C.g:551:9: '\\\\' 'u' HexDigit HexDigit HexDigit HexDigit
+            # C.g:555:5: ( '\\\\' 'u' HexDigit HexDigit HexDigit HexDigit )
+            # C.g:555:9: '\\\\' 'u' HexDigit HexDigit HexDigit HexDigit
             self.match(u'\\')
 
             self.match(u'u')
@@ -3144,8 +3192,8 @@ class CLexer(Lexer):
         try:
             self.type = WS
 
-            # C.g:554:5: ( ( ' ' | '\\r' | '\\t' | '\\u000C' | '\\n' ) )
-            # C.g:554:8: ( ' ' | '\\r' | '\\t' | '\\u000C' | '\\n' )
+            # C.g:558:5: ( ( ' ' | '\\r' | '\\t' | '\\u000C' | '\\n' ) )
+            # C.g:558:8: ( ' ' | '\\r' | '\\t' | '\\u000C' | '\\n' )
             if (u'\t' <= self.input.LA(1) <= u'\n') or (u'\f' <= self.input.LA(1) <= u'\r') or self.input.LA(1) == u' ':
                 self.input.consume();
 
@@ -3176,10 +3224,10 @@ class CLexer(Lexer):
         try:
             self.type = BS
 
-            # C.g:558:5: ( ( '\\\\' ) )
-            # C.g:558:7: ( '\\\\' )
-            # C.g:558:7: ( '\\\\' )
-            # C.g:558:8: '\\\\'
+            # C.g:562:5: ( ( '\\\\' ) )
+            # C.g:562:7: ( '\\\\' )
+            # C.g:562:7: ( '\\\\' )
+            # C.g:562:8: '\\\\'
             self.match(u'\\')
 
 
@@ -3206,8 +3254,8 @@ class CLexer(Lexer):
         try:
             self.type = UnicodeVocabulary
 
-            # C.g:566:5: ( '\\u0003' .. '\\uFFFE' )
-            # C.g:566:7: '\\u0003' .. '\\uFFFE'
+            # C.g:570:5: ( '\\u0003' .. '\\uFFFE' )
+            # C.g:570:7: '\\u0003' .. '\\uFFFE'
             self.matchRange(u'\u0003', u'\uFFFE')
 
 
@@ -3228,12 +3276,12 @@ class CLexer(Lexer):
         try:
             self.type = COMMENT
 
-            # C.g:569:5: ( '/*' ( options {greedy=false; } : . )* '*/' )
-            # C.g:569:9: '/*' ( options {greedy=false; } : . )* '*/'
+            # C.g:573:5: ( '/*' ( options {greedy=false; } : . )* '*/' )
+            # C.g:573:9: '/*' ( options {greedy=false; } : . )* '*/'
             self.match("/*")
 
 
-            # C.g:569:14: ( options {greedy=false; } : . )*
+            # C.g:573:14: ( options {greedy=false; } : . )*
             while True: #loop33
                 alt33 = 2
                 LA33_0 = self.input.LA(1)
@@ -3252,7 +3300,7 @@ class CLexer(Lexer):
 
 
                 if alt33 == 1:
-                    # C.g:569:42: .
+                    # C.g:573:42: .
                     self.matchAny()
 
 
@@ -3285,12 +3333,12 @@ class CLexer(Lexer):
         try:
             self.type = LINE_COMMENT
 
-            # C.g:574:5: ( '//' (~ ( '\\n' | '\\r' ) )* ( '\\r' )? '\\n' )
-            # C.g:574:7: '//' (~ ( '\\n' | '\\r' ) )* ( '\\r' )? '\\n'
+            # C.g:578:5: ( '//' (~ ( '\\n' | '\\r' ) )* ( '\\r' )? '\\n' )
+            # C.g:578:7: '//' (~ ( '\\n' | '\\r' ) )* ( '\\r' )? '\\n'
             self.match("//")
 
 
-            # C.g:574:12: (~ ( '\\n' | '\\r' ) )*
+            # C.g:578:12: (~ ( '\\n' | '\\r' ) )*
             while True: #loop34
                 alt34 = 2
                 LA34_0 = self.input.LA(1)
@@ -3300,7 +3348,7 @@ class CLexer(Lexer):
 
 
                 if alt34 == 1:
-                    # C.g:574:12: ~ ( '\\n' | '\\r' )
+                    # C.g:578:12: ~ ( '\\n' | '\\r' )
                     if (u'\u0000' <= self.input.LA(1) <= u'\t') or (u'\u000B' <= self.input.LA(1) <= u'\f') or (u'\u000E' <= self.input.LA(1) <= u'\uFFFE'):
                         self.input.consume();
 
@@ -3316,14 +3364,14 @@ class CLexer(Lexer):
                     break #loop34
 
 
-            # C.g:574:26: ( '\\r' )?
+            # C.g:578:26: ( '\\r' )?
             alt35 = 2
             LA35_0 = self.input.LA(1)
 
             if (LA35_0 == u'\r') :
                 alt35 = 1
             if alt35 == 1:
-                # C.g:574:26: '\\r'
+                # C.g:578:26: '\\r'
                 self.match(u'\r')
 
 
@@ -3352,11 +3400,11 @@ class CLexer(Lexer):
         try:
             self.type = LINE_COMMAND
 
-            # C.g:579:5: ( '#' (~ ( '\\n' | '\\r' ) )* ( '\\r' )? '\\n' )
-            # C.g:579:7: '#' (~ ( '\\n' | '\\r' ) )* ( '\\r' )? '\\n'
+            # C.g:583:5: ( '#' (~ ( '\\n' | '\\r' ) )* ( '\\r' )? '\\n' )
+            # C.g:583:7: '#' (~ ( '\\n' | '\\r' ) )* ( '\\r' )? '\\n'
             self.match(u'#')
 
-            # C.g:579:11: (~ ( '\\n' | '\\r' ) )*
+            # C.g:583:11: (~ ( '\\n' | '\\r' ) )*
             while True: #loop36
                 alt36 = 2
                 LA36_0 = self.input.LA(1)
@@ -3366,7 +3414,7 @@ class CLexer(Lexer):
 
 
                 if alt36 == 1:
-                    # C.g:579:11: ~ ( '\\n' | '\\r' )
+                    # C.g:583:11: ~ ( '\\n' | '\\r' )
                     if (u'\u0000' <= self.input.LA(1) <= u'\t') or (u'\u000B' <= self.input.LA(1) <= u'\f') or (u'\u000E' <= self.input.LA(1) <= u'\uFFFE'):
                         self.input.consume();
 
@@ -3382,14 +3430,14 @@ class CLexer(Lexer):
                     break #loop36
 
 
-            # C.g:579:25: ( '\\r' )?
+            # C.g:583:25: ( '\\r' )?
             alt37 = 2
             LA37_0 = self.input.LA(1)
 
             if (LA37_0 == u'\r') :
                 alt37 = 1
             if alt37 == 1:
-                # C.g:579:25: '\\r'
+                # C.g:583:25: '\\r'
                 self.match(u'\r')
 
 
@@ -3413,8 +3461,8 @@ class CLexer(Lexer):
 
 
     def mTokens(self):
-        # C.g:1:8: ( T25 | T26 | T27 | T28 | T29 | T30 | T31 | T32 | T33 | T34 | T35 | T36 | T37 | T38 | T39 | T40 | T41 | T42 | T43 | T44 | T45 | T46 | T47 | T48 | T49 | T50 | T51 | T52 | T53 | T54 | T55 | T56 | T57 | T58 | T59 | T60 | T61 | T62 | T63 | T64 | T65 | T66 | T67 | T68 | T69 | T70 | T71 | T72 | T73 | T74 | T75 | T76 | T77 | T78 | T79 | T80 | T81 | T82 | T83 | T84 | T85 | T86 | T87 | T88 | T89 | T90 | T91 | T92 | T93 | T94 | T95 | T96 | T97 | T98 | T99 | T100 | T101 | T102 | T103 | T104 | T105 | T106 | T107 | IDENTIFIER | CHARACTER_LITERAL | STRING_LITERAL | HEX_LITERAL | DECIMAL_LITERAL | OCTAL_LITERAL | FLOATING_POINT_LITERAL | WS | BS | UnicodeVocabulary | COMMENT | LINE_COMMENT | LINE_COMMAND )
-        alt38 = 96
+        # C.g:1:8: ( T25 | T26 | T27 | T28 | T29 | T30 | T31 | T32 | T33 | T34 | T35 | T36 | T37 | T38 | T39 | T40 | T41 | T42 | T43 | T44 | T45 | T46 | T47 | T48 | T49 | T50 | T51 | T52 | T53 | T54 | T55 | T56 | T57 | T58 | T59 | T60 | T61 | T62 | T63 | T64 | T65 | T66 | T67 | T68 | T69 | T70 | T71 | T72 | T73 | T74 | T75 | T76 | T77 | T78 | T79 | T80 | T81 | T82 | T83 | T84 | T85 | T86 | T87 | T88 | T89 | T90 | T91 | T92 | T93 | T94 | T95 | T96 | T97 | T98 | T99 | T100 | T101 | T102 | T103 | T104 | T105 | T106 | T107 | T108 | T109 | IDENTIFIER | CHARACTER_LITERAL | STRING_LITERAL | HEX_LITERAL | DECIMAL_LITERAL | OCTAL_LITERAL | FLOATING_POINT_LITERAL | WS | BS | UnicodeVocabulary | COMMENT | LINE_COMMENT | LINE_COMMAND )
+        alt38 = 98
         alt38 = self.dfa38.predict(self.input)
         if alt38 == 1:
             # C.g:1:10: T25
@@ -3915,79 +3963,91 @@ class CLexer(Lexer):
 
 
         elif alt38 == 84:
-            # C.g:1:350: IDENTIFIER
-            self.mIDENTIFIER()
+            # C.g:1:350: T108
+            self.mT108()
 
 
 
         elif alt38 == 85:
-            # C.g:1:361: CHARACTER_LITERAL
-            self.mCHARACTER_LITERAL()
+            # C.g:1:355: T109
+            self.mT109()
 
 
 
         elif alt38 == 86:
-            # C.g:1:379: STRING_LITERAL
-            self.mSTRING_LITERAL()
+            # C.g:1:360: IDENTIFIER
+            self.mIDENTIFIER()
 
 
 
         elif alt38 == 87:
-            # C.g:1:394: HEX_LITERAL
-            self.mHEX_LITERAL()
+            # C.g:1:371: CHARACTER_LITERAL
+            self.mCHARACTER_LITERAL()
 
 
 
         elif alt38 == 88:
-            # C.g:1:406: DECIMAL_LITERAL
-            self.mDECIMAL_LITERAL()
+            # C.g:1:389: STRING_LITERAL
+            self.mSTRING_LITERAL()
 
 
 
         elif alt38 == 89:
-            # C.g:1:422: OCTAL_LITERAL
-            self.mOCTAL_LITERAL()
+            # C.g:1:404: HEX_LITERAL
+            self.mHEX_LITERAL()
 
 
 
         elif alt38 == 90:
-            # C.g:1:436: FLOATING_POINT_LITERAL
-            self.mFLOATING_POINT_LITERAL()
+            # C.g:1:416: DECIMAL_LITERAL
+            self.mDECIMAL_LITERAL()
 
 
 
         elif alt38 == 91:
-            # C.g:1:459: WS
-            self.mWS()
+            # C.g:1:432: OCTAL_LITERAL
+            self.mOCTAL_LITERAL()
 
 
 
         elif alt38 == 92:
-            # C.g:1:462: BS
-            self.mBS()
+            # C.g:1:446: FLOATING_POINT_LITERAL
+            self.mFLOATING_POINT_LITERAL()
 
 
 
         elif alt38 == 93:
-            # C.g:1:465: UnicodeVocabulary
-            self.mUnicodeVocabulary()
+            # C.g:1:469: WS
+            self.mWS()
 
 
 
         elif alt38 == 94:
-            # C.g:1:483: COMMENT
-            self.mCOMMENT()
+            # C.g:1:472: BS
+            self.mBS()
 
 
 
         elif alt38 == 95:
-            # C.g:1:491: LINE_COMMENT
-            self.mLINE_COMMENT()
+            # C.g:1:475: UnicodeVocabulary
+            self.mUnicodeVocabulary()
 
 
 
         elif alt38 == 96:
-            # C.g:1:504: LINE_COMMAND
+            # C.g:1:493: COMMENT
+            self.mCOMMENT()
+
+
+
+        elif alt38 == 97:
+            # C.g:1:501: LINE_COMMENT
+            self.mLINE_COMMENT()
+
+
+
+        elif alt38 == 98:
+            # C.g:1:514: LINE_COMMAND
             self.mLINE_COMMAND()
 
 
@@ -4008,15 +4068,15 @@ class CLexer(Lexer):
         )
 
     DFA28_min = DFA.unpack(
-        u"\2\56\2\uffff\1\53\1\uffff\2\60\2\uffff"
+        u"\2\56\1\uffff\1\53\2\uffff\2\60\2\uffff"
         )
 
     DFA28_max = DFA.unpack(
-        u"\1\71\1\146\2\uffff\1\71\1\uffff\1\71\1\146\2\uffff"
+        u"\1\71\1\146\1\uffff\1\71\2\uffff\1\71\1\146\2\uffff"
         )
 
     DFA28_accept = DFA.unpack(
-        u"\2\uffff\1\2\1\1\1\uffff\1\4\2\uffff\2\3"
+        u"\2\uffff\1\2\1\uffff\1\4\1\1\2\uffff\2\3"
         )
 
     DFA28_special = DFA.unpack(
@@ -4026,12 +4086,12 @@ class CLexer(Lexer):
             
     DFA28_transition = [
         DFA.unpack(u"\1\2\1\uffff\12\1"),
-        DFA.unpack(u"\1\3\1\uffff\12\1\12\uffff\1\5\1\4\1\5\35\uffff\1\5"
-        u"\1\4\1\5"),
-        DFA.unpack(u""),
+        DFA.unpack(u"\1\5\1\uffff\12\1\12\uffff\1\4\1\3\1\4\35\uffff\1\4"
+        u"\1\3\1\4"),
         DFA.unpack(u""),
         DFA.unpack(u"\1\6\1\uffff\1\6\2\uffff\12\7"),
         DFA.unpack(u""),
+        DFA.unpack(u""),
         DFA.unpack(u"\12\7"),
         DFA.unpack(u"\12\7\12\uffff\1\11\1\uffff\1\11\35\uffff\1\11\1\uffff"
         u"\1\11"),
@@ -4045,198 +4105,206 @@ class CLexer(Lexer):
     # lookup tables for DFA #38
 
     DFA38_eot = DFA.unpack(
-        u"\2\uffff\1\70\1\uffff\1\73\14\70\3\uffff\3\70\4\uffff\1\136\1\141"
-        u"\1\144\1\150\1\154\1\156\1\161\1\uffff\1\164\1\167\1\172\1\174"
-        u"\1\177\1\uffff\4\70\1\uffff\2\65\2\u0087\2\uffff\1\65\2\uffff\1"
-        u"\70\4\uffff\16\70\1\u00a0\4\70\1\u00a6\2\70\3\uffff\1\u00aa\3\70"
-        u"\34\uffff\1\u00af\2\uffff\1\u00b1\10\uffff\3\70\4\uffff\1\u00b5"
-        u"\1\u0087\3\uffff\23\70\1\uffff\1\u00ca\2\70\1\u00cd\1\70\1\uffff"
-        u"\3\70\1\uffff\1\u00d2\2\70\4\uffff\3\70\1\uffff\1\70\1\u00d9\1"
-        u"\70\1\u00db\6\70\1\u00e2\4\70\1\u00e7\1\u00e8\2\70\1\u00eb\1\uffff"
-        u"\1\u00ec\1\70\1\uffff\4\70\1\uffff\3\70\1\u00f5\2\70\1\uffff\1"
-        u"\70\1\uffff\2\70\1\u00fb\3\70\1\uffff\4\70\2\uffff\1\70\1\u0104"
-        u"\2\uffff\1\u0105\2\70\1\u0108\3\70\1\u010c\1\uffff\1\u010d\1\70"
-        u"\1\u010f\1\u0110\1\u0111\1\uffff\1\u0112\1\u0113\1\u0114\1\70\1"
-        u"\u0116\1\u0117\2\70\2\uffff\1\u011a\1\70\1\uffff\2\70\1\u011e\2"
-        u"\uffff\1\u011f\6\uffff\1\70\2\uffff\2\70\1\uffff\1\u0123\2\70\2"
-        u"\uffff\1\u0126\1\u0127\1\u0128\1\uffff\1\u0129\1\u012a\5\uffff"
+        u"\2\uffff\1\72\1\uffff\1\75\15\72\3\uffff\4\72\4\uffff\1\142\1\145"
+        u"\1\150\1\154\1\160\1\162\1\165\1\uffff\1\170\1\173\1\176\1\u0080"
+        u"\1\u0083\1\uffff\4\72\1\uffff\2\67\2\u008c\2\uffff\1\67\2\uffff"
+        u"\1\72\4\uffff\16\72\1\u00a4\4\72\1\u00aa\3\72\3\uffff\1\u00af\4"
+        u"\72\34\uffff\1\u00b5\3\uffff\1\u00b7\7\uffff\3\72\3\uffff\1\u00bb"
+        u"\1\uffff\1\u008c\3\uffff\23\72\1\uffff\1\u00d0\2\72\1\u00d3\1\72"
+        u"\1\uffff\4\72\1\uffff\1\u00d9\3\72\4\uffff\3\72\1\uffff\1\72\1"
+        u"\u00e1\1\u00e2\7\72\1\u00ea\4\72\1\u00ef\2\72\1\u00f2\1\u00f3\1"
+        u"\uffff\1\u00f4\1\72\1\uffff\5\72\1\uffff\4\72\1\u00ff\2\72\2\uffff"
+        u"\5\72\1\u0107\1\72\1\uffff\4\72\1\uffff\1\u010d\1\72\3\uffff\1"
+        u"\u010f\2\72\1\u0112\3\72\1\u0116\1\72\1\u0118\1\uffff\1\u0119\1"
+        u"\72\1\u011b\1\u011c\1\u011d\1\u011e\1\u011f\1\uffff\1\u0120\1\72"
+        u"\1\u0122\1\u0123\1\72\1\uffff\1\72\1\uffff\1\u0126\1\72\1\uffff"
+        u"\3\72\1\uffff\1\u012b\2\uffff\1\u012c\6\uffff\1\72\2\uffff\2\72"
+        u"\1\uffff\1\u0130\1\72\1\u0132\1\72\2\uffff\1\u0134\1\u0135\1\u0136"
+        u"\1\uffff\1\u0137\1\uffff\1\u0138\5\uffff"
         )
 
     DFA38_eof = DFA.unpack(
-        u"\u012b\uffff"
+        u"\u0139\uffff"
         )
 
     DFA38_min = DFA.unpack(
         u"\1\3\1\uffff\1\171\1\uffff\1\75\1\154\1\150\1\165\1\145\1\124\1"
-        u"\157\1\141\1\146\1\157\1\154\1\145\1\156\3\uffff\1\116\1\120\1"
-        u"\106\4\uffff\1\75\1\56\1\53\1\55\1\52\1\75\1\46\1\uffff\1\75\1"
-        u"\74\3\75\1\uffff\1\150\1\157\1\162\1\42\1\uffff\2\0\2\56\2\uffff"
-        u"\1\0\2\uffff\1\160\4\uffff\1\165\1\164\1\163\1\141\1\157\1\151"
-        u"\1\147\1\164\1\147\1\101\1\151\1\163\1\156\1\141\1\44\1\164\1\156"
-        u"\1\157\1\162\1\44\1\146\1\151\3\uffff\1\44\2\124\1\111\34\uffff"
-        u"\1\75\2\uffff\1\75\10\uffff\1\151\1\164\1\145\4\uffff\2\56\3\uffff"
-        u"\1\145\1\155\2\145\1\165\1\164\1\162\1\164\1\156\1\145\1\157\1"
-        u"\151\1\165\1\124\1\141\1\144\1\145\1\163\1\162\1\uffff\1\44\1\147"
-        u"\1\141\1\44\1\142\1\uffff\1\141\1\157\1\151\1\uffff\1\44\1\111"
-        u"\1\101\4\uffff\1\154\1\157\1\141\1\uffff\1\144\1\44\1\162\1\44"
-        u"\1\143\1\151\1\164\1\143\1\145\1\157\1\44\1\163\1\162\1\111\1\164"
-        u"\2\44\1\151\1\164\1\44\1\uffff\1\44\1\164\1\uffff\1\154\1\165\1"
-        u"\156\1\147\1\uffff\1\117\1\120\1\145\1\44\1\153\1\145\1\uffff\1"
-        u"\156\1\uffff\1\164\1\143\1\44\1\150\1\144\1\146\1\uffff\1\164\1"
-        u"\156\1\103\1\151\2\uffff\1\156\1\44\2\uffff\1\44\1\145\1\154\1"
-        u"\44\1\156\1\116\1\111\1\44\1\uffff\1\44\1\146\3\44\1\uffff\3\44"
-        u"\1\145\2\44\1\154\1\165\2\uffff\1\44\1\164\1\uffff\1\145\1\101"
+        u"\157\1\141\1\146\1\157\1\154\1\145\1\156\1\117\3\uffff\1\116\1"
+        u"\120\1\117\1\106\4\uffff\1\75\1\56\1\53\1\55\1\52\1\75\1\46\1\uffff"
+        u"\1\75\1\74\3\75\1\uffff\1\150\1\157\1\162\1\42\1\uffff\2\0\2\56"
+        u"\2\uffff\1\0\2\uffff\1\160\4\uffff\1\165\1\163\1\164\1\141\1\147"
+        u"\1\157\1\151\1\164\1\147\1\101\1\151\1\156\1\163\1\141\1\44\1\164"
+        u"\1\156\1\157\1\162\1\44\1\146\1\151\1\117\3\uffff\1\44\2\124\1"
+        u"\116\1\111\34\uffff\1\75\3\uffff\1\75\7\uffff\1\151\1\164\1\145"
+        u"\3\uffff\1\56\1\uffff\1\56\3\uffff\1\145\1\155\2\145\1\164\1\165"
+        u"\1\156\1\145\1\162\1\164\1\157\1\151\1\165\1\124\1\141\1\144\1"
+        u"\163\1\145\1\162\1\uffff\1\44\1\147\1\141\1\44\1\142\1\uffff\1"
+        u"\141\1\157\1\151\1\114\1\uffff\1\44\1\111\1\123\1\101\4\uffff\1"
+        u"\154\1\157\1\141\1\uffff\1\144\2\44\1\162\1\151\1\143\1\145\1\157"
+        u"\1\164\1\143\1\44\1\163\1\162\1\111\1\164\1\44\1\164\1\151\2\44"
+        u"\1\uffff\1\44\1\164\1\uffff\1\154\1\165\1\156\1\147\1\105\1\uffff"
+        u"\1\117\1\124\1\120\1\145\1\44\1\153\1\145\2\uffff\1\156\1\143\1"
+        u"\164\1\144\1\146\1\44\1\150\1\uffff\1\164\1\156\1\103\1\151\1\uffff"
+        u"\1\44\1\156\3\uffff\1\44\1\145\1\154\1\44\1\156\1\101\1\116\1\44"
+        u"\1\111\1\44\1\uffff\1\44\1\146\5\44\1\uffff\1\44\1\145\2\44\1\154"
+        u"\1\uffff\1\165\1\uffff\1\44\1\164\1\uffff\1\145\1\116\1\101\1\uffff"
         u"\1\44\2\uffff\1\44\6\uffff\1\162\2\uffff\2\145\1\uffff\1\44\1\144"
-        u"\1\114\2\uffff\3\44\1\uffff\2\44\5\uffff"
+        u"\1\44\1\114\2\uffff\3\44\1\uffff\1\44\1\uffff\1\44\5\uffff"
         )
 
     DFA38_max = DFA.unpack(
         u"\1\ufffe\1\uffff\1\171\1\uffff\1\75\1\170\1\167\1\165\1\145\1\124"
-        u"\2\157\1\156\3\157\1\156\3\uffff\1\116\1\125\1\106\4\uffff\1\75"
-        u"\1\71\1\75\1\76\3\75\1\uffff\2\75\1\76\1\75\1\174\1\uffff\1\150"
-        u"\1\157\1\162\1\47\1\uffff\2\ufffe\1\170\1\146\2\uffff\1\ufffe\2"
-        u"\uffff\1\160\4\uffff\1\165\1\164\1\163\1\162\1\157\1\151\1\172"
-        u"\2\164\1\101\1\154\1\163\1\156\1\141\1\172\1\164\1\156\1\157\1"
-        u"\162\1\172\1\146\1\163\3\uffff\1\172\2\124\1\111\34\uffff\1\75"
-        u"\2\uffff\1\75\10\uffff\1\151\1\164\1\145\4\uffff\2\146\3\uffff"
-        u"\1\145\1\155\2\145\1\165\1\164\1\162\1\164\1\156\1\145\1\157\1"
-        u"\151\1\165\1\124\1\141\1\144\1\145\1\164\1\162\1\uffff\1\172\1"
-        u"\147\1\141\1\172\1\142\1\uffff\1\141\1\157\1\151\1\uffff\1\172"
-        u"\1\111\1\101\4\uffff\1\154\1\157\1\141\1\uffff\1\144\1\172\1\162"
-        u"\1\172\1\143\1\151\1\164\1\143\1\145\1\157\1\172\1\163\1\162\1"
-        u"\111\1\164\2\172\1\151\1\164\1\172\1\uffff\1\172\1\164\1\uffff"
-        u"\1\154\1\165\1\156\1\147\1\uffff\1\117\1\120\1\145\1\172\1\153"
-        u"\1\145\1\uffff\1\156\1\uffff\1\164\1\143\1\172\1\150\1\144\1\146"
-        u"\1\uffff\1\164\1\156\1\103\1\151\2\uffff\1\156\1\172\2\uffff\1"
-        u"\172\1\145\1\154\1\172\1\156\1\116\1\111\1\172\1\uffff\1\172\1"
-        u"\146\3\172\1\uffff\3\172\1\145\2\172\1\154\1\165\2\uffff\1\172"
-        u"\1\164\1\uffff\1\145\1\101\1\172\2\uffff\1\172\6\uffff\1\162\2"
-        u"\uffff\2\145\1\uffff\1\172\1\144\1\114\2\uffff\3\172\1\uffff\2"
-        u"\172\5\uffff"
+        u"\2\157\1\156\3\157\1\156\1\117\3\uffff\1\116\1\125\1\117\1\106"
+        u"\4\uffff\1\75\1\71\1\75\1\76\3\75\1\uffff\2\75\1\76\1\75\1\174"
+        u"\1\uffff\1\150\1\157\1\162\1\47\1\uffff\2\ufffe\1\170\1\146\2\uffff"
+        u"\1\ufffe\2\uffff\1\160\4\uffff\1\165\1\163\1\164\1\162\1\172\1"
+        u"\157\1\151\2\164\1\101\1\154\1\156\1\163\1\141\1\172\1\164\1\156"
+        u"\1\157\1\162\1\172\1\146\1\163\1\117\3\uffff\1\172\2\124\1\116"
+        u"\1\111\34\uffff\1\75\3\uffff\1\75\7\uffff\1\151\1\164\1\145\3\uffff"
+        u"\1\146\1\uffff\1\146\3\uffff\1\145\1\155\2\145\1\164\1\165\1\156"
+        u"\1\145\1\162\1\164\1\157\1\151\1\165\1\124\1\141\1\144\1\164\1"
+        u"\145\1\162\1\uffff\1\172\1\147\1\141\1\172\1\142\1\uffff\1\141"
+        u"\1\157\1\151\1\114\1\uffff\1\172\1\111\1\123\1\101\4\uffff\1\154"
+        u"\1\157\1\141\1\uffff\1\144\2\172\1\162\1\151\1\143\1\145\1\157"
+        u"\1\164\1\143\1\172\1\163\1\162\1\111\1\164\1\172\1\164\1\151\2"
+        u"\172\1\uffff\1\172\1\164\1\uffff\1\154\1\165\1\156\1\147\1\105"
+        u"\1\uffff\1\117\1\124\1\120\1\145\1\172\1\153\1\145\2\uffff\1\156"
+        u"\1\143\1\164\1\144\1\146\1\172\1\150\1\uffff\1\164\1\156\1\103"
+        u"\1\151\1\uffff\1\172\1\156\3\uffff\1\172\1\145\1\154\1\172\1\156"
+        u"\1\101\1\116\1\172\1\111\1\172\1\uffff\1\172\1\146\5\172\1\uffff"
+        u"\1\172\1\145\2\172\1\154\1\uffff\1\165\1\uffff\1\172\1\164\1\uffff"
+        u"\1\145\1\116\1\101\1\uffff\1\172\2\uffff\1\172\6\uffff\1\162\2"
+        u"\uffff\2\145\1\uffff\1\172\1\144\1\172\1\114\2\uffff\3\172\1\uffff"
+        u"\1\172\1\uffff\1\172\5\uffff"
         )
 
     DFA38_accept = DFA.unpack(
-        u"\1\uffff\1\1\1\uffff\1\3\15\uffff\1\23\1\24\1\27\3\uffff\1\37\1"
-        u"\40\1\41\1\42\7\uffff\1\57\5\uffff\1\73\4\uffff\1\124\4\uffff\1"
-        u"\133\1\134\1\uffff\1\135\1\1\1\uffff\1\124\1\3\1\100\1\4\26\uffff"
-        u"\1\23\1\24\1\27\4\uffff\1\37\1\40\1\41\1\42\1\61\1\43\1\44\1\132"
-        u"\1\54\1\64\1\51\1\45\1\52\1\65\1\55\1\46\1\136\1\62\1\137\1\47"
-        u"\1\63\1\50\1\70\1\75\1\56\1\57\1\101\1\60\1\uffff\1\104\1\102\1"
-        u"\uffff\1\105\1\103\1\71\1\77\1\74\1\72\1\76\1\73\3\uffff\1\125"
-        u"\1\126\1\127\1\130\2\uffff\1\133\1\134\1\140\23\uffff\1\112\5\uffff"
-        u"\1\116\3\uffff\1\33\3\uffff\1\66\1\106\1\67\1\107\3\uffff\1\131"
-        u"\24\uffff\1\15\2\uffff\1\117\4\uffff\1\34\6\uffff\1\30\1\uffff"
-        u"\1\113\6\uffff\1\7\4\uffff\1\12\1\110\2\uffff\1\13\1\16\10\uffff"
-        u"\1\120\5\uffff\1\14\10\uffff\1\31\1\17\2\uffff\1\26\3\uffff\1\115"
-        u"\1\122\1\uffff\1\5\1\25\1\6\1\114\1\21\1\53\1\uffff\1\123\1\11"
-        u"\2\uffff\1\20\3\uffff\1\36\1\2\3\uffff\1\111\2\uffff\1\10\1\32"
-        u"\1\121\1\22\1\35"
+        u"\1\uffff\1\1\1\uffff\1\3\16\uffff\1\24\1\25\1\30\4\uffff\1\41\1"
+        u"\42\1\43\1\44\7\uffff\1\61\5\uffff\1\75\4\uffff\1\126\4\uffff\1"
+        u"\135\1\136\1\uffff\1\137\1\1\1\uffff\1\126\1\3\1\102\1\4\27\uffff"
+        u"\1\24\1\25\1\30\5\uffff\1\41\1\42\1\43\1\44\1\63\1\45\1\46\1\134"
+        u"\1\56\1\53\1\66\1\47\1\57\1\54\1\67\1\50\1\64\1\140\1\141\1\51"
+        u"\1\65\1\52\1\77\1\72\1\60\1\61\1\103\1\62\1\uffff\1\106\1\104\1"
+        u"\107\1\uffff\1\105\1\73\1\101\1\76\1\74\1\100\1\75\3\uffff\1\130"
+        u"\1\127\1\131\1\uffff\1\132\1\uffff\1\135\1\136\1\142\23\uffff\1"
+        u"\114\5\uffff\1\120\4\uffff\1\34\4\uffff\1\70\1\110\1\71\1\111\3"
+        u"\uffff\1\133\24\uffff\1\15\2\uffff\1\121\5\uffff\1\35\7\uffff\1"
+        u"\31\1\115\7\uffff\1\7\4\uffff\1\12\2\uffff\1\112\1\13\1\16\12\uffff"
+        u"\1\122\7\uffff\1\14\5\uffff\1\32\1\uffff\1\17\2\uffff\1\27\3\uffff"
+        u"\1\37\1\uffff\1\117\1\124\1\uffff\1\5\1\6\1\26\1\21\1\55\1\116"
+        u"\1\uffff\1\125\1\11\2\uffff\1\20\4\uffff\1\40\1\2\3\uffff\1\113"
+        u"\1\uffff\1\23\1\uffff\1\10\1\33\1\123\1\22\1\36"
         )
 
     DFA38_special = DFA.unpack(
-        u"\u012b\uffff"
+        u"\u0139\uffff"
         )
 
             
     DFA38_transition = [
-        DFA.unpack(u"\6\65\2\62\1\65\2\62\22\65\1\62\1\43\1\57\1\64\1\55"
-        u"\1\40\1\41\1\56\1\27\1\30\1\33\1\35\1\3\1\36\1\34\1\37\1\60\11"
-        u"\61\1\23\1\1\1\44\1\4\1\45\1\50\1\65\4\55\1\26\3\55\1\24\2\55\1"
-        u"\54\2\55\1\25\3\55\1\11\7\55\1\31\1\63\1\32\1\46\1\55\1\65\1\7"
-        u"\1\53\1\13\1\17\1\5\1\16\1\52\1\55\1\14\2\55\1\15\5\55\1\10\1\6"
-        u"\1\2\1\20\1\12\1\51\3\55\1\21\1\47\1\22\1\42\uff80\65"),
+        DFA.unpack(u"\6\67\2\64\1\67\2\64\22\67\1\64\1\45\1\61\1\66\1\57"
+        u"\1\42\1\43\1\60\1\31\1\32\1\35\1\37\1\3\1\40\1\36\1\41\1\62\11"
+        u"\63\1\24\1\1\1\46\1\4\1\47\1\52\1\67\1\57\1\21\1\27\1\57\1\30\3"
+        u"\57\1\25\2\57\1\56\2\57\1\26\3\57\1\11\7\57\1\33\1\65\1\34\1\50"
+        u"\1\57\1\67\1\7\1\55\1\13\1\17\1\5\1\16\1\54\1\57\1\14\2\57\1\15"
+        u"\5\57\1\10\1\6\1\2\1\20\1\12\1\53\3\57\1\22\1\51\1\23\1\44\uff80"
+        u"\67"),
         DFA.unpack(u""),
-        DFA.unpack(u"\1\67"),
+        DFA.unpack(u"\1\71"),
         DFA.unpack(u""),
-        DFA.unpack(u"\1\72"),
-        DFA.unpack(u"\1\76\1\uffff\1\74\11\uffff\1\75"),
-        DFA.unpack(u"\1\100\1\102\12\uffff\1\77\2\uffff\1\101"),
-        DFA.unpack(u"\1\103"),
-        DFA.unpack(u"\1\104"),
+        DFA.unpack(u"\1\74"),
+        DFA.unpack(u"\1\77\1\uffff\1\76\11\uffff\1\100"),
+        DFA.unpack(u"\1\103\1\102\12\uffff\1\101\2\uffff\1\104"),
         DFA.unpack(u"\1\105"),
         DFA.unpack(u"\1\106"),
-        DFA.unpack(u"\1\107\6\uffff\1\111\6\uffff\1\110"),
-        DFA.unpack(u"\1\112\7\uffff\1\113"),
-        DFA.unpack(u"\1\114"),
-        DFA.unpack(u"\1\115\2\uffff\1\116"),
-        DFA.unpack(u"\1\120\11\uffff\1\117"),
-        DFA.unpack(u"\1\121"),
+        DFA.unpack(u"\1\107"),
+        DFA.unpack(u"\1\110"),
+        DFA.unpack(u"\1\112\6\uffff\1\113\6\uffff\1\111"),
+        DFA.unpack(u"\1\114\7\uffff\1\115"),
+        DFA.unpack(u"\1\116"),
+        DFA.unpack(u"\1\117\2\uffff\1\120"),
+        DFA.unpack(u"\1\122\11\uffff\1\121"),
+        DFA.unpack(u"\1\123"),
+        DFA.unpack(u"\1\124"),
         DFA.unpack(u""),
         DFA.unpack(u""),
         DFA.unpack(u""),
-        DFA.unpack(u"\1\125"),
-        DFA.unpack(u"\1\127\4\uffff\1\126"),
         DFA.unpack(u"\1\130"),
+        DFA.unpack(u"\1\132\4\uffff\1\131"),
+        DFA.unpack(u"\1\133"),
+        DFA.unpack(u"\1\134"),
         DFA.unpack(u""),
         DFA.unpack(u""),
         DFA.unpack(u""),
         DFA.unpack(u""),
-        DFA.unpack(u"\1\135"),
-        DFA.unpack(u"\1\137\1\uffff\12\140"),
-        DFA.unpack(u"\1\143\21\uffff\1\142"),
-        DFA.unpack(u"\1\145\17\uffff\1\146\1\147"),
-        DFA.unpack(u"\1\151\4\uffff\1\153\15\uffff\1\152"),
-        DFA.unpack(u"\1\155"),
-        DFA.unpack(u"\1\160\26\uffff\1\157"),
+        DFA.unpack(u"\1\141"),
+        DFA.unpack(u"\1\143\1\uffff\12\144"),
+        DFA.unpack(u"\1\146\21\uffff\1\147"),
+        DFA.unpack(u"\1\152\17\uffff\1\153\1\151"),
+        DFA.unpack(u"\1\156\4\uffff\1\157\15\uffff\1\155"),
+        DFA.unpack(u"\1\161"),
+        DFA.unpack(u"\1\163\26\uffff\1\164"),
         DFA.unpack(u""),
-        DFA.unpack(u"\1\163"),
-        DFA.unpack(u"\1\165\1\166"),
-        DFA.unpack(u"\1\171\1\170"),
-        DFA.unpack(u"\1\173"),
-        DFA.unpack(u"\1\176\76\uffff\1\175"),
+        DFA.unpack(u"\1\167"),
+        DFA.unpack(u"\1\171\1\172"),
+        DFA.unpack(u"\1\174\1\175"),
+        DFA.unpack(u"\1\177"),
+        DFA.unpack(u"\1\u0082\76\uffff\1\u0081"),
         DFA.unpack(u""),
-        DFA.unpack(u"\1\u0081"),
-        DFA.unpack(u"\1\u0082"),
-        DFA.unpack(u"\1\u0083"),
-        DFA.unpack(u"\1\u0085\4\uffff\1\u0084"),
+        DFA.unpack(u"\1\u0085"),
+        DFA.unpack(u"\1\u0086"),
+        DFA.unpack(u"\1\u0087"),
+        DFA.unpack(u"\1\u0088\4\uffff\1\u0089"),
         DFA.unpack(u""),
-        DFA.unpack(u"\47\u0084\1\uffff\uffd7\u0084"),
-        DFA.unpack(u"\uffff\u0085"),
-        DFA.unpack(u"\1\140\1\uffff\10\u0088\2\140\12\uffff\3\140\21\uffff"
-        u"\1\u0086\13\uffff\3\140\21\uffff\1\u0086"),
-        DFA.unpack(u"\1\140\1\uffff\12\u0089\12\uffff\3\140\35\uffff\3\140"),
+        DFA.unpack(u"\47\u0089\1\uffff\uffd7\u0089"),
+        DFA.unpack(u"\uffff\u0088"),
+        DFA.unpack(u"\1\144\1\uffff\10\u008b\2\144\12\uffff\3\144\21\uffff"
+        u"\1\u008a\13\uffff\3\144\21\uffff\1\u008a"),
+        DFA.unpack(u"\1\144\1\uffff\12\u008d\12\uffff\3\144\35\uffff\3\144"),
         DFA.unpack(u""),
         DFA.unpack(u""),
-        DFA.unpack(u"\uffff\u008c"),
+        DFA.unpack(u"\uffff\u0090"),
         DFA.unpack(u""),
         DFA.unpack(u""),
-        DFA.unpack(u"\1\u008d"),
+        DFA.unpack(u"\1\u0091"),
         DFA.unpack(u""),
         DFA.unpack(u""),
         DFA.unpack(u""),
         DFA.unpack(u""),
-        DFA.unpack(u"\1\u008e"),
-        DFA.unpack(u"\1\u008f"),
-        DFA.unpack(u"\1\u0090"),
-        DFA.unpack(u"\1\u0092\20\uffff\1\u0091"),
+        DFA.unpack(u"\1\u0092"),
         DFA.unpack(u"\1\u0093"),
         DFA.unpack(u"\1\u0094"),
-        DFA.unpack(u"\1\u0095\22\uffff\1\u0096"),
-        DFA.unpack(u"\1\u0097"),
-        DFA.unpack(u"\1\u0098\14\uffff\1\u0099"),
+        DFA.unpack(u"\1\u0095\20\uffff\1\u0096"),
+        DFA.unpack(u"\1\u0097\22\uffff\1\u0098"),
+        DFA.unpack(u"\1\u0099"),
         DFA.unpack(u"\1\u009a"),
-        DFA.unpack(u"\1\u009c\2\uffff\1\u009b"),
-        DFA.unpack(u"\1\u009d"),
+        DFA.unpack(u"\1\u009b"),
+        DFA.unpack(u"\1\u009c\14\uffff\1\u009d"),
         DFA.unpack(u"\1\u009e"),
-        DFA.unpack(u"\1\u009f"),
-        DFA.unpack(u"\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff"
-        u"\32\70"),
+        DFA.unpack(u"\1\u00a0\2\uffff\1\u009f"),
         DFA.unpack(u"\1\u00a1"),
         DFA.unpack(u"\1\u00a2"),
         DFA.unpack(u"\1\u00a3"),
-        DFA.unpack(u"\1\u00a4"),
-        DFA.unpack(u"\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff"
-        u"\24\70\1\u00a5\5\70"),
+        DFA.unpack(u"\1\72\13\uffff\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff"
+        u"\32\72"),
+        DFA.unpack(u"\1\u00a5"),
+        DFA.unpack(u"\1\u00a6"),
         DFA.unpack(u"\1\u00a7"),
-        DFA.unpack(u"\1\u00a8\11\uffff\1\u00a9"),
+        DFA.unpack(u"\1\u00a8"),
+        DFA.unpack(u"\1\72\13\uffff\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff"
+        u"\24\72\1\u00a9\5\72"),
+        DFA.unpack(u"\1\u00ab"),
+        DFA.unpack(u"\1\u00ac\11\uffff\1\u00ad"),
+        DFA.unpack(u"\1\u00ae"),
         DFA.unpack(u""),
         DFA.unpack(u""),
         DFA.unpack(u""),
-        DFA.unpack(u"\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff"
-        u"\32\70"),
-        DFA.unpack(u"\1\u00ab"),
-        DFA.unpack(u"\1\u00ac"),
-        DFA.unpack(u"\1\u00ad"),
+        DFA.unpack(u"\1\72\13\uffff\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff"
+        u"\32\72"),
+        DFA.unpack(u"\1\u00b0"),
+        DFA.unpack(u"\1\u00b1"),
+        DFA.unpack(u"\1\u00b2"),
+        DFA.unpack(u"\1\u00b3"),
         DFA.unpack(u""),
         DFA.unpack(u""),
         DFA.unpack(u""),
@@ -4265,11 +4333,11 @@ class CLexer(Lexer):
         DFA.unpack(u""),
         DFA.unpack(u""),
         DFA.unpack(u""),
-        DFA.unpack(u"\1\u00ae"),
+        DFA.unpack(u"\1\u00b4"),
         DFA.unpack(u""),
         DFA.unpack(u""),
-        DFA.unpack(u"\1\u00b0"),
         DFA.unpack(u""),
+        DFA.unpack(u"\1\u00b6"),
         DFA.unpack(u""),
         DFA.unpack(u""),
         DFA.unpack(u""),
@@ -4277,25 +4345,19 @@ class CLexer(Lexer):
         DFA.unpack(u""),
         DFA.unpack(u""),
         DFA.unpack(u""),
-        DFA.unpack(u"\1\u00b2"),
-        DFA.unpack(u"\1\u00b3"),
-        DFA.unpack(u"\1\u00b4"),
+        DFA.unpack(u"\1\u00b8"),
+        DFA.unpack(u"\1\u00b9"),
+        DFA.unpack(u"\1\u00ba"),
         DFA.unpack(u""),
         DFA.unpack(u""),
         DFA.unpack(u""),
+        DFA.unpack(u"\1\144\1\uffff\10\u008b\2\144\12\uffff\3\144\35\uffff"
+        u"\3\144"),
         DFA.unpack(u""),
-        DFA.unpack(u"\1\140\1\uffff\10\u0088\2\140\12\uffff\3\140\35\uffff"
-        u"\3\140"),
-        DFA.unpack(u"\1\140\1\uffff\12\u0089\12\uffff\3\140\35\uffff\3\140"),
+        DFA.unpack(u"\1\144\1\uffff\12\u008d\12\uffff\3\144\35\uffff\3\144"),
         DFA.unpack(u""),
         DFA.unpack(u""),
         DFA.unpack(u""),
-        DFA.unpack(u"\1\u00b6"),
-        DFA.unpack(u"\1\u00b7"),
-        DFA.unpack(u"\1\u00b8"),
-        DFA.unpack(u"\1\u00b9"),
-        DFA.unpack(u"\1\u00ba"),
-        DFA.unpack(u"\1\u00bb"),
         DFA.unpack(u"\1\u00bc"),
         DFA.unpack(u"\1\u00bd"),
         DFA.unpack(u"\1\u00be"),
@@ -4307,176 +4369,194 @@ class CLexer(Lexer):
         DFA.unpack(u"\1\u00c4"),
         DFA.unpack(u"\1\u00c5"),
         DFA.unpack(u"\1\u00c6"),
-        DFA.unpack(u"\1\u00c8\1\u00c7"),
+        DFA.unpack(u"\1\u00c7"),
+        DFA.unpack(u"\1\u00c8"),
         DFA.unpack(u"\1\u00c9"),
-        DFA.unpack(u""),
-        DFA.unpack(u"\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff"
-        u"\32\70"),
+        DFA.unpack(u"\1\u00ca"),
         DFA.unpack(u"\1\u00cb"),
-        DFA.unpack(u"\1\u00cc"),
-        DFA.unpack(u"\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff"
-        u"\32\70"),
+        DFA.unpack(u"\1\u00cc\1\u00cd"),
         DFA.unpack(u"\1\u00ce"),
-        DFA.unpack(u""),
         DFA.unpack(u"\1\u00cf"),
-        DFA.unpack(u"\1\u00d0"),
-        DFA.unpack(u"\1\u00d1"),
         DFA.unpack(u""),
-        DFA.unpack(u"\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff"
-        u"\32\70"),
-        DFA.unpack(u"\1\u00d3"),
+        DFA.unpack(u"\1\72\13\uffff\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff"
+        u"\32\72"),
+        DFA.unpack(u"\1\u00d1"),
+        DFA.unpack(u"\1\u00d2"),
+        DFA.unpack(u"\1\72\13\uffff\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff"
+        u"\32\72"),
         DFA.unpack(u"\1\u00d4"),
         DFA.unpack(u""),
-        DFA.unpack(u""),
-        DFA.unpack(u""),
-        DFA.unpack(u""),
         DFA.unpack(u"\1\u00d5"),
         DFA.unpack(u"\1\u00d6"),
         DFA.unpack(u"\1\u00d7"),
-        DFA.unpack(u""),
         DFA.unpack(u"\1\u00d8"),
-        DFA.unpack(u"\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff"
-        u"\32\70"),
+        DFA.unpack(u""),
+        DFA.unpack(u"\1\72\13\uffff\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff"
+        u"\32\72"),
         DFA.unpack(u"\1\u00da"),
-        DFA.unpack(u"\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff"
-        u"\32\70"),
+        DFA.unpack(u"\1\u00db"),
         DFA.unpack(u"\1\u00dc"),
+        DFA.unpack(u""),
+        DFA.unpack(u""),
+        DFA.unpack(u""),
+        DFA.unpack(u""),
         DFA.unpack(u"\1\u00dd"),
         DFA.unpack(u"\1\u00de"),
         DFA.unpack(u"\1\u00df"),
+        DFA.unpack(u""),
         DFA.unpack(u"\1\u00e0"),
-        DFA.unpack(u"\1\u00e1"),
-        DFA.unpack(u"\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff"
-        u"\32\70"),
+        DFA.unpack(u"\1\72\13\uffff\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff"
+        u"\32\72"),
+        DFA.unpack(u"\1\72\13\uffff\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff"
+        u"\32\72"),
         DFA.unpack(u"\1\u00e3"),
         DFA.unpack(u"\1\u00e4"),
         DFA.unpack(u"\1\u00e5"),
         DFA.unpack(u"\1\u00e6"),
-        DFA.unpack(u"\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff"
-        u"\32\70"),
-        DFA.unpack(u"\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff"
-        u"\32\70"),
+        DFA.unpack(u"\1\u00e7"),
+        DFA.unpack(u"\1\u00e8"),
         DFA.unpack(u"\1\u00e9"),
-        DFA.unpack(u"\1\u00ea"),
-        DFA.unpack(u"\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff"
-        u"\32\70"),
-        DFA.unpack(u""),
-        DFA.unpack(u"\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff"
-        u"\32\70"),
+        DFA.unpack(u"\1\72\13\uffff\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff"
+        u"\32\72"),
+        DFA.unpack(u"\1\u00eb"),
+        DFA.unpack(u"\1\u00ec"),
         DFA.unpack(u"\1\u00ed"),
-        DFA.unpack(u""),
         DFA.unpack(u"\1\u00ee"),
-        DFA.unpack(u"\1\u00ef"),
+        DFA.unpack(u"\1\72\13\uffff\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff"
+        u"\32\72"),
         DFA.unpack(u"\1\u00f0"),
         DFA.unpack(u"\1\u00f1"),
+        DFA.unpack(u"\1\72\13\uffff\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff"
+        u"\32\72"),
+        DFA.unpack(u"\1\72\13\uffff\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff"
+        u"\32\72"),
+        DFA.unpack(u""),
+        DFA.unpack(u"\1\72\13\uffff\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff"
+        u"\32\72"),
+        DFA.unpack(u"\1\u00f5"),
         DFA.unpack(u""),
-        DFA.unpack(u"\1\u00f2"),
-        DFA.unpack(u"\1\u00f3"),
-        DFA.unpack(u"\1\u00f4"),
-        DFA.unpack(u"\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff"
-        u"\32\70"),
         DFA.unpack(u"\1\u00f6"),
         DFA.unpack(u"\1\u00f7"),
-        DFA.unpack(u""),
         DFA.unpack(u"\1\u00f8"),
-        DFA.unpack(u""),
         DFA.unpack(u"\1\u00f9"),
         DFA.unpack(u"\1\u00fa"),
-        DFA.unpack(u"\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff"
-        u"\32\70"),
+        DFA.unpack(u""),
+        DFA.unpack(u"\1\u00fb"),
         DFA.unpack(u"\1\u00fc"),
         DFA.unpack(u"\1\u00fd"),
         DFA.unpack(u"\1\u00fe"),
-        DFA.unpack(u""),
-        DFA.unpack(u"\1\u00ff"),
+        DFA.unpack(u"\1\72\13\uffff\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff"
+        u"\32\72"),
         DFA.unpack(u"\1\u0100"),
         DFA.unpack(u"\1\u0101"),
-        DFA.unpack(u"\1\u0102"),
         DFA.unpack(u""),
         DFA.unpack(u""),
+        DFA.unpack(u"\1\u0102"),
         DFA.unpack(u"\1\u0103"),
-        DFA.unpack(u"\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff"
-        u"\32\70"),
-        DFA.unpack(u""),
-        DFA.unpack(u""),
-        DFA.unpack(u"\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff"
-        u"\32\70"),
+        DFA.unpack(u"\1\u0104"),
+        DFA.unpack(u"\1\u0105"),
         DFA.unpack(u"\1\u0106"),
-        DFA.unpack(u"\1\u0107"),
-        DFA.unpack(u"\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff"
-        u"\32\70"),
+        DFA.unpack(u"\1\72\13\uffff\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff"
+        u"\32\72"),
+        DFA.unpack(u"\1\u0108"),
+        DFA.unpack(u""),
         DFA.unpack(u"\1\u0109"),
         DFA.unpack(u"\1\u010a"),
         DFA.unpack(u"\1\u010b"),
-        DFA.unpack(u"\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff"
-        u"\32\70"),
+        DFA.unpack(u"\1\u010c"),
         DFA.unpack(u""),
-        DFA.unpack(u"\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff"
-        u"\32\70"),
+        DFA.unpack(u"\1\72\13\uffff\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff"
+        u"\32\72"),
         DFA.unpack(u"\1\u010e"),
-        DFA.unpack(u"\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff"
-        u"\32\70"),
-        DFA.unpack(u"\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff"
-        u"\32\70"),
-        DFA.unpack(u"\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff"
-        u"\32\70"),
         DFA.unpack(u""),
-        DFA.unpack(u"\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff"
-        u"\32\70"),
-        DFA.unpack(u"\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff"
-        u"\32\70"),
-        DFA.unpack(u"\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff"
-        u"\32\70"),
+        DFA.unpack(u""),
+        DFA.unpack(u""),
+        DFA.unpack(u"\1\72\13\uffff\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff"
+        u"\32\72"),
+        DFA.unpack(u"\1\u0110"),
+        DFA.unpack(u"\1\u0111"),
+        DFA.unpack(u"\1\72\13\uffff\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff"
+        u"\32\72"),
+        DFA.unpack(u"\1\u0113"),
+        DFA.unpack(u"\1\u0114"),
         DFA.unpack(u"\1\u0115"),
-        DFA.unpack(u"\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff"
-        u"\32\70"),
-        DFA.unpack(u"\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff"
-        u"\32\70"),
-        DFA.unpack(u"\1\u0118"),
-        DFA.unpack(u"\1\u0119"),
+        DFA.unpack(u"\1\72\13\uffff\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff"
+        u"\32\72"),
+        DFA.unpack(u"\1\u0117"),
+        DFA.unpack(u"\1\72\13\uffff\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff"
+        u"\32\72"),
         DFA.unpack(u""),
+        DFA.unpack(u"\1\72\13\uffff\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff"
+        u"\32\72"),
+        DFA.unpack(u"\1\u011a"),
+        DFA.unpack(u"\1\72\13\uffff\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff"
+        u"\32\72"),
+        DFA.unpack(u"\1\72\13\uffff\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff"
+        u"\32\72"),
+        DFA.unpack(u"\1\72\13\uffff\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff"
+        u"\32\72"),
+        DFA.unpack(u"\1\72\13\uffff\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff"
+        u"\32\72"),
+        DFA.unpack(u"\1\72\13\uffff\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff"
+        u"\32\72"),
         DFA.unpack(u""),
-        DFA.unpack(u"\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff"
-        u"\32\70"),
-        DFA.unpack(u"\1\u011b"),
+        DFA.unpack(u"\1\72\13\uffff\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff"
+        u"\32\72"),
+        DFA.unpack(u"\1\u0121"),
+        DFA.unpack(u"\1\72\13\uffff\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff"
+        u"\32\72"),
+        DFA.unpack(u"\1\72\13\uffff\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff"
+        u"\32\72"),
+        DFA.unpack(u"\1\u0124"),
         DFA.unpack(u""),
-        DFA.unpack(u"\1\u011c"),
-        DFA.unpack(u"\1\u011d"),
-        DFA.unpack(u"\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff"
-        u"\32\70"),
+        DFA.unpack(u"\1\u0125"),
         DFA.unpack(u""),
+        DFA.unpack(u"\1\72\13\uffff\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff"
+        u"\32\72"),
+        DFA.unpack(u"\1\u0127"),
         DFA.unpack(u""),
-        DFA.unpack(u"\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff"
-        u"\32\70"),
+        DFA.unpack(u"\1\u0128"),
+        DFA.unpack(u"\1\u0129"),
+        DFA.unpack(u"\1\u012a"),
         DFA.unpack(u""),
+        DFA.unpack(u"\1\72\13\uffff\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff"
+        u"\32\72"),
         DFA.unpack(u""),
         DFA.unpack(u""),
+        DFA.unpack(u"\1\72\13\uffff\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff"
+        u"\32\72"),
         DFA.unpack(u""),
         DFA.unpack(u""),
         DFA.unpack(u""),
-        DFA.unpack(u"\1\u0120"),
         DFA.unpack(u""),
         DFA.unpack(u""),
-        DFA.unpack(u"\1\u0121"),
-        DFA.unpack(u"\1\u0122"),
         DFA.unpack(u""),
-        DFA.unpack(u"\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff"
-        u"\32\70"),
-        DFA.unpack(u"\1\u0124"),
-        DFA.unpack(u"\1\u0125"),
+        DFA.unpack(u"\1\u012d"),
+        DFA.unpack(u""),
+        DFA.unpack(u""),
+        DFA.unpack(u"\1\u012e"),
+        DFA.unpack(u"\1\u012f"),
+        DFA.unpack(u""),
+        DFA.unpack(u"\1\72\13\uffff\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff"
+        u"\32\72"),
+        DFA.unpack(u"\1\u0131"),
+        DFA.unpack(u"\1\72\13\uffff\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff"
+        u"\32\72"),
+        DFA.unpack(u"\1\u0133"),
+        DFA.unpack(u""),
         DFA.unpack(u""),
+        DFA.unpack(u"\1\72\13\uffff\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff"
+        u"\32\72"),
+        DFA.unpack(u"\1\72\13\uffff\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff"
+        u"\32\72"),
+        DFA.unpack(u"\1\72\13\uffff\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff"
+        u"\32\72"),
         DFA.unpack(u""),
-        DFA.unpack(u"\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff"
-        u"\32\70"),
-        DFA.unpack(u"\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff"
-        u"\32\70"),
-        DFA.unpack(u"\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff"
-        u"\32\70"),
+        DFA.unpack(u"\1\72\13\uffff\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff"
+        u"\32\72"),
         DFA.unpack(u""),
-        DFA.unpack(u"\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff"
-        u"\32\70"),
-        DFA.unpack(u"\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff"
-        u"\32\70"),
+        DFA.unpack(u"\1\72\13\uffff\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff"
+        u"\32\72"),
         DFA.unpack(u""),
         DFA.unpack(u""),
         DFA.unpack(u""),
index 3828e56..c730091 100644 (file)
@@ -1,4 +1,4 @@
-# $ANTLR 3.0.1 C.g 2008-01-25 19:33:35
+# $ANTLR 3.0.1 C.g 2008-01-28 16:35:58
 
 from antlr3 import *
 from antlr3.compat import set, frozenset
@@ -44,15 +44,15 @@ tokenNames = [
     "UnicodeEscape", "WS", "BS", "UnicodeVocabulary", "COMMENT", "LINE_COMMENT", 
     "LINE_COMMAND", "';'", "'typedef'", "','", "'='", "'extern'", "'static'", 
     "'auto'", "'register'", "'STATIC'", "'void'", "'char'", "'short'", "'int'", 
-    "'long'", "'float'", "'double'", "'signed'", "'unsigned'", "'{'", "'}'", 
-    "'struct'", "'union'", "':'", "'enum'", "'const'", "'volatile'", "'IN'", 
-    "'OUT'", "'OPTIONAL'", "'EFIAPI'", "'('", "')'", "'['", "']'", "'*'", 
-    "'...'", "'+'", "'-'", "'/'", "'%'", "'++'", "'--'", "'sizeof'", "'.'", 
-    "'->'", "'&'", "'~'", "'!'", "'*='", "'/='", "'%='", "'+='", "'-='", 
-    "'<<='", "'>>='", "'&='", "'^='", "'|='", "'?'", "'||'", "'&&'", "'|'", 
-    "'^'", "'=='", "'!='", "'<'", "'>'", "'<='", "'>='", "'<<'", "'>>'", 
-    "'case'", "'default'", "'if'", "'else'", "'switch'", "'while'", "'do'", 
-    "'for'", "'goto'", "'continue'", "'break'", "'return'"
+    "'long'", "'float'", "'double'", "'signed'", "'unsigned'", "'BOOLEAN'", 
+    "'{'", "'}'", "'struct'", "'union'", "':'", "'enum'", "'const'", "'volatile'", 
+    "'IN'", "'OUT'", "'OPTIONAL'", "'CONST'", "'EFIAPI'", "'('", "')'", 
+    "'['", "']'", "'*'", "'...'", "'+'", "'-'", "'/'", "'%'", "'++'", "'--'", 
+    "'sizeof'", "'.'", "'->'", "'&'", "'~'", "'!'", "'*='", "'/='", "'%='", 
+    "'+='", "'-='", "'<<='", "'>>='", "'&='", "'^='", "'|='", "'?'", "'||'", 
+    "'&&'", "'|'", "'^'", "'=='", "'!='", "'<'", "'>'", "'<='", "'>='", 
+    "'<<'", "'>>'", "'case'", "'default'", "'if'", "'else'", "'switch'", 
+    "'while'", "'do'", "'for'", "'goto'", "'continue'", "'break'", "'return'"
 ]
 
 
@@ -135,7 +135,7 @@ class CParser(Parser):
                     alt1 = 2
                     LA1_0 = self.input.LA(1)
 
-                    if (LA1_0 == IDENTIFIER or LA1_0 == 26 or (29 <= LA1_0 <= 42) or (45 <= LA1_0 <= 46) or (48 <= LA1_0 <= 55) or LA1_0 == 59) :
+                    if (LA1_0 == IDENTIFIER or LA1_0 == 26 or (29 <= LA1_0 <= 43) or (46 <= LA1_0 <= 47) or (49 <= LA1_0 <= 57) or LA1_0 == 61) :
                         alt1 = 1
 
 
@@ -354,7 +354,7 @@ class CParser(Parser):
 
                         raise nvae
 
-                elif ((45 <= LA3_0 <= 46)) :
+                elif (LA3_0 == 43) :
                     LA3_11 = self.input.LA(2)
 
                     if (self.synpred4()) :
@@ -370,7 +370,7 @@ class CParser(Parser):
 
                         raise nvae
 
-                elif (LA3_0 == 48) :
+                elif ((46 <= LA3_0 <= 47)) :
                     LA3_12 = self.input.LA(2)
 
                     if (self.synpred4()) :
@@ -386,15 +386,13 @@ class CParser(Parser):
 
                         raise nvae
 
-                elif (LA3_0 == IDENTIFIER) :
+                elif (LA3_0 == 49) :
                     LA3_13 = self.input.LA(2)
 
                     if (self.synpred4()) :
                         alt3 = 1
                     elif (self.synpred5()) :
                         alt3 = 2
-                    elif (True) :
-                        alt3 = 3
                     else:
                         if self.backtracking > 0:
                             self.failed = True
@@ -404,13 +402,15 @@ class CParser(Parser):
 
                         raise nvae
 
-                elif ((49 <= LA3_0 <= 53)) :
+                elif (LA3_0 == IDENTIFIER) :
                     LA3_14 = self.input.LA(2)
 
                     if (self.synpred4()) :
                         alt3 = 1
                     elif (self.synpred5()) :
                         alt3 = 2
+                    elif (True) :
+                        alt3 = 3
                     else:
                         if self.backtracking > 0:
                             self.failed = True
@@ -420,11 +420,27 @@ class CParser(Parser):
 
                         raise nvae
 
-                elif (LA3_0 == 54) and (self.synpred4()):
+                elif ((50 <= LA3_0 <= 55)) :
+                    LA3_15 = self.input.LA(2)
+
+                    if (self.synpred4()) :
+                        alt3 = 1
+                    elif (self.synpred5()) :
+                        alt3 = 2
+                    else:
+                        if self.backtracking > 0:
+                            self.failed = True
+                            return 
+
+                        nvae = NoViableAltException("62:1: external_declaration options {k=1; } : ( ( ( declaration_specifiers )? declarator ( declaration )* '{' )=> function_definition | declaration | macro_statement ( ';' )? );", 3, 15, self.input)
+
+                        raise nvae
+
+                elif (LA3_0 == 56) and (self.synpred4()):
                     alt3 = 1
-                elif (LA3_0 == 59) and (self.synpred4()):
+                elif (LA3_0 == 61) and (self.synpred4()):
                     alt3 = 1
-                elif (LA3_0 == 55) and (self.synpred4()):
+                elif (LA3_0 == 57) and (self.synpred4()):
                     alt3 = 1
                 elif (LA3_0 == 26) :
                     alt3 = 2
@@ -534,20 +550,13 @@ class CParser(Parser):
                 alt4 = 2
                 LA4_0 = self.input.LA(1)
 
-                if ((29 <= LA4_0 <= 42) or (45 <= LA4_0 <= 46) or (48 <= LA4_0 <= 53)) :
+                if ((29 <= LA4_0 <= 43) or (46 <= LA4_0 <= 47) or (49 <= LA4_0 <= 55)) :
                     alt4 = 1
                 elif (LA4_0 == IDENTIFIER) :
                     LA4 = self.input.LA(2)
-                    if LA4 == 54 or LA4 == 59:
-                        alt4 = 1
-                    elif LA4 == IDENTIFIER:
+                    if LA4 == 57:
                         LA4_20 = self.input.LA(3)
 
-                        if (self.synpred7()) :
-                            alt4 = 1
-                    elif LA4 == 55:
-                        LA4_21 = self.input.LA(3)
-
                         if (self.synpred7()) :
                             alt4 = 1
                     elif LA4 == 29 or LA4 == 30 or LA4 == 31 or LA4 == 32 or LA4 == 33:
@@ -600,21 +609,33 @@ class CParser(Parser):
 
                         if (self.synpred7()) :
                             alt4 = 1
-                    elif LA4 == 45 or LA4 == 46:
+                    elif LA4 == 43:
                         LA4_32 = self.input.LA(3)
 
                         if (self.synpred7()) :
                             alt4 = 1
-                    elif LA4 == 48:
+                    elif LA4 == 46 or LA4 == 47:
                         LA4_33 = self.input.LA(3)
 
                         if (self.synpred7()) :
                             alt4 = 1
-                    elif LA4 == 49 or LA4 == 50 or LA4 == 51 or LA4 == 52 or LA4 == 53:
+                    elif LA4 == 49:
                         LA4_34 = self.input.LA(3)
 
                         if (self.synpred7()) :
                             alt4 = 1
+                    elif LA4 == IDENTIFIER:
+                        LA4_35 = self.input.LA(3)
+
+                        if (self.synpred7()) :
+                            alt4 = 1
+                    elif LA4 == 50 or LA4 == 51 or LA4 == 52 or LA4 == 53 or LA4 == 54 or LA4 == 55:
+                        LA4_36 = self.input.LA(3)
+
+                        if (self.synpred7()) :
+                            alt4 = 1
+                    elif LA4 == 56 or LA4 == 61:
+                        alt4 = 1
                 if alt4 == 1:
                     # C.g:0:0: d= declaration_specifiers
                     self.following.append(self.FOLLOW_declaration_specifiers_in_function_definition147)
@@ -634,9 +655,9 @@ class CParser(Parser):
                 alt6 = 2
                 LA6_0 = self.input.LA(1)
 
-                if (LA6_0 == IDENTIFIER or LA6_0 == 26 or (29 <= LA6_0 <= 42) or (45 <= LA6_0 <= 46) or (48 <= LA6_0 <= 53)) :
+                if (LA6_0 == IDENTIFIER or LA6_0 == 26 or (29 <= LA6_0 <= 43) or (46 <= LA6_0 <= 47) or (49 <= LA6_0 <= 55)) :
                     alt6 = 1
-                elif (LA6_0 == 43) :
+                elif (LA6_0 == 44) :
                     alt6 = 2
                 else:
                     if self.backtracking > 0:
@@ -655,7 +676,7 @@ class CParser(Parser):
                         alt5 = 2
                         LA5_0 = self.input.LA(1)
 
-                        if (LA5_0 == IDENTIFIER or LA5_0 == 26 or (29 <= LA5_0 <= 42) or (45 <= LA5_0 <= 46) or (48 <= LA5_0 <= 53)) :
+                        if (LA5_0 == IDENTIFIER or LA5_0 == 26 or (29 <= LA5_0 <= 43) or (46 <= LA5_0 <= 47) or (49 <= LA5_0 <= 55)) :
                             alt5 = 1
 
 
@@ -770,7 +791,7 @@ class CParser(Parser):
 
                 if (LA9_0 == 26) :
                     alt9 = 1
-                elif (LA9_0 == IDENTIFIER or (29 <= LA9_0 <= 42) or (45 <= LA9_0 <= 46) or (48 <= LA9_0 <= 53)) :
+                elif (LA9_0 == IDENTIFIER or (29 <= LA9_0 <= 43) or (46 <= LA9_0 <= 47) or (49 <= LA9_0 <= 55)) :
                     alt9 = 2
                 else:
                     if self.backtracking > 0:
@@ -791,17 +812,17 @@ class CParser(Parser):
                     alt7 = 2
                     LA7_0 = self.input.LA(1)
 
-                    if ((29 <= LA7_0 <= 42) or (45 <= LA7_0 <= 46) or (48 <= LA7_0 <= 53)) :
+                    if ((29 <= LA7_0 <= 43) or (46 <= LA7_0 <= 47) or (49 <= LA7_0 <= 55)) :
                         alt7 = 1
                     elif (LA7_0 == IDENTIFIER) :
-                        LA7_13 = self.input.LA(2)
+                        LA7_14 = self.input.LA(2)
 
-                        if (LA7_13 == 55) :
-                            LA7_19 = self.input.LA(3)
+                        if (LA7_14 == 57) :
+                            LA7_20 = self.input.LA(3)
 
                             if (self.synpred10()) :
                                 alt7 = 1
-                        elif (LA7_13 == IDENTIFIER or (29 <= LA7_13 <= 42) or (45 <= LA7_13 <= 46) or (48 <= LA7_13 <= 54) or LA7_13 == 59) :
+                        elif (LA7_14 == IDENTIFIER or (29 <= LA7_14 <= 43) or (46 <= LA7_14 <= 47) or (49 <= LA7_14 <= 56) or LA7_14 == 61) :
                             alt7 = 1
                     if alt7 == 1:
                         # C.g:0:0: b= declaration_specifiers
@@ -843,7 +864,7 @@ class CParser(Parser):
                     alt8 = 2
                     LA8_0 = self.input.LA(1)
 
-                    if (LA8_0 == IDENTIFIER or (54 <= LA8_0 <= 55) or LA8_0 == 59) :
+                    if (LA8_0 == IDENTIFIER or (56 <= LA8_0 <= 57) or LA8_0 == 61) :
                         alt8 = 1
                     if alt8 == 1:
                         # C.g:0:0: t= init_declarator_list
@@ -889,7 +910,7 @@ class CParser(Parser):
 
 
     # $ANTLR start declaration_specifiers
-    # C.g:130:1: declaration_specifiers : ( storage_class_specifier | type_specifier ( pointer )? | type_qualifier )+ ;
+    # C.g:130:1: declaration_specifiers : ( storage_class_specifier | type_specifier | type_qualifier )+ ;
     def declaration_specifiers(self, ):
 
         retval = self.declaration_specifiers_return()
@@ -900,28 +921,35 @@ class CParser(Parser):
                 if self.backtracking > 0 and self.alreadyParsedRule(self.input, 5):
                     return retval
 
-                # C.g:131:2: ( ( storage_class_specifier | type_specifier ( pointer )? | type_qualifier )+ )
-                # C.g:131:6: ( storage_class_specifier | type_specifier ( pointer )? | type_qualifier )+
-                # C.g:131:6: ( storage_class_specifier | type_specifier ( pointer )? | type_qualifier )+
-                cnt11 = 0
-                while True: #loop11
-                    alt11 = 4
-                    LA11 = self.input.LA(1)
-                    if LA11 == IDENTIFIER:
-                        LA11_3 = self.input.LA(2)
+                # C.g:131:2: ( ( storage_class_specifier | type_specifier | type_qualifier )+ )
+                # C.g:131:6: ( storage_class_specifier | type_specifier | type_qualifier )+
+                # C.g:131:6: ( storage_class_specifier | type_specifier | type_qualifier )+
+                cnt10 = 0
+                while True: #loop10
+                    alt10 = 4
+                    LA10 = self.input.LA(1)
+                    if LA10 == IDENTIFIER:
+                        LA10_3 = self.input.LA(2)
+
+                        if (self.synpred14()) :
+                            alt10 = 2
+
+
+                    elif LA10 == 54:
+                        LA10_7 = self.input.LA(2)
 
                         if (self.synpred15()) :
-                            alt11 = 2
+                            alt10 = 3
 
 
-                    elif LA11 == 29 or LA11 == 30 or LA11 == 31 or LA11 == 32 or LA11 == 33:
-                        alt11 = 1
-                    elif LA11 == 34 or LA11 == 35 or LA11 == 36 or LA11 == 37 or LA11 == 38 or LA11 == 39 or LA11 == 40 or LA11 == 41 or LA11 == 42 or LA11 == 45 or LA11 == 46 or LA11 == 48:
-                        alt11 = 2
-                    elif LA11 == 49 or LA11 == 50 or LA11 == 51 or LA11 == 52 or LA11 == 53:
-                        alt11 = 3
+                    elif LA10 == 29 or LA10 == 30 or LA10 == 31 or LA10 == 32 or LA10 == 33:
+                        alt10 = 1
+                    elif LA10 == 34 or LA10 == 35 or LA10 == 36 or LA10 == 37 or LA10 == 38 or LA10 == 39 or LA10 == 40 or LA10 == 41 or LA10 == 42 or LA10 == 43 or LA10 == 46 or LA10 == 47 or LA10 == 49:
+                        alt10 = 2
+                    elif LA10 == 50 or LA10 == 51 or LA10 == 52 or LA10 == 53 or LA10 == 55:
+                        alt10 = 3
 
-                    if alt11 == 1:
+                    if alt10 == 1:
                         # C.g:131:10: storage_class_specifier
                         self.following.append(self.FOLLOW_storage_class_specifier_in_declaration_specifiers254)
                         self.storage_class_specifier()
@@ -930,37 +958,18 @@ class CParser(Parser):
                             return retval
 
 
-                    elif alt11 == 2:
-                        # C.g:132:7: type_specifier ( pointer )?
+                    elif alt10 == 2:
+                        # C.g:132:7: type_specifier
                         self.following.append(self.FOLLOW_type_specifier_in_declaration_specifiers262)
                         self.type_specifier()
                         self.following.pop()
                         if self.failed:
                             return retval
-                        # C.g:132:22: ( pointer )?
-                        alt10 = 2
-                        LA10_0 = self.input.LA(1)
-
-                        if (LA10_0 == 59) :
-                            LA10_1 = self.input.LA(2)
-
-                            if (self.synpred14()) :
-                                alt10 = 1
-                        if alt10 == 1:
-                            # C.g:0:0: pointer
-                            self.following.append(self.FOLLOW_pointer_in_declaration_specifiers264)
-                            self.pointer()
-                            self.following.pop()
-                            if self.failed:
-                                return retval
-
-
-
 
 
-                    elif alt11 == 3:
+                    elif alt10 == 3:
                         # C.g:133:13: type_qualifier
-                        self.following.append(self.FOLLOW_type_qualifier_in_declaration_specifiers279)
+                        self.following.append(self.FOLLOW_type_qualifier_in_declaration_specifiers276)
                         self.type_qualifier()
                         self.following.pop()
                         if self.failed:
@@ -968,17 +977,17 @@ class CParser(Parser):
 
 
                     else:
-                        if cnt11 >= 1:
-                            break #loop11
+                        if cnt10 >= 1:
+                            break #loop10
 
                         if self.backtracking > 0:
                             self.failed = True
                             return retval
 
-                        eee = EarlyExitException(11, self.input)
+                        eee = EarlyExitException(10, self.input)
                         raise eee
 
-                    cnt11 += 1
+                    cnt10 += 1
 
 
 
@@ -1021,26 +1030,26 @@ class CParser(Parser):
 
                 # C.g:138:2: ( init_declarator ( ',' init_declarator )* )
                 # C.g:138:4: init_declarator ( ',' init_declarator )*
-                self.following.append(self.FOLLOW_init_declarator_in_init_declarator_list301)
+                self.following.append(self.FOLLOW_init_declarator_in_init_declarator_list298)
                 self.init_declarator()
                 self.following.pop()
                 if self.failed:
                     return retval
                 # C.g:138:20: ( ',' init_declarator )*
-                while True: #loop12
-                    alt12 = 2
-                    LA12_0 = self.input.LA(1)
+                while True: #loop11
+                    alt11 = 2
+                    LA11_0 = self.input.LA(1)
 
-                    if (LA12_0 == 27) :
-                        alt12 = 1
+                    if (LA11_0 == 27) :
+                        alt11 = 1
 
 
-                    if alt12 == 1:
+                    if alt11 == 1:
                         # C.g:138:21: ',' init_declarator
-                        self.match(self.input, 27, self.FOLLOW_27_in_init_declarator_list304)
+                        self.match(self.input, 27, self.FOLLOW_27_in_init_declarator_list301)
                         if self.failed:
                             return retval
-                        self.following.append(self.FOLLOW_init_declarator_in_init_declarator_list306)
+                        self.following.append(self.FOLLOW_init_declarator_in_init_declarator_list303)
                         self.init_declarator()
                         self.following.pop()
                         if self.failed:
@@ -1048,7 +1057,7 @@ class CParser(Parser):
 
 
                     else:
-                        break #loop12
+                        break #loop11
 
 
 
@@ -1083,23 +1092,23 @@ class CParser(Parser):
 
                 # C.g:142:2: ( declarator ( '=' initializer )? )
                 # C.g:142:4: declarator ( '=' initializer )?
-                self.following.append(self.FOLLOW_declarator_in_init_declarator319)
+                self.following.append(self.FOLLOW_declarator_in_init_declarator316)
                 self.declarator()
                 self.following.pop()
                 if self.failed:
                     return 
                 # C.g:142:15: ( '=' initializer )?
-                alt13 = 2
-                LA13_0 = self.input.LA(1)
+                alt12 = 2
+                LA12_0 = self.input.LA(1)
 
-                if (LA13_0 == 28) :
-                    alt13 = 1
-                if alt13 == 1:
+                if (LA12_0 == 28) :
+                    alt12 = 1
+                if alt12 == 1:
                     # C.g:142:16: '=' initializer
-                    self.match(self.input, 28, self.FOLLOW_28_in_init_declarator322)
+                    self.match(self.input, 28, self.FOLLOW_28_in_init_declarator319)
                     if self.failed:
                         return 
-                    self.following.append(self.FOLLOW_initializer_in_init_declarator324)
+                    self.following.append(self.FOLLOW_initializer_in_init_declarator321)
                     self.initializer()
                     self.following.pop()
                     if self.failed:
@@ -1173,7 +1182,7 @@ class CParser(Parser):
 
 
     # $ANTLR start type_specifier
-    # C.g:153:1: type_specifier : ( 'void' | 'char' | 'short' | 'int' | 'long' | 'float' | 'double' | 'signed' | 'unsigned' | s= struct_or_union_specifier | e= enum_specifier | ( IDENTIFIER declarator )=> type_id );
+    # C.g:153:1: type_specifier : ( 'void' | 'char' | 'short' | 'int' | 'long' | 'float' | 'double' | 'signed' | 'unsigned' | 'BOOLEAN' | s= struct_or_union_specifier | e= enum_specifier | ( IDENTIFIER declarator )=> type_id );
     def type_specifier(self, ):
 
         type_specifier_StartIndex = self.input.index()
@@ -1187,109 +1196,118 @@ class CParser(Parser):
                 if self.backtracking > 0 and self.alreadyParsedRule(self.input, 9):
                     return 
 
-                # C.g:154:2: ( 'void' | 'char' | 'short' | 'int' | 'long' | 'float' | 'double' | 'signed' | 'unsigned' | s= struct_or_union_specifier | e= enum_specifier | ( IDENTIFIER declarator )=> type_id )
-                alt14 = 12
-                LA14_0 = self.input.LA(1)
+                # C.g:154:2: ( 'void' | 'char' | 'short' | 'int' | 'long' | 'float' | 'double' | 'signed' | 'unsigned' | 'BOOLEAN' | s= struct_or_union_specifier | e= enum_specifier | ( IDENTIFIER declarator )=> type_id )
+                alt13 = 13
+                LA13_0 = self.input.LA(1)
 
-                if (LA14_0 == 34) :
-                    alt14 = 1
-                elif (LA14_0 == 35) :
-                    alt14 = 2
-                elif (LA14_0 == 36) :
-                    alt14 = 3
-                elif (LA14_0 == 37) :
-                    alt14 = 4
-                elif (LA14_0 == 38) :
-                    alt14 = 5
-                elif (LA14_0 == 39) :
-                    alt14 = 6
-                elif (LA14_0 == 40) :
-                    alt14 = 7
-                elif (LA14_0 == 41) :
-                    alt14 = 8
-                elif (LA14_0 == 42) :
-                    alt14 = 9
-                elif ((45 <= LA14_0 <= 46)) :
-                    alt14 = 10
-                elif (LA14_0 == 48) :
-                    alt14 = 11
-                elif (LA14_0 == IDENTIFIER) and (self.synpred34()):
-                    alt14 = 12
+                if (LA13_0 == 34) :
+                    alt13 = 1
+                elif (LA13_0 == 35) :
+                    alt13 = 2
+                elif (LA13_0 == 36) :
+                    alt13 = 3
+                elif (LA13_0 == 37) :
+                    alt13 = 4
+                elif (LA13_0 == 38) :
+                    alt13 = 5
+                elif (LA13_0 == 39) :
+                    alt13 = 6
+                elif (LA13_0 == 40) :
+                    alt13 = 7
+                elif (LA13_0 == 41) :
+                    alt13 = 8
+                elif (LA13_0 == 42) :
+                    alt13 = 9
+                elif (LA13_0 == 43) :
+                    alt13 = 10
+                elif ((46 <= LA13_0 <= 47)) :
+                    alt13 = 11
+                elif (LA13_0 == 49) :
+                    alt13 = 12
+                elif (LA13_0 == IDENTIFIER) and (self.synpred34()):
+                    alt13 = 13
                 else:
                     if self.backtracking > 0:
                         self.failed = True
                         return 
 
-                    nvae = NoViableAltException("153:1: type_specifier : ( 'void' | 'char' | 'short' | 'int' | 'long' | 'float' | 'double' | 'signed' | 'unsigned' | s= struct_or_union_specifier | e= enum_specifier | ( IDENTIFIER declarator )=> type_id );", 14, 0, self.input)
+                    nvae = NoViableAltException("153:1: type_specifier : ( 'void' | 'char' | 'short' | 'int' | 'long' | 'float' | 'double' | 'signed' | 'unsigned' | 'BOOLEAN' | s= struct_or_union_specifier | e= enum_specifier | ( IDENTIFIER declarator )=> type_id );", 13, 0, self.input)
 
                     raise nvae
 
-                if alt14 == 1:
+                if alt13 == 1:
                     # C.g:154:4: 'void'
-                    self.match(self.input, 34, self.FOLLOW_34_in_type_specifier369)
+                    self.match(self.input, 34, self.FOLLOW_34_in_type_specifier366)
                     if self.failed:
                         return 
 
 
-                elif alt14 == 2:
+                elif alt13 == 2:
                     # C.g:155:4: 'char'
-                    self.match(self.input, 35, self.FOLLOW_35_in_type_specifier374)
+                    self.match(self.input, 35, self.FOLLOW_35_in_type_specifier371)
                     if self.failed:
                         return 
 
 
-                elif alt14 == 3:
+                elif alt13 == 3:
                     # C.g:156:4: 'short'
-                    self.match(self.input, 36, self.FOLLOW_36_in_type_specifier379)
+                    self.match(self.input, 36, self.FOLLOW_36_in_type_specifier376)
                     if self.failed:
                         return 
 
 
-                elif alt14 == 4:
+                elif alt13 == 4:
                     # C.g:157:4: 'int'
-                    self.match(self.input, 37, self.FOLLOW_37_in_type_specifier384)
+                    self.match(self.input, 37, self.FOLLOW_37_in_type_specifier381)
                     if self.failed:
                         return 
 
 
-                elif alt14 == 5:
+                elif alt13 == 5:
                     # C.g:158:4: 'long'
-                    self.match(self.input, 38, self.FOLLOW_38_in_type_specifier389)
+                    self.match(self.input, 38, self.FOLLOW_38_in_type_specifier386)
                     if self.failed:
                         return 
 
 
-                elif alt14 == 6:
+                elif alt13 == 6:
                     # C.g:159:4: 'float'
-                    self.match(self.input, 39, self.FOLLOW_39_in_type_specifier394)
+                    self.match(self.input, 39, self.FOLLOW_39_in_type_specifier391)
                     if self.failed:
                         return 
 
 
-                elif alt14 == 7:
+                elif alt13 == 7:
                     # C.g:160:4: 'double'
-                    self.match(self.input, 40, self.FOLLOW_40_in_type_specifier399)
+                    self.match(self.input, 40, self.FOLLOW_40_in_type_specifier396)
                     if self.failed:
                         return 
 
 
-                elif alt14 == 8:
+                elif alt13 == 8:
                     # C.g:161:4: 'signed'
-                    self.match(self.input, 41, self.FOLLOW_41_in_type_specifier404)
+                    self.match(self.input, 41, self.FOLLOW_41_in_type_specifier401)
                     if self.failed:
                         return 
 
 
-                elif alt14 == 9:
+                elif alt13 == 9:
                     # C.g:162:4: 'unsigned'
-                    self.match(self.input, 42, self.FOLLOW_42_in_type_specifier409)
+                    self.match(self.input, 42, self.FOLLOW_42_in_type_specifier406)
+                    if self.failed:
+                        return 
+
+
+                elif alt13 == 10:
+                    # C.g:163:4: 'BOOLEAN'
+                    self.match(self.input, 43, self.FOLLOW_43_in_type_specifier411)
                     if self.failed:
                         return 
 
 
-                elif alt14 == 10:
-                    # C.g:163:4: s= struct_or_union_specifier
-                    self.following.append(self.FOLLOW_struct_or_union_specifier_in_type_specifier416)
+                elif alt13 == 11:
+                    # C.g:164:4: s= struct_or_union_specifier
+                    self.following.append(self.FOLLOW_struct_or_union_specifier_in_type_specifier418)
                     s = self.struct_or_union_specifier()
                     self.following.pop()
                     if self.failed:
@@ -1299,9 +1317,9 @@ class CParser(Parser):
 
 
 
-                elif alt14 == 11:
-                    # C.g:164:4: e= enum_specifier
-                    self.following.append(self.FOLLOW_enum_specifier_in_type_specifier425)
+                elif alt13 == 12:
+                    # C.g:165:4: e= enum_specifier
+                    self.following.append(self.FOLLOW_enum_specifier_in_type_specifier427)
                     e = self.enum_specifier()
                     self.following.pop()
                     if self.failed:
@@ -1311,9 +1329,9 @@ class CParser(Parser):
 
 
 
-                elif alt14 == 12:
-                    # C.g:165:4: ( IDENTIFIER declarator )=> type_id
-                    self.following.append(self.FOLLOW_type_id_in_type_specifier439)
+                elif alt13 == 13:
+                    # C.g:166:4: ( IDENTIFIER declarator )=> type_id
+                    self.following.append(self.FOLLOW_type_id_in_type_specifier441)
                     self.type_id()
                     self.following.pop()
                     if self.failed:
@@ -1336,7 +1354,7 @@ class CParser(Parser):
 
 
     # $ANTLR start type_id
-    # C.g:168:1: type_id : IDENTIFIER ;
+    # C.g:169:1: type_id : IDENTIFIER ;
     def type_id(self, ):
 
         type_id_StartIndex = self.input.index()
@@ -1345,9 +1363,9 @@ class CParser(Parser):
                 if self.backtracking > 0 and self.alreadyParsedRule(self.input, 10):
                     return 
 
-                # C.g:169:5: ( IDENTIFIER )
-                # C.g:169:9: IDENTIFIER
-                self.match(self.input, IDENTIFIER, self.FOLLOW_IDENTIFIER_in_type_id455)
+                # C.g:170:5: ( IDENTIFIER )
+                # C.g:170:9: IDENTIFIER
+                self.match(self.input, IDENTIFIER, self.FOLLOW_IDENTIFIER_in_type_id457)
                 if self.failed:
                     return 
 
@@ -1375,7 +1393,7 @@ class CParser(Parser):
 
 
     # $ANTLR start struct_or_union_specifier
-    # C.g:173:1: struct_or_union_specifier options {k=3; } : ( struct_or_union ( IDENTIFIER )? '{' struct_declaration_list '}' | struct_or_union IDENTIFIER );
+    # C.g:174:1: struct_or_union_specifier options {k=3; } : ( struct_or_union ( IDENTIFIER )? '{' struct_declaration_list '}' | struct_or_union IDENTIFIER );
     def struct_or_union_specifier(self, ):
 
         retval = self.struct_or_union_specifier_return()
@@ -1386,37 +1404,37 @@ class CParser(Parser):
                 if self.backtracking > 0 and self.alreadyParsedRule(self.input, 11):
                     return retval
 
-                # C.g:175:2: ( struct_or_union ( IDENTIFIER )? '{' struct_declaration_list '}' | struct_or_union IDENTIFIER )
-                alt16 = 2
-                LA16_0 = self.input.LA(1)
+                # C.g:176:2: ( struct_or_union ( IDENTIFIER )? '{' struct_declaration_list '}' | struct_or_union IDENTIFIER )
+                alt15 = 2
+                LA15_0 = self.input.LA(1)
 
-                if ((45 <= LA16_0 <= 46)) :
-                    LA16_1 = self.input.LA(2)
+                if ((46 <= LA15_0 <= 47)) :
+                    LA15_1 = self.input.LA(2)
 
-                    if (LA16_1 == IDENTIFIER) :
-                        LA16_2 = self.input.LA(3)
+                    if (LA15_1 == IDENTIFIER) :
+                        LA15_2 = self.input.LA(3)
 
-                        if (LA16_2 == 43) :
-                            alt16 = 1
-                        elif (LA16_2 == EOF or LA16_2 == IDENTIFIER or LA16_2 == 25 or (29 <= LA16_2 <= 42) or (45 <= LA16_2 <= 57) or LA16_2 == 59) :
-                            alt16 = 2
+                        if (LA15_2 == 44) :
+                            alt15 = 1
+                        elif (LA15_2 == EOF or LA15_2 == IDENTIFIER or LA15_2 == 25 or LA15_2 == 27 or (29 <= LA15_2 <= 43) or (46 <= LA15_2 <= 59) or LA15_2 == 61) :
+                            alt15 = 2
                         else:
                             if self.backtracking > 0:
                                 self.failed = True
                                 return retval
 
-                            nvae = NoViableAltException("173:1: struct_or_union_specifier options {k=3; } : ( struct_or_union ( IDENTIFIER )? '{' struct_declaration_list '}' | struct_or_union IDENTIFIER );", 16, 2, self.input)
+                            nvae = NoViableAltException("174:1: struct_or_union_specifier options {k=3; } : ( struct_or_union ( IDENTIFIER )? '{' struct_declaration_list '}' | struct_or_union IDENTIFIER );", 15, 2, self.input)
 
                             raise nvae
 
-                    elif (LA16_1 == 43) :
-                        alt16 = 1
+                    elif (LA15_1 == 44) :
+                        alt15 = 1
                     else:
                         if self.backtracking > 0:
                             self.failed = True
                             return retval
 
-                        nvae = NoViableAltException("173:1: struct_or_union_specifier options {k=3; } : ( struct_or_union ( IDENTIFIER )? '{' struct_declaration_list '}' | struct_or_union IDENTIFIER );", 16, 1, self.input)
+                        nvae = NoViableAltException("174:1: struct_or_union_specifier options {k=3; } : ( struct_or_union ( IDENTIFIER )? '{' struct_declaration_list '}' | struct_or_union IDENTIFIER );", 15, 1, self.input)
 
                         raise nvae
 
@@ -1425,52 +1443,52 @@ class CParser(Parser):
                         self.failed = True
                         return retval
 
-                    nvae = NoViableAltException("173:1: struct_or_union_specifier options {k=3; } : ( struct_or_union ( IDENTIFIER )? '{' struct_declaration_list '}' | struct_or_union IDENTIFIER );", 16, 0, self.input)
+                    nvae = NoViableAltException("174:1: struct_or_union_specifier options {k=3; } : ( struct_or_union ( IDENTIFIER )? '{' struct_declaration_list '}' | struct_or_union IDENTIFIER );", 15, 0, self.input)
 
                     raise nvae
 
-                if alt16 == 1:
-                    # C.g:175:4: struct_or_union ( IDENTIFIER )? '{' struct_declaration_list '}'
-                    self.following.append(self.FOLLOW_struct_or_union_in_struct_or_union_specifier482)
+                if alt15 == 1:
+                    # C.g:176:4: struct_or_union ( IDENTIFIER )? '{' struct_declaration_list '}'
+                    self.following.append(self.FOLLOW_struct_or_union_in_struct_or_union_specifier484)
                     self.struct_or_union()
                     self.following.pop()
                     if self.failed:
                         return retval
-                    # C.g:175:20: ( IDENTIFIER )?
-                    alt15 = 2
-                    LA15_0 = self.input.LA(1)
+                    # C.g:176:20: ( IDENTIFIER )?
+                    alt14 = 2
+                    LA14_0 = self.input.LA(1)
 
-                    if (LA15_0 == IDENTIFIER) :
-                        alt15 = 1
-                    if alt15 == 1:
+                    if (LA14_0 == IDENTIFIER) :
+                        alt14 = 1
+                    if alt14 == 1:
                         # C.g:0:0: IDENTIFIER
-                        self.match(self.input, IDENTIFIER, self.FOLLOW_IDENTIFIER_in_struct_or_union_specifier484)
+                        self.match(self.input, IDENTIFIER, self.FOLLOW_IDENTIFIER_in_struct_or_union_specifier486)
                         if self.failed:
                             return retval
 
 
 
-                    self.match(self.input, 43, self.FOLLOW_43_in_struct_or_union_specifier487)
+                    self.match(self.input, 44, self.FOLLOW_44_in_struct_or_union_specifier489)
                     if self.failed:
                         return retval
-                    self.following.append(self.FOLLOW_struct_declaration_list_in_struct_or_union_specifier489)
+                    self.following.append(self.FOLLOW_struct_declaration_list_in_struct_or_union_specifier491)
                     self.struct_declaration_list()
                     self.following.pop()
                     if self.failed:
                         return retval
-                    self.match(self.input, 44, self.FOLLOW_44_in_struct_or_union_specifier491)
+                    self.match(self.input, 45, self.FOLLOW_45_in_struct_or_union_specifier493)
                     if self.failed:
                         return retval
 
 
-                elif alt16 == 2:
-                    # C.g:176:4: struct_or_union IDENTIFIER
-                    self.following.append(self.FOLLOW_struct_or_union_in_struct_or_union_specifier496)
+                elif alt15 == 2:
+                    # C.g:177:4: struct_or_union IDENTIFIER
+                    self.following.append(self.FOLLOW_struct_or_union_in_struct_or_union_specifier498)
                     self.struct_or_union()
                     self.following.pop()
                     if self.failed:
                         return retval
-                    self.match(self.input, IDENTIFIER, self.FOLLOW_IDENTIFIER_in_struct_or_union_specifier498)
+                    self.match(self.input, IDENTIFIER, self.FOLLOW_IDENTIFIER_in_struct_or_union_specifier500)
                     if self.failed:
                         return retval
 
@@ -1493,7 +1511,7 @@ class CParser(Parser):
 
 
     # $ANTLR start struct_or_union
-    # C.g:179:1: struct_or_union : ( 'struct' | 'union' );
+    # C.g:180:1: struct_or_union : ( 'struct' | 'union' );
     def struct_or_union(self, ):
 
         struct_or_union_StartIndex = self.input.index()
@@ -1502,9 +1520,9 @@ class CParser(Parser):
                 if self.backtracking > 0 and self.alreadyParsedRule(self.input, 12):
                     return 
 
-                # C.g:180:2: ( 'struct' | 'union' )
+                # C.g:181:2: ( 'struct' | 'union' )
                 # C.g:
-                if (45 <= self.input.LA(1) <= 46):
+                if (46 <= self.input.LA(1) <= 47):
                     self.input.consume();
                     self.errorRecovery = False
                     self.failed = False
@@ -1540,7 +1558,7 @@ class CParser(Parser):
 
 
     # $ANTLR start struct_declaration_list
-    # C.g:184:1: struct_declaration_list : ( struct_declaration )+ ;
+    # C.g:185:1: struct_declaration_list : ( struct_declaration )+ ;
     def struct_declaration_list(self, ):
 
         struct_declaration_list_StartIndex = self.input.index()
@@ -1549,21 +1567,21 @@ class CParser(Parser):
                 if self.backtracking > 0 and self.alreadyParsedRule(self.input, 13):
                     return 
 
-                # C.g:185:2: ( ( struct_declaration )+ )
-                # C.g:185:4: ( struct_declaration )+
-                # C.g:185:4: ( struct_declaration )+
-                cnt17 = 0
-                while True: #loop17
-                    alt17 = 2
-                    LA17_0 = self.input.LA(1)
+                # C.g:186:2: ( ( struct_declaration )+ )
+                # C.g:186:4: ( struct_declaration )+
+                # C.g:186:4: ( struct_declaration )+
+                cnt16 = 0
+                while True: #loop16
+                    alt16 = 2
+                    LA16_0 = self.input.LA(1)
 
-                    if (LA17_0 == IDENTIFIER or (34 <= LA17_0 <= 42) or (45 <= LA17_0 <= 46) or (48 <= LA17_0 <= 53)) :
-                        alt17 = 1
+                    if (LA16_0 == IDENTIFIER or (34 <= LA16_0 <= 43) or (46 <= LA16_0 <= 47) or (49 <= LA16_0 <= 55)) :
+                        alt16 = 1
 
 
-                    if alt17 == 1:
+                    if alt16 == 1:
                         # C.g:0:0: struct_declaration
-                        self.following.append(self.FOLLOW_struct_declaration_in_struct_declaration_list525)
+                        self.following.append(self.FOLLOW_struct_declaration_in_struct_declaration_list527)
                         self.struct_declaration()
                         self.following.pop()
                         if self.failed:
@@ -1571,17 +1589,17 @@ class CParser(Parser):
 
 
                     else:
-                        if cnt17 >= 1:
-                            break #loop17
+                        if cnt16 >= 1:
+                            break #loop16
 
                         if self.backtracking > 0:
                             self.failed = True
                             return 
 
-                        eee = EarlyExitException(17, self.input)
+                        eee = EarlyExitException(16, self.input)
                         raise eee
 
-                    cnt17 += 1
+                    cnt16 += 1
 
 
 
@@ -1603,7 +1621,7 @@ class CParser(Parser):
 
 
     # $ANTLR start struct_declaration
-    # C.g:188:1: struct_declaration : specifier_qualifier_list struct_declarator_list ';' ;
+    # C.g:189:1: struct_declaration : specifier_qualifier_list struct_declarator_list ';' ;
     def struct_declaration(self, ):
 
         struct_declaration_StartIndex = self.input.index()
@@ -1612,19 +1630,19 @@ class CParser(Parser):
                 if self.backtracking > 0 and self.alreadyParsedRule(self.input, 14):
                     return 
 
-                # C.g:189:2: ( specifier_qualifier_list struct_declarator_list ';' )
-                # C.g:189:4: specifier_qualifier_list struct_declarator_list ';'
-                self.following.append(self.FOLLOW_specifier_qualifier_list_in_struct_declaration537)
+                # C.g:190:2: ( specifier_qualifier_list struct_declarator_list ';' )
+                # C.g:190:4: specifier_qualifier_list struct_declarator_list ';'
+                self.following.append(self.FOLLOW_specifier_qualifier_list_in_struct_declaration539)
                 self.specifier_qualifier_list()
                 self.following.pop()
                 if self.failed:
                     return 
-                self.following.append(self.FOLLOW_struct_declarator_list_in_struct_declaration539)
+                self.following.append(self.FOLLOW_struct_declarator_list_in_struct_declaration541)
                 self.struct_declarator_list()
                 self.following.pop()
                 if self.failed:
                     return 
-                self.match(self.input, 25, self.FOLLOW_25_in_struct_declaration541)
+                self.match(self.input, 25, self.FOLLOW_25_in_struct_declaration543)
                 if self.failed:
                     return 
 
@@ -1646,7 +1664,7 @@ class CParser(Parser):
 
 
     # $ANTLR start specifier_qualifier_list
-    # C.g:192:1: specifier_qualifier_list : ( type_qualifier | type_specifier )+ ;
+    # C.g:193:1: specifier_qualifier_list : ( type_qualifier | type_specifier )+ ;
     def specifier_qualifier_list(self, ):
 
         specifier_qualifier_list_StartIndex = self.input.index()
@@ -1655,56 +1673,56 @@ class CParser(Parser):
                 if self.backtracking > 0 and self.alreadyParsedRule(self.input, 15):
                     return 
 
-                # C.g:193:2: ( ( type_qualifier | type_specifier )+ )
-                # C.g:193:4: ( type_qualifier | type_specifier )+
-                # C.g:193:4: ( type_qualifier | type_specifier )+
-                cnt18 = 0
-                while True: #loop18
-                    alt18 = 3
-                    LA18 = self.input.LA(1)
-                    if LA18 == IDENTIFIER:
-                        LA18 = self.input.LA(2)
-                        if LA18 == EOF or LA18 == IDENTIFIER or LA18 == 34 or LA18 == 35 or LA18 == 36 or LA18 == 37 or LA18 == 38 or LA18 == 39 or LA18 == 40 or LA18 == 41 or LA18 == 42 or LA18 == 45 or LA18 == 46 or LA18 == 48 or LA18 == 49 or LA18 == 50 or LA18 == 51 or LA18 == 52 or LA18 == 53 or LA18 == 54 or LA18 == 56 or LA18 == 59:
-                            alt18 = 2
-                        elif LA18 == 55:
-                            LA18_24 = self.input.LA(3)
+                # C.g:194:2: ( ( type_qualifier | type_specifier )+ )
+                # C.g:194:4: ( type_qualifier | type_specifier )+
+                # C.g:194:4: ( type_qualifier | type_specifier )+
+                cnt17 = 0
+                while True: #loop17
+                    alt17 = 3
+                    LA17 = self.input.LA(1)
+                    if LA17 == IDENTIFIER:
+                        LA17 = self.input.LA(2)
+                        if LA17 == 59:
+                            LA17_22 = self.input.LA(3)
 
                             if (self.synpred40()) :
-                                alt18 = 2
+                                alt17 = 2
 
 
-                        elif LA18 == 47:
-                            LA18_25 = self.input.LA(3)
+                        elif LA17 == 57:
+                            LA17_23 = self.input.LA(3)
 
                             if (self.synpred40()) :
-                                alt18 = 2
+                                alt17 = 2
 
 
-                        elif LA18 == 57:
-                            LA18_26 = self.input.LA(3)
+                        elif LA17 == 48:
+                            LA17_24 = self.input.LA(3)
 
                             if (self.synpred40()) :
-                                alt18 = 2
+                                alt17 = 2
 
 
+                        elif LA17 == EOF or LA17 == IDENTIFIER or LA17 == 34 or LA17 == 35 or LA17 == 36 or LA17 == 37 or LA17 == 38 or LA17 == 39 or LA17 == 40 or LA17 == 41 or LA17 == 42 or LA17 == 43 or LA17 == 46 or LA17 == 47 or LA17 == 49 or LA17 == 50 or LA17 == 51 or LA17 == 52 or LA17 == 53 or LA17 == 54 or LA17 == 55 or LA17 == 56 or LA17 == 58 or LA17 == 61:
+                            alt17 = 2
 
-                    elif LA18 == 49 or LA18 == 50 or LA18 == 51 or LA18 == 52 or LA18 == 53:
-                        alt18 = 1
-                    elif LA18 == 34 or LA18 == 35 or LA18 == 36 or LA18 == 37 or LA18 == 38 or LA18 == 39 or LA18 == 40 or LA18 == 41 or LA18 == 42 or LA18 == 45 or LA18 == 46 or LA18 == 48:
-                        alt18 = 2
+                    elif LA17 == 50 or LA17 == 51 or LA17 == 52 or LA17 == 53 or LA17 == 54 or LA17 == 55:
+                        alt17 = 1
+                    elif LA17 == 34 or LA17 == 35 or LA17 == 36 or LA17 == 37 or LA17 == 38 or LA17 == 39 or LA17 == 40 or LA17 == 41 or LA17 == 42 or LA17 == 43 or LA17 == 46 or LA17 == 47 or LA17 == 49:
+                        alt17 = 2
 
-                    if alt18 == 1:
-                        # C.g:193:6: type_qualifier
-                        self.following.append(self.FOLLOW_type_qualifier_in_specifier_qualifier_list554)
+                    if alt17 == 1:
+                        # C.g:194:6: type_qualifier
+                        self.following.append(self.FOLLOW_type_qualifier_in_specifier_qualifier_list556)
                         self.type_qualifier()
                         self.following.pop()
                         if self.failed:
                             return 
 
 
-                    elif alt18 == 2:
-                        # C.g:193:23: type_specifier
-                        self.following.append(self.FOLLOW_type_specifier_in_specifier_qualifier_list558)
+                    elif alt17 == 2:
+                        # C.g:194:23: type_specifier
+                        self.following.append(self.FOLLOW_type_specifier_in_specifier_qualifier_list560)
                         self.type_specifier()
                         self.following.pop()
                         if self.failed:
@@ -1712,17 +1730,17 @@ class CParser(Parser):
 
 
                     else:
-                        if cnt18 >= 1:
-                            break #loop18
+                        if cnt17 >= 1:
+                            break #loop17
 
                         if self.backtracking > 0:
                             self.failed = True
                             return 
 
-                        eee = EarlyExitException(18, self.input)
+                        eee = EarlyExitException(17, self.input)
                         raise eee
 
-                    cnt18 += 1
+                    cnt17 += 1
 
 
 
@@ -1744,7 +1762,7 @@ class CParser(Parser):
 
 
     # $ANTLR start struct_declarator_list
-    # C.g:196:1: struct_declarator_list : struct_declarator ( ',' struct_declarator )* ;
+    # C.g:197:1: struct_declarator_list : struct_declarator ( ',' struct_declarator )* ;
     def struct_declarator_list(self, ):
 
         struct_declarator_list_StartIndex = self.input.index()
@@ -1753,28 +1771,28 @@ class CParser(Parser):
                 if self.backtracking > 0 and self.alreadyParsedRule(self.input, 16):
                     return 
 
-                # C.g:197:2: ( struct_declarator ( ',' struct_declarator )* )
-                # C.g:197:4: struct_declarator ( ',' struct_declarator )*
-                self.following.append(self.FOLLOW_struct_declarator_in_struct_declarator_list572)
+                # C.g:198:2: ( struct_declarator ( ',' struct_declarator )* )
+                # C.g:198:4: struct_declarator ( ',' struct_declarator )*
+                self.following.append(self.FOLLOW_struct_declarator_in_struct_declarator_list574)
                 self.struct_declarator()
                 self.following.pop()
                 if self.failed:
                     return 
-                # C.g:197:22: ( ',' struct_declarator )*
-                while True: #loop19
-                    alt19 = 2
-                    LA19_0 = self.input.LA(1)
+                # C.g:198:22: ( ',' struct_declarator )*
+                while True: #loop18
+                    alt18 = 2
+                    LA18_0 = self.input.LA(1)
 
-                    if (LA19_0 == 27) :
-                        alt19 = 1
+                    if (LA18_0 == 27) :
+                        alt18 = 1
 
 
-                    if alt19 == 1:
-                        # C.g:197:23: ',' struct_declarator
-                        self.match(self.input, 27, self.FOLLOW_27_in_struct_declarator_list575)
+                    if alt18 == 1:
+                        # C.g:198:23: ',' struct_declarator
+                        self.match(self.input, 27, self.FOLLOW_27_in_struct_declarator_list577)
                         if self.failed:
                             return 
-                        self.following.append(self.FOLLOW_struct_declarator_in_struct_declarator_list577)
+                        self.following.append(self.FOLLOW_struct_declarator_in_struct_declarator_list579)
                         self.struct_declarator()
                         self.following.pop()
                         if self.failed:
@@ -1782,7 +1800,7 @@ class CParser(Parser):
 
 
                     else:
-                        break #loop19
+                        break #loop18
 
 
 
@@ -1804,7 +1822,7 @@ class CParser(Parser):
 
 
     # $ANTLR start struct_declarator
-    # C.g:200:1: struct_declarator : ( declarator ( ':' constant_expression )? | ':' constant_expression );
+    # C.g:201:1: struct_declarator : ( declarator ( ':' constant_expression )? | ':' constant_expression );
     def struct_declarator(self, ):
 
         struct_declarator_StartIndex = self.input.index()
@@ -1813,42 +1831,42 @@ class CParser(Parser):
                 if self.backtracking > 0 and self.alreadyParsedRule(self.input, 17):
                     return 
 
-                # C.g:201:2: ( declarator ( ':' constant_expression )? | ':' constant_expression )
-                alt21 = 2
-                LA21_0 = self.input.LA(1)
+                # C.g:202:2: ( declarator ( ':' constant_expression )? | ':' constant_expression )
+                alt20 = 2
+                LA20_0 = self.input.LA(1)
 
-                if (LA21_0 == IDENTIFIER or (54 <= LA21_0 <= 55) or LA21_0 == 59) :
-                    alt21 = 1
-                elif (LA21_0 == 47) :
-                    alt21 = 2
+                if (LA20_0 == IDENTIFIER or (56 <= LA20_0 <= 57) or LA20_0 == 61) :
+                    alt20 = 1
+                elif (LA20_0 == 48) :
+                    alt20 = 2
                 else:
                     if self.backtracking > 0:
                         self.failed = True
                         return 
 
-                    nvae = NoViableAltException("200:1: struct_declarator : ( declarator ( ':' constant_expression )? | ':' constant_expression );", 21, 0, self.input)
+                    nvae = NoViableAltException("201:1: struct_declarator : ( declarator ( ':' constant_expression )? | ':' constant_expression );", 20, 0, self.input)
 
                     raise nvae
 
-                if alt21 == 1:
-                    # C.g:201:4: declarator ( ':' constant_expression )?
-                    self.following.append(self.FOLLOW_declarator_in_struct_declarator590)
+                if alt20 == 1:
+                    # C.g:202:4: declarator ( ':' constant_expression )?
+                    self.following.append(self.FOLLOW_declarator_in_struct_declarator592)
                     self.declarator()
                     self.following.pop()
                     if self.failed:
                         return 
-                    # C.g:201:15: ( ':' constant_expression )?
-                    alt20 = 2
-                    LA20_0 = self.input.LA(1)
+                    # C.g:202:15: ( ':' constant_expression )?
+                    alt19 = 2
+                    LA19_0 = self.input.LA(1)
 
-                    if (LA20_0 == 47) :
-                        alt20 = 1
-                    if alt20 == 1:
-                        # C.g:201:16: ':' constant_expression
-                        self.match(self.input, 47, self.FOLLOW_47_in_struct_declarator593)
+                    if (LA19_0 == 48) :
+                        alt19 = 1
+                    if alt19 == 1:
+                        # C.g:202:16: ':' constant_expression
+                        self.match(self.input, 48, self.FOLLOW_48_in_struct_declarator595)
                         if self.failed:
                             return 
-                        self.following.append(self.FOLLOW_constant_expression_in_struct_declarator595)
+                        self.following.append(self.FOLLOW_constant_expression_in_struct_declarator597)
                         self.constant_expression()
                         self.following.pop()
                         if self.failed:
@@ -1858,12 +1876,12 @@ class CParser(Parser):
 
 
 
-                elif alt21 == 2:
-                    # C.g:202:4: ':' constant_expression
-                    self.match(self.input, 47, self.FOLLOW_47_in_struct_declarator602)
+                elif alt20 == 2:
+                    # C.g:203:4: ':' constant_expression
+                    self.match(self.input, 48, self.FOLLOW_48_in_struct_declarator604)
                     if self.failed:
                         return 
-                    self.following.append(self.FOLLOW_constant_expression_in_struct_declarator604)
+                    self.following.append(self.FOLLOW_constant_expression_in_struct_declarator606)
                     self.constant_expression()
                     self.following.pop()
                     if self.failed:
@@ -1892,7 +1910,7 @@ class CParser(Parser):
 
 
     # $ANTLR start enum_specifier
-    # C.g:205:1: enum_specifier options {k=3; } : ( 'enum' '{' enumerator_list '}' | 'enum' IDENTIFIER '{' enumerator_list '}' | 'enum' IDENTIFIER );
+    # C.g:206:1: enum_specifier options {k=3; } : ( 'enum' '{' enumerator_list '}' | 'enum' IDENTIFIER '{' enumerator_list '}' | 'enum' IDENTIFIER );
     def enum_specifier(self, ):
 
         retval = self.enum_specifier_return()
@@ -1903,37 +1921,37 @@ class CParser(Parser):
                 if self.backtracking > 0 and self.alreadyParsedRule(self.input, 18):
                     return retval
 
-                # C.g:207:2: ( 'enum' '{' enumerator_list '}' | 'enum' IDENTIFIER '{' enumerator_list '}' | 'enum' IDENTIFIER )
-                alt22 = 3
-                LA22_0 = self.input.LA(1)
+                # C.g:208:2: ( 'enum' '{' enumerator_list '}' | 'enum' IDENTIFIER '{' enumerator_list '}' | 'enum' IDENTIFIER )
+                alt21 = 3
+                LA21_0 = self.input.LA(1)
 
-                if (LA22_0 == 48) :
-                    LA22_1 = self.input.LA(2)
+                if (LA21_0 == 49) :
+                    LA21_1 = self.input.LA(2)
 
-                    if (LA22_1 == IDENTIFIER) :
-                        LA22_2 = self.input.LA(3)
+                    if (LA21_1 == IDENTIFIER) :
+                        LA21_2 = self.input.LA(3)
 
-                        if (LA22_2 == 43) :
-                            alt22 = 2
-                        elif (LA22_2 == EOF or LA22_2 == IDENTIFIER or LA22_2 == 25 or (29 <= LA22_2 <= 42) or (45 <= LA22_2 <= 57) or LA22_2 == 59) :
-                            alt22 = 3
+                        if (LA21_2 == 44) :
+                            alt21 = 2
+                        elif (LA21_2 == EOF or LA21_2 == IDENTIFIER or LA21_2 == 25 or LA21_2 == 27 or (29 <= LA21_2 <= 43) or (46 <= LA21_2 <= 59) or LA21_2 == 61) :
+                            alt21 = 3
                         else:
                             if self.backtracking > 0:
                                 self.failed = True
                                 return retval
 
-                            nvae = NoViableAltException("205:1: enum_specifier options {k=3; } : ( 'enum' '{' enumerator_list '}' | 'enum' IDENTIFIER '{' enumerator_list '}' | 'enum' IDENTIFIER );", 22, 2, self.input)
+                            nvae = NoViableAltException("206:1: enum_specifier options {k=3; } : ( 'enum' '{' enumerator_list '}' | 'enum' IDENTIFIER '{' enumerator_list '}' | 'enum' IDENTIFIER );", 21, 2, self.input)
 
                             raise nvae
 
-                    elif (LA22_1 == 43) :
-                        alt22 = 1
+                    elif (LA21_1 == 44) :
+                        alt21 = 1
                     else:
                         if self.backtracking > 0:
                             self.failed = True
                             return retval
 
-                        nvae = NoViableAltException("205:1: enum_specifier options {k=3; } : ( 'enum' '{' enumerator_list '}' | 'enum' IDENTIFIER '{' enumerator_list '}' | 'enum' IDENTIFIER );", 22, 1, self.input)
+                        nvae = NoViableAltException("206:1: enum_specifier options {k=3; } : ( 'enum' '{' enumerator_list '}' | 'enum' IDENTIFIER '{' enumerator_list '}' | 'enum' IDENTIFIER );", 21, 1, self.input)
 
                         raise nvae
 
@@ -1942,55 +1960,55 @@ class CParser(Parser):
                         self.failed = True
                         return retval
 
-                    nvae = NoViableAltException("205:1: enum_specifier options {k=3; } : ( 'enum' '{' enumerator_list '}' | 'enum' IDENTIFIER '{' enumerator_list '}' | 'enum' IDENTIFIER );", 22, 0, self.input)
+                    nvae = NoViableAltException("206:1: enum_specifier options {k=3; } : ( 'enum' '{' enumerator_list '}' | 'enum' IDENTIFIER '{' enumerator_list '}' | 'enum' IDENTIFIER );", 21, 0, self.input)
 
                     raise nvae
 
-                if alt22 == 1:
-                    # C.g:207:4: 'enum' '{' enumerator_list '}'
-                    self.match(self.input, 48, self.FOLLOW_48_in_enum_specifier622)
+                if alt21 == 1:
+                    # C.g:208:4: 'enum' '{' enumerator_list '}'
+                    self.match(self.input, 49, self.FOLLOW_49_in_enum_specifier624)
                     if self.failed:
                         return retval
-                    self.match(self.input, 43, self.FOLLOW_43_in_enum_specifier624)
+                    self.match(self.input, 44, self.FOLLOW_44_in_enum_specifier626)
                     if self.failed:
                         return retval
-                    self.following.append(self.FOLLOW_enumerator_list_in_enum_specifier626)
+                    self.following.append(self.FOLLOW_enumerator_list_in_enum_specifier628)
                     self.enumerator_list()
                     self.following.pop()
                     if self.failed:
                         return retval
-                    self.match(self.input, 44, self.FOLLOW_44_in_enum_specifier628)
+                    self.match(self.input, 45, self.FOLLOW_45_in_enum_specifier630)
                     if self.failed:
                         return retval
 
 
-                elif alt22 == 2:
-                    # C.g:208:4: 'enum' IDENTIFIER '{' enumerator_list '}'
-                    self.match(self.input, 48, self.FOLLOW_48_in_enum_specifier633)
+                elif alt21 == 2:
+                    # C.g:209:4: 'enum' IDENTIFIER '{' enumerator_list '}'
+                    self.match(self.input, 49, self.FOLLOW_49_in_enum_specifier635)
                     if self.failed:
                         return retval
-                    self.match(self.input, IDENTIFIER, self.FOLLOW_IDENTIFIER_in_enum_specifier635)
+                    self.match(self.input, IDENTIFIER, self.FOLLOW_IDENTIFIER_in_enum_specifier637)
                     if self.failed:
                         return retval
-                    self.match(self.input, 43, self.FOLLOW_43_in_enum_specifier637)
+                    self.match(self.input, 44, self.FOLLOW_44_in_enum_specifier639)
                     if self.failed:
                         return retval
-                    self.following.append(self.FOLLOW_enumerator_list_in_enum_specifier639)
+                    self.following.append(self.FOLLOW_enumerator_list_in_enum_specifier641)
                     self.enumerator_list()
                     self.following.pop()
                     if self.failed:
                         return retval
-                    self.match(self.input, 44, self.FOLLOW_44_in_enum_specifier641)
+                    self.match(self.input, 45, self.FOLLOW_45_in_enum_specifier643)
                     if self.failed:
                         return retval
 
 
-                elif alt22 == 3:
-                    # C.g:209:4: 'enum' IDENTIFIER
-                    self.match(self.input, 48, self.FOLLOW_48_in_enum_specifier646)
+                elif alt21 == 3:
+                    # C.g:210:4: 'enum' IDENTIFIER
+                    self.match(self.input, 49, self.FOLLOW_49_in_enum_specifier648)
                     if self.failed:
                         return retval
-                    self.match(self.input, IDENTIFIER, self.FOLLOW_IDENTIFIER_in_enum_specifier648)
+                    self.match(self.input, IDENTIFIER, self.FOLLOW_IDENTIFIER_in_enum_specifier650)
                     if self.failed:
                         return retval
 
@@ -2013,7 +2031,7 @@ class CParser(Parser):
 
 
     # $ANTLR start enumerator_list
-    # C.g:212:1: enumerator_list : enumerator ( ',' enumerator )* ;
+    # C.g:213:1: enumerator_list : enumerator ( ',' enumerator )* ;
     def enumerator_list(self, ):
 
         enumerator_list_StartIndex = self.input.index()
@@ -2022,28 +2040,28 @@ class CParser(Parser):
                 if self.backtracking > 0 and self.alreadyParsedRule(self.input, 19):
                     return 
 
-                # C.g:213:2: ( enumerator ( ',' enumerator )* )
-                # C.g:213:4: enumerator ( ',' enumerator )*
-                self.following.append(self.FOLLOW_enumerator_in_enumerator_list659)
+                # C.g:214:2: ( enumerator ( ',' enumerator )* )
+                # C.g:214:4: enumerator ( ',' enumerator )*
+                self.following.append(self.FOLLOW_enumerator_in_enumerator_list661)
                 self.enumerator()
                 self.following.pop()
                 if self.failed:
                     return 
-                # C.g:213:15: ( ',' enumerator )*
-                while True: #loop23
-                    alt23 = 2
-                    LA23_0 = self.input.LA(1)
+                # C.g:214:15: ( ',' enumerator )*
+                while True: #loop22
+                    alt22 = 2
+                    LA22_0 = self.input.LA(1)
 
-                    if (LA23_0 == 27) :
-                        alt23 = 1
+                    if (LA22_0 == 27) :
+                        alt22 = 1
 
 
-                    if alt23 == 1:
-                        # C.g:213:16: ',' enumerator
-                        self.match(self.input, 27, self.FOLLOW_27_in_enumerator_list662)
+                    if alt22 == 1:
+                        # C.g:214:16: ',' enumerator
+                        self.match(self.input, 27, self.FOLLOW_27_in_enumerator_list664)
                         if self.failed:
                             return 
-                        self.following.append(self.FOLLOW_enumerator_in_enumerator_list664)
+                        self.following.append(self.FOLLOW_enumerator_in_enumerator_list666)
                         self.enumerator()
                         self.following.pop()
                         if self.failed:
@@ -2051,7 +2069,7 @@ class CParser(Parser):
 
 
                     else:
-                        break #loop23
+                        break #loop22
 
 
 
@@ -2073,7 +2091,7 @@ class CParser(Parser):
 
 
     # $ANTLR start enumerator
-    # C.g:216:1: enumerator : IDENTIFIER ( '=' constant_expression )? ;
+    # C.g:217:1: enumerator : IDENTIFIER ( '=' constant_expression )? ;
     def enumerator(self, ):
 
         enumerator_StartIndex = self.input.index()
@@ -2082,23 +2100,23 @@ class CParser(Parser):
                 if self.backtracking > 0 and self.alreadyParsedRule(self.input, 20):
                     return 
 
-                # C.g:217:2: ( IDENTIFIER ( '=' constant_expression )? )
-                # C.g:217:4: IDENTIFIER ( '=' constant_expression )?
-                self.match(self.input, IDENTIFIER, self.FOLLOW_IDENTIFIER_in_enumerator677)
+                # C.g:218:2: ( IDENTIFIER ( '=' constant_expression )? )
+                # C.g:218:4: IDENTIFIER ( '=' constant_expression )?
+                self.match(self.input, IDENTIFIER, self.FOLLOW_IDENTIFIER_in_enumerator679)
                 if self.failed:
                     return 
-                # C.g:217:15: ( '=' constant_expression )?
-                alt24 = 2
-                LA24_0 = self.input.LA(1)
+                # C.g:218:15: ( '=' constant_expression )?
+                alt23 = 2
+                LA23_0 = self.input.LA(1)
 
-                if (LA24_0 == 28) :
-                    alt24 = 1
-                if alt24 == 1:
-                    # C.g:217:16: '=' constant_expression
-                    self.match(self.input, 28, self.FOLLOW_28_in_enumerator680)
+                if (LA23_0 == 28) :
+                    alt23 = 1
+                if alt23 == 1:
+                    # C.g:218:16: '=' constant_expression
+                    self.match(self.input, 28, self.FOLLOW_28_in_enumerator682)
                     if self.failed:
                         return 
-                    self.following.append(self.FOLLOW_constant_expression_in_enumerator682)
+                    self.following.append(self.FOLLOW_constant_expression_in_enumerator684)
                     self.constant_expression()
                     self.following.pop()
                     if self.failed:
@@ -2125,7 +2143,7 @@ class CParser(Parser):
 
 
     # $ANTLR start type_qualifier
-    # C.g:220:1: type_qualifier : ( 'const' | 'volatile' | 'IN' | 'OUT' | 'OPTIONAL' );
+    # C.g:221:1: type_qualifier : ( 'const' | 'volatile' | 'IN' | 'OUT' | 'OPTIONAL' | 'CONST' );
     def type_qualifier(self, ):
 
         type_qualifier_StartIndex = self.input.index()
@@ -2134,9 +2152,9 @@ class CParser(Parser):
                 if self.backtracking > 0 and self.alreadyParsedRule(self.input, 21):
                     return 
 
-                # C.g:221:2: ( 'const' | 'volatile' | 'IN' | 'OUT' | 'OPTIONAL' )
+                # C.g:222:2: ( 'const' | 'volatile' | 'IN' | 'OUT' | 'OPTIONAL' | 'CONST' )
                 # C.g:
-                if (49 <= self.input.LA(1) <= 53):
+                if (50 <= self.input.LA(1) <= 55):
                     self.input.consume();
                     self.errorRecovery = False
                     self.failed = False
@@ -2178,7 +2196,7 @@ class CParser(Parser):
 
 
     # $ANTLR start declarator
-    # C.g:228:1: declarator : ( ( 'EFIAPI' )? ( pointer )? direct_declarator | pointer );
+    # C.g:230:1: declarator : ( ( 'EFIAPI' )? ( pointer )? direct_declarator | pointer );
     def declarator(self, ):
 
         retval = self.declarator_return()
@@ -2189,25 +2207,25 @@ class CParser(Parser):
                 if self.backtracking > 0 and self.alreadyParsedRule(self.input, 22):
                     return retval
 
-                # C.g:229:2: ( ( 'EFIAPI' )? ( pointer )? direct_declarator | pointer )
-                alt27 = 2
-                LA27_0 = self.input.LA(1)
+                # C.g:231:2: ( ( 'EFIAPI' )? ( pointer )? direct_declarator | pointer )
+                alt26 = 2
+                LA26_0 = self.input.LA(1)
 
-                if (LA27_0 == IDENTIFIER or (54 <= LA27_0 <= 55)) :
-                    alt27 = 1
-                elif (LA27_0 == 59) :
-                    LA27_2 = self.input.LA(2)
+                if (LA26_0 == IDENTIFIER or (56 <= LA26_0 <= 57)) :
+                    alt26 = 1
+                elif (LA26_0 == 61) :
+                    LA26_2 = self.input.LA(2)
 
-                    if (self.synpred54()) :
-                        alt27 = 1
+                    if (self.synpred55()) :
+                        alt26 = 1
                     elif (True) :
-                        alt27 = 2
+                        alt26 = 2
                     else:
                         if self.backtracking > 0:
                             self.failed = True
                             return retval
 
-                        nvae = NoViableAltException("228:1: declarator : ( ( 'EFIAPI' )? ( pointer )? direct_declarator | pointer );", 27, 2, self.input)
+                        nvae = NoViableAltException("230:1: declarator : ( ( 'EFIAPI' )? ( pointer )? direct_declarator | pointer );", 26, 2, self.input)
 
                         raise nvae
 
@@ -2216,35 +2234,35 @@ class CParser(Parser):
                         self.failed = True
                         return retval
 
-                    nvae = NoViableAltException("228:1: declarator : ( ( 'EFIAPI' )? ( pointer )? direct_declarator | pointer );", 27, 0, self.input)
+                    nvae = NoViableAltException("230:1: declarator : ( ( 'EFIAPI' )? ( pointer )? direct_declarator | pointer );", 26, 0, self.input)
 
                     raise nvae
 
-                if alt27 == 1:
-                    # C.g:229:4: ( 'EFIAPI' )? ( pointer )? direct_declarator
-                    # C.g:229:4: ( 'EFIAPI' )?
-                    alt25 = 2
-                    LA25_0 = self.input.LA(1)
-
-                    if (LA25_0 == 54) :
-                        alt25 = 1
-                    if alt25 == 1:
-                        # C.g:229:5: 'EFIAPI'
-                        self.match(self.input, 54, self.FOLLOW_54_in_declarator727)
+                if alt26 == 1:
+                    # C.g:231:4: ( 'EFIAPI' )? ( pointer )? direct_declarator
+                    # C.g:231:4: ( 'EFIAPI' )?
+                    alt24 = 2
+                    LA24_0 = self.input.LA(1)
+
+                    if (LA24_0 == 56) :
+                        alt24 = 1
+                    if alt24 == 1:
+                        # C.g:231:5: 'EFIAPI'
+                        self.match(self.input, 56, self.FOLLOW_56_in_declarator734)
                         if self.failed:
                             return retval
 
 
 
-                    # C.g:229:16: ( pointer )?
-                    alt26 = 2
-                    LA26_0 = self.input.LA(1)
+                    # C.g:231:16: ( pointer )?
+                    alt25 = 2
+                    LA25_0 = self.input.LA(1)
 
-                    if (LA26_0 == 59) :
-                        alt26 = 1
-                    if alt26 == 1:
+                    if (LA25_0 == 61) :
+                        alt25 = 1
+                    if alt25 == 1:
                         # C.g:0:0: pointer
-                        self.following.append(self.FOLLOW_pointer_in_declarator731)
+                        self.following.append(self.FOLLOW_pointer_in_declarator738)
                         self.pointer()
                         self.following.pop()
                         if self.failed:
@@ -2252,16 +2270,16 @@ class CParser(Parser):
 
 
 
-                    self.following.append(self.FOLLOW_direct_declarator_in_declarator734)
+                    self.following.append(self.FOLLOW_direct_declarator_in_declarator741)
                     self.direct_declarator()
                     self.following.pop()
                     if self.failed:
                         return retval
 
 
-                elif alt27 == 2:
-                    # C.g:230:4: pointer
-                    self.following.append(self.FOLLOW_pointer_in_declarator739)
+                elif alt26 == 2:
+                    # C.g:232:4: pointer
+                    self.following.append(self.FOLLOW_pointer_in_declarator746)
                     self.pointer()
                     self.following.pop()
                     if self.failed:
@@ -2286,7 +2304,7 @@ class CParser(Parser):
 
 
     # $ANTLR start direct_declarator
-    # C.g:233:1: direct_declarator : ( IDENTIFIER ( declarator_suffix )* | '(' declarator ')' ( declarator_suffix )+ );
+    # C.g:235:1: direct_declarator : ( IDENTIFIER ( declarator_suffix )* | '(' declarator ')' ( declarator_suffix )+ );
     def direct_declarator(self, ):
 
         direct_declarator_StartIndex = self.input.index()
@@ -2295,240 +2313,247 @@ class CParser(Parser):
                 if self.backtracking > 0 and self.alreadyParsedRule(self.input, 23):
                     return 
 
-                # C.g:234:2: ( IDENTIFIER ( declarator_suffix )* | '(' declarator ')' ( declarator_suffix )+ )
-                alt30 = 2
-                LA30_0 = self.input.LA(1)
+                # C.g:236:2: ( IDENTIFIER ( declarator_suffix )* | '(' declarator ')' ( declarator_suffix )+ )
+                alt29 = 2
+                LA29_0 = self.input.LA(1)
 
-                if (LA30_0 == IDENTIFIER) :
-                    alt30 = 1
-                elif (LA30_0 == 55) :
-                    alt30 = 2
+                if (LA29_0 == IDENTIFIER) :
+                    alt29 = 1
+                elif (LA29_0 == 57) :
+                    alt29 = 2
                 else:
                     if self.backtracking > 0:
                         self.failed = True
                         return 
 
-                    nvae = NoViableAltException("233:1: direct_declarator : ( IDENTIFIER ( declarator_suffix )* | '(' declarator ')' ( declarator_suffix )+ );", 30, 0, self.input)
+                    nvae = NoViableAltException("235:1: direct_declarator : ( IDENTIFIER ( declarator_suffix )* | '(' declarator ')' ( declarator_suffix )+ );", 29, 0, self.input)
 
                     raise nvae
 
-                if alt30 == 1:
-                    # C.g:234:4: IDENTIFIER ( declarator_suffix )*
-                    self.match(self.input, IDENTIFIER, self.FOLLOW_IDENTIFIER_in_direct_declarator750)
+                if alt29 == 1:
+                    # C.g:236:4: IDENTIFIER ( declarator_suffix )*
+                    self.match(self.input, IDENTIFIER, self.FOLLOW_IDENTIFIER_in_direct_declarator757)
                     if self.failed:
                         return 
-                    # C.g:234:15: ( declarator_suffix )*
-                    while True: #loop28
-                        alt28 = 2
-                        LA28_0 = self.input.LA(1)
+                    # C.g:236:15: ( declarator_suffix )*
+                    while True: #loop27
+                        alt27 = 2
+                        LA27_0 = self.input.LA(1)
 
-                        if (LA28_0 == 55) :
-                            LA28 = self.input.LA(2)
-                            if LA28 == 56:
-                                LA28_28 = self.input.LA(3)
+                        if (LA27_0 == 57) :
+                            LA27 = self.input.LA(2)
+                            if LA27 == 58:
+                                LA27_29 = self.input.LA(3)
 
-                                if (self.synpred55()) :
-                                    alt28 = 1
+                                if (self.synpred56()) :
+                                    alt27 = 1
 
 
-                            elif LA28 == 29 or LA28 == 30 or LA28 == 31 or LA28 == 32 or LA28 == 33:
-                                LA28_32 = self.input.LA(3)
+                            elif LA27 == 29 or LA27 == 30 or LA27 == 31 or LA27 == 32 or LA27 == 33:
+                                LA27_33 = self.input.LA(3)
 
-                                if (self.synpred55()) :
-                                    alt28 = 1
+                                if (self.synpred56()) :
+                                    alt27 = 1
 
 
-                            elif LA28 == 34:
-                                LA28_33 = self.input.LA(3)
+                            elif LA27 == 34:
+                                LA27_34 = self.input.LA(3)
 
-                                if (self.synpred55()) :
-                                    alt28 = 1
+                                if (self.synpred56()) :
+                                    alt27 = 1
 
 
-                            elif LA28 == 35:
-                                LA28_34 = self.input.LA(3)
+                            elif LA27 == 35:
+                                LA27_35 = self.input.LA(3)
 
-                                if (self.synpred55()) :
-                                    alt28 = 1
+                                if (self.synpred56()) :
+                                    alt27 = 1
 
 
-                            elif LA28 == 36:
-                                LA28_35 = self.input.LA(3)
+                            elif LA27 == 36:
+                                LA27_36 = self.input.LA(3)
 
-                                if (self.synpred55()) :
-                                    alt28 = 1
+                                if (self.synpred56()) :
+                                    alt27 = 1
 
 
-                            elif LA28 == 37:
-                                LA28_36 = self.input.LA(3)
+                            elif LA27 == 37:
+                                LA27_37 = self.input.LA(3)
 
-                                if (self.synpred55()) :
-                                    alt28 = 1
+                                if (self.synpred56()) :
+                                    alt27 = 1
 
 
-                            elif LA28 == 38:
-                                LA28_37 = self.input.LA(3)
+                            elif LA27 == 38:
+                                LA27_38 = self.input.LA(3)
 
-                                if (self.synpred55()) :
-                                    alt28 = 1
+                                if (self.synpred56()) :
+                                    alt27 = 1
 
 
-                            elif LA28 == 39:
-                                LA28_38 = self.input.LA(3)
+                            elif LA27 == 39:
+                                LA27_39 = self.input.LA(3)
 
-                                if (self.synpred55()) :
-                                    alt28 = 1
+                                if (self.synpred56()) :
+                                    alt27 = 1
 
 
-                            elif LA28 == 40:
-                                LA28_39 = self.input.LA(3)
+                            elif LA27 == 40:
+                                LA27_40 = self.input.LA(3)
 
-                                if (self.synpred55()) :
-                                    alt28 = 1
+                                if (self.synpred56()) :
+                                    alt27 = 1
 
 
-                            elif LA28 == 41:
-                                LA28_40 = self.input.LA(3)
+                            elif LA27 == 41:
+                                LA27_41 = self.input.LA(3)
 
-                                if (self.synpred55()) :
-                                    alt28 = 1
+                                if (self.synpred56()) :
+                                    alt27 = 1
 
 
-                            elif LA28 == 42:
-                                LA28_41 = self.input.LA(3)
+                            elif LA27 == 42:
+                                LA27_42 = self.input.LA(3)
 
-                                if (self.synpred55()) :
-                                    alt28 = 1
+                                if (self.synpred56()) :
+                                    alt27 = 1
 
 
-                            elif LA28 == 45 or LA28 == 46:
-                                LA28_42 = self.input.LA(3)
+                            elif LA27 == 43:
+                                LA27_43 = self.input.LA(3)
 
-                                if (self.synpred55()) :
-                                    alt28 = 1
+                                if (self.synpred56()) :
+                                    alt27 = 1
 
 
-                            elif LA28 == 48:
-                                LA28_43 = self.input.LA(3)
+                            elif LA27 == 46 or LA27 == 47:
+                                LA27_44 = self.input.LA(3)
 
-                                if (self.synpred55()) :
-                                    alt28 = 1
+                                if (self.synpred56()) :
+                                    alt27 = 1
 
 
-                            elif LA28 == IDENTIFIER:
-                                LA28_44 = self.input.LA(3)
+                            elif LA27 == 49:
+                                LA27_45 = self.input.LA(3)
 
-                                if (self.synpred55()) :
-                                    alt28 = 1
+                                if (self.synpred56()) :
+                                    alt27 = 1
 
 
-                            elif LA28 == 49 or LA28 == 50 or LA28 == 51 or LA28 == 52 or LA28 == 53:
-                                LA28_45 = self.input.LA(3)
+                            elif LA27 == IDENTIFIER:
+                                LA27_46 = self.input.LA(3)
 
-                                if (self.synpred55()) :
-                                    alt28 = 1
+                                if (self.synpred56()) :
+                                    alt27 = 1
 
 
+                            elif LA27 == 50 or LA27 == 51 or LA27 == 52 or LA27 == 53 or LA27 == 54 or LA27 == 55:
+                                LA27_47 = self.input.LA(3)
 
-                        elif (LA28_0 == 57) :
-                            LA28 = self.input.LA(2)
-                            if LA28 == 58:
-                                LA28_47 = self.input.LA(3)
+                                if (self.synpred56()) :
+                                    alt27 = 1
 
-                                if (self.synpred55()) :
-                                    alt28 = 1
 
 
-                            elif LA28 == 55:
-                                LA28_48 = self.input.LA(3)
+                        elif (LA27_0 == 59) :
+                            LA27 = self.input.LA(2)
+                            if LA27 == 60:
+                                LA27_49 = self.input.LA(3)
 
-                                if (self.synpred55()) :
-                                    alt28 = 1
+                                if (self.synpred56()) :
+                                    alt27 = 1
 
 
-                            elif LA28 == IDENTIFIER:
-                                LA28_49 = self.input.LA(3)
+                            elif LA27 == 57:
+                                LA27_50 = self.input.LA(3)
 
-                                if (self.synpred55()) :
-                                    alt28 = 1
+                                if (self.synpred56()) :
+                                    alt27 = 1
 
 
-                            elif LA28 == HEX_LITERAL:
-                                LA28_50 = self.input.LA(3)
+                            elif LA27 == IDENTIFIER:
+                                LA27_51 = self.input.LA(3)
 
-                                if (self.synpred55()) :
-                                    alt28 = 1
+                                if (self.synpred56()) :
+                                    alt27 = 1
 
 
-                            elif LA28 == OCTAL_LITERAL:
-                                LA28_51 = self.input.LA(3)
+                            elif LA27 == HEX_LITERAL:
+                                LA27_52 = self.input.LA(3)
 
-                                if (self.synpred55()) :
-                                    alt28 = 1
+                                if (self.synpred56()) :
+                                    alt27 = 1
 
 
-                            elif LA28 == DECIMAL_LITERAL:
-                                LA28_52 = self.input.LA(3)
+                            elif LA27 == OCTAL_LITERAL:
+                                LA27_53 = self.input.LA(3)
 
-                                if (self.synpred55()) :
-                                    alt28 = 1
+                                if (self.synpred56()) :
+                                    alt27 = 1
 
 
-                            elif LA28 == CHARACTER_LITERAL:
-                                LA28_53 = self.input.LA(3)
+                            elif LA27 == DECIMAL_LITERAL:
+                                LA27_54 = self.input.LA(3)
 
-                                if (self.synpred55()) :
-                                    alt28 = 1
+                                if (self.synpred56()) :
+                                    alt27 = 1
 
 
-                            elif LA28 == STRING_LITERAL:
-                                LA28_54 = self.input.LA(3)
+                            elif LA27 == CHARACTER_LITERAL:
+                                LA27_55 = self.input.LA(3)
 
-                                if (self.synpred55()) :
-                                    alt28 = 1
+                                if (self.synpred56()) :
+                                    alt27 = 1
 
 
-                            elif LA28 == FLOATING_POINT_LITERAL:
-                                LA28_55 = self.input.LA(3)
+                            elif LA27 == STRING_LITERAL:
+                                LA27_56 = self.input.LA(3)
 
-                                if (self.synpred55()) :
-                                    alt28 = 1
+                                if (self.synpred56()) :
+                                    alt27 = 1
 
 
-                            elif LA28 == 65:
-                                LA28_56 = self.input.LA(3)
+                            elif LA27 == FLOATING_POINT_LITERAL:
+                                LA27_57 = self.input.LA(3)
 
-                                if (self.synpred55()) :
-                                    alt28 = 1
+                                if (self.synpred56()) :
+                                    alt27 = 1
 
 
-                            elif LA28 == 66:
-                                LA28_57 = self.input.LA(3)
+                            elif LA27 == 67:
+                                LA27_58 = self.input.LA(3)
 
-                                if (self.synpred55()) :
-                                    alt28 = 1
+                                if (self.synpred56()) :
+                                    alt27 = 1
 
 
-                            elif LA28 == 59 or LA28 == 61 or LA28 == 62 or LA28 == 70 or LA28 == 71 or LA28 == 72:
-                                LA28_58 = self.input.LA(3)
+                            elif LA27 == 68:
+                                LA27_59 = self.input.LA(3)
 
-                                if (self.synpred55()) :
-                                    alt28 = 1
+                                if (self.synpred56()) :
+                                    alt27 = 1
 
 
-                            elif LA28 == 67:
-                                LA28_59 = self.input.LA(3)
+                            elif LA27 == 61 or LA27 == 63 or LA27 == 64 or LA27 == 72 or LA27 == 73 or LA27 == 74:
+                                LA27_60 = self.input.LA(3)
 
-                                if (self.synpred55()) :
-                                    alt28 = 1
+                                if (self.synpred56()) :
+                                    alt27 = 1
 
 
+                            elif LA27 == 69:
+                                LA27_61 = self.input.LA(3)
 
+                                if (self.synpred56()) :
+                                    alt27 = 1
 
 
-                        if alt28 == 1:
+
+
+
+                        if alt27 == 1:
                             # C.g:0:0: declarator_suffix
-                            self.following.append(self.FOLLOW_declarator_suffix_in_direct_declarator752)
+                            self.following.append(self.FOLLOW_declarator_suffix_in_direct_declarator759)
                             self.declarator_suffix()
                             self.following.pop()
                             if self.failed:
@@ -2536,237 +2561,244 @@ class CParser(Parser):
 
 
                         else:
-                            break #loop28
+                            break #loop27
 
 
 
 
-                elif alt30 == 2:
-                    # C.g:235:4: '(' declarator ')' ( declarator_suffix )+
-                    self.match(self.input, 55, self.FOLLOW_55_in_direct_declarator758)
+                elif alt29 == 2:
+                    # C.g:237:4: '(' declarator ')' ( declarator_suffix )+
+                    self.match(self.input, 57, self.FOLLOW_57_in_direct_declarator765)
                     if self.failed:
                         return 
-                    self.following.append(self.FOLLOW_declarator_in_direct_declarator760)
+                    self.following.append(self.FOLLOW_declarator_in_direct_declarator767)
                     self.declarator()
                     self.following.pop()
                     if self.failed:
                         return 
-                    self.match(self.input, 56, self.FOLLOW_56_in_direct_declarator762)
+                    self.match(self.input, 58, self.FOLLOW_58_in_direct_declarator769)
                     if self.failed:
                         return 
-                    # C.g:235:23: ( declarator_suffix )+
-                    cnt29 = 0
-                    while True: #loop29
-                        alt29 = 2
-                        LA29_0 = self.input.LA(1)
+                    # C.g:237:23: ( declarator_suffix )+
+                    cnt28 = 0
+                    while True: #loop28
+                        alt28 = 2
+                        LA28_0 = self.input.LA(1)
 
-                        if (LA29_0 == 55) :
-                            LA29 = self.input.LA(2)
-                            if LA29 == 56:
-                                LA29_28 = self.input.LA(3)
+                        if (LA28_0 == 57) :
+                            LA28 = self.input.LA(2)
+                            if LA28 == 58:
+                                LA28_29 = self.input.LA(3)
 
-                                if (self.synpred57()) :
-                                    alt29 = 1
+                                if (self.synpred58()) :
+                                    alt28 = 1
 
 
-                            elif LA29 == 29 or LA29 == 30 or LA29 == 31 or LA29 == 32 or LA29 == 33:
-                                LA29_32 = self.input.LA(3)
+                            elif LA28 == 29 or LA28 == 30 or LA28 == 31 or LA28 == 32 or LA28 == 33:
+                                LA28_33 = self.input.LA(3)
 
-                                if (self.synpred57()) :
-                                    alt29 = 1
+                                if (self.synpred58()) :
+                                    alt28 = 1
 
 
-                            elif LA29 == 34:
-                                LA29_33 = self.input.LA(3)
+                            elif LA28 == 34:
+                                LA28_34 = self.input.LA(3)
 
-                                if (self.synpred57()) :
-                                    alt29 = 1
+                                if (self.synpred58()) :
+                                    alt28 = 1
 
 
-                            elif LA29 == 35:
-                                LA29_34 = self.input.LA(3)
+                            elif LA28 == 35:
+                                LA28_35 = self.input.LA(3)
 
-                                if (self.synpred57()) :
-                                    alt29 = 1
+                                if (self.synpred58()) :
+                                    alt28 = 1
 
 
-                            elif LA29 == 36:
-                                LA29_35 = self.input.LA(3)
+                            elif LA28 == 36:
+                                LA28_36 = self.input.LA(3)
 
-                                if (self.synpred57()) :
-                                    alt29 = 1
+                                if (self.synpred58()) :
+                                    alt28 = 1
 
 
-                            elif LA29 == 37:
-                                LA29_36 = self.input.LA(3)
+                            elif LA28 == 37:
+                                LA28_37 = self.input.LA(3)
 
-                                if (self.synpred57()) :
-                                    alt29 = 1
+                                if (self.synpred58()) :
+                                    alt28 = 1
 
 
-                            elif LA29 == 38:
-                                LA29_37 = self.input.LA(3)
+                            elif LA28 == 38:
+                                LA28_38 = self.input.LA(3)
 
-                                if (self.synpred57()) :
-                                    alt29 = 1
+                                if (self.synpred58()) :
+                                    alt28 = 1
 
 
-                            elif LA29 == 39:
-                                LA29_38 = self.input.LA(3)
+                            elif LA28 == 39:
+                                LA28_39 = self.input.LA(3)
 
-                                if (self.synpred57()) :
-                                    alt29 = 1
+                                if (self.synpred58()) :
+                                    alt28 = 1
 
 
-                            elif LA29 == 40:
-                                LA29_39 = self.input.LA(3)
+                            elif LA28 == 40:
+                                LA28_40 = self.input.LA(3)
 
-                                if (self.synpred57()) :
-                                    alt29 = 1
+                                if (self.synpred58()) :
+                                    alt28 = 1
 
 
-                            elif LA29 == 41:
-                                LA29_40 = self.input.LA(3)
+                            elif LA28 == 41:
+                                LA28_41 = self.input.LA(3)
 
-                                if (self.synpred57()) :
-                                    alt29 = 1
+                                if (self.synpred58()) :
+                                    alt28 = 1
 
 
-                            elif LA29 == 42:
-                                LA29_41 = self.input.LA(3)
+                            elif LA28 == 42:
+                                LA28_42 = self.input.LA(3)
 
-                                if (self.synpred57()) :
-                                    alt29 = 1
+                                if (self.synpred58()) :
+                                    alt28 = 1
 
 
-                            elif LA29 == 45 or LA29 == 46:
-                                LA29_42 = self.input.LA(3)
+                            elif LA28 == 43:
+                                LA28_43 = self.input.LA(3)
 
-                                if (self.synpred57()) :
-                                    alt29 = 1
+                                if (self.synpred58()) :
+                                    alt28 = 1
 
 
-                            elif LA29 == 48:
-                                LA29_43 = self.input.LA(3)
+                            elif LA28 == 46 or LA28 == 47:
+                                LA28_44 = self.input.LA(3)
 
-                                if (self.synpred57()) :
-                                    alt29 = 1
+                                if (self.synpred58()) :
+                                    alt28 = 1
 
 
-                            elif LA29 == IDENTIFIER:
-                                LA29_44 = self.input.LA(3)
+                            elif LA28 == 49:
+                                LA28_45 = self.input.LA(3)
 
-                                if (self.synpred57()) :
-                                    alt29 = 1
+                                if (self.synpred58()) :
+                                    alt28 = 1
 
 
-                            elif LA29 == 49 or LA29 == 50 or LA29 == 51 or LA29 == 52 or LA29 == 53:
-                                LA29_45 = self.input.LA(3)
+                            elif LA28 == IDENTIFIER:
+                                LA28_46 = self.input.LA(3)
 
-                                if (self.synpred57()) :
-                                    alt29 = 1
+                                if (self.synpred58()) :
+                                    alt28 = 1
 
 
+                            elif LA28 == 50 or LA28 == 51 or LA28 == 52 or LA28 == 53 or LA28 == 54 or LA28 == 55:
+                                LA28_47 = self.input.LA(3)
 
-                        elif (LA29_0 == 57) :
-                            LA29 = self.input.LA(2)
-                            if LA29 == 58:
-                                LA29_47 = self.input.LA(3)
+                                if (self.synpred58()) :
+                                    alt28 = 1
 
-                                if (self.synpred57()) :
-                                    alt29 = 1
 
 
-                            elif LA29 == 55:
-                                LA29_48 = self.input.LA(3)
+                        elif (LA28_0 == 59) :
+                            LA28 = self.input.LA(2)
+                            if LA28 == 60:
+                                LA28_49 = self.input.LA(3)
 
-                                if (self.synpred57()) :
-                                    alt29 = 1
+                                if (self.synpred58()) :
+                                    alt28 = 1
 
 
-                            elif LA29 == IDENTIFIER:
-                                LA29_49 = self.input.LA(3)
+                            elif LA28 == 57:
+                                LA28_50 = self.input.LA(3)
 
-                                if (self.synpred57()) :
-                                    alt29 = 1
+                                if (self.synpred58()) :
+                                    alt28 = 1
 
 
-                            elif LA29 == HEX_LITERAL:
-                                LA29_50 = self.input.LA(3)
+                            elif LA28 == IDENTIFIER:
+                                LA28_51 = self.input.LA(3)
+
+                                if (self.synpred58()) :
+                                    alt28 = 1
+
+
+                            elif LA28 == HEX_LITERAL:
+                                LA28_52 = self.input.LA(3)
 
-                                if (self.synpred57()) :
-                                    alt29 = 1
+                                if (self.synpred58()) :
+                                    alt28 = 1
 
 
-                            elif LA29 == OCTAL_LITERAL:
-                                LA29_51 = self.input.LA(3)
+                            elif LA28 == OCTAL_LITERAL:
+                                LA28_53 = self.input.LA(3)
 
-                                if (self.synpred57()) :
-                                    alt29 = 1
+                                if (self.synpred58()) :
+                                    alt28 = 1
 
 
-                            elif LA29 == DECIMAL_LITERAL:
-                                LA29_52 = self.input.LA(3)
+                            elif LA28 == DECIMAL_LITERAL:
+                                LA28_54 = self.input.LA(3)
 
-                                if (self.synpred57()) :
-                                    alt29 = 1
+                                if (self.synpred58()) :
+                                    alt28 = 1
 
 
-                            elif LA29 == CHARACTER_LITERAL:
-                                LA29_53 = self.input.LA(3)
+                            elif LA28 == CHARACTER_LITERAL:
+                                LA28_55 = self.input.LA(3)
 
-                                if (self.synpred57()) :
-                                    alt29 = 1
+                                if (self.synpred58()) :
+                                    alt28 = 1
 
 
-                            elif LA29 == STRING_LITERAL:
-                                LA29_54 = self.input.LA(3)
+                            elif LA28 == STRING_LITERAL:
+                                LA28_56 = self.input.LA(3)
 
-                                if (self.synpred57()) :
-                                    alt29 = 1
+                                if (self.synpred58()) :
+                                    alt28 = 1
 
 
-                            elif LA29 == FLOATING_POINT_LITERAL:
-                                LA29_55 = self.input.LA(3)
+                            elif LA28 == FLOATING_POINT_LITERAL:
+                                LA28_57 = self.input.LA(3)
 
-                                if (self.synpred57()) :
-                                    alt29 = 1
+                                if (self.synpred58()) :
+                                    alt28 = 1
 
 
-                            elif LA29 == 65:
-                                LA29_56 = self.input.LA(3)
+                            elif LA28 == 67:
+                                LA28_58 = self.input.LA(3)
 
-                                if (self.synpred57()) :
-                                    alt29 = 1
+                                if (self.synpred58()) :
+                                    alt28 = 1
 
 
-                            elif LA29 == 66:
-                                LA29_57 = self.input.LA(3)
+                            elif LA28 == 68:
+                                LA28_59 = self.input.LA(3)
 
-                                if (self.synpred57()) :
-                                    alt29 = 1
+                                if (self.synpred58()) :
+                                    alt28 = 1
 
 
-                            elif LA29 == 59 or LA29 == 61 or LA29 == 62 or LA29 == 70 or LA29 == 71 or LA29 == 72:
-                                LA29_58 = self.input.LA(3)
+                            elif LA28 == 61 or LA28 == 63 or LA28 == 64 or LA28 == 72 or LA28 == 73 or LA28 == 74:
+                                LA28_60 = self.input.LA(3)
 
-                                if (self.synpred57()) :
-                                    alt29 = 1
+                                if (self.synpred58()) :
+                                    alt28 = 1
 
 
-                            elif LA29 == 67:
-                                LA29_59 = self.input.LA(3)
+                            elif LA28 == 69:
+                                LA28_61 = self.input.LA(3)
 
-                                if (self.synpred57()) :
-                                    alt29 = 1
+                                if (self.synpred58()) :
+                                    alt28 = 1
 
 
 
 
 
-                        if alt29 == 1:
+                        if alt28 == 1:
                             # C.g:0:0: declarator_suffix
-                            self.following.append(self.FOLLOW_declarator_suffix_in_direct_declarator764)
+                            self.following.append(self.FOLLOW_declarator_suffix_in_direct_declarator771)
                             self.declarator_suffix()
                             self.following.pop()
                             if self.failed:
@@ -2774,17 +2806,17 @@ class CParser(Parser):
 
 
                         else:
-                            if cnt29 >= 1:
-                                break #loop29
+                            if cnt28 >= 1:
+                                break #loop28
 
                             if self.backtracking > 0:
                                 self.failed = True
                                 return 
 
-                            eee = EarlyExitException(29, self.input)
+                            eee = EarlyExitException(28, self.input)
                             raise eee
 
-                        cnt29 += 1
+                        cnt28 += 1
 
 
 
@@ -2805,7 +2837,7 @@ class CParser(Parser):
 
 
     # $ANTLR start declarator_suffix
-    # C.g:238:1: declarator_suffix : ( '[' constant_expression ']' | '[' ']' | '(' parameter_type_list ')' | '(' identifier_list ')' | '(' ')' );
+    # C.g:240:1: declarator_suffix : ( '[' constant_expression ']' | '[' ']' | '(' parameter_type_list ')' | '(' identifier_list ')' | '(' ')' );
     def declarator_suffix(self, ):
 
         declarator_suffix_StartIndex = self.input.index()
@@ -2814,54 +2846,54 @@ class CParser(Parser):
                 if self.backtracking > 0 and self.alreadyParsedRule(self.input, 24):
                     return 
 
-                # C.g:239:2: ( '[' constant_expression ']' | '[' ']' | '(' parameter_type_list ')' | '(' identifier_list ')' | '(' ')' )
-                alt31 = 5
-                LA31_0 = self.input.LA(1)
+                # C.g:241:2: ( '[' constant_expression ']' | '[' ']' | '(' parameter_type_list ')' | '(' identifier_list ')' | '(' ')' )
+                alt30 = 5
+                LA30_0 = self.input.LA(1)
 
-                if (LA31_0 == 57) :
-                    LA31_1 = self.input.LA(2)
+                if (LA30_0 == 59) :
+                    LA30_1 = self.input.LA(2)
 
-                    if (LA31_1 == 58) :
-                        alt31 = 2
-                    elif ((IDENTIFIER <= LA31_1 <= FLOATING_POINT_LITERAL) or LA31_1 == 55 or LA31_1 == 59 or (61 <= LA31_1 <= 62) or (65 <= LA31_1 <= 67) or (70 <= LA31_1 <= 72)) :
-                        alt31 = 1
+                    if (LA30_1 == 60) :
+                        alt30 = 2
+                    elif ((IDENTIFIER <= LA30_1 <= FLOATING_POINT_LITERAL) or LA30_1 == 57 or LA30_1 == 61 or (63 <= LA30_1 <= 64) or (67 <= LA30_1 <= 69) or (72 <= LA30_1 <= 74)) :
+                        alt30 = 1
                     else:
                         if self.backtracking > 0:
                             self.failed = True
                             return 
 
-                        nvae = NoViableAltException("238:1: declarator_suffix : ( '[' constant_expression ']' | '[' ']' | '(' parameter_type_list ')' | '(' identifier_list ')' | '(' ')' );", 31, 1, self.input)
+                        nvae = NoViableAltException("240:1: declarator_suffix : ( '[' constant_expression ']' | '[' ']' | '(' parameter_type_list ')' | '(' identifier_list ')' | '(' ')' );", 30, 1, self.input)
 
                         raise nvae
 
-                elif (LA31_0 == 55) :
-                    LA31 = self.input.LA(2)
-                    if LA31 == 56:
-                        alt31 = 5
-                    elif LA31 == IDENTIFIER:
-                        LA31_17 = self.input.LA(3)
+                elif (LA30_0 == 57) :
+                    LA30 = self.input.LA(2)
+                    if LA30 == 58:
+                        alt30 = 5
+                    elif LA30 == 29 or LA30 == 30 or LA30 == 31 or LA30 == 32 or LA30 == 33 or LA30 == 34 or LA30 == 35 or LA30 == 36 or LA30 == 37 or LA30 == 38 or LA30 == 39 or LA30 == 40 or LA30 == 41 or LA30 == 42 or LA30 == 43 or LA30 == 46 or LA30 == 47 or LA30 == 49 or LA30 == 50 or LA30 == 51 or LA30 == 52 or LA30 == 53 or LA30 == 54 or LA30 == 55:
+                        alt30 = 3
+                    elif LA30 == IDENTIFIER:
+                        LA30_30 = self.input.LA(3)
 
-                        if (self.synpred60()) :
-                            alt31 = 3
-                        elif (self.synpred61()) :
-                            alt31 = 4
+                        if (self.synpred61()) :
+                            alt30 = 3
+                        elif (self.synpred62()) :
+                            alt30 = 4
                         else:
                             if self.backtracking > 0:
                                 self.failed = True
                                 return 
 
-                            nvae = NoViableAltException("238:1: declarator_suffix : ( '[' constant_expression ']' | '[' ']' | '(' parameter_type_list ')' | '(' identifier_list ')' | '(' ')' );", 31, 17, self.input)
+                            nvae = NoViableAltException("240:1: declarator_suffix : ( '[' constant_expression ']' | '[' ']' | '(' parameter_type_list ')' | '(' identifier_list ')' | '(' ')' );", 30, 30, self.input)
 
                             raise nvae
 
-                    elif LA31 == 29 or LA31 == 30 or LA31 == 31 or LA31 == 32 or LA31 == 33 or LA31 == 34 or LA31 == 35 or LA31 == 36 or LA31 == 37 or LA31 == 38 or LA31 == 39 or LA31 == 40 or LA31 == 41 or LA31 == 42 or LA31 == 45 or LA31 == 46 or LA31 == 48 or LA31 == 49 or LA31 == 50 or LA31 == 51 or LA31 == 52 or LA31 == 53:
-                        alt31 = 3
                     else:
                         if self.backtracking > 0:
                             self.failed = True
                             return 
 
-                        nvae = NoViableAltException("238:1: declarator_suffix : ( '[' constant_expression ']' | '[' ']' | '(' parameter_type_list ')' | '(' identifier_list ')' | '(' ')' );", 31, 2, self.input)
+                        nvae = NoViableAltException("240:1: declarator_suffix : ( '[' constant_expression ']' | '[' ']' | '(' parameter_type_list ')' | '(' identifier_list ')' | '(' ')' );", 30, 2, self.input)
 
                         raise nvae
 
@@ -2870,71 +2902,71 @@ class CParser(Parser):
                         self.failed = True
                         return 
 
-                    nvae = NoViableAltException("238:1: declarator_suffix : ( '[' constant_expression ']' | '[' ']' | '(' parameter_type_list ')' | '(' identifier_list ')' | '(' ')' );", 31, 0, self.input)
+                    nvae = NoViableAltException("240:1: declarator_suffix : ( '[' constant_expression ']' | '[' ']' | '(' parameter_type_list ')' | '(' identifier_list ')' | '(' ')' );", 30, 0, self.input)
 
                     raise nvae
 
-                if alt31 == 1:
-                    # C.g:239:6: '[' constant_expression ']'
-                    self.match(self.input, 57, self.FOLLOW_57_in_declarator_suffix778)
+                if alt30 == 1:
+                    # C.g:241:6: '[' constant_expression ']'
+                    self.match(self.input, 59, self.FOLLOW_59_in_declarator_suffix785)
                     if self.failed:
                         return 
-                    self.following.append(self.FOLLOW_constant_expression_in_declarator_suffix780)
+                    self.following.append(self.FOLLOW_constant_expression_in_declarator_suffix787)
                     self.constant_expression()
                     self.following.pop()
                     if self.failed:
                         return 
-                    self.match(self.input, 58, self.FOLLOW_58_in_declarator_suffix782)
+                    self.match(self.input, 60, self.FOLLOW_60_in_declarator_suffix789)
                     if self.failed:
                         return 
 
 
-                elif alt31 == 2:
-                    # C.g:240:9: '[' ']'
-                    self.match(self.input, 57, self.FOLLOW_57_in_declarator_suffix792)
+                elif alt30 == 2:
+                    # C.g:242:9: '[' ']'
+                    self.match(self.input, 59, self.FOLLOW_59_in_declarator_suffix799)
                     if self.failed:
                         return 
-                    self.match(self.input, 58, self.FOLLOW_58_in_declarator_suffix794)
+                    self.match(self.input, 60, self.FOLLOW_60_in_declarator_suffix801)
                     if self.failed:
                         return 
 
 
-                elif alt31 == 3:
-                    # C.g:241:9: '(' parameter_type_list ')'
-                    self.match(self.input, 55, self.FOLLOW_55_in_declarator_suffix804)
+                elif alt30 == 3:
+                    # C.g:243:9: '(' parameter_type_list ')'
+                    self.match(self.input, 57, self.FOLLOW_57_in_declarator_suffix811)
                     if self.failed:
                         return 
-                    self.following.append(self.FOLLOW_parameter_type_list_in_declarator_suffix806)
+                    self.following.append(self.FOLLOW_parameter_type_list_in_declarator_suffix813)
                     self.parameter_type_list()
                     self.following.pop()
                     if self.failed:
                         return 
-                    self.match(self.input, 56, self.FOLLOW_56_in_declarator_suffix808)
+                    self.match(self.input, 58, self.FOLLOW_58_in_declarator_suffix815)
                     if self.failed:
                         return 
 
 
-                elif alt31 == 4:
-                    # C.g:242:9: '(' identifier_list ')'
-                    self.match(self.input, 55, self.FOLLOW_55_in_declarator_suffix818)
+                elif alt30 == 4:
+                    # C.g:244:9: '(' identifier_list ')'
+                    self.match(self.input, 57, self.FOLLOW_57_in_declarator_suffix825)
                     if self.failed:
                         return 
-                    self.following.append(self.FOLLOW_identifier_list_in_declarator_suffix820)
+                    self.following.append(self.FOLLOW_identifier_list_in_declarator_suffix827)
                     self.identifier_list()
                     self.following.pop()
                     if self.failed:
                         return 
-                    self.match(self.input, 56, self.FOLLOW_56_in_declarator_suffix822)
+                    self.match(self.input, 58, self.FOLLOW_58_in_declarator_suffix829)
                     if self.failed:
                         return 
 
 
-                elif alt31 == 5:
-                    # C.g:243:9: '(' ')'
-                    self.match(self.input, 55, self.FOLLOW_55_in_declarator_suffix832)
+                elif alt30 == 5:
+                    # C.g:245:9: '(' ')'
+                    self.match(self.input, 57, self.FOLLOW_57_in_declarator_suffix839)
                     if self.failed:
                         return 
-                    self.match(self.input, 56, self.FOLLOW_56_in_declarator_suffix834)
+                    self.match(self.input, 58, self.FOLLOW_58_in_declarator_suffix841)
                     if self.failed:
                         return 
 
@@ -2955,7 +2987,7 @@ class CParser(Parser):
 
 
     # $ANTLR start pointer
-    # C.g:246:1: pointer : ( '*' ( type_qualifier )+ ( pointer )? | '*' pointer | '*' );
+    # C.g:248:1: pointer : ( '*' ( type_qualifier )+ ( pointer )? | '*' pointer | '*' );
     def pointer(self, ):
 
         pointer_StartIndex = self.input.index()
@@ -2964,59 +2996,59 @@ class CParser(Parser):
                 if self.backtracking > 0 and self.alreadyParsedRule(self.input, 25):
                     return 
 
-                # C.g:247:2: ( '*' ( type_qualifier )+ ( pointer )? | '*' pointer | '*' )
-                alt34 = 3
-                LA34_0 = self.input.LA(1)
+                # C.g:249:2: ( '*' ( type_qualifier )+ ( pointer )? | '*' pointer | '*' )
+                alt33 = 3
+                LA33_0 = self.input.LA(1)
 
-                if (LA34_0 == 59) :
-                    LA34 = self.input.LA(2)
-                    if LA34 == EOF or LA34 == IDENTIFIER or LA34 == 25 or LA34 == 26 or LA34 == 27 or LA34 == 28 or LA34 == 29 or LA34 == 30 or LA34 == 31 or LA34 == 32 or LA34 == 33 or LA34 == 34 or LA34 == 35 or LA34 == 36 or LA34 == 37 or LA34 == 38 or LA34 == 39 or LA34 == 40 or LA34 == 41 or LA34 == 42 or LA34 == 43 or LA34 == 45 or LA34 == 46 or LA34 == 47 or LA34 == 48 or LA34 == 54 or LA34 == 55 or LA34 == 56 or LA34 == 57:
-                        alt34 = 3
-                    elif LA34 == 59:
-                        LA34_3 = self.input.LA(3)
+                if (LA33_0 == 61) :
+                    LA33 = self.input.LA(2)
+                    if LA33 == 61:
+                        LA33_2 = self.input.LA(3)
 
-                        if (self.synpred65()) :
-                            alt34 = 2
+                        if (self.synpred66()) :
+                            alt33 = 2
                         elif (True) :
-                            alt34 = 3
+                            alt33 = 3
                         else:
                             if self.backtracking > 0:
                                 self.failed = True
                                 return 
 
-                            nvae = NoViableAltException("246:1: pointer : ( '*' ( type_qualifier )+ ( pointer )? | '*' pointer | '*' );", 34, 3, self.input)
+                            nvae = NoViableAltException("248:1: pointer : ( '*' ( type_qualifier )+ ( pointer )? | '*' pointer | '*' );", 33, 2, self.input)
 
                             raise nvae
 
-                    elif LA34 == 53:
-                        LA34_21 = self.input.LA(3)
+                    elif LA33 == EOF or LA33 == IDENTIFIER or LA33 == 25 or LA33 == 26 or LA33 == 27 or LA33 == 28 or LA33 == 29 or LA33 == 30 or LA33 == 31 or LA33 == 32 or LA33 == 33 or LA33 == 34 or LA33 == 35 or LA33 == 36 or LA33 == 37 or LA33 == 38 or LA33 == 39 or LA33 == 40 or LA33 == 41 or LA33 == 42 or LA33 == 43 or LA33 == 44 or LA33 == 46 or LA33 == 47 or LA33 == 48 or LA33 == 49 or LA33 == 56 or LA33 == 57 or LA33 == 58 or LA33 == 59:
+                        alt33 = 3
+                    elif LA33 == 54:
+                        LA33_19 = self.input.LA(3)
 
-                        if (self.synpred64()) :
-                            alt34 = 1
+                        if (self.synpred65()) :
+                            alt33 = 1
                         elif (True) :
-                            alt34 = 3
+                            alt33 = 3
                         else:
                             if self.backtracking > 0:
                                 self.failed = True
                                 return 
 
-                            nvae = NoViableAltException("246:1: pointer : ( '*' ( type_qualifier )+ ( pointer )? | '*' pointer | '*' );", 34, 21, self.input)
+                            nvae = NoViableAltException("248:1: pointer : ( '*' ( type_qualifier )+ ( pointer )? | '*' pointer | '*' );", 33, 19, self.input)
 
                             raise nvae
 
-                    elif LA34 == 49 or LA34 == 50 or LA34 == 51 or LA34 == 52:
-                        LA34_28 = self.input.LA(3)
+                    elif LA33 == 50 or LA33 == 51 or LA33 == 52 or LA33 == 53 or LA33 == 55:
+                        LA33_27 = self.input.LA(3)
 
-                        if (self.synpred64()) :
-                            alt34 = 1
+                        if (self.synpred65()) :
+                            alt33 = 1
                         elif (True) :
-                            alt34 = 3
+                            alt33 = 3
                         else:
                             if self.backtracking > 0:
                                 self.failed = True
                                 return 
 
-                            nvae = NoViableAltException("246:1: pointer : ( '*' ( type_qualifier )+ ( pointer )? | '*' pointer | '*' );", 34, 28, self.input)
+                            nvae = NoViableAltException("248:1: pointer : ( '*' ( type_qualifier )+ ( pointer )? | '*' pointer | '*' );", 33, 27, self.input)
 
                             raise nvae
 
@@ -3025,7 +3057,7 @@ class CParser(Parser):
                             self.failed = True
                             return 
 
-                        nvae = NoViableAltException("246:1: pointer : ( '*' ( type_qualifier )+ ( pointer )? | '*' pointer | '*' );", 34, 1, self.input)
+                        nvae = NoViableAltException("248:1: pointer : ( '*' ( type_qualifier )+ ( pointer )? | '*' pointer | '*' );", 33, 1, self.input)
 
                         raise nvae
 
@@ -3034,40 +3066,40 @@ class CParser(Parser):
                         self.failed = True
                         return 
 
-                    nvae = NoViableAltException("246:1: pointer : ( '*' ( type_qualifier )+ ( pointer )? | '*' pointer | '*' );", 34, 0, self.input)
+                    nvae = NoViableAltException("248:1: pointer : ( '*' ( type_qualifier )+ ( pointer )? | '*' pointer | '*' );", 33, 0, self.input)
 
                     raise nvae
 
-                if alt34 == 1:
-                    # C.g:247:4: '*' ( type_qualifier )+ ( pointer )?
-                    self.match(self.input, 59, self.FOLLOW_59_in_pointer845)
+                if alt33 == 1:
+                    # C.g:249:4: '*' ( type_qualifier )+ ( pointer )?
+                    self.match(self.input, 61, self.FOLLOW_61_in_pointer852)
                     if self.failed:
                         return 
-                    # C.g:247:8: ( type_qualifier )+
-                    cnt32 = 0
-                    while True: #loop32
-                        alt32 = 2
-                        LA32_0 = self.input.LA(1)
+                    # C.g:249:8: ( type_qualifier )+
+                    cnt31 = 0
+                    while True: #loop31
+                        alt31 = 2
+                        LA31_0 = self.input.LA(1)
 
-                        if (LA32_0 == 53) :
-                            LA32_20 = self.input.LA(2)
+                        if (LA31_0 == 54) :
+                            LA31_18 = self.input.LA(2)
 
-                            if (self.synpred62()) :
-                                alt32 = 1
+                            if (self.synpred63()) :
+                                alt31 = 1
 
 
-                        elif ((49 <= LA32_0 <= 52)) :
-                            LA32_27 = self.input.LA(2)
+                        elif ((50 <= LA31_0 <= 53) or LA31_0 == 55) :
+                            LA31_26 = self.input.LA(2)
 
-                            if (self.synpred62()) :
-                                alt32 = 1
+                            if (self.synpred63()) :
+                                alt31 = 1
 
 
 
 
-                        if alt32 == 1:
+                        if alt31 == 1:
                             # C.g:0:0: type_qualifier
-                            self.following.append(self.FOLLOW_type_qualifier_in_pointer847)
+                            self.following.append(self.FOLLOW_type_qualifier_in_pointer854)
                             self.type_qualifier()
                             self.following.pop()
                             if self.failed:
@@ -3075,31 +3107,31 @@ class CParser(Parser):
 
 
                         else:
-                            if cnt32 >= 1:
-                                break #loop32
+                            if cnt31 >= 1:
+                                break #loop31
 
                             if self.backtracking > 0:
                                 self.failed = True
                                 return 
 
-                            eee = EarlyExitException(32, self.input)
+                            eee = EarlyExitException(31, self.input)
                             raise eee
 
-                        cnt32 += 1
+                        cnt31 += 1
 
 
-                    # C.g:247:24: ( pointer )?
-                    alt33 = 2
-                    LA33_0 = self.input.LA(1)
+                    # C.g:249:24: ( pointer )?
+                    alt32 = 2
+                    LA32_0 = self.input.LA(1)
 
-                    if (LA33_0 == 59) :
-                        LA33_1 = self.input.LA(2)
+                    if (LA32_0 == 61) :
+                        LA32_1 = self.input.LA(2)
 
-                        if (self.synpred63()) :
-                            alt33 = 1
-                    if alt33 == 1:
+                        if (self.synpred64()) :
+                            alt32 = 1
+                    if alt32 == 1:
                         # C.g:0:0: pointer
-                        self.following.append(self.FOLLOW_pointer_in_pointer850)
+                        self.following.append(self.FOLLOW_pointer_in_pointer857)
                         self.pointer()
                         self.following.pop()
                         if self.failed:
@@ -3109,21 +3141,21 @@ class CParser(Parser):
 
 
 
-                elif alt34 == 2:
-                    # C.g:248:4: '*' pointer
-                    self.match(self.input, 59, self.FOLLOW_59_in_pointer856)
+                elif alt33 == 2:
+                    # C.g:250:4: '*' pointer
+                    self.match(self.input, 61, self.FOLLOW_61_in_pointer863)
                     if self.failed:
                         return 
-                    self.following.append(self.FOLLOW_pointer_in_pointer858)
+                    self.following.append(self.FOLLOW_pointer_in_pointer865)
                     self.pointer()
                     self.following.pop()
                     if self.failed:
                         return 
 
 
-                elif alt34 == 3:
-                    # C.g:249:4: '*'
-                    self.match(self.input, 59, self.FOLLOW_59_in_pointer863)
+                elif alt33 == 3:
+                    # C.g:251:4: '*'
+                    self.match(self.input, 61, self.FOLLOW_61_in_pointer870)
                     if self.failed:
                         return 
 
@@ -3144,7 +3176,7 @@ class CParser(Parser):
 
 
     # $ANTLR start parameter_type_list
-    # C.g:252:1: parameter_type_list : parameter_list ( ',' '...' )? ;
+    # C.g:254:1: parameter_type_list : parameter_list ( ',' '...' )? ;
     def parameter_type_list(self, ):
 
         parameter_type_list_StartIndex = self.input.index()
@@ -3153,25 +3185,25 @@ class CParser(Parser):
                 if self.backtracking > 0 and self.alreadyParsedRule(self.input, 26):
                     return 
 
-                # C.g:253:2: ( parameter_list ( ',' '...' )? )
-                # C.g:253:4: parameter_list ( ',' '...' )?
-                self.following.append(self.FOLLOW_parameter_list_in_parameter_type_list874)
+                # C.g:255:2: ( parameter_list ( ',' '...' )? )
+                # C.g:255:4: parameter_list ( ',' '...' )?
+                self.following.append(self.FOLLOW_parameter_list_in_parameter_type_list881)
                 self.parameter_list()
                 self.following.pop()
                 if self.failed:
                     return 
-                # C.g:253:19: ( ',' '...' )?
-                alt35 = 2
-                LA35_0 = self.input.LA(1)
+                # C.g:255:19: ( ',' '...' )?
+                alt34 = 2
+                LA34_0 = self.input.LA(1)
 
-                if (LA35_0 == 27) :
-                    alt35 = 1
-                if alt35 == 1:
-                    # C.g:253:20: ',' '...'
-                    self.match(self.input, 27, self.FOLLOW_27_in_parameter_type_list877)
+                if (LA34_0 == 27) :
+                    alt34 = 1
+                if alt34 == 1:
+                    # C.g:255:20: ',' '...'
+                    self.match(self.input, 27, self.FOLLOW_27_in_parameter_type_list884)
                     if self.failed:
                         return 
-                    self.match(self.input, 60, self.FOLLOW_60_in_parameter_type_list879)
+                    self.match(self.input, 62, self.FOLLOW_62_in_parameter_type_list886)
                     if self.failed:
                         return 
 
@@ -3196,7 +3228,7 @@ class CParser(Parser):
 
 
     # $ANTLR start parameter_list
-    # C.g:256:1: parameter_list : parameter_declaration ( ',' ( 'OPTIONAL' )? parameter_declaration )* ;
+    # C.g:258:1: parameter_list : parameter_declaration ( ',' ( 'OPTIONAL' )? parameter_declaration )* ;
     def parameter_list(self, ):
 
         parameter_list_StartIndex = self.input.index()
@@ -3205,50 +3237,50 @@ class CParser(Parser):
                 if self.backtracking > 0 and self.alreadyParsedRule(self.input, 27):
                     return 
 
-                # C.g:257:2: ( parameter_declaration ( ',' ( 'OPTIONAL' )? parameter_declaration )* )
-                # C.g:257:4: parameter_declaration ( ',' ( 'OPTIONAL' )? parameter_declaration )*
-                self.following.append(self.FOLLOW_parameter_declaration_in_parameter_list892)
+                # C.g:259:2: ( parameter_declaration ( ',' ( 'OPTIONAL' )? parameter_declaration )* )
+                # C.g:259:4: parameter_declaration ( ',' ( 'OPTIONAL' )? parameter_declaration )*
+                self.following.append(self.FOLLOW_parameter_declaration_in_parameter_list899)
                 self.parameter_declaration()
                 self.following.pop()
                 if self.failed:
                     return 
-                # C.g:257:26: ( ',' ( 'OPTIONAL' )? parameter_declaration )*
-                while True: #loop37
-                    alt37 = 2
-                    LA37_0 = self.input.LA(1)
+                # C.g:259:26: ( ',' ( 'OPTIONAL' )? parameter_declaration )*
+                while True: #loop36
+                    alt36 = 2
+                    LA36_0 = self.input.LA(1)
 
-                    if (LA37_0 == 27) :
-                        LA37_1 = self.input.LA(2)
+                    if (LA36_0 == 27) :
+                        LA36_1 = self.input.LA(2)
 
-                        if (LA37_1 == IDENTIFIER or (29 <= LA37_1 <= 42) or (45 <= LA37_1 <= 46) or (48 <= LA37_1 <= 53)) :
-                            alt37 = 1
+                        if (LA36_1 == IDENTIFIER or (29 <= LA36_1 <= 43) or (46 <= LA36_1 <= 47) or (49 <= LA36_1 <= 55)) :
+                            alt36 = 1
 
 
 
 
-                    if alt37 == 1:
-                        # C.g:257:27: ',' ( 'OPTIONAL' )? parameter_declaration
-                        self.match(self.input, 27, self.FOLLOW_27_in_parameter_list895)
+                    if alt36 == 1:
+                        # C.g:259:27: ',' ( 'OPTIONAL' )? parameter_declaration
+                        self.match(self.input, 27, self.FOLLOW_27_in_parameter_list902)
                         if self.failed:
                             return 
-                        # C.g:257:31: ( 'OPTIONAL' )?
-                        alt36 = 2
-                        LA36_0 = self.input.LA(1)
-
-                        if (LA36_0 == 53) :
-                            LA36_1 = self.input.LA(2)
-
-                            if (self.synpred67()) :
-                                alt36 = 1
-                        if alt36 == 1:
-                            # C.g:257:32: 'OPTIONAL'
-                            self.match(self.input, 53, self.FOLLOW_53_in_parameter_list898)
+                        # C.g:259:31: ( 'OPTIONAL' )?
+                        alt35 = 2
+                        LA35_0 = self.input.LA(1)
+
+                        if (LA35_0 == 54) :
+                            LA35_1 = self.input.LA(2)
+
+                            if (self.synpred68()) :
+                                alt35 = 1
+                        if alt35 == 1:
+                            # C.g:259:32: 'OPTIONAL'
+                            self.match(self.input, 54, self.FOLLOW_54_in_parameter_list905)
                             if self.failed:
                                 return 
 
 
 
-                        self.following.append(self.FOLLOW_parameter_declaration_in_parameter_list902)
+                        self.following.append(self.FOLLOW_parameter_declaration_in_parameter_list909)
                         self.parameter_declaration()
                         self.following.pop()
                         if self.failed:
@@ -3256,7 +3288,7 @@ class CParser(Parser):
 
 
                     else:
-                        break #loop37
+                        break #loop36
 
 
 
@@ -3278,7 +3310,7 @@ class CParser(Parser):
 
 
     # $ANTLR start parameter_declaration
-    # C.g:260:1: parameter_declaration : declaration_specifiers ( declarator | abstract_declarator )+ ( 'OPTIONAL' )? ;
+    # C.g:262:1: parameter_declaration : ( declaration_specifiers ( declarator | abstract_declarator )* ( 'OPTIONAL' )? | IDENTIFIER );
     def parameter_declaration(self, ):
 
         parameter_declaration_StartIndex = self.input.index()
@@ -3287,115 +3319,141 @@ class CParser(Parser):
                 if self.backtracking > 0 and self.alreadyParsedRule(self.input, 28):
                     return 
 
-                # C.g:261:2: ( declaration_specifiers ( declarator | abstract_declarator )+ ( 'OPTIONAL' )? )
-                # C.g:261:4: declaration_specifiers ( declarator | abstract_declarator )+ ( 'OPTIONAL' )?
-                self.following.append(self.FOLLOW_declaration_specifiers_in_parameter_declaration915)
-                self.declaration_specifiers()
-                self.following.pop()
-                if self.failed:
-                    return 
-                # C.g:261:27: ( declarator | abstract_declarator )+
-                cnt38 = 0
-                while True: #loop38
-                    alt38 = 3
-                    LA38 = self.input.LA(1)
-                    if LA38 == IDENTIFIER or LA38 == 54:
-                        alt38 = 1
-                    elif LA38 == 59:
-                        LA38_6 = self.input.LA(2)
+                # C.g:263:2: ( declaration_specifiers ( declarator | abstract_declarator )* ( 'OPTIONAL' )? | IDENTIFIER )
+                alt39 = 2
+                LA39_0 = self.input.LA(1)
+
+                if ((29 <= LA39_0 <= 43) or (46 <= LA39_0 <= 47) or (49 <= LA39_0 <= 55)) :
+                    alt39 = 1
+                elif (LA39_0 == IDENTIFIER) :
+                    LA39_14 = self.input.LA(2)
+
+                    if (self.synpred73()) :
+                        alt39 = 1
+                    elif (True) :
+                        alt39 = 2
+                    else:
+                        if self.backtracking > 0:
+                            self.failed = True
+                            return 
 
-                        if (self.synpred69()) :
-                            alt38 = 1
-                        elif (self.synpred70()) :
-                            alt38 = 2
+                        nvae = NoViableAltException("262:1: parameter_declaration : ( declaration_specifiers ( declarator | abstract_declarator )* ( 'OPTIONAL' )? | IDENTIFIER );", 39, 14, self.input)
 
+                        raise nvae
 
-                    elif LA38 == 55:
-                        LA38 = self.input.LA(2)
-                        if LA38 == 29 or LA38 == 30 or LA38 == 31 or LA38 == 32 or LA38 == 33 or LA38 == 34 or LA38 == 35 or LA38 == 36 or LA38 == 37 or LA38 == 38 or LA38 == 39 or LA38 == 40 or LA38 == 41 or LA38 == 42 or LA38 == 45 or LA38 == 46 or LA38 == 48 or LA38 == 49 or LA38 == 50 or LA38 == 51 or LA38 == 52 or LA38 == 53 or LA38 == 56 or LA38 == 57:
-                            alt38 = 2
-                        elif LA38 == 59:
-                            LA38_21 = self.input.LA(3)
+                else:
+                    if self.backtracking > 0:
+                        self.failed = True
+                        return 
 
-                            if (self.synpred69()) :
-                                alt38 = 1
-                            elif (self.synpred70()) :
-                                alt38 = 2
+                    nvae = NoViableAltException("262:1: parameter_declaration : ( declaration_specifiers ( declarator | abstract_declarator )* ( 'OPTIONAL' )? | IDENTIFIER );", 39, 0, self.input)
 
+                    raise nvae
 
-                        elif LA38 == 55:
-                            LA38_22 = self.input.LA(3)
+                if alt39 == 1:
+                    # C.g:263:4: declaration_specifiers ( declarator | abstract_declarator )* ( 'OPTIONAL' )?
+                    self.following.append(self.FOLLOW_declaration_specifiers_in_parameter_declaration922)
+                    self.declaration_specifiers()
+                    self.following.pop()
+                    if self.failed:
+                        return 
+                    # C.g:263:27: ( declarator | abstract_declarator )*
+                    while True: #loop37
+                        alt37 = 3
+                        LA37 = self.input.LA(1)
+                        if LA37 == IDENTIFIER or LA37 == 56:
+                            alt37 = 1
+                        elif LA37 == 61:
+                            LA37_6 = self.input.LA(2)
 
-                            if (self.synpred69()) :
-                                alt38 = 1
-                            elif (self.synpred70()) :
-                                alt38 = 2
+                            if (self.synpred70()) :
+                                alt37 = 1
+                            elif (self.synpred71()) :
+                                alt37 = 2
 
 
-                        elif LA38 == 54:
-                            alt38 = 1
-                        elif LA38 == IDENTIFIER:
-                            LA38_25 = self.input.LA(3)
+                        elif LA37 == 57:
+                            LA37 = self.input.LA(2)
+                            if LA37 == 29 or LA37 == 30 or LA37 == 31 or LA37 == 32 or LA37 == 33 or LA37 == 34 or LA37 == 35 or LA37 == 36 or LA37 == 37 or LA37 == 38 or LA37 == 39 or LA37 == 40 or LA37 == 41 or LA37 == 42 or LA37 == 43 or LA37 == 46 or LA37 == 47 or LA37 == 49 or LA37 == 50 or LA37 == 51 or LA37 == 52 or LA37 == 53 or LA37 == 54 or LA37 == 55 or LA37 == 58 or LA37 == 59:
+                                alt37 = 2
+                            elif LA37 == 61:
+                                LA37_21 = self.input.LA(3)
 
-                            if (self.synpred69()) :
-                                alt38 = 1
-                            elif (self.synpred70()) :
-                                alt38 = 2
+                                if (self.synpred70()) :
+                                    alt37 = 1
+                                elif (self.synpred71()) :
+                                    alt37 = 2
 
 
+                            elif LA37 == 57:
+                                LA37_22 = self.input.LA(3)
 
-                    elif LA38 == 57:
-                        alt38 = 2
+                                if (self.synpred70()) :
+                                    alt37 = 1
+                                elif (self.synpred71()) :
+                                    alt37 = 2
 
-                    if alt38 == 1:
-                        # C.g:261:28: declarator
-                        self.following.append(self.FOLLOW_declarator_in_parameter_declaration918)
-                        self.declarator()
-                        self.following.pop()
-                        if self.failed:
-                            return 
 
+                            elif LA37 == IDENTIFIER:
+                                LA37_37 = self.input.LA(3)
 
-                    elif alt38 == 2:
-                        # C.g:261:39: abstract_declarator
-                        self.following.append(self.FOLLOW_abstract_declarator_in_parameter_declaration920)
-                        self.abstract_declarator()
-                        self.following.pop()
-                        if self.failed:
-                            return 
+                                if (self.synpred70()) :
+                                    alt37 = 1
+                                elif (self.synpred71()) :
+                                    alt37 = 2
 
 
-                    else:
-                        if cnt38 >= 1:
-                            break #loop38
+                            elif LA37 == 56:
+                                alt37 = 1
 
-                        if self.backtracking > 0:
-                            self.failed = True
-                            return 
+                        elif LA37 == 59:
+                            alt37 = 2
 
-                        eee = EarlyExitException(38, self.input)
-                        raise eee
+                        if alt37 == 1:
+                            # C.g:263:28: declarator
+                            self.following.append(self.FOLLOW_declarator_in_parameter_declaration925)
+                            self.declarator()
+                            self.following.pop()
+                            if self.failed:
+                                return 
 
-                    cnt38 += 1
 
+                        elif alt37 == 2:
+                            # C.g:263:39: abstract_declarator
+                            self.following.append(self.FOLLOW_abstract_declarator_in_parameter_declaration927)
+                            self.abstract_declara