ECC: CParser add framework code data types.
authorjlin16 <jlin16@7335b38e-4728-0410-8992-fb3ffe349368>
Tue, 29 Jan 2008 06:04:35 +0000 (06:04 +0000)
committerjlin16 <jlin16@7335b38e-4728-0410-8992-fb3ffe349368>
Tue, 29 Jan 2008 06:04:35 +0000 (06:04 +0000)
git-svn-id: https://buildtools.tianocore.org/svn/buildtools/trunk/BaseTools@984 7335b38e-4728-0410-8992-fb3ffe349368

Source/Python/Ecc/C.g
Source/Python/Ecc/CLexer.py
Source/Python/Ecc/CParser.py

index 3383587..f19fb60 100644 (file)
@@ -161,6 +161,9 @@ type_specifier
        | 'signed'\r
        | 'unsigned'\r
        | 'BOOLEAN'\r
+       | 'CHAR8'\r
+       | 'CHAR16'\r
+       | 'VOID'\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
@@ -225,10 +228,13 @@ type_qualifier
        | 'OUT'\r
        | 'OPTIONAL'\r
        | 'CONST'\r
+       | 'UNALIGNED'\r
+       | 'VOLATILE'\r
        ;\r
 \r
 declarator\r
-       : pointer? ('EFIAPI')? direct_declarator\r
+       : pointer? ('EFIAPI')? ('EFI_BOOTSERVICE')? ('EFI_RUNTIMESERVICE')? direct_declarator\r
+       | ('EFIAPI')? ('EFI_BOOTSERVICE')? ('EFI_RUNTIMESERVICE')? pointer? direct_declarator\r
        | pointer\r
        ;\r
 \r
index 96fab9d..df0ec9b 100644 (file)
@@ -1,4 +1,4 @@
-# $ANTLR 3.0.1 C.g 2008-01-28 19:51:32
+# $ANTLR 3.0.1 C.g 2008-01-29 13:58:55
 
 from antlr3 import *
 from antlr3.compat import set, frozenset
@@ -14,12 +14,14 @@ T70=70
 T74=74
 T85=85
 T102=102
+T114=114
 T103=103
 STRING_LITERAL=9
 T32=32
 T81=81
 T41=41
 FloatTypeSuffix=16
+T113=113
 T62=62
 T109=109
 DECIMAL_LITERAL=7
@@ -30,6 +32,7 @@ T84=84
 T33=33
 UnicodeVocabulary=21
 T78=78
+T115=115
 WS=19
 LINE_COMMAND=24
 T42=42
@@ -71,13 +74,16 @@ T91=91
 T105=105
 T37=37
 T86=86
+T116=116
 EscapeSequence=12
 T26=26
 T51=51
+T111=111
 T46=46
 T77=77
 T38=38
 T106=106
+T112=112
 T69=69
 T39=39
 T44=44
@@ -86,6 +92,7 @@ LETTER=11
 Exponent=15
 T95=95
 T50=50
+T110=110
 T108=108
 BS=20
 T92=92
@@ -109,7 +116,7 @@ T54=54
 EOF=-1
 T104=104
 T47=47
-Tokens=110
+Tokens=117
 T53=53
 OctalEscape=17
 T99=99
@@ -589,9 +596,10 @@ class CLexer(Lexer):
         try:
             self.type = T44
 
-            # C.g:26:5: ( '{' )
-            # C.g:26:7: '{'
-            self.match(u'{')
+            # C.g:26:5: ( 'CHAR8' )
+            # C.g:26:7: 'CHAR8'
+            self.match("CHAR8")
+
 
 
 
@@ -611,9 +619,10 @@ class CLexer(Lexer):
         try:
             self.type = T45
 
-            # C.g:27:5: ( '}' )
-            # C.g:27:7: '}'
-            self.match(u'}')
+            # C.g:27:5: ( 'CHAR16' )
+            # C.g:27:7: 'CHAR16'
+            self.match("CHAR16")
+
 
 
 
@@ -633,9 +642,9 @@ class CLexer(Lexer):
         try:
             self.type = T46
 
-            # C.g:28:5: ( 'struct' )
-            # C.g:28:7: 'struct'
-            self.match("struct")
+            # C.g:28:5: ( 'VOID' )
+            # C.g:28:7: 'VOID'
+            self.match("VOID")
 
 
 
@@ -656,10 +665,9 @@ class CLexer(Lexer):
         try:
             self.type = T47
 
-            # C.g:29:5: ( 'union' )
-            # C.g:29:7: 'union'
-            self.match("union")
-
+            # C.g:29:5: ( '{' )
+            # C.g:29:7: '{'
+            self.match(u'{')
 
 
 
@@ -679,9 +687,9 @@ class CLexer(Lexer):
         try:
             self.type = T48
 
-            # C.g:30:5: ( ':' )
-            # C.g:30:7: ':'
-            self.match(u':')
+            # C.g:30:5: ( '}' )
+            # C.g:30:7: '}'
+            self.match(u'}')
 
 
 
@@ -701,9 +709,9 @@ class CLexer(Lexer):
         try:
             self.type = T49
 
-            # C.g:31:5: ( 'enum' )
-            # C.g:31:7: 'enum'
-            self.match("enum")
+            # C.g:31:5: ( 'struct' )
+            # C.g:31:7: 'struct'
+            self.match("struct")
 
 
 
@@ -724,9 +732,9 @@ class CLexer(Lexer):
         try:
             self.type = T50
 
-            # C.g:32:5: ( 'const' )
-            # C.g:32:7: 'const'
-            self.match("const")
+            # C.g:32:5: ( 'union' )
+            # C.g:32:7: 'union'
+            self.match("union")
 
 
 
@@ -747,10 +755,9 @@ class CLexer(Lexer):
         try:
             self.type = T51
 
-            # C.g:33:5: ( 'volatile' )
-            # C.g:33:7: 'volatile'
-            self.match("volatile")
-
+            # C.g:33:5: ( ':' )
+            # C.g:33:7: ':'
+            self.match(u':')
 
 
 
@@ -770,9 +777,9 @@ class CLexer(Lexer):
         try:
             self.type = T52
 
-            # C.g:34:5: ( 'IN' )
-            # C.g:34:7: 'IN'
-            self.match("IN")
+            # C.g:34:5: ( 'enum' )
+            # C.g:34:7: 'enum'
+            self.match("enum")
 
 
 
@@ -793,9 +800,9 @@ class CLexer(Lexer):
         try:
             self.type = T53
 
-            # C.g:35:5: ( 'OUT' )
-            # C.g:35:7: 'OUT'
-            self.match("OUT")
+            # C.g:35:5: ( 'const' )
+            # C.g:35:7: 'const'
+            self.match("const")
 
 
 
@@ -816,9 +823,9 @@ class CLexer(Lexer):
         try:
             self.type = T54
 
-            # C.g:36:5: ( 'OPTIONAL' )
-            # C.g:36:7: 'OPTIONAL'
-            self.match("OPTIONAL")
+            # C.g:36:5: ( 'volatile' )
+            # C.g:36:7: 'volatile'
+            self.match("volatile")
 
 
 
@@ -839,9 +846,9 @@ class CLexer(Lexer):
         try:
             self.type = T55
 
-            # C.g:37:5: ( 'CONST' )
-            # C.g:37:7: 'CONST'
-            self.match("CONST")
+            # C.g:37:5: ( 'IN' )
+            # C.g:37:7: 'IN'
+            self.match("IN")
 
 
 
@@ -862,9 +869,9 @@ class CLexer(Lexer):
         try:
             self.type = T56
 
-            # C.g:38:5: ( 'EFIAPI' )
-            # C.g:38:7: 'EFIAPI'
-            self.match("EFIAPI")
+            # C.g:38:5: ( 'OUT' )
+            # C.g:38:7: 'OUT'
+            self.match("OUT")
 
 
 
@@ -885,9 +892,10 @@ class CLexer(Lexer):
         try:
             self.type = T57
 
-            # C.g:39:5: ( '(' )
-            # C.g:39:7: '('
-            self.match(u'(')
+            # C.g:39:5: ( 'OPTIONAL' )
+            # C.g:39:7: 'OPTIONAL'
+            self.match("OPTIONAL")
+
 
 
 
@@ -907,9 +915,10 @@ class CLexer(Lexer):
         try:
             self.type = T58
 
-            # C.g:40:5: ( ')' )
-            # C.g:40:7: ')'
-            self.match(u')')
+            # C.g:40:5: ( 'CONST' )
+            # C.g:40:7: 'CONST'
+            self.match("CONST")
+
 
 
 
@@ -929,9 +938,10 @@ class CLexer(Lexer):
         try:
             self.type = T59
 
-            # C.g:41:5: ( '[' )
-            # C.g:41:7: '['
-            self.match(u'[')
+            # C.g:41:5: ( 'UNALIGNED' )
+            # C.g:41:7: 'UNALIGNED'
+            self.match("UNALIGNED")
+
 
 
 
@@ -951,9 +961,10 @@ class CLexer(Lexer):
         try:
             self.type = T60
 
-            # C.g:42:5: ( ']' )
-            # C.g:42:7: ']'
-            self.match(u']')
+            # C.g:42:5: ( 'VOLATILE' )
+            # C.g:42:7: 'VOLATILE'
+            self.match("VOLATILE")
+
 
 
 
@@ -973,9 +984,10 @@ class CLexer(Lexer):
         try:
             self.type = T61
 
-            # C.g:43:5: ( '*' )
-            # C.g:43:7: '*'
-            self.match(u'*')
+            # C.g:43:5: ( 'EFIAPI' )
+            # C.g:43:7: 'EFIAPI'
+            self.match("EFIAPI")
+
 
 
 
@@ -995,9 +1007,9 @@ class CLexer(Lexer):
         try:
             self.type = T62
 
-            # C.g:44:5: ( '...' )
-            # C.g:44:7: '...'
-            self.match("...")
+            # C.g:44:5: ( 'EFI_BOOTSERVICE' )
+            # C.g:44:7: 'EFI_BOOTSERVICE'
+            self.match("EFI_BOOTSERVICE")
 
 
 
@@ -1018,9 +1030,10 @@ class CLexer(Lexer):
         try:
             self.type = T63
 
-            # C.g:45:5: ( '+' )
-            # C.g:45:7: '+'
-            self.match(u'+')
+            # C.g:45:5: ( 'EFI_RUNTIMESERVICE' )
+            # C.g:45:7: 'EFI_RUNTIMESERVICE'
+            self.match("EFI_RUNTIMESERVICE")
+
 
 
 
@@ -1040,9 +1053,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'(')
 
 
 
@@ -1062,9 +1075,9 @@ class CLexer(Lexer):
         try:
             self.type = T65
 
-            # C.g:47:5: ( '/' )
-            # C.g:47:7: '/'
-            self.match(u'/')
+            # C.g:47:5: ( ')' )
+            # C.g:47:7: ')'
+            self.match(u')')
 
 
 
@@ -1084,9 +1097,9 @@ class CLexer(Lexer):
         try:
             self.type = T66
 
-            # C.g:48:5: ( '%' )
-            # C.g:48:7: '%'
-            self.match(u'%')
+            # C.g:48:5: ( '[' )
+            # C.g:48:7: '['
+            self.match(u'[')
 
 
 
@@ -1106,10 +1119,9 @@ class CLexer(Lexer):
         try:
             self.type = T67
 
-            # C.g:49:5: ( '++' )
-            # C.g:49:7: '++'
-            self.match("++")
-
+            # C.g:49:5: ( ']' )
+            # C.g:49:7: ']'
+            self.match(u']')
 
 
 
@@ -1129,10 +1141,9 @@ class CLexer(Lexer):
         try:
             self.type = T68
 
-            # C.g:50:5: ( '--' )
-            # C.g:50:7: '--'
-            self.match("--")
-
+            # C.g:50:5: ( '*' )
+            # C.g:50:7: '*'
+            self.match(u'*')
 
 
 
@@ -1152,9 +1163,9 @@ class CLexer(Lexer):
         try:
             self.type = T69
 
-            # C.g:51:5: ( 'sizeof' )
-            # C.g:51:7: 'sizeof'
-            self.match("sizeof")
+            # C.g:51:5: ( '...' )
+            # C.g:51:7: '...'
+            self.match("...")
 
 
 
@@ -1175,9 +1186,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'+')
 
 
 
@@ -1197,10 +1208,9 @@ class CLexer(Lexer):
         try:
             self.type = T71
 
-            # C.g:53:5: ( '->' )
-            # C.g:53:7: '->'
-            self.match("->")
-
+            # C.g:53:5: ( '-' )
+            # C.g:53:7: '-'
+            self.match(u'-')
 
 
 
@@ -1220,9 +1230,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'/')
 
 
 
@@ -1242,9 +1252,9 @@ class CLexer(Lexer):
         try:
             self.type = T73
 
-            # C.g:55:5: ( '~' )
-            # C.g:55:7: '~'
-            self.match(u'~')
+            # C.g:55:5: ( '%' )
+            # C.g:55:7: '%'
+            self.match(u'%')
 
 
 
@@ -1264,9 +1274,10 @@ class CLexer(Lexer):
         try:
             self.type = T74
 
-            # C.g:56:5: ( '!' )
-            # C.g:56:7: '!'
-            self.match(u'!')
+            # C.g:56:5: ( '++' )
+            # C.g:56:7: '++'
+            self.match("++")
+
 
 
 
@@ -1286,9 +1297,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("--")
 
 
 
@@ -1309,9 +1320,9 @@ class CLexer(Lexer):
         try:
             self.type = T76
 
-            # C.g:58:5: ( '/=' )
-            # C.g:58:7: '/='
-            self.match("/=")
+            # C.g:58:5: ( 'sizeof' )
+            # C.g:58:7: 'sizeof'
+            self.match("sizeof")
 
 
 
@@ -1332,10 +1343,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(u'.')
 
 
 
@@ -1355,9 +1365,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("->")
 
 
 
@@ -1378,10 +1388,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(u'&')
 
 
 
@@ -1401,10 +1410,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(u'~')
 
 
 
@@ -1424,10 +1432,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(u'!')
 
 
 
@@ -1447,9 +1454,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("*=")
 
 
 
@@ -1470,9 +1477,9 @@ class CLexer(Lexer):
         try:
             self.type = T83
 
-            # C.g:65:5: ( '^=' )
-            # C.g:65:7: '^='
-            self.match("^=")
+            # C.g:65:5: ( '/=' )
+            # C.g:65:7: '/='
+            self.match("/=")
 
 
 
@@ -1493,9 +1500,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("%=")
 
 
 
@@ -1516,9 +1523,10 @@ class CLexer(Lexer):
         try:
             self.type = T85
 
-            # C.g:67:5: ( '?' )
-            # C.g:67:7: '?'
-            self.match(u'?')
+            # C.g:67:5: ( '+=' )
+            # C.g:67:7: '+='
+            self.match("+=")
+
 
 
 
@@ -1538,9 +1546,9 @@ class CLexer(Lexer):
         try:
             self.type = T86
 
-            # C.g:68:5: ( '||' )
-            # C.g:68:7: '||'
-            self.match("||")
+            # C.g:68:5: ( '-=' )
+            # C.g:68:7: '-='
+            self.match("-=")
 
 
 
@@ -1561,9 +1569,9 @@ class CLexer(Lexer):
         try:
             self.type = T87
 
-            # C.g:69:5: ( '&&' )
-            # C.g:69:7: '&&'
-            self.match("&&")
+            # C.g:69:5: ( '<<=' )
+            # C.g:69:7: '<<='
+            self.match("<<=")
 
 
 
@@ -1584,9 +1592,10 @@ class CLexer(Lexer):
         try:
             self.type = T88
 
-            # C.g:70:5: ( '|' )
-            # C.g:70:7: '|'
-            self.match(u'|')
+            # C.g:70:5: ( '>>=' )
+            # C.g:70:7: '>>='
+            self.match(">>=")
+
 
 
 
@@ -1606,9 +1615,10 @@ class CLexer(Lexer):
         try:
             self.type = T89
 
-            # C.g:71:5: ( '^' )
-            # C.g:71:7: '^'
-            self.match(u'^')
+            # C.g:71:5: ( '&=' )
+            # C.g:71:7: '&='
+            self.match("&=")
+
 
 
 
@@ -1628,9 +1638,9 @@ class CLexer(Lexer):
         try:
             self.type = T90
 
-            # C.g:72:5: ( '==' )
-            # C.g:72:7: '=='
-            self.match("==")
+            # C.g:72:5: ( '^=' )
+            # C.g:72:7: '^='
+            self.match("^=")
 
 
 
@@ -1651,9 +1661,9 @@ class CLexer(Lexer):
         try:
             self.type = T91
 
-            # C.g:73:5: ( '!=' )
-            # C.g:73:7: '!='
-            self.match("!=")
+            # C.g:73:5: ( '|=' )
+            # C.g:73:7: '|='
+            self.match("|=")
 
 
 
@@ -1674,9 +1684,9 @@ class CLexer(Lexer):
         try:
             self.type = T92
 
-            # C.g:74:5: ( '<' )
-            # C.g:74:7: '<'
-            self.match(u'<')
+            # C.g:74:5: ( '?' )
+            # C.g:74:7: '?'
+            self.match(u'?')
 
 
 
@@ -1696,9 +1706,10 @@ class CLexer(Lexer):
         try:
             self.type = T93
 
-            # C.g:75:5: ( '>' )
-            # C.g:75:7: '>'
-            self.match(u'>')
+            # C.g:75:5: ( '||' )
+            # C.g:75:7: '||'
+            self.match("||")
+
 
 
 
@@ -1718,9 +1729,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("&&")
 
 
 
@@ -1741,10 +1752,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(u'|')
 
 
 
@@ -1764,10 +1774,9 @@ class CLexer(Lexer):
         try:
             self.type = T96
 
-            # C.g:78:5: ( '<<' )
-            # C.g:78:7: '<<'
-            self.match("<<")
-
+            # C.g:78:5: ( '^' )
+            # C.g:78:7: '^'
+            self.match(u'^')
 
 
 
@@ -1787,9 +1796,9 @@ class CLexer(Lexer):
         try:
             self.type = T97
 
-            # C.g:79:5: ( '>>' )
-            # C.g:79:7: '>>'
-            self.match(">>")
+            # C.g:79:5: ( '==' )
+            # C.g:79:7: '=='
+            self.match("==")
 
 
 
@@ -1810,9 +1819,9 @@ class CLexer(Lexer):
         try:
             self.type = T98
 
-            # C.g:80:5: ( 'case' )
-            # C.g:80:7: 'case'
-            self.match("case")
+            # C.g:80:5: ( '!=' )
+            # C.g:80:7: '!='
+            self.match("!=")
 
 
 
@@ -1833,10 +1842,9 @@ class CLexer(Lexer):
         try:
             self.type = T99
 
-            # C.g:81:5: ( 'default' )
-            # C.g:81:7: 'default'
-            self.match("default")
-
+            # C.g:81:5: ( '<' )
+            # C.g:81:7: '<'
+            self.match(u'<')
 
 
 
@@ -1856,10 +1864,9 @@ class CLexer(Lexer):
         try:
             self.type = T100
 
-            # C.g:82:6: ( 'if' )
-            # C.g:82:8: 'if'
-            self.match("if")
-
+            # C.g:82:6: ( '>' )
+            # C.g:82:8: '>'
+            self.match(u'>')
 
 
 
@@ -1879,9 +1886,9 @@ class CLexer(Lexer):
         try:
             self.type = T101
 
-            # C.g:83:6: ( 'else' )
-            # C.g:83:8: 'else'
-            self.match("else")
+            # C.g:83:6: ( '<=' )
+            # C.g:83:8: '<='
+            self.match("<=")
 
 
 
@@ -1902,9 +1909,9 @@ class CLexer(Lexer):
         try:
             self.type = T102
 
-            # C.g:84:6: ( 'switch' )
-            # C.g:84:8: 'switch'
-            self.match("switch")
+            # C.g:84:6: ( '>=' )
+            # C.g:84:8: '>='
+            self.match(">=")
 
 
 
@@ -1925,9 +1932,9 @@ class CLexer(Lexer):
         try:
             self.type = T103
 
-            # C.g:85:6: ( 'while' )
-            # C.g:85:8: 'while'
-            self.match("while")
+            # C.g:85:6: ( '<<' )
+            # C.g:85:8: '<<'
+            self.match("<<")
 
 
 
@@ -1948,9 +1955,9 @@ class CLexer(Lexer):
         try:
             self.type = T104
 
-            # C.g:86:6: ( 'do' )
-            # C.g:86:8: 'do'
-            self.match("do")
+            # C.g:86:6: ( '>>' )
+            # C.g:86:8: '>>'
+            self.match(">>")
 
 
 
@@ -1971,9 +1978,9 @@ class CLexer(Lexer):
         try:
             self.type = T105
 
-            # C.g:87:6: ( 'for' )
-            # C.g:87:8: 'for'
-            self.match("for")
+            # C.g:87:6: ( 'case' )
+            # C.g:87:8: 'case'
+            self.match("case")
 
 
 
@@ -1994,9 +2001,9 @@ class CLexer(Lexer):
         try:
             self.type = T106
 
-            # C.g:88:6: ( 'goto' )
-            # C.g:88:8: 'goto'
-            self.match("goto")
+            # C.g:88:6: ( 'default' )
+            # C.g:88:8: 'default'
+            self.match("default")
 
 
 
@@ -2017,9 +2024,9 @@ class CLexer(Lexer):
         try:
             self.type = T107
 
-            # C.g:89:6: ( 'continue' )
-            # C.g:89:8: 'continue'
-            self.match("continue")
+            # C.g:89:6: ( 'if' )
+            # C.g:89:8: 'if'
+            self.match("if")
 
 
 
@@ -2040,9 +2047,9 @@ class CLexer(Lexer):
         try:
             self.type = T108
 
-            # C.g:90:6: ( 'break' )
-            # C.g:90:8: 'break'
-            self.match("break")
+            # C.g:90:6: ( 'else' )
+            # C.g:90:8: 'else'
+            self.match("else")
 
 
 
@@ -2063,9 +2070,9 @@ class CLexer(Lexer):
         try:
             self.type = T109
 
-            # C.g:91:6: ( 'return' )
-            # C.g:91:8: 'return'
-            self.match("return")
+            # C.g:91:6: ( 'switch' )
+            # C.g:91:8: 'switch'
+            self.match("switch")
 
 
 
@@ -2080,17 +2087,178 @@ class CLexer(Lexer):
 
 
 
+    # $ANTLR start T110
+    def mT110(self, ):
+
+        try:
+            self.type = T110
+
+            # C.g:92:6: ( 'while' )
+            # C.g:92:8: 'while'
+            self.match("while")
+
+
+
+
+
+
+        finally:
+
+            pass
+
+    # $ANTLR end T110
+
+
+
+    # $ANTLR start T111
+    def mT111(self, ):
+
+        try:
+            self.type = T111
+
+            # C.g:93:6: ( 'do' )
+            # C.g:93:8: 'do'
+            self.match("do")
+
+
+
+
+
+
+        finally:
+
+            pass
+
+    # $ANTLR end T111
+
+
+
+    # $ANTLR start T112
+    def mT112(self, ):
+
+        try:
+            self.type = T112
+
+            # C.g:94:6: ( 'for' )
+            # C.g:94:8: 'for'
+            self.match("for")
+
+
+
+
+
+
+        finally:
+
+            pass
+
+    # $ANTLR end T112
+
+
+
+    # $ANTLR start T113
+    def mT113(self, ):
+
+        try:
+            self.type = T113
+
+            # C.g:95:6: ( 'goto' )
+            # C.g:95:8: 'goto'
+            self.match("goto")
+
+
+
+
+
+
+        finally:
+
+            pass
+
+    # $ANTLR end T113
+
+
+
+    # $ANTLR start T114
+    def mT114(self, ):
+
+        try:
+            self.type = T114
+
+            # C.g:96:6: ( 'continue' )
+            # C.g:96:8: 'continue'
+            self.match("continue")
+
+
+
+
+
+
+        finally:
+
+            pass
+
+    # $ANTLR end T114
+
+
+
+    # $ANTLR start T115
+    def mT115(self, ):
+
+        try:
+            self.type = T115
+
+            # C.g:97:6: ( 'break' )
+            # C.g:97:8: 'break'
+            self.match("break")
+
+
+
+
+
+
+        finally:
+
+            pass
+
+    # $ANTLR end T115
+
+
+
+    # $ANTLR start T116
+    def mT116(self, ):
+
+        try:
+            self.type = T116
+
+            # C.g:98:6: ( 'return' )
+            # C.g:98:8: 'return'
+            self.match("return")
+
+
+
+
+
+
+        finally:
+
+            pass
+
+    # $ANTLR end T116
+
+
+
     # $ANTLR start IDENTIFIER
     def mIDENTIFIER(self, ):
 
         try:
             self.type = IDENTIFIER
 
-            # C.g:493:2: ( LETTER ( LETTER | '0' .. '9' )* )
-            # C.g:493:4: LETTER ( LETTER | '0' .. '9' )*
+            # C.g:499:2: ( LETTER ( LETTER | '0' .. '9' )* )
+            # C.g:499:4: LETTER ( LETTER | '0' .. '9' )*
             self.mLETTER()
 
-            # C.g:493:11: ( LETTER | '0' .. '9' )*
+            # C.g:499:11: ( LETTER | '0' .. '9' )*
             while True: #loop1
                 alt1 = 2
                 LA1_0 = self.input.LA(1)
@@ -2132,7 +2300,7 @@ class CLexer(Lexer):
     def mLETTER(self, ):
 
         try:
-            # C.g:498:2: ( '$' | 'A' .. 'Z' | 'a' .. 'z' | '_' )
+            # C.g:504: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();
@@ -2161,16 +2329,16 @@ class CLexer(Lexer):
         try:
             self.type = CHARACTER_LITERAL
 
-            # C.g:505:5: ( ( 'L' )? '\\'' ( EscapeSequence | ~ ( '\\'' | '\\\\' ) ) '\\'' )
-            # C.g:505:9: ( 'L' )? '\\'' ( EscapeSequence | ~ ( '\\'' | '\\\\' ) ) '\\''
-            # C.g:505:9: ( 'L' )?
+            # C.g:511:5: ( ( 'L' )? '\\'' ( EscapeSequence | ~ ( '\\'' | '\\\\' ) ) '\\'' )
+            # C.g:511:9: ( 'L' )? '\\'' ( EscapeSequence | ~ ( '\\'' | '\\\\' ) ) '\\''
+            # C.g:511:9: ( 'L' )?
             alt2 = 2
             LA2_0 = self.input.LA(1)
 
             if (LA2_0 == u'L') :
                 alt2 = 1
             if alt2 == 1:
-                # C.g:505:10: 'L'
+                # C.g:511:10: 'L'
                 self.match(u'L')
 
 
@@ -2178,7 +2346,7 @@ class CLexer(Lexer):
 
             self.match(u'\'')
 
-            # C.g:505:21: ( EscapeSequence | ~ ( '\\'' | '\\\\' ) )
+            # C.g:511:21: ( EscapeSequence | ~ ( '\\'' | '\\\\' ) )
             alt3 = 2
             LA3_0 = self.input.LA(1)
 
@@ -2187,18 +2355,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("505:21: ( EscapeSequence | ~ ( '\\'' | '\\\\' ) )", 3, 0, self.input)
+                nvae = NoViableAltException("511:21: ( EscapeSequence | ~ ( '\\'' | '\\\\' ) )", 3, 0, self.input)
 
                 raise nvae
 
             if alt3 == 1:
-                # C.g:505:23: EscapeSequence
+                # C.g:511:23: EscapeSequence
                 self.mEscapeSequence()
 
 
 
             elif alt3 == 2:
