adlint 3.0.4 → 3.0.8

data/lib/adlint/exam/c_builtin/cc1_check.rb

@@ -56,9 +56,9 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_grouped_expression += T(:enter_grouped_expression)
-      visitor.leave_grouped_expression += T(:leave_grouped_expression)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_grouped_expression += T(:enter_grouped_expression)
+      traversal.leave_grouped_expression += T(:leave_grouped_expression)
       @group_depth = 0
     end
 
@@ -82,8 +82,8 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_kandr_function_definition += T(:check)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_kandr_function_definition += T(:check)
     end
 
     private
@@ -101,8 +101,8 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_switch_statement += T(:check)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_switch_statement += T(:check)
     end
 
     private
@@ -138,8 +138,8 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_switch_statement += T(:enter_switch_statement)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_switch_statement += T(:enter_switch_statement)
     end
 
     private
@@ -199,8 +199,8 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_conditional_expression += T(:check)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_conditional_expression += T(:check)
     end
 
     private
@@ -221,8 +221,8 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_continue_statement += T(:check)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_continue_statement += T(:check)
     end
 
     private
@@ -534,33 +534,35 @@ module CBuiltin #:nodoc:
       @interp.on_indirection_expr_evaled     += T(:check_indirection)
       @interp.on_member_access_expr_evaled   += T(:check_member_access)
       @interp.on_array_subscript_expr_evaled += T(:check_array_subscript)
-      @enum_tbl = @interp.environment.enumerator_table
     end
 
     private
     def check_indirection(expr, var, *)
-      return unless expr.operand.constant?(@enum_tbl)
-      if var.value.scalar? &&
-          var.value.must_be_equal_to?(@interp.scalar_value_of(0))
-        W(expr.location)
+      if @interp.constant_expression?(expr.operand)
+        if var.value.scalar? &&
+            var.value.must_be_equal_to?(@interp.scalar_value_of(0))
+          W(expr.location)
+        end
       end
     end
 
     def check_member_access(expr, outer_var, *)
       return unless outer_var.type.pointer?
-      return unless expr.expression.constant?(@enum_tbl)
-      if outer_var.value.scalar? &&
-          outer_var.value.must_be_equal_to?(@interp.scalar_value_of(0))
-        W(expr.location)
+      if @interp.constant_expression?(expr.expression)
+        if outer_var.value.scalar? &&
+            outer_var.value.must_be_equal_to?(@interp.scalar_value_of(0))
+          W(expr.location)
+        end
       end
     end
 
     def check_array_subscript(expr, ptr_var, *)
       return unless ptr_var.type.pointer?
-      return unless expr.expression.constant?(@enum_tbl)
-      if ptr_var.value.scalar? &&
-          ptr_var.value.must_be_equal_to?(@interp.scalar_value_of(0))
-        W(expr.location)
+      if @interp.constant_expression?(expr.expression)
+        if ptr_var.value.scalar? &&
+            ptr_var.value.must_be_equal_to?(@interp.scalar_value_of(0))
+          W(expr.location)
+        end
       end
     end
   end
@@ -585,7 +587,6 @@ module CBuiltin #:nodoc:
       @interp.on_postfix_increment_expr_evaled += T(:check_unary_postfix)
       @interp.on_prefix_decrement_expr_evaled  += T(:check_unary_prefix)
       @interp.on_postfix_decrement_expr_evaled += T(:check_unary_postfix)
-      @enum_tbl = @interp.environment.enumerator_table
     end
 
     private
@@ -593,12 +594,12 @@ module CBuiltin #:nodoc:
       lhs_type, lhs_val = lhs_var.type, lhs_var.value
       rhs_type, rhs_val = rhs_var.type, rhs_var.value
 
-      if expr.lhs_operand.constant?(@enum_tbl) && lhs_type.pointer? &&
+      if @interp.constant_expression?(expr.lhs_operand) && lhs_type.pointer? &&
           lhs_val.must_be_equal_to?(@interp.scalar_value_of(0))
         W(expr.lhs_operand.location)
       end
 
-      if expr.rhs_operand.constant?(@enum_tbl) && rhs_type.pointer? &&
+      if @interp.constant_expression?(expr.rhs_operand) && rhs_type.pointer? &&
           rhs_val.must_be_equal_to?(@interp.scalar_value_of(0))
         W(expr.rhs_operand.location)
       end
@@ -607,7 +608,7 @@ module CBuiltin #:nodoc:
     def check_unary_prefix(expr, ope_var, org_val)
       type, val = ope_var.type, org_val
 
-      if expr.operand.constant?(@enum_tbl) && type.pointer? &&
+      if @interp.constant_expression?(expr.operand) && type.pointer? &&
           val.must_be_equal_to?(@interp.scalar_value_of(0))
         W(expr.operand.location)
       end
@@ -616,7 +617,7 @@ module CBuiltin #:nodoc:
     def check_unary_postfix(expr, ope_var, *)
       type, val = ope_var.type, ope_var.value
 
-      if expr.operand.constant?(@enum_tbl) && type.pointer? &&
+      if @interp.constant_expression?(expr.operand) && type.pointer? &&
           val.must_be_equal_to?(@interp.scalar_value_of(0))
         W(expr.operand.location)
       end
@@ -764,13 +765,13 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_init_declarator           += T(:check_init_decl)
-      visitor.enter_struct_declarator         += T(:check_struct_decl)
-      visitor.enter_parameter_declaration     += T(:check_parameter_decl)
-      visitor.enter_kandr_function_definition += T(:check_kandr_fundef)
-      visitor.enter_ansi_function_definition  += T(:check_ansi_fundef)
-      visitor.enter_type_name                 += T(:check_type_name)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_init_declarator           += T(:check_init_decl)
+      traversal.enter_struct_declarator         += T(:check_struct_decl)
+      traversal.enter_parameter_declaration     += T(:check_parameter_decl)
+      traversal.enter_kandr_function_definition += T(:check_kandr_fundef)
+      traversal.enter_ansi_function_definition  += T(:check_ansi_fundef)
+      traversal.enter_type_name                 += T(:check_type_name)
     end
 
     private
@@ -892,11 +893,11 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_struct_specifier += T(:enter_struct_specifier)
-      visitor.leave_struct_specifier += T(:leave_struct_specifier)
-      visitor.enter_union_specifier  += T(:enter_union_specifier)
-      visitor.leave_union_specifier  += T(:leave_union_specifier)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_struct_specifier += T(:enter_struct_specifier)
+      traversal.leave_struct_specifier += T(:leave_struct_specifier)
+      traversal.enter_union_specifier  += T(:enter_union_specifier)
+      traversal.leave_union_specifier  += T(:leave_union_specifier)
       @nest_level = 0
     end
 
@@ -929,8 +930,8 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_variable_definition += T(:check)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_variable_definition += T(:check)
     end
 
     private
@@ -950,12 +951,12 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_compound_statement   += T(:enter_block)
-      visitor.leave_compound_statement   += T(:leave_block)
-      visitor.enter_variable_definition  += T(:add_identifier)
-      visitor.enter_variable_declaration += T(:add_identifier)
-      visitor.enter_typedef_declaration  += T(:add_identifier)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_compound_statement   += T(:enter_block)
+      traversal.leave_compound_statement   += T(:leave_block)
+      traversal.enter_variable_definition  += T(:add_identifier)
+      traversal.enter_variable_declaration += T(:add_identifier)
+      traversal.enter_typedef_declaration  += T(:add_identifier)
       @block_stack = [0]
     end
 
@@ -983,9 +984,9 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_struct_type_declaration += T(:check)
-      visitor.enter_union_type_declaration  += T(:check)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_struct_type_declaration += T(:check)
+      traversal.enter_union_type_declaration  += T(:check)
     end
 
     private
@@ -1012,9 +1013,9 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_struct_type_declaration += T(:check_struct)
-      visitor.enter_union_type_declaration  += T(:check_union)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_struct_type_declaration += T(:check_struct)
+      traversal.enter_union_type_declaration  += T(:check_union)
     end
 
     private
@@ -1044,8 +1045,8 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_enum_type_declaration += T(:check)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_enum_type_declaration += T(:check)
     end
 
     private
@@ -1065,8 +1066,8 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_variable_definition += T(:enter_variable_definition)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_variable_definition += T(:enter_variable_definition)
     end
 
     private
@@ -1180,19 +1181,19 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_if_statement      += T(:enter_if_statement)
-      visitor.leave_if_statement      += T(:leave_if_statement)
-      visitor.enter_switch_statement  += T(:enter_switch_statement)
-      visitor.leave_switch_statement  += T(:leave_switch_statement)
-      visitor.enter_while_statement   += T(:enter_while_statement)
-      visitor.leave_while_statement   += T(:leave_while_statement)
-      visitor.enter_do_statement      += T(:enter_do_statement)
-      visitor.leave_do_statement      += T(:leave_do_statement)
-      visitor.enter_for_statement     += T(:enter_for_statement)
-      visitor.leave_for_statement     += T(:leave_for_statement)
-      visitor.enter_c99_for_statement += T(:enter_c99_for_statement)
-      visitor.leave_c99_for_statement += T(:leave_c99_for_statement)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_if_statement      += T(:enter_if_statement)
+      traversal.leave_if_statement      += T(:leave_if_statement)
+      traversal.enter_switch_statement  += T(:enter_switch_statement)
+      traversal.leave_switch_statement  += T(:leave_switch_statement)
+      traversal.enter_while_statement   += T(:enter_while_statement)
+      traversal.leave_while_statement   += T(:leave_while_statement)
+      traversal.enter_do_statement      += T(:enter_do_statement)
+      traversal.leave_do_statement      += T(:leave_do_statement)
+      traversal.enter_for_statement     += T(:enter_for_statement)
+      traversal.leave_for_statement     += T(:leave_for_statement)
+      traversal.enter_c99_for_statement += T(:enter_c99_for_statement)
+      traversal.leave_c99_for_statement += T(:leave_c99_for_statement)
       @ctrl_stmt_level = 0
     end
 
@@ -1261,10 +1262,10 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_switch_statement       += T(:enter_switch_statement)
-      visitor.leave_switch_statement       += T(:leave_switch_statement)
-      visitor.enter_case_labeled_statement += T(:check)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_switch_statement       += T(:enter_switch_statement)
+      traversal.leave_switch_statement       += T(:leave_switch_statement)
+      traversal.enter_case_labeled_statement += T(:check)
       @label_num_stack = []
     end
 
@@ -1399,8 +1400,8 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_string_literal_specifier += T(:check)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_string_literal_specifier += T(:check)
     end
 
     private
@@ -1420,8 +1421,8 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_typeof_type_specifier += T(:check)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_typeof_type_specifier += T(:check)
     end
 
     private
@@ -1439,9 +1440,9 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_alignof_expression      += T(:check)
-      visitor.enter_alignof_type_expression += T(:check)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_alignof_expression      += T(:check)
+      traversal.enter_alignof_type_expression += T(:check)
     end
 
     private
@@ -1478,8 +1479,8 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_simple_assignment_expression += T(:check)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_simple_assignment_expression += T(:check)
     end
 
     private
