adlint 2.6.12 → 2.6.14

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

@@ -1350,33 +1350,33 @@ module CBuiltin #:nodoc:
       interp.on_function_declared += method(:add_function)
       interp.on_function_defined += method(:add_function)
       interp.on_translation_unit_ended += method(:check)
-      @identifiers = Hash.new { |hash, key| hash[key] = [] }
+      @obj_dcls = Hash.new { |hash, key| hash[key] = [] }
     end
 
     private
-    def add_variable(decl_or_def, variable)
-      if variable.named?
-        @identifiers[mangle(variable.name)].push(
-          [decl_or_def.identifier, variable.declared_as_extern?])
+    def add_variable(dcl_or_def, var)
+      if var.named? && var.declared_as_extern?
+        @obj_dcls[mangle(var.name)].push(dcl_or_def)
       end
     end
 
-    def add_function(decl_or_def, function)
-      if function.named?
-        @identifiers[mangle(function.name)].push(
-          [decl_or_def.identifier, function.declared_as_extern?])
+    def add_function(dcl_or_def, func)
+      if func.named? && func.declared_as_extern?
+        @obj_dcls[mangle(func.name)].push(dcl_or_def)
       end
     end
 
     def check(*)
-      @identifiers.each do |key, id_array|
-        id_array.uniq! { |id| id[0].value }
-        if id_array.size > 1
-          id_array.each_with_index do |id, index|
-            next unless id[1]
-            pair = index == 0 ? id_array[1] : id_array[0]
-            C(:C0001, pair[0].location, pair[0].value)
-            W(:W0051, id[0].location, pair[0].value)
+      @obj_dcls.each_value do |dcls|
+        similar_dcls = dcls.uniq { |dcl| dcl.identifier.value }
+        next unless similar_dcls.size > 1
+
+        similar_dcls.each do |dcl|
+          W(:W0051, dcl.location, dcl.identifier.value)
+          similar_dcls.each do |pair_dcl|
+            if pair_dcl != dcl
+              C(:C0001, pair_dcl.location, pair_dcl.identifier.value)
+            end
           end
         end
       end
@@ -1402,44 +1402,42 @@ module CBuiltin #:nodoc:
 
     def initialize(context)
       super
-      visitor = context[:c_visitor]
-      visitor.enter_variable_declaration += method(:add_variable_decl)
-      visitor.enter_variable_definition += method(:add_variable_def)
-      visitor.enter_function_declaration += method(:add_function_decl)
-      visitor.enter_ansi_function_definition += method(:add_function_def)
-      visitor.enter_kandr_function_definition += method(:add_function_def)
-      visitor.leave_translation_unit += method(:check)
-      @identifiers = Hash.new { |hash, key| hash[key] = [] }
+      interp = context[:c_interpreter]
+      interp.on_variable_declared += method(:declare_object)
+      interp.on_variable_defined += method(:declare_object)
+      interp.on_function_declared += method(:declare_object)
+      interp.on_function_defined += method(:declare_object)
+      interp.on_block_started += method(:enter_scope)
+      interp.on_block_ended += method(:leave_scope)
+      @dcl_names = [Hash.new { |hash, key| hash[key] = [] }]
     end
 
     private
-    def add_variable_decl(node)
-      @identifiers[mangle(node.identifier.value)].push(node.identifier)
-    end
+    def declare_object(dcl_or_def, *)
+      dcl_name = dcl_or_def.identifier
 
-    def add_variable_def(node)
-      @identifiers[mangle(node.identifier.value)].push(node.identifier)
-    end
+      pair_names = @dcl_names.map { |name_hash|
+        name_hash[mangle(dcl_name.value)]
+      }.reduce([]) { |all_names, similar_names|
+        all_names + similar_names
+      }.uniq { |id| id.value }.reject { |id| id.value == dcl_name.value }
+
+      unless pair_names.empty?
+        W(:W0052, dcl_or_def.location, dcl_name.value)
+        pair_names.each do |pair_name|
+          C(:C0001, pair_name.location, pair_name.value)
+        end
+      end
 
-    def add_function_decl(node)
-      @identifiers[mangle(node.identifier.value)].push(node.identifier)
+      @dcl_names.last[mangle(dcl_name.value)].push(dcl_name)
     end
 
-    def add_function_def(node)
-      @identifiers[mangle(node.identifier.value)].push(node.identifier)
+    def enter_scope(*)
+      @dcl_names.push(Hash.new { |hash, key| hash[key] = [] })
     end
 
-    def check(node)
-      @identifiers.each do |key, id_array|
-        id_array.uniq! { |id| id.value }
-        if id_array.size > 1
-          id_array.each_with_index do |id, index|
-            pair = index == 0 ? id_array[1] : id_array[0]
-            C(:C0001, pair.location, pair.value)
-            W(:W0052, id.location, pair.value)
-          end
-        end
-      end
+    def leave_scope(*)
+      @dcl_names.pop
     end
 
     def mangle(name)
@@ -3061,12 +3059,9 @@ module CBuiltin #:nodoc:
     end
 
     private
-    def check(initializer_or_expression, original_variable, result_variable)
-      return if from_type == to_type
-
-      if original_variable.type.same_as?(from_type) &&
-          result_variable.type.same_as?(to_type)
-        W(message_id, initializer_or_expression.location)
+    def check(init_or_expr, from_var, to_var)
+      if match?(from_var, to_var)
+        W(message_id, init_or_expr.location)
       end
     end
 
@@ -3078,6 +3073,28 @@ module CBuiltin #:nodoc:
       @interp.signed_char_type
     end
 
+    def match?(from_var, to_var)
+      unless from_var.type.same_as?(from_type) && to_var.type.same_as?(to_type)
+        return false
+      end
+
+      if char_type_family?(from_type) &&
+          from_var.type.explicitly_signed? != from_type.explicitly_signed?
+        return false
+      end
+      if char_type_family?(to_type) &&
+          to_var.type.explicitly_signed? != to_type.explicitly_signed?
+        return false
+      end
+
+      true
+    end
+
+    def char_type_family?(type)
+      type == @interp.char_type ||
+        type == @interp.signed_char_type || type == @interp.unsigned_char_type
+    end
+
     def message_id
       self.class.name.sub(/\A.*::/, "").intern
     end
@@ -3113,7 +3130,7 @@ module CBuiltin #:nodoc:
     end
 
     def to_type
-      @interp.short_type
+      @interp.signed_short_type
     end
   end
 
@@ -3147,7 +3164,7 @@ module CBuiltin #:nodoc:
     end
 
     def to_type
-      @interp.int_type
+      @interp.signed_int_type
     end
   end
 
@@ -3181,7 +3198,7 @@ module CBuiltin #:nodoc:
     end
 
     def to_type
-      @interp.long_type
+      @interp.signed_long_type
     end
   end
 
@@ -3266,7 +3283,7 @@ module CBuiltin #:nodoc:
     end
 
     def to_type
-      @interp.long_long_type
+      @interp.signed_long_long_type
     end
   end
 
@@ -3330,7 +3347,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.short_type
+      @interp.signed_short_type
     end
 
     def to_type
@@ -3364,7 +3381,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.int_type
+      @interp.signed_int_type
     end
 
     def to_type
@@ -3398,7 +3415,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.long_type
+      @interp.signed_long_type
     end
 
     def to_type
@@ -3432,7 +3449,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.long_long_type
+      @interp.signed_long_long_type
     end
 
     def to_type
@@ -3504,7 +3521,7 @@ module CBuiltin #:nodoc:
     end
 
     def to_type
-      @interp.short_type
+      @interp.signed_short_type
     end
   end
 
@@ -3538,7 +3555,7 @@ module CBuiltin #:nodoc:
     end
 
     def to_type
-      @interp.short_type
+      @interp.signed_short_type
     end
   end
 
@@ -3555,7 +3572,7 @@ module CBuiltin #:nodoc:
     end
 
     def to_type
-      @interp.int_type
+      @interp.signed_int_type
     end
   end
 
@@ -3589,7 +3606,7 @@ module CBuiltin #:nodoc:
     end
 
     def to_type
-      @interp.short_type
+      @interp.signed_short_type
     end
   end
 
@@ -3606,7 +3623,7 @@ module CBuiltin #:nodoc:
     end
 
     def to_type
-      @interp.int_type
+      @interp.signed_int_type
     end
   end
 
@@ -3623,7 +3640,7 @@ module CBuiltin #:nodoc:
     end
 
     def to_type
-      @interp.long_type
+      @interp.signed_long_type
     end
   end
 
@@ -3657,7 +3674,7 @@ module CBuiltin #:nodoc:
     end
 
     def to_type
-      @interp.short_type
+      @interp.signed_short_type
     end
   end
 
@@ -3674,7 +3691,7 @@ module CBuiltin #:nodoc:
     end
 
     def to_type
-      @interp.int_type
+      @interp.signed_int_type
     end
   end
 
@@ -3691,7 +3708,7 @@ module CBuiltin #:nodoc:
     end
 
     def to_type
-      @interp.long_type
+      @interp.signed_long_type
     end
   end
 
@@ -3708,7 +3725,7 @@ module CBuiltin #:nodoc:
     end
 
     def to_type
-      @interp.long_long_type
+      @interp.signed_long_long_type
     end
   end
 
@@ -3789,7 +3806,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.short_type
+      @interp.signed_short_type
     end
 
     def to_type
@@ -3806,7 +3823,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.short_type
+      @interp.signed_short_type
     end
 
     def to_type
@@ -3823,7 +3840,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.short_type
+      @interp.signed_short_type
     end
 
     def to_type
@@ -3840,7 +3857,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.short_type
+      @interp.signed_short_type
     end
 
     def to_type
@@ -3857,7 +3874,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.int_type
+      @interp.signed_int_type
     end
 
     def to_type
@@ -3874,7 +3891,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.int_type
+      @interp.signed_int_type
     end
 
     def to_type
@@ -3891,7 +3908,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.int_type
+      @interp.signed_int_type
     end
 
     def to_type
@@ -3908,7 +3925,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.int_type
+      @interp.signed_int_type
     end
 
     def to_type
@@ -3925,7 +3942,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.long_type
+      @interp.signed_long_type
     end
 
     def to_type
@@ -3942,7 +3959,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.long_type
+      @interp.signed_long_type
     end
 
     def to_type
@@ -3959,7 +3976,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.long_type
+      @interp.signed_long_type
     end
 
     def to_type
@@ -3976,7 +3993,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.long_type
+      @interp.signed_long_type
     end
 
     def to_type
@@ -4010,7 +4027,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.short_type
+      @interp.signed_short_type
     end
 
     def to_type
@@ -4027,7 +4044,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.int_type
+      @interp.signed_int_type
     end
 
     def to_type
@@ -4044,7 +4061,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.long_type
+      @interp.signed_long_type
     end
 
     def to_type
@@ -4061,7 +4078,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.long_long_type
+      @interp.signed_long_long_type
     end
 
     def to_type
@@ -4078,7 +4095,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.long_long_type
+      @interp.signed_long_long_type
     end
 
     def to_type
@@ -4095,7 +4112,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.long_long_type
+      @interp.signed_long_long_type
     end
 
     def to_type
@@ -4112,7 +4129,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.long_long_type
+      @interp.signed_long_long_type
     end
 
     def to_type
@@ -4129,7 +4146,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.long_long_type
+      @interp.signed_long_long_type
     end
 
     def to_type
@@ -4248,7 +4265,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.short_type
+      @interp.signed_short_type
     end
 
     def to_type
@@ -4265,7 +4282,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.short_type
+      @interp.signed_short_type
     end
 
     def to_type
@@ -4282,7 +4299,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.short_type
+      @interp.signed_short_type
     end
 
     def to_type
@@ -4350,7 +4367,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.int_type
+      @interp.signed_int_type
     end
 
     def to_type
@@ -4367,7 +4384,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.int_type
+      @interp.signed_int_type
     end
 
     def to_type