-                # C.g:505:40: ~ ( '\\'' | '\\\\' )
+                # C.g:511: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();
 
@@ -2231,16 +2399,16 @@ class CLexer(Lexer):
         try:
             self.type = STRING_LITERAL
 
-            # C.g:509:5: ( ( 'L' )? '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"' )
-            # C.g:509:8: ( 'L' )? '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"'
-            # C.g:509:8: ( 'L' )?
+            # C.g:515:5: ( ( 'L' )? '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"' )
+            # C.g:515:8: ( 'L' )? '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"'
+            # C.g:515:8: ( 'L' )?
             alt4 = 2
             LA4_0 = self.input.LA(1)
 
             if (LA4_0 == u'L') :
                 alt4 = 1
             if alt4 == 1:
-                # C.g:509:9: 'L'
+                # C.g:515:9: 'L'
                 self.match(u'L')
 
 
@@ -2248,7 +2416,7 @@ class CLexer(Lexer):
 
             self.match(u'"')
 
-            # C.g:509:19: ( EscapeSequence | ~ ( '\\\\' | '\"' ) )*
+            # C.g:515:19: ( EscapeSequence | ~ ( '\\\\' | '\"' ) )*
             while True: #loop5
                 alt5 = 3
                 LA5_0 = self.input.LA(1)
@@ -2260,13 +2428,13 @@ class CLexer(Lexer):
 
 
                 if alt5 == 1:
-                    # C.g:509:21: EscapeSequence
+                    # C.g:515:21: EscapeSequence
                     self.mEscapeSequence()
 
 
 
                 elif alt5 == 2:
-                    # C.g:509:38: ~ ( '\\\\' | '\"' )
+                    # C.g:515: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();
 
@@ -2302,8 +2470,8 @@ class CLexer(Lexer):
         try:
             self.type = HEX_LITERAL
 
-            # C.g:512:13: ( '0' ( 'x' | 'X' ) ( HexDigit )+ ( IntegerTypeSuffix )? )
-            # C.g:512:15: '0' ( 'x' | 'X' ) ( HexDigit )+ ( IntegerTypeSuffix )?
+            # C.g:518:13: ( '0' ( 'x' | 'X' ) ( HexDigit )+ ( IntegerTypeSuffix )? )
+            # C.g:518:15: '0' ( 'x' | 'X' ) ( HexDigit )+ ( IntegerTypeSuffix )?
             self.match(u'0')
 
             if self.input.LA(1) == u'X' or self.input.LA(1) == u'x':
@@ -2315,7 +2483,7 @@ class CLexer(Lexer):
                 raise mse
 
 
-            # C.g:512:29: ( HexDigit )+
+            # C.g:518:29: ( HexDigit )+
             cnt6 = 0
             while True: #loop6
                 alt6 = 2
@@ -2326,7 +2494,7 @@ class CLexer(Lexer):
 
 
                 if alt6 == 1:
-                    # C.g:512:29: HexDigit
+                    # C.g:518:29: HexDigit
                     self.mHexDigit()
 
 
@@ -2341,14 +2509,14 @@ class CLexer(Lexer):
                 cnt6 += 1
 
 
-            # C.g:512:39: ( IntegerTypeSuffix )?
+            # C.g:518: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:512:39: IntegerTypeSuffix
+                # C.g:518:39: IntegerTypeSuffix
                 self.mIntegerTypeSuffix()
 
 
@@ -2372,9 +2540,9 @@ class CLexer(Lexer):
         try:
             self.type = DECIMAL_LITERAL
 
-            # 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' )* )
+            # C.g:520:17: ( ( '0' | '1' .. '9' ( '0' .. '9' )* ) ( IntegerTypeSuffix )? )
+            # C.g:520:19: ( '0' | '1' .. '9' ( '0' .. '9' )* ) ( IntegerTypeSuffix )?
+            # C.g:520:19: ( '0' | '1' .. '9' ( '0' .. '9' )* )
             alt9 = 2
             LA9_0 = self.input.LA(1)
 
@@ -2383,21 +2551,21 @@ class CLexer(Lexer):
             elif ((u'1' <= LA9_0 <= u'9')) :
                 alt9 = 2
             else:
-                nvae = NoViableAltException("514:19: ( '0' | '1' .. '9' ( '0' .. '9' )* )", 9, 0, self.input)
+                nvae = NoViableAltException("520:19: ( '0' | '1' .. '9' ( '0' .. '9' )* )", 9, 0, self.input)
 
                 raise nvae
 
             if alt9 == 1:
-                # C.g:514:20: '0'
+                # C.g:520:20: '0'
                 self.match(u'0')
 
 
 
             elif alt9 == 2:
-                # C.g:514:26: '1' .. '9' ( '0' .. '9' )*
+                # C.g:520:26: '1' .. '9' ( '0' .. '9' )*
                 self.matchRange(u'1', u'9')
 
-                # C.g:514:35: ( '0' .. '9' )*
+                # C.g:520:35: ( '0' .. '9' )*
                 while True: #loop8
                     alt8 = 2
                     LA8_0 = self.input.LA(1)
@@ -2407,7 +2575,7 @@ class CLexer(Lexer):
 
 
                     if alt8 == 1:
-                        # C.g:514:35: '0' .. '9'
+                        # C.g:520:35: '0' .. '9'
                         self.matchRange(u'0', u'9')
 
 
@@ -2419,14 +2587,14 @@ class CLexer(Lexer):
 
 
 
-            # C.g:514:46: ( IntegerTypeSuffix )?
+            # C.g:520: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:514:46: IntegerTypeSuffix
+                # C.g:520:46: IntegerTypeSuffix
                 self.mIntegerTypeSuffix()
 
 
@@ -2450,11 +2618,11 @@ class CLexer(Lexer):
         try:
             self.type = OCTAL_LITERAL
 
-            # C.g:516:15: ( '0' ( '0' .. '7' )+ ( IntegerTypeSuffix )? )
-            # C.g:516:17: '0' ( '0' .. '7' )+ ( IntegerTypeSuffix )?
+            # C.g:522:15: ( '0' ( '0' .. '7' )+ ( IntegerTypeSuffix )? )
+            # C.g:522:17: '0' ( '0' .. '7' )+ ( IntegerTypeSuffix )?
             self.match(u'0')
 
-            # C.g:516:21: ( '0' .. '7' )+
+            # C.g:522:21: ( '0' .. '7' )+
             cnt11 = 0
             while True: #loop11
                 alt11 = 2
@@ -2465,7 +2633,7 @@ class CLexer(Lexer):
 
 
                 if alt11 == 1:
-                    # C.g:516:22: '0' .. '7'
+                    # C.g:522:22: '0' .. '7'
                     self.matchRange(u'0', u'7')
 
 
@@ -2480,14 +2648,14 @@ class CLexer(Lexer):
                 cnt11 += 1
 
 
-            # C.g:516:33: ( IntegerTypeSuffix )?
+            # C.g:522: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:516:33: IntegerTypeSuffix
+                # C.g:522:33: IntegerTypeSuffix
                 self.mIntegerTypeSuffix()
 
 
@@ -2509,8 +2677,8 @@ class CLexer(Lexer):
     def mHexDigit(self, ):
 
         try:
-            # C.g:519:10: ( ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) )
-            # C.g:519:12: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )
+            # C.g:525:10: ( ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) )
+            # C.g:525: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();
 
@@ -2536,7 +2704,7 @@ class CLexer(Lexer):
     def mIntegerTypeSuffix(self, ):
 
         try:
-            # C.g:523:2: ( ( 'u' | 'U' )? ( 'l' | 'L' ) | ( 'u' | 'U' ) ( 'l' | 'L' )? | 'ULL' )
+            # C.g:529:2: ( ( 'u' | 'U' )? ( 'l' | 'L' ) | ( 'u' | 'U' ) ( 'l' | 'L' )? | 'ULL' )
             alt15 = 3
             LA15 = self.input.LA(1)
             if LA15 == u'U':
@@ -2562,13 +2730,13 @@ class CLexer(Lexer):
                 else:
                     alt15 = 2
             else:
-                nvae = NoViableAltException("521:1: fragment IntegerTypeSuffix : ( ( 'u' | 'U' )? ( 'l' | 'L' ) | ( 'u' | 'U' ) ( 'l' | 'L' )? | 'ULL' );", 15, 0, self.input)
+                nvae = NoViableAltException("527:1: fragment IntegerTypeSuffix : ( ( 'u' | 'U' )? ( 'l' | 'L' ) | ( 'u' | 'U' ) ( 'l' | 'L' )? | 'ULL' );", 15, 0, self.input)
 
                 raise nvae
 
             if alt15 == 1:
-                # C.g:523:4: ( 'u' | 'U' )? ( 'l' | 'L' )
-                # C.g:523:4: ( 'u' | 'U' )?
+                # C.g:529:4: ( 'u' | 'U' )? ( 'l' | 'L' )
+                # C.g:529:4: ( 'u' | 'U' )?
                 alt13 = 2
                 LA13_0 = self.input.LA(1)
 
@@ -2600,7 +2768,7 @@ class CLexer(Lexer):
 
 
             elif alt15 == 2:
-                # C.g:524:4: ( 'u' | 'U' ) ( 'l' | 'L' )?
+                # C.g:530:4: ( 'u' | 'U' ) ( 'l' | 'L' )?
                 if self.input.LA(1) == u'U' or self.input.LA(1) == u'u':
                     self.input.consume();
 
@@ -2610,7 +2778,7 @@ class CLexer(Lexer):
                     raise mse
 
 
-                # C.g:524:15: ( 'l' | 'L' )?
+                # C.g:530:15: ( 'l' | 'L' )?
                 alt14 = 2
                 LA14_0 = self.input.LA(1)
 
@@ -2633,7 +2801,7 @@ class CLexer(Lexer):
 
 
             elif alt15 == 3:
-                # C.g:525:4: 'ULL'
+                # C.g:531:4: 'ULL'
                 self.match("ULL")
 
 
@@ -2654,12 +2822,12 @@ class CLexer(Lexer):
         try:
             self.type = FLOATING_POINT_LITERAL
 
-            # C.g:529:5: ( ( '0' .. '9' )+ '.' ( '0' .. '9' )* ( Exponent )? ( FloatTypeSuffix )? | '.' ( '0' .. '9' )+ ( Exponent )? ( FloatTypeSuffix )? | ( '0' .. '9' )+ Exponent ( FloatTypeSuffix )? | ( '0' .. '9' )+ ( Exponent )? FloatTypeSuffix )
+            # C.g:535:5: ( ( '0' .. '9' )+ '.' ( '0' .. '9' )* ( Exponent )? ( FloatTypeSuffix )? | '.' ( '0' .. '9' )+ ( Exponent )? ( FloatTypeSuffix )? | ( '0' .. '9' )+ Exponent ( FloatTypeSuffix )? | ( '0' .. '9' )+ ( Exponent )? FloatTypeSuffix )
             alt27 = 4
             alt27 = self.dfa27.predict(self.input)
             if alt27 == 1:
-                # C.g:529:9: ( '0' .. '9' )+ '.' ( '0' .. '9' )* ( Exponent )? ( FloatTypeSuffix )?
-                # C.g:529:9: ( '0' .. '9' )+
+                # C.g:535:9: ( '0' .. '9' )+ '.' ( '0' .. '9' )* ( Exponent )? ( FloatTypeSuffix )?
+                # C.g:535:9: ( '0' .. '9' )+
                 cnt16 = 0
                 while True: #loop16
                     alt16 = 2
@@ -2670,7 +2838,7 @@ class CLexer(Lexer):
 
 
                     if alt16 == 1:
-                        # C.g:529:10: '0' .. '9'
+                        # C.g:535:10: '0' .. '9'
                         self.matchRange(u'0', u'9')
 
 
@@ -2687,7 +2855,7 @@ class CLexer(Lexer):
 
                 self.match(u'.')
 
-                # C.g:529:25: ( '0' .. '9' )*
+                # C.g:535:25: ( '0' .. '9' )*
                 while True: #loop17
                     alt17 = 2
                     LA17_0 = self.input.LA(1)
@@ -2697,7 +2865,7 @@ class CLexer(Lexer):
 
 
                     if alt17 == 1:
-                        # C.g:529:26: '0' .. '9'
+                        # C.g:535:26: '0' .. '9'
                         self.matchRange(u'0', u'9')
 
 
@@ -2706,27 +2874,27 @@ class CLexer(Lexer):
                         break #loop17
 
 
-                # C.g:529:37: ( Exponent )?
+                # C.g:535:37: ( Exponent )?
                 alt18 = 2
                 LA18_0 = self.input.LA(1)
 
                 if (LA18_0 == u'E' or LA18_0 == u'e') :
                     alt18 = 1
                 if alt18 == 1:
-                    # C.g:529:37: Exponent
+                    # C.g:535:37: Exponent
                     self.mExponent()
 
 
 
 
-                # C.g:529:47: ( FloatTypeSuffix )?
+                # C.g:535:47: ( FloatTypeSuffix )?
                 alt19 = 2
                 LA19_0 = self.input.LA(1)
 
                 if (LA19_0 == u'D' or LA19_0 == u'F' or LA19_0 == u'd' or LA19_0 == u'f') :
                     alt19 = 1
                 if alt19 == 1:
-                    # C.g:529:47: FloatTypeSuffix
+                    # C.g:535:47: FloatTypeSuffix
                     self.mFloatTypeSuffix()
 
 
@@ -2735,10 +2903,10 @@ class CLexer(Lexer):
 
 
             elif alt27 == 2:
-                # C.g:530:9: '.' ( '0' .. '9' )+ ( Exponent )? ( FloatTypeSuffix )?
+                # C.g:536:9: '.' ( '0' .. '9' )+ ( Exponent )? ( FloatTypeSuffix )?
                 self.match(u'.')
 
-                # C.g:530:13: ( '0' .. '9' )+
+                # C.g:536:13: ( '0' .. '9' )+
                 cnt20 = 0
                 while True: #loop20
                     alt20 = 2
@@ -2749,7 +2917,7 @@ class CLexer(Lexer):
 
 
                     if alt20 == 1:
-                        # C.g:530:14: '0' .. '9'
+                        # C.g:536:14: '0' .. '9'
                         self.matchRange(u'0', u'9')
 
 
@@ -2764,27 +2932,27 @@ class CLexer(Lexer):
                     cnt20 += 1
 
 
-                # C.g:530:25: ( Exponent )?
+                # C.g:536:25: ( Exponent )?
                 alt21 = 2
                 LA21_0 = self.input.LA(1)
 
                 if (LA21_0 == u'E' or LA21_0 == u'e') :
                     alt21 = 1
                 if alt21 == 1:
-                    # C.g:530:25: Exponent
+                    # C.g:536:25: Exponent
                     self.mExponent()
 
 
 
 
-                # C.g:530:35: ( FloatTypeSuffix )?
+                # C.g:536:35: ( FloatTypeSuffix )?
                 alt22 = 2
                 LA22_0 = self.input.LA(1)
 
                 if (LA22_0 == u'D' or LA22_0 == u'F' or LA22_0 == u'd' or LA22_0 == u'f') :
                     alt22 = 1
                 if alt22 == 1:
-                    # C.g:530:35: FloatTypeSuffix
+                    # C.g:536:35: FloatTypeSuffix
                     self.mFloatTypeSuffix()
 
 
@@ -2793,8 +2961,8 @@ class CLexer(Lexer):
 
 
             elif alt27 == 3:
-                # C.g:531:9: ( '0' .. '9' )+ Exponent ( FloatTypeSuffix )?
-                # C.g:531:9: ( '0' .. '9' )+
+                # C.g:537:9: ( '0' .. '9' )+ Exponent ( FloatTypeSuffix )?
+                # C.g:537:9: ( '0' .. '9' )+
                 cnt23 = 0
                 while True: #loop23
                     alt23 = 2
@@ -2805,7 +2973,7 @@ class CLexer(Lexer):
 
 
                     if alt23 == 1:
-                        # C.g:531:10: '0' .. '9'
+                        # C.g:537:10: '0' .. '9'
                         self.matchRange(u'0', u'9')
 
 
@@ -2822,14 +2990,14 @@ class CLexer(Lexer):
 
                 self.mExponent()
 
-                # C.g:531:30: ( FloatTypeSuffix )?
+                # C.g:537:30: ( FloatTypeSuffix )?
                 alt24 = 2
                 LA24_0 = self.input.LA(1)
 
                 if (LA24_0 == u'D' or LA24_0 == u'F' or LA24_0 == u'd' or LA24_0 == u'f') :
                     alt24 = 1
                 if alt24 == 1:
-                    # C.g:531:30: FloatTypeSuffix
+                    # C.g:537:30: FloatTypeSuffix
                     self.mFloatTypeSuffix()
 
 
@@ -2838,8 +3006,8 @@ class CLexer(Lexer):
 
 
             elif alt27 == 4:
-                # C.g:532:9: ( '0' .. '9' )+ ( Exponent )? FloatTypeSuffix
-                # C.g:532:9: ( '0' .. '9' )+
+                # C.g:538:9: ( '0' .. '9' )+ ( Exponent )? FloatTypeSuffix
+                # C.g:538:9: ( '0' .. '9' )+
                 cnt25 = 0
                 while True: #loop25
                     alt25 = 2
@@ -2850,7 +3018,7 @@ class CLexer(Lexer):
 
 
                     if alt25 == 1:
-                        # C.g:532:10: '0' .. '9'
+                        # C.g:538:10: '0' .. '9'
                         self.matchRange(u'0', u'9')
 
 
@@ -2865,14 +3033,14 @@ class CLexer(Lexer):
                     cnt25 += 1
 
 
-                # C.g:532:21: ( Exponent )?
+                # C.g:538:21: ( Exponent )?
                 alt26 = 2
                 LA26_0 = self.input.LA(1)
 
                 if (LA26_0 == u'E' or LA26_0 == u'e') :
                     alt26 = 1
                 if alt26 == 1:
-                    # C.g:532:21: Exponent
+                    # C.g:538:21: Exponent
                     self.mExponent()
 
 
@@ -2895,8 +3063,8 @@ class CLexer(Lexer):
     def mExponent(self, ):
 
         try:
-            # C.g:536:10: ( ( 'e' | 'E' ) ( '+' | '-' )? ( '0' .. '9' )+ )
-            # C.g:536:12: ( 'e' | 'E' ) ( '+' | '-' )? ( '0' .. '9' )+
+            # C.g:542:10: ( ( 'e' | 'E' ) ( '+' | '-' )? ( '0' .. '9' )+ )
+            # C.g:542:12: ( 'e' | 'E' ) ( '+' | '-' )? ( '0' .. '9' )+
             if self.input.LA(1) == u'E' or self.input.LA(1) == u'e':
                 self.input.consume();
 
@@ -2906,7 +3074,7 @@ class CLexer(Lexer):
                 raise mse
 
 
-            # C.g:536:22: ( '+' | '-' )?
+            # C.g:542:22: ( '+' | '-' )?
             alt28 = 2
             LA28_0 = self.input.LA(1)
 
@@ -2926,7 +3094,7 @@ class CLexer(Lexer):
 
 
 
-            # C.g:536:33: ( '0' .. '9' )+
+            # C.g:542:33: ( '0' .. '9' )+
             cnt29 = 0
             while True: #loop29
                 alt29 = 2
@@ -2937,7 +3105,7 @@ class CLexer(Lexer):
 
 
                 if alt29 == 1:
-                    # C.g:536:34: '0' .. '9'
+                    # C.g:542:34: '0' .. '9'
                     self.matchRange(u'0', u'9')
 
 
@@ -2968,8 +3136,8 @@ class CLexer(Lexer):
     def mFloatTypeSuffix(self, ):
 
         try:
-            # C.g:539:17: ( ( 'f' | 'F' | 'd' | 'D' ) )
-            # C.g:539:19: ( 'f' | 'F' | 'd' | 'D' )
+            # C.g:545:17: ( ( 'f' | 'F' | 'd' | 'D' ) )
+            # C.g:545: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();
 
@@ -2995,7 +3163,7 @@ class CLexer(Lexer):
     def mEscapeSequence(self, ):
 
         try:
-            # C.g:543:5: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | OctalEscape )
+            # C.g:549:5: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | OctalEscape )
             alt30 = 2
             LA30_0 = self.input.LA(1)
 
@@ -3007,17 +3175,17 @@ class CLexer(Lexer):
                 elif ((u'0' <= LA30_1 <= u'7')) :
                     alt30 = 2
                 else:
-                    nvae = NoViableAltException("541:1: fragment EscapeSequence : ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | OctalEscape );", 30, 1, self.input)
+                    nvae = NoViableAltException("547:1: fragment EscapeSequence : ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | OctalEscape );", 30, 1, self.input)
 
                     raise nvae
 
             else:
-                nvae = NoViableAltException("541:1: fragment EscapeSequence : ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | OctalEscape );", 30, 0, self.input)
+                nvae = NoViableAltException("547:1: fragment EscapeSequence : ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | OctalEscape );", 30, 0, self.input)
 
                 raise nvae
 
             if alt30 == 1:
-                # C.g:543:8: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' )
+                # C.g:549: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':
@@ -3032,7 +3200,7 @@ class CLexer(Lexer):
 
 
             elif alt30 == 2:
-                # C.g:544:9: OctalEscape
+                # C.g:550:9: OctalEscape
                 self.mOctalEscape()
 
 
@@ -3050,7 +3218,7 @@ class CLexer(Lexer):
     def mOctalEscape(self, ):
 
         try:
-            # C.g:549:5: ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) )
+            # C.g:555:5: ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) )
             alt31 = 3
             LA31_0 = self.input.LA(1)
 
@@ -3061,9 +3229,9 @@ class CLexer(Lexer):
                     LA31_2 = self.input.LA(3)
 
                     if ((u'0' <= LA31_2 <= u'7')) :
-                        LA31_5 = self.input.LA(4)
+                        LA31_4 = self.input.LA(4)
 
-                        if ((u'0' <= LA31_5 <= u'7')) :
+                        if ((u'0' <= LA31_4 <= u'7')) :
                             alt31 = 1
                         else:
                             alt31 = 2
@@ -3077,35 +3245,35 @@ class CLexer(Lexer):
                     else:
                         alt31 = 3
                 else:
-                    nvae = NoViableAltException("547:1: fragment OctalEscape : ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) );", 31, 1, self.input)
+                    nvae = NoViableAltException("553:1: fragment OctalEscape : ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) );", 31, 1, self.input)
 
                     raise nvae
 
             else:
-                nvae = NoViableAltException("547:1: fragment OctalEscape : ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) );", 31, 0, self.input)
+                nvae = NoViableAltException("553:1: fragment OctalEscape : ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) );", 31, 0, self.input)
 
                 raise nvae
 
             if alt31 == 1:
-                # C.g:549:9: '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' )
+                # C.g:555:9: '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' )
                 self.match(u'\\')
 
-                # C.g:549:14: ( '0' .. '3' )
-                # C.g:549:15: '0' .. '3'
+                # C.g:555:14: ( '0' .. '3' )
+                # C.g:555:15: '0' .. '3'
                 self.matchRange(u'0', u'3')
 
 
 
 
-                # C.g:549:25: ( '0' .. '7' )
-                # C.g:549:26: '0' .. '7'
+                # C.g:555:25: ( '0' .. '7' )
+                # C.g:555:26: '0' .. '7'
                 self.matchRange(u'0', u'7')
 
 
 
 
-                # C.g:549:36: ( '0' .. '7' )
-                # C.g:549:37: '0' .. '7'
+                # C.g:555:36: ( '0' .. '7' )
+                # C.g:555:37: '0' .. '7'
                 self.matchRange(u'0', u'7')
 
 
@@ -3114,18 +3282,18 @@ class CLexer(Lexer):
 
 
             elif alt31 == 2:
-                # C.g:550:9: '\\\\' ( '0' .. '7' ) ( '0' .. '7' )
+                # C.g:556:9: '\\\\' ( '0' .. '7' ) ( '0' .. '7' )
                 self.match(u'\\')
 
-                # C.g:550:14: ( '0' .. '7' )
-                # C.g:550:15: '0' .. '7'
+                # C.g:556:14: ( '0' .. '7' )
+                # C.g:556:15: '0' .. '7'
                 self.matchRange(u'0', u'7')
 
 
 
 
-                # C.g:550:25: ( '0' .. '7' )
-                # C.g:550:26: '0' .. '7'
+                # C.g:556:25: ( '0' .. '7' )
+                # C.g:556:26: '0' .. '7'
                 self.matchRange(u'0', u'7')
 
 
@@ -3134,11 +3302,11 @@ class CLexer(Lexer):
 
 
             elif alt31 == 3:
-                # C.g:551:9: '\\\\' ( '0' .. '7' )
+                # C.g:557:9: '\\\\' ( '0' .. '7' )
                 self.match(u'\\')
 
-                # C.g:551:14: ( '0' .. '7' )
-                # C.g:551:15: '0' .. '7'
+                # C.g:557:14: ( '0' .. '7' )
+                # C.g:557:15: '0' .. '7'
                 self.matchRange(u'0', u'7')
 
 
@@ -3159,8 +3327,8 @@ class CLexer(Lexer):
     def mUnicodeEscape(self, ):
 
         try:
-            # C.g:556:5: ( '\\\\' 'u' HexDigit HexDigit HexDigit HexDigit )
-            # C.g:556:9: '\\\\' 'u' HexDigit HexDigit HexDigit HexDigit
+            # C.g:562:5: ( '\\\\' 'u' HexDigit HexDigit HexDigit HexDigit )
+            # C.g:562:9: '\\\\' 'u' HexDigit HexDigit HexDigit HexDigit
             self.match(u'\\')
 
             self.match(u'u')
@@ -3191,8 +3359,8 @@ class CLexer(Lexer):
         try:
             self.type = WS
 
-            # C.g:559:5: ( ( ' ' | '\\r' | '\\t' | '\\u000C' | '\\n' ) )
-            # C.g:559:8: ( ' ' | '\\r' | '\\t' | '\\u000C' | '\\n' )
+            # C.g:565:5: ( ( ' ' | '\\r' | '\\t' | '\\u000C' | '\\n' ) )
+            # C.g:565: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();
 
@@ -3223,10 +3391,10 @@ class CLexer(Lexer):
         try:
             self.type = BS
 
-            # C.g:563:5: ( ( '\\\\' ) )
-            # C.g:563:7: ( '\\\\' )
-            # C.g:563:7: ( '\\\\' )
-            # C.g:563:8: '\\\\'
+            # C.g:569:5: ( ( '\\\\' ) )
+            # C.g:569:7: ( '\\\\' )
+            # C.g:569:7: ( '\\\\' )
+            # C.g:569:8: '\\\\'
             self.match(u'\\')
 
 
@@ -3253,8 +3421,8 @@ class CLexer(Lexer):
         try:
             self.type = UnicodeVocabulary
 
-            # C.g:571:5: ( '\\u0003' .. '\\uFFFE' )
-            # C.g:571:7: '\\u0003' .. '\\uFFFE'
+            # C.g:577:5: ( '\\u0003' .. '\\uFFFE' )
+            # C.g:577:7: '\\u0003' .. '\\uFFFE'
             self.matchRange(u'\u0003', u'\uFFFE')
 
 
@@ -3275,12 +3443,12 @@ class CLexer(Lexer):
         try:
             self.type = COMMENT
 
-            # C.g:574:5: ( '/*' ( options {greedy=false; } : . )* '*/' )
-            # C.g:574:9: '/*' ( options {greedy=false; } : . )* '*/'
+            # C.g:580:5: ( '/*' ( options {greedy=false; } : . )* '*/' )
+            # C.g:580:9: '/*' ( options {greedy=false; } : . )* '*/'
             self.match("/*")
 
 