@@ -1499,9 +1500,9 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_ansi_function_definition  += T(:check_ansi_function)
-      visitor.enter_kandr_function_definition += T(:check_kandr_function)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_ansi_function_definition  += T(:check_ansi_function)
+      traversal.enter_kandr_function_definition += T(:check_kandr_function)
       @interp = phase_ctxt[:cc1_interpreter]
     end
 
@@ -1579,9 +1580,9 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_bit_access_by_value_expression   += T(:check)
-      visitor.enter_bit_access_by_pointer_expression += T(:check)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_bit_access_by_value_expression   += T(:check)
+      traversal.enter_bit_access_by_pointer_expression += T(:check)
     end
 
     private
@@ -1690,8 +1691,8 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_function_declaration += T(:check)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_function_declaration += T(:check)
     end
 
     private
@@ -1709,8 +1710,8 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_variable_definition += T(:check)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_variable_definition += T(:check)
       @interp = phase_ctxt[:cc1_interpreter]
     end
 
@@ -1720,9 +1721,9 @@ module CBuiltin #:nodoc:
 
       if node.type.array? && node.type.base_type.same_as?(@interp.char_t)
         if len = node.type.length
-          visitor = StringLiteralSpecifierFinder.new
-          node.initializer.expression.accept(visitor)
-          if str_lit = visitor.result
+          finder = StringLiteralSpecifierFinder.new
+          node.initializer.expression.accept(finder)
+          if str_lit = finder.result
             str = unquote_string_literal(str_lit)
             W(node.location) if len <= str.length
           end
@@ -1846,8 +1847,8 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_comma_separated_expression += T(:check)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_comma_separated_expression += T(:check)
     end
 
     private
@@ -1871,7 +1872,7 @@ module CBuiltin #:nodoc:
     def do_prepare(phase_ctxt) end
 
     def do_execute(phase_ctxt)
-      phase_ctxt[:cc1_syntax_tree].accept(Visitor.new(phase_ctxt))
+      phase_ctxt[:cc1_ast].accept(Visitor.new(phase_ctxt))
     end
 
     class Visitor < Cc1::SyntaxTreeVisitor
@@ -1925,8 +1926,8 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_conditional_expression += T(:check)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_conditional_expression += T(:check)
     end
 
     private
@@ -1949,14 +1950,14 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_simple_assignment_expression   += T(:enter_assignment)
-      visitor.leave_simple_assignment_expression   += T(:leave_assignment)
-      visitor.enter_compound_assignment_expression += T(:enter_assignment)
-      visitor.leave_compound_assignment_expression += T(:leave_assignment)
-      visitor.enter_function_call_expression       += T(:enter_assignment)
-      visitor.leave_function_call_expression       += T(:leave_assignment)
-      visitor.enter_comma_separated_expression     += T(:check)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_simple_assignment_expression   += T(:enter_assignment)
+      traversal.leave_simple_assignment_expression   += T(:leave_assignment)
+      traversal.enter_compound_assignment_expression += T(:enter_assignment)
+      traversal.leave_compound_assignment_expression += T(:leave_assignment)
+      traversal.enter_function_call_expression       += T(:enter_assignment)
+      traversal.leave_function_call_expression       += T(:leave_assignment)
+      traversal.enter_comma_separated_expression     += T(:check)
       @assignment_depth = 0
     end
 
@@ -2028,13 +2029,12 @@ module CBuiltin #:nodoc:
       super
       @interp = phase_ctxt[:cc1_interpreter]
       @interp.on_multiplicative_expr_evaled += T(:check)
-      @enum_tbl = @interp.environment.enumerator_table
     end
 
     private
     def check(expr, lhs_var, rhs_var, *)
       return if expr.operator.type == "*"
-      return if expr.rhs_operand.constant?(@enum_tbl)
+      return if @interp.constant_expression?(expr.rhs_operand)
 
       return unless rhs_var.type.scalar? && rhs_var.value.scalar?
       return if rhs_var.value.must_be_equal_to?(@interp.scalar_value_of(0))
@@ -2056,13 +2056,12 @@ module CBuiltin #:nodoc:
       super
       @interp = phase_ctxt[:cc1_interpreter]
       @interp.on_multiplicative_expr_evaled += T(:check)
-      @enum_tbl = @interp.environment.enumerator_table
     end
 
     private
     def check(expr, lhs_var, rhs_var, *)
       return if expr.operator.type == "*"
-      return unless expr.rhs_operand.constant?(@enum_tbl)
+      return unless @interp.constant_expression?(expr.rhs_operand)
 
       return unless rhs_var.type.scalar? && rhs_var.value.scalar?
 
@@ -2083,13 +2082,12 @@ module CBuiltin #:nodoc:
       super
       @interp = phase_ctxt[:cc1_interpreter]
       @interp.on_multiplicative_expr_evaled += T(:check)
-      @enum_tbl = @interp.environment.enumerator_table
     end
 
     private
     def check(expr, lhs_var, rhs_var, *)
       return if expr.operator.type == "*"
-      return if expr.rhs_operand.constant?(@enum_tbl)
+      return if @interp.constant_expression?(expr.rhs_operand)
 
       return unless rhs_var.type.scalar? && rhs_var.value.scalar?
 
@@ -2511,7 +2509,7 @@ module CBuiltin #:nodoc:
     def do_prepare(phase_ctxt) end
 
     def do_execute(phase_ctxt)
-      phase_ctxt[:cc1_syntax_tree].accept(Visitor.new(phase_ctxt))
+      phase_ctxt[:cc1_ast].accept(Visitor.new(phase_ctxt))
     end
 
     class Visitor < Cc1::SyntaxTreeVisitor
@@ -2732,7 +2730,7 @@ module CBuiltin #:nodoc:
     def do_prepare(phase_ctxt) end
 
     def do_execute(phase_ctxt)
-      phase_ctxt[:cc1_syntax_tree].accept(Visitor.new(phase_ctxt))
+      phase_ctxt[:cc1_ast].accept(Visitor.new(phase_ctxt))
     end
 
     class Visitor < Cc1::SyntaxTreeVisitor
@@ -8088,8 +8086,8 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_enum_type_declaration += T(:check)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_enum_type_declaration += T(:check)
     end
 
     private
@@ -8113,13 +8111,13 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_if_statement      += T(:check_if_statement)
-      visitor.enter_if_else_statement += T(:check_if_else_statement)
-      visitor.enter_while_statement   += T(:check_while_statement)
-      visitor.enter_do_statement      += T(:check_do_statement)
-      visitor.enter_for_statement     += T(:check_for_statement)
-      visitor.enter_c99_for_statement += T(:check_for_statement)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_if_statement      += T(:check_if_statement)
+      traversal.enter_if_else_statement += T(:check_if_else_statement)
+      traversal.enter_while_statement   += T(:check_while_statement)
+      traversal.enter_do_statement      += T(:check_do_statement)
+      traversal.enter_for_statement     += T(:check_for_statement)
+      traversal.enter_c99_for_statement += T(:check_for_statement)
     end
 
     private
@@ -8187,13 +8185,13 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_if_statement      += T(:check_if_statement)
-      visitor.enter_if_else_statement += T(:check_if_else_statement)
-      visitor.enter_while_statement   += T(:check_while_statement)
-      visitor.enter_do_statement      += T(:check_do_statement)
-      visitor.enter_for_statement     += T(:check_for_statement)
-      visitor.enter_c99_for_statement += T(:check_for_statement)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_if_statement      += T(:check_if_statement)
+      traversal.enter_if_else_statement += T(:check_if_else_statement)
+      traversal.enter_while_statement   += T(:check_while_statement)
+      traversal.enter_do_statement      += T(:check_do_statement)
+      traversal.enter_for_statement     += T(:check_for_statement)
+      traversal.enter_c99_for_statement += T(:check_for_statement)
     end
 
     private
@@ -8265,33 +8263,35 @@ module CBuiltin #:nodoc:
       @interp.on_indirection_expr_evaled     += T(:check_indirection)
       @interp.on_member_access_expr_evaled   += T(:check_member_access)
       @interp.on_array_subscript_expr_evaled += T(:check_array_subscript)
-      @enum_tbl = @interp.environment.enumerator_table
     end
 
     private
     def check_indirection(expr, ptr_var, *)
-      return if expr.operand.constant?(@enum_tbl)
-      if ptr_var.value.scalar? &&
-          ptr_var.value.must_be_equal_to?(@interp.scalar_value_of(0))
-        W(expr.location)
+      unless @interp.constant_expression?(expr.operand)
+        if ptr_var.value.scalar? &&
+            ptr_var.value.must_be_equal_to?(@interp.scalar_value_of(0))
+          W(expr.location)
+        end
       end
     end
 
     def check_member_access(expr, outer_var, *)
       return unless outer_var.type.pointer?
-      return if expr.expression.constant?(@enum_tbl)
-      if outer_var.value.scalar? &&
-          outer_var.value.must_be_equal_to?(@interp.scalar_value_of(0))
-        W(expr.location)
+      unless @interp.constant_expression?(expr.expression)
+        if outer_var.value.scalar? &&
+            outer_var.value.must_be_equal_to?(@interp.scalar_value_of(0))
+          W(expr.location)
+        end
       end
     end
 
     def check_array_subscript(expr, ary_or_ptr, *)
       return unless ary_or_ptr.type.pointer?
-      return if expr.expression.constant?(@enum_tbl)
-      if ary_or_ptr.value.scalar? &&
-          ary_or_ptr.value.must_be_equal_to?(@interp.scalar_value_of(0))
-        W(expr.location)
+      unless @interp.constant_expression?(expr.expression)
+        if ary_or_ptr.value.scalar? &&
+            ary_or_ptr.value.must_be_equal_to?(@interp.scalar_value_of(0))
+          W(expr.location)
+        end
       end
     end
   end
@@ -8309,12 +8309,11 @@ module CBuiltin #:nodoc:
       @interp.on_indirection_expr_evaled     += T(:check_indirection)
       @interp.on_member_access_expr_evaled   += T(:check_member_access)
       @interp.on_array_subscript_expr_evaled += T(:check_array_subscript)
-      @enum_tbl = @interp.environment.enumerator_table
     end
 
     private
     def check_indirection(expr, ptr_var, *)
-      return if expr.operand.constant?(@enum_tbl)
+      return if @interp.constant_expression?(expr.operand)
       return unless ptr_var.value.scalar?
 
       if !ptr_var.value.must_be_equal_to?(@interp.scalar_value_of(0)) &&
@@ -8325,7 +8324,7 @@ module CBuiltin #:nodoc:
 
     def check_member_access(expr, outer_var, *)
       return unless outer_var.type.pointer?
-      return if expr.expression.constant?(@enum_tbl)
+      return if @interp.constant_expression?(expr.expression)
       return unless outer_var.value.scalar?
 
       if !outer_var.value.must_be_equal_to?(@interp.scalar_value_of(0)) &&
@@ -8336,7 +8335,7 @@ module CBuiltin #:nodoc:
 
     def check_array_subscript(expr, ary_or_ptr, *)
       return unless ary_or_ptr.type.pointer?
