adlint 2.6.14 → 3.0.0

data/lib/adlint/{c → cc1}/parser.y

@@ -1,7 +1,7 @@
 # The ISO C99 parser.
 #
 # Author::    Yutaka Yanoh <mailto:yanoh@users.sourceforge.net>
-# Copyright:: Copyright (C) 2010-2012, OGIS-RI Co.,Ltd.
+# Copyright:: Copyright (C) 2010-2013, OGIS-RI Co.,Ltd.
 # License::   GPLv3+: GNU General Public License version 3 or later
 #
 # Owner::     Yutaka Yanoh <mailto:yanoh@users.sourceforge.net>
@@ -11,7 +11,7 @@
 #    /   |  / _  |/ /   / / | / /__  __/           Source Code Static Analyzer
 #   / /| | / / / / /   / /  |/ /  / /                   AdLint - Advanced Lint
 #  / __  |/ /_/ / /___/ / /|  /  / /
-# /_/  |_|_____/_____/_/_/ |_/  /_/   Copyright (C) 2010-2012, OGIS-RI Co.,Ltd.
+# /_/  |_|_____/_____/_/_/ |_/  /_/   Copyright (C) 2010-2013, OGIS-RI Co.,Ltd.
 #
 # This file is part of AdLint.
 #
@@ -29,7 +29,7 @@
 #
 #++
 
-class AdLint::C::Parser
+class AdLint::Cc1::Parser
 
 token IDENTIFIER
       TYPEDEF_NAME
