adlint 2.6.14 → 3.0.0

data/lib/adlint/{c → cc1}/operator.rb

@@ -1,7 +1,7 @@
 # Comparison operator of controlling expressions.
 #
 # 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.
 #
@@ -30,15 +30,15 @@
 #++
 
 module AdLint #:nodoc:
-module C #:nodoc:
+module Cc1 #:nodoc:
 
   class Operator
-    def initialize(token_or_symbol)
-      case token_or_symbol
+    def initialize(tok_or_sym)
+      case tok_or_sym
       when Token
-        @sym = token_or_symbol.type.to_sym
+        @sym = tok_or_sym.type.to_sym
       when ::Symbol
-        @sym = token_or_symbol
+        @sym = tok_or_sym
       end
     end
 

data/lib/adlint/{c → cc1}/option.rb

@@ -1,7 +1,7 @@
 # Miscellaneous option constants.
 #
 # 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.
 #
@@ -30,7 +30,7 @@
 #++
 
 module AdLint #:nodoc:
-module C #:nodoc:
+module Cc1 #:nodoc:
 
   module InterpreterOptions
     QUIET = :quiet
@@ -44,6 +44,7 @@ module C #:nodoc:
     FINAL = :final
     SMOTHER_BREAK = :smother_break
     IMPLICIT_COND = :implicit_cond
+    COMPLEMENTAL = :complemental
   end
 
   module BranchGroupOptions

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

@@ -11,24 +11,24 @@ 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"
 
 module AdLint
-  module C
+  module Cc1
     class Parser < Racc::Parser
 
-module_eval(<<'...end parser.y/module_eval...', 'parser.y', 2031)
+module_eval(<<'...end parser.y/module_eval...', 'parser.y', 1797)
 
-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
@@ -42,8 +42,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)
@@ -53,47 +53,49 @@ 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:
 ...end parser.y/module_eval...
@@ -1247,7 +1249,6 @@ Racc_debug_parser = false
 module_eval(<<'.,.,', 'parser.y', 90)
   def _reduce_1(val, _values, result)
             checkpoint(val[0].location)
-
         result = ObjectSpecifier.new(val[0])
         result.head_token = result.tail_token = val[0]
       
@@ -1255,10 +1256,9 @@ module_eval(<<'.,.,', 'parser.y', 90)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 97)
+module_eval(<<'.,.,', 'parser.y', 96)
   def _reduce_2(val, _values, result)
             checkpoint(val[0].location)
-
         result = ConstantSpecifier.new(val[0])
         result.head_token = result.tail_token = val[0]
       
@@ -1266,10 +1266,9 @@ module_eval(<<'.,.,', 'parser.y', 97)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 104)
+module_eval(<<'.,.,', 'parser.y', 102)
   def _reduce_3(val, _values, result)
             checkpoint(val[0].location)
-
         result = StringLiteralSpecifier.new(val[0])
         result.head_token = result.tail_token = val[0]
       
@@ -1277,10 +1276,9 @@ module_eval(<<'.,.,', 'parser.y', 104)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 111)
+module_eval(<<'.,.,', 'parser.y', 108)
   def _reduce_4(val, _values, result)
             checkpoint(val[0].location)
-
         result = NullConstantSpecifier.new(val[0])
         result.head_token = result.tail_token = val[0]
       
@@ -1288,10 +1286,9 @@ module_eval(<<'.,.,', 'parser.y', 111)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 118)
+module_eval(<<'.,.,', 'parser.y', 114)
   def _reduce_5(val, _values, result)
             checkpoint(val[0].location)
-
         result = GroupedExpression.new(val[1])
         result.head_token = val[0]
         result.tail_token = val[2]
@@ -1300,10 +1297,9 @@ module_eval(<<'.,.,', 'parser.y', 118)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 126)
+module_eval(<<'.,.,', 'parser.y', 121)
   def _reduce_6(val, _values, result)
             checkpoint(val[0].location)
-
         E(:E0013, val[0].location)
         result = ErrorExpression.new(val[0])
         result.head_token = val[0]
@@ -1315,10 +1311,9 @@ module_eval(<<'.,.,', 'parser.y', 126)
 
 # reduce 7 omitted
 
-module_eval(<<'.,.,', 'parser.y', 139)
+module_eval(<<'.,.,', 'parser.y', 133)
   def _reduce_8(val, _values, result)
             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]
@@ -1327,10 +1322,9 @@ module_eval(<<'.,.,', 'parser.y', 139)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 147)
+module_eval(<<'.,.,', 'parser.y', 140)
   def _reduce_9(val, _values, result)
             checkpoint(val[0].location)
-
         result = FunctionCallExpression.new(val[0], [], val[1])
         result.head_token = val[0].head_token
         result.tail_token = val[2]
@@ -1339,10 +1333,9 @@ module_eval(<<'.,.,', 'parser.y', 147)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 155)
+module_eval(<<'.,.,', 'parser.y', 147)
   def _reduce_10(val, _values, result)
             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]
@@ -1351,10 +1344,9 @@ module_eval(<<'.,.,', 'parser.y', 155)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 163)
+module_eval(<<'.,.,', 'parser.y', 154)
   def _reduce_11(val, _values, result)
             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]
@@ -1363,10 +1355,9 @@ module_eval(<<'.,.,', 'parser.y', 163)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 171)
+module_eval(<<'.,.,', 'parser.y', 161)
   def _reduce_12(val, _values, result)
             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]
@@ -1375,10 +1366,9 @@ module_eval(<<'.,.,', 'parser.y', 171)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 179)
+module_eval(<<'.,.,', 'parser.y', 168)
   def _reduce_13(val, _values, result)
             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]
@@ -1387,10 +1377,9 @@ module_eval(<<'.,.,', 'parser.y', 179)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 187)
+module_eval(<<'.,.,', 'parser.y', 175)
   def _reduce_14(val, _values, result)
             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]
@@ -1399,10 +1388,9 @@ module_eval(<<'.,.,', 'parser.y', 187)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 195)
+module_eval(<<'.,.,', 'parser.y', 182)
   def _reduce_15(val, _values, result)
             checkpoint(val[0].location)
-
         result = PostfixIncrementExpression.new(val[1], val[0])
         result.head_token = val[0].head_token
         result.tail_token = val[1]
@@ -1411,10 +1399,9 @@ module_eval(<<'.,.,', 'parser.y', 195)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 203)
+module_eval(<<'.,.,', 'parser.y', 189)
   def _reduce_16(val, _values, result)
             checkpoint(val[0].location)
-
         result = PostfixDecrementExpression.new(val[1], val[0])
         result.head_token = val[0].head_token
         result.tail_token = val[1]
@@ -1423,10 +1410,9 @@ module_eval(<<'.,.,', 'parser.y', 203)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 211)
+module_eval(<<'.,.,', 'parser.y', 196)
   def _reduce_17(val, _values, result)
             checkpoint(val[0].location)
-
         result = CompoundLiteralExpression.new(val[1], val[4], val[0])
         result.head_token = val[0]
         result.tail_token = val[5]
@@ -1435,10 +1421,9 @@ module_eval(<<'.,.,', 'parser.y', 211)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 219)
+module_eval(<<'.,.,', 'parser.y', 203)
   def _reduce_18(val, _values, result)
             checkpoint(val[0].location)
-
         result = CompoundLiteralExpression.new(val[1], val[4], val[0])
         result.head_token = val[0]
         result.tail_token = val[6]
@@ -1447,20 +1432,18 @@ module_eval(<<'.,.,', 'parser.y', 219)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 230)
+module_eval(<<'.,.,', 'parser.y', 213)
   def _reduce_19(val, _values, result)
             checkpoint(val[0].location)
-
         result = val
       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 236)
+module_eval(<<'.,.,', 'parser.y', 218)
   def _reduce_20(val, _values, result)
             checkpoint(val[0].first.location)
-
         result = val[0].push(val[2])
       
     result
@@ -1469,10 +1452,9 @@ module_eval(<<'.,.,', 'parser.y', 236)
 
 # reduce 21 omitted
 
-module_eval(<<'.,.,', 'parser.y', 246)
+module_eval(<<'.,.,', 'parser.y', 227)
   def _reduce_22(val, _values, result)
             checkpoint(val[0].location)
-
         result = PrefixIncrementExpression.new(val[0], val[1])
         result.head_token = val[0]
         result.tail_token = val[1].tail_token
