adlint 3.0.4 → 3.0.8

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

@@ -96,8 +96,8 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_union_type_declaration += T(:check)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_union_type_declaration += T(:check)
     end
 
     private
@@ -122,8 +122,8 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_kandr_function_definition += T(:check)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_kandr_function_definition += T(:check)
     end
 
     def check(node)
@@ -222,12 +222,12 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_ansi_function_definition  += T(:start_function)
-      visitor.enter_kandr_function_definition += T(:start_function)
-      visitor.leave_ansi_function_definition  += T(:end_function)
-      visitor.leave_kandr_function_definition += T(:end_function)
-      visitor.enter_return_statement          += T(:check)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_ansi_function_definition  += T(:start_function)
+      traversal.enter_kandr_function_definition += T(:start_function)
+      traversal.leave_ansi_function_definition  += T(:end_function)
+      traversal.leave_kandr_function_definition += T(:end_function)
+      traversal.enter_return_statement          += T(:check)
       @cur_fun = nil
     end
 
@@ -320,8 +320,8 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_relational_expression += T(:check)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_relational_expression += T(:check)
     end
 
     private
@@ -371,8 +371,8 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_and_expression += T(:check)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_and_expression += T(:check)
     end
 
     private
@@ -392,8 +392,8 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_inclusive_or_expression += T(:check)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_inclusive_or_expression += T(:check)
     end
 
     private
@@ -413,14 +413,14 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_additive_expression            += T(:check)
-      visitor.enter_multiplicative_expression      += T(:check)
-      visitor.enter_shift_expression               += T(:check)
-      visitor.enter_and_expression                 += T(:check)
-      visitor.enter_exclusive_or_expression        += T(:check)
-      visitor.enter_inclusive_or_expression        += T(:check)
-      visitor.enter_compound_assignment_expression += T(:check)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_additive_expression            += T(:check)
+      traversal.enter_multiplicative_expression      += T(:check)
+      traversal.enter_shift_expression               += T(:check)
+      traversal.enter_and_expression                 += T(:check)
+      traversal.enter_exclusive_or_expression        += T(:check)
+      traversal.enter_inclusive_or_expression        += T(:check)
+      traversal.enter_compound_assignment_expression += T(:check)
     end
 
     private
@@ -489,8 +489,8 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_logical_and_expression += T(:check)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_logical_and_expression += T(:check)
     end
 
     private
@@ -512,8 +512,8 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_logical_or_expression += T(:check)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_logical_or_expression += T(:check)
     end
 
     private
@@ -535,9 +535,9 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_logical_and_expression += T(:check)
-      visitor.enter_logical_or_expression  += T(:check)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_logical_and_expression += T(:check)
+      traversal.enter_logical_or_expression  += T(:check)
     end
 
     private
@@ -576,11 +576,11 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_switch_statement          += T(:enter_switch_statement)
-      visitor.leave_switch_statement          += T(:check)
-      visitor.enter_case_labeled_statement    += T(:add_exec_path)
-      visitor.enter_default_labeled_statement += T(:add_exec_path)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_switch_statement          += T(:enter_switch_statement)
+      traversal.leave_switch_statement          += T(:check)
+      traversal.enter_case_labeled_statement    += T(:add_exec_path)
+      traversal.enter_default_labeled_statement += T(:add_exec_path)
       @exec_path_nums = []
     end
 
@@ -610,9 +610,9 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_struct_type_declaration += T(:check)
-      visitor.enter_union_type_declaration  += T(:check)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_struct_type_declaration += T(:check)
+      traversal.enter_union_type_declaration  += T(:check)
     end
 
     private