-            # C.g:574:14: ( options {greedy=false; } : . )*
+            # C.g:580:14: ( options {greedy=false; } : . )*
             while True: #loop32
                 alt32 = 2
                 LA32_0 = self.input.LA(1)
@@ -3299,7 +3467,7 @@ class CLexer(Lexer):
 
 
                 if alt32 == 1:
-                    # C.g:574:42: .
+                    # C.g:580:42: .
                     self.matchAny()
 
 
@@ -3332,12 +3500,12 @@ class CLexer(Lexer):
         try:
             self.type = LINE_COMMENT
 
-            # C.g:579:5: ( '//' (~ ( '\\n' | '\\r' ) )* ( '\\r' )? '\\n' )
-            # C.g:579:7: '//' (~ ( '\\n' | '\\r' ) )* ( '\\r' )? '\\n'
+            # C.g:585:5: ( '//' (~ ( '\\n' | '\\r' ) )* ( '\\r' )? '\\n' )
+            # C.g:585:7: '//' (~ ( '\\n' | '\\r' ) )* ( '\\r' )? '\\n'
             self.match("//")
 
 
-            # C.g:579:12: (~ ( '\\n' | '\\r' ) )*
+            # C.g:585:12: (~ ( '\\n' | '\\r' ) )*
             while True: #loop33
                 alt33 = 2
                 LA33_0 = self.input.LA(1)
@@ -3347,7 +3515,7 @@ class CLexer(Lexer):
 
 
                 if alt33 == 1:
-                    # C.g:579:12: ~ ( '\\n' | '\\r' )
+                    # C.g:585: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();
 
@@ -3363,14 +3531,14 @@ class CLexer(Lexer):
                     break #loop33
 
 
-            # C.g:579:26: ( '\\r' )?
+            # C.g:585:26: ( '\\r' )?
             alt34 = 2
             LA34_0 = self.input.LA(1)
 
             if (LA34_0 == u'\r') :
                 alt34 = 1
             if alt34 == 1:
-                # C.g:579:26: '\\r'
+                # C.g:585:26: '\\r'
                 self.match(u'\r')
 
 
@@ -3399,11 +3567,11 @@ class CLexer(Lexer):
         try:
             self.type = LINE_COMMAND
 
-            # C.g:584:5: ( '#' (~ ( '\\n' | '\\r' ) )* ( '\\r' )? '\\n' )
-            # C.g:584:7: '#' (~ ( '\\n' | '\\r' ) )* ( '\\r' )? '\\n'
+            # C.g:590:5: ( '#' (~ ( '\\n' | '\\r' ) )* ( '\\r' )? '\\n' )
+            # C.g:590:7: '#' (~ ( '\\n' | '\\r' ) )* ( '\\r' )? '\\n'
             self.match(u'#')
 
-            # C.g:584:11: (~ ( '\\n' | '\\r' ) )*
+            # C.g:590:11: (~ ( '\\n' | '\\r' ) )*
             while True: #loop35
                 alt35 = 2
                 LA35_0 = self.input.LA(1)
@@ -3413,7 +3581,7 @@ class CLexer(Lexer):
 
 
                 if alt35 == 1:
-                    # C.g:584:11: ~ ( '\\n' | '\\r' )
+                    # C.g:590: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();
 
@@ -3429,14 +3597,14 @@ class CLexer(Lexer):
                     break #loop35
 
 
-            # C.g:584:25: ( '\\r' )?
+            # C.g:590:25: ( '\\r' )?
             alt36 = 2
             LA36_0 = self.input.LA(1)
 
             if (LA36_0 == u'\r') :
                 alt36 = 1
             if alt36 == 1:
-                # C.g:584:25: '\\r'
+                # C.g:590:25: '\\r'
                 self.match(u'\r')
 
 
@@ -3460,8 +3628,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 | T108 | T109 | IDENTIFIER | CHARACTER_LITERAL | STRING_LITERAL | HEX_LITERAL | DECIMAL_LITERAL | OCTAL_LITERAL | FLOATING_POINT_LITERAL | WS | BS | UnicodeVocabulary | COMMENT | LINE_COMMENT | LINE_COMMAND )
-        alt37 = 98
+        # 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 | T110 | T111 | T112 | T113 | T114 | T115 | T116 | IDENTIFIER | CHARACTER_LITERAL | STRING_LITERAL | HEX_LITERAL | DECIMAL_LITERAL | OCTAL_LITERAL | FLOATING_POINT_LITERAL | WS | BS | UnicodeVocabulary | COMMENT | LINE_COMMENT | LINE_COMMAND )
+        alt37 = 105
         alt37 = self.dfa37.predict(self.input)
         if alt37 == 1:
             # C.g:1:10: T25
@@ -3974,79 +4142,121 @@ class CLexer(Lexer):
 
 
         elif alt37 == 86:
-            # C.g:1:360: IDENTIFIER
-            self.mIDENTIFIER()
+            # C.g:1:360: T110
+            self.mT110()
 
 
 
         elif alt37 == 87:
-            # C.g:1:371: CHARACTER_LITERAL
-            self.mCHARACTER_LITERAL()
+            # C.g:1:365: T111
+            self.mT111()
 
 
 
         elif alt37 == 88:
-            # C.g:1:389: STRING_LITERAL
-            self.mSTRING_LITERAL()
+            # C.g:1:370: T112
+            self.mT112()
 
 
 
         elif alt37 == 89:
-            # C.g:1:404: HEX_LITERAL
-            self.mHEX_LITERAL()
+            # C.g:1:375: T113
+            self.mT113()
 
 
 
         elif alt37 == 90:
-            # C.g:1:416: DECIMAL_LITERAL
-            self.mDECIMAL_LITERAL()
+            # C.g:1:380: T114
+            self.mT114()
 
 
 
         elif alt37 == 91:
-            # C.g:1:432: OCTAL_LITERAL
-            self.mOCTAL_LITERAL()
+            # C.g:1:385: T115
+            self.mT115()
 
 
 
         elif alt37 == 92:
-            # C.g:1:446: FLOATING_POINT_LITERAL
-            self.mFLOATING_POINT_LITERAL()
+            # C.g:1:390: T116
+            self.mT116()
 
 
 
         elif alt37 == 93:
-            # C.g:1:469: WS
-            self.mWS()
+            # C.g:1:395: IDENTIFIER
+            self.mIDENTIFIER()
 
 
 
         elif alt37 == 94:
-            # C.g:1:472: BS
-            self.mBS()
+            # C.g:1:406: CHARACTER_LITERAL
+            self.mCHARACTER_LITERAL()
 
 
 
         elif alt37 == 95:
-            # C.g:1:475: UnicodeVocabulary
-            self.mUnicodeVocabulary()
+            # C.g:1:424: STRING_LITERAL
+            self.mSTRING_LITERAL()
 
 
 
         elif alt37 == 96:
-            # C.g:1:493: COMMENT
-            self.mCOMMENT()
+            # C.g:1:439: HEX_LITERAL
+            self.mHEX_LITERAL()
 
 
 
         elif alt37 == 97:
-            # C.g:1:501: LINE_COMMENT
-            self.mLINE_COMMENT()
+            # C.g:1:451: DECIMAL_LITERAL
+            self.mDECIMAL_LITERAL()
 
 
 
         elif alt37 == 98:
-            # C.g:1:514: LINE_COMMAND
+            # C.g:1:467: OCTAL_LITERAL
+            self.mOCTAL_LITERAL()
+
+
+
+        elif alt37 == 99:
+            # C.g:1:481: FLOATING_POINT_LITERAL
+            self.mFLOATING_POINT_LITERAL()
+
+
+
+        elif alt37 == 100:
+            # C.g:1:504: WS
+            self.mWS()
+
+
+
+        elif alt37 == 101:
+            # C.g:1:507: BS
+            self.mBS()
+
+
+
+        elif alt37 == 102:
+            # C.g:1:510: UnicodeVocabulary
+            self.mUnicodeVocabulary()
+
+
+
+        elif alt37 == 103:
+            # C.g:1:528: COMMENT
+            self.mCOMMENT()
+
+
+
+        elif alt37 == 104:
+            # C.g:1:536: LINE_COMMENT
+            self.mLINE_COMMENT()
+
+
+
+        elif alt37 == 105:
+            # C.g:1:549: LINE_COMMAND
             self.mLINE_COMMAND()
 
 
@@ -4104,206 +4314,226 @@ class CLexer(Lexer):
     # lookup tables for DFA #37
 
     DFA37_eot = DFA.unpack(
-        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"
+        u"\2\uffff\1\74\1\uffff\1\77\17\74\3\uffff\4\74\4\uffff\1\147\1\151"
+        u"\1\155\1\161\1\165\1\167\1\172\1\uffff\1\175\1\u0080\1\u0083\1"
+        u"\u0085\1\u0088\1\uffff\4\74\1\uffff\2\71\2\u0091\2\uffff\1\71\2"
+        u"\uffff\1\74\4\uffff\16\74\1\u00a9\5\74\1\u00b0\5\74\3\uffff\1\u00b8"
+        u"\4\74\34\uffff\1\u00be\2\uffff\1\u00c0\10\uffff\3\74\3\uffff\1"
+        u"\u00c4\1\uffff\1\u0091\3\uffff\23\74\1\uffff\1\u00d9\1\74\1\u00db"
+        u"\3\74\1\uffff\7\74\1\uffff\1\u00e6\3\74\4\uffff\3\74\1\uffff\1"
+        u"\74\1\u00ef\1\74\1\u00f1\6\74\1\u00f8\4\74\1\u00fd\2\74\1\u0100"
+        u"\1\u0101\1\uffff\1\u0102\1\uffff\10\74\1\u010c\1\74\1\uffff\5\74"
+        u"\1\u0114\2\74\1\uffff\1\74\1\uffff\4\74\1\u011c\1\74\1\uffff\4"
+        u"\74\1\uffff\1\u0122\1\74\3\uffff\1\u0124\3\74\1\u0128\1\74\1\u012a"
+        u"\1\u012b\1\74\1\uffff\6\74\1\u0133\1\uffff\1\u0134\1\74\1\u0136"
+        u"\1\u0137\1\u0138\1\u0139\1\u013a\1\uffff\1\u013b\1\u013c\1\74\1"
+        u"\u013e\1\74\1\uffff\1\74\1\uffff\1\74\1\u0142\1\74\1\uffff\1\74"
+        u"\2\uffff\1\u0145\5\74\1\u014b\2\uffff\1\u014c\7\uffff\1\74\1\uffff"
+        u"\2\74\1\u0150\1\uffff\1\74\1\u0152\1\uffff\5\74\2\uffff\1\u0158"
+        u"\1\u0159\1\u015a\1\uffff\1\u015b\1\uffff\1\u015c\1\u015d\3\74\6"
+        u"\uffff\1\u0161\2\74\1\uffff\13\74\1\u016f\1\74\1\uffff\1\74\1\u0172"
+        u"\1\uffff"
         )
 
     DFA37_eof = DFA.unpack(
-        u"\u0139\uffff"
+        u"\u0173\uffff"
         )
 
     DFA37_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\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\44\1\114\2\uffff\3\44\1\uffff\1\44\1\uffff\1\44\5\uffff"
+        u"\157\1\141\1\146\1\157\1\154\1\145\1\156\1\117\1\110\1\117\3\uffff"
+        u"\1\116\1\120\1\116\1\106\4\uffff\1\75\1\56\1\53\1\55\1\52\1\75"
+        u"\1\46\1\uffff\1\75\1\74\3\75\1\uffff\1\150\1\157\1\162\1\42\1\uffff"
+        u"\2\0\2\56\2\uffff\1\0\2\uffff\1\160\4\uffff\1\165\1\164\1\163\1"
+        u"\147\1\141\1\157\1\151\1\164\1\147\1\101\1\151\1\156\1\141\1\163"
+        u"\1\44\1\164\1\156\1\162\1\157\1\146\1\44\1\151\1\117\1\116\1\101"
+        u"\1\111\3\uffff\1\44\2\124\1\101\1\111\34\uffff\1\75\2\uffff\1\75"
+        u"\10\uffff\1\151\1\164\1\145\3\uffff\1\56\1\uffff\1\56\3\uffff\1"
+        u"\145\1\155\2\145\1\156\1\145\1\165\1\164\1\162\1\164\1\157\1\165"
+        u"\1\151\1\124\1\141\1\144\1\163\1\162\1\145\1\uffff\1\44\1\147\1"
+        u"\44\2\141\1\142\1\uffff\1\151\1\157\1\114\1\123\1\122\1\104\1\101"
+        u"\1\uffff\1\44\1\111\1\114\1\101\4\uffff\1\154\1\157\1\141\1\uffff"
+        u"\1\144\1\44\1\162\1\44\1\145\1\157\1\143\1\151\1\164\1\143\1\44"
+        u"\1\162\1\163\1\111\1\164\1\44\1\164\1\151\2\44\1\uffff\1\44\1\uffff"
+        u"\1\164\1\165\1\154\1\147\1\156\1\105\1\124\1\61\1\44\1\124\1\uffff"
+        u"\1\117\1\111\1\102\1\120\1\145\1\44\1\153\1\145\1\uffff\1\156\1"
+        u"\uffff\1\144\1\146\1\164\1\143\1\44\1\150\1\uffff\1\156\1\164\1"
+        u"\103\1\151\1\uffff\1\44\1\156\3\uffff\1\44\1\154\1\145\1\156\1"
+        u"\44\1\101\2\44\1\66\1\uffff\1\111\1\116\1\107\1\125\1\117\1\111"
+        u"\1\44\1\uffff\1\44\1\146\5\44\1\uffff\2\44\1\145\1\44\1\154\1\uffff"
+        u"\1\165\1\uffff\1\164\1\44\1\145\1\uffff\1\116\2\uffff\1\44\1\114"
+        u"\1\101\2\116\1\117\1\44\2\uffff\1\44\7\uffff\1\162\1\uffff\2\145"
+        u"\1\44\1\uffff\1\144\1\44\1\uffff\1\105\1\114\1\105\2\124\2\uffff"
+        u"\3\44\1\uffff\1\44\1\uffff\2\44\1\104\1\111\1\123\6\uffff\1\44"
+        u"\1\115\1\105\1\uffff\1\105\1\122\1\123\1\126\1\105\1\111\1\122"
+        u"\1\103\1\126\1\105\1\111\1\44\1\103\1\uffff\1\105\1\44\1\uffff"
         )
 
     DFA37_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\1\117\3\uffff\1\116\1\125\1\117\1\106"
+        u"\2\157\1\156\3\157\1\156\3\117\3\uffff\1\116\1\125\1\116\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"
+        u"\1\ufffe\2\uffff\1\160\4\uffff\1\165\1\164\1\163\1\172\1\162\1"
+        u"\157\1\151\2\164\1\101\1\154\1\156\1\141\1\163\1\172\1\164\1\156"
+        u"\1\162\1\157\1\146\1\172\1\163\1\117\1\116\1\101\1\114\3\uffff"
+        u"\1\172\2\124\1\101\1\111\34\uffff\1\75\2\uffff\1\75\10\uffff\1"
+        u"\151\1\164\1\145\3\uffff\1\146\1\uffff\1\146\3\uffff\1\145\1\155"
+        u"\2\145\1\156\1\145\1\165\1\164\1\162\1\164\1\157\1\165\1\151\1"
+        u"\124\1\141\1\144\1\164\1\162\1\145\1\uffff\1\172\1\147\1\172\2"
+        u"\141\1\142\1\uffff\1\151\1\157\1\114\1\123\1\122\1\104\1\101\1"
+        u"\uffff\1\172\1\111\1\114\1\137\4\uffff\1\154\1\157\1\141\1\uffff"
+        u"\1\144\1\172\1\162\1\172\1\145\1\157\1\143\1\151\1\164\1\143\1"
+        u"\172\1\162\1\163\1\111\1\164\1\172\1\164\1\151\2\172\1\uffff\1"
+        u"\172\1\uffff\1\164\1\165\1\154\1\147\1\156\1\105\1\124\1\70\1\172"
+        u"\1\124\1\uffff\1\117\1\111\1\122\1\120\1\145\1\172\1\153\1\145"
+        u"\1\uffff\1\156\1\uffff\1\144\1\146\1\164\1\143\1\172\1\150\1\uffff"
+        u"\1\156\1\164\1\103\1\151\1\uffff\1\172\1\156\3\uffff\1\172\1\154"
+        u"\1\145\1\156\1\172\1\101\2\172\1\66\1\uffff\1\111\1\116\1\107\1"
+        u"\125\1\117\1\111\1\172\1\uffff\1\172\1\146\5\172\1\uffff\2\172"
+        u"\1\145\1\172\1\154\1\uffff\1\165\1\uffff\1\164\1\172\1\145\1\uffff"
+        u"\1\116\2\uffff\1\172\1\114\1\101\2\116\1\117\1\172\2\uffff\1\172"
+        u"\7\uffff\1\162\1\uffff\2\145\1\172\1\uffff\1\144\1\172\1\uffff"
+        u"\1\105\1\114\1\105\2\124\2\uffff\3\172\1\uffff\1\172\1\uffff\2"
+        u"\172\1\104\1\111\1\123\6\uffff\1\172\1\115\1\105\1\uffff\1\105"
+        u"\1\122\1\123\1\126\1\105\1\111\1\122\1\103\1\126\1\105\1\111\1"
+        u"\172\1\103\1\uffff\1\105\1\172\1\uffff"
         )
 
     DFA37_accept = DFA.unpack(
-        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"
+        u"\1\uffff\1\1\1\uffff\1\3\20\uffff\1\27\1\30\1\33\4\uffff\1\50\1"
+        u"\51\1\52\1\53\7\uffff\1\70\5\uffff\1\104\4\uffff\1\135\4\uffff"
+        u"\1\144\1\145\1\uffff\1\146\1\1\1\uffff\1\135\1\3\1\111\1\4\32\uffff"
+        u"\1\27\1\30\1\33\5\uffff\1\50\1\51\1\52\1\53\1\72\1\54\1\55\1\65"
+        u"\1\143\1\62\1\75\1\56\1\76\1\66\1\63\1\57\1\73\1\150\1\147\1\60"
+        u"\1\74\1\61\1\106\1\101\1\67\1\70\1\112\1\71\1\uffff\1\115\1\113"
+        u"\1\uffff\1\116\1\114\1\102\1\110\1\105\1\103\1\107\1\104\3\uffff"
+        u"\1\136\1\137\1\140\1\uffff\1\141\1\uffff\1\144\1\145\1\151\23\uffff"
+        u"\1\123\6\uffff\1\127\7\uffff\1\37\4\uffff\1\77\1\117\1\100\1\120"
+        u"\3\uffff\1\142\24\uffff\1\15\1\uffff\1\130\12\uffff\1\40\10\uffff"
+        u"\1\34\1\uffff\1\124\6\uffff\1\7\4\uffff\1\12\2\uffff\1\13\1\121"
+        u"\1\16\11\uffff\1\26\7\uffff\1\131\7\uffff\1\14\5\uffff\1\35\1\uffff"
+        u"\1\17\3\uffff\1\32\1\uffff\1\42\1\24\7\uffff\1\126\1\133\1\uffff"
+        u"\1\5\1\21\1\64\1\31\1\6\1\125\1\134\1\uffff\1\11\3\uffff\1\20\2"
+        u"\uffff\1\25\5\uffff\1\45\1\2\3\uffff\1\122\1\uffff\1\23\5\uffff"
+        u"\1\10\1\36\1\132\1\22\1\44\1\41\3\uffff\1\43\15\uffff\1\46\2\uffff"
+        u"\1\47"
         )
 
     DFA37_special = DFA.unpack(
-        u"\u0139\uffff"
+        u"\u0173\uffff"
         )
 
             
     DFA37_transition = [
-        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"\6\71\2\66\1\71\2\66\22\71\1\66\1\47\1\63\1\70\1\61"
+        u"\1\44\1\45\1\62\1\33\1\34\1\37\1\41\1\3\1\42\1\40\1\43\1\64\11"
+        u"\65\1\26\1\1\1\50\1\4\1\51\1\54\1\71\1\61\1\21\1\22\1\61\1\32\3"
+        u"\61\1\27\2\61\1\60\2\61\1\30\3\61\1\11\1\61\1\31\1\23\4\61\1\35"
+        u"\1\67\1\36\1\52\1\61\1\71\1\7\1\57\1\13\1\17\1\5\1\16\1\56\1\61"
+        u"\1\14\2\61\1\15\5\61\1\10\1\6\1\2\1\20\1\12\1\55\3\61\1\24\1\53"
+        u"\1\25\1\46\uff80\71"),
         DFA.unpack(u""),
-        DFA.unpack(u"\1\71"),
+        DFA.unpack(u"\1\73"),
         DFA.unpack(u""),
-        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\76"),
+        DFA.unpack(u"\1\102\1\uffff\1\100\11\uffff\1\101"),
+        DFA.unpack(u"\1\105\1\103\12\uffff\1\104\2\uffff\1\106"),
         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"\1\111"),
+        DFA.unpack(u"\1\112"),
+        DFA.unpack(u"\1\115\6\uffff\1\114\6\uffff\1\113"),
+        DFA.unpack(u"\1\116\7\uffff\1\117"),
+        DFA.unpack(u"\1\120"),
+        DFA.unpack(u"\1\122\2\uffff\1\121"),
+        DFA.unpack(u"\1\123\11\uffff\1\124"),
+        DFA.unpack(u"\1\125"),
+        DFA.unpack(u"\1\126"),
+        DFA.unpack(u"\1\130\6\uffff\1\127"),
+        DFA.unpack(u"\1\131"),
         DFA.unpack(u""),
         DFA.unpack(u""),
         DFA.unpack(u""),
-        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"\1\135"),
+        DFA.unpack(u"\1\137\4\uffff\1\136"),
+        DFA.unpack(u"\1\140"),
+        DFA.unpack(u"\1\141"),
         DFA.unpack(u""),
         DFA.unpack(u""),
         DFA.unpack(u""),
         DFA.unpack(u""),
-        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"\1\146"),
+        DFA.unpack(u"\1\150\1\uffff\12\152"),
+        DFA.unpack(u"\1\153\21\uffff\1\154"),
+        DFA.unpack(u"\1\160\17\uffff\1\156\1\157"),
+        DFA.unpack(u"\1\164\4\uffff\1\163\15\uffff\1\162"),
+        DFA.unpack(u"\1\166"),
+        DFA.unpack(u"\1\170\26\uffff\1\171"),
         DFA.unpack(u""),
-        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"\1\174"),
+        DFA.unpack(u"\1\176\1\177"),
+        DFA.unpack(u"\1\u0082\1\u0081"),
+        DFA.unpack(u"\1\u0084"),
+        DFA.unpack(u"\1\u0087\76\uffff\1\u0086"),
         DFA.unpack(u""),
-        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"\1\u008a"),
+        DFA.unpack(u"\1\u008b"),
+        DFA.unpack(u"\1\u008c"),
+        DFA.unpack(u"\1\u008e\4\uffff\1\u008d"),
         DFA.unpack(u""),
-        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"\47\u008d\1\uffff\uffd7\u008d"),
+        DFA.unpack(u"\uffff\u008e"),
+        DFA.unpack(u"\1\152\1\uffff\10\u0090\2\152\12\uffff\3\152\21\uffff"
+        u"\1\u008f\13\uffff\3\152\21\uffff\1\u008f"),
+        DFA.unpack(u"\1\152\1\uffff\12\u0092\12\uffff\3\152\35\uffff\3\152"),
         DFA.unpack(u""),
         DFA.unpack(u""),
-        DFA.unpack(u"\uffff\u0090"),
+        DFA.unpack(u"\uffff\u0095"),
         DFA.unpack(u""),
         DFA.unpack(u""),
-        DFA.unpack(u"\1\u0091"),
+        DFA.unpack(u"\1\u0096"),
         DFA.unpack(u""),
         DFA.unpack(u""),
         DFA.unpack(u""),
         DFA.unpack(u""),
-        DFA.unpack(u"\1\u0092"),
-        DFA.unpack(u"\1\u0093"),
-        DFA.unpack(u"\1\u0094"),
-        DFA.unpack(u"\1\u0095\20\uffff\1\u0096"),
-        DFA.unpack(u"\1\u0097\22\uffff\1\u0098"),
+        DFA.unpack(u"\1\u0097"),
+        DFA.unpack(u"\1\u0098"),
         DFA.unpack(u"\1\u0099"),
-        DFA.unpack(u"\1\u009a"),
-        DFA.unpack(u"\1\u009b"),
-        DFA.unpack(u"\1\u009c\14\uffff\1\u009d"),
+        DFA.unpack(u"\1\u009a\22\uffff\1\u009b"),
+        DFA.unpack(u"\1\u009d\20\uffff\1\u009c"),
         DFA.unpack(u"\1\u009e"),
-        DFA.unpack(u"\1\u00a0\2\uffff\1\u009f"),
-        DFA.unpack(u"\1\u00a1"),
-        DFA.unpack(u"\1\u00a2"),
+        DFA.unpack(u"\1\u009f"),
+        DFA.unpack(u"\1\u00a0"),
+        DFA.unpack(u"\1\u00a2\14\uffff\1\u00a1"),
         DFA.unpack(u"\1\u00a3"),
-        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\u00a5\2\uffff\1\u00a4"),
         DFA.unpack(u"\1\u00a6"),
         DFA.unpack(u"\1\u00a7"),
         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\74\13\uffff\12\74\7\uffff\32\74\4\uffff\1\74\1\uffff"
+        u"\32\74"),
+        DFA.unpack(u"\1\u00aa"),
         DFA.unpack(u"\1\u00ab"),
-        DFA.unpack(u"\1\u00ac\11\uffff\1\u00ad"),
+        DFA.unpack(u"\1\u00ac"),
+        DFA.unpack(u"\1\u00ad"),
         DFA.unpack(u"\1\u00ae"),
+        DFA.unpack(u"\1\74\13\uffff\12\74\7\uffff\32\74\4\uffff\1\74\1\uffff"
+        u"\24\74\1\u00af\5\74"),
+        DFA.unpack(u"\1\u00b2\11\uffff\1\u00b1"),
+        DFA.unpack(u"\1\u00b3"),
+        DFA.unpack(u"\1\u00b4"),
+        DFA.unpack(u"\1\u00b5"),
+        DFA.unpack(u"\1\u00b6\2\uffff\1\u00b7"),
         DFA.unpack(u""),
         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\u00b0"),
-        DFA.unpack(u"\1\u00b1"),
-        DFA.unpack(u"\1\u00b2"),
-        DFA.unpack(u"\1\u00b3"),
+        DFA.unpack(u"\1\74\13\uffff\12\74\7\uffff\32\74\4\uffff\1\74\1\uffff"
+        u"\32\74"),
+        DFA.unpack(u"\1\u00b9"),
+        DFA.unpack(u"\1\u00ba"),
+        DFA.unpack(u"\1\u00bb"),
+        DFA.unpack(u"\1\u00bc"),
         DFA.unpack(u""),
         DFA.unpack(u""),
         DFA.unpack(u""),
@@ -4332,11 +4562,11 @@ class CLexer(Lexer):
         DFA.unpack(u""),
         DFA.unpack(u""),
         DFA.unpack(u""),
-        DFA.unpack(u"\1\u00b4"),
+        DFA.unpack(u"\1\u00bd"),
         DFA.unpack(u""),
         DFA.unpack(u""),
+        DFA.unpack(u"\1\u00bf"),
         DFA.unpack(u""),
-        DFA.unpack(u"\1\u00b6"),
         DFA.unpack(u""),
         DFA.unpack(u""),
         DFA.unpack(u""),