-      return if expr.expression.constant?(@enum_tbl)
+      return if @interp.constant_expression?(expr.expression)
       return unless ary_or_ptr.value.scalar?
 
       if !ary_or_ptr.value.must_be_equal_to?(@interp.scalar_value_of(0)) &&
@@ -8473,7 +8472,7 @@ module CBuiltin #:nodoc:
     def do_prepare(phase_ctxt) end
 
     def do_execute(phase_ctxt)
-      phase_ctxt[:cc1_syntax_tree].accept(Visitor.new(phase_ctxt))
+      phase_ctxt[:cc1_ast].accept(Visitor.new(phase_ctxt))
     end
 
     class Visitor < Cc1::SyntaxTreeVisitor
@@ -8681,8 +8680,9 @@ module CBuiltin #:nodoc:
     private
     def do_prepare(phase_ctxt)
       fpath = phase_ctxt[:sources].first.fpath
-      tok_ary = phase_ctxt[:cc1_token_array]
-      @tokens = tok_ary.select { |tok| tok.location.fpath == fpath }
+      @tokens = phase_ctxt[:cc1_tokens].select { |tok|
+        tok.location.fpath == fpath
+      }
       @index = 0
       @indent_level = 0
       @indent_widths = Hash.new(0)
@@ -8884,8 +8884,9 @@ module CBuiltin #:nodoc:
     private
     def do_prepare(phase_ctxt)
       fpath = phase_ctxt[:sources].first.fpath
-      tok_ary = phase_ctxt[:cc1_token_array]
-      @tokens = tok_ary.select { |tok| tok.location.fpath == fpath }
+      @tokens = phase_ctxt[:cc1_tokens].select { |tok|
+        tok.location.fpath == fpath
+      }
       @index  = 0
       @indent_level = 0
       @indent_width = indent_width
@@ -9111,8 +9112,8 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_compound_statement += T(:check)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_compound_statement += T(:check)
     end
 
     private
@@ -9161,7 +9162,7 @@ module CBuiltin #:nodoc:
     def do_prepare(phase_ctxt) end
 
     def do_execute(phase_ctxt)
-      phase_ctxt[:cc1_syntax_tree].accept(Visitor.new(phase_ctxt))
+      phase_ctxt[:cc1_ast].accept(Visitor.new(phase_ctxt))
     end
 
     class Visitor < Cc1::SyntaxTreeVisitor
@@ -9265,12 +9266,12 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_comma_separated_expression += T(:check)
-      visitor.enter_for_statement              += T(:enter_for_statement)
-      visitor.leave_for_statement              += T(:leave_for_statement)
-      visitor.enter_c99_for_statement          += T(:enter_for_statement)
-      visitor.leave_c99_for_statement          += T(:leave_for_statement)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_comma_separated_expression += T(:check)
+      traversal.enter_for_statement              += T(:enter_for_statement)
+      traversal.leave_for_statement              += T(:leave_for_statement)
+      traversal.enter_c99_for_statement          += T(:enter_for_statement)
+      traversal.leave_c99_for_statement          += T(:leave_for_statement)
       @in_for_stmt = false
     end
 
@@ -9330,10 +9331,10 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_function_declaration      += T(:check_function)
-      visitor.enter_ansi_function_definition  += T(:check_function)
-      visitor.enter_kandr_function_definition += T(:check_function)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_function_declaration      += T(:check_function)
+      traversal.enter_ansi_function_definition  += T(:check_function)
+      traversal.enter_kandr_function_definition += T(:check_function)
     end
 
     private
@@ -9351,10 +9352,10 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_variable_declaration += T(:check_variable)
-      visitor.enter_variable_definition  += T(:check_variable)
-      visitor.enter_parameter_definition += T(:check_variable)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_variable_declaration += T(:check_variable)
+      traversal.enter_variable_definition  += T(:check_variable)
+      traversal.enter_parameter_definition += T(:check_variable)
     end
 
     private
@@ -9484,17 +9485,17 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_initializer          += T(:check_initializer)
-      visitor.enter_expression_statement += T(:check_expr_statement)
-      visitor.enter_if_statement         += T(:check_selection_statement)
-      visitor.enter_if_else_statement    += T(:check_selection_statement)
-      visitor.enter_switch_statement     += T(:check_selection_statement)
-      visitor.enter_while_statement      += T(:check_iteration_statement)
-      visitor.enter_do_statement         += T(:check_iteration_statement)
-      visitor.enter_for_statement        += T(:check_iteration_statement)
-      visitor.enter_c99_for_statement    += T(:check_iteration_statement)
-      visitor.enter_return_statement     += T(:check_return_statement)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_initializer          += T(:check_initializer)
+      traversal.enter_expression_statement += T(:check_expr_statement)
+      traversal.enter_if_statement         += T(:check_selection_statement)
+      traversal.enter_if_else_statement    += T(:check_selection_statement)
+      traversal.enter_switch_statement     += T(:check_selection_statement)
+      traversal.enter_while_statement      += T(:check_iteration_statement)
+      traversal.enter_do_statement         += T(:check_iteration_statement)
+      traversal.enter_for_statement        += T(:check_iteration_statement)
+      traversal.enter_c99_for_statement    += T(:check_iteration_statement)
+      traversal.enter_return_statement     += T(:check_return_statement)
     end
 
     private
@@ -9659,17 +9660,17 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_initializer          += T(:check_initializer)
-      visitor.enter_expression_statement += T(:check_expr_statement)
-      visitor.enter_if_statement         += T(:check_selection_statement)
-      visitor.enter_if_else_statement    += T(:check_selection_statement)
-      visitor.enter_switch_statement     += T(:check_selection_statement)
-      visitor.enter_while_statement      += T(:check_iteration_statement)
-      visitor.enter_do_statement         += T(:check_iteration_statement)
-      visitor.enter_for_statement        += T(:check_iteration_statement)
-      visitor.enter_c99_for_statement    += T(:check_iteration_statement)
-      visitor.enter_return_statement     += T(:check_return_statement)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_initializer          += T(:check_initializer)
+      traversal.enter_expression_statement += T(:check_expr_statement)
+      traversal.enter_if_statement         += T(:check_selection_statement)
+      traversal.enter_if_else_statement    += T(:check_selection_statement)
+      traversal.enter_switch_statement     += T(:check_selection_statement)
+      traversal.enter_while_statement      += T(:check_iteration_statement)
+      traversal.enter_do_statement         += T(:check_iteration_statement)
+      traversal.enter_for_statement        += T(:check_iteration_statement)
+      traversal.enter_c99_for_statement    += T(:check_iteration_statement)
+      traversal.enter_return_statement     += T(:check_return_statement)
     end
 
     private
@@ -9845,17 +9846,17 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_initializer          += T(:check_initializer)
-      visitor.enter_expression_statement += T(:check_expr_statement)
-      visitor.enter_if_statement         += T(:check_selection_statement)
-      visitor.enter_if_else_statement    += T(:check_selection_statement)
-      visitor.enter_switch_statement     += T(:check_selection_statement)
-      visitor.enter_while_statement      += T(:check_iteration_statement)
-      visitor.enter_do_statement         += T(:check_iteration_statement)
-      visitor.enter_for_statement        += T(:check_iteration_statement)
-      visitor.enter_c99_for_statement    += T(:check_iteration_statement)
-      visitor.enter_return_statement     += T(:check_return_statement)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_initializer          += T(:check_initializer)
+      traversal.enter_expression_statement += T(:check_expr_statement)
+      traversal.enter_if_statement         += T(:check_selection_statement)
+      traversal.enter_if_else_statement    += T(:check_selection_statement)
+      traversal.enter_switch_statement     += T(:check_selection_statement)
+      traversal.enter_while_statement      += T(:check_iteration_statement)
+      traversal.enter_do_statement         += T(:check_iteration_statement)
+      traversal.enter_for_statement        += T(:check_iteration_statement)
+      traversal.enter_c99_for_statement    += T(:check_iteration_statement)
+      traversal.enter_return_statement     += T(:check_return_statement)
     end
 
     private
@@ -10422,17 +10423,17 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_initializer          += T(:check_initializer)
-      visitor.enter_expression_statement += T(:check_expr_statement)
-      visitor.enter_if_statement         += T(:check_selection_statement)
-      visitor.enter_if_else_statement    += T(:check_selection_statement)
-      visitor.enter_switch_statement     += T(:check_selection_statement)
-      visitor.enter_while_statement      += T(:check_iteration_statement)
-      visitor.enter_do_statement         += T(:check_iteration_statement)
-      visitor.enter_for_statement        += T(:check_iteration_statement)
-      visitor.enter_c99_for_statement    += T(:check_iteration_statement)
-      visitor.enter_return_statement     += T(:check_return_statement)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_initializer          += T(:check_initializer)
+      traversal.enter_expression_statement += T(:check_expr_statement)
+      traversal.enter_if_statement         += T(:check_selection_statement)
+      traversal.enter_if_else_statement    += T(:check_selection_statement)
+      traversal.enter_switch_statement     += T(:check_selection_statement)
+      traversal.enter_while_statement      += T(:check_iteration_statement)
+      traversal.enter_do_statement         += T(:check_iteration_statement)
+      traversal.enter_for_statement        += T(:check_iteration_statement)
+      traversal.enter_c99_for_statement    += T(:check_iteration_statement)
+      traversal.enter_return_statement     += T(:check_return_statement)
     end
 
     private
@@ -10597,17 +10598,17 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_initializer          += T(:check_initializer)
-      visitor.enter_expression_statement += T(:check_expr_statement)
-      visitor.enter_if_statement         += T(:check_selection_statement)
-      visitor.enter_if_else_statement    += T(:check_selection_statement)
-      visitor.enter_switch_statement     += T(:check_selection_statement)
-      visitor.enter_while_statement      += T(:check_iteration_statement)
-      visitor.enter_do_statement         += T(:check_iteration_statement)
-      visitor.enter_for_statement        += T(:check_iteration_statement)
-      visitor.enter_c99_for_statement    += T(:check_iteration_statement)
-      visitor.enter_return_statement     += T(:check_return_statement)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_initializer          += T(:check_initializer)
+      traversal.enter_expression_statement += T(:check_expr_statement)
+      traversal.enter_if_statement         += T(:check_selection_statement)
+      traversal.enter_if_else_statement    += T(:check_selection_statement)
+      traversal.enter_switch_statement     += T(:check_selection_statement)
+      traversal.enter_while_statement      += T(:check_iteration_statement)
+      traversal.enter_do_statement         += T(:check_iteration_statement)
+      traversal.enter_for_statement        += T(:check_iteration_statement)
+      traversal.enter_c99_for_statement    += T(:check_iteration_statement)
+      traversal.enter_return_statement     += T(:check_return_statement)
     end
 
     private