@@ -630,20 +630,20 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_function_declaration      += T(:check_function_name)
-      visitor.enter_variable_declaration      += T(:check_variable_name)
-      visitor.enter_variable_definition       += T(:check_variable_name)
-      visitor.enter_parameter_definition      += T(:check_variable_name)
-      visitor.enter_typedef_declaration       += T(:check_typedef_name)
-      visitor.enter_struct_type_declaration   += T(:check_tag_name)
-      visitor.enter_union_type_declaration    += T(:check_tag_name)
-      visitor.enter_enum_type_declaration     += T(:check_tag_name)
-      visitor.enter_enumerator                += T(:check_enumerator_name)
-      visitor.enter_kandr_function_definition += T(:enter_function)
-      visitor.enter_ansi_function_definition  += T(:enter_function)
-      visitor.leave_kandr_function_definition += T(:leave_function)
-      visitor.leave_ansi_function_definition  += T(:leave_function)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_function_declaration      += T(:check_function_name)
+      traversal.enter_variable_declaration      += T(:check_variable_name)
+      traversal.enter_variable_definition       += T(:check_variable_name)
+      traversal.enter_parameter_definition      += T(:check_variable_name)
+      traversal.enter_typedef_declaration       += T(:check_typedef_name)
+      traversal.enter_struct_type_declaration   += T(:check_tag_name)
+      traversal.enter_union_type_declaration    += T(:check_tag_name)
+      traversal.enter_enum_type_declaration     += T(:check_tag_name)
+      traversal.enter_enumerator                += T(:check_enumerator_name)
+      traversal.enter_kandr_function_definition += T(:enter_function)
+      traversal.enter_ansi_function_definition  += T(:enter_function)
+      traversal.leave_kandr_function_definition += T(:leave_function)
+      traversal.leave_ansi_function_definition  += T(:leave_function)
       @function_def_level = 0
     end
 
@@ -725,12 +725,12 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_generic_labeled_statement += T(:check)
-      visitor.enter_ansi_function_definition  += T(:enter_function)
-      visitor.leave_ansi_function_definition  += T(:leave_function)
-      visitor.enter_kandr_function_definition += T(:enter_function)
-      visitor.leave_kandr_function_definition += T(:leave_function)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_generic_labeled_statement += T(:check)
+      traversal.enter_ansi_function_definition  += T(:enter_function)
+      traversal.leave_ansi_function_definition  += T(:leave_function)
+      traversal.enter_kandr_function_definition += T(:enter_function)
+      traversal.leave_kandr_function_definition += T(:leave_function)
       @labels = nil
     end
 
@@ -763,10 +763,10 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_ansi_function_definition  += T(:check)
-      visitor.enter_kandr_function_definition += T(:check)
-      visitor.enter_function_declaration      += T(:check)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_ansi_function_definition  += T(:check)
+      traversal.enter_kandr_function_definition += T(:check)
+      traversal.enter_function_declaration      += T(:check)
     end
 
     private
@@ -878,13 +878,13 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_ansi_function_definition  += T(:enter_function)
-      visitor.enter_kandr_function_definition += T(:enter_function)
-      visitor.enter_compound_statement        += T(:enter_compound_stmt)
-      visitor.leave_compound_statement        += T(:leave_compound_stmt)
-      visitor.enter_if_else_statement         += T(:enter_if_else_stmt)
-      visitor.leave_if_else_statement         += T(:leave_if_else_stmt)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_ansi_function_definition  += T(:enter_function)
+      traversal.enter_kandr_function_definition += T(:enter_function)
+      traversal.enter_compound_statement        += T(:enter_compound_stmt)
+      traversal.leave_compound_statement        += T(:leave_compound_stmt)
+      traversal.enter_if_else_statement         += T(:enter_if_else_stmt)
+      traversal.leave_if_else_statement         += T(:leave_if_else_stmt)
       @if_else_stmt_chain_stack = []
     end
 
@@ -942,8 +942,8 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_goto_statement += T(:warn_goto)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_goto_statement += T(:warn_goto)
     end
 
     private

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

@@ -43,11 +43,11 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_typedef_declaration     += T(:extract_typedef)
-      visitor.enter_struct_type_declaration += T(:extract_struct)
-      visitor.enter_union_type_declaration  += T(:extract_union)
-      visitor.enter_enum_type_declaration   += T(:extract_enum)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_typedef_declaration     += T(:extract_typedef)
+      traversal.enter_struct_type_declaration += T(:extract_struct)
+      traversal.enter_union_type_declaration  += T(:extract_union)
+      traversal.enter_enum_type_declaration   += T(:extract_enum)
     end
 
     private