@@ -4344,28 +4574,19 @@ class CLexer(Lexer):
         DFA.unpack(u""),
         DFA.unpack(u""),
         DFA.unpack(u""),
-        DFA.unpack(u"\1\u00b8"),
-        DFA.unpack(u"\1\u00b9"),
-        DFA.unpack(u"\1\u00ba"),
+        DFA.unpack(u"\1\u00c1"),
+        DFA.unpack(u"\1\u00c2"),
+        DFA.unpack(u"\1\u00c3"),
         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"\1\152\1\uffff\10\u0090\2\152\12\uffff\3\152\35\uffff"
+        u"\3\152"),
         DFA.unpack(u""),
-        DFA.unpack(u"\1\144\1\uffff\12\u008d\12\uffff\3\144\35\uffff\3\144"),
+        DFA.unpack(u"\1\152\1\uffff\12\u0092\12\uffff\3\152\35\uffff\3\152"),
         DFA.unpack(u""),
         DFA.unpack(u""),
         DFA.unpack(u""),
-        DFA.unpack(u"\1\u00bc"),
-        DFA.unpack(u"\1\u00bd"),
-        DFA.unpack(u"\1\u00be"),
-        DFA.unpack(u"\1\u00bf"),
-        DFA.unpack(u"\1\u00c0"),
-        DFA.unpack(u"\1\u00c1"),
-        DFA.unpack(u"\1\u00c2"),
-        DFA.unpack(u"\1\u00c3"),
-        DFA.unpack(u"\1\u00c4"),
         DFA.unpack(u"\1\u00c5"),
         DFA.unpack(u"\1\u00c6"),
         DFA.unpack(u"\1\u00c7"),
@@ -4373,193 +4594,262 @@ class CLexer(Lexer):
         DFA.unpack(u"\1\u00c9"),
         DFA.unpack(u"\1\u00ca"),
         DFA.unpack(u"\1\u00cb"),
-        DFA.unpack(u"\1\u00cc\1\u00cd"),
+        DFA.unpack(u"\1\u00cc"),
+        DFA.unpack(u"\1\u00cd"),
         DFA.unpack(u"\1\u00ce"),
         DFA.unpack(u"\1\u00cf"),
-        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\u00d0"),
         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\u00d3"),
         DFA.unpack(u"\1\u00d4"),
-        DFA.unpack(u""),
-        DFA.unpack(u"\1\u00d5"),
-        DFA.unpack(u"\1\u00d6"),
+        DFA.unpack(u"\1\u00d5\1\u00d6"),
         DFA.unpack(u"\1\u00d7"),
         DFA.unpack(u"\1\u00d8"),
         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\74\13\uffff\12\74\7\uffff\32\74\4\uffff\1\74\1\uffff"
+        u"\32\74"),
         DFA.unpack(u"\1\u00da"),
-        DFA.unpack(u"\1\u00db"),
+        DFA.unpack(u"\1\74\13\uffff\12\74\7\uffff\32\74\4\uffff\1\74\1\uffff"
+        u"\32\74"),
         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\u00df"),
         DFA.unpack(u"\1\u00e0"),
-        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\u00e1"),
+        DFA.unpack(u"\1\u00e2"),
         DFA.unpack(u"\1\u00e3"),
         DFA.unpack(u"\1\u00e4"),
         DFA.unpack(u"\1\u00e5"),
-        DFA.unpack(u"\1\u00e6"),
+        DFA.unpack(u""),
+        DFA.unpack(u"\1\74\13\uffff\12\74\7\uffff\32\74\4\uffff\1\74\1\uffff"
+        u"\32\74"),
         DFA.unpack(u"\1\u00e7"),
         DFA.unpack(u"\1\u00e8"),
-        DFA.unpack(u"\1\u00e9"),
-        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\u00ea\35\uffff\1\u00e9"),
+        DFA.unpack(u""),
+        DFA.unpack(u""),
+        DFA.unpack(u""),
+        DFA.unpack(u""),
         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\72\13\uffff\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff"
-        u"\32\72"),
+        DFA.unpack(u"\1\74\13\uffff\12\74\7\uffff\32\74\4\uffff\1\74\1\uffff"
+        u"\32\74"),
         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\74\13\uffff\12\74\7\uffff\32\74\4\uffff\1\74\1\uffff"
+        u"\32\74"),
+        DFA.unpack(u"\1\u00f2"),
+        DFA.unpack(u"\1\u00f3"),
+        DFA.unpack(u"\1\u00f4"),
         DFA.unpack(u"\1\u00f5"),
-        DFA.unpack(u""),
         DFA.unpack(u"\1\u00f6"),
         DFA.unpack(u"\1\u00f7"),
-        DFA.unpack(u"\1\u00f8"),
+        DFA.unpack(u"\1\74\13\uffff\12\74\7\uffff\32\74\4\uffff\1\74\1\uffff"
+        u"\32\74"),
         DFA.unpack(u"\1\u00f9"),
         DFA.unpack(u"\1\u00fa"),
-        DFA.unpack(u""),
         DFA.unpack(u"\1\u00fb"),
         DFA.unpack(u"\1\u00fc"),
-        DFA.unpack(u"\1\u00fd"),
+        DFA.unpack(u"\1\74\13\uffff\12\74\7\uffff\32\74\4\uffff\1\74\1\uffff"
+        u"\32\74"),
         DFA.unpack(u"\1\u00fe"),
-        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\u00ff"),
+        DFA.unpack(u"\1\74\13\uffff\12\74\7\uffff\32\74\4\uffff\1\74\1\uffff"
+        u"\32\74"),
+        DFA.unpack(u"\1\74\13\uffff\12\74\7\uffff\32\74\4\uffff\1\74\1\uffff"
+        u"\32\74"),
         DFA.unpack(u""),
+        DFA.unpack(u"\1\74\13\uffff\12\74\7\uffff\32\74\4\uffff\1\74\1\uffff"
+        u"\32\74"),
         DFA.unpack(u""),
-        DFA.unpack(u"\1\u0102"),
         DFA.unpack(u"\1\u0103"),
         DFA.unpack(u"\1\u0104"),
         DFA.unpack(u"\1\u0105"),
         DFA.unpack(u"\1\u0106"),
-        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\u0107"),
         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\u010c"),
+        DFA.unpack(u"\1\u010b\6\uffff\1\u010a"),
+        DFA.unpack(u"\1\74\13\uffff\12\74\7\uffff\32\74\4\uffff\1\74\1\uffff"
+        u"\32\74"),
+        DFA.unpack(u"\1\u010d"),
         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\u010e"),
-        DFA.unpack(u""),
-        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\u010f"),
+        DFA.unpack(u"\1\u0111\17\uffff\1\u0110"),
+        DFA.unpack(u"\1\u0112"),
         DFA.unpack(u"\1\u0113"),
-        DFA.unpack(u"\1\u0114"),
+        DFA.unpack(u"\1\74\13\uffff\12\74\7\uffff\32\74\4\uffff\1\74\1\uffff"
+        u"\32\74"),
         DFA.unpack(u"\1\u0115"),
-        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\u0116"),
+        DFA.unpack(u""),
         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\u0118"),
+        DFA.unpack(u"\1\u0119"),
         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"\1\u011b"),
+        DFA.unpack(u"\1\74\13\uffff\12\74\7\uffff\32\74\4\uffff\1\74\1\uffff"
+        u"\32\74"),
+        DFA.unpack(u"\1\u011d"),
         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\u011e"),
+        DFA.unpack(u"\1\u011f"),
+        DFA.unpack(u"\1\u0120"),
         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\u0125"),
+        DFA.unpack(u"\1\74\13\uffff\12\74\7\uffff\32\74\4\uffff\1\74\1\uffff"
+        u"\32\74"),
+        DFA.unpack(u"\1\u0123"),
+        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\u0127"),
         DFA.unpack(u""),
-        DFA.unpack(u"\1\u0128"),
+        DFA.unpack(u"\1\74\13\uffff\12\74\7\uffff\32\74\4\uffff\1\74\1\uffff"
+        u"\32\74"),
+        DFA.unpack(u"\1\u0125"),
+        DFA.unpack(u"\1\u0126"),
+        DFA.unpack(u"\1\u0127"),
+        DFA.unpack(u"\1\74\13\uffff\12\74\7\uffff\32\74\4\uffff\1\74\1\uffff"
+        u"\32\74"),
         DFA.unpack(u"\1\u0129"),
-        DFA.unpack(u"\1\u012a"),
+        DFA.unpack(u"\1\74\13\uffff\12\74\7\uffff\32\74\4\uffff\1\74\1\uffff"
+        u"\32\74"),
+        DFA.unpack(u"\1\74\13\uffff\12\74\7\uffff\32\74\4\uffff\1\74\1\uffff"
+        u"\32\74"),
+        DFA.unpack(u"\1\u012c"),
         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\u012d"),
+        DFA.unpack(u"\1\u012e"),
+        DFA.unpack(u"\1\u012f"),
+        DFA.unpack(u"\1\u0130"),
+        DFA.unpack(u"\1\u0131"),
+        DFA.unpack(u"\1\u0132"),
+        DFA.unpack(u"\1\74\13\uffff\12\74\7\uffff\32\74\4\uffff\1\74\1\uffff"
+        u"\32\74"),
         DFA.unpack(u""),
+        DFA.unpack(u"\1\74\13\uffff\12\74\7\uffff\32\74\4\uffff\1\74\1\uffff"
+        u"\32\74"),
+        DFA.unpack(u"\1\u0135"),
+        DFA.unpack(u"\1\74\13\uffff\12\74\7\uffff\32\74\4\uffff\1\74\1\uffff"
+        u"\32\74"),
+        DFA.unpack(u"\1\74\13\uffff\12\74\7\uffff\32\74\4\uffff\1\74\1\uffff"
+        u"\32\74"),
+        DFA.unpack(u"\1\74\13\uffff\12\74\7\uffff\32\74\4\uffff\1\74\1\uffff"
+        u"\32\74"),
+        DFA.unpack(u"\1\74\13\uffff\12\74\7\uffff\32\74\4\uffff\1\74\1\uffff"
+        u"\32\74"),
+        DFA.unpack(u"\1\74\13\uffff\12\74\7\uffff\32\74\4\uffff\1\74\1\uffff"
+        u"\32\74"),
         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\74\13\uffff\12\74\7\uffff\32\74\4\uffff\1\74\1\uffff"
+        u"\32\74"),
+        DFA.unpack(u"\1\74\13\uffff\12\74\7\uffff\32\74\4\uffff\1\74\1\uffff"
+        u"\32\74"),
+        DFA.unpack(u"\1\u013d"),
+        DFA.unpack(u"\1\74\13\uffff\12\74\7\uffff\32\74\4\uffff\1\74\1\uffff"
+        u"\32\74"),
+        DFA.unpack(u"\1\u013f"),
         DFA.unpack(u""),
+        DFA.unpack(u"\1\u0140"),
         DFA.unpack(u""),
+        DFA.unpack(u"\1\u0141"),
+        DFA.unpack(u"\1\74\13\uffff\12\74\7\uffff\32\74\4\uffff\1\74\1\uffff"
+        u"\32\74"),
+        DFA.unpack(u"\1\u0143"),
         DFA.unpack(u""),
+        DFA.unpack(u"\1\u0144"),
         DFA.unpack(u""),
         DFA.unpack(u""),
+        DFA.unpack(u"\1\74\13\uffff\12\74\7\uffff\32\74\4\uffff\1\74\1\uffff"
+        u"\32\74"),
+        DFA.unpack(u"\1\u0146"),
+        DFA.unpack(u"\1\u0147"),
+        DFA.unpack(u"\1\u0148"),
+        DFA.unpack(u"\1\u0149"),
+        DFA.unpack(u"\1\u014a"),
+        DFA.unpack(u"\1\74\13\uffff\12\74\7\uffff\32\74\4\uffff\1\74\1\uffff"
+        u"\32\74"),
         DFA.unpack(u""),
-        DFA.unpack(u"\1\u012d"),
         DFA.unpack(u""),
+        DFA.unpack(u"\1\74\13\uffff\12\74\7\uffff\32\74\4\uffff\1\74\1\uffff"
+        u"\32\74"),
         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\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""),
+        DFA.unpack(u"\1\u014d"),
+        DFA.unpack(u""),
+        DFA.unpack(u"\1\u014e"),
+        DFA.unpack(u"\1\u014f"),
+        DFA.unpack(u"\1\74\13\uffff\12\74\7\uffff\32\74\4\uffff\1\74\1\uffff"
+        u"\32\74"),
+        DFA.unpack(u""),
+        DFA.unpack(u"\1\u0151"),
+        DFA.unpack(u"\1\74\13\uffff\12\74\7\uffff\32\74\4\uffff\1\74\1\uffff"
+        u"\32\74"),
+        DFA.unpack(u""),
+        DFA.unpack(u"\1\u0153"),
+        DFA.unpack(u"\1\u0154"),
+        DFA.unpack(u"\1\u0155"),
+        DFA.unpack(u"\1\u0156"),
+        DFA.unpack(u"\1\u0157"),
+        DFA.unpack(u""),
+        DFA.unpack(u""),
+        DFA.unpack(u"\1\74\13\uffff\12\74\7\uffff\32\74\4\uffff\1\74\1\uffff"
+        u"\32\74"),
+        DFA.unpack(u"\1\74\13\uffff\12\74\7\uffff\32\74\4\uffff\1\74\1\uffff"
+        u"\32\74"),
+        DFA.unpack(u"\1\74\13\uffff\12\74\7\uffff\32\74\4\uffff\1\74\1\uffff"
+        u"\32\74"),
+        DFA.unpack(u""),
+        DFA.unpack(u"\1\74\13\uffff\12\74\7\uffff\32\74\4\uffff\1\74\1\uffff"
+        u"\32\74"),
+        DFA.unpack(u""),
+        DFA.unpack(u"\1\74\13\uffff\12\74\7\uffff\32\74\4\uffff\1\74\1\uffff"
+        u"\32\74"),
+        DFA.unpack(u"\1\74\13\uffff\12\74\7\uffff\32\74\4\uffff\1\74\1\uffff"
+        u"\32\74"),
+        DFA.unpack(u"\1\u015e"),
+        DFA.unpack(u"\1\u015f"),
+        DFA.unpack(u"\1\u0160"),
+        DFA.unpack(u""),
+        DFA.unpack(u""),
+        DFA.unpack(u""),
+        DFA.unpack(u""),
         DFA.unpack(u""),
         DFA.unpack(u""),
+        DFA.unpack(u"\1\74\13\uffff\12\74\7\uffff\32\74\4\uffff\1\74\1\uffff"
+        u"\32\74"),
+        DFA.unpack(u"\1\u0162"),
+        DFA.unpack(u"\1\u0163"),
         DFA.unpack(u""),
+        DFA.unpack(u"\1\u0164"),
+        DFA.unpack(u"\1\u0165"),
+        DFA.unpack(u"\1\u0166"),
+        DFA.unpack(u"\1\u0167"),
+        DFA.unpack(u"\1\u0168"),
+        DFA.unpack(u"\1\u0169"),
+        DFA.unpack(u"\1\u016a"),
+        DFA.unpack(u"\1\u016b"),
+        DFA.unpack(u"\1\u016c"),
+        DFA.unpack(u"\1\u016d"),
+        DFA.unpack(u"\1\u016e"),
+        DFA.unpack(u"\1\74\13\uffff\12\74\7\uffff\32\74\4\uffff\1\74\1\uffff"
+        u"\32\74"),
+        DFA.unpack(u"\1\u0170"),
         DFA.unpack(u""),
+        DFA.unpack(u"\1\u0171"),
+        DFA.unpack(u"\1\74\13\uffff\12\74\7\uffff\32\74\4\uffff\1\74\1\uffff"
+        u"\32\74"),
         DFA.unpack(u"")
     ]
 
index d0ff461..685bc09 100644 (file)
@@ -1,4 +1,4 @@
-# $ANTLR 3.0.1 C.g 2008-01-28 19:51:31
+# $ANTLR 3.0.1 C.g 2008-01-29 13:58:54
 
 from antlr3 import *
 from antlr3.compat import set, frozenset
@@ -45,14 +45,16 @@ tokenNames = [
     "LINE_COMMAND", "';'", "'typedef'", "','", "'='", "'extern'", "'static'", 
     "'auto'", "'register'", "'STATIC'", "'void'", "'char'", "'short'", "'int'", 
     "'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'"
+    "'CHAR8'", "'CHAR16'", "'VOID'", "'{'", "'}'", "'struct'", "'union'", 
+    "':'", "'enum'", "'const'", "'volatile'", "'IN'", "'OUT'", "'OPTIONAL'", 
+    "'CONST'", "'UNALIGNED'", "'VOLATILE'", "'EFIAPI'", "'EFI_BOOTSERVICE'", 
+    "'EFI_RUNTIMESERVICE'", "'('", "')'", "'['", "']'", "'*'", "'...'", 
+    "'+'", "'-'", "'/'", "'%'", "'++'", "'--'", "'sizeof'", "'.'", "'->'", 
+    "'&'", "'~'", "'!'", "'*='", "'/='", "'%='", "'+='", "'-='", "'<<='", 
+    "'>>='", "'&='", "'^='", "'|='", "'?'", "'||'", "'&&'", "'|'", "'^'", 
+    "'=='", "'!='", "'<'", "'>'", "'<='", "'>='", "'<<'", "'>>'", "'case'", 
+    "'default'", "'if'", "'else'", "'switch'", "'while'", "'do'", "'for'", 
+    "'goto'", "'continue'", "'break'", "'return'"
 ]
 
 
@@ -135,7 +137,7 @@ class CParser(Parser):
                     alt1 = 2
                     LA1_0 = self.input.LA(1)
 
-                    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) :
+                    if (LA1_0 == IDENTIFIER or LA1_0 == 26 or (29 <= LA1_0 <= 46) or (49 <= LA1_0 <= 50) or (52 <= LA1_0 <= 64) or LA1_0 == 68) :
                         alt1 = 1
 
 
@@ -370,7 +372,7 @@ class CParser(Parser):
 
                         raise nvae
 
-                elif ((46 <= LA3_0 <= 47)) :
+                elif (LA3_0 == 44) :
                     LA3_12 = self.input.LA(2)
 
                     if (self.synpred4()) :
@@ -386,7 +388,7 @@ class CParser(Parser):
 
                         raise nvae
 
-                elif (LA3_0 == 49) :
+                elif (LA3_0 == 45) :
                     LA3_13 = self.input.LA(2)
 
                     if (self.synpred4()) :
@@ -402,15 +404,13 @@ class CParser(Parser):
 
                         raise nvae
 
-                elif (LA3_0 == IDENTIFIER) :
+                elif (LA3_0 == 46) :
                     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,7 +420,7 @@ class CParser(Parser):
 
                         raise nvae
 
-                elif ((50 <= LA3_0 <= 55)) :
+                elif ((49 <= LA3_0 <= 50)) :
                     LA3_15 = self.input.LA(2)
 
                     if (self.synpred4()) :
@@ -436,11 +436,65 @@ class CParser(Parser):
 
                         raise nvae
 
+                elif (LA3_0 == 52) :
+                    LA3_16 = 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, 16, self.input)
+
+                        raise nvae
+
+                elif (LA3_0 == IDENTIFIER) :
+                    LA3_17 = 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
+                            return 
+
+                        nvae = NoViableAltException("62:1: external_declaration options {k=1; } : ( ( ( declaration_specifiers )? declarator ( declaration )* '{' )=> function_definition | declaration | macro_statement ( ';' )? );", 3, 17, self.input)
+
+                        raise nvae
+
+                elif ((53 <= LA3_0 <= 60)) :
+                    LA3_18 = 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, 18, self.input)
+
+                        raise nvae
+
+                elif (LA3_0 == 68) and (self.synpred4()):
+                    alt3 = 1
                 elif (LA3_0 == 61) and (self.synpred4()):
                     alt3 = 1
-                elif (LA3_0 == 56) and (self.synpred4()):
+                elif (LA3_0 == 62) and (self.synpred4()):
                     alt3 = 1
-                elif (LA3_0 == 57) and (self.synpred4()):
+                elif (LA3_0 == 63) and (self.synpred4()):
+                    alt3 = 1
+                elif (LA3_0 == 64) and (self.synpred4()):
                     alt3 = 1
                 elif (LA3_0 == 26) :
                     alt3 = 2
@@ -550,91 +604,106 @@ class CParser(Parser):
                 alt4 = 2
                 LA4_0 = self.input.LA(1)
 
-                if ((29 <= LA4_0 <= 43) or (46 <= LA4_0 <= 47) or (49 <= LA4_0 <= 55)) :
+                if ((29 <= LA4_0 <= 46) or (49 <= LA4_0 <= 50) or (52 <= LA4_0 <= 60)) :
                     alt4 = 1
                 elif (LA4_0 == IDENTIFIER) :
                     LA4 = self.input.LA(2)
-                    if LA4 == 57:
-                        LA4_20 = self.input.LA(3)
+                    if LA4 == 64:
+                        LA4_25 = self.input.LA(3)
 
                         if (self.synpred7()) :
                             alt4 = 1
                     elif LA4 == 29 or LA4 == 30 or LA4 == 31 or LA4 == 32 or LA4 == 33:
-                        LA4_22 = self.input.LA(3)
+                        LA4_27 = self.input.LA(3)
 
                         if (self.synpred7()) :
                             alt4 = 1
                     elif LA4 == 34:
-                        LA4_23 = self.input.LA(3)
+                        LA4_28 = self.input.LA(3)
 
                         if (self.synpred7()) :
                             alt4 = 1
                     elif LA4 == 35:
-                        LA4_24 = self.input.LA(3)
+                        LA4_29 = self.input.LA(3)
 
                         if (self.synpred7()) :
                             alt4 = 1
                     elif LA4 == 36:
-                        LA4_25 = self.input.LA(3)
+                        LA4_30 = self.input.LA(3)
 
                         if (self.synpred7()) :
                             alt4 = 1
                     elif LA4 == 37:
-                        LA4_26 = self.input.LA(3)
+                        LA4_31 = self.input.LA(3)
 
                         if (self.synpred7()) :
                             alt4 = 1
                     elif LA4 == 38:
-                        LA4_27 = self.input.LA(3)
+                        LA4_32 = self.input.LA(3)
 
                         if (self.synpred7()) :
                             alt4 = 1
                     elif LA4 == 39:
-                        LA4_28 = self.input.LA(3)
+                        LA4_33 = self.input.LA(3)
 
                         if (self.synpred7()) :
                             alt4 = 1
                     elif LA4 == 40:
-                        LA4_29 = self.input.LA(3)
+                        LA4_34 = self.input.LA(3)
 
                         if (self.synpred7()) :
                             alt4 = 1
                     elif LA4 == 41:
-                        LA4_30 = self.input.LA(3)
+                        LA4_35 = self.input.LA(3)
 
                         if (self.synpred7()) :
                             alt4 = 1
                     elif LA4 == 42:
-                        LA4_31 = self.input.LA(3)
+                        LA4_36 = self.input.LA(3)
 
                         if (self.synpred7()) :
                             alt4 = 1
                     elif LA4 == 43:
-                        LA4_32 = self.input.LA(3)
+                        LA4_37 = self.input.LA(3)
 
                         if (self.synpred7()) :
                             alt4 = 1
-                    elif LA4 == 46 or LA4 == 47:
-                        LA4_33 = self.input.LA(3)
+                    elif LA4 == 44:
+                        LA4_38 = self.input.LA(3)
 
                         if (self.synpred7()) :
                             alt4 = 1
-                    elif LA4 == 49:
-                        LA4_34 = self.input.LA(3)
+                    elif LA4 == 45:
+                        LA4_39 = self.input.LA(3)
+
+                        if (self.synpred7()) :
+                            alt4 = 1
+                    elif LA4 == 46:
+                        LA4_40 = self.input.LA(3)
+
+                        if (self.synpred7()) :
+                            alt4 = 1
+                    elif LA4 == 49 or LA4 == 50:
+                        LA4_41 = self.input.LA(3)
+
+                        if (self.synpred7()) :
+                            alt4 = 1
+                    elif LA4 == 52:
+                        LA4_42 = self.input.LA(3)
 
                         if (self.synpred7()) :
                             alt4 = 1
                     elif LA4 == IDENTIFIER:
-                        LA4_35 = self.input.LA(3)
+                        LA4_43 = 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)
+                    elif LA4 == 53 or LA4 == 54 or LA4 == 55 or LA4 == 56 or LA4 == 57 or LA4 == 58 or LA4 == 59 or LA4 == 60:
+                        LA4_44 = self.input.LA(3)
 
                         if (self.synpred7()) :
                             alt4 = 1
-                    elif LA4 == 56 or LA4 == 61:
+                    elif LA4 == 61 or LA4 == 62 or LA4 == 63 or LA4 == 68:
                         alt4 = 1
                 if alt4 == 1:
                     # C.g:0:0: d= declaration_specifiers
@@ -655,9 +724,9 @@ class CParser(Parser):
                 alt6 = 2
                 LA6_0 = self.input.LA(1)
 
-                if (LA6_0 == IDENTIFIER or LA6_0 == 26 or (29 <= LA6_0 <= 43) or (46 <= LA6_0 <= 47) or (49 <= LA6_0 <= 55)) :
+                if (LA6_0 == IDENTIFIER or LA6_0 == 26 or (29 <= LA6_0 <= 46) or (49 <= LA6_0 <= 50) or (52 <= LA6_0 <= 60)) :
                     alt6 = 1
-                elif (LA6_0 == 44) :
+                elif (LA6_0 == 47) :
                     alt6 = 2
                 else:
                     if self.backtracking > 0:
@@ -676,7 +745,7 @@ class CParser(Parser):
                         alt5 = 2
                         LA5_0 = self.input.LA(1)
 
-                        if (LA5_0 == IDENTIFIER or LA5_0 == 26 or (29 <= LA5_0 <= 43) or (46 <= LA5_0 <= 47) or (49 <= LA5_0 <= 55)) :
+                        if (LA5_0 == IDENTIFIER or LA5_0 == 26 or (29 <= LA5_0 <= 46) or (49 <= LA5_0 <= 50) or (52 <= LA5_0 <= 60)) :
                             alt5 = 1
 
 
@@ -791,7 +860,7 @@ class CParser(Parser):
 
                 if (LA9_0 == 26) :
                     alt9 = 1
-                elif (LA9_0 == IDENTIFIER or (29 <= LA9_0 <= 43) or (46 <= LA9_0 <= 47) or (49 <= LA9_0 <= 55)) :
+                elif (LA9_0 == IDENTIFIER or (29 <= LA9_0 <= 46) or (49 <= LA9_0 <= 50) or (52 <= LA9_0 <= 60)) :
                     alt9 = 2
                 else:
                     if self.backtracking > 0:
@@ -812,18 +881,18 @@ class CParser(Parser):
                     alt7 = 2
                     LA7_0 = self.input.LA(1)
 
-                    if ((29 <= LA7_0 <= 43) or (46 <= LA7_0 <= 47) or (49 <= LA7_0 <= 55)) :
+                    if ((29 <= LA7_0 <= 46) or (49 <= LA7_0 <= 50) or (52 <= LA7_0 <= 60)) :
                         alt7 = 1
                     elif (LA7_0 == IDENTIFIER) :
-                        LA7_14 = self.input.LA(2)
+                        LA7_17 = self.input.LA(2)
 
-                        if (LA7_14 == 57) :
-                            LA7_20 = self.input.LA(3)
+                        if (LA7_17 == IDENTIFIER or (29 <= LA7_17 <= 46) or (49 <= LA7_17 <= 50) or (52 <= LA7_17 <= 63) or LA7_17 == 68) :
+                            alt7 = 1
+                        elif (LA7_17 == 64) :
+                            LA7_29 = self.input.LA(3)
 
                             if (self.synpred10()) :
                                 alt7 = 1