@@ -10715,17 +10716,17 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_initializer          += T(:check_initializer)
-      visitor.enter_expression_statement += T(:check_expr_statement)
-      visitor.enter_if_statement         += T(:check_selection_statement)
-      visitor.enter_if_else_statement    += T(:check_selection_statement)
-      visitor.enter_switch_statement     += T(:check_selection_statement)
-      visitor.enter_while_statement      += T(:check_iteration_statement)
-      visitor.enter_do_statement         += T(:check_iteration_statement)
-      visitor.enter_for_statement        += T(:check_iteration_statement)
-      visitor.enter_c99_for_statement    += T(:check_iteration_statement)
-      visitor.enter_return_statement     += T(:check_return_statement)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_initializer          += T(:check_initializer)
+      traversal.enter_expression_statement += T(:check_expr_statement)
+      traversal.enter_if_statement         += T(:check_selection_statement)
+      traversal.enter_if_else_statement    += T(:check_selection_statement)
+      traversal.enter_switch_statement     += T(:check_selection_statement)
+      traversal.enter_while_statement      += T(:check_iteration_statement)
+      traversal.enter_do_statement         += T(:check_iteration_statement)
+      traversal.enter_for_statement        += T(:check_iteration_statement)
+      traversal.enter_c99_for_statement    += T(:check_iteration_statement)
+      traversal.enter_return_statement     += T(:check_return_statement)
     end
 
     private
@@ -10904,17 +10905,17 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_initializer          += T(:check_initializer)
-      visitor.enter_expression_statement += T(:check_expr_statement)
-      visitor.enter_if_statement         += T(:check_selection_statement)
-      visitor.enter_if_else_statement    += T(:check_selection_statement)
-      visitor.enter_switch_statement     += T(:check_selection_statement)
-      visitor.enter_while_statement      += T(:check_iteration_statement)
-      visitor.enter_do_statement         += T(:check_iteration_statement)
-      visitor.enter_for_statement        += T(:check_iteration_statement)
-      visitor.enter_c99_for_statement    += T(:check_iteration_statement)
-      visitor.enter_return_statement     += T(:check_return_statement)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_initializer          += T(:check_initializer)
+      traversal.enter_expression_statement += T(:check_expr_statement)
+      traversal.enter_if_statement         += T(:check_selection_statement)
+      traversal.enter_if_else_statement    += T(:check_selection_statement)
+      traversal.enter_switch_statement     += T(:check_selection_statement)
+      traversal.enter_while_statement      += T(:check_iteration_statement)
+      traversal.enter_do_statement         += T(:check_iteration_statement)
+      traversal.enter_for_statement        += T(:check_iteration_statement)
+      traversal.enter_c99_for_statement    += T(:check_iteration_statement)
+      traversal.enter_return_statement     += T(:check_return_statement)
     end
 
     private
@@ -11068,17 +11069,17 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_initializer          += T(:check_initializer)
-      visitor.enter_expression_statement += T(:check_expr_statement)
-      visitor.enter_if_statement         += T(:check_selection_statement)
-      visitor.enter_if_else_statement    += T(:check_selection_statement)
-      visitor.enter_switch_statement     += T(:check_selection_statement)
-      visitor.enter_while_statement      += T(:check_iteration_statement)
-      visitor.enter_do_statement         += T(:check_iteration_statement)
-      visitor.enter_for_statement        += T(:check_iteration_statement)
-      visitor.enter_c99_for_statement    += T(:check_iteration_statement)
-      visitor.enter_return_statement     += T(:check_return_statement)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_initializer          += T(:check_initializer)
+      traversal.enter_expression_statement += T(:check_expr_statement)
+      traversal.enter_if_statement         += T(:check_selection_statement)
+      traversal.enter_if_else_statement    += T(:check_selection_statement)
+      traversal.enter_switch_statement     += T(:check_selection_statement)
+      traversal.enter_while_statement      += T(:check_iteration_statement)
+      traversal.enter_do_statement         += T(:check_iteration_statement)
+      traversal.enter_for_statement        += T(:check_iteration_statement)
+      traversal.enter_c99_for_statement    += T(:check_iteration_statement)
+      traversal.enter_return_statement     += T(:check_return_statement)
     end
 
     private
@@ -11269,17 +11270,17 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_initializer          += T(:check_initializer)
-      visitor.enter_expression_statement += T(:check_expr_statement)
-      visitor.enter_if_statement         += T(:check_selection_statement)
-      visitor.enter_if_else_statement    += T(:check_selection_statement)
-      visitor.enter_switch_statement     += T(:check_selection_statement)
-      visitor.enter_while_statement      += T(:check_iteration_statement)
-      visitor.enter_do_statement         += T(:check_iteration_statement)
-      visitor.enter_for_statement        += T(:check_iteration_statement)
-      visitor.enter_c99_for_statement    += T(:check_iteration_statement)
-      visitor.enter_return_statement     += T(:check_return_statement)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_initializer          += T(:check_initializer)
+      traversal.enter_expression_statement += T(:check_expr_statement)
+      traversal.enter_if_statement         += T(:check_selection_statement)
+      traversal.enter_if_else_statement    += T(:check_selection_statement)
+      traversal.enter_switch_statement     += T(:check_selection_statement)
+      traversal.enter_while_statement      += T(:check_iteration_statement)
+      traversal.enter_do_statement         += T(:check_iteration_statement)
+      traversal.enter_for_statement        += T(:check_iteration_statement)
+      traversal.enter_c99_for_statement    += T(:check_iteration_statement)
+      traversal.enter_return_statement     += T(:check_return_statement)
     end
 
     private
@@ -11433,17 +11434,17 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_initializer          += T(:check_initializer)
-      visitor.enter_expression_statement += T(:check_expr_statement)
-      visitor.enter_if_statement         += T(:check_selection_statement)
-      visitor.enter_if_else_statement    += T(:check_selection_statement)
-      visitor.enter_switch_statement     += T(:check_selection_statement)
-      visitor.enter_while_statement      += T(:check_iteration_statement)
-      visitor.enter_do_statement         += T(:check_iteration_statement)
-      visitor.enter_for_statement        += T(:check_iteration_statement)
-      visitor.enter_c99_for_statement    += T(:check_iteration_statement)
-      visitor.enter_return_statement     += T(:check_return_statement)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_initializer          += T(:check_initializer)
+      traversal.enter_expression_statement += T(:check_expr_statement)
+      traversal.enter_if_statement         += T(:check_selection_statement)
+      traversal.enter_if_else_statement    += T(:check_selection_statement)
+      traversal.enter_switch_statement     += T(:check_selection_statement)
+      traversal.enter_while_statement      += T(:check_iteration_statement)
+      traversal.enter_do_statement         += T(:check_iteration_statement)
+      traversal.enter_for_statement        += T(:check_iteration_statement)
+      traversal.enter_c99_for_statement    += T(:check_iteration_statement)
+      traversal.enter_return_statement     += T(:check_return_statement)
     end
 
     private
@@ -11607,17 +11608,17 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_initializer          += T(:check_initializer)
-      visitor.enter_expression_statement += T(:check_expr_statement)
-      visitor.enter_if_statement         += T(:check_selection_statement)
-      visitor.enter_if_else_statement    += T(:check_selection_statement)
-      visitor.enter_switch_statement     += T(:check_selection_statement)
-      visitor.enter_while_statement      += T(:check_iteration_statement)
-      visitor.enter_do_statement         += T(:check_iteration_statement)
-      visitor.enter_for_statement        += T(:check_iteration_statement)
-      visitor.enter_c99_for_statement    += T(:check_iteration_statement)
-      visitor.enter_return_statement     += T(:check_return_statement)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_initializer          += T(:check_initializer)
+      traversal.enter_expression_statement += T(:check_expr_statement)
+      traversal.enter_if_statement         += T(:check_selection_statement)
+      traversal.enter_if_else_statement    += T(:check_selection_statement)
+      traversal.enter_switch_statement     += T(:check_selection_statement)
+      traversal.enter_while_statement      += T(:check_iteration_statement)
+      traversal.enter_do_statement         += T(:check_iteration_statement)
+      traversal.enter_for_statement        += T(:check_iteration_statement)
+      traversal.enter_c99_for_statement    += T(:check_iteration_statement)
+      traversal.enter_return_statement     += T(:check_return_statement)
     end
 
     private
@@ -11857,9 +11858,9 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_logical_and_expression += T(:check)
-      visitor.enter_logical_or_expression  += T(:check)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_logical_and_expression += T(:check)
+      traversal.enter_logical_or_expression  += T(:check)
     end
 
     private
@@ -11877,13 +11878,13 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_expression_statement         += T(:enter_expr_stmt)
-      visitor.leave_expression_statement         += T(:leave_expr_stmt)
-      visitor.enter_postfix_increment_expression += T(:check)
-      visitor.enter_postfix_decrement_expression += T(:check)
-      visitor.enter_prefix_increment_expression  += T(:check)
-      visitor.enter_prefix_decrement_expression  += T(:check)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_expression_statement         += T(:enter_expr_stmt)
+      traversal.leave_expression_statement         += T(:leave_expr_stmt)
+      traversal.enter_postfix_increment_expression += T(:check)
+      traversal.enter_postfix_decrement_expression += T(:check)
+      traversal.enter_prefix_increment_expression  += T(:check)
+      traversal.enter_prefix_decrement_expression  += T(:check)
       @cur_stmt = nil
     end
 
@@ -11914,8 +11915,8 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_member_declaration += T(:check)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_member_declaration += T(:check)
     end
 
     private
@@ -11936,8 +11937,8 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_constant_specifier += T(:check)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_constant_specifier += T(:check)
     end
 
     private
@@ -11957,9 +11958,9 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_constant_specifier       += T(:check_constant)
-      visitor.enter_string_literal_specifier += T(:check_string_literal)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_constant_specifier       += T(:check_constant)
+      traversal.enter_string_literal_specifier += T(:check_string_literal)
     end
 
     private
@@ -11985,8 +11986,8 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_switch_statement += T(:check_switch_statement)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_switch_statement += T(:check_switch_statement)
     end
 
     private
@@ -12106,12 +12107,12 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_comma_separated_expression += T(:check)
-      visitor.enter_for_statement              += T(:enter_for_statement)
-      visitor.leave_for_statement              += T(:leave_for_statement)
-      visitor.enter_c99_for_statement          += T(:enter_for_statement)
-      visitor.leave_c99_for_statement          += T(:leave_for_statement)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_comma_separated_expression += T(:check)
+      traversal.enter_for_statement              += T(:enter_for_statement)
+      traversal.leave_for_statement              += T(:leave_for_statement)
+      traversal.enter_c99_for_statement          += T(:enter_for_statement)
+      traversal.leave_c99_for_statement          += T(:leave_for_statement)
       @in_for_stmt = false
     end
 
@@ -12138,8 +12139,8 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_switch_statement += T(:check)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_switch_statement += T(:check)
     end
 
     private
@@ -12194,8 +12195,8 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_ansi_function_definition += T(:check)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_ansi_function_definition += T(:check)
     end
 
     private
@@ -12215,8 +12216,8 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_function_declaration += T(:check)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_function_declaration += T(:check)
     end
 
     private
@@ -12276,8 +12277,8 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_ansi_function_definition += T(:check)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_ansi_function_definition += T(:check)
       @interp = phase_ctxt[:cc1_interpreter]
     end
 
@@ -12363,8 +12364,8 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_switch_statement += T(:check)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_switch_statement += T(:check)
     end
 
     private
@@ -12466,8 +12467,8 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_union_type_declaration += T(:check)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_union_type_declaration += T(:check)
     end
 
     private