@@ -4384,7 +4401,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.int_type
+      @interp.signed_int_type
     end
 
     def to_type
@@ -4452,7 +4469,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.long_type
+      @interp.signed_long_type
     end
 
     def to_type
@@ -4469,7 +4486,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.long_type
+      @interp.signed_long_type
     end
 
     def to_type
@@ -4486,7 +4503,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.long_type
+      @interp.signed_long_type
     end
 
     def to_type
@@ -4554,7 +4571,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.long_long_type
+      @interp.signed_long_long_type
     end
 
     def to_type
@@ -4571,7 +4588,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.long_long_type
+      @interp.signed_long_long_type
     end
 
     def to_type
@@ -4588,7 +4605,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.long_long_type
+      @interp.signed_long_long_type
     end
 
     def to_type
@@ -4711,7 +4728,7 @@ module CBuiltin #:nodoc:
     end
 
     def to_type
-      @interp.short_type
+      @interp.signed_short_type
     end
   end
 
@@ -4745,7 +4762,7 @@ module CBuiltin #:nodoc:
     end
 
     def to_type
-      @interp.int_type
+      @interp.signed_int_type
     end
   end
 
@@ -4779,7 +4796,7 @@ module CBuiltin #:nodoc:
     end
 
     def to_type
-      @interp.long_type
+      @interp.signed_long_type
     end
   end
 
@@ -4864,7 +4881,7 @@ module CBuiltin #:nodoc:
     end
 
     def to_type
-      @interp.short_type
+      @interp.signed_short_type
     end
   end
 
@@ -4898,7 +4915,7 @@ module CBuiltin #:nodoc:
     end
 
     def to_type
-      @interp.int_type
+      @interp.signed_int_type
     end
   end
 
@@ -4932,7 +4949,7 @@ module CBuiltin #:nodoc:
     end
 
     def to_type
-      @interp.long_type
+      @interp.signed_long_type
     end
   end
 
@@ -5017,7 +5034,7 @@ module CBuiltin #:nodoc:
     end
 
     def to_type
-      @interp.short_type
+      @interp.signed_short_type
     end
   end
 
@@ -5051,7 +5068,7 @@ module CBuiltin #:nodoc:
     end
 
     def to_type
-      @interp.int_type
+      @interp.signed_int_type
     end
   end
 
@@ -5085,7 +5102,7 @@ module CBuiltin #:nodoc:
     end
 
     def to_type
-      @interp.long_type
+      @interp.signed_long_type
     end
   end
 
@@ -5119,7 +5136,7 @@ module CBuiltin #:nodoc:
     end
 
     def to_type
-      @interp.long_long_type
+      @interp.signed_long_long_type
     end
   end
 
@@ -5153,7 +5170,7 @@ module CBuiltin #:nodoc:
     end
 
     def to_type
-      @interp.long_long_type
+      @interp.signed_long_long_type
     end
   end
 
@@ -5187,7 +5204,7 @@ module CBuiltin #:nodoc:
     end
 
     def to_type
-      @interp.long_long_type
+      @interp.signed_long_long_type
     end
   end
 
@@ -5221,7 +5238,7 @@ module CBuiltin #:nodoc:
     end
 
     def to_type
-      @interp.short_type
+      @interp.signed_short_type
     end
   end
 
@@ -5238,7 +5255,7 @@ module CBuiltin #:nodoc:
     end
 
     def to_type
-      @interp.int_type
+      @interp.signed_int_type
     end
   end
 
@@ -5255,7 +5272,7 @@ module CBuiltin #:nodoc:
     end
 
     def to_type
-      @interp.long_type
+      @interp.signed_long_type
     end
   end
 
@@ -5272,7 +5289,7 @@ module CBuiltin #:nodoc:
     end
 
     def to_type
-      @interp.int_type
+      @interp.signed_int_type
     end
   end
 
@@ -5289,7 +5306,7 @@ module CBuiltin #:nodoc:
     end
 
     def to_type
-      @interp.long_type
+      @interp.signed_long_type
     end
   end
 
@@ -5306,7 +5323,7 @@ module CBuiltin #:nodoc:
     end
 
     def to_type
-      @interp.long_type
+      @interp.signed_long_type
     end
   end
 
@@ -5323,7 +5340,7 @@ module CBuiltin #:nodoc:
     end
 
     def to_type
-      @interp.long_long_type
+      @interp.signed_long_long_type
     end
   end
 
@@ -5340,7 +5357,7 @@ module CBuiltin #:nodoc:
     end
 
     def to_type
-      @interp.long_long_type
+      @interp.signed_long_long_type
     end
   end
 
@@ -5357,7 +5374,7 @@ module CBuiltin #:nodoc:
     end
 
     def to_type
-      @interp.long_long_type
+      @interp.signed_long_long_type
     end
   end
 
@@ -5374,7 +5391,7 @@ module CBuiltin #:nodoc:
     end
 
     def to_type
-      @interp.long_long_type
+      @interp.signed_long_long_type
     end
   end
 
@@ -5388,29 +5405,26 @@ module CBuiltin #:nodoc:
     def initialize(context)
       super
       @interp = context[:c_interpreter]
-      @interp.on_function_started += method(:start_function)
-      @interp.on_function_ended += method(:end_function)
-      @interp.on_return_stmt_evaled += method(:check_return_statement)
-      @current_function = nil
+      @interp.on_function_started += method(:enter_function)
+      @interp.on_function_ended += method(:leave_function)
+      @interp.on_return_stmt_evaled += method(:check)
+      @current_func = nil
     end
 
     private
-    def start_function(function_definition, function)
-      @current_function = function
+    def enter_function(func_def, func)
+      @current_func = func
     end
 
-    def end_function(function_definition, function)
-      @current_function = nil
+    def leave_function(func_def, func)
+      @current_func = nil
     end
 
-    def check_return_statement(return_statement, result_variable)
-      return unless @current_function
-      return if from_type == to_type
-      return unless result_variable
-
-      if result_variable.type.same_as?(from_type) &&
-          @current_function.type.return_type.same_as?(to_type)
-        W(message_id, return_statement.location, @current_function.name)
+    def check(return_stmt, result_var)
+      if @current_func && result_var
+        if match?(result_var.type, @current_func.type.return_type)
+          W(message_id, return_stmt.location, @current_func.name)
+        end
       end
     end
 
@@ -5422,6 +5436,28 @@ module CBuiltin #:nodoc:
       @interp.signed_char_type
     end
 
+    def match?(expr_type, func_type)
+      unless expr_type.same_as?(from_type) && func_type.same_as?(to_type)
+        return false
+      end
+
+      if char_type_family?(expr_type) &&
+          expr_type.explicitly_signed? != from_type.explicitly_signed?
+        return false
+      end
+      if char_type_family?(func_type) &&
+          func_type.explicitly_signed? != to_type.explicitly_signed?
+        return false
+      end
+
+      true
+    end
+
+    def char_type_family?(type)
+      type == @interp.char_type ||
+        type == @interp.signed_char_type || type == @interp.unsigned_char_type
+    end
+
     def message_id
       self.class.name.sub(/\A.*::/, "").intern
     end
@@ -5457,7 +5493,7 @@ module CBuiltin #:nodoc:
     end
 
     def to_type
-      @interp.short_type
+      @interp.signed_short_type
     end
   end
 
@@ -5491,7 +5527,7 @@ module CBuiltin #:nodoc:
     end
 
     def to_type
-      @interp.int_type
+      @interp.signed_int_type
     end
   end
 
@@ -5525,7 +5561,7 @@ module CBuiltin #:nodoc:
     end
 
     def to_type
-      @interp.long_type
+      @interp.signed_long_type
     end
   end
 
@@ -5610,7 +5646,7 @@ module CBuiltin #:nodoc:
     end
 
     def to_type
-      @interp.long_long_type
+      @interp.signed_long_long_type
     end
   end
 
@@ -5674,7 +5710,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.short_type
+      @interp.signed_short_type
     end
 
     def to_type
@@ -5708,7 +5744,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.int_type
+      @interp.signed_int_type
     end
 
     def to_type
@@ -5742,7 +5778,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.long_type
+      @interp.signed_long_type
     end
 
     def to_type
@@ -5776,7 +5812,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.long_long_type
+      @interp.signed_long_long_type
     end
 
     def to_type
@@ -5848,7 +5884,7 @@ module CBuiltin #:nodoc:
     end
 
     def to_type
-      @interp.short_type
+      @interp.signed_short_type
     end
   end
 
@@ -5882,7 +5918,7 @@ module CBuiltin #:nodoc:
     end
 
     def to_type
-      @interp.short_type
+      @interp.signed_short_type
     end
   end
 
@@ -5899,7 +5935,7 @@ module CBuiltin #:nodoc:
     end
 
     def to_type
-      @interp.int_type
+      @interp.signed_int_type
     end
   end
 
@@ -5933,7 +5969,7 @@ module CBuiltin #:nodoc:
     end
 
     def to_type
-      @interp.short_type
+      @interp.signed_short_type
     end
   end
 
@@ -5950,7 +5986,7 @@ module CBuiltin #:nodoc:
     end
 
     def to_type
-      @interp.int_type
+      @interp.signed_int_type
     end
   end
 
@@ -5967,7 +6003,7 @@ module CBuiltin #:nodoc:
     end
 
     def to_type
-      @interp.long_type
+      @interp.signed_long_type
     end
   end
 
@@ -6001,7 +6037,7 @@ module CBuiltin #:nodoc:
     end
 
     def to_type
-      @interp.short_type
+      @interp.signed_short_type
     end
   end
 
@@ -6018,7 +6054,7 @@ module CBuiltin #:nodoc:
     end
 
     def to_type
-      @interp.int_type
+      @interp.signed_int_type
     end
   end
 
@@ -6035,7 +6071,7 @@ module CBuiltin #:nodoc:
     end
 
     def to_type
-      @interp.long_type
+      @interp.signed_long_type
     end
   end
 
@@ -6052,7 +6088,7 @@ module CBuiltin #:nodoc:
     end
 
     def to_type
-      @interp.long_long_type
+      @interp.signed_long_long_type
     end
   end
 
@@ -6133,7 +6169,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.short_type
+      @interp.signed_short_type
     end
 
     def to_type
@@ -6150,7 +6186,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.short_type
+      @interp.signed_short_type
     end
 
     def to_type
@@ -6167,7 +6203,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.short_type
+      @interp.signed_short_type
     end
 
     def to_type
@@ -6184,7 +6220,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.short_type
+      @interp.signed_short_type
     end
 
     def to_type
@@ -6201,7 +6237,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.int_type
+      @interp.signed_int_type
     end
 
     def to_type
@@ -6218,7 +6254,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.int_type
+      @interp.signed_int_type
     end
 
     def to_type
@@ -6235,7 +6271,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.int_type
+      @interp.signed_int_type
     end
 
     def to_type
@@ -6252,7 +6288,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.int_type
+      @interp.signed_int_type
     end
 
     def to_type
@@ -6269,7 +6305,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.long_type
+      @interp.signed_long_type
     end
 
     def to_type
@@ -6286,7 +6322,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.long_type
+      @interp.signed_long_type
     end
 
     def to_type
@@ -6303,7 +6339,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.long_type
+      @interp.signed_long_type
     end
 
     def to_type
@@ -6320,7 +6356,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.long_type
+      @interp.signed_long_type
     end
 
     def to_type
@@ -6354,7 +6390,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.short_type
+      @interp.signed_short_type
     end
 
     def to_type
@@ -6371,7 +6407,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.int_type
+      @interp.signed_int_type
     end
 
     def to_type
@@ -6388,7 +6424,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.long_type
+      @interp.signed_long_type
     end
 
     def to_type
@@ -6405,7 +6441,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.long_long_type
+      @interp.signed_long_long_type
     end
 
     def to_type