@@ -1481,10 +1463,9 @@ module_eval(<<'.,.,', 'parser.y', 246)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 254)
+module_eval(<<'.,.,', 'parser.y', 234)
   def _reduce_23(val, _values, result)
             checkpoint(val[0].location)
-
         result = PrefixDecrementExpression.new(val[0], val[1])
         result.head_token = val[0]
         result.tail_token = val[1].tail_token
@@ -1493,10 +1474,9 @@ module_eval(<<'.,.,', 'parser.y', 254)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 262)
+module_eval(<<'.,.,', 'parser.y', 241)
   def _reduce_24(val, _values, result)
             checkpoint(val[0].location)
-
         result = AddressExpression.new(val[0], val[1])
         result.head_token = val[0]
         result.tail_token = val[1].tail_token
@@ -1505,10 +1485,9 @@ module_eval(<<'.,.,', 'parser.y', 262)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 270)
+module_eval(<<'.,.,', 'parser.y', 248)
   def _reduce_25(val, _values, result)
             checkpoint(val[0].location)
-
         result = IndirectionExpression.new(val[0], val[1])
         result.head_token = val[0]
         result.tail_token = val[1].tail_token
@@ -1517,10 +1496,9 @@ module_eval(<<'.,.,', 'parser.y', 270)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 278)
+module_eval(<<'.,.,', 'parser.y', 255)
   def _reduce_26(val, _values, result)
             checkpoint(val[0].location)
-
         result = UnaryArithmeticExpression.new(val[0], val[1])
         result.head_token = val[0]
         result.tail_token = val[1].tail_token
@@ -1529,10 +1507,9 @@ module_eval(<<'.,.,', 'parser.y', 278)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 286)
+module_eval(<<'.,.,', 'parser.y', 262)
   def _reduce_27(val, _values, result)
             checkpoint(val[0].location)
-
         result = SizeofExpression.new(val[0], val[1])
         result.head_token = val[0]
         result.tail_token = val[1].tail_token
@@ -1541,10 +1518,9 @@ module_eval(<<'.,.,', 'parser.y', 286)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 294)
+module_eval(<<'.,.,', 'parser.y', 269)
   def _reduce_28(val, _values, result)
             checkpoint(val[0].location)
-
         result = SizeofTypeExpression.new(val[0], val[2])
         result.head_token = val[0]
         result.tail_token = val[3]
@@ -1553,10 +1529,9 @@ module_eval(<<'.,.,', 'parser.y', 294)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 302)
+module_eval(<<'.,.,', 'parser.y', 276)
   def _reduce_29(val, _values, result)
             checkpoint(val[0].location)
-
         result = AlignofExpression.new(val[0], val[1])
         result.head_token = val[0]
         result.tail_token = val[1].tail_token
@@ -1565,10 +1540,9 @@ module_eval(<<'.,.,', 'parser.y', 302)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 310)
+module_eval(<<'.,.,', 'parser.y', 283)
   def _reduce_30(val, _values, result)
             checkpoint(val[0].location)
-
         result = AlignofTypeExpression.new(val[0], val[2])
         result.head_token = val[0]
         result.tail_token = val[3]
@@ -1577,10 +1551,9 @@ module_eval(<<'.,.,', 'parser.y', 310)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 318)
+module_eval(<<'.,.,', 'parser.y', 290)
   def _reduce_31(val, _values, result)
             checkpoint(val[0].location)
-
         E(:E0014, val[0].location, val[0].value)
         result = ErrorExpression.new(val[0])
         result.head_token = val[0]
@@ -1600,10 +1573,9 @@ module_eval(<<'.,.,', 'parser.y', 318)
 
 # reduce 36 omitted
 
-module_eval(<<'.,.,', 'parser.y', 338)
+module_eval(<<'.,.,', 'parser.y', 309)
   def _reduce_37(val, _values, result)
             checkpoint(val[0].location)
-
         result = CastExpression.new(val[1], val[3])
         result.head_token = val[0]
         result.tail_token = val[3].tail_token
@@ -1614,10 +1586,9 @@ module_eval(<<'.,.,', 'parser.y', 338)
 
 # reduce 38 omitted
 
-module_eval(<<'.,.,', 'parser.y', 350)
+module_eval(<<'.,.,', 'parser.y', 320)
   def _reduce_39(val, _values, result)
             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
@@ -1626,10 +1597,9 @@ module_eval(<<'.,.,', 'parser.y', 350)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 358)
+module_eval(<<'.,.,', 'parser.y', 327)
   def _reduce_40(val, _values, result)
             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
@@ -1638,10 +1608,9 @@ module_eval(<<'.,.,', 'parser.y', 358)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 366)
+module_eval(<<'.,.,', 'parser.y', 334)
   def _reduce_41(val, _values, result)
             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
@@ -1652,10 +1621,9 @@ module_eval(<<'.,.,', 'parser.y', 366)
 
 # reduce 42 omitted
 
-module_eval(<<'.,.,', 'parser.y', 378)
+module_eval(<<'.,.,', 'parser.y', 345)
   def _reduce_43(val, _values, result)
             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
@@ -1664,10 +1632,9 @@ module_eval(<<'.,.,', 'parser.y', 378)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 386)
+module_eval(<<'.,.,', 'parser.y', 352)
   def _reduce_44(val, _values, result)
             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
@@ -1678,10 +1645,9 @@ module_eval(<<'.,.,', 'parser.y', 386)
 
 # reduce 45 omitted
 
-module_eval(<<'.,.,', 'parser.y', 398)
+module_eval(<<'.,.,', 'parser.y', 363)
   def _reduce_46(val, _values, result)
             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
@@ -1690,10 +1656,9 @@ module_eval(<<'.,.,', 'parser.y', 398)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 406)
+module_eval(<<'.,.,', 'parser.y', 370)
   def _reduce_47(val, _values, result)
             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
@@ -1704,10 +1669,9 @@ module_eval(<<'.,.,', 'parser.y', 406)
 
 # reduce 48 omitted
 
-module_eval(<<'.,.,', 'parser.y', 418)
+module_eval(<<'.,.,', 'parser.y', 381)
   def _reduce_49(val, _values, result)
             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
@@ -1716,10 +1680,9 @@ module_eval(<<'.,.,', 'parser.y', 418)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 426)
+module_eval(<<'.,.,', 'parser.y', 388)
   def _reduce_50(val, _values, result)
             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
@@ -1728,10 +1691,9 @@ module_eval(<<'.,.,', 'parser.y', 426)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 434)
+module_eval(<<'.,.,', 'parser.y', 395)
   def _reduce_51(val, _values, result)
             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
@@ -1740,10 +1702,9 @@ module_eval(<<'.,.,', 'parser.y', 434)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 442)
+module_eval(<<'.,.,', 'parser.y', 402)
   def _reduce_52(val, _values, result)
             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
@@ -1754,10 +1715,9 @@ module_eval(<<'.,.,', 'parser.y', 442)
 
 # reduce 53 omitted
 
-module_eval(<<'.,.,', 'parser.y', 454)
+module_eval(<<'.,.,', 'parser.y', 413)
   def _reduce_54(val, _values, result)
             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
@@ -1766,10 +1726,9 @@ module_eval(<<'.,.,', 'parser.y', 454)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 462)
+module_eval(<<'.,.,', 'parser.y', 420)
   def _reduce_55(val, _values, result)
             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
@@ -1780,10 +1739,9 @@ module_eval(<<'.,.,', 'parser.y', 462)
 
 # reduce 56 omitted
 
-module_eval(<<'.,.,', 'parser.y', 474)
+module_eval(<<'.,.,', 'parser.y', 431)
   def _reduce_57(val, _values, result)
             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
@@ -1794,10 +1752,9 @@ module_eval(<<'.,.,', 'parser.y', 474)
 
 # reduce 58 omitted
 
-module_eval(<<'.,.,', 'parser.y', 486)
+module_eval(<<'.,.,', 'parser.y', 442)
   def _reduce_59(val, _values, result)
             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
@@ -1808,10 +1765,9 @@ module_eval(<<'.,.,', 'parser.y', 486)
 
 # reduce 60 omitted
 
-module_eval(<<'.,.,', 'parser.y', 498)
+module_eval(<<'.,.,', 'parser.y', 453)
   def _reduce_61(val, _values, result)
             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
@@ -1822,10 +1778,9 @@ module_eval(<<'.,.,', 'parser.y', 498)
 
 # reduce 62 omitted
 