-                        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
                         self.following.append(self.FOLLOW_declaration_specifiers_in_declaration197)
@@ -864,7 +933,7 @@ class CParser(Parser):
                     alt8 = 2
                     LA8_0 = self.input.LA(1)
 
-                    if (LA8_0 == IDENTIFIER or (56 <= LA8_0 <= 57) or LA8_0 == 61) :
+                    if (LA8_0 == IDENTIFIER or (61 <= LA8_0 <= 64) or LA8_0 == 68) :
                         alt8 = 1
                     if alt8 == 1:
                         # C.g:0:0: t= init_declarator_list
@@ -929,14 +998,14 @@ class CParser(Parser):
                     alt10 = 4
                     LA10 = self.input.LA(1)
                     if LA10 == IDENTIFIER:
-                        LA10_3 = self.input.LA(2)
+                        LA10_5 = self.input.LA(2)
 
                         if (self.synpred14()) :
                             alt10 = 2
 
 
-                    elif LA10 == 54:
-                        LA10_7 = self.input.LA(2)
+                    elif LA10 == 57:
+                        LA10_9 = self.input.LA(2)
 
                         if (self.synpred15()) :
                             alt10 = 3
@@ -944,9 +1013,9 @@ class CParser(Parser):
 
                     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:
+                    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 == 44 or LA10 == 45 or LA10 == 46 or LA10 == 49 or LA10 == 50 or LA10 == 52:
                         alt10 = 2
-                    elif LA10 == 50 or LA10 == 51 or LA10 == 52 or LA10 == 53 or LA10 == 55:
+                    elif LA10 == 53 or LA10 == 54 or LA10 == 55 or LA10 == 56 or LA10 == 58 or LA10 == 59 or LA10 == 60:
                         alt10 = 3
 
                     if alt10 == 1:
@@ -1182,7 +1251,7 @@ class CParser(Parser):
 
 
     # $ANTLR start type_specifier
-    # 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 );
+    # C.g:153:1: type_specifier : ( 'void' | 'char' | 'short' | 'int' | 'long' | 'float' | 'double' | 'signed' | 'unsigned' | 'BOOLEAN' | 'CHAR8' | 'CHAR16' | 'VOID' | s= struct_or_union_specifier | e= enum_specifier | ( IDENTIFIER declarator )=> type_id );
     def type_specifier(self, ):
 
         type_specifier_StartIndex = self.input.index()
@@ -1196,8 +1265,8 @@ 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' | 'BOOLEAN' | s= struct_or_union_specifier | e= enum_specifier | ( IDENTIFIER declarator )=> type_id )
-                alt13 = 13
+                # C.g:154:2: ( 'void' | 'char' | 'short' | 'int' | 'long' | 'float' | 'double' | 'signed' | 'unsigned' | 'BOOLEAN' | 'CHAR8' | 'CHAR16' | 'VOID' | s= struct_or_union_specifier | e= enum_specifier | ( IDENTIFIER declarator )=> type_id )
+                alt13 = 16
                 LA13_0 = self.input.LA(1)
 
                 if (LA13_0 == 34) :
@@ -1220,18 +1289,24 @@ class CParser(Parser):
                     alt13 = 9
                 elif (LA13_0 == 43) :
                     alt13 = 10
-                elif ((46 <= LA13_0 <= 47)) :
+                elif (LA13_0 == 44) :
                     alt13 = 11
-                elif (LA13_0 == 49) :
+                elif (LA13_0 == 45) :
                     alt13 = 12
-                elif (LA13_0 == IDENTIFIER) and (self.synpred34()):
+                elif (LA13_0 == 46) :
                     alt13 = 13
+                elif ((49 <= LA13_0 <= 50)) :
+                    alt13 = 14
+                elif (LA13_0 == 52) :
+                    alt13 = 15
+                elif (LA13_0 == IDENTIFIER) and (self.synpred37()):
+                    alt13 = 16
                 else:
                     if self.backtracking > 0:
                         self.failed = True
                         return 
 
-                    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)
+                    nvae = NoViableAltException("153:1: type_specifier : ( 'void' | 'char' | 'short' | 'int' | 'long' | 'float' | 'double' | 'signed' | 'unsigned' | 'BOOLEAN' | 'CHAR8' | 'CHAR16' | 'VOID' | s= struct_or_union_specifier | e= enum_specifier | ( IDENTIFIER declarator )=> type_id );", 13, 0, self.input)
 
                     raise nvae
 
@@ -1306,8 +1381,29 @@ class CParser(Parser):
 
 
                 elif alt13 == 11:
-                    # C.g:164:4: s= struct_or_union_specifier
-                    self.following.append(self.FOLLOW_struct_or_union_specifier_in_type_specifier418)
+                    # C.g:164:4: 'CHAR8'
+                    self.match(self.input, 44, self.FOLLOW_44_in_type_specifier416)
+                    if self.failed:
+                        return 
+
+
+                elif alt13 == 12:
+                    # C.g:165:4: 'CHAR16'
+                    self.match(self.input, 45, self.FOLLOW_45_in_type_specifier421)
+                    if self.failed:
+                        return 
+
+
+                elif alt13 == 13:
+                    # C.g:166:4: 'VOID'
+                    self.match(self.input, 46, self.FOLLOW_46_in_type_specifier426)
+                    if self.failed:
+                        return 
+
+
+                elif alt13 == 14:
+                    # C.g:167:4: s= struct_or_union_specifier
+                    self.following.append(self.FOLLOW_struct_or_union_specifier_in_type_specifier433)
                     s = self.struct_or_union_specifier()
                     self.following.pop()
                     if self.failed:
@@ -1317,9 +1413,9 @@ class CParser(Parser):
 
 
 
-                elif alt13 == 12:
-                    # C.g:165:4: e= enum_specifier
-                    self.following.append(self.FOLLOW_enum_specifier_in_type_specifier427)
+                elif alt13 == 15:
+                    # C.g:168:4: e= enum_specifier
+                    self.following.append(self.FOLLOW_enum_specifier_in_type_specifier442)
                     e = self.enum_specifier()
                     self.following.pop()
                     if self.failed:
@@ -1329,9 +1425,9 @@ class CParser(Parser):
 
 
 
-                elif alt13 == 13:
-                    # C.g:166:4: ( IDENTIFIER declarator )=> type_id
-                    self.following.append(self.FOLLOW_type_id_in_type_specifier441)
+                elif alt13 == 16:
+                    # C.g:169:4: ( IDENTIFIER declarator )=> type_id
+                    self.following.append(self.FOLLOW_type_id_in_type_specifier456)
                     self.type_id()
                     self.following.pop()
                     if self.failed:
@@ -1354,7 +1450,7 @@ class CParser(Parser):
 
 
     # $ANTLR start type_id
-    # C.g:169:1: type_id : IDENTIFIER ;
+    # C.g:172:1: type_id : IDENTIFIER ;
     def type_id(self, ):
 
         type_id_StartIndex = self.input.index()
@@ -1363,9 +1459,9 @@ class CParser(Parser):
                 if self.backtracking > 0 and self.alreadyParsedRule(self.input, 10):
                     return 
 
-                # C.g:170:5: ( IDENTIFIER )
-                # C.g:170:9: IDENTIFIER
-                self.match(self.input, IDENTIFIER, self.FOLLOW_IDENTIFIER_in_type_id457)
+                # C.g:173:5: ( IDENTIFIER )
+                # C.g:173:9: IDENTIFIER
+                self.match(self.input, IDENTIFIER, self.FOLLOW_IDENTIFIER_in_type_id472)
                 if self.failed:
                     return 
 
@@ -1393,7 +1489,7 @@ class CParser(Parser):
 
 
     # $ANTLR start struct_or_union_specifier
-    # C.g:174:1: struct_or_union_specifier options {k=3; } : ( struct_or_union ( IDENTIFIER )? '{' struct_declaration_list '}' | struct_or_union IDENTIFIER );
+    # C.g:177: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()
@@ -1404,37 +1500,37 @@ class CParser(Parser):
                 if self.backtracking > 0 and self.alreadyParsedRule(self.input, 11):
                     return retval
 
-                # C.g:176:2: ( struct_or_union ( IDENTIFIER )? '{' struct_declaration_list '}' | struct_or_union IDENTIFIER )
+                # C.g:179:2: ( struct_or_union ( IDENTIFIER )? '{' struct_declaration_list '}' | struct_or_union IDENTIFIER )
                 alt15 = 2
                 LA15_0 = self.input.LA(1)
 
-                if ((46 <= LA15_0 <= 47)) :
+                if ((49 <= LA15_0 <= 50)) :
                     LA15_1 = self.input.LA(2)
 
                     if (LA15_1 == IDENTIFIER) :
                         LA15_2 = self.input.LA(3)
 
-                        if (LA15_2 == 44) :
+                        if (LA15_2 == 47) :
                             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) :
+                        elif (LA15_2 == EOF or LA15_2 == IDENTIFIER or LA15_2 == 25 or LA15_2 == 27 or (29 <= LA15_2 <= 46) or (49 <= LA15_2 <= 66) or LA15_2 == 68) :
                             alt15 = 2
                         else:
                             if self.backtracking > 0:
                                 self.failed = True
                                 return retval
 
-                            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)
+                            nvae = NoViableAltException("177: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 (LA15_1 == 44) :
+                    elif (LA15_1 == 47) :
                         alt15 = 1
                     else:
                         if self.backtracking > 0:
                             self.failed = True
                             return retval
 
-                        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)
+                        nvae = NoViableAltException("177: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
 
@@ -1443,18 +1539,18 @@ class CParser(Parser):
                         self.failed = True
                         return retval
 
-                    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)
+                    nvae = NoViableAltException("177: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 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)
+                    # C.g:179:4: struct_or_union ( IDENTIFIER )? '{' struct_declaration_list '}'
+                    self.following.append(self.FOLLOW_struct_or_union_in_struct_or_union_specifier499)
                     self.struct_or_union()
                     self.following.pop()
                     if self.failed:
                         return retval
-                    # C.g:176:20: ( IDENTIFIER )?
+                    # C.g:179:20: ( IDENTIFIER )?
                     alt14 = 2
                     LA14_0 = self.input.LA(1)
 
@@ -1462,33 +1558,33 @@ class CParser(Parser):
                         alt14 = 1
                     if alt14 == 1:
                         # C.g:0:0: IDENTIFIER
-                        self.match(self.input, IDENTIFIER, self.FOLLOW_IDENTIFIER_in_struct_or_union_specifier486)
+                        self.match(self.input, IDENTIFIER, self.FOLLOW_IDENTIFIER_in_struct_or_union_specifier501)
                         if self.failed:
                             return retval
 
 
 
-                    self.match(self.input, 44, self.FOLLOW_44_in_struct_or_union_specifier489)
+                    self.match(self.input, 47, self.FOLLOW_47_in_struct_or_union_specifier504)
                     if self.failed:
                         return retval
-                    self.following.append(self.FOLLOW_struct_declaration_list_in_struct_or_union_specifier491)
+                    self.following.append(self.FOLLOW_struct_declaration_list_in_struct_or_union_specifier506)
                     self.struct_declaration_list()
                     self.following.pop()
                     if self.failed:
                         return retval
-                    self.match(self.input, 45, self.FOLLOW_45_in_struct_or_union_specifier493)
+                    self.match(self.input, 48, self.FOLLOW_48_in_struct_or_union_specifier508)
                     if self.failed:
                         return retval
 
 
                 elif alt15 == 2:
-                    # C.g:177:4: struct_or_union IDENTIFIER
-                    self.following.append(self.FOLLOW_struct_or_union_in_struct_or_union_specifier498)
+                    # C.g:180:4: struct_or_union IDENTIFIER
+                    self.following.append(self.FOLLOW_struct_or_union_in_struct_or_union_specifier513)
                     self.struct_or_union()
                     self.following.pop()
                     if self.failed:
                         return retval
-                    self.match(self.input, IDENTIFIER, self.FOLLOW_IDENTIFIER_in_struct_or_union_specifier500)
+                    self.match(self.input, IDENTIFIER, self.FOLLOW_IDENTIFIER_in_struct_or_union_specifier515)
                     if self.failed:
                         return retval
 
@@ -1511,7 +1607,7 @@ class CParser(Parser):
 
 
     # $ANTLR start struct_or_union
-    # C.g:180:1: struct_or_union : ( 'struct' | 'union' );
+    # C.g:183:1: struct_or_union : ( 'struct' | 'union' );
     def struct_or_union(self, ):
 
         struct_or_union_StartIndex = self.input.index()
@@ -1520,9 +1616,9 @@ class CParser(Parser):
                 if self.backtracking > 0 and self.alreadyParsedRule(self.input, 12):
                     return 
 
-                # C.g:181:2: ( 'struct' | 'union' )
+                # C.g:184:2: ( 'struct' | 'union' )
                 # C.g:
-                if (46 <= self.input.LA(1) <= 47):
+                if (49 <= self.input.LA(1) <= 50):
                     self.input.consume();
                     self.errorRecovery = False
                     self.failed = False
@@ -1558,7 +1654,7 @@ class CParser(Parser):
 
 
     # $ANTLR start struct_declaration_list
-    # C.g:185:1: struct_declaration_list : ( struct_declaration )+ ;
+    # C.g:188:1: struct_declaration_list : ( struct_declaration )+ ;
     def struct_declaration_list(self, ):
 
         struct_declaration_list_StartIndex = self.input.index()
@@ -1567,21 +1663,21 @@ class CParser(Parser):
                 if self.backtracking > 0 and self.alreadyParsedRule(self.input, 13):
                     return 
 
-                # C.g:186:2: ( ( struct_declaration )+ )
-                # C.g:186:4: ( struct_declaration )+
-                # C.g:186:4: ( struct_declaration )+
+                # C.g:189:2: ( ( struct_declaration )+ )
+                # C.g:189:4: ( struct_declaration )+
+                # C.g:189:4: ( struct_declaration )+
                 cnt16 = 0
                 while True: #loop16
                     alt16 = 2
                     LA16_0 = self.input.LA(1)
 
-                    if (LA16_0 == IDENTIFIER or (34 <= LA16_0 <= 43) or (46 <= LA16_0 <= 47) or (49 <= LA16_0 <= 55)) :
+                    if (LA16_0 == IDENTIFIER or (34 <= LA16_0 <= 46) or (49 <= LA16_0 <= 50) or (52 <= LA16_0 <= 60)) :
                         alt16 = 1
 
 
                     if alt16 == 1:
                         # C.g:0:0: struct_declaration
-                        self.following.append(self.FOLLOW_struct_declaration_in_struct_declaration_list527)
+                        self.following.append(self.FOLLOW_struct_declaration_in_struct_declaration_list542)
                         self.struct_declaration()
                         self.following.pop()
                         if self.failed:
@@ -1621,7 +1717,7 @@ class CParser(Parser):
 
 
     # $ANTLR start struct_declaration
-    # C.g:189:1: struct_declaration : specifier_qualifier_list struct_declarator_list ';' ;
+    # C.g:192:1: struct_declaration : specifier_qualifier_list struct_declarator_list ';' ;
     def struct_declaration(self, ):
 
         struct_declaration_StartIndex = self.input.index()
@@ -1630,19 +1726,19 @@ class CParser(Parser):
                 if self.backtracking > 0 and self.alreadyParsedRule(self.input, 14):
                     return 
 
-                # 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)
+                # C.g:193:2: ( specifier_qualifier_list struct_declarator_list ';' )
+                # C.g:193:4: specifier_qualifier_list struct_declarator_list ';'
+                self.following.append(self.FOLLOW_specifier_qualifier_list_in_struct_declaration554)
                 self.specifier_qualifier_list()
                 self.following.pop()
                 if self.failed:
                     return 
-                self.following.append(self.FOLLOW_struct_declarator_list_in_struct_declaration541)
+                self.following.append(self.FOLLOW_struct_declarator_list_in_struct_declaration556)
                 self.struct_declarator_list()
                 self.following.pop()
                 if self.failed:
                     return 
-                self.match(self.input, 25, self.FOLLOW_25_in_struct_declaration543)
+                self.match(self.input, 25, self.FOLLOW_25_in_struct_declaration558)
                 if self.failed:
                     return 
 
@@ -1664,7 +1760,7 @@ class CParser(Parser):
 
 
     # $ANTLR start specifier_qualifier_list
-    # C.g:193:1: specifier_qualifier_list : ( type_qualifier | type_specifier )+ ;
+    # C.g:196:1: specifier_qualifier_list : ( type_qualifier | type_specifier )+ ;
     def specifier_qualifier_list(self, ):
 
         specifier_qualifier_list_StartIndex = self.input.index()
@@ -1673,47 +1769,47 @@ class CParser(Parser):
                 if self.backtracking > 0 and self.alreadyParsedRule(self.input, 15):
                     return 
 
-                # C.g:194:2: ( ( type_qualifier | type_specifier )+ )
-                # C.g:194:4: ( type_qualifier | type_specifier )+
-                # C.g:194:4: ( type_qualifier | type_specifier )+
+                # C.g:197:2: ( ( type_qualifier | type_specifier )+ )
+                # C.g:197:4: ( type_qualifier | type_specifier )+
+                # C.g:197: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 LA17 == 66:
+                            LA17_27 = self.input.LA(3)
 
-                            if (self.synpred40()) :
+                            if (self.synpred43()) :
                                 alt17 = 2
 
 
-                        elif LA17 == 57:
-                            LA17_23 = self.input.LA(3)
+                        elif LA17 == 64:
+                            LA17_28 = self.input.LA(3)
 
-                            if (self.synpred40()) :
+                            if (self.synpred43()) :
                                 alt17 = 2
 
 
-                        elif LA17 == 48:
-                            LA17_24 = self.input.LA(3)
+                        elif LA17 == 51:
+                            LA17_29 = self.input.LA(3)
 
-                            if (self.synpred40()) :
+                            if (self.synpred43()) :
                                 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:
+                        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 == 44 or LA17 == 45 or LA17 == 46 or LA17 == 49 or LA17 == 50 or LA17 == 52 or LA17 == 53 or LA17 == 54 or LA17 == 55 or LA17 == 56 or LA17 == 57 or LA17 == 58 or LA17 == 59 or LA17 == 60 or LA17 == 61 or LA17 == 62 or LA17 == 63 or LA17 == 65 or LA17 == 68:
                             alt17 = 2
 
-                    elif LA17 == 50 or LA17 == 51 or LA17 == 52 or LA17 == 53 or LA17 == 54 or LA17 == 55:
+                    elif LA17 == 53 or LA17 == 54 or LA17 == 55 or LA17 == 56 or LA17 == 57 or LA17 == 58 or LA17 == 59 or LA17 == 60:
                         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:
+                    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 == 44 or LA17 == 45 or LA17 == 46 or LA17 == 49 or LA17 == 50 or LA17 == 52:
                         alt17 = 2
 
                     if alt17 == 1:
-                        # C.g:194:6: type_qualifier
-                        self.following.append(self.FOLLOW_type_qualifier_in_specifier_qualifier_list556)
+                        # C.g:197:6: type_qualifier
+                        self.following.append(self.FOLLOW_type_qualifier_in_specifier_qualifier_list571)
                         self.type_qualifier()
                         self.following.pop()
                         if self.failed:
@@ -1721,8 +1817,8 @@ class CParser(Parser):
 
 
                     elif alt17 == 2:
-                        # C.g:194:23: type_specifier
-                        self.following.append(self.FOLLOW_type_specifier_in_specifier_qualifier_list560)
+                        # C.g:197:23: type_specifier
+                        self.following.append(self.FOLLOW_type_specifier_in_specifier_qualifier_list575)
                         self.type_specifier()
                         self.following.pop()
                         if self.failed:
@@ -1762,7 +1858,7 @@ class CParser(Parser):
 
 
     # $ANTLR start struct_declarator_list
-    # C.g:197:1: struct_declarator_list : struct_declarator ( ',' struct_declarator )* ;
+    # C.g:200:1: struct_declarator_list : struct_declarator ( ',' struct_declarator )* ;
     def struct_declarator_list(self, ):
 
         struct_declarator_list_StartIndex = self.input.index()
@@ -1771,14 +1867,14 @@ class CParser(Parser):
                 if self.backtracking > 0 and self.alreadyParsedRule(self.input, 16):
                     return 
 
-                # 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)
+                # C.g:201:2: ( struct_declarator ( ',' struct_declarator )* )
+                # C.g:201:4: struct_declarator ( ',' struct_declarator )*
+                self.following.append(self.FOLLOW_struct_declarator_in_struct_declarator_list589)
                 self.struct_declarator()
                 self.following.pop()
                 if self.failed:
                     return 
-                # C.g:198:22: ( ',' struct_declarator )*
+                # C.g:201:22: ( ',' struct_declarator )*
                 while True: #loop18
                     alt18 = 2
                     LA18_0 = self.input.LA(1)
@@ -1788,11 +1884,11 @@ class CParser(Parser):
 
 
                     if alt18 == 1:
-                        # C.g:198:23: ',' struct_declarator
-                        self.match(self.input, 27, self.FOLLOW_27_in_struct_declarator_list577)
+                        # C.g:201:23: ',' struct_declarator
+                        self.match(self.input, 27, self.FOLLOW_27_in_struct_declarator_list592)
                         if self.failed:
                             return 
-                        self.following.append(self.FOLLOW_struct_declarator_in_struct_declarator_list579)
+                        self.following.append(self.FOLLOW_struct_declarator_in_struct_declarator_list594)
                         self.struct_declarator()
                         self.following.pop()
                         if self.failed:
@@ -1822,7 +1918,7 @@ class CParser(Parser):
 
 
     # $ANTLR start struct_declarator
-    # C.g:201:1: struct_declarator : ( declarator ( ':' constant_expression )? | ':' constant_expression );
+    # C.g:204:1: struct_declarator : ( declarator ( ':' constant_expression )? | ':' constant_expression );
     def struct_declarator(self, ):
 
         struct_declarator_StartIndex = self.input.index()
@@ -1831,42 +1927,42 @@ class CParser(Parser):
                 if self.backtracking > 0 and self.alreadyParsedRule(self.input, 17):
                     return 
 
-                # C.g:202:2: ( declarator ( ':' constant_expression )? | ':' constant_expression )
+                # C.g:205:2: ( declarator ( ':' constant_expression )? | ':' constant_expression )
                 alt20 = 2
                 LA20_0 = self.input.LA(1)
 
-                if (LA20_0 == IDENTIFIER or (56 <= LA20_0 <= 57) or LA20_0 == 61) :
+                if (LA20_0 == IDENTIFIER or (61 <= LA20_0 <= 64) or LA20_0 == 68) :
                     alt20 = 1
-                elif (LA20_0 == 48) :
+                elif (LA20_0 == 51) :
                     alt20 = 2
                 else:
                     if self.backtracking > 0:
                         self.failed = True
                         return 
 
-                    nvae = NoViableAltException("201:1: struct_declarator : ( declarator ( ':' constant_expression )? | ':' constant_expression );", 20, 0, self.input)
+                    nvae = NoViableAltException("204:1: struct_declarator : ( declarator ( ':' constant_expression )? | ':' constant_expression );", 20, 0, self.input)
 
                     raise nvae
 
                 if alt20 == 1:
-                    # C.g:202:4: declarator ( ':' constant_expression )?
-                    self.following.append(self.FOLLOW_declarator_in_struct_declarator592)
+                    # C.g:205:4: declarator ( ':' constant_expression )?
+                    self.following.append(self.FOLLOW_declarator_in_struct_declarator607)
                     self.declarator()
                     self.following.pop()
                     if self.failed:
                         return 
-                    # C.g:202:15: ( ':' constant_expression )?
+                    # C.g:205:15: ( ':' constant_expression )?
                     alt19 = 2
                     LA19_0 = self.input.LA(1)
 
-                    if (LA19_0 == 48) :
+                    if (LA19_0 == 51) :
                         alt19 = 1
                     if alt19 == 1:
-                        # C.g:202:16: ':' constant_expression
-                        self.match(self.input, 48, self.FOLLOW_48_in_struct_declarator595)
+                        # C.g:205:16: ':' constant_expression
+                        self.match(self.input, 51, self.FOLLOW_51_in_struct_declarator610)
                         if self.failed:
                             return 
-                        self.following.append(self.FOLLOW_constant_expression_in_struct_declarator597)
+                        self.following.append(self.FOLLOW_constant_expression_in_struct_declarator612)
                         self.constant_expression()
                         self.following.pop()
                         if self.failed:
@@ -1877,11 +1973,11 @@ class CParser(Parser):
 
 
                 elif alt20 == 2:
-                    # C.g:203:4: ':' constant_expression
-                    self.match(self.input, 48, self.FOLLOW_48_in_struct_declarator604)
+                    # C.g:206:4: ':' constant_expression
+                    self.match(self.input, 51, self.FOLLOW_51_in_struct_declarator619)
                     if self.failed:
                         return 
-                    self.following.append(self.FOLLOW_constant_expression_in_struct_declarator606)
+                    self.following.append(self.FOLLOW_constant_expression_in_struct_declarator621)
                     self.constant_expression()
                     self.following.pop()
                     if self.failed:
@@ -1910,7 +2006,7 @@ class CParser(Parser):
 
 
     # $ANTLR start enum_specifier
-    # C.g:206:1: enum_specifier options {k=3; } : ( 'enum' '{' enumerator_list '}' | 'enum' IDENTIFIER '{' enumerator_list '}' | 'enum' IDENTIFIER );
+    # C.g:209:1: enum_specifier options {k=3; } : ( 'enum' '{' enumerator_list '}' | 'enum' IDENTIFIER '{' enumerator_list '}' | 'enum' IDENTIFIER );
     def enum_specifier(self, ):
 
         retval = self.enum_specifier_return()
@@ -1921,37 +2017,37 @@ class CParser(Parser):
                 if self.backtracking > 0 and self.alreadyParsedRule(self.input, 18):
                     return retval
 
-                # C.g:208:2: ( 'enum' '{' enumerator_list '}' | 'enum' IDENTIFIER '{' enumerator_list '}' | 'enum' IDENTIFIER )
+                # C.g:211:2: ( 'enum' '{' enumerator_list '}' | 'enum' IDENTIFIER '{' enumerator_list '}' | 'enum' IDENTIFIER )
                 alt21 = 3
                 LA21_0 = self.input.LA(1)
 
-                if (LA21_0 == 49) :
+                if (LA21_0 == 52) :
                     LA21_1 = self.input.LA(2)
 
                     if (LA21_1 == IDENTIFIER) :
                         LA21_2 = self.input.LA(3)
 
-                        if (LA21_2 == 44) :
+                        if (LA21_2 == 47) :
                             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) :
+                        elif (LA21_2 == EOF or LA21_2 == IDENTIFIER or LA21_2 == 25 or LA21_2 == 27 or (29 <= LA21_2 <= 46) or (49 <= LA21_2 <= 66) or LA21_2 == 68) :
                             alt21 = 3
                         else:
                             if self.backtracking > 0:
                                 self.failed = True
                                 return retval
 
-                            nvae = NoViableAltException("206:1: enum_specifier options {k=3; } : ( 'enum' '{' enumerator_list '}' | 'enum' IDENTIFIER '{' enumerator_list '}' | 'enum' IDENTIFIER );", 21, 2, self.input)
+                            nvae = NoViableAltException("209:1: enum_specifier options {k=3; } : ( 'enum' '{' enumerator_list '}' | 'enum' IDENTIFIER '{' enumerator_list '}' | 'enum' IDENTIFIER );", 21, 2, self.input)
 
                             raise nvae
 