@@ -6422,7 +6458,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.long_long_type
+      @interp.signed_long_long_type
     end
 
     def to_type
@@ -6439,7 +6475,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.long_long_type
+      @interp.signed_long_long_type
     end
 
     def to_type
@@ -6456,7 +6492,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.long_long_type
+      @interp.signed_long_long_type
     end
 
     def to_type
@@ -6473,7 +6509,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.long_long_type
+      @interp.signed_long_long_type
     end
 
     def to_type
@@ -6592,7 +6628,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.short_type
+      @interp.signed_short_type
     end
 
     def to_type
@@ -6609,7 +6645,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.short_type
+      @interp.signed_short_type
     end
 
     def to_type
@@ -6626,7 +6662,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.short_type
+      @interp.signed_short_type
     end
 
     def to_type
@@ -6694,7 +6730,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.int_type
+      @interp.signed_int_type
     end
 
     def to_type
@@ -6711,7 +6747,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.int_type
+      @interp.signed_int_type
     end
 
     def to_type
@@ -6728,7 +6764,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.int_type
+      @interp.signed_int_type
     end
 
     def to_type
@@ -6796,7 +6832,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.long_type
+      @interp.signed_long_type
     end
 
     def to_type
@@ -6813,7 +6849,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.long_type
+      @interp.signed_long_type
     end
 
     def to_type
@@ -6830,7 +6866,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.long_type
+      @interp.signed_long_type
     end
 
     def to_type
@@ -6898,7 +6934,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.long_long_type
+      @interp.signed_long_long_type
     end
 
     def to_type
@@ -6915,7 +6951,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.long_long_type
+      @interp.signed_long_long_type
     end
 
     def to_type
@@ -6932,7 +6968,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.long_long_type
+      @interp.signed_long_long_type
     end
 
     def to_type
@@ -7055,7 +7091,7 @@ module CBuiltin #:nodoc:
     end
 
     def to_type
-      @interp.short_type
+      @interp.signed_short_type
     end
   end
 
@@ -7089,7 +7125,7 @@ module CBuiltin #:nodoc:
     end
 
     def to_type
-      @interp.int_type
+      @interp.signed_int_type
     end
   end
 
@@ -7123,7 +7159,7 @@ module CBuiltin #:nodoc:
     end
 
     def to_type
-      @interp.long_type
+      @interp.signed_long_type
     end
   end
 
@@ -7208,7 +7244,7 @@ module CBuiltin #:nodoc:
     end
 
     def to_type
-      @interp.short_type
+      @interp.signed_short_type
     end
   end
 
@@ -7242,7 +7278,7 @@ module CBuiltin #:nodoc:
     end
 
     def to_type
-      @interp.int_type
+      @interp.signed_int_type
     end
   end
 
@@ -7276,7 +7312,7 @@ module CBuiltin #:nodoc:
     end
 
     def to_type
-      @interp.long_type
+      @interp.signed_long_type
     end
   end
 
@@ -7361,7 +7397,7 @@ module CBuiltin #:nodoc:
     end
 
     def to_type
-      @interp.short_type
+      @interp.signed_short_type
     end
   end
 
@@ -7395,7 +7431,7 @@ module CBuiltin #:nodoc:
     end
 
     def to_type
-      @interp.int_type
+      @interp.signed_int_type
     end
   end
 
@@ -7429,7 +7465,7 @@ module CBuiltin #:nodoc:
     end
 
     def to_type
-      @interp.long_type
+      @interp.signed_long_type
     end
   end
 
@@ -7463,7 +7499,7 @@ module CBuiltin #:nodoc:
     end
 
     def to_type
-      @interp.long_long_type
+      @interp.signed_long_long_type
     end
   end
 
@@ -7497,7 +7533,7 @@ module CBuiltin #:nodoc:
     end
 
     def to_type
-      @interp.long_long_type
+      @interp.signed_long_long_type
     end
   end
 
@@ -7531,7 +7567,7 @@ module CBuiltin #:nodoc:
     end
 
     def to_type
-      @interp.long_long_type
+      @interp.signed_long_long_type
     end
   end
 
@@ -7561,7 +7597,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.short_type
+      @interp.signed_short_type
     end
 
     def to_type
@@ -7595,7 +7631,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.int_type
+      @interp.signed_int_type
     end
 
     def to_type
@@ -7612,11 +7648,11 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.int_type
+      @interp.signed_int_type
     end
 
     def to_type
-      @interp.short_type
+      @interp.signed_short_type
     end
   end
 
@@ -7663,7 +7699,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.long_type
+      @interp.signed_long_type
     end
 
     def to_type
@@ -7680,11 +7716,11 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.long_type
+      @interp.signed_long_type
     end
 
     def to_type
-      @interp.short_type
+      @interp.signed_short_type
     end
   end
 
@@ -7697,11 +7733,11 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.long_type
+      @interp.signed_long_type
     end
 
     def to_type
-      @interp.int_type
+      @interp.signed_int_type
     end
   end
 
@@ -7765,7 +7801,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.long_long_type
+      @interp.signed_long_long_type
     end
 
     def to_type
@@ -7782,11 +7818,11 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.long_long_type
+      @interp.signed_long_long_type
     end
 
     def to_type
-      @interp.short_type
+      @interp.signed_short_type
     end
   end
 
@@ -7799,11 +7835,11 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.long_long_type
+      @interp.signed_long_long_type
     end
 
     def to_type
-      @interp.int_type
+      @interp.signed_int_type
     end
   end
 
@@ -7816,11 +7852,11 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.long_long_type
+      @interp.signed_long_long_type
     end
 
     def to_type
-      @interp.long_type
+      @interp.signed_long_type
     end
   end
 
@@ -7905,7 +7941,7 @@ module CBuiltin #:nodoc:
     end
 
     def to_type
-      @interp.short_type
+      @interp.signed_short_type
     end
   end
 
@@ -7922,7 +7958,7 @@ module CBuiltin #:nodoc:
     end
 
     def to_type
-      @interp.int_type
+      @interp.signed_int_type
     end
   end
 
@@ -7939,7 +7975,7 @@ module CBuiltin #:nodoc:
     end
 
     def to_type
-      @interp.long_type
+      @interp.signed_long_type
     end
   end
 
@@ -7956,7 +7992,7 @@ module CBuiltin #:nodoc:
     end
 
     def to_type
-      @interp.int_type
+      @interp.signed_int_type
     end
   end
 
@@ -7973,7 +8009,7 @@ module CBuiltin #:nodoc:
     end
 
     def to_type
-      @interp.long_type
+      @interp.signed_long_type
     end
   end
 
@@ -7990,7 +8026,7 @@ module CBuiltin #:nodoc:
     end
 
     def to_type
-      @interp.long_type
+      @interp.signed_long_type
     end
   end
 
@@ -8007,7 +8043,7 @@ module CBuiltin #:nodoc:
     end
 
     def to_type
-      @interp.long_long_type
+      @interp.signed_long_long_type
     end
   end
 
@@ -8024,7 +8060,7 @@ module CBuiltin #:nodoc:
     end
 
     def to_type
-      @interp.long_long_type
+      @interp.signed_long_long_type
     end
   end
 
@@ -8041,7 +8077,7 @@ module CBuiltin #:nodoc:
     end
 
     def to_type
-      @interp.long_long_type
+      @interp.signed_long_long_type
     end
   end
 
@@ -8058,7 +8094,7 @@ module CBuiltin #:nodoc:
     end
 
     def to_type
-      @interp.long_long_type
+      @interp.signed_long_long_type
     end
   end
 
@@ -9928,128 +9964,160 @@ module CBuiltin #:nodoc:
       interp.on_label_defined += method(:define_label)
       interp.on_block_started += method(:enter_scope)
       interp.on_block_ended += method(:leave_scope)
-      @variable_names = [[]]
+      @dcl_names = [[]]
       @tag_names = [[]]
       @label_names = [[]]
     end
 
     private
-    def define_variable(variable_definition, variable)
-      variable_id = variable_definition.identifier
+    def define_variable(var_def, *)
+      dcl_name = var_def.identifier
 
-      (@tag_names + @label_names).each do |identifier_array|
-        if identifier_array.any? { |id| id.value == variable_id.value }
-          W(:W0491, variable_definition.location, variable_id.value)
-          return
+      pair_names = (@tag_names + @label_names).flatten.select { |id|
+        id.value == dcl_name.value
+      }
+
+      unless pair_names.empty?
+        W(:W0491, var_def.location, dcl_name.value)
+        pair_names.each do |pair_name|
+          C(:C0001, pair_name.location, pair_name.value)
         end
       end
 
-      @variable_names.last.push(variable_id)
+      @dcl_names.last.push(dcl_name)
     end
 
-    def declare_variable(variable_declaration, variable)
-      variable_id = variable_declaration.identifier
+    def declare_variable(var_dcl, *)
+      dcl_name = var_dcl.identifier
 
-      (@tag_names + @label_names).each do |identifier_array|
-        if identifier_array.any? { |id| id.value == variable_id.value }
-          W(:W0491, variable_declaration.location, variable_id.value)
-          return
+      pair_names = (@tag_names + @label_names).flatten.select { |id|
+        id.value == dcl_name.value
+      }
+
+      unless pair_names.empty?
+        W(:W0491, var_dcl.location, dcl_name.value)
+        pair_names.each do |pair_name|
+          C(:C0001, pair_name.location, pair_name.value)
         end
       end
 
-      @variable_names.last.push(variable_id)
+      @dcl_names.last.push(dcl_name)
     end
 
-    def declare_struct(struct_type_declaration)
-      tag_id = struct_type_declaration.identifier
-      return unless tag_id
+    def declare_struct(struct_dcl)
+      tag_name = struct_dcl.identifier
+      return unless tag_name
 
-      (@variable_names + @label_names).each do |identifier_array|
-        if identifier_array.any? { |id| id.value == tag_id.value }
-          W(:W0491, struct_type_declaration.location, tag_id.value)
-          return
+      pair_names = (@dcl_names + @label_names).flatten.select { |id|
+        id.value == tag_name.value
+      }
+
+      unless pair_names.empty?
+        W(:W0491, struct_dcl.location, tag_name.value)
+        pair_names.each do |pair_name|
+          C(:C0001, pair_name.location, pair_name.value)
         end
       end
 
-      @tag_names.last.push(tag_id)
+      @tag_names.last.push(tag_name)
     end
 
-    def declare_union(union_type_declaration)
-      tag_id = union_type_declaration.identifier
-      return unless tag_id
+    def declare_union(union_dcl)
+      tag_name = union_dcl.identifier
+      return unless tag_name
 
-      (@variable_names + @label_names).each do |identifier_array|
-        if identifier_array.any? { |id| id.value == tag_id.value }
-          W(:W0491, union_type_declaration.location, tag_id.value)
-          return
+      pair_names = (@dcl_names + @label_names).flatten.select { |id|
+        id.value == tag_name.value
+      }
+
+      unless pair_names.empty?
+        W(:W0491, union_dcl.location, tag_name.value)
+        pair_names.each do |pair_name|
+          C(:C0001, pair_name.location, pair_name.value)
         end
       end
 
-      @tag_names.last.push(tag_id)
+      @tag_names.last.push(tag_name)
     end
 
-    def declare_enum(enum_type_declaration)
-      tag_id = enum_type_declaration.identifier
-      return unless tag_id
+    def declare_enum(enum_dcl)
+      tag_name = enum_dcl.identifier
+      return unless tag_name
 
-      (@variable_names + @label_names).each do |identifier_array|
-        if identifier_array.any? { |id| id.value == tag_id.value }
-          W(:W0491, enum_type_declaration.location, tag_id.value)
-          return
+      pair_names = (@dcl_names + @label_names).flatten.select { |id|
+        id.value == tag_name.value
+      }
+
+      unless pair_names.empty?
+        W(:W0491, enum_dcl.location, tag_name.value)
+        pair_names.each do |pair_name|
+          C(:C0001, pair_name.location, pair_name.value)
         end
       end
 