@@ -12563,8 +12564,8 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_unary_arithmetic_expression += T(:check)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_unary_arithmetic_expression += T(:check)
     end
 
     private
@@ -12609,8 +12610,8 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_unary_arithmetic_expression += T(:check)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_unary_arithmetic_expression += T(:check)
     end
 
     private
@@ -12665,8 +12666,8 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_expression_statement += T(:check)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_expression_statement += T(:check)
     end
 
     private
@@ -12690,8 +12691,8 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_variable_definition += T(:check)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_variable_definition += T(:check)
     end
 
     private
@@ -12733,10 +12734,10 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_compound_statement        += T(:enter_block)
-      visitor.leave_compound_statement        += T(:leave_block)
-      visitor.enter_generic_labeled_statement += T(:check)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_compound_statement        += T(:enter_block)
+      traversal.leave_compound_statement        += T(:leave_block)
+      traversal.enter_generic_labeled_statement += T(:check)
       @blocks = []
     end
 
@@ -12778,10 +12779,10 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_compound_statement        += T(:enter_block)
-      visitor.leave_compound_statement        += T(:leave_block)
-      visitor.enter_generic_labeled_statement += T(:check)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_compound_statement        += T(:enter_block)
+      traversal.leave_compound_statement        += T(:leave_block)
+      traversal.enter_generic_labeled_statement += T(:check)
       @blocks = []
     end
 
@@ -12918,7 +12919,6 @@ module CBuiltin #:nodoc:
       super
       @interp = phase_ctxt[:cc1_interpreter]
       @interp.on_shift_expr_evaled += T(:check)
-      @enum_tbl = @interp.environment.enumerator_table
     end
 
     private
@@ -12926,7 +12926,7 @@ module CBuiltin #:nodoc:
       op = expr.operator.type
       return unless op == "<<" || op == "<<="
 
-      return unless expr.lhs_operand.constant?(@enum_tbl)
+      return unless @interp.constant_expression?(expr.lhs_operand)
       return unless lhs_var.type.signed?
 
       if lhs_var.value.must_be_less_than?(@interp.scalar_value_of(0)) or
@@ -12954,7 +12954,6 @@ module CBuiltin #:nodoc:
       super
       @interp = phase_ctxt[:cc1_interpreter]
       @interp.on_shift_expr_evaled += T(:check)
-      @enum_tbl = @interp.environment.enumerator_table
     end
 
     private
@@ -12962,7 +12961,7 @@ module CBuiltin #:nodoc:
       op = expr.operator.type
       return unless op == "<<" || op == "<<="
 
-      return if expr.lhs_operand.constant?(@enum_tbl)
+      return if @interp.constant_expression?(expr.lhs_operand)
       return unless lhs_var.type.signed?
 
       if lhs_var.value.must_be_less_than?(@interp.scalar_value_of(0)) or
@@ -12990,7 +12989,6 @@ module CBuiltin #:nodoc:
       super
       @interp = phase_ctxt[:cc1_interpreter]
       @interp.on_shift_expr_evaled += T(:check)
-      @enum_tbl = @interp.environment.enumerator_table
     end
 
     private
@@ -12998,7 +12996,7 @@ module CBuiltin #:nodoc:
       op = expr.operator.type
       return unless op == "<<" || op == "<<="
 
-      return if expr.lhs_operand.constant?(@enum_tbl)
+      return if @interp.constant_expression?(expr.lhs_operand)
       return unless lhs_var.type.signed?
 
       if !lhs_var.value.must_be_less_than?(@interp.scalar_value_of(0)) &&
@@ -13351,7 +13349,6 @@ module CBuiltin #:nodoc:
       @interp = phase_ctxt[:cc1_interpreter]
       @interp.on_function_call_expr_evaled  += T(:call_function)
       @interp.on_explicit_function_declared += T(:check)
-      @enum_tbl = @interp.environment.enumerator_table
       @funcalls = Hash.new { |hash, key| hash[key] = [] }
     end
 
@@ -13366,7 +13363,8 @@ module CBuiltin #:nodoc:
         if args.size == param_types.size
           types = args.map { |ary| ary.first }.zip(param_types)
           conformed = types.each_with_index.all? { |(atype, ptype), idx|
-            funcall_expr.argument_expressions[idx].constant?(@enum_tbl) &&
+            arg_expr = funcall_expr.argument_expressions[idx]
+            @interp.constant_expression?(arg_expr) &&
               untyped_pointer_conversion?(atype, ptype, args[idx].last) or
             atype.convertible?(ptype)
           }
@@ -13405,7 +13403,6 @@ module CBuiltin #:nodoc:
       @interp = phase_ctxt[:cc1_interpreter]
       @interp.on_function_call_expr_evaled += T(:call_function)
       @interp.on_explicit_function_defined += T(:check)
-      @enum_tbl = @interp.environment.enumerator_table
       @funcalls = Hash.new { |hash, key| hash[key] = [] }
     end
 
@@ -13420,7 +13417,8 @@ module CBuiltin #:nodoc:
         if args.size == param_types.size
           types = args.map { |ary| ary.first }.zip(param_types)
           conformed = types.each_with_index.all? { |(atype, ptype), idx|
-            funcall_expr.argument_expressions[idx].constant?(@enum_tbl) &&
+            arg_expr = funcall_expr.argument_expressions[idx]
+            @interp.constant_expression?(arg_expr) &&
               untyped_pointer_conversion?(atype, ptype, args[idx].last) or
             atype.convertible?(ptype)
           }
@@ -13458,7 +13456,6 @@ module CBuiltin #:nodoc:
       super
       @interp = phase_ctxt[:cc1_interpreter]
       @interp.on_function_call_expr_evaled += T(:check)
-      @enum_tbl = @interp.environment.enumerator_table
     end
 
     private
@@ -13474,7 +13471,7 @@ module CBuiltin #:nodoc:
 
       args.zip(param_types).each_with_index do |(arg, ptype), idx|
         arg_expr = funcall_expr.argument_expressions[idx]
-        if arg_expr.constant?(@enum_tbl)
+        if @interp.constant_expression?(arg_expr)
           next if untyped_pointer_conversion?(arg.first, ptype, arg.last)
         end
 
@@ -13774,18 +13771,18 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_break_statement   += T(:check)
-      visitor.enter_switch_statement  += T(:enter_breakable_statement)
-      visitor.leave_switch_statement  += T(:leave_breakable_statement)
-      visitor.enter_while_statement   += T(:enter_breakable_statement)
-      visitor.leave_while_statement   += T(:leave_breakable_statement)
-      visitor.enter_do_statement      += T(:enter_breakable_statement)
-      visitor.leave_do_statement      += T(:leave_breakable_statement)
-      visitor.enter_for_statement     += T(:enter_breakable_statement)
-      visitor.leave_for_statement     += T(:leave_breakable_statement)
-      visitor.enter_c99_for_statement += T(:enter_breakable_statement)
-      visitor.leave_c99_for_statement += T(:leave_breakable_statement)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_break_statement   += T(:check)
+      traversal.enter_switch_statement  += T(:enter_breakable_statement)
+      traversal.leave_switch_statement  += T(:leave_breakable_statement)
+      traversal.enter_while_statement   += T(:enter_breakable_statement)
+      traversal.leave_while_statement   += T(:leave_breakable_statement)
+      traversal.enter_do_statement      += T(:enter_breakable_statement)
+      traversal.leave_do_statement      += T(:leave_breakable_statement)
+      traversal.enter_for_statement     += T(:enter_breakable_statement)
+      traversal.leave_for_statement     += T(:leave_breakable_statement)
+      traversal.enter_c99_for_statement += T(:enter_breakable_statement)
+      traversal.leave_c99_for_statement += T(:leave_breakable_statement)
       @breakable_stmts = []
     end
 
@@ -14073,7 +14070,7 @@ module CBuiltin #:nodoc:
 
     def check(*)
       if ctrlexpr = @iter_stmts.last.ctrlexpr
-        unless ctrlexpr.constant?(@interp.environment.enumerator_table)
+        unless @interp.constant_expression?(ctrlexpr)
           ctrlexpr_val = @iter_stmts.last.ctrlexpr_val
           ctrl_vars = @iter_stmts.last.ctrl_vars
           if ctrlexpr_val && ctrlexpr_val.must_be_true? and
@@ -14095,16 +14092,15 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      interp = phase_ctxt[:cc1_interpreter]
-      interp.on_if_ctrlexpr_evaled      += T(:check)
-      interp.on_if_else_ctrlexpr_evaled += T(:check)
-      @enum_tbl = interp.environment.enumerator_table
+      @interp = phase_ctxt[:cc1_interpreter]
+      @interp.on_if_ctrlexpr_evaled      += T(:check)
+      @interp.on_if_else_ctrlexpr_evaled += T(:check)
     end
 
     private
     def check(selection_stmt, ctrlexpr_val)
       if ctrlexpr = selection_stmt.expression
-        unless ctrlexpr.constant?(@enum_tbl)
+        unless @interp.constant_expression?(ctrlexpr)
           W(ctrlexpr.location) if ctrlexpr_val.must_be_true?
         end
       end
@@ -14173,14 +14169,13 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      interp = phase_ctxt[:cc1_interpreter]
-      interp.on_do_ctrlexpr_evaled += T(:check)
-      @enum_tbl = interp.environment.enumerator_table
+      @interp = phase_ctxt[:cc1_interpreter]
+      @interp.on_do_ctrlexpr_evaled += T(:check)
     end
 
     private
     def check(do_stmt, ctrlexpr_val)
-      unless do_stmt.expression.constant?(@enum_tbl)
+      unless @interp.constant_expression?(do_stmt.expression)
         if ctrlexpr_val.must_be_false?
           W(do_stmt.expression.location)
         end
@@ -14263,11 +14258,11 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_ansi_function_definition  += T(:check)
-      visitor.enter_kandr_function_definition += T(:check)
-      @dires = collect_define_lines(phase_ctxt[:cpp_syntax_tree]) +
-               collect_undef_lines(phase_ctxt[:cpp_syntax_tree])
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_ansi_function_definition  += T(:check)
+      traversal.enter_kandr_function_definition += T(:check)
+      @dires = collect_define_lines(phase_ctxt[:cpp_ast]) +
+               collect_undef_lines(phase_ctxt[:cpp_ast])
     end
 
     private
@@ -14343,9 +14338,9 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_constant_specifier       += T(:check_constant)
-      visitor.enter_string_literal_specifier += T(:check_string_literal)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_constant_specifier       += T(:check_constant)
+      traversal.enter_string_literal_specifier += T(:check_string_literal)
     end
 
     private