-                    elif (LA21_1 == 44) :
+                    elif (LA21_1 == 47) :
                         alt21 = 1
                     else:
                         if self.backtracking > 0:
                             self.failed = True
                             return retval
 
-                        nvae = NoViableAltException("206:1: enum_specifier options {k=3; } : ( 'enum' '{' enumerator_list '}' | 'enum' IDENTIFIER '{' enumerator_list '}' | 'enum' IDENTIFIER );", 21, 1, self.input)
+                        nvae = NoViableAltException("209:1: enum_specifier options {k=3; } : ( 'enum' '{' enumerator_list '}' | 'enum' IDENTIFIER '{' enumerator_list '}' | 'enum' IDENTIFIER );", 21, 1, self.input)
 
                         raise nvae
 
@@ -1960,55 +2056,55 @@ class CParser(Parser):
                         self.failed = True
                         return retval
 
-                    nvae = NoViableAltException("206:1: enum_specifier options {k=3; } : ( 'enum' '{' enumerator_list '}' | 'enum' IDENTIFIER '{' enumerator_list '}' | 'enum' IDENTIFIER );", 21, 0, self.input)
+                    nvae = NoViableAltException("209:1: enum_specifier options {k=3; } : ( 'enum' '{' enumerator_list '}' | 'enum' IDENTIFIER '{' enumerator_list '}' | 'enum' IDENTIFIER );", 21, 0, self.input)
 
                     raise nvae
 
                 if alt21 == 1:
-                    # C.g:208:4: 'enum' '{' enumerator_list '}'
-                    self.match(self.input, 49, self.FOLLOW_49_in_enum_specifier624)
+                    # C.g:211:4: 'enum' '{' enumerator_list '}'
+                    self.match(self.input, 52, self.FOLLOW_52_in_enum_specifier639)
                     if self.failed:
                         return retval
-                    self.match(self.input, 44, self.FOLLOW_44_in_enum_specifier626)
+                    self.match(self.input, 47, self.FOLLOW_47_in_enum_specifier641)
                     if self.failed:
                         return retval
-                    self.following.append(self.FOLLOW_enumerator_list_in_enum_specifier628)
+                    self.following.append(self.FOLLOW_enumerator_list_in_enum_specifier643)
                     self.enumerator_list()
                     self.following.pop()
                     if self.failed:
                         return retval
-                    self.match(self.input, 45, self.FOLLOW_45_in_enum_specifier630)
+                    self.match(self.input, 48, self.FOLLOW_48_in_enum_specifier645)
                     if self.failed:
                         return retval
 
 
                 elif alt21 == 2:
-                    # C.g:209:4: 'enum' IDENTIFIER '{' enumerator_list '}'
-                    self.match(self.input, 49, self.FOLLOW_49_in_enum_specifier635)
+                    # C.g:212:4: 'enum' IDENTIFIER '{' enumerator_list '}'
+                    self.match(self.input, 52, self.FOLLOW_52_in_enum_specifier650)
                     if self.failed:
                         return retval
-                    self.match(self.input, IDENTIFIER, self.FOLLOW_IDENTIFIER_in_enum_specifier637)
+                    self.match(self.input, IDENTIFIER, self.FOLLOW_IDENTIFIER_in_enum_specifier652)
                     if self.failed:
                         return retval
-                    self.match(self.input, 44, self.FOLLOW_44_in_enum_specifier639)
+                    self.match(self.input, 47, self.FOLLOW_47_in_enum_specifier654)
                     if self.failed:
                         return retval
-                    self.following.append(self.FOLLOW_enumerator_list_in_enum_specifier641)
+                    self.following.append(self.FOLLOW_enumerator_list_in_enum_specifier656)
                     self.enumerator_list()
                     self.following.pop()
                     if self.failed:
                         return retval
-                    self.match(self.input, 45, self.FOLLOW_45_in_enum_specifier643)
+                    self.match(self.input, 48, self.FOLLOW_48_in_enum_specifier658)
                     if self.failed:
                         return retval
 
 
                 elif alt21 == 3:
-                    # C.g:210:4: 'enum' IDENTIFIER
-                    self.match(self.input, 49, self.FOLLOW_49_in_enum_specifier648)
+                    # C.g:213:4: 'enum' IDENTIFIER
+                    self.match(self.input, 52, self.FOLLOW_52_in_enum_specifier663)
                     if self.failed:
                         return retval
-                    self.match(self.input, IDENTIFIER, self.FOLLOW_IDENTIFIER_in_enum_specifier650)
+                    self.match(self.input, IDENTIFIER, self.FOLLOW_IDENTIFIER_in_enum_specifier665)
                     if self.failed:
                         return retval
 
@@ -2031,7 +2127,7 @@ class CParser(Parser):
 
 
     # $ANTLR start enumerator_list
-    # C.g:213:1: enumerator_list : enumerator ( ',' enumerator )* ;
+    # C.g:216:1: enumerator_list : enumerator ( ',' enumerator )* ;
     def enumerator_list(self, ):
 
         enumerator_list_StartIndex = self.input.index()
@@ -2040,14 +2136,14 @@ class CParser(Parser):
                 if self.backtracking > 0 and self.alreadyParsedRule(self.input, 19):
                     return 
 
-                # C.g:214:2: ( enumerator ( ',' enumerator )* )
-                # C.g:214:4: enumerator ( ',' enumerator )*
-                self.following.append(self.FOLLOW_enumerator_in_enumerator_list661)
+                # C.g:217:2: ( enumerator ( ',' enumerator )* )
+                # C.g:217:4: enumerator ( ',' enumerator )*
+                self.following.append(self.FOLLOW_enumerator_in_enumerator_list676)
                 self.enumerator()
                 self.following.pop()
                 if self.failed:
                     return 
-                # C.g:214:15: ( ',' enumerator )*
+                # C.g:217:15: ( ',' enumerator )*
                 while True: #loop22
                     alt22 = 2
                     LA22_0 = self.input.LA(1)
@@ -2057,11 +2153,11 @@ class CParser(Parser):
 
 
                     if alt22 == 1:
-                        # C.g:214:16: ',' enumerator
-                        self.match(self.input, 27, self.FOLLOW_27_in_enumerator_list664)
+                        # C.g:217:16: ',' enumerator
+                        self.match(self.input, 27, self.FOLLOW_27_in_enumerator_list679)
                         if self.failed:
                             return 
-                        self.following.append(self.FOLLOW_enumerator_in_enumerator_list666)
+                        self.following.append(self.FOLLOW_enumerator_in_enumerator_list681)
                         self.enumerator()
                         self.following.pop()
                         if self.failed:
@@ -2091,7 +2187,7 @@ class CParser(Parser):
 
 
     # $ANTLR start enumerator
-    # C.g:217:1: enumerator : IDENTIFIER ( '=' constant_expression )? ;
+    # C.g:220:1: enumerator : IDENTIFIER ( '=' constant_expression )? ;
     def enumerator(self, ):
 
         enumerator_StartIndex = self.input.index()
@@ -2100,23 +2196,23 @@ class CParser(Parser):
                 if self.backtracking > 0 and self.alreadyParsedRule(self.input, 20):
                     return 
 
-                # C.g:218:2: ( IDENTIFIER ( '=' constant_expression )? )
-                # C.g:218:4: IDENTIFIER ( '=' constant_expression )?
-                self.match(self.input, IDENTIFIER, self.FOLLOW_IDENTIFIER_in_enumerator679)
+                # C.g:221:2: ( IDENTIFIER ( '=' constant_expression )? )
+                # C.g:221:4: IDENTIFIER ( '=' constant_expression )?
+                self.match(self.input, IDENTIFIER, self.FOLLOW_IDENTIFIER_in_enumerator694)
                 if self.failed:
                     return 
-                # C.g:218:15: ( '=' constant_expression )?
+                # C.g:221:15: ( '=' constant_expression )?
                 alt23 = 2
                 LA23_0 = self.input.LA(1)
 
                 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)
+                    # C.g:221:16: '=' constant_expression
+                    self.match(self.input, 28, self.FOLLOW_28_in_enumerator697)
                     if self.failed:
                         return 
-                    self.following.append(self.FOLLOW_constant_expression_in_enumerator684)
+                    self.following.append(self.FOLLOW_constant_expression_in_enumerator699)
                     self.constant_expression()
                     self.following.pop()
                     if self.failed:
@@ -2143,7 +2239,7 @@ class CParser(Parser):
 
 
     # $ANTLR start type_qualifier
-    # C.g:221:1: type_qualifier : ( 'const' | 'volatile' | 'IN' | 'OUT' | 'OPTIONAL' | 'CONST' );
+    # C.g:224:1: type_qualifier : ( 'const' | 'volatile' | 'IN' | 'OUT' | 'OPTIONAL' | 'CONST' | 'UNALIGNED' | 'VOLATILE' );
     def type_qualifier(self, ):
 
         type_qualifier_StartIndex = self.input.index()
@@ -2152,9 +2248,9 @@ class CParser(Parser):
                 if self.backtracking > 0 and self.alreadyParsedRule(self.input, 21):
                     return 
 
-                # C.g:222:2: ( 'const' | 'volatile' | 'IN' | 'OUT' | 'OPTIONAL' | 'CONST' )
+                # C.g:225:2: ( 'const' | 'volatile' | 'IN' | 'OUT' | 'OPTIONAL' | 'CONST' | 'UNALIGNED' | 'VOLATILE' )
                 # C.g:
-                if (50 <= self.input.LA(1) <= 55):
+                if (53 <= self.input.LA(1) <= 60):
                     self.input.consume();
                     self.errorRecovery = False
                     self.failed = False
@@ -2196,7 +2292,7 @@ class CParser(Parser):
 
 
     # $ANTLR start declarator
-    # C.g:230:1: declarator : ( ( pointer )? ( 'EFIAPI' )? direct_declarator | pointer );
+    # C.g:235:1: declarator : ( ( pointer )? ( 'EFIAPI' )? ( 'EFI_BOOTSERVICE' )? ( 'EFI_RUNTIMESERVICE' )? direct_declarator | ( 'EFIAPI' )? ( 'EFI_BOOTSERVICE' )? ( 'EFI_RUNTIMESERVICE' )? ( pointer )? direct_declarator | pointer );
     def declarator(self, ):
 
         retval = self.declarator_return()
@@ -2207,353 +2303,774 @@ class CParser(Parser):
                 if self.backtracking > 0 and self.alreadyParsedRule(self.input, 22):
                     return retval
 
-                # C.g:231:2: ( ( pointer )? ( 'EFIAPI' )? direct_declarator | pointer )
-                alt26 = 2
-                LA26_0 = self.input.LA(1)
+                # C.g:236:2: ( ( pointer )? ( 'EFIAPI' )? ( 'EFI_BOOTSERVICE' )? ( 'EFI_RUNTIMESERVICE' )? direct_declarator | ( 'EFIAPI' )? ( 'EFI_BOOTSERVICE' )? ( 'EFI_RUNTIMESERVICE' )? ( pointer )? direct_declarator | pointer )
+                alt32 = 3
+                LA32 = self.input.LA(1)
+                if LA32 == 68:
+                    LA32_1 = self.input.LA(2)
 
-                if (LA26_0 == 61) :
-                    LA26_1 = self.input.LA(2)
-
-                    if (self.synpred55()) :
-                        alt26 = 1
+                    if (self.synpred62()) :
+                        alt32 = 1
+                    elif (self.synpred67()) :
+                        alt32 = 2
                     elif (True) :
-                        alt26 = 2
+                        alt32 = 3
                     else:
                         if self.backtracking > 0:
                             self.failed = True
                             return retval
 
-                        nvae = NoViableAltException("230:1: declarator : ( ( pointer )? ( 'EFIAPI' )? direct_declarator | pointer );", 26, 1, self.input)
+                        nvae = NoViableAltException("235:1: declarator : ( ( pointer )? ( 'EFIAPI' )? ( 'EFI_BOOTSERVICE' )? ( 'EFI_RUNTIMESERVICE' )? direct_declarator | ( 'EFIAPI' )? ( 'EFI_BOOTSERVICE' )? ( 'EFI_RUNTIMESERVICE' )? ( pointer )? direct_declarator | pointer );", 32, 1, self.input)
 
                         raise nvae
 
-                elif (LA26_0 == IDENTIFIER or (56 <= LA26_0 <= 57)) :
-                    alt26 = 1
-                else:
-                    if self.backtracking > 0:
-                        self.failed = True
-                        return retval
-
-                    nvae = NoViableAltException("230:1: declarator : ( ( pointer )? ( 'EFIAPI' )? direct_declarator | pointer );", 26, 0, self.input)
+                elif LA32 == 61:
+                    LA32 = self.input.LA(2)
+                    if LA32 == 62:
+                        LA32_43 = self.input.LA(3)
 
-                    raise nvae
+                        if (self.synpred62()) :
+                            alt32 = 1
+                        elif (self.synpred67()) :
+                            alt32 = 2
+                        else:
+                            if self.backtracking > 0:
+                                self.failed = True
+                                return retval
 
-                if alt26 == 1:
-                    # C.g:231:4: ( pointer )? ( 'EFIAPI' )? direct_declarator
-                    # C.g:231:4: ( pointer )?
-                    alt24 = 2
-                    LA24_0 = self.input.LA(1)
+                            nvae = NoViableAltException("235:1: declarator : ( ( pointer )? ( 'EFIAPI' )? ( 'EFI_BOOTSERVICE' )? ( 'EFI_RUNTIMESERVICE' )? direct_declarator | ( 'EFIAPI' )? ( 'EFI_BOOTSERVICE' )? ( 'EFI_RUNTIMESERVICE' )? ( pointer )? direct_declarator | pointer );", 32, 43, self.input)
 
-                    if (LA24_0 == 61) :
-                        alt24 = 1
-                    if alt24 == 1:
-                        # C.g:0:0: pointer
-                        self.following.append(self.FOLLOW_pointer_in_declarator733)
-                        self.pointer()
-                        self.following.pop()
-                        if self.failed:
-                            return retval
+                            raise nvae
 
+                    elif LA32 == 63:
+                        LA32_44 = self.input.LA(3)
 
+                        if (self.synpred62()) :
+                            alt32 = 1
+                        elif (self.synpred67()) :
+                            alt32 = 2
+                        else:
+                            if self.backtracking > 0:
+                                self.failed = True
+                                return retval
 
-                    # C.g:231:13: ( 'EFIAPI' )?
-                    alt25 = 2
-                    LA25_0 = self.input.LA(1)
+                            nvae = NoViableAltException("235:1: declarator : ( ( pointer )? ( 'EFIAPI' )? ( 'EFI_BOOTSERVICE' )? ( 'EFI_RUNTIMESERVICE' )? direct_declarator | ( 'EFIAPI' )? ( 'EFI_BOOTSERVICE' )? ( 'EFI_RUNTIMESERVICE' )? ( pointer )? direct_declarator | pointer );", 32, 44, self.input)
 
-                    if (LA25_0 == 56) :
-                        alt25 = 1
-                    if alt25 == 1:
-                        # C.g:231:14: 'EFIAPI'
-                        self.match(self.input, 56, self.FOLLOW_56_in_declarator737)
-                        if self.failed:
-                            return retval
+                            raise nvae
 
+                    elif LA32 == IDENTIFIER:
+                        LA32_45 = self.input.LA(3)
 
+                        if (self.synpred62()) :
+                            alt32 = 1
+                        elif (self.synpred67()) :
+                            alt32 = 2
+                        else:
+                            if self.backtracking > 0:
+                                self.failed = True
+                                return retval
 
-                    self.following.append(self.FOLLOW_direct_declarator_in_declarator741)
-                    self.direct_declarator()
-                    self.following.pop()
-                    if self.failed:
-                        return retval
+                            nvae = NoViableAltException("235:1: declarator : ( ( pointer )? ( 'EFIAPI' )? ( 'EFI_BOOTSERVICE' )? ( 'EFI_RUNTIMESERVICE' )? direct_declarator | ( 'EFIAPI' )? ( 'EFI_BOOTSERVICE' )? ( 'EFI_RUNTIMESERVICE' )? ( pointer )? direct_declarator | pointer );", 32, 45, self.input)
 
+                            raise nvae
 
-                elif alt26 == 2:
-                    # C.g:232:4: pointer
-                    self.following.append(self.FOLLOW_pointer_in_declarator746)
-                    self.pointer()
-                    self.following.pop()
-                    if self.failed:
-                        return retval
+                    elif LA32 == 64:
+                        LA32_46 = self.input.LA(3)
 
+                        if (self.synpred62()) :
+                            alt32 = 1
+                        elif (self.synpred67()) :
+                            alt32 = 2
+                        else:
+                            if self.backtracking > 0:
+                                self.failed = True
+                                return retval
 
-                retval.stop = self.input.LT(-1)
+                            nvae = NoViableAltException("235:1: declarator : ( ( pointer )? ( 'EFIAPI' )? ( 'EFI_BOOTSERVICE' )? ( 'EFI_RUNTIMESERVICE' )? direct_declarator | ( 'EFIAPI' )? ( 'EFI_BOOTSERVICE' )? ( 'EFI_RUNTIMESERVICE' )? ( pointer )? direct_declarator | pointer );", 32, 46, self.input)
 
+                            raise nvae
 
-            except RecognitionException, re:
-                self.reportError(re)
-                self.recover(self.input, re)
-        finally:
-            if self.backtracking > 0:
-                self.memoize(self.input, 22, declarator_StartIndex)
+                    elif LA32 == 68:
+                        alt32 = 2
+                    else:
+                        if self.backtracking > 0:
+                            self.failed = True
+                            return retval
 
-            pass
+                        nvae = NoViableAltException("235:1: declarator : ( ( pointer )? ( 'EFIAPI' )? ( 'EFI_BOOTSERVICE' )? ( 'EFI_RUNTIMESERVICE' )? direct_declarator | ( 'EFIAPI' )? ( 'EFI_BOOTSERVICE' )? ( 'EFI_RUNTIMESERVICE' )? ( pointer )? direct_declarator | pointer );", 32, 2, self.input)
 
-        return retval
+                        raise nvae
 
-    # $ANTLR end declarator
+                elif LA32 == 62:
+                    LA32 = self.input.LA(2)
+                    if LA32 == 63:
+                        LA32_48 = self.input.LA(3)
 
+                        if (self.synpred62()) :
+                            alt32 = 1
+                        elif (self.synpred67()) :
+                            alt32 = 2
+                        else:
+                            if self.backtracking > 0:
+                                self.failed = True
+                                return retval
 
-    # $ANTLR start direct_declarator
-    # C.g:235:1: direct_declarator : ( IDENTIFIER ( declarator_suffix )* | '(' declarator ')' ( declarator_suffix )+ );
-    def direct_declarator(self, ):
+                            nvae = NoViableAltException("235:1: declarator : ( ( pointer )? ( 'EFIAPI' )? ( 'EFI_BOOTSERVICE' )? ( 'EFI_RUNTIMESERVICE' )? direct_declarator | ( 'EFIAPI' )? ( 'EFI_BOOTSERVICE' )? ( 'EFI_RUNTIMESERVICE' )? ( pointer )? direct_declarator | pointer );", 32, 48, self.input)
 
-        direct_declarator_StartIndex = self.input.index()
-        try:
-            try:
-                if self.backtracking > 0 and self.alreadyParsedRule(self.input, 23):
-                    return 
+                            raise nvae
 
-                # C.g:236:2: ( IDENTIFIER ( declarator_suffix )* | '(' declarator ')' ( declarator_suffix )+ )
-                alt29 = 2
-                LA29_0 = self.input.LA(1)
+                    elif LA32 == IDENTIFIER:
+                        LA32_49 = self.input.LA(3)
 
-                if (LA29_0 == IDENTIFIER) :
-                    alt29 = 1
-                elif (LA29_0 == 57) :
-                    alt29 = 2
-                else:
-                    if self.backtracking > 0:
-                        self.failed = True
-                        return 
+                        if (self.synpred62()) :
+                            alt32 = 1
+                        elif (self.synpred67()) :
+                            alt32 = 2
+                        else:
+                            if self.backtracking > 0:
+                                self.failed = True
+                                return retval
 
-                    nvae = NoViableAltException("235:1: direct_declarator : ( IDENTIFIER ( declarator_suffix )* | '(' declarator ')' ( declarator_suffix )+ );", 29, 0, self.input)
+                            nvae = NoViableAltException("235:1: declarator : ( ( pointer )? ( 'EFIAPI' )? ( 'EFI_BOOTSERVICE' )? ( 'EFI_RUNTIMESERVICE' )? direct_declarator | ( 'EFIAPI' )? ( 'EFI_BOOTSERVICE' )? ( 'EFI_RUNTIMESERVICE' )? ( pointer )? direct_declarator | pointer );", 32, 49, self.input)
 
-                    raise nvae
+                            raise nvae
 
-                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:236:15: ( declarator_suffix )*
-                    while True: #loop27
-                        alt27 = 2
-                        LA27_0 = self.input.LA(1)
+                    elif LA32 == 64:
+                        LA32_50 = self.input.LA(3)
 
-                        if (LA27_0 == 57) :
-                            LA27 = self.input.LA(2)
-                            if LA27 == 58:
-                                LA27_29 = self.input.LA(3)
+                        if (self.synpred62()) :
+                            alt32 = 1
+                        elif (self.synpred67()) :
+                            alt32 = 2
+                        else:
+                            if self.backtracking > 0:
+                                self.failed = True
+                                return retval
 
-                                if (self.synpred56()) :
-                                    alt27 = 1
+                            nvae = NoViableAltException("235:1: declarator : ( ( pointer )? ( 'EFIAPI' )? ( 'EFI_BOOTSERVICE' )? ( 'EFI_RUNTIMESERVICE' )? direct_declarator | ( 'EFIAPI' )? ( 'EFI_BOOTSERVICE' )? ( 'EFI_RUNTIMESERVICE' )? ( pointer )? direct_declarator | pointer );", 32, 50, self.input)
 
+                            raise nvae
 
-                            elif LA27 == 29 or LA27 == 30 or LA27 == 31 or LA27 == 32 or LA27 == 33:
-                                LA27_33 = self.input.LA(3)
+                    elif LA32 == 68:
+                        alt32 = 2
+                    else:
+                        if self.backtracking > 0:
+                            self.failed = True
+                            return retval
 
-                                if (self.synpred56()) :
-                                    alt27 = 1
+                        nvae = NoViableAltException("235:1: declarator : ( ( pointer )? ( 'EFIAPI' )? ( 'EFI_BOOTSERVICE' )? ( 'EFI_RUNTIMESERVICE' )? direct_declarator | ( 'EFIAPI' )? ( 'EFI_BOOTSERVICE' )? ( 'EFI_RUNTIMESERVICE' )? ( pointer )? direct_declarator | pointer );", 32, 3, self.input)
 
+                        raise nvae
 
-                            elif LA27 == 34:
-                                LA27_34 = self.input.LA(3)
+                elif LA32 == 63:
+                    LA32 = self.input.LA(2)
+                    if LA32 == IDENTIFIER:
+                        LA32_52 = self.input.LA(3)
 
-                                if (self.synpred56()) :
-                                    alt27 = 1
+                        if (self.synpred62()) :
+                            alt32 = 1
+                        elif (self.synpred67()) :
+                            alt32 = 2
+                        else:
+                            if self.backtracking > 0:
+                                self.failed = True
+                                return retval
 
+                            nvae = NoViableAltException("235:1: declarator : ( ( pointer )? ( 'EFIAPI' )? ( 'EFI_BOOTSERVICE' )? ( 'EFI_RUNTIMESERVICE' )? direct_declarator | ( 'EFIAPI' )? ( 'EFI_BOOTSERVICE' )? ( 'EFI_RUNTIMESERVICE' )? ( pointer )? direct_declarator | pointer );", 32, 52, self.input)
 
-                            elif LA27 == 35:
-                                LA27_35 = self.input.LA(3)
+                            raise nvae
 
-                                if (self.synpred56()) :
-                                    alt27 = 1
+                    elif LA32 == 64:
+                        LA32_53 = self.input.LA(3)
 
+                        if (self.synpred62()) :
+                            alt32 = 1
+                        elif (self.synpred67()) :
+                            alt32 = 2
+                        else:
+                            if self.backtracking > 0:
+                                self.failed = True
+                                return retval
 
-                            elif LA27 == 36:
-                                LA27_36 = self.input.LA(3)
+                            nvae = NoViableAltException("235:1: declarator : ( ( pointer )? ( 'EFIAPI' )? ( 'EFI_BOOTSERVICE' )? ( 'EFI_RUNTIMESERVICE' )? direct_declarator | ( 'EFIAPI' )? ( 'EFI_BOOTSERVICE' )? ( 'EFI_RUNTIMESERVICE' )? ( pointer )? direct_declarator | pointer );", 32, 53, self.input)
 
-                                if (self.synpred56()) :
-                                    alt27 = 1
+                            raise nvae
 
+                    elif LA32 == 68:
+                        alt32 = 2
+                    else:
+                        if self.backtracking > 0:
+                            self.failed = True
+                            return retval
 
-                            elif LA27 == 37:
-                                LA27_37 = self.input.LA(3)
+                        nvae = NoViableAltException("235:1: declarator : ( ( pointer )? ( 'EFIAPI' )? ( 'EFI_BOOTSERVICE' )? ( 'EFI_RUNTIMESERVICE' )? direct_declarator | ( 'EFIAPI' )? ( 'EFI_BOOTSERVICE' )? ( 'EFI_RUNTIMESERVICE' )? ( pointer )? direct_declarator | pointer );", 32, 4, self.input)
 
-                                if (self.synpred56()) :
-                                    alt27 = 1
+                        raise nvae
 
+                elif LA32 == IDENTIFIER:
+                    LA32_5 = self.input.LA(2)
 
-                            elif LA27 == 38:
-                                LA27_38 = self.input.LA(3)
+                    if (self.synpred62()) :
+                        alt32 = 1
+                    elif (self.synpred67()) :
+                        alt32 = 2
+                    else:
+                        if self.backtracking > 0:
+                            self.failed = True
+                            return retval
 
-                                if (self.synpred56()) :
-                                    alt27 = 1
+                        nvae = NoViableAltException("235:1: declarator : ( ( pointer )? ( 'EFIAPI' )? ( 'EFI_BOOTSERVICE' )? ( 'EFI_RUNTIMESERVICE' )? direct_declarator | ( 'EFIAPI' )? ( 'EFI_BOOTSERVICE' )? ( 'EFI_RUNTIMESERVICE' )? ( pointer )? direct_declarator | pointer );", 32, 5, self.input)
 
+                        raise nvae
 
-                            elif LA27 == 39:
-                                LA27_39 = self.input.LA(3)
+                elif LA32 == 64:
+                    LA32 = self.input.LA(2)
+                    if LA32 == 68:
+                        LA32_89 = self.input.LA(3)
 
-                                if (self.synpred56()) :
-                                    alt27 = 1
+                        if (self.synpred62()) :
+                            alt32 = 1
+                        elif (self.synpred67()) :
+                            alt32 = 2
+                        else:
+                            if self.backtracking > 0:
+                                self.failed = True
+                                return retval
 
+                            nvae = NoViableAltException("235:1: declarator : ( ( pointer )? ( 'EFIAPI' )? ( 'EFI_BOOTSERVICE' )? ( 'EFI_RUNTIMESERVICE' )? direct_declarator | ( 'EFIAPI' )? ( 'EFI_BOOTSERVICE' )? ( 'EFI_RUNTIMESERVICE' )? ( pointer )? direct_declarator | pointer );", 32, 89, self.input)
 
-                            elif LA27 == 40:
-                                LA27_40 = self.input.LA(3)
+                            raise nvae
 