@@ -96,7 +96,7 @@ module CBuiltin #:nodoc:
     end
   end
 
-  class FuncDeclExtraction < CodeExtraction
+  class FunDclExtraction < CodeExtraction
     def_registrant_phase Cc1::Prepare2Phase
 
     def initialize(phase_ctxt)
@@ -115,22 +115,22 @@ module CBuiltin #:nodoc:
 
     def extract_explicit_dcl(fun_dcl, fun)
       if fun.declared_as_extern?
-        FUNCDCL(fun_dcl.identifier.location, "X",
-                @block_level == 0 ? "F" : "B", "E",
-                FunctionId.new(fun_dcl.identifier.value,
-                               fun_dcl.signature.to_s))
+        FUNDCL(fun_dcl.identifier.location, "X",
+               @block_level == 0 ? "F" : "B", "E",
+               FunctionId.new(fun_dcl.identifier.value,
+                              fun_dcl.signature.to_s))
       else
-        FUNCDCL(fun_dcl.identifier.location, "I",
-                @block_level == 0 ? "F" : "B", "E",
-                FunctionId.new(fun_dcl.identifier.value,
-                               fun_dcl.signature.to_s))
+        FUNDCL(fun_dcl.identifier.location, "I",
+               @block_level == 0 ? "F" : "B", "E",
+               FunctionId.new(fun_dcl.identifier.value,
+                              fun_dcl.signature.to_s))
       end
     end
 
     def extract_implicit_dcl(expr, fun)
       if fun.named?
-        FUNCDCL(expr.location, "X", "F", "I",
-                FunctionId.new(fun.name, fun.signature.to_s))
+        FUNDCL(expr.location, "X", "F", "I",
+               FunctionId.new(fun.name, fun.signature.to_s))
       end
     end
 
@@ -217,7 +217,7 @@ module CBuiltin #:nodoc:
     end
   end
 
-  class FuncDefExtraction < CodeExtraction
+  class FunDefExtraction < CodeExtraction
     def_registrant_phase Cc1::Prepare2Phase
 
     def initialize(phase_ctxt)
@@ -234,9 +234,9 @@ module CBuiltin #:nodoc:
       fun_id = FunctionId.new(fun_def.identifier.value, fun_def.signature.to_s)
       case
       when fun.declared_as_extern?
-        FUNCDEF(fun_def.identifier.location, "X", "F", fun_id, fun_def.lines)
+        FUNDEF(fun_def.identifier.location, "X", "F", fun_id, fun_def.lines)
       when fun.declared_as_static?
-        FUNCDEF(fun_def.identifier.location, "I", "F", fun_id, fun_def.lines)
+        FUNDEF(fun_def.identifier.location, "I", "F", fun_id, fun_def.lines)
       end
     end
   end
@@ -246,8 +246,8 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_generic_labeled_statement += T(:extract)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_generic_labeled_statement += T(:extract)
     end
 
     private
@@ -264,8 +264,8 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_variable_definition += T(:extract)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_variable_definition += T(:extract)
     end
 
     private
@@ -285,9 +285,9 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_simple_assignment_expression   += T(:extract)
-      visitor.enter_compound_assignment_expression += T(:extract)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_simple_assignment_expression   += T(:extract)
+      traversal.enter_compound_assignment_expression += T(:extract)
     end
 
     private
@@ -304,13 +304,14 @@ module CBuiltin #:nodoc:
     end
   end
 
-  class FuncCallExtraction < CodeExtraction
+  class FuncallExtraction < CodeExtraction
     def_registrant_phase Cc1::Prepare2Phase
 
     def initialize(phase_ctxt)
       super
       @interp = phase_ctxt[:cc1_interpreter]
       @interp.on_function_started          += T(:update_caller)
+      @interp.on_function_ended            += T(:clear_caller)
       @interp.on_function_call_expr_evaled += T(:extract_function_call)
       @caller = nil
     end