-module_eval(<<'.,.,', 'parser.y', 510)
+module_eval(<<'.,.,', 'parser.y', 464)
   def _reduce_63(val, _values, result)
             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
@@ -1836,10 +1791,9 @@ module_eval(<<'.,.,', 'parser.y', 510)
 
 # reduce 64 omitted
 
-module_eval(<<'.,.,', 'parser.y', 522)
+module_eval(<<'.,.,', 'parser.y', 475)
   def _reduce_65(val, _values, result)
             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
@@ -1850,10 +1804,9 @@ module_eval(<<'.,.,', 'parser.y', 522)
 
 # reduce 66 omitted
 
-module_eval(<<'.,.,', 'parser.y', 534)
+module_eval(<<'.,.,', 'parser.y', 486)
   def _reduce_67(val, _values, result)
             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
@@ -1864,10 +1817,9 @@ module_eval(<<'.,.,', 'parser.y', 534)
 
 # reduce 68 omitted
 
-module_eval(<<'.,.,', 'parser.y', 546)
+module_eval(<<'.,.,', 'parser.y', 497)
   def _reduce_69(val, _values, result)
             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
@@ -1876,10 +1828,9 @@ module_eval(<<'.,.,', 'parser.y', 546)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 554)
+module_eval(<<'.,.,', 'parser.y', 504)
   def _reduce_70(val, _values, result)
             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
@@ -1910,18 +1861,14 @@ module_eval(<<'.,.,', 'parser.y', 554)
 
 # reduce 81 omitted
 
-module_eval(<<'.,.,', 'parser.y', 579)
+module_eval(<<'.,.,', 'parser.y', 528)
   def _reduce_82(val, _values, result)
             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
       
     result
@@ -1930,13 +1877,11 @@ module_eval(<<'.,.,', 'parser.y', 579)
 
 # reduce 83 omitted
 
-module_eval(<<'.,.,', 'parser.y', 603)
+module_eval(<<'.,.,', 'parser.y', 548)
   def _reduce_84(val, _values, result)
             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]
       
@@ -1944,14 +1889,12 @@ module_eval(<<'.,.,', 'parser.y', 603)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 613)
+module_eval(<<'.,.,', 'parser.y', 556)
   def _reduce_85(val, _values, result)
             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
@@ -1967,11 +1910,10 @@ module_eval(<<'.,.,', 'parser.y', 613)
 
 # reduce 86 omitted
 
-module_eval(<<'.,.,', 'parser.y', 634)
+module_eval(<<'.,.,', 'parser.y', 575)
   def _reduce_87(val, _values, result)
             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]
       
@@ -1979,10 +1921,9 @@ module_eval(<<'.,.,', 'parser.y', 634)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 645)
+module_eval(<<'.,.,', 'parser.y', 585)
   def _reduce_88(val, _values, result)
             checkpoint(val[0].location)
-
         result = DeclarationSpecifiers.new
         result.storage_class_specifier = val[0]
         result.head_token = result.tail_token = val[0]
@@ -1991,10 +1932,9 @@ module_eval(<<'.,.,', 'parser.y', 645)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 653)
+module_eval(<<'.,.,', 'parser.y', 592)
   def _reduce_89(val, _values, result)
             checkpoint(val[0].location)
-
         result = val[0]
         result.storage_class_specifier = val[1]
         result.tail_token = val[1]
@@ -2003,12 +1943,10 @@ module_eval(<<'.,.,', 'parser.y', 653)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 661)
+module_eval(<<'.,.,', 'parser.y', 599)
   def _reduce_90(val, _values, result)
             checkpoint(val[0].location)
-
         @lexer.stop_identifier_translation
-
         result = DeclarationSpecifiers.new
         result.type_specifiers.push(val[0])
         result.head_token = val[0].head_token
@@ -2018,12 +1956,10 @@ module_eval(<<'.,.,', 'parser.y', 661)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 672)
+module_eval(<<'.,.,', 'parser.y', 608)
   def _reduce_91(val, _values, result)
             checkpoint(val[0].location)
-
         @lexer.stop_identifier_translation
-
         result = val[0]
         result.type_specifiers.push(val[1])
         result.tail_token = val[1].tail_token
@@ -2032,10 +1968,9 @@ module_eval(<<'.,.,', 'parser.y', 672)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 682)
+module_eval(<<'.,.,', 'parser.y', 616)
   def _reduce_92(val, _values, result)
             checkpoint(val[0].location)
-
         result = DeclarationSpecifiers.new
         result.type_qualifiers.push(val[0])
         result.head_token = result.tail_token = val[0]
@@ -2044,10 +1979,9 @@ module_eval(<<'.,.,', 'parser.y', 682)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 690)
+module_eval(<<'.,.,', 'parser.y', 623)
   def _reduce_93(val, _values, result)
             checkpoint(val[0].location)
-
         result = val[0]
         result.type_qualifiers.push(val[1])
         result.tail_token = val[1]
@@ -2056,10 +1990,9 @@ module_eval(<<'.,.,', 'parser.y', 690)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 698)
+module_eval(<<'.,.,', 'parser.y', 630)
   def _reduce_94(val, _values, result)
             checkpoint(val[0].location)
-
         result = DeclarationSpecifiers.new
         result.function_specifier = val[0]
         result.head_token = result.tail_token = val[0]
@@ -2068,10 +2001,9 @@ module_eval(<<'.,.,', 'parser.y', 698)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 706)
+module_eval(<<'.,.,', 'parser.y', 637)
   def _reduce_95(val, _values, result)
             checkpoint(val[0].location)
-
         result = val[0]
         result.function_specifier = val[1]
         result.tail_token = val[1]
@@ -2080,30 +2012,27 @@ module_eval(<<'.,.,', 'parser.y', 706)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 717)
+module_eval(<<'.,.,', 'parser.y', 647)
   def _reduce_96(val, _values, result)
             checkpoint(val[0].location)
-
         result = val
       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 723)
+module_eval(<<'.,.,', 'parser.y', 652)
   def _reduce_97(val, _values, result)
             checkpoint(val[0].first.location)
-
         result = val[0].push(val[2])
       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 732)
+module_eval(<<'.,.,', 'parser.y', 660)
   def _reduce_98(val, _values, result)
             checkpoint(val[0].location)
-
         result = InitDeclarator.new(val[0], nil)
         result.head_token = val[0].head_token
         result.tail_token = val[0].tail_token
@@ -2112,10 +2041,9 @@ module_eval(<<'.,.,', 'parser.y', 732)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 740)
+module_eval(<<'.,.,', 'parser.y', 667)
   def _reduce_99(val, _values, result)
             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
@@ -2134,10 +2062,9 @@ module_eval(<<'.,.,', 'parser.y', 740)
 
 # reduce 104 omitted
 
-module_eval(<<'.,.,', 'parser.y', 759)
+module_eval(<<'.,.,', 'parser.y', 685)
   def _reduce_105(val, _values, result)
             checkpoint(val[0].location)
-
         result = StandardTypeSpecifier.new(val[0])
         result.head_token = result.tail_token = val[0]
       
@@ -2145,10 +2072,9 @@ module_eval(<<'.,.,', 'parser.y', 759)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 766)
+module_eval(<<'.,.,', 'parser.y', 691)
   def _reduce_106(val, _values, result)
             checkpoint(val[0].location)
-
         result = StandardTypeSpecifier.new(val[0])
         result.head_token = result.tail_token = val[0]
       
@@ -2156,10 +2082,9 @@ module_eval(<<'.,.,', 'parser.y', 766)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 773)
+module_eval(<<'.,.,', 'parser.y', 697)
   def _reduce_107(val, _values, result)
             checkpoint(val[0].location)
-
         result = StandardTypeSpecifier.new(val[0])
         result.head_token = result.tail_token = val[0]
       
@@ -2167,10 +2092,9 @@ module_eval(<<'.,.,', 'parser.y', 773)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 780)
+module_eval(<<'.,.,', 'parser.y', 703)
   def _reduce_108(val, _values, result)
             checkpoint(val[0].location)
-
         result = StandardTypeSpecifier.new(val[0])
         result.head_token = result.tail_token = val[0]
       
@@ -2178,10 +2102,9 @@ module_eval(<<'.,.,', 'parser.y', 780)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 787)
+module_eval(<<'.,.,', 'parser.y', 709)
   def _reduce_109(val, _values, result)
             checkpoint(val[0].location)