-                                if (self.synpred56()) :
-                                    alt27 = 1
+                    elif LA32 == 61:
+                        LA32_90 = self.input.LA(3)
 
+                        if (self.synpred62()) :
+                            alt32 = 1
+                        elif (self.synpred67()) :
+                            alt32 = 2
+                        else:
+                            if self.backtracking > 0:
+                                self.failed = True
+                                return retval
 
-                            elif LA27 == 41:
-                                LA27_41 = self.input.LA(3)
+                            nvae = NoViableAltException("235:1: declarator : ( ( pointer )? ( 'EFIAPI' )? ( 'EFI_BOOTSERVICE' )? ( 'EFI_RUNTIMESERVICE' )? direct_declarator | ( 'EFIAPI' )? ( 'EFI_BOOTSERVICE' )? ( 'EFI_RUNTIMESERVICE' )? ( pointer )? direct_declarator | pointer );", 32, 90, self.input)
 
-                                if (self.synpred56()) :
-                                    alt27 = 1
+                            raise nvae
 
+                    elif LA32 == 62:
+                        LA32_91 = self.input.LA(3)
 
-                            elif LA27 == 42:
-                                LA27_42 = self.input.LA(3)
+                        if (self.synpred62()) :
+                            alt32 = 1
+                        elif (self.synpred67()) :
+                            alt32 = 2
+                        else:
+                            if self.backtracking > 0:
+                                self.failed = True
+                                return retval
 
-                                if (self.synpred56()) :
-                                    alt27 = 1
+                            nvae = NoViableAltException("235:1: declarator : ( ( pointer )? ( 'EFIAPI' )? ( 'EFI_BOOTSERVICE' )? ( 'EFI_RUNTIMESERVICE' )? direct_declarator | ( 'EFIAPI' )? ( 'EFI_BOOTSERVICE' )? ( 'EFI_RUNTIMESERVICE' )? ( pointer )? direct_declarator | pointer );", 32, 91, self.input)
 
+                            raise nvae
 
-                            elif LA27 == 43:
-                                LA27_43 = self.input.LA(3)
+                    elif LA32 == 63:
+                        LA32_92 = self.input.LA(3)
 
-                                if (self.synpred56()) :
-                                    alt27 = 1
+                        if (self.synpred62()) :
+                            alt32 = 1
+                        elif (self.synpred67()) :
+                            alt32 = 2
+                        else:
+                            if self.backtracking > 0:
+                                self.failed = True
+                                return retval
 
+                            nvae = NoViableAltException("235:1: declarator : ( ( pointer )? ( 'EFIAPI' )? ( 'EFI_BOOTSERVICE' )? ( 'EFI_RUNTIMESERVICE' )? direct_declarator | ( 'EFIAPI' )? ( 'EFI_BOOTSERVICE' )? ( 'EFI_RUNTIMESERVICE' )? ( pointer )? direct_declarator | pointer );", 32, 92, self.input)
 
-                            elif LA27 == 46 or LA27 == 47:
-                                LA27_44 = self.input.LA(3)
+                            raise nvae
 
-                                if (self.synpred56()) :
-                                    alt27 = 1
+                    elif LA32 == IDENTIFIER:
+                        LA32_93 = self.input.LA(3)
 
+                        if (self.synpred62()) :
+                            alt32 = 1
+                        elif (self.synpred67()) :
+                            alt32 = 2
+                        else:
+                            if self.backtracking > 0:
+                                self.failed = True
+                                return retval
 
-                            elif LA27 == 49:
-                                LA27_45 = self.input.LA(3)
+                            nvae = NoViableAltException("235:1: declarator : ( ( pointer )? ( 'EFIAPI' )? ( 'EFI_BOOTSERVICE' )? ( 'EFI_RUNTIMESERVICE' )? direct_declarator | ( 'EFIAPI' )? ( 'EFI_BOOTSERVICE' )? ( 'EFI_RUNTIMESERVICE' )? ( pointer )? direct_declarator | pointer );", 32, 93, self.input)
 
-                                if (self.synpred56()) :
-                                    alt27 = 1
+                            raise nvae
 
+                    elif LA32 == 64:
+                        LA32_94 = self.input.LA(3)
 
-                            elif LA27 == IDENTIFIER:
-                                LA27_46 = self.input.LA(3)
+                        if (self.synpred62()) :
+                            alt32 = 1
+                        elif (self.synpred67()) :
+                            alt32 = 2
+                        else:
+                            if self.backtracking > 0:
+                                self.failed = True
+                                return retval
+
+                            nvae = NoViableAltException("235:1: declarator : ( ( pointer )? ( 'EFIAPI' )? ( 'EFI_BOOTSERVICE' )? ( 'EFI_RUNTIMESERVICE' )? direct_declarator | ( 'EFIAPI' )? ( 'EFI_BOOTSERVICE' )? ( 'EFI_RUNTIMESERVICE' )? ( pointer )? direct_declarator | pointer );", 32, 94, self.input)
+
+                            raise nvae
+
+                    else:
+                        if self.backtracking > 0:
+                            self.failed = True
+                            return retval
+
+                        nvae = NoViableAltException("235:1: declarator : ( ( pointer )? ( 'EFIAPI' )? ( 'EFI_BOOTSERVICE' )? ( 'EFI_RUNTIMESERVICE' )? direct_declarator | ( 'EFIAPI' )? ( 'EFI_BOOTSERVICE' )? ( 'EFI_RUNTIMESERVICE' )? ( pointer )? direct_declarator | pointer );", 32, 6, self.input)
+
+                        raise nvae
+
+                else:
+                    if self.backtracking > 0:
+                        self.failed = True
+                        return retval
+
+                    nvae = NoViableAltException("235:1: declarator : ( ( pointer )? ( 'EFIAPI' )? ( 'EFI_BOOTSERVICE' )? ( 'EFI_RUNTIMESERVICE' )? direct_declarator | ( 'EFIAPI' )? ( 'EFI_BOOTSERVICE' )? ( 'EFI_RUNTIMESERVICE' )? ( pointer )? direct_declarator | pointer );", 32, 0, self.input)
+
+                    raise nvae
+
+                if alt32 == 1:
+                    # C.g:236:4: ( pointer )? ( 'EFIAPI' )? ( 'EFI_BOOTSERVICE' )? ( 'EFI_RUNTIMESERVICE' )? direct_declarator
+                    # C.g:236:4: ( pointer )?
+                    alt24 = 2
+                    LA24_0 = self.input.LA(1)
+
+                    if (LA24_0 == 68) :
+                        alt24 = 1
+                    if alt24 == 1:
+                        # C.g:0:0: pointer
+                        self.following.append(self.FOLLOW_pointer_in_declarator758)
+                        self.pointer()
+                        self.following.pop()
+                        if self.failed:
+                            return retval
+
+
+
+                    # C.g:236:13: ( 'EFIAPI' )?
+                    alt25 = 2
+                    LA25_0 = self.input.LA(1)
+
+                    if (LA25_0 == 61) :
+                        alt25 = 1
+                    if alt25 == 1:
+                        # C.g:236:14: 'EFIAPI'
+                        self.match(self.input, 61, self.FOLLOW_61_in_declarator762)
+                        if self.failed:
+                            return retval
+
+
+
+                    # C.g:236:25: ( 'EFI_BOOTSERVICE' )?
+                    alt26 = 2
+                    LA26_0 = self.input.LA(1)
+
+                    if (LA26_0 == 62) :
+                        alt26 = 1
+                    if alt26 == 1:
+                        # C.g:236:26: 'EFI_BOOTSERVICE'
+                        self.match(self.input, 62, self.FOLLOW_62_in_declarator767)
+                        if self.failed:
+                            return retval
+
+
+
+                    # C.g:236:46: ( 'EFI_RUNTIMESERVICE' )?
+                    alt27 = 2
+                    LA27_0 = self.input.LA(1)
+
+                    if (LA27_0 == 63) :
+                        alt27 = 1
+                    if alt27 == 1:
+                        # C.g:236:47: 'EFI_RUNTIMESERVICE'
+                        self.match(self.input, 63, self.FOLLOW_63_in_declarator772)
+                        if self.failed:
+                            return retval
+
+
+
+                    self.following.append(self.FOLLOW_direct_declarator_in_declarator776)
+                    self.direct_declarator()
+                    self.following.pop()
+                    if self.failed:
+                        return retval
+
+
+                elif alt32 == 2:
+                    # C.g:237:4: ( 'EFIAPI' )? ( 'EFI_BOOTSERVICE' )? ( 'EFI_RUNTIMESERVICE' )? ( pointer )? direct_declarator
+                    # C.g:237:4: ( 'EFIAPI' )?
+                    alt28 = 2
+                    LA28_0 = self.input.LA(1)
+
+                    if (LA28_0 == 61) :
+                        alt28 = 1
+                    if alt28 == 1:
+                        # C.g:237:5: 'EFIAPI'
+                        self.match(self.input, 61, self.FOLLOW_61_in_declarator782)
+                        if self.failed:
+                            return retval
+
+
+
+                    # C.g:237:16: ( 'EFI_BOOTSERVICE' )?
+                    alt29 = 2
+                    LA29_0 = self.input.LA(1)
+
+                    if (LA29_0 == 62) :
+                        alt29 = 1
+                    if alt29 == 1:
+                        # C.g:237:17: 'EFI_BOOTSERVICE'
+                        self.match(self.input, 62, self.FOLLOW_62_in_declarator787)
+                        if self.failed:
+                            return retval
+
+
+
+                    # C.g:237:37: ( 'EFI_RUNTIMESERVICE' )?
+                    alt30 = 2
+                    LA30_0 = self.input.LA(1)
+
+                    if (LA30_0 == 63) :
+                        alt30 = 1
+                    if alt30 == 1:
+                        # C.g:237:38: 'EFI_RUNTIMESERVICE'
+                        self.match(self.input, 63, self.FOLLOW_63_in_declarator792)
+                        if self.failed:
+                            return retval
+
+
+
+                    # C.g:237:61: ( pointer )?
+                    alt31 = 2
+                    LA31_0 = self.input.LA(1)
+
+                    if (LA31_0 == 68) :
+                        alt31 = 1
+                    if alt31 == 1:
+                        # C.g:0:0: pointer
+                        self.following.append(self.FOLLOW_pointer_in_declarator796)
+                        self.pointer()
+                        self.following.pop()
+                        if self.failed:
+                            return retval
+
+
+
+                    self.following.append(self.FOLLOW_direct_declarator_in_declarator799)
+                    self.direct_declarator()
+                    self.following.pop()
+                    if self.failed:
+                        return retval
+
+
+                elif alt32 == 3:
+                    # C.g:238:4: pointer
+                    self.following.append(self.FOLLOW_pointer_in_declarator804)
+                    self.pointer()
+                    self.following.pop()
+                    if self.failed:
+                        return retval
+
+
+                retval.stop = self.input.LT(-1)
+
+
+            except RecognitionException, re:
+                self.reportError(re)
+                self.recover(self.input, re)
+        finally:
+            if self.backtracking > 0:
+                self.memoize(self.input, 22, declarator_StartIndex)
+
+            pass
+
+        return retval
+
+    # $ANTLR end declarator
+
+
+    # $ANTLR start direct_declarator
+    # C.g:241:1: direct_declarator : ( IDENTIFIER ( declarator_suffix )* | '(' declarator ')' ( declarator_suffix )+ );
+    def direct_declarator(self, ):
+
+        direct_declarator_StartIndex = self.input.index()
+        try:
+            try:
+                if self.backtracking > 0 and self.alreadyParsedRule(self.input, 23):
+                    return 
+
+                # C.g:242:2: ( IDENTIFIER ( declarator_suffix )* | '(' declarator ')' ( declarator_suffix )+ )
+                alt35 = 2
+                LA35_0 = self.input.LA(1)
+
+                if (LA35_0 == IDENTIFIER) :
+                    alt35 = 1
+                elif (LA35_0 == 64) :
+                    alt35 = 2
+                else:
+                    if self.backtracking > 0:
+                        self.failed = True
+                        return 
+
+                    nvae = NoViableAltException("241:1: direct_declarator : ( IDENTIFIER ( declarator_suffix )* | '(' declarator ')' ( declarator_suffix )+ );", 35, 0, self.input)
+
+                    raise nvae
+
+                if alt35 == 1:
+                    # C.g:242:4: IDENTIFIER ( declarator_suffix )*
+                    self.match(self.input, IDENTIFIER, self.FOLLOW_IDENTIFIER_in_direct_declarator815)
+                    if self.failed:
+                        return 
+                    # C.g:242:15: ( declarator_suffix )*
+                    while True: #loop33
+                        alt33 = 2
+                        LA33_0 = self.input.LA(1)
+
+                        if (LA33_0 == 64) :
+                            LA33 = self.input.LA(2)
+                            if LA33 == 65:
+                                LA33_34 = self.input.LA(3)
+
+                                if (self.synpred68()) :
+                                    alt33 = 1
+
+
+                            elif LA33 == IDENTIFIER:
+                                LA33_39 = self.input.LA(3)
+
+                                if (self.synpred68()) :
+                                    alt33 = 1
+
+
+                            elif LA33 == 29 or LA33 == 30 or LA33 == 31 or LA33 == 32 or LA33 == 33:
+                                LA33_42 = self.input.LA(3)
+
+                                if (self.synpred68()) :
+                                    alt33 = 1
+
+
+                            elif LA33 == 34:
+                                LA33_43 = self.input.LA(3)
+
+                                if (self.synpred68()) :
+                                    alt33 = 1
+
+
+                            elif LA33 == 35:
+                                LA33_44 = self.input.LA(3)
+
+                                if (self.synpred68()) :
+                                    alt33 = 1
+
+
+                            elif LA33 == 36:
+                                LA33_45 = self.input.LA(3)
+
+                                if (self.synpred68()) :
+                                    alt33 = 1
+
+
+                            elif LA33 == 37:
+                                LA33_46 = self.input.LA(3)
+
+                                if (self.synpred68()) :
+                                    alt33 = 1
+
+
+                            elif LA33 == 38:
+                                LA33_47 = self.input.LA(3)
+
+                                if (self.synpred68()) :
+                                    alt33 = 1
+
+
+                            elif LA33 == 39:
+                                LA33_48 = self.input.LA(3)
+
+                                if (self.synpred68()) :
+                                    alt33 = 1
+
+
+                            elif LA33 == 40:
+                                LA33_49 = self.input.LA(3)
+
+                                if (self.synpred68()) :
+                                    alt33 = 1
+
+
+                            elif LA33 == 41:
+                                LA33_50 = self.input.LA(3)
+
+                                if (self.synpred68()) :
+                                    alt33 = 1
+
+
+                            elif LA33 == 42:
+                                LA33_51 = self.input.LA(3)
+
+                                if (self.synpred68()) :
+                                    alt33 = 1
+
+
+                            elif LA33 == 43:
+                                LA33_52 = self.input.LA(3)
+
+                                if (self.synpred68()) :
+                                    alt33 = 1
+
+
+                            elif LA33 == 44:
+                                LA33_53 = self.input.LA(3)
+
+                                if (self.synpred68()) :
+                                    alt33 = 1
+
+
+                            elif LA33 == 45:
+                                LA33_54 = self.input.LA(3)
+
+                                if (self.synpred68()) :
+                                    alt33 = 1
+
+
+                            elif LA33 == 46:
+                                LA33_55 = self.input.LA(3)
+
+                                if (self.synpred68()) :
+                                    alt33 = 1
 
-                                if (self.synpred56()) :
-                                    alt27 = 1
 
+                            elif LA33 == 49 or LA33 == 50:
+                                LA33_56 = self.input.LA(3)
 
-                            elif LA27 == 50 or LA27 == 51 or LA27 == 52 or LA27 == 53 or LA27 == 54 or LA27 == 55:
-                                LA27_47 = self.input.LA(3)
+                                if (self.synpred68()) :
+                                    alt33 = 1
 
-                                if (self.synpred56()) :
-                                    alt27 = 1
 
+                            elif LA33 == 52:
+                                LA33_57 = self.input.LA(3)
 
+                                if (self.synpred68()) :
+                                    alt33 = 1
 
-                        elif (LA27_0 == 59) :
-                            LA27 = self.input.LA(2)
-                            if LA27 == 60:
-                                LA27_49 = self.input.LA(3)
 
-                                if (self.synpred56()) :
-                                    alt27 = 1
+                            elif LA33 == 53 or LA33 == 54 or LA33 == 55 or LA33 == 56 or LA33 == 57 or LA33 == 58 or LA33 == 59 or LA33 == 60:
+                                LA33_58 = self.input.LA(3)
 
+                                if (self.synpred68()) :
+                                    alt33 = 1
 
-                            elif LA27 == 57:
-                                LA27_50 = self.input.LA(3)
 
-                                if (self.synpred56()) :
-                                    alt27 = 1
 
+                        elif (LA33_0 == 66) :
+                            LA33 = self.input.LA(2)
+                            if LA33 == 67:
+                                LA33_59 = self.input.LA(3)
 
-                            elif LA27 == IDENTIFIER:
-                                LA27_51 = self.input.LA(3)
+                                if (self.synpred68()) :
+                                    alt33 = 1
 
-                                if (self.synpred56()) :
-                                    alt27 = 1
 
+                            elif LA33 == 64:
+                                LA33_60 = self.input.LA(3)
 
-                            elif LA27 == HEX_LITERAL:
-                                LA27_52 = self.input.LA(3)
+                                if (self.synpred68()) :
+                                    alt33 = 1
 
-                                if (self.synpred56()) :
-                                    alt27 = 1
 
+                            elif LA33 == IDENTIFIER:
+                                LA33_61 = self.input.LA(3)
 
-                            elif LA27 == OCTAL_LITERAL:
-                                LA27_53 = self.input.LA(3)
+                                if (self.synpred68()) :
+                                    alt33 = 1
 
-                                if (self.synpred56()) :
-                                    alt27 = 1
 
+                            elif LA33 == HEX_LITERAL:
+                                LA33_62 = self.input.LA(3)
 
-                            elif LA27 == DECIMAL_LITERAL:
-                                LA27_54 = self.input.LA(3)
+                                if (self.synpred68()) :
+                                    alt33 = 1
 
-                                if (self.synpred56()) :
-                                    alt27 = 1
 
+                            elif LA33 == OCTAL_LITERAL:
+                                LA33_63 = self.input.LA(3)
 
-                            elif LA27 == CHARACTER_LITERAL:
-                                LA27_55 = self.input.LA(3)
+                                if (self.synpred68()) :
+                                    alt33 = 1
 
-                                if (self.synpred56()) :
-                                    alt27 = 1
 
+                            elif LA33 == DECIMAL_LITERAL:
+                                LA33_64 = self.input.LA(3)
 
-                            elif LA27 == STRING_LITERAL:
-                                LA27_56 = self.input.LA(3)
+                                if (self.synpred68()) :
+                                    alt33 = 1
 
-                                if (self.synpred56()) :
-                                    alt27 = 1
 
+                            elif LA33 == CHARACTER_LITERAL:
+                                LA33_65 = self.input.LA(3)
 
-                            elif LA27 == FLOATING_POINT_LITERAL:
-                                LA27_57 = self.input.LA(3)
+                                if (self.synpred68()) :
+                                    alt33 = 1
 
-                                if (self.synpred56()) :
-                                    alt27 = 1
 
+                            elif LA33 == STRING_LITERAL:
+                                LA33_66 = self.input.LA(3)
 
-                            elif LA27 == 67:
-                                LA27_58 = self.input.LA(3)
+                                if (self.synpred68()) :
+                                    alt33 = 1
 
-                                if (self.synpred56()) :
-                                    alt27 = 1
 
+                            elif LA33 == FLOATING_POINT_LITERAL:
+                                LA33_67 = self.input.LA(3)
 
-                            elif LA27 == 68:
-                                LA27_59 = self.input.LA(3)
+                                if (self.synpred68()) :
+                                    alt33 = 1
 
-                                if (self.synpred56()) :
-                                    alt27 = 1
 
+                            elif LA33 == 74:
+                                LA33_68 = 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.synpred68()) :
+                                    alt33 = 1
 
-                                if (self.synpred56()) :
-                                    alt27 = 1
 
+                            elif LA33 == 75:
+                                LA33_69 = self.input.LA(3)
 
-                            elif LA27 == 69:
-                                LA27_61 = self.input.LA(3)
+                                if (self.synpred68()) :
+                                    alt33 = 1
 
-                                if (self.synpred56()) :
-                                    alt27 = 1
 
+                            elif LA33 == 68 or LA33 == 70 or LA33 == 71 or LA33 == 79 or LA33 == 80 or LA33 == 81:
+                                LA33_70 = self.input.LA(3)
 
+                                if (self.synpred68()) :
+                                    alt33 = 1
 
 
+                            elif LA33 == 76:
+                                LA33_71 = self.input.LA(3)
 
-                        if alt27 == 1:
+                                if (self.synpred68()) :
+                                    alt33 = 1
+
+
+
+
+
+                        if alt33 == 1:
                             # C.g:0:0: declarator_suffix
-                            self.following.append(self.FOLLOW_declarator_suffix_in_direct_declarator759)
+                            self.following.append(self.FOLLOW_declarator_suffix_in_direct_declarator817)
                             self.declarator_suffix()
                             self.following.pop()
                             if self.failed:
@@ -2561,244 +3078,265 @@ class CParser(Parser):
 
 
                         else:
-                            break #loop27
+                            break #loop33
 
 
 
 
-                elif alt29 == 2:
-                    # C.g:237:4: '(' declarator ')' ( declarator_suffix )+
-                    self.match(self.input, 57, self.FOLLOW_57_in_direct_declarator765)
+                elif alt35 == 2:
+                    # C.g:243:4: '(' declarator ')' ( declarator_suffix )+
+                    self.match(self.input, 64, self.FOLLOW_64_in_direct_declarator823)
                     if self.failed:
                         return 
-                    self.following.append(self.FOLLOW_declarator_in_direct_declarator767)
+                    self.following.append(self.FOLLOW_declarator_in_direct_declarator825)
                     self.declarator()
                     self.following.pop()
                     if self.failed:
                         return 
-                    self.match(self.input, 58, self.FOLLOW_58_in_direct_declarator769)
+                    self.match(self.input, 65, self.FOLLOW_65_in_direct_declarator827)
                     if self.failed:
                         return 
-                    # C.g:237:23: ( declarator_suffix )+
-                    cnt28 = 0
-                    while True: #loop28
-                        alt28 = 2
-                        LA28_0 = self.input.LA(1)
+                    # C.g:243:23: ( declarator_suffix )+
+                    cnt34 = 0
+                    while True: #loop34
+                        alt34 = 2
+                        LA34_0 = self.input.LA(1)
+
+                        if (LA34_0 == 64) :
+                            LA34 = self.input.LA(2)
+                            if LA34 == 65:
+                                LA34_34 = self.input.LA(3)
+
+                                if (self.synpred70()) :
+                                    alt34 = 1
+
+
+                            elif LA34 == IDENTIFIER:
+                                LA34_39 = self.input.LA(3)
+
+                                if (self.synpred70()) :
+                                    alt34 = 1
+
+
+                            elif LA34 == 29 or LA34 == 30 or LA34 == 31 or LA34 == 32 or LA34 == 33:
+                                LA34_42 = self.input.LA(3)
+
+                                if (self.synpred70()) :
+                                    alt34 = 1
 
-                        if (LA28_0 == 57) :
-                            LA28 = self.input.LA(2)
-                            if LA28 == 58:
-                                LA28_29 = self.input.LA(3)
 
-                                if (self.synpred58()) :
-                                    alt28 = 1
+                            elif LA34 == 34:
+                                LA34_43 = self.input.LA(3)
+
+                                if (self.synpred70()) :
+                                    alt34 = 1
 
 
-                            elif LA28 == 29 or LA28 == 30 or LA28 == 31 or LA28 == 32 or LA28 == 33:
-                                LA28_33 = self.input.LA(3)
+                            elif LA34 == 35:
+                                LA34_44 = self.input.LA(3)
 
-                                if (self.synpred58()) :
-                                    alt28 = 1
+                                if (self.synpred70()) :
+                                    alt34 = 1
 
 
-                            elif LA28 == 34:
-                                LA28_34 = self.input.LA(3)
+                            elif LA34 == 36:
+                                LA34_45 = self.input.LA(3)
 
-                                if (self.synpred58()) :
-                                    alt28 = 1
+                                if (self.synpred70()) :
+                                    alt34 = 1
 
 
-                            elif LA28 == 35:
-                                LA28_35 = self.input.LA(3)
+                            elif LA34 == 37:
+                                LA34_46 = self.input.LA(3)
 
-                                if (self.synpred58()) :
-                                    alt28 = 1
+                                if (self.synpred70()) :
+                                    alt34 = 1
 
 
-                            elif LA28 == 36:
-                                LA28_36 = self.input.LA(3)
+                            elif LA34 == 38:
+                                LA34_47 = self.input.LA(3)
 
-                                if (self.synpred58()) :
-                                    alt28 = 1
+                                if (self.synpred70()) :
+                                    alt34 = 1
 
 
-                            elif LA28 == 37:
-                                LA28_37 = self.input.LA(3)
+                            elif LA34 == 39:
+                                LA34_48 = self.input.LA(3)
 
-                                if (self.synpred58()) :
-                                    alt28 = 1
+                                if (self.synpred70()) :
+                                    alt34 = 1
 
 
-                            elif LA28 == 38:
-                                LA28_38 = self.input.LA(3)
+                            elif LA34 == 40:
+                                LA34_49 = self.input.LA(3)
 
-                                if (self.synpred58()) :
-                                    alt28 = 1
+                                if (self.synpred70()) :
+                                    alt34 = 1
 
 
-                            elif LA28 == 39:
-                                LA28_39 = self.input.LA(3)
+                            elif LA34 == 41:
+                                LA34_50 = self.input.LA(3)
 
-                                if (self.synpred58()) :
-                                    alt28 = 1
+                                if (self.synpred70()) :
+                                    alt34 = 1
 
 
-                            elif LA28 == 40:
-                                LA28_40 = self.input.LA(3)
+                            elif LA34 == 42:
+                                LA34_51 = self.input.LA(3)
 
-                                if (self.synpred58()) :
-                                    alt28 = 1
+                                if (self.synpred70()) :
+                                    alt34 = 1
 
 
-                            elif LA28 == 41:
-                                LA28_41 = self.input.LA(3)
+                            elif LA34 == 43:
+                                LA34_52 = self.input.LA(3)
 
-                                if (self.synpred58()) :
-                                    alt28 = 1
+                                if (self.synpred70()) :
+                                    alt34 = 1
 
 
-                            elif LA28 == 42:
-                                LA28_42 = self.input.LA(3)
+                            elif LA34 == 44:
+                                LA34_53 = self.input.LA(3)
 
-                                if (self.synpred58()) :
-                                    alt28 = 1
+                                if (self.synpred70()) :
+                                    alt34 = 1
 
 
-                            elif LA28 == 43:
-                                LA28_43 = self.input.LA(3)
+                            elif LA34 == 45:
+                                LA34_54 = self.input.LA(3)
 
-                                if (self.synpred58()) :
-                                    alt28 = 1
+                                if (self.synpred70()) :
+                                    alt34 = 1
 
 
-                            elif LA28 == 46 or LA28 == 47:
-                                LA28_44 = self.input.LA(3)
+                            elif LA34 == 46:
+                                LA34_55 = self.input.LA(3)
 
-                                if (self.synpred58()) :
-                                    alt28 = 1
+                                if (self.synpred70()) :
+                                    alt34 = 1
 
 
-                            elif LA28 == 49:
-                                LA28_45 = self.input.LA(3)
+                            elif LA34 == 49 or LA34 == 50:
+                                LA34_56 = self.input.LA(3)
 