-      @tag_names.last.push(tag_id)
+      @tag_names.last.push(tag_name)
     end
 
-    def declare_typedef(typedef_declaration)
-      typedef_id = typedef_declaration.identifier
+    def declare_typedef(typedef_dcl)
+      dcl_name = typedef_dcl.identifier
 
-      (@tag_names + @label_names).each do |identifier_array|
-        if identifier_array.any? { |id| id.value == typedef_id.value }
-          W(:W0491, typedef_declaration.location, typedef_id.value)
-          return
+      pair_names = (@tag_names + @label_names).flatten.select { |id|
+        id.value == dcl_name.value
+      }
+
+      unless pair_names.empty?
+        W(:W0491, typedef_dcl.location, dcl_name.value)
+        pair_names.each do |pair_name|
+          C(:C0001, pair_name.location, pair_name.value)
         end
       end
 
-      @variable_names.last.push(typedef_id)
+      @dcl_names.last.push(dcl_name)
     end
 
-    def define_parameter(parameter_definition, variable)
-      param_id = parameter_definition.identifier
-      return unless param_id
+    def define_parameter(param_def, *)
+      dcl_name = param_def.identifier
+      return unless dcl_name
 
-      (@tag_names + @label_names).each do |identifier_array|
-        if identifier_array.any? { |id| id.value == param_id.value }
-          W(:W0491, parameter_definition.location, param_id.value)
-          return
+      pair_names = (@tag_names + @label_names).flatten.select { |id|
+        id.value == dcl_name.value
+      }
+
+      unless pair_names.empty?
+        W(:W0491, param_def.location, dcl_name.value)
+        pair_names.each do |pair_name|
+          C(:C0001, pair_name.location, pair_name.value)
         end
       end
 
-      @variable_names.last.push(param_id)
+      @dcl_names.last.push(dcl_name)
     end
 
-    def define_label(generic_labeled_statement)
-      label_id = generic_labeled_statement.label
+    def define_label(labeled_stmt)
+      label_name = labeled_stmt.label
 
-      (@variable_names + @tag_names).each do |identifier_array|
-        if identifier_array.any? { |id| id.value == label_id.value }
-          W(:W0491, generic_labeled_statement.location, label_id.value)
-          return
+      pair_names = (@dcl_names + @tag_names).flatten.select { |id|
+        id.value == label_name.value
+      }
+
+      unless pair_names.empty?
+        W(:W0491, labeled_stmt.location, label_name.value)
+        pair_names.each do |pair_name|
+          C(:C0001, pair_name.location, pair_name.value)
         end
       end
 
-      @label_names.last.push(label_id)
+      @label_names.last.push(label_name)
     end
 
-    def enter_scope(compound_statement)
-      @variable_names.push([])
+    def enter_scope(*)
+      @dcl_names.push([])
       @tag_names.push([])
       @label_names.push([])
     end
 
-    def leave_scope(compound_statement)
-      @variable_names.pop
+    def leave_scope(*)
+      @dcl_names.pop
       @tag_names.pop
       @label_names.pop
     end
@@ -10067,169 +10135,178 @@ module CBuiltin #:nodoc:
       interp = context[:c_interpreter]
       interp.on_variable_defined += method(:define_variable)
       interp.on_variable_declared += method(:declare_variable)
-      interp.on_struct_declared += method(:declare_struct)
-      interp.on_union_declared += method(:declare_union)
+      interp.on_struct_declared += method(:declare_struct_or_union)
+      interp.on_union_declared += method(:declare_struct_or_union)
       interp.on_enum_declared += method(:declare_enum)
       interp.on_typedef_declared += method(:declare_typedef)
       interp.on_parameter_defined += method(:define_parameter)
       interp.on_label_defined += method(:define_label)
       interp.on_block_started += method(:enter_scope)
       interp.on_block_ended += method(:leave_scope)
-      @variable_names = [[]]
+      @dcl_names = [[]]
       @tag_names = [[]]
       @label_names = [[]]
-      @member_names = [[]]
+      @memb_names = [[]]
     end
 
     private
-    def define_variable(variable_definition, variable)
-      variable_id = variable_definition.identifier
+    def define_variable(var_def, *)
+      dcl_name = var_def.identifier
 
-      @member_names.each do |identifier_array|
-        if identifier_array.any? { |id| id.value == variable_id.value }
-          W(:W0492, variable_definition.location, variable_id.value)
-          return
+      pair_names = @memb_names.flatten.select { |id|
+        id.value == dcl_name.value
+      }
+
+      unless pair_names.empty?
+        W(:W0492, var_def.location, dcl_name.value)
+        pair_names.each do |pair_name|
+          C(:C0001, pair_name.location, pair_name.value)
         end
       end
 
-      @variable_names.last.push(variable_id)
+      @dcl_names.last.push(dcl_name)
     end
 
-    def declare_variable(variable_declaration, variable)
-      variable_id = variable_declaration.identifier
+    def declare_variable(var_dcl, *)
+      dcl_name = var_dcl.identifier
 
-      @member_names.each do |identifier_array|
-        if identifier_array.any? { |id| id.value == variable_id.value }
-          W(:W0492, variable_declaration.location, variable_id.value)
-          return
+      pair_names = @memb_names.flatten.select { |id|
+        id.value == dcl_name.value
+      }
+
+      unless pair_names.empty?
+        W(:W0492, var_dcl.location, dcl_name.value)
+        pair_names.each do |pair_name|
+          C(:C0001, pair_name.location, pair_name.value)
         end
       end
 
-      @variable_names.last.push(variable_id)
+      @dcl_names.last.push(dcl_name)
     end
 
-    def declare_struct(struct_type_declaration)
-      tag_id = struct_type_declaration.identifier
-      return unless tag_id
+    def declare_struct_or_union(struct_or_union_dcl)
+      tag_name = struct_or_union_dcl.identifier
+      return unless tag_name
 
-      @member_names.each do |identifier_array|
-        if identifier_array.any? { |id| id.value == tag_id.value }
-          W(:W0492, struct_type_declaration.location, tag_id.value)
-          break
-        end
-      end
-
-      member_declarations = MemberExtractor.new.tap { |ext|
-        struct_type_declaration.accept(ext)
-      }.result
+      pair_names = @memb_names.flatten.select { |id|
+        id.value == tag_name.value
+      }
 
-      (@variable_names + @tag_names + @label_names).each do |identifier_array|
-        identifier_array.each do |identifier|
-          member = member_declarations.find { |memb|
-            memb.identifier.value == identifier.value
-          }
-          W(:W0492, member.location, member.identifier.value) if member
+      unless pair_names.empty?
+        W(:W0492, struct_or_union_dcl.location, tag_name.value)
+        pair_names.each do |pair_name|
+          C(:C0001, pair_name.location, pair_name.value)
         end
       end
 
-      @member_names.last.push(
-        *member_declarations.map { |memb| memb.identifier })
-    end
+      @tag_names.last.push(tag_name)
 
-    def declare_union(union_type_declaration)
-      tag_id = union_type_declaration.identifier
-      return unless tag_id
-
-      @member_names.each do |identifier_array|
-        if identifier_array.any? { |id| id.value == tag_id.value }
-          W(:W0492, union_type_declaration.location, tag_id.value)
-          break
-        end
-      end
+      declare_members(struct_or_union_dcl)
+    end
 