-
         result = StandardTypeSpecifier.new(val[0])
         result.head_token = result.tail_token = val[0]
       
@@ -2189,10 +2112,9 @@ module_eval(<<'.,.,', 'parser.y', 787)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 794)
+module_eval(<<'.,.,', 'parser.y', 715)
   def _reduce_110(val, _values, result)
             checkpoint(val[0].location)
-
         result = StandardTypeSpecifier.new(val[0])
         result.head_token = result.tail_token = val[0]
       
@@ -2200,10 +2122,9 @@ module_eval(<<'.,.,', 'parser.y', 794)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 801)
+module_eval(<<'.,.,', 'parser.y', 721)
   def _reduce_111(val, _values, result)
             checkpoint(val[0].location)
-
         result = StandardTypeSpecifier.new(val[0])
         result.head_token = result.tail_token = val[0]
       
@@ -2211,10 +2132,9 @@ module_eval(<<'.,.,', 'parser.y', 801)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 808)
+module_eval(<<'.,.,', 'parser.y', 727)
   def _reduce_112(val, _values, result)
             checkpoint(val[0].location)
-
         result = StandardTypeSpecifier.new(val[0])
         result.head_token = result.tail_token = val[0]
       
@@ -2222,10 +2142,9 @@ module_eval(<<'.,.,', 'parser.y', 808)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 815)
+module_eval(<<'.,.,', 'parser.y', 733)
   def _reduce_113(val, _values, result)
             checkpoint(val[0].location)
-
         result = StandardTypeSpecifier.new(val[0])
         result.head_token = result.tail_token = val[0]
       
@@ -2233,10 +2152,9 @@ module_eval(<<'.,.,', 'parser.y', 815)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 822)
+module_eval(<<'.,.,', 'parser.y', 739)
   def _reduce_114(val, _values, result)
             checkpoint(val[0].location)
-
         result = StandardTypeSpecifier.new(val[0])
         result.head_token = result.tail_token = val[0]
       
@@ -2244,10 +2162,9 @@ module_eval(<<'.,.,', 'parser.y', 822)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 829)
+module_eval(<<'.,.,', 'parser.y', 745)
   def _reduce_115(val, _values, result)
             checkpoint(val[0].location)
-
         result = StandardTypeSpecifier.new(val[0])
         result.head_token = result.tail_token = val[0]
       
@@ -2255,10 +2172,9 @@ module_eval(<<'.,.,', 'parser.y', 829)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 836)
+module_eval(<<'.,.,', 'parser.y', 751)
   def _reduce_116(val, _values, result)
             checkpoint(val[0].location)
-
         result = StandardTypeSpecifier.new(val[0])
         result.head_token = result.tail_token = val[0]
       
@@ -2266,10 +2182,9 @@ module_eval(<<'.,.,', 'parser.y', 836)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 843)
+module_eval(<<'.,.,', 'parser.y', 757)
   def _reduce_117(val, _values, result)
             checkpoint(val[0].location)
-
         result = TypedefTypeSpecifier.new(val[0])
         result.head_token = result.tail_token = val[0]
       
@@ -2281,10 +2196,9 @@ module_eval(<<'.,.,', 'parser.y', 843)
 
 # reduce 119 omitted
 
-module_eval(<<'.,.,', 'parser.y', 852)
+module_eval(<<'.,.,', 'parser.y', 765)
   def _reduce_120(val, _values, result)
             checkpoint(val[0].location)
-
         val[2].full = true
         result = TypeofTypeSpecifier.new(val[2], nil)
         result.head_token = val[0]
@@ -2294,10 +2208,9 @@ module_eval(<<'.,.,', 'parser.y', 852)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 861)
+module_eval(<<'.,.,', 'parser.y', 773)
   def _reduce_121(val, _values, result)
             checkpoint(val[0].location)
-
         result = TypeofTypeSpecifier.new(nil, val[2])
         result.head_token = val[0]
         result.tail_token = val[3]
@@ -2306,10 +2219,9 @@ module_eval(<<'.,.,', 'parser.y', 861)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 872)
+module_eval(<<'.,.,', 'parser.y', 783)
   def _reduce_122(val, _values, result)
             checkpoint(val[0].location)
-
         result = StructSpecifier.new(val[1], val[3])
         result.head_token = val[0]
         result.tail_token = val[4]
@@ -2318,10 +2230,9 @@ module_eval(<<'.,.,', 'parser.y', 872)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 880)
+module_eval(<<'.,.,', 'parser.y', 790)
   def _reduce_123(val, _values, result)
             checkpoint(val[0].location)
-
         result = StructSpecifier.new(val[1], [])
         result.head_token = val[0]
         result.tail_token = val[3]
@@ -2330,10 +2241,9 @@ module_eval(<<'.,.,', 'parser.y', 880)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 888)
+module_eval(<<'.,.,', 'parser.y', 797)
   def _reduce_124(val, _values, result)
             checkpoint(val[0].location)
-
         result = UnionSpecifier.new(val[1], val[3])
         result.head_token = val[0]
         result.tail_token = val[4]
@@ -2342,10 +2252,9 @@ module_eval(<<'.,.,', 'parser.y', 888)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 896)
+module_eval(<<'.,.,', 'parser.y', 804)
   def _reduce_125(val, _values, result)
             checkpoint(val[0].location)
-
         result = UnionSpecifier.new(val[1], [])
         result.head_token = val[0]
         result.tail_token = val[3]
@@ -2354,11 +2263,10 @@ module_eval(<<'.,.,', 'parser.y', 896)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 904)
+module_eval(<<'.,.,', 'parser.y', 811)
   def _reduce_126(val, _values, result)
             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]
       
@@ -2366,11 +2274,10 @@ module_eval(<<'.,.,', 'parser.y', 904)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 912)
+module_eval(<<'.,.,', 'parser.y', 818)
   def _reduce_127(val, _values, result)
             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]
       
@@ -2378,11 +2285,10 @@ module_eval(<<'.,.,', 'parser.y', 912)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 920)
+module_eval(<<'.,.,', 'parser.y', 825)
   def _reduce_128(val, _values, result)
             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]
       
@@ -2390,11 +2296,10 @@ module_eval(<<'.,.,', 'parser.y', 920)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 928)
+module_eval(<<'.,.,', 'parser.y', 832)
   def _reduce_129(val, _values, result)
             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]
       
@@ -2402,10 +2307,9 @@ module_eval(<<'.,.,', 'parser.y', 928)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 936)
+module_eval(<<'.,.,', 'parser.y', 839)
   def _reduce_130(val, _values, result)
             checkpoint(val[0].location)
-
         result = StructSpecifier.new(val[1], nil)
         result.head_token = val[0]
         result.tail_token = val[1]
@@ -2414,10 +2318,9 @@ module_eval(<<'.,.,', 'parser.y', 936)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 944)
+module_eval(<<'.,.,', 'parser.y', 846)
   def _reduce_131(val, _values, result)
             checkpoint(val[0].location)
-
         result = UnionSpecifier.new(val[1], nil)
         result.head_token = val[0]
         result.tail_token = val[1]
@@ -2426,32 +2329,28 @@ module_eval(<<'.,.,', 'parser.y', 944)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 955)
+module_eval(<<'.,.,', 'parser.y', 856)
   def _reduce_132(val, _values, result)
             checkpoint(val[0].location)
-
         result = val
       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 961)
+module_eval(<<'.,.,', 'parser.y', 861)
   def _reduce_133(val, _values, result)
             checkpoint(val[0].first.location)
-
         result = val[0].push(val[1])
       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 970)
+module_eval(<<'.,.,', 'parser.y', 869)
   def _reduce_134(val, _values, result)
             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]
@@ -2460,17 +2359,16 @@ module_eval(<<'.,.,', 'parser.y', 970)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 978)
+module_eval(<<'.,.,', 'parser.y', 875)
   def _reduce_135(val, _values, result)
      @lexer.stop_identifier_translation 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 981)
+module_eval(<<'.,.,', 'parser.y', 878)
   def _reduce_136(val, _values, result)
             checkpoint(val[0].location)
-
         result = StructDeclaration.new(val[0], val[2])
         result.head_token = val[0].head_token
         result.tail_token = val[3]
@@ -2479,12 +2377,10 @@ module_eval(<<'.,.,', 'parser.y', 981)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 992)
+module_eval(<<'.,.,', 'parser.y', 888)
   def _reduce_137(val, _values, result)
             checkpoint(val[0].location)