-                                if (self.synpred58()) :
-                                    alt28 = 1
+                                if (self.synpred70()) :
+                                    alt34 = 1
 
 
-                            elif LA28 == IDENTIFIER:
-                                LA28_46 = self.input.LA(3)
+                            elif LA34 == 52:
+                                LA34_57 = self.input.LA(3)
 
-                                if (self.synpred58()) :
-                                    alt28 = 1
+                                if (self.synpred70()) :
+                                    alt34 = 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 LA34 == 53 or LA34 == 54 or LA34 == 55 or LA34 == 56 or LA34 == 57 or LA34 == 58 or LA34 == 59 or LA34 == 60:
+                                LA34_58 = self.input.LA(3)
 
-                                if (self.synpred58()) :
-                                    alt28 = 1
+                                if (self.synpred70()) :
+                                    alt34 = 1
 
 
 
-                        elif (LA28_0 == 59) :
-                            LA28 = self.input.LA(2)
-                            if LA28 == 60:
-                                LA28_49 = self.input.LA(3)
+                        elif (LA34_0 == 66) :
+                            LA34 = self.input.LA(2)
+                            if LA34 == 67:
+                                LA34_59 = self.input.LA(3)
 
-                                if (self.synpred58()) :
-                                    alt28 = 1
+                                if (self.synpred70()) :
+                                    alt34 = 1
 
 
-                            elif LA28 == 57:
-                                LA28_50 = self.input.LA(3)
+                            elif LA34 == 64:
+                                LA34_60 = self.input.LA(3)
 
-                                if (self.synpred58()) :
-                                    alt28 = 1
+                                if (self.synpred70()) :
+                                    alt34 = 1
 
 
-                            elif LA28 == IDENTIFIER:
-                                LA28_51 = self.input.LA(3)
+                            elif LA34 == IDENTIFIER:
+                                LA34_61 = self.input.LA(3)
 
-                                if (self.synpred58()) :
-                                    alt28 = 1
+                                if (self.synpred70()) :
+                                    alt34 = 1
 
 
-                            elif LA28 == HEX_LITERAL:
-                                LA28_52 = self.input.LA(3)
+                            elif LA34 == HEX_LITERAL:
+                                LA34_62 = self.input.LA(3)
 
-                                if (self.synpred58()) :
-                                    alt28 = 1
+                                if (self.synpred70()) :
+                                    alt34 = 1
 
 
-                            elif LA28 == OCTAL_LITERAL:
-                                LA28_53 = self.input.LA(3)
+                            elif LA34 == OCTAL_LITERAL:
+                                LA34_63 = self.input.LA(3)
 
-                                if (self.synpred58()) :
-                                    alt28 = 1
+                                if (self.synpred70()) :
+                                    alt34 = 1
 
 
-                            elif LA28 == DECIMAL_LITERAL:
-                                LA28_54 = self.input.LA(3)
+                            elif LA34 == DECIMAL_LITERAL:
+                                LA34_64 = self.input.LA(3)
 
-                                if (self.synpred58()) :
-                                    alt28 = 1
+                                if (self.synpred70()) :
+                                    alt34 = 1
 
 
-                            elif LA28 == CHARACTER_LITERAL:
-                                LA28_55 = self.input.LA(3)
+                            elif LA34 == CHARACTER_LITERAL:
+                                LA34_65 = self.input.LA(3)
 
-                                if (self.synpred58()) :
-                                    alt28 = 1
+                                if (self.synpred70()) :
+                                    alt34 = 1
 
 
-                            elif LA28 == STRING_LITERAL:
-                                LA28_56 = self.input.LA(3)
+                            elif LA34 == STRING_LITERAL:
+                                LA34_66 = self.input.LA(3)
 
-                                if (self.synpred58()) :
-                                    alt28 = 1
+                                if (self.synpred70()) :
+                                    alt34 = 1
 
 
-                            elif LA28 == FLOATING_POINT_LITERAL:
-                                LA28_57 = self.input.LA(3)
+                            elif LA34 == FLOATING_POINT_LITERAL:
+                                LA34_67 = self.input.LA(3)
 
-                                if (self.synpred58()) :
-                                    alt28 = 1
+                                if (self.synpred70()) :
+                                    alt34 = 1
 
 
-                            elif LA28 == 67:
-                                LA28_58 = self.input.LA(3)
+                            elif LA34 == 74:
+                                LA34_68 = self.input.LA(3)
 
-                                if (self.synpred58()) :
-                                    alt28 = 1
+                                if (self.synpred70()) :
+                                    alt34 = 1
 
 
-                            elif LA28 == 68:
-                                LA28_59 = self.input.LA(3)
+                            elif LA34 == 75:
+                                LA34_69 = self.input.LA(3)
 
-                                if (self.synpred58()) :
-                                    alt28 = 1
+                                if (self.synpred70()) :
+                                    alt34 = 1
 
 
-                            elif LA28 == 61 or LA28 == 63 or LA28 == 64 or LA28 == 72 or LA28 == 73 or LA28 == 74:
-                                LA28_60 = self.input.LA(3)
+                            elif LA34 == 68 or LA34 == 70 or LA34 == 71 or LA34 == 79 or LA34 == 80 or LA34 == 81:
+                                LA34_70 = self.input.LA(3)
 
-                                if (self.synpred58()) :
-                                    alt28 = 1
+                                if (self.synpred70()) :
+                                    alt34 = 1
 
 
-                            elif LA28 == 69:
-                                LA28_61 = self.input.LA(3)
+                            elif LA34 == 76:
+                                LA34_71 = self.input.LA(3)
 
-                                if (self.synpred58()) :
-                                    alt28 = 1
+                                if (self.synpred70()) :
+                                    alt34 = 1
 
 
 
 
 
-                        if alt28 == 1:
+                        if alt34 == 1:
                             # C.g:0:0: declarator_suffix
-                            self.following.append(self.FOLLOW_declarator_suffix_in_direct_declarator771)
+                            self.following.append(self.FOLLOW_declarator_suffix_in_direct_declarator829)
                             self.declarator_suffix()
                             self.following.pop()
                             if self.failed:
@@ -2806,17 +3344,17 @@ class CParser(Parser):
 
 
                         else:
-                            if cnt28 >= 1:
-                                break #loop28
+                            if cnt34 >= 1:
+                                break #loop34
 
                             if self.backtracking > 0:
                                 self.failed = True
                                 return 
 
-                            eee = EarlyExitException(28, self.input)
+                            eee = EarlyExitException(34, self.input)
                             raise eee
 
-                        cnt28 += 1
+                        cnt34 += 1
 
 
 
@@ -2837,7 +3375,7 @@ class CParser(Parser):
 
 
     # $ANTLR start declarator_suffix
-    # C.g:240:1: declarator_suffix : ( '[' constant_expression ']' | '[' ']' | '(' parameter_type_list ')' | '(' identifier_list ')' | '(' ')' );
+    # C.g:246:1: declarator_suffix : ( '[' constant_expression ']' | '[' ']' | '(' parameter_type_list ')' | '(' identifier_list ')' | '(' ')' );
     def declarator_suffix(self, ):
 
         declarator_suffix_StartIndex = self.input.index()
@@ -2846,45 +3384,45 @@ class CParser(Parser):
                 if self.backtracking > 0 and self.alreadyParsedRule(self.input, 24):
                     return 
 
-                # C.g:241:2: ( '[' constant_expression ']' | '[' ']' | '(' parameter_type_list ')' | '(' identifier_list ')' | '(' ')' )
-                alt30 = 5
-                LA30_0 = self.input.LA(1)
+                # C.g:247:2: ( '[' constant_expression ']' | '[' ']' | '(' parameter_type_list ')' | '(' identifier_list ')' | '(' ')' )
+                alt36 = 5
+                LA36_0 = self.input.LA(1)
 
-                if (LA30_0 == 59) :
-                    LA30_1 = self.input.LA(2)
+                if (LA36_0 == 66) :
+                    LA36_1 = self.input.LA(2)
 
-                    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
+                    if (LA36_1 == 67) :
+                        alt36 = 2
+                    elif ((IDENTIFIER <= LA36_1 <= FLOATING_POINT_LITERAL) or LA36_1 == 64 or LA36_1 == 68 or (70 <= LA36_1 <= 71) or (74 <= LA36_1 <= 76) or (79 <= LA36_1 <= 81)) :
+                        alt36 = 1
                     else:
                         if self.backtracking > 0:
                             self.failed = True
                             return 
 
-                        nvae = NoViableAltException("240:1: declarator_suffix : ( '[' constant_expression ']' | '[' ']' | '(' parameter_type_list ')' | '(' identifier_list ')' | '(' ')' );", 30, 1, self.input)
+                        nvae = NoViableAltException("246:1: declarator_suffix : ( '[' constant_expression ']' | '[' ']' | '(' parameter_type_list ')' | '(' identifier_list ')' | '(' ')' );", 36, 1, self.input)
 
                         raise nvae
 
-                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.synpred61()) :
-                            alt30 = 3
-                        elif (self.synpred62()) :
-                            alt30 = 4
+                elif (LA36_0 == 64) :
+                    LA36 = self.input.LA(2)
+                    if LA36 == 65:
+                        alt36 = 5
+                    elif LA36 == 29 or LA36 == 30 or LA36 == 31 or LA36 == 32 or LA36 == 33 or LA36 == 34 or LA36 == 35 or LA36 == 36 or LA36 == 37 or LA36 == 38 or LA36 == 39 or LA36 == 40 or LA36 == 41 or LA36 == 42 or LA36 == 43 or LA36 == 44 or LA36 == 45 or LA36 == 46 or LA36 == 49 or LA36 == 50 or LA36 == 52 or LA36 == 53 or LA36 == 54 or LA36 == 55 or LA36 == 56 or LA36 == 57 or LA36 == 58 or LA36 == 59 or LA36 == 60:
+                        alt36 = 3
+                    elif LA36 == IDENTIFIER:
+                        LA36_33 = self.input.LA(3)
+
+                        if (self.synpred73()) :
+                            alt36 = 3
+                        elif (self.synpred74()) :
+                            alt36 = 4
                         else:
                             if self.backtracking > 0:
                                 self.failed = True
                                 return 
 
-                            nvae = NoViableAltException("240:1: declarator_suffix : ( '[' constant_expression ']' | '[' ']' | '(' parameter_type_list ')' | '(' identifier_list ')' | '(' ')' );", 30, 30, self.input)
+                            nvae = NoViableAltException("246:1: declarator_suffix : ( '[' constant_expression ']' | '[' ']' | '(' parameter_type_list ')' | '(' identifier_list ')' | '(' ')' );", 36, 33, self.input)
 
                             raise nvae
 
@@ -2893,7 +3431,7 @@ class CParser(Parser):
                             self.failed = True
                             return 
 
-                        nvae = NoViableAltException("240:1: declarator_suffix : ( '[' constant_expression ']' | '[' ']' | '(' parameter_type_list ')' | '(' identifier_list ')' | '(' ')' );", 30, 2, self.input)
+                        nvae = NoViableAltException("246:1: declarator_suffix : ( '[' constant_expression ']' | '[' ']' | '(' parameter_type_list ')' | '(' identifier_list ')' | '(' ')' );", 36, 2, self.input)
 
                         raise nvae
 
@@ -2902,71 +3440,71 @@ class CParser(Parser):
                         self.failed = True
                         return 
 
-                    nvae = NoViableAltException("240:1: declarator_suffix : ( '[' constant_expression ']' | '[' ']' | '(' parameter_type_list ')' | '(' identifier_list ')' | '(' ')' );", 30, 0, self.input)
+                    nvae = NoViableAltException("246:1: declarator_suffix : ( '[' constant_expression ']' | '[' ']' | '(' parameter_type_list ')' | '(' identifier_list ')' | '(' ')' );", 36, 0, self.input)
 
                     raise nvae
 
-                if alt30 == 1:
-                    # C.g:241:6: '[' constant_expression ']'
-                    self.match(self.input, 59, self.FOLLOW_59_in_declarator_suffix785)
+                if alt36 == 1:
+                    # C.g:247:6: '[' constant_expression ']'
+                    self.match(self.input, 66, self.FOLLOW_66_in_declarator_suffix843)
                     if self.failed:
                         return 
-                    self.following.append(self.FOLLOW_constant_expression_in_declarator_suffix787)
+                    self.following.append(self.FOLLOW_constant_expression_in_declarator_suffix845)
                     self.constant_expression()
                     self.following.pop()
                     if self.failed:
                         return 
-                    self.match(self.input, 60, self.FOLLOW_60_in_declarator_suffix789)
+                    self.match(self.input, 67, self.FOLLOW_67_in_declarator_suffix847)
                     if self.failed:
                         return 
 
 
-                elif alt30 == 2:
-                    # C.g:242:9: '[' ']'
-                    self.match(self.input, 59, self.FOLLOW_59_in_declarator_suffix799)
+                elif alt36 == 2:
+                    # C.g:248:9: '[' ']'
+                    self.match(self.input, 66, self.FOLLOW_66_in_declarator_suffix857)
                     if self.failed:
                         return 
-                    self.match(self.input, 60, self.FOLLOW_60_in_declarator_suffix801)
+                    self.match(self.input, 67, self.FOLLOW_67_in_declarator_suffix859)
                     if self.failed:
                         return 
 
 
-                elif alt30 == 3:
-                    # C.g:243:9: '(' parameter_type_list ')'
-                    self.match(self.input, 57, self.FOLLOW_57_in_declarator_suffix811)
+                elif alt36 == 3:
+                    # C.g:249:9: '(' parameter_type_list ')'
+                    self.match(self.input, 64, self.FOLLOW_64_in_declarator_suffix869)
                     if self.failed:
                         return 
-                    self.following.append(self.FOLLOW_parameter_type_list_in_declarator_suffix813)
+                    self.following.append(self.FOLLOW_parameter_type_list_in_declarator_suffix871)
                     self.parameter_type_list()
                     self.following.pop()
                     if self.failed:
                         return 
-                    self.match(self.input, 58, self.FOLLOW_58_in_declarator_suffix815)
+                    self.match(self.input, 65, self.FOLLOW_65_in_declarator_suffix873)
                     if self.failed:
                         return 
 
 
-                elif alt30 == 4:
-                    # C.g:244:9: '(' identifier_list ')'
-                    self.match(self.input, 57, self.FOLLOW_57_in_declarator_suffix825)
+                elif alt36 == 4:
+                    # C.g:250:9: '(' identifier_list ')'
+                    self.match(self.input, 64, self.FOLLOW_64_in_declarator_suffix883)
                     if self.failed:
                         return 
-                    self.following.append(self.FOLLOW_identifier_list_in_declarator_suffix827)
+                    self.following.append(self.FOLLOW_identifier_list_in_declarator_suffix885)
                     self.identifier_list()
                     self.following.pop()
                     if self.failed:
                         return 
-                    self.match(self.input, 58, self.FOLLOW_58_in_declarator_suffix829)
+                    self.match(self.input, 65, self.FOLLOW_65_in_declarator_suffix887)
                     if self.failed:
                         return 
 
 
-                elif alt30 == 5:
-                    # C.g:245:9: '(' ')'
-                    self.match(self.input, 57, self.FOLLOW_57_in_declarator_suffix839)
+                elif alt36 == 5:
+                    # C.g:251:9: '(' ')'
+                    self.match(self.input, 64, self.FOLLOW_64_in_declarator_suffix897)
                     if self.failed:
                         return 
-                    self.match(self.input, 58, self.FOLLOW_58_in_declarator_suffix841)
+                    self.match(self.input, 65, self.FOLLOW_65_in_declarator_suffix899)
                     if self.failed:
                         return 
 
@@ -2987,7 +3525,7 @@ class CParser(Parser):
 
 
     # $ANTLR start pointer
-    # C.g:248:1: pointer : ( '*' ( type_qualifier )+ ( pointer )? | '*' pointer | '*' );
+    # C.g:254:1: pointer : ( '*' ( type_qualifier )+ ( pointer )? | '*' pointer | '*' );
     def pointer(self, ):
 
         pointer_StartIndex = self.input.index()
@@ -2996,59 +3534,59 @@ class CParser(Parser):
                 if self.backtracking > 0 and self.alreadyParsedRule(self.input, 25):
                     return 
 
-                # C.g:249:2: ( '*' ( type_qualifier )+ ( pointer )? | '*' pointer | '*' )
-                alt33 = 3
-                LA33_0 = self.input.LA(1)
+                # C.g:255:2: ( '*' ( type_qualifier )+ ( pointer )? | '*' pointer | '*' )
+                alt39 = 3
+                LA39_0 = self.input.LA(1)
 
-                if (LA33_0 == 61) :
-                    LA33 = self.input.LA(2)
-                    if LA33 == 61:
-                        LA33_2 = self.input.LA(3)
+                if (LA39_0 == 68) :
+                    LA39 = self.input.LA(2)
+                    if LA39 == EOF or LA39 == IDENTIFIER or LA39 == 25 or LA39 == 26 or LA39 == 27 or LA39 == 28 or LA39 == 29 or LA39 == 30 or LA39 == 31 or LA39 == 32 or LA39 == 33 or LA39 == 34 or LA39 == 35 or LA39 == 36 or LA39 == 37 or LA39 == 38 or LA39 == 39 or LA39 == 40 or LA39 == 41 or LA39 == 42 or LA39 == 43 or LA39 == 44 or LA39 == 45 or LA39 == 46 or LA39 == 47 or LA39 == 49 or LA39 == 50 or LA39 == 51 or LA39 == 52 or LA39 == 61 or LA39 == 62 or LA39 == 63 or LA39 == 64 or LA39 == 65 or LA39 == 66:
+                        alt39 = 3
+                    elif LA39 == 57:
+                        LA39_24 = self.input.LA(3)
 
-                        if (self.synpred66()) :
-                            alt33 = 2
+                        if (self.synpred77()) :
+                            alt39 = 1
                         elif (True) :
-                            alt33 = 3
+                            alt39 = 3
                         else:
                             if self.backtracking > 0:
                                 self.failed = True
                                 return 
 
-                            nvae = NoViableAltException("248:1: pointer : ( '*' ( type_qualifier )+ ( pointer )? | '*' pointer | '*' );", 33, 2, self.input)
+                            nvae = NoViableAltException("254:1: pointer : ( '*' ( type_qualifier )+ ( pointer )? | '*' pointer | '*' );", 39, 24, self.input)
 
                             raise nvae
 
-                    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_20 = self.input.LA(3)
+                    elif LA39 == 53 or LA39 == 54 or LA39 == 55 or LA39 == 56 or LA39 == 58 or LA39 == 59 or LA39 == 60:
+                        LA39_32 = self.input.LA(3)
 
-                        if (self.synpred65()) :
-                            alt33 = 1
+                        if (self.synpred77()) :
+                            alt39 = 1
                         elif (True) :
-                            alt33 = 3
+                            alt39 = 3
                         else:
                             if self.backtracking > 0:
                                 self.failed = True
                                 return 
 
-                            nvae = NoViableAltException("248:1: pointer : ( '*' ( type_qualifier )+ ( pointer )? | '*' pointer | '*' );", 33, 20, self.input)
+                            nvae = NoViableAltException("254:1: pointer : ( '*' ( type_qualifier )+ ( pointer )? | '*' pointer | '*' );", 39, 32, self.input)
 
                             raise nvae
 
-                    elif LA33 == 50 or LA33 == 51 or LA33 == 52 or LA33 == 53 or LA33 == 55:
-                        LA33_28 = self.input.LA(3)
+                    elif LA39 == 68:
+                        LA39_33 = self.input.LA(3)
 
-                        if (self.synpred65()) :
-                            alt33 = 1
+                        if (self.synpred78()) :
+                            alt39 = 2
                         elif (True) :
-                            alt33 = 3
+                            alt39 = 3
                         else:
                             if self.backtracking > 0:
                                 self.failed = True
                                 return 
 
-                            nvae = NoViableAltException("248:1: pointer : ( '*' ( type_qualifier )+ ( pointer )? | '*' pointer | '*' );", 33, 28, self.input)
+                            nvae = NoViableAltException("254:1: pointer : ( '*' ( type_qualifier )+ ( pointer )? | '*' pointer | '*' );", 39, 33, self.input)
 
                             raise nvae
 
@@ -3057,7 +3595,7 @@ class CParser(Parser):
                             self.failed = True
                             return 
 
-                        nvae = NoViableAltException("248:1: pointer : ( '*' ( type_qualifier )+ ( pointer )? | '*' pointer | '*' );", 33, 1, self.input)
+                        nvae = NoViableAltException("254:1: pointer : ( '*' ( type_qualifier )+ ( pointer )? | '*' pointer | '*' );", 39, 1, self.input)
 
                         raise nvae
 
@@ -3066,40 +3604,40 @@ class CParser(Parser):
                         self.failed = True
                         return 
 
-                    nvae = NoViableAltException("248:1: pointer : ( '*' ( type_qualifier )+ ( pointer )? | '*' pointer | '*' );", 33, 0, self.input)
+                    nvae = NoViableAltException("254:1: pointer : ( '*' ( type_qualifier )+ ( pointer )? | '*' pointer | '*' );", 39, 0, self.input)
 
                     raise nvae
 
-                if alt33 == 1:
-                    # C.g:249:4: '*' ( type_qualifier )+ ( pointer )?
-                    self.match(self.input, 61, self.FOLLOW_61_in_pointer852)
+                if alt39 == 1:
+                    # C.g:255:4: '*' ( type_qualifier )+ ( pointer )?
+                    self.match(self.input, 68, self.FOLLOW_68_in_pointer910)
                     if self.failed:
                         return 
-                    # C.g:249:8: ( type_qualifier )+
-                    cnt31 = 0
-                    while True: #loop31
-                        alt31 = 2
-                        LA31_0 = self.input.LA(1)
+                    # C.g:255:8: ( type_qualifier )+
+                    cnt37 = 0
+                    while True: #loop37
+                        alt37 = 2
+                        LA37_0 = self.input.LA(1)
 
-                        if (LA31_0 == 54) :
-                            LA31_19 = self.input.LA(2)
+                        if (LA37_0 == 57) :
+                            LA37_24 = self.input.LA(2)
 
-                            if (self.synpred63()) :
-                                alt31 = 1
+                            if (self.synpred75()) :
+                                alt37 = 1
 
 
-                        elif ((50 <= LA31_0 <= 53) or LA31_0 == 55) :
-                            LA31_27 = self.input.LA(2)
+                        elif ((53 <= LA37_0 <= 56) or (58 <= LA37_0 <= 60)) :
+                            LA37_32 = self.input.LA(2)
 
-                            if (self.synpred63()) :
-                                alt31 = 1
+                            if (self.synpred75()) :
+                                alt37 = 1
 
 
 
 
-                        if alt31 == 1:
+                        if alt37 == 1:
                             # C.g:0:0: type_qualifier
-                            self.following.append(self.FOLLOW_type_qualifier_in_pointer854)
+                            self.following.append(self.FOLLOW_type_qualifier_in_pointer912)
                             self.type_qualifier()
                             self.following.pop()
                             if self.failed:
@@ -3107,31 +3645,31 @@ class CParser(Parser):
 
 
                         else:
-                            if cnt31 >= 1:
-                                break #loop31
+                            if cnt37 >= 1:
+                                break #loop37
 
                             if self.backtracking > 0:
                                 self.failed = True
                                 return 
 
-                            eee = EarlyExitException(31, self.input)
+                            eee = EarlyExitException(37, self.input)
                             raise eee
 
-                        cnt31 += 1
+                        cnt37 += 1
 
 
-                    # C.g:249:24: ( pointer )?
-                    alt32 = 2
-                    LA32_0 = self.input.LA(1)
+                    # C.g:255:24: ( pointer )?
+                    alt38 = 2
+                    LA38_0 = self.input.LA(1)
 
-                    if (LA32_0 == 61) :
-                        LA32_1 = self.input.LA(2)
+                    if (LA38_0 == 68) :
+                        LA38_1 = self.input.LA(2)
 
-                        if (self.synpred64()) :
-                            alt32 = 1
-                    if alt32 == 1:
+                        if (self.synpred76()) :
+                            alt38 = 1
+                    if alt38 == 1:
                         # C.g:0:0: pointer
-                        self.following.append(self.FOLLOW_pointer_in_pointer857)
+                        self.following.append(self.FOLLOW_pointer_in_pointer915)
                         self.pointer()
                         self.following.pop()
                         if self.failed:
@@ -3141,21 +3679,21 @@ class CParser(Parser):
 
 
 
-                elif alt33 == 2:
-                    # C.g:250:4: '*' pointer
-                    self.match(self.input, 61, self.FOLLOW_61_in_pointer863)
+                elif alt39 == 2:
+                    # C.g:256:4: '*' pointer
+                    self.match(self.input, 68, self.FOLLOW_68_in_pointer921)
                     if self.failed:
                         return 
-                    self.following.append(self.FOLLOW_pointer_in_pointer865)
+                    self.following.append(self.FOLLOW_pointer_in_pointer923)
                     self.pointer()
                     self.following.pop()
                     if self.failed:
                         return 
 
 
-                elif alt33 == 3:
-                    # C.g:251:4: '*'
-                    self.match(self.input, 61, self.FOLLOW_61_in_pointer870)
+                elif alt39 == 3:
+                    # C.g:257:4: '*'
+                    self.match(self.input, 68, self.FOLLOW_68_in_pointer928)
                     if self.failed:
                         return 
 
@@ -3176,7 +3714,7 @@ class CParser(Parser):
 
 
     # $ANTLR start parameter_type_list
-    # C.g:254:1: parameter_type_list : parameter_list ( ',' '...' )? ;
+    # C.g:260:1: parameter_type_list : parameter_list ( ',' '...' )? ;
     def parameter_type_list(self, ):
 
         parameter_type_list_StartIndex = self.input.index()
@@ -3185,25 +3723,25 @@ class CParser(Parser):
                 if self.backtracking > 0 and self.alreadyParsedRule(self.input, 26):
                     return 
 
-                # C.g:255:2: ( parameter_list ( ',' '...' )? )
-                # C.g:255:4: parameter_list ( ',' '...' )?
-                self.following.append(self.FOLLOW_parameter_list_in_parameter_type_list881)
+                # C.g:261:2: ( parameter_list ( ',' '...' )? )
+                # C.g:261:4: parameter_list ( ',' '...' )?
+                self.following.append(self.FOLLOW_parameter_list_in_parameter_type_list939)
                 self.parameter_list()
                 self.following.pop()
                 if self.failed:
                     return 
-                # C.g:255:19: ( ',' '...' )?
-                alt34 = 2
-                LA34_0 = self.input.LA(1)
-
-                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)
+                # C.g:261:19: ( ',' '...' )?
+                alt40 = 2
+                LA40_0 = self.input.LA(1)
+
+                if (LA40_0 == 27) :
+                    alt40 = 1
+                if alt40 == 1:
+                    # C.g:261:20: ',' '...'
+                    self.match(self.input, 27, self.FOLLOW_27_in_parameter_type_list942)
                     if self.failed:
                         return 
-                    self.match(self.input, 62, self.FOLLOW_62_in_parameter_type_list886)
+                    self.match(self.input, 69, self.FOLLOW_69_in_parameter_type_list944)
                     if self.failed:
                         return 
 
@@ -3228,7 +3766,7 @@ class CParser(Parser):
 
 
     # $ANTLR start parameter_list
-    # C.g:258:1: parameter_list : parameter_declaration ( ',' ( 'OPTIONAL' )? parameter_declaration )* ;
+    # C.g:264:1: parameter_list : parameter_declaration ( ',' ( 'OPTIONAL' )? parameter_declaration )* ;
     def parameter_list(self, ):
 
         parameter_list_StartIndex = self.input.index()