-      member_declarations = MemberExtractor.new.tap { |ext|
-        union_type_declaration.accept(ext)
+    def declare_members(struct_or_union_dcl)
+      memb_dcls = MemberExtractor.new.tap { |ext|
+        struct_or_union_dcl.accept(ext)
       }.result
 
-      (@variable_names + @tag_names + @label_names).each do |identifier_array|
-        identifier_array.each do |identifier|
-          member = member_declarations.find { |memb|
-            memb.identifier.value == identifier.value
+      memb_dcls.each do |memb_dcl|
+        pair_names =
+          (@dcl_names + @tag_names + @label_names).flatten.select { |id|
+            id.value == memb_dcl.identifier.value
           }
-          W(:W0492, member.location, member.identifier.value) if member
+        unless pair_names.empty?
+          W(:W0492, memb_dcl.location, memb_dcl.identifier.value)
+          pair_names.each do |pair_name|
+            C(:C0001, pair_name.location, pair_name.value)
+          end
         end
-      end
 
-      @member_names.last.push(
-        *member_declarations.map { |memb| memb.identifier })
+        @memb_names.last.push(memb_dcl.identifier)
+      end
     end
 
-    def declare_enum(enum_type_declaration)
-      tag_id = enum_type_declaration.identifier
-      return unless tag_id
+    def declare_enum(enum_dcl)
+      tag_name = enum_dcl.identifier
+      return unless tag_name
 
-      @member_names.each do |identifier_array|
-        if identifier_array.any? { |id| id.value == tag_id.value }
-          W(:W0492, enum_type_declaration.location, tag_id.value)
-          return
+      pair_names = @memb_names.flatten.select { |id|
+        id.value == tag_name.value
+      }
+
+      unless pair_names.empty?
+        W(:W0492, enum_dcl.location, tag_name.value)
+        pair_names.each do |pair_name|
+          C(:C0001, pair_name.location, pair_name.value)
         end
       end
 
-      @tag_names.last.push(tag_id)
+      @tag_names.last.push(tag_name)
     end
 
-    def declare_typedef(typedef_declaration)
-      typedef_id = typedef_declaration.identifier
+    def declare_typedef(typedef_dcl)
+      dcl_name = typedef_dcl.identifier
 
-      @member_names.each do |identifier_array|
-        if identifier_array.any? { |id| id.value == typedef_id.value }
-          W(:W0492, typedef_declaration.location, typedef_id.value)
-          return
+      pair_names = @memb_names.flatten.select { |id|
+        id.value == dcl_name.value
+      }
+
+      unless pair_names.empty?
+        W(:W0492, typedef_dcl.location, dcl_name.value)
+        pair_names.each do |pair_name|
+          C(:C0001, pair_name.location, pair_name.value)
         end
       end
 
-      @variable_names.last.push(typedef_id)
+      @dcl_names.last.push(dcl_name)
     end
 
-    def define_parameter(parameter_definition, variable)
-      param_id = parameter_definition.identifier
-      return unless param_id
+    def define_parameter(param_def, *)
+      dcl_name = param_def.identifier
+      return unless dcl_name
 
-      @member_names.each do |identifier_array|
-        if identifier_array.any? { |id| id.value == param_id.value }
-          W(:W0492, parameter_definition.location, param_id.value)
-          return
+      pair_names = @memb_names.flatten.select { |id|
+        id.value == dcl_name.value
+      }
+
+      unless pair_names.empty?
+        W(:W0492, param_def.location, dcl_name.value)
+        pair_names.each do |pair_name|
+          C(:C0001, pair_name.location, pair_name.value)
         end
       end
 
-      @variable_names.last.push(param_id)
+      @dcl_names.last.push(dcl_name)
     end
 
-    def define_label(generic_labeled_statement)
-      label_id = generic_labeled_statement.label
+    def define_label(labeled_stmt)
+      label_name = labeled_stmt.label
 
-      @member_names.each do |identifier_array|
-        if identifier_array.any? { |id| id.value == label_id.value }
-          W(:W0492, generic_labeled_statement.location, label_id.value)
-          return
+      pair_names = @memb_names.flatten.select { |id|
+        id.value == label_name.value
+      }
+
+      unless pair_names.empty?
+        W(:W0492, labeled_stmt.location, label_name.value)
+        pair_names.each do |pair_name|
+          C(:C0001, pair_name.location, pair_name.value)
         end
       end
 
-      @label_names.last.push(label_id)
+      @label_names.last.push(label_name)
     end
 
-    def enter_scope(compound_statement)
-      @variable_names.push([])
+    def enter_scope(*)
+      @dcl_names.push([])
       @tag_names.push([])
       @label_names.push([])
-      @member_names.push([])
+      @memb_names.push([])
     end
 
-    def leave_scope(compound_statement)
-      @variable_names.pop
+    def leave_scope(*)
+      @dcl_names.pop
       @tag_names.pop
       @label_names.pop
-      @member_names.pop
+      @memb_names.pop
     end
 
     class MemberExtractor < C::SyntaxTreeVisitor
@@ -10241,16 +10318,16 @@ module CBuiltin #:nodoc:
 
       def visit_struct_type_declaration(node)
         if node.struct_declarations
-          node.struct_declarations.each do |struct_declaration|
-            struct_declaration.accept(self)
+          node.struct_declarations.each do |struct_dcl|
+            struct_dcl.accept(self)
           end
         end
       end
 
       def visit_union_type_declaration(node)
         if node.struct_declarations
-          node.struct_declarations.each do |struct_declaration|
-            struct_declaration.accept(self)
+          node.struct_declarations.each do |struct_dcl|
+            struct_dcl.accept(self)
           end
         end
       end
@@ -15507,39 +15584,66 @@ module CBuiltin #:nodoc:
       interp.on_enum_declared += method(:declare_enum)
       interp.on_block_started += method(:enter_scope)
       interp.on_block_ended += method(:leave_scope)
-      @tag_names = [Set.new]
+      @tag_names = [[]]
     end
 
     private
-    def declare_struct(struct_type_declaration)
-      tag_name = struct_type_declaration.identifier.value
-      if @tag_names.any? { |names| names.include?(tag_name) }
-        W(:W0703, struct_type_declaration.location, tag_name)
+    def declare_struct(struct_dcl)
+      tag_name = struct_dcl.identifier
+
+      pair_names = @tag_names.flatten.select { |id|
+        id.value == tag_name.value
+      }
+
+      unless pair_names.empty?
+        W(:W0703, struct_dcl.location, tag_name.value)
+        pair_names.each do |pair_name|
+          C(:C0001, pair_name.location, pair_name.value)
+        end
       end
-      @tag_names.last.add(tag_name)
+
+      @tag_names.last.push(tag_name)
     end
 
-    def declare_union(union_type_declaration)
-      tag_name = union_type_declaration.identifier.value
-      if @tag_names.any? { |names| names.include?(tag_name) }
-        W(:W0703, union_type_declaration.location, tag_name)
+    def declare_union(union_dcl)
+      tag_name = union_dcl.identifier
+
+      pair_names = @tag_names.flatten.select { |id|
+        id.value == tag_name.value
+      }
+
+      unless pair_names.empty?
+        W(:W0703, union_dcl.location, tag_name.value)
+        pair_names.each do |pair_name|
+          C(:C0001, pair_name.location, pair_name.value)
+        end
       end
-      @tag_names.last.add(tag_name)
+
+      @tag_names.last.push(tag_name)
     end
 
-    def declare_enum(enum_type_declaration)
-      tag_name = enum_type_declaration.identifier.value
-      if @tag_names.any? { |names| names.include?(tag_name) }
-        W(:W0703, enum_type_declaration.location, tag_name)
+    def declare_enum(enum_dcl)
+      tag_name = enum_dcl.identifier
+
+      pair_names = @tag_names.flatten.select { |id|
+        id.value == tag_name.value
+      }
+
+      unless pair_names.empty?
+        W(:W0703, enum_dcl.location, tag_name.value)
+        pair_names.each do |pair_name|
+          C(:C0001, pair_name.location, pair_name.value)
+        end
       end
-      @tag_names.last.add(tag_name)
+
+      @tag_names.last.push(tag_name)
     end
 
-    def enter_scope(compound_statement)
-      @tag_names.push(Set.new)
+    def enter_scope(*)
+      @tag_names.push([])
     end
 
-    def leave_scope(compound_statement)
+    def leave_scope(*)
       @tag_names.pop
     end
   end
@@ -15563,115 +15667,178 @@ module CBuiltin #:nodoc:
       interp.on_parameter_defined += method(:define_parameter)
       interp.on_block_started += method(:enter_scope)
       interp.on_block_ended += method(:leave_scope)
-      @vdcls = [Set.new]
-      @vdefs = [Set.new]
-      @fdcls = [Set.new]
-      @fdefs = [Set.new]
-      @tdefs = [Set.new]
-      @enums = [Set.new]
+      @vdcls = [[]]
+      @vdefs = [[]]
+      @fdcls = [[]]
+      @fdefs = [[]]
+      @tdefs = [[]]
+      @enums = [[]]
     end
 
     private
-    def define_variable(variable_definition, variable)
-      identifier = variable_definition.identifier.value
-      if wider_identifiers_of_variable_definition.include?(identifier)
-        W(:W0704, variable_definition.location, identifier)
+    def define_variable(var_def, *)
+      dcl_name = var_def.identifier
+
+      pair_names = wider_identifiers_of_variable_definition.select { |id|
+        id.value == dcl_name.value
+      }
+
+      unless pair_names.empty?
+        W(:W0704, var_def.location, dcl_name.value)
+        pair_names.each do |pair_name|
+          C(:C0001, pair_name.location, pair_name.value)
+        end
       end
-      @vdefs.last.add(identifier)
+
+      @vdefs.last.push(dcl_name)
     end
 
     def wider_identifiers_of_variable_definition
       (@vdcls[0..-2] + @vdefs[0..-2] + @fdcls[0..-2] + @fdefs[0..-2] +
-       @tdefs[0..-2] + @enums[0..-2]).reduce(Set.new) { |r, s| r + s }
+       @tdefs[0..-2] + @enums[0..-2]).flatten
     end
 
-    def declare_function(function_declaration, function)
-      identifier = function_declaration.identifier.value
-      if wider_identifiers_of_function_declaration.include?(identifier)
-        W(:W0704, function_declaration.location, identifier)
+    def declare_function(func_dcl, *)
+      dcl_name = func_dcl.identifier
+
+      pair_names = wider_identifiers_of_function_declaration.select { |id|
+        id.value == dcl_name.value
+      }
+
+      unless pair_names.empty?
+        W(:W0704, func_dcl.location, dcl_name.value)
+        pair_names.each do |pair_name|
+          C(:C0001, pair_name.location, pair_name.value)
+        end
       end
-      @fdcls.last.add(identifier)
+
+      @fdcls.last.push(dcl_name)
     end
 
     def wider_identifiers_of_function_declaration
       (@vdcls[0..-2] + @vdefs[0..-2] + @fdcls[0..-2] + @fdefs[0..-2] +
-       @tdefs[0..-2] + @enums[0..-2]).reduce(Set.new) { |r, s| r + s }
+       @tdefs[0..-2] + @enums[0..-2]).flatten
     end
 
-    def declare_variable(variable_declaration, variable)
-      identifier = variable_declaration.identifier.value
-      if wider_identifiers_of_variable_declaration.include?(identifier)
-        W(:W0704, variable_declaration.location, identifier)
+    def declare_variable(var_dcl, *)
+      dcl_name = var_dcl.identifier
+
+      pair_names = wider_identifiers_of_variable_declaration.select { |id|
+        id.value == dcl_name.value
+      }
+
+      unless pair_names.empty?
+        W(:W0704, var_dcl.location, dcl_name.value)
+        pair_names.each do |pair_name|
+          C(:C0001, pair_name.location, pair_name.value)
+        end
       end
-      @vdcls.last.add(identifier)
+
+      @vdcls.last.push(dcl_name)
     end
 
     def wider_identifiers_of_variable_declaration
       (@vdefs[0..-2] + @fdcls[0..-2] + @fdefs[0..-2] + @tdefs[0..-2] +
-       @enums[0..-2]).reduce(Set.new) { |r, s| r + s }
+       @enums[0..-2]).flatten
     end
 
-    def declare_enum(enum_type_declaration)
-      enum_type_declaration.enumerators.each do |enum|
-        identifier = enum.identifier.value
-        if wider_identifiers_of_enum_declaration.include?(identifier)
-          W(:W0704, enum.location, identifier)
+    def declare_enum(enum_dcl)
+      enum_dcl.enumerators.each do |enum|
+        enum_name = enum.identifier
+
+        pair_names = wider_identifiers_of_enum_declaration.select { |id|
+          id.value == enum_name.value
+        }
+
+        unless pair_names.empty?
+          W(:W0704, enum.location, enum_name.value)
+          pair_names.each do |pair_name|
+            C(:C0001, pair_name.location, pair_name.value)
+          end
         end
-        @enums.last.add(identifier)
+
+        @enums.last.push(enum_name)
       end
     end
 
     def wider_identifiers_of_enum_declaration
       (@vdcls[0..-2] + @vdefs[0..-2] + @fdcls[0..-2] + @fdefs[0..-2] +
-       @tdefs[0..-2] + @enums[0..-2]).reduce(Set.new) { |r, s| r + s }
+       @tdefs[0..-2] + @enums[0..-2]).flatten
     end
 
-    def declare_typedef(typedef_declaration)
-      identifier = typedef_declaration.identifier.value
-      if wider_identifiers_of_typedef_declaration.include?(identifier)
-        W(:W0704, typedef_declaration.location, identifier)
+    def declare_typedef(typedef_dcl)
+      dcl_name = typedef_dcl.identifier
+
+      pair_names = wider_identifiers_of_typedef_declaration.select { |id|
+        id.value == dcl_name.value
+      }
+
+      unless pair_names.empty?
+        W(:W0704, typedef_dcl.location, dcl_name.value)
+        pair_names.each do |pair_name|
+          C(:C0001, pair_name.location, pair_name.value)
+        end
       end
-      @enums.last.add(identifier)
+
+      @enums.last.push(dcl_name)
     end
 
     def wider_identifiers_of_typedef_declaration
       (@vdcls[0..-2] + @vdefs[0..-2] + @fdcls[0..-2] + @fdefs[0..-2] +
-       @tdefs[0..-2] + @enums[0..-2]).reduce(Set.new) { |r, s| r + s }
+       @tdefs[0..-2] + @enums[0..-2]).flatten
     end
 
-    def define_function(function_definition, function)
-      identifier = function_definition.identifier.value
-      if wider_identifiers_of_function_definition.include?(identifier)
-        W(:W0704, function_definition.location, identifier)
+    def define_function(func_def, *)
+      dcl_name = func_def.identifier
+
+      pair_names = wider_identifiers_of_function_definition.select { |id|
+        id.value == dcl_name.value
+      }
+
+      unless pair_names.empty?
+        W(:W0704, func_def.location, dcl_name.value)
+        pair_names.each do |pair_name|
+          C(:C0001, pair_name.location, pair_name.value)
+        end
       end
-      @fdefs.last.add(identifier)
+
+      @fdefs.last.push(dcl_name)
     end
 
     def wider_identifiers_of_function_definition
       (@vdcls[0..-2] + @vdefs[0..-2] + @fdefs[0..-2] + @tdefs[0..-2] +
-       @enums[0..-2]).reduce(Set.new) { |r, s| r + s }
+       @enums[0..-2]).flatten
     end
 
-    def define_parameter(parameter_definition, variable)
-      identifier = parameter_definition.identifier.value
-      if wider_identifiers_of_parameter_definition.include?(identifier)
-        W(:W0704, parameter_definition.location, identifier)
+    def define_parameter(param_def, *)
+      dcl_name = param_def.identifier
+
+      pair_names = wider_identifiers_of_parameter_definition.select { |id|
+        id.value == dcl_name.value
+      }
+
+      unless pair_names.empty?
+        W(:W0704, param_def.location, dcl_name.value)
+        pair_names.each do |pair_name|
+          C(:C0001, pair_name.location, pair_name.value)
+        end
       end