-
         @lexer.stop_identifier_translation
-
         result = val[0]
         result.type_specifiers.push(val[1])
         result.tail_token = val[1].tail_token
@@ -2493,12 +2389,10 @@ module_eval(<<'.,.,', 'parser.y', 992)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1002)
+module_eval(<<'.,.,', 'parser.y', 896)
   def _reduce_138(val, _values, result)
             checkpoint(val[0].location)
-
         @lexer.stop_identifier_translation
-
         result = SpecifierQualifierList.new
         result.type_specifiers.push(val[0])
         result.head_token = val[0].head_token
@@ -2508,10 +2402,9 @@ module_eval(<<'.,.,', 'parser.y', 1002)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1013)
+module_eval(<<'.,.,', 'parser.y', 905)
   def _reduce_139(val, _values, result)
             checkpoint(val[0].location)
-
         result = val[0]
         result.type_qualifiers.push(val[1])
         result.tail_token = val[1]
@@ -2520,10 +2413,9 @@ module_eval(<<'.,.,', 'parser.y', 1013)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1021)
+module_eval(<<'.,.,', 'parser.y', 912)
   def _reduce_140(val, _values, result)
             checkpoint(val[0].location)
-
         result = SpecifierQualifierList.new
         result.type_qualifiers.push(val[0])
         result.head_token = result.tail_token = val[0]
@@ -2532,30 +2424,27 @@ module_eval(<<'.,.,', 'parser.y', 1021)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1032)
+module_eval(<<'.,.,', 'parser.y', 922)
   def _reduce_141(val, _values, result)
             checkpoint(val[0].location)
-
         result = val
       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1038)
+module_eval(<<'.,.,', 'parser.y', 927)
   def _reduce_142(val, _values, result)
             checkpoint(val[0].first.location)
-
         result = val[0].push(val[2])
       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1047)
+module_eval(<<'.,.,', 'parser.y', 935)
   def _reduce_143(val, _values, result)
             checkpoint(val[0].location)
-
         result = StructDeclarator.new(val[0], nil)
         result.head_token = val[0].head_token
         result.tail_token = val[0].tail_token
@@ -2564,10 +2453,9 @@ module_eval(<<'.,.,', 'parser.y', 1047)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1055)
+module_eval(<<'.,.,', 'parser.y', 942)
   def _reduce_144(val, _values, result)
             checkpoint(val[0].location)
-
         val[1].full = true
         result = StructDeclarator.new(nil, val[1])
         result.head_token = val[0]
@@ -2577,10 +2465,9 @@ module_eval(<<'.,.,', 'parser.y', 1055)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1064)
+module_eval(<<'.,.,', 'parser.y', 950)
   def _reduce_145(val, _values, result)
             checkpoint(val[0].location)
-
         val[2].full = true
         result = StructDeclarator.new(val[0], val[2])
         result.head_token = val[0].head_token
@@ -2590,11 +2477,10 @@ module_eval(<<'.,.,', 'parser.y', 1064)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1076)
+module_eval(<<'.,.,', 'parser.y', 961)
   def _reduce_146(val, _values, result)
             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]
       
@@ -2602,10 +2488,9 @@ module_eval(<<'.,.,', 'parser.y', 1076)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1084)
+module_eval(<<'.,.,', 'parser.y', 968)
   def _reduce_147(val, _values, result)
             checkpoint(val[0].location)
-
         result = EnumSpecifier.new(val[1], val[3])
         result.head_token = val[0]
         result.tail_token = val[4]
@@ -2614,12 +2499,11 @@ module_eval(<<'.,.,', 'parser.y', 1084)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1092)
+module_eval(<<'.,.,', 'parser.y', 975)
   def _reduce_148(val, _values, result)
             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]
       
@@ -2627,10 +2511,9 @@ module_eval(<<'.,.,', 'parser.y', 1092)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1101)
+module_eval(<<'.,.,', 'parser.y', 983)
   def _reduce_149(val, _values, result)
             checkpoint(val[0].location)
-
         result = EnumSpecifier.new(val[1], val[3], val[4])
         result.head_token = val[0]
         result.tail_token = val[5]
@@ -2639,10 +2522,9 @@ module_eval(<<'.,.,', 'parser.y', 1101)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1109)
+module_eval(<<'.,.,', 'parser.y', 990)
   def _reduce_150(val, _values, result)
             checkpoint(val[0].location)
-
         result = EnumSpecifier.new(val[1], nil)
         result.head_token = val[0]
         result.tail_token = val[1]
@@ -2651,45 +2533,41 @@ module_eval(<<'.,.,', 'parser.y', 1109)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1120)
+module_eval(<<'.,.,', 'parser.y', 1000)
   def _reduce_151(val, _values, result)
             checkpoint(val[0].location)
-
         result = val
       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1126)
+module_eval(<<'.,.,', 'parser.y', 1005)
   def _reduce_152(val, _values, result)
             checkpoint(val[0].first.location)
-
         result = val[0].push(val[2])
       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1135)
+module_eval(<<'.,.,', 'parser.y', 1013)
   def _reduce_153(val, _values, result)
             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]
       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1143)
+module_eval(<<'.,.,', 'parser.y', 1020)
   def _reduce_154(val, _values, result)
             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
       
@@ -2705,10 +2583,9 @@ module_eval(<<'.,.,', 'parser.y', 1143)
 
 # reduce 158 omitted
 
-module_eval(<<'.,.,', 'parser.y', 1166)
+module_eval(<<'.,.,', 'parser.y', 1042)
   def _reduce_159(val, _values, result)
             checkpoint(val[0].first.location)
-
         result = val[1]
         result.pointer = val[0]
         result.head_token = val[0].first
@@ -2718,10 +2595,9 @@ module_eval(<<'.,.,', 'parser.y', 1166)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1175)
+module_eval(<<'.,.,', 'parser.y', 1050)
   def _reduce_160(val, _values, result)
             checkpoint(val[0].location)
-
         result = val[0]
         result.full = true
       
@@ -2729,12 +2605,10 @@ module_eval(<<'.,.,', 'parser.y', 1175)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1185)
+module_eval(<<'.,.,', 'parser.y', 1059)
   def _reduce_161(val, _values, result)
             checkpoint(val[0].location)
-
         @lexer.start_identifier_translation
-
         result = IdentifierDeclarator.new(val[0])
         result.head_token = result.tail_token = val[0]
       
@@ -2742,10 +2616,9 @@ module_eval(<<'.,.,', 'parser.y', 1185)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1194)
+module_eval(<<'.,.,', 'parser.y', 1066)
   def _reduce_162(val, _values, result)
             checkpoint(val[0].location)
-
         result = GroupedDeclarator.new(val[1])
         result.head_token = val[0]
         result.tail_token = val[2]
@@ -2754,10 +2627,9 @@ module_eval(<<'.,.,', 'parser.y', 1194)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1202)
+module_eval(<<'.,.,', 'parser.y', 1073)
   def _reduce_163(val, _values, result)
             checkpoint(val[0].location)
-
         val[3].full = true
         result = ArrayDeclarator.new(val[0], val[3])
         result.head_token = val[0].head_token
@@ -2767,10 +2639,9 @@ module_eval(<<'.,.,', 'parser.y', 1202)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1211)
+module_eval(<<'.,.,', 'parser.y', 1081)
   def _reduce_164(val, _values, result)
             checkpoint(val[0].location)
-
         result = ArrayDeclarator.new(val[0], nil)
         result.head_token = val[0].head_token
         result.tail_token = val[3]
@@ -2779,10 +2650,9 @@ module_eval(<<'.,.,', 'parser.y', 1211)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1219)
+module_eval(<<'.,.,', 'parser.y', 1088)
   def _reduce_165(val, _values, result)
             checkpoint(val[0].location)
-
         val[2].full = true
         result = ArrayDeclarator.new(val[0], val[2])
         result.head_token = val[0].head_token
@@ -2792,10 +2662,9 @@ module_eval(<<'.,.,', 'parser.y', 1219)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1229)
+module_eval(<<'.,.,', 'parser.y', 1097)
   def _reduce_166(val, _values, result)
             checkpoint(val[0].location)
-
         val[4].full = true
         result = ArrayDeclarator.new(val[0], val[4])
         result.head_token = val[0].head_token