@@ -323,16 +324,24 @@ module CBuiltin #:nodoc:
       @caller = fun
     end
 
+    def clear_caller(*)
+      @caller = nil
+    end
+
     def extract_function_call(funcall_expr, fun, *)
-      if @caller && fun.named?
-        CALL(funcall_expr.location,
-             FunctionId.new(@caller.name, @caller.signature.to_s),
-             FunctionId.new(fun.name, fun.signature.to_s))
+      if fun.named?
+        if @caller
+          referrer = FunctionId.new(@caller.name, @caller.signature.to_s)
+        else
+          referrer = FunctionId.of_ctors_section
+        end
+        FUNCALL(funcall_expr.location, referrer,
+                FunctionId.new(fun.name, fun.signature.to_s))
       end
     end
   end
 
-  class CrossRefExtraction < CodeExtraction
+  class XRefExtraction < CodeExtraction
     def_registrant_phase Cc1::Prepare2Phase
 
     def initialize(phase_ctxt)
@@ -359,36 +368,47 @@ module CBuiltin #:nodoc:
     end
 
     def extract_variable_read(expr, var)
-      if @accessor && var.scope.global? && var.named?
+      if var.scope.global? && var.named?
         # NOTE: When a value of the inner-variable of array or composite object
         #       is referred, dependency record of only outmost-variable access
         #       should be output.
         var = var.owner while var.inner?
-        XREF_VAR(expr.location,
-                 FunctionId.new(@accessor.name, @accessor.signature.to_s),
-                 "R", var.name)
+
+        if @accessor
+          referrer = FunctionId.new(@accessor.name, @accessor.signature.to_s)
+        else
+          referrer = FunctionId.of_ctors_section
+        end
+        XREF_VAR(expr.location, referrer, "R", var.name)
       end
     end
 
     def extract_variable_write(expr, var)
-      if @accessor && var.scope.global? && var.named?
-        unless var.inner?
-          # NOTE: When a value of the inner-variable of array or composite
-          #       object is updated, dependency record of the inner-variable
-          #       access should not be output and the outer variable's value
-          #       will also be notified later.
-          XREF_VAR(expr.location,
-                   FunctionId.new(@accessor.name, @accessor.signature.to_s),
-                   "W", var.name)
+      # NOTE: When a value of the inner-variable of array or composite
+      #       object is updated, dependency record of the inner-variable
+      #       access should not be output and the outer variable's value
+      #       will also be notified later.
+      return if var.inner?
+
+      if var.scope.global? && var.named?
+        if @accessor
+          referrer = FunctionId.new(@accessor.name, @accessor.signature.to_s)
+        else
+          referrer = FunctionId.of_ctors_section
         end
+        XREF_VAR(expr.location, referrer, "W", var.name)
       end
     end
 
     def extract_function_reference(expr, fun)
-      if @accessor && fun.named?
-        XREF_FUNC(expr.location,
-                  FunctionId.new(@accessor.name, @accessor.signature.to_s),
-                  "R", FunctionId.new(fun.name, fun.signature.to_s))
+      if fun.named?
+        if @accessor
+          referrer = FunctionId.new(@accessor.name, @accessor.signature.to_s)
+        else
+          referrer = FunctionId.of_ctors_section
+        end
+        XREF_FUNC(expr.location, referrer, "R",
+                  FunctionId.new(fun.name, fun.signature.to_s))
       end
     end
   end
@@ -398,9 +418,9 @@ module CBuiltin #:nodoc:
 
     def initialize(phase_ctxt)
       super
-      visitor = phase_ctxt[:cc1_visitor]
-      visitor.enter_constant_specifier       += T(:extract_constant)
-      visitor.enter_string_literal_specifier += T(:extract_string_literal)
+      traversal = phase_ctxt[:cc1_ast_traversal]
+      traversal.enter_constant_specifier       += T(:extract_constant)
+      traversal.enter_string_literal_specifier += T(:extract_string_literal)
     end
 
     private