-      @vdefs.last.add(identifier)
+
+      @vdefs.last.push(dcl_name)
     end
 
     def wider_identifiers_of_parameter_definition
       (@vdcls[0..-2] + @vdefs[0..-2] + @fdcls[0..-2] + @fdefs[0..-2] +
-       @tdefs[0..-2] + @enums[0..-2]).reduce(Set.new) { |r, s| r + s }
+       @tdefs[0..-2] + @enums[0..-2]).flatten
     end
 
     def enter_scope(compound_statement)
-      @vdcls.push(Set.new)
-      @vdefs.push(Set.new)
-      @fdcls.push(Set.new)
-      @fdefs.push(Set.new)
-      @tdefs.push(Set.new)
-      @enums.push(Set.new)
+      @vdcls.push([])
+      @vdefs.push([])
+      @fdcls.push([])
+      @fdefs.push([])
+      @tdefs.push([])
+      @enums.push([])
     end
 
     def leave_scope(compound_statement)
@@ -17487,7 +17654,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.short_type
+      @interp.signed_short_type
     end
 
     def to_type
@@ -17521,7 +17688,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.int_type
+      @interp.signed_int_type
     end
 
     def to_type
@@ -17538,11 +17705,11 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.int_type
+      @interp.signed_int_type
     end
 
     def to_type
-      @interp.short_type
+      @interp.signed_short_type
     end
   end
 
@@ -17589,7 +17756,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.long_type
+      @interp.signed_long_type
     end
 
     def to_type
@@ -17606,11 +17773,11 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.long_type
+      @interp.signed_long_type
     end
 
     def to_type
-      @interp.short_type
+      @interp.signed_short_type
     end
   end
 
@@ -17623,11 +17790,11 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.long_type
+      @interp.signed_long_type
     end
 
     def to_type
-      @interp.int_type
+      @interp.signed_int_type
     end
   end
 
@@ -17691,7 +17858,7 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.long_long_type
+      @interp.signed_long_long_type
     end
 
     def to_type
@@ -17708,11 +17875,11 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.long_long_type
+      @interp.signed_long_long_type
     end
 
     def to_type
-      @interp.short_type
+      @interp.signed_short_type
     end
   end
 
@@ -17725,11 +17892,11 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.long_long_type
+      @interp.signed_long_long_type
     end
 
     def to_type
-      @interp.int_type
+      @interp.signed_int_type
     end
   end
 
@@ -17742,11 +17909,11 @@ module CBuiltin #:nodoc:
 
     private
     def from_type
-      @interp.long_long_type
+      @interp.signed_long_long_type
     end
 
     def to_type
-      @interp.long_type
+      @interp.signed_long_type
     end
   end
 
@@ -17882,42 +18049,33 @@ module CBuiltin #:nodoc:
       interp.on_variable_declared += method(:declare_variable)
       interp.on_function_declared += method(:declare_function)
       interp.on_translation_unit_ended += method(:check)
-      @variable_declarations = Hash.new { |hash, key| hash[key] = [] }
-      @function_declarations = Hash.new { |hash, key| hash[key] = [] }
+      @obj_dcls = Hash.new { |hash, key| hash[key] = [] }
     end
 
     private
-    def declare_variable(variable_declaration, variable)
-      if variable.named? && variable.declared_as_extern?
-        @variable_declarations[variable.name].push(variable_declaration)
+    def declare_variable(var_dcl, var)
+      if var.named? && var.declared_as_extern?
+        @obj_dcls[var.name].push(var_dcl)
       end
     end
 
-    def declare_function(function_declaration, function)
-      if function.named? && function.declared_as_extern?
-        @function_declarations[function.name].push(function_declaration)
+    def declare_function(func_dcl, func)
+      if func.named? && func.declared_as_extern?
+        @obj_dcls[func.name].push(func_dcl)
       end
     end
 
     def check(*)
-      @variable_declarations.each_value do |declarations|
-        decl_locations = declarations.map { |decl|
-          decl.location
-        }.uniq { |location| location.fpath }
-        if decl_locations.size > 1
-          decl_locations.each do |location|
-            W(:W0771, location, declarations.first.identifier.value)
-          end
-        end
-      end
-
-      @function_declarations.each_value do |declarations|
-        decl_locations = declarations.map { |decl|
-          decl.location
-        }.uniq { |location| location.fpath }
-        if decl_locations.size > 1
-          decl_locations.each do |location|
-            W(:W0771, location, declarations.first.identifier.value)
+      @obj_dcls.each_value do |dcls|
+        similar_dcls = dcls.uniq { |dcl| dcl.location.fpath }
+        next unless similar_dcls.size > 1
+
+        similar_dcls.each do |dcl|
+          W(:W0771, dcl.location, dcl.identifier.value)
+          similar_dcls.each do |pair_dcl|
+            if pair_dcl != dcl
+              C(:C0001, pair_dcl.location, pair_dcl.identifier.value)
+            end
           end
         end
       end
@@ -17993,36 +18151,34 @@ module CBuiltin #:nodoc:
     end
 
     private
-    def check(initializer_or_expression, original_variable, result_variable)
-      return unless @rvalues
-      return unless original_variable.type.floating?
-
-      case expression = @rvalues[original_variable]
-      when C::AdditiveExpression, C::MultiplicativeExpression
-        if original_variable.type.same_as?(from_type) &&
-            result_variable.type.same_as?(to_type)
-          W(message_id, expression.location)
+    def check(*, orig_var, result_var)
+      if @rvalues && orig_var.type.floating?
+        case expr = @rvalues[orig_var]
+        when C::AdditiveExpression, C::MultiplicativeExpression
+          if orig_var.type.same_as?(from_type) &&
+              result_var.type.same_as?(to_type)
+            W(message_id, expr.location)
+          end
         end
       end
     end
 
-    def clear_rvalues(function_definition, function)
+    def clear_rvalues(*)
       @rvalues = {}
     end
 
-    def handle_additive(additive_expression,
-                        lhs_variable, rhs_variable, result_variable)
-      memorize_rvalue_derivation(result_variable, additive_expression)
+    def handle_additive(expr, lhs_var, rhs_var, result_var)
+      memorize_rvalue_derivation(result_var, expr)
     end
 
-    def handle_multiplicative(multiplicative_expression,
-                              lhs_variable, rhs_variable, result_variable)
-      return if multiplicative_expression.operator.type == "%"
-      memorize_rvalue_derivation(result_variable, multiplicative_expression)
+    def handle_multiplicative(expr, lhs_var, rhs_var, result_var)
+      unless expr.operator.type == "%"
+        memorize_rvalue_derivation(result_var, expr)
+      end
     end
 
-    def memorize_rvalue_derivation(rvalue_holder, expression)
-      @rvalues[rvalue_holder] = expression if @rvalues
+    def memorize_rvalue_derivation(rvalue_holder, expr)
+      @rvalues[rvalue_holder] = expr if @rvalues
     end
 
     def from_type
@@ -18238,131 +18394,140 @@ module CBuiltin #:nodoc:
       interp.on_function_defined += method(:check_object_declaration)
       interp.on_typedef_declared += method(:check_typedef_declaration)
       interp.on_enum_declared += method(:check_enum_declaration)
-      interp.on_block_started += method(:start_block)
-      interp.on_block_ended += method(:end_block)
+      interp.on_block_started += method(:enter_scope)
+      interp.on_block_ended += method(:leave_scope)
 
-      @object_decls_stack = [Hash.new { |hash, key| hash[key] = [] }]
-      @typedef_decls_stack = [Hash.new { |hash, key| hash[key] = [] }]
-      @enumerators_stack = [Hash.new(0)]
+      @obj_dcls = [Hash.new { |hash, key| hash[key] = [] }]
+      @typedef_dcls = [Hash.new { |hash, key| hash[key] = [] }]
+      @enum_names = [Hash.new { |hash, key| hash[key] = [] }]
 
-      @object_decls_in_other_scope = Hash.new { |hash, key| hash[key] = [] }
-      @typedef_decls_in_other_scope = Hash.new { |hash, key| hash[key] = [] }
-      @enumerators_in_other_scope = Hash.new(0)
+      @obj_dcls_in_other_scope = Hash.new { |hash, key| hash[key] = [] }
+      @typedef_dcls_in_other_scope = Hash.new { |hash, key| hash[key] = [] }
+      @enum_names_in_other_scope = Hash.new { |hash, key| hash[key] = [] }
     end
 
     private
-    def check_object_declaration(declaration_or_definition, object)
-      return unless object.declared_as_extern?
+    def check_object_declaration(obj_dcl, obj)
+      return unless obj.declared_as_extern?
 
-      name = declaration_or_definition.identifier.value
-      type = declaration_or_definition.type
+      name = obj_dcl.identifier.value
+      type = obj_dcl.type
 
-      same_name_object_decls = @object_decls_in_other_scope[name]
-      unless same_name_object_decls.all? { |decl| decl.type == type }
-        W(:W0787, declaration_or_definition.location, name)
-        return
+      same_name_obj_dcls = @obj_dcls_in_other_scope[name]
+      incompatibles = same_name_obj_dcls.select { |dcl| dcl.type != type }
+      unless incompatibles.empty?
+        W(:W0787, obj_dcl.location, name)
+        incompatibles.each do |same_name_dcl|
+          C(:C0001, same_name_dcl.location, same_name_dcl.identifier.value)
+        end
       end
 
-      same_name_typedef_decls = @typedef_decls_in_other_scope[name]
-      unless same_name_typedef_decls.empty?
-        W(:W0787, declaration_or_definition.location, name)
-        return
+      same_name_typedef_dcls = @typedef_dcls_in_other_scope[name]
+      unless same_name_typedef_dcls.empty?
+        W(:W0787, obj_dcl.location, name)
+        same_name_typedef_dcls.each do |same_name_dcl|
+          C(:C0001, same_name_dcl.location, same_name_dcl.identifier.value)
+        end
       end
 
-      same_name_enumerators = @enumerators_in_other_scope[name]
-      unless same_name_enumerators == 0
-        W(:W0787, declaration_or_definition.location, name)
-        return
-      end
-    ensure
-      unless @object_decls_stack.empty?
-        @object_decls_stack.last[name].push(declaration_or_definition)
+      same_name_enums = @enum_names_in_other_scope[name]
+      unless same_name_enums.empty?
+        W(:W0787, obj_dcl.location, name)
+        same_name_enums.each do |same_name_enum|
+          C(:C0001, same_name_enum.location, same_name_enum.identifier.value)
+        end
       end
+
+      @obj_dcls.last[name].push(obj_dcl)
     end
 
-    def check_typedef_declaration(typedef_declaration)
-      name = typedef_declaration.identifier.value
-      type = typedef_declaration.type
+    def check_typedef_declaration(typedef_dcl)
+      name = typedef_dcl.identifier.value
+      type = typedef_dcl.type
 
-      same_name_object_decls = @object_decls_in_other_scope[name]
-      unless same_name_object_decls.empty?
-        W(:W0787, typedef_declaration.location, name)
-        return
+      same_name_obj_dcls = @obj_dcls_in_other_scope[name]
+      unless same_name_obj_dcls.empty?
+        W(:W0787, typedef_dcl.location, name)
+        same_name_obj_dcls.each do |same_name_dcl|
+          C(:C0001, same_name_dcl.location, same_name_dcl.identifier.value)
+        end
       end
 
-      same_name_typedef_decls = @typedef_decls_in_other_scope[name]
-      unless same_name_typedef_decls.all? { |decl| decl.type == type }
-        W(:W0787, typedef_declaration.location, name)
-        return
+      same_name_typedef_dcls = @typedef_dcls_in_other_scope[name]
+      incompatibles = same_name_typedef_dcls.select { |dcl| dcl.type != type }
+      unless incompatibles.empty?
+        W(:W0787, typedef_dcl.location, name)
+        incompatibles.each do |same_name_dcl|
+          C(:C0001, same_name_dcl.location, same_name_dcl.identifier.value)
+        end
       end
 