@@ -14367,21 +14362,21 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_compound_statement   += T(:enter_block)
-      visitor.leave_compound_statement   += T(:leave_block)
-      visitor.enter_expression_statement += T(:enter_expression_statement)
-      visitor.enter_if_statement         += T(:update_last_statement)
-      visitor.enter_if_else_statement    += T(:update_last_statement)
-      visitor.enter_switch_statement     += T(:update_last_statement)
-      visitor.enter_while_statement      += T(:update_last_statement)
-      visitor.enter_do_statement         += T(:update_last_statement)
-      visitor.enter_for_statement        += T(:enter_for_statement)
-      visitor.enter_c99_for_statement    += T(:enter_for_statement)
-      visitor.enter_goto_statement       += T(:update_last_statement)
-      visitor.enter_continue_statement   += T(:update_last_statement)
-      visitor.enter_break_statement      += T(:update_last_statement)
-      visitor.enter_return_statement     += T(:update_last_statement)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_compound_statement   += T(:enter_block)
+      traversal.leave_compound_statement   += T(:leave_block)
+      traversal.enter_expression_statement += T(:enter_expression_statement)
+      traversal.enter_if_statement         += T(:update_last_statement)
+      traversal.enter_if_else_statement    += T(:update_last_statement)
+      traversal.enter_switch_statement     += T(:update_last_statement)
+      traversal.enter_while_statement      += T(:update_last_statement)
+      traversal.enter_do_statement         += T(:update_last_statement)
+      traversal.enter_for_statement        += T(:enter_for_statement)
+      traversal.enter_c99_for_statement    += T(:enter_for_statement)
+      traversal.enter_goto_statement       += T(:update_last_statement)
+      traversal.enter_continue_statement   += T(:update_last_statement)
+      traversal.enter_break_statement      += T(:update_last_statement)
+      traversal.enter_return_statement     += T(:update_last_statement)
       @last_stmts = []
       @expected_stmts = Set.new
     end
@@ -14776,18 +14771,13 @@ module CBuiltin #:nodoc:
     def initialize(phase_ctxt)
       super
       interp = phase_ctxt[:cc1_interpreter]
-      interp.on_address_expr_evaled     += T(:check_address_expression)
-      interp.on_implicit_conv_performed += T(:check_conversion)
+      interp.on_address_derivation_performed += T(:check)
     end
 
     private
-    def check_address_expression(expr, obj, *)
+    def check(expr, obj, *)
       W(expr.location) if obj.declared_as_register?
     end
-
-    def check_conversion(expr, org_var, *)
-      W(expr.location) if org_var.declared_as_register?
-    end
   end
 
   class W0644 < PassiveCodeCheck
@@ -14845,12 +14835,11 @@ module CBuiltin #:nodoc:
       super
       @interp = phase_ctxt[:cc1_interpreter]
       @interp.on_shift_expr_evaled += T(:check)
-      @enum_tbl = @interp.environment.enumerator_table
     end
 
     private
     def check(expr, lhs_var, rhs_var, *)
-      if expr.rhs_operand.constant?(@enum_tbl)
+      if @interp.constant_expression?(expr.rhs_operand)
         if rhs_var.value.must_be_less_than?(@interp.scalar_value_of(0))
           W(expr.location)
         end
@@ -14869,12 +14858,11 @@ module CBuiltin #:nodoc:
       super
       @interp = phase_ctxt[:cc1_interpreter]
       @interp.on_shift_expr_evaled += T(:check)
-      @enum_tbl = @interp.environment.enumerator_table
     end
 
     private
     def check(expr, lhs_var, rhs_var, *)
-      if expr.rhs_operand.constant?(@enum_tbl)
+      if @interp.constant_expression?(expr.rhs_operand)
         promoted_type = lhs_var.type.integer_promoted_type
         promoted_bit_size = @interp.scalar_value_of(promoted_type.bit_size)
         if rhs_var.value.must_be_equal_to?(promoted_bit_size) ||
@@ -15872,14 +15860,13 @@ module CBuiltin #:nodoc:
       @interp = phase_ctxt[:cc1_interpreter]
       @interp.on_array_subscript_expr_evaled += T(:check_array_subscript)
       @interp.on_indirection_expr_evaled     += T(:check_indirection)
-      @enum_tbl = @interp.environment.enumerator_table
     end
 
     private
     def check_array_subscript(expr, ary_or_ptr, subs, ary, *)
       return unless ary
 
-      unless expr.array_subscript.constant?(@enum_tbl)
+      unless @interp.constant_expression?(expr.array_subscript)
         warn_array_oob_access(expr.array_subscript, ary, subs)
       end
     end
@@ -15888,7 +15875,7 @@ module CBuiltin #:nodoc:
       ary, subs_expr = extract_array_and_subscript(expr.operand)
       return unless ary
 
-      unless subs_expr.constant?(@enum_tbl)
+      unless @interp.constant_expression?(subs_expr)
         subs = @interp.interpret(subs_expr, QUIET_WITHOUT_SIDE_EFFECT)
         warn_array_oob_access(expr.operand, ary, subs)
       end
@@ -16191,14 +16178,13 @@ module CBuiltin #:nodoc:
       @interp = phase_ctxt[:cc1_interpreter]
       @interp.on_array_subscript_expr_evaled += T(:check_array_subscript)
       @interp.on_indirection_expr_evaled     += T(:check_indirection)
-      @enum_tbl = @interp.environment.enumerator_table
     end
 
     private
     def check_array_subscript(expr, ary_or_ptr, subs, ary, *)
       return unless ary
 
-      if expr.array_subscript.constant?(@enum_tbl)
+      if @interp.constant_expression?(expr.array_subscript)
         warn_array_oob_access(expr.array_subscript, ary, subs)
       end
     end
@@ -16207,7 +16193,7 @@ module CBuiltin #:nodoc:
       ary, subs_expr = extract_array_and_subscript(expr.operand)
       return unless ary
 
-      if subs_expr.constant?(@enum_tbl)
+      if @interp.constant_expression?(subs_expr)
         # NOTE: A constant-expression has no side-effects.
         subs = @interp.interpret(subs_expr, QUIET)
         warn_array_oob_access(expr.operand, ary, subs)
@@ -16636,12 +16622,11 @@ module CBuiltin #:nodoc:
       super
       @interp = phase_ctxt[:cc1_interpreter]
       @interp.on_shift_expr_evaled += T(:check)
-      @enum_tbl = @interp.environment.enumerator_table
     end
 
     private
     def check(expr, lhs_var, rhs_var, *)
-      if expr.rhs_operand.constant?(@enum_tbl)
+      if @interp.constant_expression?(expr.rhs_operand)
         underlying_type     = lhs_var.type
         underlying_bit_size = @interp.scalar_value_of(underlying_type.bit_size)
         promoted_type       = lhs_var.type.integer_promoted_type
@@ -16836,9 +16821,8 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      interp = phase_ctxt[:cc1_interpreter]
-      interp.on_function_call_expr_evaled += T(:check)
-      @enum_tbl = interp.environment.enumerator_table
+      @interp = phase_ctxt[:cc1_interpreter]
+      @interp.on_function_call_expr_evaled += T(:check)
     end
 
     private
@@ -16848,10 +16832,10 @@ module CBuiltin #:nodoc:
         next unless param_type && param_type.enum?
 
         arg_expr = expr.argument_expressions[idx]
-        next unless arg_expr.constant?(@enum_tbl)
-
-        if arg_var.type.enum?
-          W(arg_expr.location) unless arg_var.type.same_as?(param_type)
+        if @interp.constant_expression?(arg_expr)
+          if arg_var.type.enum?
+            W(arg_expr.location) unless arg_var.type.same_as?(param_type)
+          end
         end
       end
     end
@@ -16866,18 +16850,17 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      interp = phase_ctxt[:cc1_interpreter]
-      interp.on_assignment_expr_evaled += T(:check)
-      @enum_tbl = interp.environment.enumerator_table
+      @interp = phase_ctxt[:cc1_interpreter]
+      @interp.on_assignment_expr_evaled += T(:check)
     end
 
     private
     def check(expr, lhs_var, rhs_var)
       return unless lhs_var.type.enum?
-      return unless expr.rhs_operand.constant?(@enum_tbl)
-
-      if rhs_var.type.enum? && !lhs_var.type.same_as?(rhs_var.type)
-        W(expr.location)
+      if @interp.constant_expression?(expr.rhs_operand)
+        if rhs_var.type.enum? && !lhs_var.type.same_as?(rhs_var.type)
+          W(expr.location)
+        end
       end
     end
   end
@@ -16891,11 +16874,10 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      interp = phase_ctxt[:cc1_interpreter]
-      interp.on_function_started   += T(:start_function)
-      interp.on_function_ended     += T(:end_function)
-      interp.on_return_stmt_evaled += T(:check)
-      @enum_tbl = interp.environment.enumerator_table
+      @interp = phase_ctxt[:cc1_interpreter]
+      @interp.on_function_started   += T(:start_function)
+      @interp.on_function_ended     += T(:end_function)
+      @interp.on_return_stmt_evaled += T(:check)
       @cur_fun = nil
     end
 
@@ -16910,13 +16892,13 @@ module CBuiltin #:nodoc:
 
     def check(retn_stmt, retn_var)
       return unless @cur_fun && retn_var
-
       return unless retn_type = @cur_fun.type.return_type
       return unless retn_type.enum?
-      return unless retn_stmt.expression.constant?(@enum_tbl)
 
-      if retn_var.type.enum? && !retn_type.same_as?(retn_var.type)
-        W(retn_stmt.expression.location)
+      if @interp.constant_expression?(retn_stmt.expression)
+        if retn_var.type.enum? && !retn_type.same_as?(retn_var.type)
+          W(retn_stmt.expression.location)
+        end
       end
     end
   end
@@ -17041,7 +17023,6 @@ module CBuiltin #:nodoc:
       super
       @interp = phase_ctxt[:cc1_interpreter]
       @interp.on_implicit_conv_performed += T(:check)
-      @enum_tbl = @interp.environment.enumerator_table
     end
 
     private
@@ -17055,7 +17036,7 @@ module CBuiltin #:nodoc:
         expr = init_or_expr
       end
 
-      return unless expr.constant?(@enum_tbl)
+      return unless @interp.constant_expression?(expr)
 
       org_type = org_var.type
       res_type = res_var.type
@@ -17085,15 +17066,14 @@ module CBuiltin #:nodoc:
       super
       @interp = phase_ctxt[:cc1_interpreter]
       @interp.on_additive_expr_evaled += T(:check)
-      @enum_tbl = @interp.environment.enumerator_table
     end
 
     private
     def check(expr, lhs_var, rhs_var, res_var)
       return unless expr.operator.type == "-"
 
-      return unless expr.lhs_operand.constant?(@enum_tbl)
-      return unless expr.rhs_operand.constant?(@enum_tbl)
+      return unless @interp.constant_expression?(expr.lhs_operand)
+      return unless @interp.constant_expression?(expr.rhs_operand)
 
       return unless lhs_var.type.scalar? && lhs_var.type.unsigned?
       return unless rhs_var.type.scalar? && rhs_var.type.unsigned?
@@ -17118,15 +17098,14 @@ module CBuiltin #:nodoc:
       super
       @interp = phase_ctxt[:cc1_interpreter]
       @interp.on_additive_expr_evaled += T(:check)
-      @enum_tbl = @interp.environment.enumerator_table
     end
 
     private
     def check(expr, lhs_var, rhs_var, res_var)
       return unless expr.operator.type == "+"
 
-      return unless expr.lhs_operand.constant?(@enum_tbl)
-      return unless expr.rhs_operand.constant?(@enum_tbl)
+      return unless @interp.constant_expression?(expr.lhs_operand)
+      return unless @interp.constant_expression?(expr.rhs_operand)
 
       return unless lhs_var.type.scalar? && lhs_var.type.unsigned?
       return unless rhs_var.type.scalar? && rhs_var.type.unsigned?