@@ -2805,10 +2674,9 @@ module_eval(<<'.,.,', 'parser.y', 1229)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1239)
+module_eval(<<'.,.,', 'parser.y', 1106)
   def _reduce_167(val, _values, result)
             checkpoint(val[0].location)
-
         val[4].full = true
         result = ArrayDeclarator.new(val[0], val[4])
         result.head_token = val[0].head_token
@@ -2818,10 +2686,9 @@ module_eval(<<'.,.,', 'parser.y', 1239)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1248)
+module_eval(<<'.,.,', 'parser.y', 1114)
   def _reduce_168(val, _values, result)
             checkpoint(val[0].location)
-
         result = ArrayDeclarator.new(val[0], nil)
         result.head_token = val[0].head_token
         result.tail_token = val[4]
@@ -2830,10 +2697,9 @@ module_eval(<<'.,.,', 'parser.y', 1248)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1256)
+module_eval(<<'.,.,', 'parser.y', 1121)
   def _reduce_169(val, _values, result)
             checkpoint(val[0].location)
-
         result = ArrayDeclarator.new(val[0], nil)
         result.head_token = val[0].head_token
         result.tail_token = val[3]
@@ -2842,10 +2708,9 @@ module_eval(<<'.,.,', 'parser.y', 1256)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1264)
+module_eval(<<'.,.,', 'parser.y', 1128)
   def _reduce_170(val, _values, result)
             checkpoint(val[0].location)
-
         result = ArrayDeclarator.new(val[0], nil)
         result.head_token = val[0].head_token
         result.tail_token = val[2]
@@ -2854,10 +2719,9 @@ module_eval(<<'.,.,', 'parser.y', 1264)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1272)
+module_eval(<<'.,.,', 'parser.y', 1135)
   def _reduce_171(val, _values, result)
             checkpoint(val[0].location)
-
         result = AnsiFunctionDeclarator.new(val[0], val[2])
         result.head_token = val[0].head_token
         result.tail_token = val[3]
@@ -2866,10 +2730,9 @@ module_eval(<<'.,.,', 'parser.y', 1272)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1280)
+module_eval(<<'.,.,', 'parser.y', 1142)
   def _reduce_172(val, _values, result)
             checkpoint(val[0].location)
-
         result = KandRFunctionDeclarator.new(val[0], val[2])
         result.head_token = val[0].head_token
         result.tail_token = val[3]
@@ -2878,10 +2741,9 @@ module_eval(<<'.,.,', 'parser.y', 1280)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1288)
+module_eval(<<'.,.,', 'parser.y', 1149)
   def _reduce_173(val, _values, result)
             checkpoint(val[0].location)
-
         result = AbbreviatedFunctionDeclarator.new(val[0])
         result.head_token = val[0].head_token
         result.tail_token = val[2]
@@ -2890,70 +2752,63 @@ module_eval(<<'.,.,', 'parser.y', 1288)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1299)
+module_eval(<<'.,.,', 'parser.y', 1159)
   def _reduce_174(val, _values, result)
             checkpoint(val[0].location)
-
         result = val
       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1305)
+module_eval(<<'.,.,', 'parser.y', 1164)
   def _reduce_175(val, _values, result)
             checkpoint(val[0].location)
-
         result = val[1].unshift(val[0])
       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1311)
+module_eval(<<'.,.,', 'parser.y', 1169)
   def _reduce_176(val, _values, result)
             checkpoint(val[0].location)
-
         result = val[1].unshift(val[0])
       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1317)
+module_eval(<<'.,.,', 'parser.y', 1174)
   def _reduce_177(val, _values, result)
             checkpoint(val[0].location)
-
         result = val[1].unshift(val[0]).concat(val[2])
       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1326)
+module_eval(<<'.,.,', 'parser.y', 1182)
   def _reduce_178(val, _values, result)
             checkpoint(val[0].location)
-
         result = val
       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1332)
+module_eval(<<'.,.,', 'parser.y', 1187)
   def _reduce_179(val, _values, result)
             checkpoint(val[0].first.location)
-
         result = val[0].push(val[1])
       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1341)
+module_eval(<<'.,.,', 'parser.y', 1195)
   def _reduce_180(val, _values, result)
             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
@@ -2962,10 +2817,9 @@ module_eval(<<'.,.,', 'parser.y', 1341)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1349)
+module_eval(<<'.,.,', 'parser.y', 1202)
   def _reduce_181(val, _values, result)
             checkpoint(val[0].first.location)
-
         result = ParameterTypeList.new(val[0], true)
         result.head_token = val[0].first.head_token
         result.tail_token = val[2]
@@ -2974,30 +2828,27 @@ module_eval(<<'.,.,', 'parser.y', 1349)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1360)
+module_eval(<<'.,.,', 'parser.y', 1212)
   def _reduce_182(val, _values, result)
             checkpoint(val[0].location)
-
         result = val
       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1366)
+module_eval(<<'.,.,', 'parser.y', 1217)
   def _reduce_183(val, _values, result)
             checkpoint(val[0].first.location)
-
         result = val[0].push(val[2])
       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1375)
+module_eval(<<'.,.,', 'parser.y', 1225)
   def _reduce_184(val, _values, result)
             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
@@ -3006,10 +2857,9 @@ module_eval(<<'.,.,', 'parser.y', 1375)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1383)
+module_eval(<<'.,.,', 'parser.y', 1232)
   def _reduce_185(val, _values, result)
             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
@@ -3018,12 +2868,10 @@ module_eval(<<'.,.,', 'parser.y', 1383)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1391)
+module_eval(<<'.,.,', 'parser.y', 1239)
   def _reduce_186(val, _values, result)
             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
@@ -3032,33 +2880,29 @@ module_eval(<<'.,.,', 'parser.y', 1391)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1404)
+module_eval(<<'.,.,', 'parser.y', 1250)
   def _reduce_187(val, _values, result)
             checkpoint(val[0].location)
-
         result = val
       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1410)
+module_eval(<<'.,.,', 'parser.y', 1255)
   def _reduce_188(val, _values, result)
             checkpoint(val[0].first.location)
-
         result = val[0].push(val[2])
       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1419)
+module_eval(<<'.,.,', 'parser.y', 1263)
   def _reduce_189(val, _values, result)
             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
       
@@ -3066,11 +2910,10 @@ module_eval(<<'.,.,', 'parser.y', 1419)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1429)
+module_eval(<<'.,.,', 'parser.y', 1271)
   def _reduce_190(val, _values, result)
             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
       
@@ -3078,12 +2921,10 @@ module_eval(<<'.,.,', 'parser.y', 1429)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1440)
+module_eval(<<'.,.,', 'parser.y', 1281)
   def _reduce_191(val, _values, result)
             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
@@ -3093,10 +2934,9 @@ module_eval(<<'.,.,', 'parser.y', 1440)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1451)
+module_eval(<<'.,.,', 'parser.y', 1290)
   def _reduce_192(val, _values, result)
             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
@@ -3106,10 +2946,9 @@ module_eval(<<'.,.,', 'parser.y', 1451)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1460)
+module_eval(<<'.,.,', 'parser.y', 1298)
   def _reduce_193(val, _values, result)
             checkpoint(val[0].location)
-
         result = val[0]
         result.full = true
       
@@ -3117,12 +2956,10 @@ module_eval(<<'.,.,', 'parser.y', 1460)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1470)
+module_eval(<<'.,.,', 'parser.y', 1307)
   def _reduce_194(val, _values, result)
             checkpoint(val[0].location)
-
         @lexer.start_identifier_translation
-
         result = GroupedAbstractDeclarator.new(val[1])
         result.head_token = val[0]
         result.tail_token = val[2]
@@ -3131,12 +2968,10 @@ module_eval(<<'.,.,', 'parser.y', 1470)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1480)
+module_eval(<<'.,.,', 'parser.y', 1315)
   def _reduce_195(val, _values, result)
             checkpoint(val[0].location)
-
         @lexer.start_identifier_translation
-
         result = ArrayAbstractDeclarator.new(nil, nil)
         result.head_token = val[0]
         result.tail_token = val[1]
@@ -3145,12 +2980,10 @@ module_eval(<<'.,.,', 'parser.y', 1480)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1490)
+module_eval(<<'.,.,', 'parser.y', 1323)
   def _reduce_196(val, _values, result)
             checkpoint(val[0].location)
-
         @lexer.start_identifier_translation
-
         val[1].full = true
         result = ArrayAbstractDeclarator.new(nil, val[1])
         result.head_token = val[0]