-      same_name_enumerators = @enumerators_in_other_scope[name]
-      unless same_name_enumerators == 0
-        W(:W0787, typedef_declaration.location, name)
-        return
-      end
-    ensure
-      unless @typedef_decls_stack.empty?
-        @typedef_decls_stack.last[name].push(typedef_declaration)
+      same_name_enums = @enum_names_in_other_scope[name]
+      unless same_name_enums.empty?
+        W(:W0787, typedef_dcl.location, name)
+        same_name_enums.each do |same_name_enum|
+          C(:C0001, same_name_enum.location, same_name_enum.identifier.value)
+        end
       end
+
+      @typedef_dcls.last[name].push(typedef_dcl)
     end
 
-    def check_enum_declaration(enum_type_declaration)
-      enum_type_declaration.enumerators.each { |enum| check_enumerator(enum) }
+    def check_enum_declaration(enum_dcl)
+      enum_dcl.enumerators.each { |enum| check_enumerator(enum) }
     end
 
-    def check_enumerator(enumerator)
-      name = enumerator.identifier.value
+    def check_enumerator(enum)
+      name = enum.identifier.value
 
-      same_name_object_decls = @object_decls_in_other_scope[name]
-      unless same_name_object_decls.empty?
-        W(:W0787, enumerator.location, name)
-        return
+      same_name_obj_dcls = @obj_dcls_in_other_scope[name]
+      unless same_name_obj_dcls.empty?
+        W(:W0787, enum.location, name)
+        same_name_obj_dcls.each do |same_name_dcl|
+          C(:C0001, same_name_dcl.location, same_name_dcl.identifier.value)
+        end
       end
 
-      same_name_typedef_decls = @typedef_decls_in_other_scope[name]
-      unless same_name_typedef_decls.empty?
-        W(:W0787, enumerator.location, name)
-        return
+      same_name_typedef_dcls = @typedef_dcls_in_other_scope[name]
+      unless same_name_typedef_dcls.empty?
+        W(:W0787, enum.location, name)
+        same_name_typedef_dcls.each do |same_name_dcl|
+          C(:C0001, same_name_dcl.location, same_name_dcl.identifier.value)
+        end
       end
 
-      same_name_enumerators = @enumerators_in_other_scope[name]
-      unless same_name_enumerators == 0
-        W(:W0787, enumerator.location, name)
-        return
-      end
-    ensure
-      unless @enumerators_stack.empty?
-        @enumerators_stack.last[name] += 1
+      same_name_enums = @enum_names_in_other_scope[name]
+      unless same_name_enums.empty?
+        W(:W0787, enum.location, name)
+        same_name_enums.each do |same_name_enum|
+          C(:C0001, same_name_enum.location, same_name_enum.identifier.value)
+        end
       end
+
+      @enum_names.last[name].push(enum)
     end
 
-    def start_block(compound_statement)
-      @object_decls_stack.push(Hash.new { |hash, key| hash[key] = [] })
-      @typedef_decls_stack.push(Hash.new { |hash, key| hash[key] = [] })
-      @enumerators_stack.push(Hash.new(0))
+    def enter_scope(*)
+      @obj_dcls.push(Hash.new { |hash, key| hash[key] = [] })
+      @typedef_dcls.push(Hash.new { |hash, key| hash[key] = [] })
+      @enum_names.push(Hash.new { |hash, key| hash[key] = [] })
     end
 
-    def end_block(compound_statement)
-      unless @object_decls_stack.empty?
-        @object_decls_stack.last.each do |name, decls|
-          @object_decls_in_other_scope[name].concat(decls)
-        end
-        @object_decls_stack.pop
+    def leave_scope(*)
+      @obj_dcls.last.each do |name, dcls|
+        @obj_dcls_in_other_scope[name].concat(dcls)
       end
+      @obj_dcls.pop
 
-      unless @typedef_decls_stack.empty?
-        @typedef_decls_stack.last.each do |name, decls|
-          @typedef_decls_in_other_scope[name].concat(decls)
-        end
-        @typedef_decls_stack.pop
+      @typedef_dcls.last.each do |name, dcls|
+        @typedef_dcls_in_other_scope[name].concat(dcls)
       end
+      @typedef_dcls.pop
 
-      unless @enumerators_stack.empty?
-        @enumerators_stack.last.each do |name, decl_num|
-          @enumerators_in_other_scope[name] += decl_num
-        end
+      @enum_names.last.each do |name, enums|
+        @enum_names_in_other_scope[name].concat(enums)
       end
+      @enum_names.pop
     end
   end
 
@@ -18382,127 +18547,123 @@ module CBuiltin #:nodoc:
       interp.on_function_defined += method(:check_object_declaration)
       interp.on_typedef_declared += method(:check_typedef_declaration)
       interp.on_enum_declared += method(:check_enum_declaration)
-      interp.on_block_started += method(:start_block)
-      interp.on_block_ended += method(:end_block)
+      interp.on_block_started += method(:enter_scope)
+      interp.on_block_ended += method(:leave_scope)
 
-      @object_decls_stack = [Hash.new { |hash, key| hash[key] = [] }]
-      @typedef_decls_stack = [Hash.new { |hash, key| hash[key] = [] }]
-      @enumerators_stack = [Hash.new(0)]
+      @obj_dcls = [Hash.new { |hash, key| hash[key] = [] }]
+      @typedef_dcls = [Hash.new { |hash, key| hash[key] = [] }]
+      @enum_names = [Hash.new { |hash, key| hash[key] = [] }]
     end
 
     private
-    def check_object_declaration(declaration_or_definition, *)
-      name = declaration_or_definition.identifier.value
-      type = declaration_or_definition.type
+    def check_object_declaration(obj_dcl, *)
+      name = obj_dcl.identifier.value
+      type = obj_dcl.type
 
-      unless @object_decls_stack.empty?
-        same_name_object_decls = @object_decls_stack.last[name]
-        unless same_name_object_decls.all? { |decl| decl.type == type }
-          W(:W0788, declaration_or_definition.location, name)
-          return
+      same_name_obj_dcls = @obj_dcls.last[name]
+      incompatibles = same_name_obj_dcls.select { |dcl| dcl.type != type }
+      unless incompatibles.empty?
+        W(:W0788, obj_dcl.location, name)
+        incompatibles.each do |same_name_dcl|
+          C(:C0001, same_name_dcl.location, same_name_dcl.identifier.value)
         end
       end
 
-      unless @typedef_decls_stack.empty?
-        same_name_typedef_decls = @typedef_decls_stack.last[name]
-        unless same_name_typedef_decls.empty?
-          W(:W0788, declaration_or_definition.location, name)
-          return
+      same_name_typedef_dcls = @typedef_dcls.last[name]
+      unless same_name_typedef_dcls.empty?
+        W(:W0788, obj_dcl.location, name)
+        same_name_typedef_dcls.each do |same_name_dcl|
+          C(:C0001, same_name_dcl.location, same_name_dcl.identifier.value)
         end
       end
 
-      unless @enumerators_stack.empty?
-        same_name_enumerators = @enumerators_stack.last[name]
-        unless same_name_enumerators == 0
-          W(:W0788, declaration_or_definition.location, name)
-          return
+      same_name_enums = @enum_names.last[name]
+      unless same_name_enums.empty?
+        W(:W0788, obj_dcl.location, name)
+        same_name_enums.each do |same_name_enum|
+          C(:C0001, same_name_enum.location, same_name_enum.identifier.value)
         end
       end
-    ensure
-      unless @object_decls_stack.empty?
-        @object_decls_stack.last[name].push(declaration_or_definition)
-      end
+
+      @obj_dcls.last[name].push(obj_dcl)
     end
 
-    def check_typedef_declaration(typedef_declaration)
-      name = typedef_declaration.identifier.value
-      type = typedef_declaration.type
+    def check_typedef_declaration(typedef_dcl)
+      name = typedef_dcl.identifier.value
+      type = typedef_dcl.type
 
-      unless @object_decls_stack.empty?
-        same_name_object_decls = @object_decls_stack.last[name]
-        unless same_name_object_decls.empty?
-          W(:W0788, typedef_declaration.location, name)
-          return
+      same_name_obj_dcls = @obj_dcls.last[name]
+      unless same_name_obj_dcls.empty?
+        W(:W0788, typedef_dcl.location, name)
+        same_name_obj_dcls.each do |same_name_dcl|
+          C(:C0001, same_name_dcl.location, same_name_dcl.identifier.value)
         end
       end
 
-      unless @typedef_decls_stack.empty?
-        same_name_typedef_decls = @typedef_decls_stack.last[name]
-        unless same_name_typedef_decls.all? { |decl| decl.type == type }
-          W(:W0788, typedef_declaration.location, name)
-          return
+      same_name_typedef_dcls = @typedef_dcls.last[name]
+      incompatibles = same_name_typedef_dcls.select { |dcl| dcl.type != type }
+      unless incompatibles.empty?
+        W(:W0788, typedef_dcl.location, name)
+        incompatibles.each do |same_name_dcl|
+          C(:C0001, same_name_dcl.location, same_name_dcl.identifier.value)
         end
       end
 
-      unless @enumerators_stack.empty?
-        same_name_enumerators = @enumerators_stack.last[name]
-        unless same_name_enumerators == 0
-          W(:W0788, typedef_declaration.location, name)
-          return
+      same_name_enums = @enum_names.last[name]
+      unless same_name_enums.empty?
+        W(:W0788, typedef_dcl.location, name)
+        same_name_enums.each do |same_name_enum|
+          C(:C0001, same_name_enum.location, same_name_enum.identifier.value)
         end
       end
-    ensure
-      unless @typedef_decls_stack.empty?
-        @typedef_decls_stack.last[name].push(typedef_declaration)
-      end
+
+      @typedef_dcls.last[name].push(typedef_dcl)
     end
 
-    def check_enum_declaration(enum_type_declaration)
-      enum_type_declaration.enumerators.each { |enum| check_enumerator(enum) }
+    def check_enum_declaration(enum_dcl)
+      enum_dcl.enumerators.each { |enum| check_enumerator(enum) }
     end
 
-    def check_enumerator(enumerator)
-      name = enumerator.identifier.value
+    def check_enumerator(enum)
+      name = enum.identifier.value
 
-      unless @object_decls_stack.empty?
-        same_name_object_decls = @object_decls_stack.last[name]
-        unless same_name_object_decls.empty?
-          W(:W0788, enumerator.location, name)
-          return
+      same_name_obj_dcls = @obj_dcls.last[name]
+      unless same_name_obj_dcls.empty?
+        W(:W0788, enum.location, name)
+        same_name_obj_dcls.each do |same_name_dcl|
+          C(:C0001, same_name_dcl.location, same_name_dcl.identifier.value)
         end
       end
 
-      unless @typedef_decls_stack.empty?
-        same_name_typedef_decls = @typedef_decls_stack.last[name]
-        unless same_name_typedef_decls.empty?
-          W(:W0788, enumerator.location, name)
-          return
+      same_name_typedef_dcls = @typedef_dcls.last[name]
+      unless same_name_typedef_dcls.empty?
+        W(:W0788, enum.location, name)
+        same_name_typedef_decls.each do |same_name_dcl|
+          C(:C0001, same_name_dcl.location, same_name_dcl.identifier.value)
         end
       end
 
-      unless @enumerators_stack.empty?
-        same_name_enumerators = @enumerators_stack.last[name]
-        unless same_name_enumerators == 0
-          W(:W0788, enumerator.location, name)
-          return
+      same_name_enums = @enum_names.last[name]
+      unless same_name_enums.empty?
+        W(:W0788, enum.location, name)
+        same_name_enums.each do |same_name_enum|
+          C(:C0001, same_name_enum.location, same_name_enum.identifier.value)
         end
       end
-    ensure
-      unless @enumerators_stack.empty?
-        @enumerators_stack.last[name] += 1
-      end
+
+      @enum_names.last[name].push(enum)
     end
 