@@ -17151,15 +17130,14 @@ module CBuiltin #:nodoc:
       super
       @interp = phase_ctxt[:cc1_interpreter]
       @interp.on_multiplicative_expr_evaled += T(:check)
-      @enum_tbl = @interp.environment.enumerator_table
     end
 
     private
     def check(expr, lhs_var, rhs_var, res_var)
       return unless expr.operator.type == "*"
 
-      return unless expr.lhs_operand.constant?(@enum_tbl)
-      return unless expr.rhs_operand.constant?(@enum_tbl)
+      return unless @interp.constant_expression?(expr.lhs_operand)
+      return unless @interp.constant_expression?(expr.rhs_operand)
 
       return unless lhs_var.type.scalar? && lhs_var.type.unsigned?
       return unless rhs_var.type.scalar? && rhs_var.type.unsigned?
@@ -17184,7 +17162,6 @@ module CBuiltin #:nodoc:
       super
       @interp = phase_ctxt[:cc1_interpreter]
       @interp.on_implicit_conv_performed += T(:check)
-      @enum_tbl = @interp.environment.enumerator_table
     end
 
     private
@@ -17200,7 +17177,7 @@ module CBuiltin #:nodoc:
         expr = init_or_expr
       end
 
-      if expr && expr.constant?(@enum_tbl) &&
+      if expr && @interp.constant_expression?(expr) &&
           org_var.value.must_be_less_than?(@interp.scalar_value_of(0))
         W(expr.location)
       end
@@ -17218,7 +17195,6 @@ module CBuiltin #:nodoc:
       super
       @interp = phase_ctxt[:cc1_interpreter]
       @interp.on_implicit_conv_performed += T(:check)
-      @enum_tbl = @interp.environment.enumerator_table
     end
 
     private
@@ -17232,7 +17208,7 @@ module CBuiltin #:nodoc:
         expr = init_or_expr
       end
 
-      return unless expr.constant?(@enum_tbl)
+      return unless @interp.constant_expression?(expr)
 
       org_type = org_var.type
       res_type = res_var.type
@@ -17263,47 +17239,46 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      interp = phase_ctxt[:cc1_interpreter]
-      interp.on_if_ctrlexpr_evaled      += T(:check_if_statement)
-      interp.on_if_else_ctrlexpr_evaled += T(:check_if_else_statement)
-      interp.on_while_ctrlexpr_evaled   += T(:check_while_statement)
-      interp.on_for_ctrlexpr_evaled     += T(:check_for_statement)
-      interp.on_c99_for_ctrlexpr_evaled += T(:check_c99_for_statement)
-      @enum_tbl = interp.environment.enumerator_table
+      @interp = phase_ctxt[:cc1_interpreter]
+      @interp.on_if_ctrlexpr_evaled      += T(:check_if_statement)
+      @interp.on_if_else_ctrlexpr_evaled += T(:check_if_else_statement)
+      @interp.on_while_ctrlexpr_evaled   += T(:check_while_statement)
+      @interp.on_for_ctrlexpr_evaled     += T(:check_for_statement)
+      @interp.on_c99_for_ctrlexpr_evaled += T(:check_c99_for_statement)
     end
 
     private
     def check_if_statement(if_stmt, ctrlexpr_val)
       ctrlexpr = if_stmt.expression
-      if ctrlexpr.constant?(@enum_tbl) && ctrlexpr_val.must_be_false?
+      if @interp.constant_expression?(ctrlexpr) && ctrlexpr_val.must_be_false?
         W(ctrlexpr.location)
       end
     end
 
     def check_if_else_statement(if_else_stmt, ctrlexpr_val)
       ctrlexpr = if_else_stmt.expression
-      if ctrlexpr.constant?(@enum_tbl) && ctrlexpr_val.must_be_false?
+      if @interp.constant_expression?(ctrlexpr) && ctrlexpr_val.must_be_false?
         W(ctrlexpr.location)
       end
     end
 
     def check_while_statement(while_stmt, ctrlexpr_val)
       ctrlexpr = while_stmt.expression
-      if ctrlexpr.constant?(@enum_tbl) && ctrlexpr_val.must_be_false?
+      if @interp.constant_expression?(ctrlexpr) && ctrlexpr_val.must_be_false?
         W(ctrlexpr.location)
       end
     end
 
     def check_for_statement(for_stmt, ctrlexpr_val)
       ctrlexpr = for_stmt.condition_statement.expression
-      if ctrlexpr.constant?(@enum_tbl) && ctrlexpr_val.must_be_false?
+      if @interp.constant_expression?(ctrlexpr) && ctrlexpr_val.must_be_false?
         W(ctrlexpr.location)
       end
     end
 
     def check_c99_for_statement(c99_for_stmt, ctrlexpr_val)
       ctrlexpr = c99_for_stmt.condition_statement.expression
-      if ctrlexpr.constant?(@enum_tbl) && ctrlexpr_val.must_be_false?
+      if @interp.constant_expression?(ctrlexpr) && ctrlexpr_val.must_be_false?
         W(ctrlexpr.location)
       end
     end
@@ -17324,14 +17299,13 @@ module CBuiltin #:nodoc:
       @interp = phase_ctxt[:cc1_interpreter]
       @interp.on_array_subscript_expr_evaled += T(:check_array_subscript)
       @interp.on_indirection_expr_evaled     += T(:check_indirection)
-      @enum_tbl = @interp.environment.enumerator_table
     end
 
     private
     def check_array_subscript(expr, ary_or_ptr, subs, ary, *)
       return unless ary
 
-      unless expr.array_subscript.constant?(@enum_tbl)
+      unless @interp.constant_expression?(expr.array_subscript)
         warn_array_oob_access(expr.array_subscript, ary, subs)
       end
     end
@@ -17340,7 +17314,7 @@ module CBuiltin #:nodoc:
       ary, subs_expr = extract_array_and_subscript(expr.operand)
       return unless ary
 
-      unless subs_expr.constant?(@enum_tbl)
+      unless @interp.constant_expression?(subs_expr)
         subs = @interp.interpret(subs_expr, QUIET_WITHOUT_SIDE_EFFECT)
         warn_array_oob_access(expr.operand, ary, subs)
       end
@@ -18211,7 +18185,6 @@ module CBuiltin #:nodoc:
       super
       @interp = phase_ctxt[:cc1_interpreter]
       @interp.on_shift_expr_evaled += T(:check)
-      @enum_tbl = @interp.environment.enumerator_table
     end
 
     private
@@ -18219,7 +18192,7 @@ module CBuiltin #:nodoc:
       op = expr.operator.type
       return unless op == "<<" || op == "<<="
 
-      if lhs_var.type.unsigned? && expr.constant?(@enum_tbl)
+      if lhs_var.type.unsigned? && @interp.constant_expression?(expr)
         if must_overflow?(lhs_var, rhs_var)
           W(expr.location)
         end
@@ -18297,9 +18270,9 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_struct_type_declaration += T(:check)
-      visitor.enter_union_type_declaration  += T(:check)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_struct_type_declaration += T(:check)
+      traversal.enter_union_type_declaration  += T(:check)
       @interp = phase_ctxt[:cc1_interpreter]
     end
 
@@ -18310,10 +18283,9 @@ module CBuiltin #:nodoc:
           type = memb_dcl.type
           next unless type.scalar? && type.integer? && type.bitfield?
 
-          case type.base_type
-          when @interp.int_t, @interp.unsigned_int_t, @interp.signed_int_t
-            next
-          else
+          unless type.base_type.same_as?(@interp.int_t) ||
+              type.base_type.same_as?(@interp.unsigned_int_t) ||
+              type.base_type.same_as?(@interp.signed_int_t)
             W(node.location)
             return
           end
@@ -18719,16 +18691,15 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      interp = phase_ctxt[:cc1_interpreter]
-      interp.on_shift_expr_evaled += T(:check)
-      @enum_tbl = interp.environment.enumerator_table
+      @interp = phase_ctxt[:cc1_interpreter]
+      @interp.on_shift_expr_evaled += T(:check)
     end
 
     private
     def check(expr, lhs_var, *)
       case expr.operator.type
       when "<<", "<<="
-        unless expr.lhs_operand.constant?(@enum_tbl)
+        unless @interp.constant_expression?(expr.lhs_operand)
           W(expr.location) if lhs_var.type.signed?
         end
       end
@@ -18958,10 +18929,10 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_if_statement      += T(:enter_outer_if_stmt)
-      visitor.leave_if_statement      += T(:leave_outer_if_stmt)
-      visitor.enter_if_else_statement += T(:check_inner_if_else_stmt)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_if_statement      += T(:enter_outer_if_stmt)
+      traversal.leave_if_statement      += T(:leave_outer_if_stmt)
+      traversal.enter_if_else_statement += T(:check_inner_if_else_stmt)
       @if_stmt_stack = []
     end
 
@@ -18991,8 +18962,8 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_variable_definition += T(:enter_variable_definition)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_variable_definition += T(:enter_variable_definition)
     end
 
     private
@@ -19036,8 +19007,8 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_variable_definition += T(:enter_variable_definition)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_variable_definition += T(:enter_variable_definition)
     end
 
     private
@@ -19083,8 +19054,8 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_enum_specifier += T(:check)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_enum_specifier += T(:check)
     end
 
     private
@@ -19126,17 +19097,17 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_member_declaration        += T(:check_member_decl)
-      visitor.enter_typedef_declaration       += T(:check_declspec_holder)
-      visitor.enter_function_declaration      += T(:check_declspec_holder)
-      visitor.enter_parameter_declaration     += T(:check_declspec_holder)
-      visitor.enter_variable_declaration      += T(:check_declspec_holder)
-      visitor.enter_variable_definition       += T(:check_declspec_holder)
-      visitor.enter_ansi_function_definition  += T(:check_declspec_holder)
-      visitor.enter_kandr_function_definition += T(:check_declspec_holder)
-      visitor.enter_parameter_definition      += T(:check_declspec_holder)
-      visitor.enter_type_name                 += T(:check_type_name)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_member_declaration        += T(:check_member_decl)
+      traversal.enter_typedef_declaration       += T(:check_declspec_holder)
+      traversal.enter_function_declaration      += T(:check_declspec_holder)
+      traversal.enter_parameter_declaration     += T(:check_declspec_holder)
+      traversal.enter_variable_declaration      += T(:check_declspec_holder)
+      traversal.enter_variable_definition       += T(:check_declspec_holder)
+      traversal.enter_ansi_function_definition  += T(:check_declspec_holder)
+      traversal.enter_kandr_function_definition += T(:check_declspec_holder)
+      traversal.enter_parameter_definition      += T(:check_declspec_holder)
+      traversal.enter_type_name                 += T(:check_type_name)
     end
 
     private
@@ -19228,8 +19199,8 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_string_literal_specifier += T(:check)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_string_literal_specifier += T(:check)
     end
 
     private
@@ -19247,8 +19218,8 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_constant_specifier += T(:check)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_constant_specifier += T(:check)
     end
 
     private