@@ -3160,10 +2993,9 @@ module_eval(<<'.,.,', 'parser.y', 1490)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1501)
+module_eval(<<'.,.,', 'parser.y', 1332)
   def _reduce_197(val, _values, result)
             checkpoint(val[0].location)
-
         result = ArrayAbstractDeclarator.new(val[0], nil)
         result.head_token = val[0].head_token
         result.tail_token = val[2]
@@ -3172,10 +3004,9 @@ module_eval(<<'.,.,', 'parser.y', 1501)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1509)
+module_eval(<<'.,.,', 'parser.y', 1339)
   def _reduce_198(val, _values, result)
             checkpoint(val[0].location)
-
         val[2].full = true
         result = ArrayAbstractDeclarator.new(val[0], val[2])
         result.head_token = val[0].head_token
@@ -3185,12 +3016,10 @@ module_eval(<<'.,.,', 'parser.y', 1509)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1518)
+module_eval(<<'.,.,', 'parser.y', 1347)
   def _reduce_199(val, _values, result)
             checkpoint(val[0].location)
-
         @lexer.start_identifier_translation
-
         result = ArrayAbstractDeclarator.new(nil, nil)
         result.head_token = val[0]
         result.tail_token = val[2]
@@ -3199,10 +3028,9 @@ module_eval(<<'.,.,', 'parser.y', 1518)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1528)
+module_eval(<<'.,.,', 'parser.y', 1355)
   def _reduce_200(val, _values, result)
             checkpoint(val[0].location)
-
         result = ArrayAbstractDeclarator.new(val[0], nil)
         result.head_token = val[0].head_token
         result.tail_token = val[3]
@@ -3211,12 +3039,10 @@ module_eval(<<'.,.,', 'parser.y', 1528)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1536)
+module_eval(<<'.,.,', 'parser.y', 1362)
   def _reduce_201(val, _values, result)
             checkpoint(val[0].location)
-
         @lexer.start_identifier_translation
-
         result = FunctionAbstractDeclarator.new(nil, nil)
         result.head_token = val[0]
         result.tail_token = val[1]
@@ -3225,17 +3051,16 @@ module_eval(<<'.,.,', 'parser.y', 1536)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1544)
+module_eval(<<'.,.,', 'parser.y', 1368)
   def _reduce_202(val, _values, result)
      @lexer.start_identifier_translation 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1546)
+module_eval(<<'.,.,', 'parser.y', 1370)
   def _reduce_203(val, _values, result)
             checkpoint(val[0].location)
-
         result = FunctionAbstractDeclarator.new(nil, val[2])
         result.head_token = val[0]
         result.tail_token = val[3]
@@ -3244,12 +3069,10 @@ module_eval(<<'.,.,', 'parser.y', 1546)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1554)
+module_eval(<<'.,.,', 'parser.y', 1377)
   def _reduce_204(val, _values, result)
             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]
@@ -3258,10 +3081,9 @@ module_eval(<<'.,.,', 'parser.y', 1554)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1564)
+module_eval(<<'.,.,', 'parser.y', 1385)
   def _reduce_205(val, _values, result)
             checkpoint(val[0].location)
-
         result = FunctionAbstractDeclarator.new(val[0], val[2])
         result.head_token = val[0].head_token
         result.tail_token = val[3]
@@ -3270,10 +3092,9 @@ module_eval(<<'.,.,', 'parser.y', 1564)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1575)
+module_eval(<<'.,.,', 'parser.y', 1395)
   def _reduce_206(val, _values, result)
             checkpoint(val[0].location)
-
         val[0].full = true
         result = Initializer.new(val[0], nil)
         result.head_token = val[0].head_token
@@ -3283,10 +3104,9 @@ module_eval(<<'.,.,', 'parser.y', 1575)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1584)
+module_eval(<<'.,.,', 'parser.y', 1403)
   def _reduce_207(val, _values, result)
             checkpoint(val[0].location)
-
         result = Initializer.new(nil, nil)
         result.head_token = val[0]
         result.tail_token = val[1]
@@ -3295,10 +3115,9 @@ module_eval(<<'.,.,', 'parser.y', 1584)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1592)
+module_eval(<<'.,.,', 'parser.y', 1410)
   def _reduce_208(val, _values, result)
             checkpoint(val[0].location)
-
         result = Initializer.new(nil, val[1])
         result.head_token = val[0]
         result.tail_token = val[2]
@@ -3307,10 +3126,9 @@ module_eval(<<'.,.,', 'parser.y', 1592)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1600)
+module_eval(<<'.,.,', 'parser.y', 1417)
   def _reduce_209(val, _values, result)
             checkpoint(val[0].location)
-
         result = Initializer.new(nil, val[1])
         result.head_token = val[0]
         result.tail_token = val[3]
@@ -3319,40 +3137,36 @@ module_eval(<<'.,.,', 'parser.y', 1600)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1611)
+module_eval(<<'.,.,', 'parser.y', 1427)
   def _reduce_210(val, _values, result)
             checkpoint(val[0].location)
-
         result = val
       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1617)
+module_eval(<<'.,.,', 'parser.y', 1432)
   def _reduce_211(val, _values, result)
             checkpoint(val[1].location)
-
         result = [val[1]]
       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1623)
+module_eval(<<'.,.,', 'parser.y', 1437)
   def _reduce_212(val, _values, result)
             checkpoint(val[0].first.location)
-
         result = val[0].push(val[2])
       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1629)
+module_eval(<<'.,.,', 'parser.y', 1442)
   def _reduce_213(val, _values, result)
             checkpoint(val[0].first.location)
-
         result = val[0].push(val[3])
       
     result
@@ -3381,10 +3195,9 @@ module_eval(<<'.,.,', 'parser.y', 1629)
 
 # reduce 224 omitted
 
-module_eval(<<'.,.,', 'parser.y', 1664)
+module_eval(<<'.,.,', 'parser.y', 1476)
   def _reduce_225(val, _values, result)
             checkpoint(val[0].location)
-
         result = GenericLabeledStatement.new(val[0], val[2])
         result.head_token = val[0]
         result.tail_token = val[2].tail_token
@@ -3393,10 +3206,9 @@ module_eval(<<'.,.,', 'parser.y', 1664)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1672)
+module_eval(<<'.,.,', 'parser.y', 1483)
   def _reduce_226(val, _values, result)
             checkpoint(val[0].location)
-
         val[1].full = true
         result = CaseLabeledStatement.new(val[1], val[3])
         result.head_token = val[0]
@@ -3406,10 +3218,9 @@ module_eval(<<'.,.,', 'parser.y', 1672)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1681)
+module_eval(<<'.,.,', 'parser.y', 1491)
   def _reduce_227(val, _values, result)
             checkpoint(val[0].location)
-
         result = DefaultLabeledStatement.new(val[2])
         result.head_token = val[0]
         result.tail_token = val[2].tail_token
@@ -3418,10 +3229,9 @@ module_eval(<<'.,.,', 'parser.y', 1681)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1692)
+module_eval(<<'.,.,', 'parser.y', 1501)
   def _reduce_228(val, _values, result)
             checkpoint(val[0].location)
-
         result = CompoundStatement.new([])
         result.head_token = val[0]
         result.tail_token = val[1]
@@ -3430,24 +3240,23 @@ module_eval(<<'.,.,', 'parser.y', 1692)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1698)
+module_eval(<<'.,.,', 'parser.y', 1506)
   def _reduce_229(val, _values, result)
      @lexer.enter_scope 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1698)
+module_eval(<<'.,.,', 'parser.y', 1506)
   def _reduce_230(val, _values, result)
      @lexer.leave_scope 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1700)
+module_eval(<<'.,.,', 'parser.y', 1508)
   def _reduce_231(val, _values, result)
             checkpoint(val[0].location)
-
         result = CompoundStatement.new(val[2])
         result.head_token = val[0]
         result.tail_token = val[4]
@@ -3456,20 +3265,18 @@ module_eval(<<'.,.,', 'parser.y', 1700)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1711)
+module_eval(<<'.,.,', 'parser.y', 1518)
   def _reduce_232(val, _values, result)
             checkpoint(val[0].location)
-
         result = val
       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1717)
+module_eval(<<'.,.,', 'parser.y', 1523)
   def _reduce_233(val, _values, result)
             checkpoint(val[0].first.location)
-
         result = val[0].push(val[1])
       
     result