-    def start_block(compound_statement)
-      @object_decls_stack.push(Hash.new { |hash, key| hash[key] = [] })
-      @typedef_decls_stack.push(Hash.new { |hash, key| hash[key] = [] })
-      @enumerators_stack.push(Hash.new(0))
+    def enter_scope(*)
+      @obj_dcls.push(Hash.new { |hash, key| hash[key] = [] })
+      @typedef_dcls.push(Hash.new { |hash, key| hash[key] = [] })
+      @enum_names.push(Hash.new { |hash, key| hash[key] = [] })
     end
 
-    def end_block(compound_statement)
-      @object_decls_stack.pop
-      @typedef_decls_stack.pop
-      @enumerators_stack.pop
+    def leave_scope(*)
+      @obj_dcls.pop
+      @typedef_dcls.pop
+      @enum_names.pop
     end
   end
 
@@ -18522,130 +18683,127 @@ module CBuiltin #:nodoc:
       interp.on_function_defined += method(:check_object_declaration)
       interp.on_typedef_declared += method(:check_typedef_declaration)
       interp.on_enum_declared += method(:check_enum_declaration)
-      interp.on_block_started += method(:start_block)
-      interp.on_block_ended += method(:end_block)
+      interp.on_block_started += method(:enter_scope)
+      interp.on_block_ended += method(:leave_scope)
 
-      @object_decls_stack = [Hash.new { |hash, key| hash[key] = [] }]
-      @typedef_decls_stack = [Hash.new { |hash, key| hash[key] = [] }]
-      @enumerators_stack = [Hash.new(0)]
+      @obj_dcls = [Hash.new { |hash, key| hash[key] = [] }]
+      @typedef_dcls = [Hash.new { |hash, key| hash[key] = [] }]
+      @enum_names = [Hash.new { |hash, key| hash[key] = [] }]
     end
 
     private
-    def check_object_declaration(declaration_or_definition, *)
-      name = declaration_or_definition.identifier.value
-      type = declaration_or_definition.type
+    def check_object_declaration(obj_dcl, *)
+      name = obj_dcl.identifier.value
+      type = obj_dcl.type
 
-      same_name_object_decls =
-        merge_same_name_object_decls(name, @object_decls_stack[0..-2])
-      unless same_name_object_decls.all? { |decl| decl.type == type }
-        W(:W0789, declaration_or_definition.location, name)
-        return
+      same_name_obj_dcls = merge_upper_scopes(name, @obj_dcls)
+      incompatibles = same_name_obj_dcls.select { |dcl| dcl.type != type }
+      unless incompatibles.empty?
+        W(:W0789, obj_dcl.location, name)
+        incompatibles.each do |same_name_dcl|
+          C(:C0001, same_name_dcl.location, same_name_dcl.identifier.value)
+        end
       end
 
-      same_name_typedef_decls =
-        merge_same_name_typedef_decls(name, @typedef_decls_stack[0..-2])
-      unless same_name_typedef_decls.empty?
-        W(:W0789, declaration_or_definition.location, name)
-        return
+      same_name_typedef_dcls = merge_upper_scopes(name, @typedef_dcls)
+      unless same_name_typedef_dcls.empty?
+        W(:W0789, obj_dcl.location, name)
+        same_name_typedef_dcls.each do |same_name_dcl|
+          C(:C0001, same_name_dcl.location, same_name_dcl.identifier.value)
+        end
       end
 
-      same_name_enumerators =
-        merge_same_name_enumerators(name, @enumerators_stack[0..-2])
-      unless same_name_enumerators == 0
-        W(:W0789, declaration_or_definition.location, name)
-        return
-      end
-    ensure
-      unless @object_decls_stack.empty?
-        @object_decls_stack.last[name].push(declaration_or_definition)
+      same_name_enums = merge_upper_scopes(name, @enum_names)
+      unless same_name_enums.empty?
+        W(:W0789, obj_dcl.location, name)
+        same_name_enums.each do |same_name_enum|
+          C(:C0001, same_name_enum.location, same_name_enum.identifier.value)
+        end
       end
+
+      @obj_dcls.last[name].push(obj_dcl)
     end
 
-    def check_typedef_declaration(typedef_declaration)
-      name = typedef_declaration.identifier.value
-      type = typedef_declaration.type
+    def check_typedef_declaration(typedef_dcl)
+      name = typedef_dcl.identifier.value
+      type = typedef_dcl.type
 
-      same_name_object_decls =
-        merge_same_name_object_decls(name, @object_decls_stack[0..-2])
-      unless same_name_object_decls.empty?
-        W(:W0789, typedef_declaration.location, name)
-        return
+      same_name_obj_dcls = merge_upper_scopes(name, @obj_dcls)
+      unless same_name_obj_dcls.empty?
+        W(:W0789, typedef_dcl.location, name)
+        same_name_obj_dcls.each do |same_name_dcl|
+          C(:C0001, same_name_dcl.location, same_name_dcl.identifier.value)
+        end
       end
 
-      same_name_typedef_decls =
-        merge_same_name_typedef_decls(name, @typedef_decls_stack[0..-2])
-      unless same_name_typedef_decls.all? { |decl| decl.type == type }
-        W(:W0789, typedef_declaration.location, name)
-        return
+      same_name_typedef_dcls = merge_upper_scopes(name, @typedef_dcls)
+      incompatibles = same_name_typedef_dcls.select { |dcl| dcl.type != type }
+      unless incompatibles.empty?
+        W(:W0789, typedef_dcl.location, name)
+        incompatibles.each do |same_name_dcl|
+          C(:C0001, same_name_dcl.location, same_name_dcl.identifier.value)
+        end
       end
 
-      same_name_enumerators =
-        merge_same_name_enumerators(name, @enumerators_stack[0..-2])
-      unless same_name_enumerators == 0
-        W(:W0789, typedef_declaration.location, name)
-        return
-      end
-    ensure
-      unless @typedef_decls_stack.empty?
-        @typedef_decls_stack.last[name].push(typedef_declaration)
+      same_name_enums = merge_upper_scopes(name, @enum_names)
+      unless same_name_enums.empty?
+        W(:W0789, typedef_dcl.location, name)
+        same_name_enums.each do |same_name_enum|
+          C(:C0001, same_name_enum.location, same_name_enum.identifier.value)
+        end
       end
+
+      @typedef_dcls.last[name].push(typedef_dcl)
     end
 
-    def check_enum_declaration(enum_type_declaration)
-      enum_type_declaration.enumerators.each { |enum| check_enumerator(enum) }
+    def check_enum_declaration(enum_dcl)
+      enum_dcl.enumerators.each { |enum| check_enumerator(enum) }
     end
 
-    def check_enumerator(enumerator)
-      name = enumerator.identifier.value
+    def check_enumerator(enum)
+      name = enum.identifier.value
 
-      same_name_object_decls =
-        merge_same_name_object_decls(name, @object_decls_stack[0..-2])
-      unless same_name_object_decls.empty?
-        W(:W0789, enumerator.location, name)
-        return
+      same_name_obj_dcls = merge_upper_scopes(name, @obj_dcls)
+      unless same_name_obj_dcls.empty?
+        W(:W0789, enum.location, name)
+        same_name_obj_dcls.each do |same_name_dcl|
+          C(:C0001, same_name_dcl.location, same_name_dcl.identifier.value)
+        end
       end
 
-      same_name_typedef_decls =
-        merge_same_name_typedef_decls(name, @typedef_decls_stack[0..-2])
-      unless same_name_typedef_decls.empty?
-        W(:W0789, enumerator.location, name)
-        return
+      same_name_typedef_dcls = merge_upper_scopes(name, @typedef_dcls)
+      unless same_name_typedef_dcls.empty?
+        W(:W0789, enum.location, name)
+        same_name_typedef_dcls.each do |same_name_dcl|
+          C(:C0001, same_name_dcl.location, same_name_dcl.identifier.value)
+        end
       end
 
-      same_name_enumerators =
-        merge_same_name_enumerators(name, @enumerators_stack[0..-2])
-      unless same_name_enumerators == 0
-        W(:W0789, enumerator.location, name)
-        return
-      end
-    ensure
-      unless @enumerators_stack.empty?
-        @enumerators_stack.last[name] += 1
+      same_name_enums = merge_upper_scopes(name, @enum_names)
+      unless same_name_enums.empty?
+        W(:W0789, enum.location, name)
+        same_name_enums.each do |same_name_enum|
+          C(:C0001, same_name_enum.location, same_name_enum.identifier.value)
+        end
       end
-    end
 
-    def start_block(compound_statement)
-      @object_decls_stack.push(Hash.new { |hash, key| hash[key] = [] })
-      @typedef_decls_stack.push(Hash.new { |hash, key| hash[key] = [] })
-      @enumerators_stack.push(Hash.new(0))
+      @enum_names.last[name].push(enum)
     end
 
-    def end_block(compound_statement)
-      @object_decls_stack.pop
-      @typedef_decls_stack.pop
-      @enumerators_stack.pop
+    def enter_scope(*)
+      @obj_dcls.push(Hash.new { |hash, key| hash[key] = [] })
+      @typedef_dcls.push(Hash.new { |hash, key| hash[key] = [] })
+      @enum_names.push(Hash.new { |hash, key| hash[key] = [] })
     end
 
-    def merge_same_name_object_decls(name, scopes)
-      scopes.each_with_object([]) { |hash, result| result.concat(hash[name]) }
+    def leave_scope(*)
+      @obj_dcls.pop
+      @typedef_dcls.pop
+      @enum_names.pop
     end
 
-    def merge_same_name_typedef_decls(name, scopes)
-      scopes.each_with_object([]) { |hash, result| result.concat(hash[name]) }
-    end
-
-    def merge_same_name_enumerators(name, scopes)
-      scopes.reduce(0) { |result, hash| result + hash[name] }
+    def merge_upper_scopes(name, scoped_hash)
+      scoped_hash[0..-2].reduce([]) { |result, hash| result + hash[name] }
     end
   end
 
@@ -18659,45 +18817,24 @@ module CBuiltin #:nodoc:
     def initialize(context)
       super
       interp = context[:c_interpreter]
-      interp.on_variable_defined += method(:check_variable)
-      interp.on_function_defined += method(:check_function)
-      interp.on_block_started += method(:enter_block)
-      interp.on_block_ended += method(:leave_block)
-      @global_var_names = Set.new
-      @global_fun_names = Set.new
-      @block_level = 0
+      interp.on_variable_defined += method(:check)
+      interp.on_function_defined += method(:check)
+      @global_names = Hash.new { |hash, key| hash[key] = [] }
     end
 
     private
-    def check_variable(variable_definition, variable)
-      return unless @block_level == 0 && variable.declared_as_extern?
-
-      name = variable_definition.identifier.value
-      if @global_var_names.include?(name) || @global_fun_names.include?(name)
-        W(:W0790, variable_definition.location, name)
-      else
-        @global_var_names.add(name)
-      end
-    end
-
-    def check_function(function_definition, function)
-      return unless @block_level == 0 && function.declared_as_extern?
-
-      name = function_definition.identifier.value
-      if @global_var_names.include?(name) || @global_fun_names.include?(name)
-        W(:W0790, function_definition.location, name)
-      else
-        @global_fun_names.add(name)
+    def check(var_or_func_def, var)
+      if var.declared_as_extern?
+        name = var_or_func_def.identifier
+        if @global_names.include?(name.value)
+          W(:W0790, var_or_func_def.location, name.value)
+          @global_names[name.value].each do |pair_name|
+            C(:C0001, pair_name.location, pair_name.value)
+          end
+        end
+        @global_names[name.value].push(name)
       end
     end
-
-    def enter_block(*)
-      @block_level += 1
-    end
-
-    def leave_block(*)
-      @block_level -= 1
-    end
   end
 
   class W0792 < PassiveCodeCheck