@@ -19270,8 +19241,8 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_struct_declarator += T(:check)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_struct_declarator += T(:check)
       @interp = Cc1::Interpreter.new(phase_ctxt[:cc1_type_table])
     end
 
@@ -19307,8 +19278,8 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_variable_definition += T(:check)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_variable_definition += T(:check)
     end
 
     private
@@ -19541,10 +19512,10 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_function_declaration += T(:check)
-      visitor.enter_compound_statement   += T(:enter_block)
-      visitor.leave_compound_statement   += T(:leave_block)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_function_declaration += T(:check)
+      traversal.enter_compound_statement   += T(:enter_block)
+      traversal.leave_compound_statement   += T(:leave_block)
       @block_level = 0
     end
 
@@ -19650,19 +19621,22 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      interp = phase_ctxt[:cc1_interpreter]
-      interp.on_variable_initialized += T(:check)
-      @enum_tbl = interp.environment.enumerator_table
+      @interp = phase_ctxt[:cc1_interpreter]
+      @interp.on_variable_initialized += T(:check)
     end
 
     private
     def check(var_def, *)
       type = var_def.type
-      if type.struct? || type.union? || type.array?
-        if init = var_def.initializer
-          obj_specs = collect_object_specifiers(init)
-          if obj_specs.any? { |os| !@enum_tbl.lookup(os.identifier.value) }
+      return unless type.struct? || type.union? || type.array?
+
+      if init = var_def.initializer
+        Cc1::ExpressionExtractor.new.tap { |extr|
+          init.accept(extr)
+        }.expressions.each do |expr|
+          unless @interp.constant_expression?(expr)
             W(var_def.location)
+            break
           end
         end
       end
@@ -19830,9 +19804,8 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      interp = phase_ctxt[:cc1_interpreter]
-      interp.on_function_call_expr_evaled += T(:check)
-      @enum_tbl = interp.environment.enumerator_table
+      @interp = phase_ctxt[:cc1_interpreter]
+      @interp.on_function_call_expr_evaled += T(:check)
     end
 
     private
@@ -19842,9 +19815,9 @@ module CBuiltin #:nodoc:
         next unless param_type && param_type.enum?
 
         arg_expr = expr.argument_expressions[idx]
-        next unless arg_expr.constant?(@enum_tbl)
-
-        W(arg_expr.location) unless arg_var.type.enum?
+        if @interp.constant_expression?(arg_expr)
+          W(arg_expr.location) unless arg_var.type.enum?
+        end
       end
     end
   end
@@ -19913,9 +19886,8 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      interp = phase_ctxt[:cc1_interpreter]
-      interp.on_function_call_expr_evaled += T(:check)
-      @enum_tbl = interp.environment.enumerator_table
+      @interp = phase_ctxt[:cc1_interpreter]
+      @interp.on_function_call_expr_evaled += T(:check)
     end
 
     private
@@ -19925,11 +19897,9 @@ module CBuiltin #:nodoc:
         next unless param_type && param_type.enum?
 
         arg_expr = expr.argument_expressions[idx]
-        next if arg_expr.constant?(@enum_tbl)
-
-        if arg_var.type.enum?
-          unless arg_var.type.same_as?(param_type)
-            W(arg_expr.location)
+        unless @interp.constant_expression?(arg_expr)
+          if arg_var.type.enum?
+            W(arg_expr.location) unless arg_var.type.same_as?(param_type)
           end
         end
       end
@@ -19945,16 +19915,15 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      interp = phase_ctxt[:cc1_interpreter]
-      interp.on_assignment_expr_evaled += T(:check)
-      @enum_tbl = interp.environment.enumerator_table
+      @interp = phase_ctxt[:cc1_interpreter]
+      @interp.on_assignment_expr_evaled += T(:check)
     end
 
     private
     def check(expr, lhs_var, rhs_var)
       return unless lhs_var.type.enum?
 
-      if rhs_var.type.enum? && !expr.rhs_operand.constant?(@enum_tbl)
+      if rhs_var.type.enum? && !@interp.constant_expression?(expr.rhs_operand)
         unless lhs_var.type.same_as?(rhs_var.type)
           W(expr.location)
         end
@@ -19971,11 +19940,10 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      interp = phase_ctxt[:cc1_interpreter]
-      interp.on_function_started   += T(:start_function)
-      interp.on_function_ended     += T(:end_function)
-      interp.on_return_stmt_evaled += T(:check)
-      @enum_tbl = interp.environment.enumerator_table
+      @interp = phase_ctxt[:cc1_interpreter]
+      @interp.on_function_started   += T(:start_function)
+      @interp.on_function_ended     += T(:end_function)
+      @interp.on_return_stmt_evaled += T(:check)
       @cur_fun  = nil
     end
 
@@ -19990,7 +19958,7 @@ module CBuiltin #:nodoc:
 
     def check(retn_stmt, retn_var)
       return unless @cur_fun && retn_var
-      return if retn_stmt.expression.constant?(@enum_tbl)
+      return if @interp.constant_expression?(retn_stmt.expression)
 
       if retn_type = @cur_fun.type.return_type and retn_type.enum?
         if retn_var.type.enum? && !retn_type.same_as?(retn_var.type)
@@ -20011,7 +19979,6 @@ module CBuiltin #:nodoc:
       super
       interp = phase_ctxt[:cc1_interpreter]
       interp.on_function_call_expr_evaled += T(:check)
-      @enum_tbl = interp.environment.enumerator_table
     end
 
     private
@@ -20038,7 +20005,6 @@ module CBuiltin #:nodoc:
       interp.on_function_started   += T(:start_function)
       interp.on_function_ended     += T(:end_function)
       interp.on_return_stmt_evaled += T(:check)
-      @enum_tbl = interp.environment.enumerator_table
       @cur_fun  = nil
     end
 
@@ -20069,9 +20035,8 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      interp = phase_ctxt[:cc1_interpreter]
-      interp.on_function_call_expr_evaled += T(:check)
-      @enum_tbl = interp.environment.enumerator_table
+      @interp = phase_ctxt[:cc1_interpreter]
+      @interp.on_function_call_expr_evaled += T(:check)
     end
 
     private
@@ -20081,7 +20046,7 @@ module CBuiltin #:nodoc:
         next unless param_type && param_type.enum?
 
         arg_expr = expr.argument_expressions[idx]
-        unless arg_expr.constant?(@enum_tbl)
+        unless @interp.constant_expression?(arg_expr)
           unless arg_var.type.same_as?(param_type)
             W(arg_expr.location)
           end
@@ -20099,14 +20064,13 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      interp = phase_ctxt[:cc1_interpreter]
-      interp.on_assignment_expr_evaled += T(:check)
-      @enum_tbl = interp.environment.enumerator_table
+      @interp = phase_ctxt[:cc1_interpreter]
+      @interp.on_assignment_expr_evaled += T(:check)
     end
 
     private
     def check(expr, lhs_var, rhs_var)
-      if lhs_var.type.enum? && !expr.rhs_operand.constant?(@enum_tbl)
+      if lhs_var.type.enum? && !@interp.constant_expression?(expr.rhs_operand)
         unless lhs_var.type.same_as?(rhs_var.type)
           W(expr.location)
         end
@@ -20123,11 +20087,10 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      interp = phase_ctxt[:cc1_interpreter]
-      interp.on_function_started   += T(:start_function)
-      interp.on_function_ended     += T(:end_function)
-      interp.on_return_stmt_evaled += T(:check)
-      @enum_tbl = interp.environment.enumerator_table
+      @interp = phase_ctxt[:cc1_interpreter]
+      @interp.on_function_started   += T(:start_function)
+      @interp.on_function_ended     += T(:end_function)
+      @interp.on_return_stmt_evaled += T(:check)
       @cur_fun  = nil
     end
 
@@ -20144,7 +20107,7 @@ module CBuiltin #:nodoc:
       return unless @cur_fun && retn_var
 
       if retn_type = @cur_fun.type.return_type and retn_type.enum?
-        unless retn_stmt.expression.constant?(@enum_tbl)
+        unless @interp.constant_expression?(retn_stmt.expression)
           unless retn_var.type.same_as?(retn_type)
             W(retn_stmt.expression.location)
           end
@@ -20299,8 +20262,8 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_sizeof_expression += T(:check)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_sizeof_expression += T(:check)
     end
 
     private
@@ -20436,23 +20399,23 @@ module CBuiltin #:nodoc:
     def initialize(phase_ctxt)
       super
       @fpath = phase_ctxt[:sources].first.fpath
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_error_statement           += T(:check)
-      visitor.enter_generic_labeled_statement += T(:check)
-      visitor.enter_case_labeled_statement    += T(:check)
-      visitor.enter_default_labeled_statement += T(:check)
-      visitor.enter_expression_statement      += T(:check)
-      visitor.enter_if_statement              += T(:check)
-      visitor.enter_if_else_statement         += T(:check)
-      visitor.enter_switch_statement          += T(:check)
-      visitor.enter_while_statement           += T(:check)
-      visitor.enter_do_statement              += T(:check)
-      visitor.enter_for_statement             += T(:check)
-      visitor.enter_c99_for_statement         += T(:check)
-      visitor.enter_goto_statement            += T(:check)
-      visitor.enter_continue_statement        += T(:check)
-      visitor.enter_break_statement           += T(:check)
-      visitor.enter_return_statement          += T(:check)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_error_statement           += T(:check)
+      traversal.enter_generic_labeled_statement += T(:check)
+      traversal.enter_case_labeled_statement    += T(:check)
+      traversal.enter_default_labeled_statement += T(:check)
+      traversal.enter_expression_statement      += T(:check)
+      traversal.enter_if_statement              += T(:check)
+      traversal.enter_if_else_statement         += T(:check)
+      traversal.enter_switch_statement          += T(:check)
+      traversal.enter_while_statement           += T(:check)
+      traversal.enter_do_statement              += T(:check)
+      traversal.enter_for_statement             += T(:check)
+      traversal.enter_c99_for_statement         += T(:check)
+      traversal.enter_goto_statement            += T(:check)
+      traversal.enter_continue_statement        += T(:check)
+      traversal.enter_break_statement           += T(:check)
+      traversal.enter_return_statement          += T(:check)
     end
 
     private
@@ -20477,7 +20440,6 @@ module CBuiltin #:nodoc:
       super
       @interp = phase_ctxt[:cc1_interpreter]
       @interp.on_implicit_conv_performed += T(:check)
-      @enum_tbl = @interp.environment.enumerator_table
     end
 
     private
@@ -20492,13 +20454,14 @@ module CBuiltin #:nodoc:
 
       case init_or_expr
       when Cc1::Initializer
-        if expr = init_or_expr.expression and expr.constant?(@enum_tbl)
+        expr = init_or_expr.expression
+        if expr && @interp.constant_expression?(expr)
           if untyped_pointer_conversion?(from_type, to_type, org_var.value)
             return
           end
         end
       when Cc1::Expression
-        if init_or_expr.constant?(@enum_tbl)
+        if @interp.constant_expression?(init_or_expr)
           if untyped_pointer_conversion?(from_type, to_type, org_var.value)
             return
           end