@@ -3482,10 +3289,9 @@ module_eval(<<'.,.,', 'parser.y', 1717)
 
 # reduce 236 omitted
 
-module_eval(<<'.,.,', 'parser.y', 1732)
+module_eval(<<'.,.,', 'parser.y', 1537)
   def _reduce_237(val, _values, result)
             checkpoint(val[0].location)
-
         result = ExpressionStatement.new(nil)
         result.head_token = result.tail_token = val[0]
       
@@ -3493,10 +3299,9 @@ module_eval(<<'.,.,', 'parser.y', 1732)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1739)
+module_eval(<<'.,.,', 'parser.y', 1543)
   def _reduce_238(val, _values, result)
             checkpoint(val[0].location)
-
         val[0].full = true
         result = ExpressionStatement.new(val[0])
         result.head_token = val[0].head_token
@@ -3506,10 +3311,9 @@ module_eval(<<'.,.,', 'parser.y', 1739)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1751)
+module_eval(<<'.,.,', 'parser.y', 1554)
   def _reduce_239(val, _values, result)
             checkpoint(val[0].location)
-
         val[2].full = true
         result = IfStatement.new(val[2], val[4], val[3])
         result.head_token = val[0]
@@ -3519,10 +3323,9 @@ module_eval(<<'.,.,', 'parser.y', 1751)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1760)
+module_eval(<<'.,.,', 'parser.y', 1562)
   def _reduce_240(val, _values, result)
             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]
@@ -3532,10 +3335,9 @@ module_eval(<<'.,.,', 'parser.y', 1760)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1769)
+module_eval(<<'.,.,', 'parser.y', 1570)
   def _reduce_241(val, _values, result)
             checkpoint(val[0].location)
-
         val[2].full = true
         result = SwitchStatement.new(val[2], val[4])
         result.head_token = val[0]
@@ -3545,10 +3347,9 @@ module_eval(<<'.,.,', 'parser.y', 1769)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1781)
+module_eval(<<'.,.,', 'parser.y', 1581)
   def _reduce_242(val, _values, result)
             checkpoint(val[0].location)
-
         val[2].full = true
         result = WhileStatement.new(val[2], val[4], val[3])
         result.head_token = val[0]
@@ -3558,10 +3359,9 @@ module_eval(<<'.,.,', 'parser.y', 1781)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1790)
+module_eval(<<'.,.,', 'parser.y', 1589)
   def _reduce_243(val, _values, result)
             checkpoint(val[0].location)
-
         val[4].full = true
         result = DoStatement.new(val[1], val[4], val[0], val[2])
         result.head_token = val[0]
@@ -3571,10 +3371,9 @@ module_eval(<<'.,.,', 'parser.y', 1790)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1799)
+module_eval(<<'.,.,', 'parser.y', 1597)
   def _reduce_244(val, _values, result)
             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
@@ -3583,10 +3382,9 @@ module_eval(<<'.,.,', 'parser.y', 1799)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1808)
+module_eval(<<'.,.,', 'parser.y', 1605)
   def _reduce_245(val, _values, result)
             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]
@@ -3596,10 +3394,9 @@ module_eval(<<'.,.,', 'parser.y', 1808)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1817)
+module_eval(<<'.,.,', 'parser.y', 1613)
   def _reduce_246(val, _values, result)
             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
@@ -3608,10 +3405,9 @@ module_eval(<<'.,.,', 'parser.y', 1817)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1825)
+module_eval(<<'.,.,', 'parser.y', 1620)
   def _reduce_247(val, _values, result)
             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]
@@ -3621,10 +3417,9 @@ module_eval(<<'.,.,', 'parser.y', 1825)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1837)
+module_eval(<<'.,.,', 'parser.y', 1631)
   def _reduce_248(val, _values, result)
             checkpoint(val[0].location)
-
         result = GotoStatement.new(val[1])
         result.head_token = val[0]
         result.tail_token = val[2]
@@ -3633,10 +3428,9 @@ module_eval(<<'.,.,', 'parser.y', 1837)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1845)
+module_eval(<<'.,.,', 'parser.y', 1638)
   def _reduce_249(val, _values, result)
             checkpoint(val[0].location)
-
         E(:E0015, val[1].location, val[1].value)
         result = ErrorStatement.new(val[1])
         result.head_token = val[0]
@@ -3646,10 +3440,9 @@ module_eval(<<'.,.,', 'parser.y', 1845)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1854)
+module_eval(<<'.,.,', 'parser.y', 1646)
   def _reduce_250(val, _values, result)
             checkpoint(val[0].location)
-
         result = ContinueStatement.new
         result.head_token = val[0]
         result.tail_token = val[1]
@@ -3658,10 +3451,9 @@ module_eval(<<'.,.,', 'parser.y', 1854)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1862)
+module_eval(<<'.,.,', 'parser.y', 1653)
   def _reduce_251(val, _values, result)
             checkpoint(val[0].location)
-
         result = BreakStatement.new
         result.head_token = val[0]
         result.tail_token = val[1]
@@ -3670,10 +3462,9 @@ module_eval(<<'.,.,', 'parser.y', 1862)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1870)
+module_eval(<<'.,.,', 'parser.y', 1660)
   def _reduce_252(val, _values, result)
             checkpoint(val[0].location)
-
         result = ReturnStatement.new(nil)
         result.head_token = val[0]
         result.tail_token = val[1]
@@ -3682,10 +3473,9 @@ module_eval(<<'.,.,', 'parser.y', 1870)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1878)
+module_eval(<<'.,.,', 'parser.y', 1667)
   def _reduce_253(val, _values, result)
             checkpoint(val[0].location)
-
         val[1].full = true
         result = ReturnStatement.new(val[1])
         result.head_token = val[0]
@@ -3695,7 +3485,7 @@ module_eval(<<'.,.,', 'parser.y', 1878)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1893)
+module_eval(<<'.,.,', 'parser.y', 1681)
   def _reduce_254(val, _values, result)
             result = TranslationUnit.new
       
@@ -3703,16 +3493,11 @@ module_eval(<<'.,.,', 'parser.y', 1893)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1897)
+module_eval(<<'.,.,', 'parser.y', 1685)
   def _reduce_255(val, _values, result)
             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
       
     result
   end
@@ -3722,12 +3507,11 @@ module_eval(<<'.,.,', 'parser.y', 1897)
 
 # reduce 257 omitted
 
-module_eval(<<'.,.,', 'parser.y', 1916)
+module_eval(<<'.,.,', 'parser.y', 1699)
   def _reduce_258(val, _values, result)
             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
       
@@ -3735,22 +3519,18 @@ module_eval(<<'.,.,', 'parser.y', 1916)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1925)
+module_eval(<<'.,.,', 'parser.y', 1707)
   def _reduce_259(val, _values, result)
             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
       
@@ -3758,12 +3538,11 @@ module_eval(<<'.,.,', 'parser.y', 1925)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1944)
+module_eval(<<'.,.,', 'parser.y', 1722)
   def _reduce_260(val, _values, result)
             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
       
@@ -3771,22 +3550,18 @@ module_eval(<<'.,.,', 'parser.y', 1944)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1953)
+module_eval(<<'.,.,', 'parser.y', 1730)
   def _reduce_261(val, _values, result)
             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
       
@@ -3794,12 +3569,11 @@ module_eval(<<'.,.,', 'parser.y', 1953)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1975)
+module_eval(<<'.,.,', 'parser.y', 1748)
   def _reduce_262(val, _values, result)
             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
       
@@ -3807,22 +3581,18 @@ module_eval(<<'.,.,', 'parser.y', 1975)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1984)
+module_eval(<<'.,.,', 'parser.y', 1756)
   def _reduce_263(val, _values, result)
             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
       
@@ -3830,20 +3600,18 @@ module_eval(<<'.,.,', 'parser.y', 1984)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 2006)
+module_eval(<<'.,.,', 'parser.y', 1774)
   def _reduce_264(val, _values, result)
             checkpoint(val[0].location)
-
         result = val
       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 2012)
+module_eval(<<'.,.,', 'parser.y', 1779)
   def _reduce_265(val, _values, result)
             checkpoint(val[0].first.location)
-
         result = val[0].push(val[1])
       
     result
@@ -3855,5 +3623,5 @@ def _reduce_none(val, _values, result)
 end
 
     end   # class Parser
-  end   # module C
+  end   # module Cc1
 end   # module AdLint