@@ -89,35 +89,30 @@ primary_expression
     : IDENTIFIER
       {
         checkpoint(val[0].location)
-
         result = ObjectSpecifier.new(val[0])
         result.head_token = result.tail_token = val[0]
       }
     | CONSTANT
       {
         checkpoint(val[0].location)
-
         result = ConstantSpecifier.new(val[0])
         result.head_token = result.tail_token = val[0]
       }
     | STRING_LITERAL
       {
         checkpoint(val[0].location)
-
         result = StringLiteralSpecifier.new(val[0])
         result.head_token = result.tail_token = val[0]
       }
     | NULL
       {
         checkpoint(val[0].location)
-
         result = NullConstantSpecifier.new(val[0])
         result.head_token = result.tail_token = val[0]
       }
     | "(" expression ")"
       {
         checkpoint(val[0].location)
-
         result = GroupedExpression.new(val[1])
         result.head_token = val[0]
         result.tail_token = val[2]
@@ -125,7 +120,6 @@ primary_expression
     | "(" compound_statement ")"
       {
         checkpoint(val[0].location)
-
         E(:E0013, val[0].location)
         result = ErrorExpression.new(val[0])
         result.head_token = val[0]
@@ -138,7 +132,6 @@ postfix_expression
     | postfix_expression "[" expression "]"
       {
         checkpoint(val[0].location)
-
         result = ArraySubscriptExpression.new(val[0], val[2], val[1])
         result.head_token = val[0].head_token
         result.tail_token = val[3]
@@ -146,7 +139,6 @@ postfix_expression
     | postfix_expression "(" ")"
       {
         checkpoint(val[0].location)
-
         result = FunctionCallExpression.new(val[0], [], val[1])
         result.head_token = val[0].head_token
         result.tail_token = val[2]
@@ -154,7 +146,6 @@ postfix_expression
     | postfix_expression "(" argument_expression_list ")"
       {
         checkpoint(val[0].location)
-
         result = FunctionCallExpression.new(val[0], val[2], val [1])
         result.head_token = val[0].head_token
         result.tail_token = val[3]
@@ -162,7 +153,6 @@ postfix_expression
     | postfix_expression "." IDENTIFIER
       {
         checkpoint(val[0].location)
-
         result = MemberAccessByValueExpression.new(val[0], val[2], val[1])
         result.head_token = val[0].head_token
         result.tail_token = val[2]
@@ -170,7 +160,6 @@ postfix_expression
     | postfix_expression "->" IDENTIFIER
       {
         checkpoint(val[0].location)
-
         result = MemberAccessByPointerExpression.new(val[0], val[2], val[1])
         result.head_token = val[0].head_token
         result.tail_token = val[2]
@@ -178,7 +167,6 @@ postfix_expression
     | postfix_expression "." CONSTANT
       {
         checkpoint(val[0].location)
-
         result = BitAccessByValueExpression.new(val[0], val[2], val[1])
         result.head_token = val[0].head_token
         result.tail_token = val[2]
@@ -186,7 +174,6 @@ postfix_expression
     | postfix_expression "->" CONSTANT
       {
         checkpoint(val[0].location)
-
         result = BitAccessByPointerExpression.new(val[0], val[2], val[1])
         result.head_token = val[0].head_token
         result.tail_token = val[2]
@@ -194,7 +181,6 @@ postfix_expression
     | postfix_expression "++"
       {
         checkpoint(val[0].location)
-
         result = PostfixIncrementExpression.new(val[1], val[0])
         result.head_token = val[0].head_token
         result.tail_token = val[1]
@@ -202,7 +188,6 @@ postfix_expression
     | postfix_expression "--"
       {
         checkpoint(val[0].location)
-
         result = PostfixDecrementExpression.new(val[1], val[0])
         result.head_token = val[0].head_token
         result.tail_token = val[1]
@@ -210,7 +195,6 @@ postfix_expression
     | "(" type_name ")" "{" initializer_list "}"
       {
         checkpoint(val[0].location)
-
         result = CompoundLiteralExpression.new(val[1], val[4], val[0])
         result.head_token = val[0]
         result.tail_token = val[5]
@@ -218,7 +202,6 @@ postfix_expression
     | "(" type_name ")" "{" initializer_list "," "}"
       {
         checkpoint(val[0].location)
-
         result = CompoundLiteralExpression.new(val[1], val[4], val[0])
         result.head_token = val[0]
         result.tail_token = val[6]
@@ -229,13 +212,11 @@ argument_expression_list
     : assignment_expression
       {
         checkpoint(val[0].location)
-
         result = val
       }
     | argument_expression_list "," assignment_expression
       {
         checkpoint(val[0].first.location)
-
         result = val[0].push(val[2])
       }
     ;
@@ -245,7 +226,6 @@ unary_expression
     | "++" unary_expression
       {
         checkpoint(val[0].location)
-
         result = PrefixIncrementExpression.new(val[0], val[1])
         result.head_token = val[0]
         result.tail_token = val[1].tail_token
@@ -253,7 +233,6 @@ unary_expression
     | "--" unary_expression
       {
         checkpoint(val[0].location)
-
         result = PrefixDecrementExpression.new(val[0], val[1])
         result.head_token = val[0]
         result.tail_token = val[1].tail_token
@@ -261,7 +240,6 @@ unary_expression
     | "&" cast_expression
       {
         checkpoint(val[0].location)
-
         result = AddressExpression.new(val[0], val[1])
         result.head_token = val[0]
         result.tail_token = val[1].tail_token
@@ -269,7 +247,6 @@ unary_expression
     | "*" cast_expression
       {
         checkpoint(val[0].location)
-
         result = IndirectionExpression.new(val[0], val[1])
         result.head_token = val[0]
         result.tail_token = val[1].tail_token
@@ -277,7 +254,6 @@ unary_expression
     | unary_arithmetic_operator cast_expression
       {
         checkpoint(val[0].location)
-
         result = UnaryArithmeticExpression.new(val[0], val[1])
         result.head_token = val[0]
         result.tail_token = val[1].tail_token
@@ -285,7 +261,6 @@ unary_expression
     | SIZEOF unary_expression
       {
         checkpoint(val[0].location)
-
         result = SizeofExpression.new(val[0], val[1])
         result.head_token = val[0]
         result.tail_token = val[1].tail_token
@@ -293,7 +268,6 @@ unary_expression
     | SIZEOF "(" type_name ")"
       {
         checkpoint(val[0].location)
-
         result = SizeofTypeExpression.new(val[0], val[2])
         result.head_token = val[0]
         result.tail_token = val[3]
@@ -301,7 +275,6 @@ unary_expression
     | ALIGNOF unary_expression
       {
         checkpoint(val[0].location)
-
         result = AlignofExpression.new(val[0], val[1])
         result.head_token = val[0]
         result.tail_token = val[1].tail_token
@@ -309,7 +282,6 @@ unary_expression
     | ALIGNOF "(" type_name ")"
       {
         checkpoint(val[0].location)
-
         result = AlignofTypeExpression.new(val[0], val[2])
         result.head_token = val[0]
         result.tail_token = val[3]
@@ -317,7 +289,6 @@ unary_expression
     | "&&" unary_expression
       {
         checkpoint(val[0].location)
-
         E(:E0014, val[0].location, val[0].value)
         result = ErrorExpression.new(val[0])
         result.head_token = val[0]
@@ -337,7 +308,6 @@ cast_expression
     | "(" type_name ")" cast_expression
       {
         checkpoint(val[0].location)
-
         result = CastExpression.new(val[1], val[3])
         result.head_token = val[0]
         result.tail_token = val[3].tail_token
@@ -349,7 +319,6 @@ multiplicative_expression
     | multiplicative_expression "*" cast_expression
       {
         checkpoint(val[0].location)
-
         result = MultiplicativeExpression.new(val[1], val[0], val[2])
         result.head_token = val[0].head_token
         result.tail_token = val[2].tail_token
@@ -357,7 +326,6 @@ multiplicative_expression
     | multiplicative_expression "/" cast_expression
       {
         checkpoint(val[0].location)
-
         result = MultiplicativeExpression.new(val[1], val[0], val[2])
         result.head_token = val[0].head_token
         result.tail_token = val[2].tail_token
@@ -365,7 +333,6 @@ multiplicative_expression
     | multiplicative_expression "%" cast_expression
       {
         checkpoint(val[0].location)
-
         result = MultiplicativeExpression.new(val[1], val[0], val[2])
         result.head_token = val[0].head_token
         result.tail_token = val[2].tail_token
@@ -377,7 +344,6 @@ additive_expression
     | additive_expression "+" multiplicative_expression
       {
         checkpoint(val[0].location)
-
         result = AdditiveExpression.new(val[1], val[0], val[2])
         result.head_token = val[0].head_token
         result.tail_token = val[2].tail_token
@@ -385,7 +351,6 @@ additive_expression
     | additive_expression "-" multiplicative_expression
       {
         checkpoint(val[0].location)
-
         result = AdditiveExpression.new(val[1], val[0], val[2])
         result.head_token = val[0].head_token
         result.tail_token = val[2].tail_token
@@ -397,7 +362,6 @@ shift_expression
     | shift_expression "<<" additive_expression
       {
         checkpoint(val[0].location)
-
         result = ShiftExpression.new(val[1], val[0], val[2])
         result.head_token = val[0].head_token
         result.tail_token = val[2].tail_token
@@ -405,7 +369,6 @@ shift_expression
     | shift_expression ">>" additive_expression
       {
         checkpoint(val[0].location)
-
         result = ShiftExpression.new(val[1], val[0], val[2])
         result.head_token = val[0].head_token
         result.tail_token = val[2].tail_token
@@ -417,7 +380,6 @@ relational_expression
     | relational_expression "<" shift_expression
       {
         checkpoint(val[0].location)
-
         result = RelationalExpression.new(val[1], val[0], val[2])
         result.head_token = val[0].head_token
         result.tail_token = val[2].tail_token
@@ -425,7 +387,6 @@ relational_expression
     | relational_expression ">" shift_expression
       {
         checkpoint(val[0].location)
-
         result = RelationalExpression.new(val[1], val[0], val[2])
         result.head_token = val[0].head_token
         result.tail_token = val[2].tail_token
@@ -433,7 +394,6 @@ relational_expression
     | relational_expression "<=" shift_expression
       {
         checkpoint(val[0].location)
-
         result = RelationalExpression.new(val[1], val[0], val[2])
         result.head_token = val[0].head_token
         result.tail_token = val[2].tail_token
@@ -441,7 +401,6 @@ relational_expression
     | relational_expression ">=" shift_expression
       {
         checkpoint(val[0].location)
-
         result = RelationalExpression.new(val[1], val[0], val[2])
         result.head_token = val[0].head_token
         result.tail_token = val[2].tail_token
@@ -453,7 +412,6 @@ equality_expression
     | equality_expression "==" relational_expression
       {
         checkpoint(val[0].location)
-
         result = EqualityExpression.new(val[1], val[0], val[2])
         result.head_token = val[0].head_token
         result.tail_token = val[2].tail_token
@@ -461,7 +419,6 @@ equality_expression
     | equality_expression "!=" relational_expression
       {
         checkpoint(val[0].location)
-
         result = EqualityExpression.new(val[1], val[0], val[2])
         result.head_token = val[0].head_token
         result.tail_token = val[2].tail_token
@@ -473,7 +430,6 @@ and_expression
     | and_expression "&" equality_expression
       {
         checkpoint(val[0].location)
-
         result = AndExpression.new(val[1], val[0], val[2])
         result.head_token = val[0].head_token
         result.tail_token = val[2].tail_token
@@ -485,7 +441,6 @@ exclusive_or_expression
     | exclusive_or_expression "^" and_expression
       {
         checkpoint(val[0].location)
-
         result = ExclusiveOrExpression.new(val[1], val[0], val[2])
         result.head_token = val[0].head_token
         result.tail_token = val[2].tail_token
@@ -497,7 +452,6 @@ inclusive_or_expression
     | inclusive_or_expression "|" exclusive_or_expression
       {
         checkpoint(val[0].location)
-
         result = InclusiveOrExpression.new(val[1], val[0], val[2])
         result.head_token = val[0].head_token
         result.tail_token = val[2].tail_token
@@ -509,7 +463,6 @@ logical_and_expression
     | logical_and_expression "&&" inclusive_or_expression
       {
         checkpoint(val[0].location)
-
         result = LogicalAndExpression.new(val[1], val[0], val[2])
         result.head_token = val[0].head_token
         result.tail_token = val[2].tail_token
@@ -521,7 +474,6 @@ logical_or_expression
     | logical_or_expression "||" logical_and_expression
       {
         checkpoint(val[0].location)
-
         result = LogicalOrExpression.new(val[1], val[0], val[2])
         result.head_token = val[0].head_token
         result.tail_token = val[2].tail_token
@@ -533,7 +485,6 @@ conditional_expression
     | logical_or_expression "?" expression ":" conditional_expression
       {
         checkpoint(val[0].location)
-
         result = ConditionalExpression.new(val[0], val[2], val[4], val[1])
         result.head_token = val[0].head_token
         result.tail_token = val[4].tail_token
@@ -545,7 +496,6 @@ assignment_expression
     | cast_expression "=" assignment_expression
       {
         checkpoint(val[0].location)
-
         result = SimpleAssignmentExpression.new(val[1], val[0], val[2])
         result.head_token = val[0].head_token
         result.tail_token = val[2].tail_token
@@ -553,7 +503,6 @@ assignment_expression
     | cast_expression compound_assignment_operator assignment_expression
       {
         checkpoint(val[0].location)
-
         result = CompoundAssignmentExpression.new(val[1], val[0], val[2])
         result.head_token = val[0].head_token
         result.tail_token = val[2].tail_token
@@ -578,15 +527,11 @@ expression
     | expression "," assignment_expression
       {
         checkpoint(val[0].location)
-
         case val[0]
         when CommaSeparatedExpression
           result = val[0].push(val[2])
-          result.tail_token = val[2].tail_token
         else
           result = CommaSeparatedExpression.new(val[0]).push(val[2])
-          result.head_token = val[0].head_token
-          result.tail_token = val[2].tail_token
         end
       }
     ;
@@ -602,21 +547,17 @@ declaration
     : declaration_specifiers ";"
       {
         checkpoint(val[0].location)
-
         @lexer.start_identifier_translation
-
-        result = Declaration.new(val[0], [], @symbol_table)
+        result = Declaration.new(val[0], [], @sym_tbl)
         result.head_token = val[0].head_token
         result.tail_token = val[1]
       }
     | declaration_specifiers init_declarator_list ";"
       {
         checkpoint(val[0].location)
-
-        result = Declaration.new(val[0], val[1], @symbol_table)
+        result = Declaration.new(val[0], val[1], @sym_tbl)
         result.head_token = val[0].head_token
         result.tail_token = val[2]
-
         result.items.each do |item|
           case item
           when TypedefDeclaration
@@ -633,8 +574,7 @@ global_declaration
     | init_declarator_list ";"
       {
         checkpoint(val[0].first.location)
-
-        result = Declaration.new(nil, val[0], @symbol_table)
+        result = Declaration.new(nil, val[0], @sym_tbl)
         result.head_token = val[0].first.head_token
         result.tail_token = val[1]
       }
@@ -644,7 +584,6 @@ declaration_specifiers
     : storage_class_specifier
       {
         checkpoint(val[0].location)
-
         result = DeclarationSpecifiers.new
         result.storage_class_specifier = val[0]
         result.head_token = result.tail_token = val[0]
@@ -652,7 +591,6 @@ declaration_specifiers
     | declaration_specifiers storage_class_specifier
       {
         checkpoint(val[0].location)
-
         result = val[0]
         result.storage_class_specifier = val[1]
         result.tail_token = val[1]
@@ -660,9 +598,7 @@ declaration_specifiers
     | type_specifier
       {
         checkpoint(val[0].location)
-
         @lexer.stop_identifier_translation
-
         result = DeclarationSpecifiers.new
         result.type_specifiers.push(val[0])
         result.head_token = val[0].head_token
@@ -671,9 +607,7 @@ declaration_specifiers
     | declaration_specifiers type_specifier
       {
         checkpoint(val[0].location)
-
         @lexer.stop_identifier_translation
-
         result = val[0]
         result.type_specifiers.push(val[1])
         result.tail_token = val[1].tail_token
@@ -681,7 +615,6 @@ declaration_specifiers
     | type_qualifier
       {
         checkpoint(val[0].location)
-
         result = DeclarationSpecifiers.new
         result.type_qualifiers.push(val[0])
         result.head_token = result.tail_token = val[0]
@@ -689,7 +622,6 @@ declaration_specifiers
     | declaration_specifiers type_qualifier
       {
         checkpoint(val[0].location)
-
         result = val[0]
         result.type_qualifiers.push(val[1])
         result.tail_token = val[1]
@@ -697,7 +629,6 @@ declaration_specifiers
     | function_specifier
       {
         checkpoint(val[0].location)
-
         result = DeclarationSpecifiers.new
         result.function_specifier = val[0]
         result.head_token = result.tail_token = val[0]
@@ -705,7 +636,6 @@ declaration_specifiers
     | declaration_specifiers function_specifier
       {
         checkpoint(val[0].location)
-
         result = val[0]
         result.function_specifier = val[1]
         result.tail_token = val[1]
@@ -716,13 +646,11 @@ init_declarator_list
     : init_declarator
       {
         checkpoint(val[0].location)
-
         result = val
       }
     | init_declarator_list "," init_declarator
       {
         checkpoint(val[0].first.location)
-
         result = val[0].push(val[2])
       }
     ;
@@ -731,7 +659,6 @@ init_declarator
     : declarator
       {
         checkpoint(val[0].location)
-
         result = InitDeclarator.new(val[0], nil)
         result.head_token = val[0].head_token
         result.tail_token = val[0].tail_token
@@ -739,7 +666,6 @@ init_declarator
     | declarator "=" initializer
       {
         checkpoint(val[0].location)
-
         result = InitDeclarator.new(val[0], val[2])
         result.head_token = val[0].head_token
         result.tail_token = val[2].tail_token
@@ -758,91 +684,78 @@ type_specifier
     : VOID
       {
         checkpoint(val[0].location)
-
         result = StandardTypeSpecifier.new(val[0])
         result.head_token = result.tail_token = val[0]
       }
     | CHAR
       {
         checkpoint(val[0].location)
-
         result = StandardTypeSpecifier.new(val[0])
         result.head_token = result.tail_token = val[0]
       }
     | SHORT
       {
         checkpoint(val[0].location)
-
         result = StandardTypeSpecifier.new(val[0])
         result.head_token = result.tail_token = val[0]
       }
     | INT
       {
         checkpoint(val[0].location)
-
         result = StandardTypeSpecifier.new(val[0])
         result.head_token = result.tail_token = val[0]
       }
     | LONG
       {
         checkpoint(val[0].location)
-
         result = StandardTypeSpecifier.new(val[0])
         result.head_token = result.tail_token = val[0]
       }
     | FLOAT
       {
         checkpoint(val[0].location)
-
         result = StandardTypeSpecifier.new(val[0])
         result.head_token = result.tail_token = val[0]
       }
     | DOUBLE
       {
         checkpoint(val[0].location)
-
         result = StandardTypeSpecifier.new(val[0])
         result.head_token = result.tail_token = val[0]
       }
     | SIGNED
       {
         checkpoint(val[0].location)
-
         result = StandardTypeSpecifier.new(val[0])
         result.head_token = result.tail_token = val[0]
       }
     | UNSIGNED
       {
         checkpoint(val[0].location)
-
         result = StandardTypeSpecifier.new(val[0])
         result.head_token = result.tail_token = val[0]
       }
     | BOOL
       {
         checkpoint(val[0].location)
-
         result = StandardTypeSpecifier.new(val[0])
         result.head_token = result.tail_token = val[0]
       }
     | COMPLEX
       {
         checkpoint(val[0].location)
-
         result = StandardTypeSpecifier.new(val[0])
         result.head_token = result.tail_token = val[0]
       }
     | IMAGINARY
       {
         checkpoint(val[0].location)
-
         result = StandardTypeSpecifier.new(val[0])
         result.head_token = result.tail_token = val[0]
       }
     | TYPEDEF_NAME
       {
         checkpoint(val[0].location)
-
         result = TypedefTypeSpecifier.new(val[0])
         result.head_token = result.tail_token = val[0]
       }
@@ -851,7 +764,6 @@ type_specifier
     | TYPEOF "(" constant_expression ")"
       {
         checkpoint(val[0].location)
-
         val[2].full = true
         result = TypeofTypeSpecifier.new(val[2], nil)
         result.head_token = val[0]
@@ -860,7 +772,6 @@ type_specifier
     | TYPEOF "(" type_name ")"
       {
         checkpoint(val[0].location)
-
         result = TypeofTypeSpecifier.new(nil, val[2])
         result.head_token = val[0]
         result.tail_token = val[3]
@@ -871,7 +782,6 @@ struct_or_union_specifier
     : STRUCT IDENTIFIER "{" struct_declaration_list "}"
       {
         checkpoint(val[0].location)
-
         result = StructSpecifier.new(val[1], val[3])
         result.head_token = val[0]
         result.tail_token = val[4]
@@ -879,7 +789,6 @@ struct_or_union_specifier
     | STRUCT IDENTIFIER "{" "}"
       {
         checkpoint(val[0].location)
-
         result = StructSpecifier.new(val[1], [])
         result.head_token = val[0]
         result.tail_token = val[3]
@@ -887,7 +796,6 @@ struct_or_union_specifier
     | UNION IDENTIFIER "{" struct_declaration_list "}"
       {
         checkpoint(val[0].location)
-
         result = UnionSpecifier.new(val[1], val[3])
         result.head_token = val[0]
         result.tail_token = val[4]
@@ -895,7 +803,6 @@ struct_or_union_specifier
     | UNION IDENTIFIER "{" "}"
       {
         checkpoint(val[0].location)
-
         result = UnionSpecifier.new(val[1], [])
         result.head_token = val[0]
         result.tail_token = val[3]
@@ -903,39 +810,34 @@ struct_or_union_specifier
     | STRUCT "{" struct_declaration_list "}"
       {
         checkpoint(val[0].location)
-
-        result = StructSpecifier.new(create_unnamed_tag_name(val[0]), val[2])
+        result = StructSpecifier.new(create_anon_tag_name(val[0]), val[2])
         result.head_token = val[0]
         result.tail_token = val[3]
       }
     | STRUCT "{" "}"
       {
         checkpoint(val[0].location)
-
-        result = StructSpecifier.new(create_unnamed_tag_name(val[0]), [])
+        result = StructSpecifier.new(create_anon_tag_name(val[0]), [])
         result.head_token = val[0]
         result.tail_token = val[2]
       }
     | UNION "{" struct_declaration_list "}"
       {
         checkpoint(val[0].location)
-
-        result = UnionSpecifier.new(create_unnamed_tag_name(val[0]), val[2])
+        result = UnionSpecifier.new(create_anon_tag_name(val[0]), val[2])
         result.head_token = val[0]
         result.tail_token = val[3]
       }
     | UNION "{" "}"
       {
         checkpoint(val[0].location)
-
-        result = UnionSpecifier.new(create_unnamed_tag_name(val[0]), [])
+        result = UnionSpecifier.new(create_anon_tag_name(val[0]), [])
         result.head_token = val[0]
         result.tail_token = val[2]
       }
     | STRUCT IDENTIFIER
       {
         checkpoint(val[0].location)
-
         result = StructSpecifier.new(val[1], nil)
         result.head_token = val[0]
         result.tail_token = val[1]
@@ -943,7 +845,6 @@ struct_or_union_specifier
     | UNION IDENTIFIER
       {
         checkpoint(val[0].location)
-
         result = UnionSpecifier.new(val[1], nil)
         result.head_token = val[0]
         result.tail_token = val[1]
@@ -954,13 +855,11 @@ struct_declaration_list
     : struct_declaration
       {
         checkpoint(val[0].location)
-
         result = val
       }
     | struct_declaration_list struct_declaration
       {
         checkpoint(val[0].first.location)
-
         result = val[0].push(val[1])
       }
     ;
@@ -969,9 +868,7 @@ struct_declaration
     : specifier_qualifier_list ";"
       {
         checkpoint(val[0].location)
-
         @lexer.start_identifier_translation
-
         result = StructDeclaration.new(val[0], [])
         result.head_token = val[0].head_token
         result.tail_token = val[1]
@@ -980,7 +877,6 @@ struct_declaration
       struct_declarator_list ";"
       {
         checkpoint(val[0].location)
-
         result = StructDeclaration.new(val[0], val[2])
         result.head_token = val[0].head_token
         result.tail_token = val[3]
@@ -991,9 +887,7 @@ specifier_qualifier_list
     : specifier_qualifier_list type_specifier
       {
         checkpoint(val[0].location)
-
         @lexer.stop_identifier_translation
-
         result = val[0]
         result.type_specifiers.push(val[1])
         result.tail_token = val[1].tail_token
@@ -1001,9 +895,7 @@ specifier_qualifier_list
     | type_specifier
       {
         checkpoint(val[0].location)
-
         @lexer.stop_identifier_translation
-
         result = SpecifierQualifierList.new
         result.type_specifiers.push(val[0])
         result.head_token = val[0].head_token
@@ -1012,7 +904,6 @@ specifier_qualifier_list
     | specifier_qualifier_list type_qualifier
       {
         checkpoint(val[0].location)
-
         result = val[0]
         result.type_qualifiers.push(val[1])
         result.tail_token = val[1]
@@ -1020,7 +911,6 @@ specifier_qualifier_list
     | type_qualifier
       {
         checkpoint(val[0].location)
-
         result = SpecifierQualifierList.new
         result.type_qualifiers.push(val[0])
         result.head_token = result.tail_token = val[0]
@@ -1031,13 +921,11 @@ struct_declarator_list
     : struct_declarator
       {
         checkpoint(val[0].location)
-
         result = val
       }
     | struct_declarator_list "," struct_declarator
       {
         checkpoint(val[0].first.location)
-
         result = val[0].push(val[2])
       }
     ;
@@ -1046,7 +934,6 @@ struct_declarator
     : declarator
       {
         checkpoint(val[0].location)
-
         result = StructDeclarator.new(val[0], nil)
         result.head_token = val[0].head_token
         result.tail_token = val[0].tail_token
@@ -1054,7 +941,6 @@ struct_declarator
     | ":" constant_expression
       {
         checkpoint(val[0].location)
-
         val[1].full = true
         result = StructDeclarator.new(nil, val[1])
         result.head_token = val[0]
@@ -1063,7 +949,6 @@ struct_declarator
     | declarator ":" constant_expression
       {
         checkpoint(val[0].location)
-
         val[2].full = true
         result = StructDeclarator.new(val[0], val[2])
         result.head_token = val[0].head_token
@@ -1075,15 +960,13 @@ enum_specifier
     : ENUM "{" enumerator_list "}"
       {
         checkpoint(val[0].location)
-
-        result = EnumSpecifier.new(create_unnamed_tag_name(val[0]), val[2])
+        result = EnumSpecifier.new(create_anon_tag_name(val[0]), val[2])
         result.head_token = val[0]
         result.tail_token = val[3]
       }
     | ENUM IDENTIFIER "{" enumerator_list "}"
       {
         checkpoint(val[0].location)
-
         result = EnumSpecifier.new(val[1], val[3])
         result.head_token = val[0]
         result.tail_token = val[4]
@@ -1091,16 +974,14 @@ enum_specifier
     | ENUM "{" enumerator_list "," "}"
       {
         checkpoint(val[0].location)
-
-        result = EnumSpecifier.new(create_unnamed_tag_name(val[0]), val[2],
-                                   val[3])
+        result = EnumSpecifier.new(create_anon_tag_name(val[0]),
+                                   val[2], val[3])
         result.head_token = val[0]
         result.tail_token = val[4]
       }
     | ENUM IDENTIFIER "{" enumerator_list "," "}"
       {
         checkpoint(val[0].location)
-
         result = EnumSpecifier.new(val[1], val[3], val[4])
         result.head_token = val[0]
         result.tail_token = val[5]
@@ -1108,7 +989,6 @@ enum_specifier
     | ENUM IDENTIFIER
       {
         checkpoint(val[0].location)
-
         result = EnumSpecifier.new(val[1], nil)
         result.head_token = val[0]
         result.tail_token = val[1]
@@ -1119,13 +999,11 @@ enumerator_list
     : enumerator
       {
         checkpoint(val[0].location)
-
         result = val
       }
     | enumerator_list "," enumerator
       {
         checkpoint(val[0].first.location)
-
         result = val[0].push(val[2])
       }
     ;
@@ -1134,18 +1012,16 @@ enumerator
     : IDENTIFIER
       {
         checkpoint(val[0].location)
-
-        symbol = @symbol_table.create_new_symbol(EnumeratorName, val[0])
-        result = Enumerator.new(val[0], nil, symbol)
+        sym = @sym_tbl.create_new_symbol(EnumeratorName, val[0])
+        result = Enumerator.new(val[0], nil, sym)
         result.head_token = result.tail_token = val[0]
       }
     | IDENTIFIER "=" constant_expression
       {
         checkpoint(val[0].location)
-
         val[2].full = true
-        symbol = @symbol_table.create_new_symbol(EnumeratorName, val[0])
-        result = Enumerator.new(val[0], val[2], symbol)
+        sym = @sym_tbl.create_new_symbol(EnumeratorName, val[0])
+        result = Enumerator.new(val[0], val[2], sym)
         result.head_token = val[0]
         result.tail_token = val[2].tail_token
       }
@@ -1165,7 +1041,6 @@ declarator
     : pointer direct_declarator
       {
         checkpoint(val[0].first.location)
-
         result = val[1]
         result.pointer = val[0]
         result.head_token = val[0].first
@@ -1174,7 +1049,6 @@ declarator
     | direct_declarator
       {
         checkpoint(val[0].location)
-
         result = val[0]
         result.full = true
       }
@@ -1184,16 +1058,13 @@ direct_declarator
     : IDENTIFIER
       {
         checkpoint(val[0].location)
-
         @lexer.start_identifier_translation
-
         result = IdentifierDeclarator.new(val[0])
         result.head_token = result.tail_token = val[0]
       }
     | "(" declarator ")"
       {
         checkpoint(val[0].location)
-
         result = GroupedDeclarator.new(val[1])
         result.head_token = val[0]
         result.tail_token = val[2]
@@ -1201,7 +1072,6 @@ direct_declarator
     | direct_declarator "[" type_qualifier_list assignment_expression "]"
       {
         checkpoint(val[0].location)
-
         val[3].full = true
         result = ArrayDeclarator.new(val[0], val[3])
         result.head_token = val[0].head_token
@@ -1210,7 +1080,6 @@ direct_declarator
     | direct_declarator "[" type_qualifier_list "]"
       {
         checkpoint(val[0].location)
-
         result = ArrayDeclarator.new(val[0], nil)
         result.head_token = val[0].head_token
         result.tail_token = val[3]
@@ -1218,7 +1087,6 @@ direct_declarator
     | direct_declarator "[" assignment_expression "]"
       {
         checkpoint(val[0].location)
-
         val[2].full = true
         result = ArrayDeclarator.new(val[0], val[2])
         result.head_token = val[0].head_token
@@ -1228,7 +1096,6 @@ direct_declarator
       "[" STATIC type_qualifier_list assignment_expression "]"
       {
         checkpoint(val[0].location)
-
         val[4].full = true
         result = ArrayDeclarator.new(val[0], val[4])
         result.head_token = val[0].head_token
@@ -1238,7 +1105,6 @@ direct_declarator
       "[" type_qualifier_list STATIC assignment_expression "]"
       {
         checkpoint(val[0].location)
-
         val[4].full = true
         result = ArrayDeclarator.new(val[0], val[4])
         result.head_token = val[0].head_token
@@ -1247,7 +1113,6 @@ direct_declarator
     | direct_declarator "[" type_qualifier_list "*" "]"
       {
         checkpoint(val[0].location)
-
         result = ArrayDeclarator.new(val[0], nil)
         result.head_token = val[0].head_token
         result.tail_token = val[4]
@@ -1255,7 +1120,6 @@ direct_declarator
     | direct_declarator "[" "*" "]"
       {
         checkpoint(val[0].location)
-
         result = ArrayDeclarator.new(val[0], nil)
         result.head_token = val[0].head_token
         result.tail_token = val[3]
@@ -1263,7 +1127,6 @@ direct_declarator
     | direct_declarator "[" "]"
       {
         checkpoint(val[0].location)
-
         result = ArrayDeclarator.new(val[0], nil)
         result.head_token = val[0].head_token
         result.tail_token = val[2]
@@ -1271,7 +1134,6 @@ direct_declarator
     | direct_declarator "(" parameter_type_list ")"
       {
         checkpoint(val[0].location)
-
         result = AnsiFunctionDeclarator.new(val[0], val[2])
         result.head_token = val[0].head_token
         result.tail_token = val[3]
@@ -1279,7 +1141,6 @@ direct_declarator
     | direct_declarator "(" identifier_list ")"
       {
         checkpoint(val[0].location)
-
         result = KandRFunctionDeclarator.new(val[0], val[2])
         result.head_token = val[0].head_token
         result.tail_token = val[3]
@@ -1287,7 +1148,6 @@ direct_declarator
     | direct_declarator "(" ")"
       {
         checkpoint(val[0].location)
-
         result = AbbreviatedFunctionDeclarator.new(val[0])
         result.head_token = val[0].head_token
         result.tail_token = val[2]
@@ -1298,25 +1158,21 @@ pointer
     : "*"
       {
         checkpoint(val[0].location)
-
         result = val
       }
     | "*" type_qualifier_list
       {
         checkpoint(val[0].location)
-
         result = val[1].unshift(val[0])
       }
     | "*" pointer
       {
         checkpoint(val[0].location)
-
         result = val[1].unshift(val[0])
       }
     | "*" type_qualifier_list pointer
       {
         checkpoint(val[0].location)
-
         result = val[1].unshift(val[0]).concat(val[2])
       }
     ;
@@ -1325,13 +1181,11 @@ type_qualifier_list
     : type_qualifier
       {
         checkpoint(val[0].location)
-
         result = val
       }
     | type_qualifier_list type_qualifier
       {
         checkpoint(val[0].first.location)
-
         result = val[0].push(val[1])
       }
     ;
@@ -1340,7 +1194,6 @@ parameter_type_list
     : parameter_list
       {
         checkpoint(val[0].first.location)
-
         result = ParameterTypeList.new(val[0], false)
         result.head_token = val[0].first.head_token
         result.tail_token = val[0].last.tail_token
@@ -1348,7 +1201,6 @@ parameter_type_list
     | parameter_list "," "..."
       {
         checkpoint(val[0].first.location)
-
         result = ParameterTypeList.new(val[0], true)
         result.head_token = val[0].first.head_token
         result.tail_token = val[2]
@@ -1359,13 +1211,11 @@ parameter_list
     : parameter_declaration
       {
         checkpoint(val[0].location)
-
         result = val
       }
     | parameter_list "," parameter_declaration
       {
         checkpoint(val[0].first.location)
-
         result = val[0].push(val[2])
       }
     ;
@@ -1374,7 +1224,6 @@ parameter_declaration
     : declaration_specifiers declarator
       {
         checkpoint(val[0].location)
-
         result = ParameterDeclaration.new(val[0], val[1])
         result.head_token = val[0].head_token
         result.tail_token = val[1].tail_token
@@ -1382,7 +1231,6 @@ parameter_declaration
     | declaration_specifiers abstract_declarator
       {
         checkpoint(val[0].location)
-
         result = ParameterDeclaration.new(val[0], val[1])
         result.head_token = val[0].head_token
         result.tail_token = val[1].tail_token
@@ -1390,9 +1238,7 @@ parameter_declaration
     | declaration_specifiers
       {
         checkpoint(val[0].location)
-
         @lexer.start_identifier_translation
-
         result = ParameterDeclaration.new(val[0], nil)
         result.head_token = val[0].head_token
         result.tail_token = val[0].tail_token
@@ -1403,13 +1249,11 @@ identifier_list
     : IDENTIFIER
       {
         checkpoint(val[0].location)
-
         result = val
       }
     | identifier_list "," IDENTIFIER
       {
         checkpoint(val[0].first.location)
-
         result = val[0].push(val[2])
       }
     ;
@@ -1418,18 +1262,15 @@ type_name
     : specifier_qualifier_list
       {
         checkpoint(val[0].location)
-
         @lexer.start_identifier_translation
-
-        result = TypeName.new(val[0], nil, @symbol_table)
+        result = TypeName.new(val[0], nil, @sym_tbl)
         result.head_token = val[0].head_token
         result.tail_token = val[0].tail_token
       }
     | specifier_qualifier_list abstract_declarator
       {
         checkpoint(val[0].location)
-
-        result = TypeName.new(val[0], val[1], @symbol_table)
+        result = TypeName.new(val[0], val[1], @sym_tbl)
         result.head_token = val[0].head_token
         result.tail_token = val[1].tail_token
       }
@@ -1439,9 +1280,7 @@ abstract_declarator
     : pointer
       {
         checkpoint(val[0].first.location)
-
         @lexer.start_identifier_translation
-
         result = PointerAbstractDeclarator.new(nil, val[0])
         result.head_token = val[0].first
         result.tail_token = val[0].last
@@ -1450,7 +1289,6 @@ abstract_declarator
     | pointer direct_abstract_declarator
       {
         checkpoint(val[0].first.location)
-
         result = PointerAbstractDeclarator.new(val[1], val[0])
         result.head_token = val[0].first
         result.tail_token = val[1].tail_token
@@ -1459,7 +1297,6 @@ abstract_declarator
     | direct_abstract_declarator
       {
         checkpoint(val[0].location)
-
         result = val[0]
         result.full = true
       }
@@ -1469,9 +1306,7 @@ direct_abstract_declarator
     : "(" abstract_declarator ")"
       {
         checkpoint(val[0].location)
-
         @lexer.start_identifier_translation
-
         result = GroupedAbstractDeclarator.new(val[1])
         result.head_token = val[0]
         result.tail_token = val[2]
@@ -1479,9 +1314,7 @@ direct_abstract_declarator
     | "[" "]"
       {
         checkpoint(val[0].location)
-
         @lexer.start_identifier_translation
-
         result = ArrayAbstractDeclarator.new(nil, nil)
         result.head_token = val[0]
         result.tail_token = val[1]
@@ -1489,9 +1322,7 @@ direct_abstract_declarator
     | "[" assignment_expression "]"
       {
         checkpoint(val[0].location)
-
         @lexer.start_identifier_translation
-
         val[1].full = true
         result = ArrayAbstractDeclarator.new(nil, val[1])
         result.head_token = val[0]
@@ -1500,7 +1331,6 @@ direct_abstract_declarator
     | direct_abstract_declarator "[" "]"
       {
         checkpoint(val[0].location)
-
         result = ArrayAbstractDeclarator.new(val[0], nil)
         result.head_token = val[0].head_token
         result.tail_token = val[2]
@@ -1508,7 +1338,6 @@ direct_abstract_declarator
     | direct_abstract_declarator "[" assignment_expression "]"
       {
         checkpoint(val[0].location)
-
         val[2].full = true
         result = ArrayAbstractDeclarator.new(val[0], val[2])
         result.head_token = val[0].head_token
@@ -1517,9 +1346,7 @@ direct_abstract_declarator
     | "[" "*" "]"
       {
         checkpoint(val[0].location)
-
         @lexer.start_identifier_translation
-
         result = ArrayAbstractDeclarator.new(nil, nil)
         result.head_token = val[0]
         result.tail_token = val[2]
@@ -1527,7 +1354,6 @@ direct_abstract_declarator
     | direct_abstract_declarator "[" "*" "]"
       {
         checkpoint(val[0].location)
-
         result = ArrayAbstractDeclarator.new(val[0], nil)
         result.head_token = val[0].head_token
         result.tail_token = val[3]
@@ -1535,9 +1361,7 @@ direct_abstract_declarator
     | "(" ")"
       {
         checkpoint(val[0].location)
-
         @lexer.start_identifier_translation
-
         result = FunctionAbstractDeclarator.new(nil, nil)
         result.head_token = val[0]
         result.tail_token = val[1]
@@ -1545,7 +1369,6 @@ direct_abstract_declarator
     | "(" { @lexer.start_identifier_translation } parameter_type_list ")"
       {
         checkpoint(val[0].location)
-
         result = FunctionAbstractDeclarator.new(nil, val[2])
         result.head_token = val[0]
         result.tail_token = val[3]
@@ -1553,9 +1376,7 @@ direct_abstract_declarator
     | direct_abstract_declarator "(" ")"
       {
         checkpoint(val[0].location)
-
         @lexer.start_identifier_translation
-
         result = FunctionAbstractDeclarator.new(val[0], nil)
         result.head_token = val[0].head_token
         result.tail_token = val[2]
@@ -1563,7 +1384,6 @@ direct_abstract_declarator
     | direct_abstract_declarator "(" parameter_type_list ")"
       {
         checkpoint(val[0].location)
-
         result = FunctionAbstractDeclarator.new(val[0], val[2])
         result.head_token = val[0].head_token
         result.tail_token = val[3]
@@ -1574,7 +1394,6 @@ initializer
     : assignment_expression
       {
         checkpoint(val[0].location)
-
         val[0].full = true
         result = Initializer.new(val[0], nil)
         result.head_token = val[0].head_token
@@ -1583,7 +1402,6 @@ initializer
     | "{" "}"
       {
         checkpoint(val[0].location)
-
         result = Initializer.new(nil, nil)
         result.head_token = val[0]
         result.tail_token = val[1]
@@ -1591,7 +1409,6 @@ initializer
     | "{" initializer_list "}"
       {
         checkpoint(val[0].location)
-
         result = Initializer.new(nil, val[1])
         result.head_token = val[0]
         result.tail_token = val[2]
@@ -1599,7 +1416,6 @@ initializer
     | "{" initializer_list "," "}"
       {
         checkpoint(val[0].location)
-
         result = Initializer.new(nil, val[1])
         result.head_token = val[0]
         result.tail_token = val[3]
@@ -1610,25 +1426,21 @@ initializer_list
     : initializer
       {
         checkpoint(val[0].location)
-
         result = val
       }
     | designation initializer
       {
         checkpoint(val[1].location)
-
         result = [val[1]]
       }
     | initializer_list "," initializer
       {
         checkpoint(val[0].first.location)
-
         result = val[0].push(val[2])
       }
     | initializer_list "," designation initializer
       {
         checkpoint(val[0].first.location)
-
         result = val[0].push(val[3])
       }
     ;
@@ -1663,7 +1475,6 @@ labeled_statement
     : IDENTIFIER ":" statement
       {
         checkpoint(val[0].location)
-
         result = GenericLabeledStatement.new(val[0], val[2])
         result.head_token = val[0]
         result.tail_token = val[2].tail_token
@@ -1671,7 +1482,6 @@ labeled_statement
     | CASE constant_expression ":" statement
       {
         checkpoint(val[0].location)
-
         val[1].full = true
         result = CaseLabeledStatement.new(val[1], val[3])
         result.head_token = val[0]
@@ -1680,7 +1490,6 @@ labeled_statement
     | DEFAULT ":" statement
       {
         checkpoint(val[0].location)
-
         result = DefaultLabeledStatement.new(val[2])
         result.head_token = val[0]
         result.tail_token = val[2].tail_token
@@ -1691,7 +1500,6 @@ compound_statement
     : "{" "}"
       {
         checkpoint(val[0].location)
-
         result = CompoundStatement.new([])
         result.head_token = val[0]
         result.tail_token = val[1]
@@ -1699,7 +1507,6 @@ compound_statement
     | "{" { @lexer.enter_scope } block_item_list { @lexer.leave_scope } "}"
       {
         checkpoint(val[0].location)
-
         result = CompoundStatement.new(val[2])
         result.head_token = val[0]
         result.tail_token = val[4]
@@ -1710,13 +1517,11 @@ block_item_list
     : block_item
       {
         checkpoint(val[0].location)
-
         result = val
       }
     | block_item_list block_item
       {
         checkpoint(val[0].first.location)
-
         result = val[0].push(val[1])
       }
     ;
@@ -1731,14 +1536,12 @@ expression_statement
     : ";"
       {
         checkpoint(val[0].location)
-
         result = ExpressionStatement.new(nil)
         result.head_token = result.tail_token = val[0]
       }
     | expression ";"
       {
         checkpoint(val[0].location)
-
         val[0].full = true
         result = ExpressionStatement.new(val[0])
         result.head_token = val[0].head_token
@@ -1750,7 +1553,6 @@ selection_statement
     : IF "(" expression ")" statement
       {
         checkpoint(val[0].location)
-
         val[2].full = true
         result = IfStatement.new(val[2], val[4], val[3])
         result.head_token = val[0]
@@ -1759,7 +1561,6 @@ selection_statement
     | IF "(" expression ")" statement ELSE statement
       {
         checkpoint(val[0].location)
-
         val[2].full = true
         result = IfElseStatement.new(val[2], val[4], val[6], val[3], val[5])
         result.head_token = val[0]
@@ -1768,7 +1569,6 @@ selection_statement
     | SWITCH "(" expression ")" statement
       {
         checkpoint(val[0].location)
-
         val[2].full = true
         result = SwitchStatement.new(val[2], val[4])
         result.head_token = val[0]
@@ -1780,7 +1580,6 @@ iteration_statement
     : WHILE "(" expression ")" statement
       {
         checkpoint(val[0].location)
-
         val[2].full = true
         result = WhileStatement.new(val[2], val[4], val[3])
         result.head_token = val[0]
@@ -1789,7 +1588,6 @@ iteration_statement
     | DO statement WHILE "(" expression ")" ";"
       {
         checkpoint(val[0].location)
-
         val[4].full = true
         result = DoStatement.new(val[1], val[4], val[0], val[2])
         result.head_token = val[0]
@@ -1798,7 +1596,6 @@ iteration_statement
     | FOR "(" expression_statement expression_statement ")" statement
       {
         checkpoint(val[0].location)
-
         result = ForStatement.new(val[2], val[3], nil, val[5], val[4])
         result.head_token = val[0]
         result.tail_token = val[5].tail_token
@@ -1807,7 +1604,6 @@ iteration_statement
       statement
       {
         checkpoint(val[0].location)
-
         val[4].full = true
         result = ForStatement.new(val[2], val[3], val[4], val[6], val[5])
         result.head_token = val[0]
@@ -1816,7 +1612,6 @@ iteration_statement
     | FOR "(" declaration expression_statement ")" statement
       {
         checkpoint(val[0].location)
-
         result = C99ForStatement.new(val[2], val[3], nil, val[5], val[4])
         result.head_token = val[0]
         result.tail_token = val[5].tail_token
@@ -1824,7 +1619,6 @@ iteration_statement
     | FOR "(" declaration expression_statement expression ")" statement
       {
         checkpoint(val[0].location)
-
         val[4].full = true
         result = C99ForStatement.new(val[2], val[3], val[4], val[6], val[5])
         result.head_token = val[0]
@@ -1836,7 +1630,6 @@ jump_statement
     : GOTO IDENTIFIER ";"
       {
         checkpoint(val[0].location)
-
         result = GotoStatement.new(val[1])
         result.head_token = val[0]
         result.tail_token = val[2]
@@ -1844,7 +1637,6 @@ jump_statement
     | GOTO "*" expression ";"
       {
         checkpoint(val[0].location)
-
         E(:E0015, val[1].location, val[1].value)
         result = ErrorStatement.new(val[1])
         result.head_token = val[0]
@@ -1853,7 +1645,6 @@ jump_statement
     | CONTINUE ";"
       {
         checkpoint(val[0].location)
-
         result = ContinueStatement.new
         result.head_token = val[0]
         result.tail_token = val[1]
@@ -1861,7 +1652,6 @@ jump_statement
     | BREAK ";"
       {
         checkpoint(val[0].location)
-
         result = BreakStatement.new
         result.head_token = val[0]
         result.tail_token = val[1]
@@ -1869,7 +1659,6 @@ jump_statement
     | RETURN ";"
       {
         checkpoint(val[0].location)
-
         result = ReturnStatement.new(nil)
         result.head_token = val[0]
         result.tail_token = val[1]
@@ -1877,7 +1666,6 @@ jump_statement
     | RETURN expression ";"
       {
         checkpoint(val[0].location)
-
         val[1].full = true
         result = ReturnStatement.new(val[1])
         result.head_token = val[0]
@@ -1896,13 +1684,8 @@ translation_unit
     | translation_unit external_declaration
       {
         checkpoint(val[0].location)
-
         result = val[0]
-        if result.external_declarations.empty?
-          result.head_token = val[1].head_token
-        end
         result.push(val[1])
-        result.tail_token = val[1].tail_token
       }
     ;
 
@@ -1915,56 +1698,46 @@ function_definition
     : declaration_specifiers declarator declaration_list compound_statement
       {
         checkpoint(val[0].location)
-
         result = KandRFunctionDefinition.new(val[0], val[1], val[2], val[3],
-                                             @symbol_table)
+                                             @sym_tbl)
         result.head_token = val[0].head_token
         result.tail_token = val[3].tail_token
       }
     | declaration_specifiers declarator compound_statement
       {
         checkpoint(val[0].location)
-
         case val[1]
         when AnsiFunctionDeclarator
-          result = AnsiFunctionDefinition.new(val[0], val[1], val[2],
-                                              @symbol_table)
+          result = AnsiFunctionDefinition.new(val[0], val[1], val[2], @sym_tbl)
         when KandRFunctionDeclarator
           result = KandRFunctionDefinition.new(val[0], val[1], [], val[2],
-                                               @symbol_table)
+                                               @sym_tbl)
         when AbbreviatedFunctionDeclarator
-          result = AnsiFunctionDefinition.new(val[0], val[1], val[2],
-                                              @symbol_table)
+          result = AnsiFunctionDefinition.new(val[0], val[1], val[2], @sym_tbl)
         end
-
         result.head_token = val[0].head_token
         result.tail_token = val[2].tail_token
       }
     | declarator declaration_list compound_statement
       {
         checkpoint(val[0].location)
-
         result = KandRFunctionDefinition.new(nil, val[0], val[1], val[2],
-                                             @symbol_table)
+                                             @sym_tbl)
         result.head_token = val[0].head_token
         result.tail_token = val[2].tail_token
       }
     | declarator compound_statement
       {
         checkpoint(val[0].location)
-
         case val[0]
         when AnsiFunctionDeclarator
-          result = AnsiFunctionDefinition.new(nil, val[0], val[1],
-                                              @symbol_table)
+          result = AnsiFunctionDefinition.new(nil, val[0], val[1], @sym_tbl)
         when KandRFunctionDeclarator
           result = KandRFunctionDefinition.new(nil, val[0], [], val[1],
-                                               @symbol_table)
+                                               @sym_tbl)
         when AbbreviatedFunctionDeclarator
-          result = AnsiFunctionDefinition.new(nil, val[0], val[1],
-                                              @symbol_table)
+          result = AnsiFunctionDefinition.new(nil, val[0], val[1], @sym_tbl)
         end
-
         result.head_token = val[0].head_token
         result.tail_token = val[1].tail_token
       }
@@ -1974,28 +1747,23 @@ local_function_definition
     : declaration_specifiers declarator declaration_list compound_statement
       {
         checkpoint(val[0].location)
-
         result = KandRFunctionDefinition.new(val[0], val[1], val[2], val[3],
-                                             @symbol_table)
+                                             @sym_tbl)
         result.head_token = val[0].head_token
         result.tail_token = val[3].tail_token
       }
     | declaration_specifiers declarator compound_statement
       {
         checkpoint(val[0].location)
-
         case val[1]
         when AnsiFunctionDeclarator
-          result = AnsiFunctionDefinition.new(val[0], val[1], val[2],
-                                              @symbol_table)
+          result = AnsiFunctionDefinition.new(val[0], val[1], val[2], @sym_tbl)
         when KandRFunctionDeclarator
           result = KandRFunctionDefinition.new(val[0], val[1], [], val[2],
-                                               @symbol_table)
+                                               @sym_tbl)
         when AbbreviatedFunctionDeclarator
-          result = AnsiFunctionDefinition.new(val[0], val[1], val[2],
-                                              @symbol_table)
+          result = AnsiFunctionDefinition.new(val[0], val[1], val[2], @sym_tbl)
         end
-
         result.head_token = val[0].head_token
         result.tail_token = val[2].tail_token
       }
@@ -2005,13 +1773,11 @@ declaration_list
     : declaration
       {
         checkpoint(val[0].location)
-
         result = val
       }
     | declaration_list declaration
       {
         checkpoint(val[0].first.location)
-
         result = val[0].push(val[1])
       }
     ;
@@ -2024,20 +1790,20 @@ require "adlint/error"
 require "adlint/symbol"
 require "adlint/monitor"
 require "adlint/util"
-require "adlint/c/lexer"
-require "adlint/c/syntax"
+require "adlint/cc1/lexer"
+require "adlint/cc1/syntax"
 
 ---- inner
 
-include MonitorUtil
 include ReportUtil
+include MonitorUtil
 
-def initialize(context)
-  @context = context
-  @lexer = create_lexer(context[:c_source])
-  @symbol_table = context[:symbol_table]
+def initialize(phase_ctxt)
+  @phase_ctxt  = phase_ctxt
+  @lexer       = create_lexer(phase_ctxt[:cc1_source])
+  @sym_tbl     = phase_ctxt[:symbol_table]
   @token_array = []
-  @unnamed_tag_no = 0
+  @anon_tag_no = 0
 end
 
 attr_reader :token_array
@@ -2051,8 +1817,8 @@ extend Pluggable
 def_plugin :on_string_literals_concatenated
 
 private
-def create_lexer(c_source)
-  Lexer.new(c_source).tap { |lexer| attach_lexer_plugin(lexer) }
+def create_lexer(pp_src)
+  Lexer.new(pp_src).tap { |lexer| attach_lexer_plugin(lexer) }
 end
 
 def attach_lexer_plugin(lexer)
@@ -2062,46 +1828,48 @@ def attach_lexer_plugin(lexer)
 end
 
 def next_token
-  if token = @lexer.next_token
-    @token_array.push(token)
-    [token.type, token]
+  if tok = @lexer.next_token
+    @token_array.push(tok)
+    [tok.type, tok]
   else
     nil
   end
 end
 
-def on_error(error_token_id, error_value, value_stack)
-  if first_token = @token_array[-2] and second_token = @token_array[-1]
-    E(:E0008, location_of(first_token),
-      "#{value_of(first_token)} #{value_of(second_token)}")
-    raise ParseError.new(location_of(first_token),
-                         @context.msg_fpath, @context.log_fpath)
+def on_error(err_tok, err_val, *)
+  if fst_tok = @token_array[-2] and snd_tok = @token_array[-1]
+    E(:E0008, loc_of(fst_tok), "#{val_of(fst_tok)} #{val_of(snd_tok)}")
+    raise ParseError.new(loc_of(fst_tok),
+                         @phase_ctxt.msg_fpath, @phase_ctxt.log_fpath)
   else
-    E(:E0008, location_of(error_value), value_of(error_value))
-    raise ParseError.new(location_of(error_value),
-                         @context.msg_fpath, @context.log_fpath)
+    E(:E0008, loc_of(err_val), val_of(err_val))
+    raise ParseError.new(loc_of(err_val),
+                         @phase_ctxt.msg_fpath, @phase_ctxt.log_fpath)
   end
 end
 
-def location_of(value)
-  if value == "$"
-    Location.new
-  else
-    value.location
-  end
+def loc_of(val)
+  val == "$" ? Location.new : val.location
 end
 
-def value_of(token)
-  token == "$" ? "EOF" : token.value
+def val_of(tok)
+  tok == "$" ? "EOF" : tok.value
 end
 
-def create_unnamed_tag_name(base_token)
-  Token.new(:IDENTIFIER, "__adlint__unnamed_#{@unnamed_tag_no += 1}",
-            base_token.location)
+def create_anon_tag_name(base_tok)
+  Token.new(:IDENTIFIER, "__adlint__anon_#{@anon_tag_no += 1}",
+            base_tok.location)
 end
 
-def report
-  @context.report
-end
+extend Forwardable
+
+def_delegator :@phase_ctxt, :report
+private :report
+
+def_delegator :@phase_ctxt, :message_catalog
+private :message_catalog
+
+def_delegator :@phase_ctxt, :monitor
+private :monitor
 
 # vim:ft=racc:sw=2:ts=2:sts=2:et: