adlint 1.6.0 → 1.8.0

data/lib/adlint/c/message_shima.rb

@@ -187,6 +187,69 @@ module C #:nodoc:
     end
   end
 
+  class W0711 < PassiveMessageDetection
+    def initialize(context)
+      super
+      visitor = context[:c_visitor]
+      visitor.enter_relational_expression += method(:check)
+    end
+
+    private
+    def check(expression)
+      if !expression.lhs_operand.logical? && expression.rhs_operand.logical?
+        W(:W0711, expression.rhs_operand.location)
+      end
+    end
+  end
+
+  class W0712 < W0711
+    private
+    def check(expression)
+      if expression.lhs_operand.logical? && !expression.rhs_operand.logical?
+        W(:W0712, expression.lhs_operand.location)
+      end
+    end
+  end
+
+  class W0713 < W0711
+    private
+    def check(expression)
+      if expression.lhs_operand.logical? && expression.rhs_operand.logical?
+        W(:W0713, expression.location)
+      end
+    end
+  end
+
+  class W0714 < PassiveMessageDetection
+    def initialize(context)
+      super
+      visitor = context[:c_visitor]
+      visitor.enter_and_expression += method(:check)
+    end
+
+    private
+    def check(expression)
+      if expression.lhs_operand.logical? && expression.rhs_operand.logical?
+        W(:W0714, expression.location)
+      end
+    end
+  end
+
+  class W0715 < PassiveMessageDetection
+    def initialize(context)
+      super
+      visitor = context[:c_visitor]
+      visitor.enter_inclusive_or_expression += method(:check)
+    end
+
+    private
+    def check(expression)
+      if expression.lhs_operand.logical? && expression.rhs_operand.logical?
+        W(:W0715, expression.location)
+      end
+    end
+  end
+
   class W0726 < W0698
     private
     def check(return_statement)

data/lib/adlint/c/metric.rb

@@ -145,7 +145,7 @@ module C #:nodoc:
       return unless @current_function
 
       FN_STMT(FunctionIdentifier.new(@current_function.identifier.value,
-                                     @current_function.signature),
+                                     @current_function.signature.to_s),
               @current_function.location, @statement_count)
 
       @current_function = nil
@@ -302,14 +302,14 @@ module C #:nodoc:
     def do_prepare(context) end
     def do_execute(context) end
 
-    def enter_function(function_definition)
+    def enter_function(function_definition, function)
       if @fpath == function_definition.location.fpath
         @current_function = function_definition
         @variables = {}
       end
     end
 
-    def leave_function(function_definition)
+    def leave_function(function_definition, function)
       return unless @current_function
 
       useless_count = @variables.each_value.reduce(0) { |count, read_count|
@@ -527,9 +527,11 @@ module C #:nodoc:
       visitor.leave_ansi_function_definition += method(:leave_function)
       visitor.enter_kandr_function_definition += method(:enter_function)
       visitor.leave_kandr_function_definition += method(:leave_function)
-      visitor.enter_if_statement += method(:count_if_statement)
+      visitor.enter_if_else_statement += method(:enter_if_else_statement)
+      visitor.leave_if_else_statement += method(:leave_if_else_statement)
       @current_function = nil
-      @if_statement_count = 0
+      @if_else_statement_chain = 0
+      @incomplete_if_else_statement_count = 0
     end
 
     private
@@ -539,7 +541,8 @@ module C #:nodoc:
     def enter_function(function_definition)
       if @fpath == function_definition.location.fpath
         @current_function = function_definition
-        @if_statement_count = 0
+        @if_else_statement_chain = 0
+        @incomplete_if_else_statement_count = 0
       end
     end
 
@@ -548,17 +551,26 @@ module C #:nodoc:
 
       FN_UELS(FunctionIdentifier.new(@current_function.identifier.value,
                                      @current_function.signature.to_s),
-              @current_function.location, @if_statement_count)
+              @current_function.location, @incomplete_if_else_statement_count)
 
       @current_function = nil
-      @if_statement_count = 0
+      @if_else_statement_chain = 0
+      @incomplete_if_else_statement_count = 0
     end
 
-    def count_if_statement(node)
-      if @current_function
-        @if_statement_count += 1
+    def enter_if_else_statement(node)
+      @if_else_statement_chain += 1
+
+      if @current_function && @if_else_statement_chain > 0
+        if node.else_statement.kind_of?(IfStatement)
+          @incomplete_if_else_statement_count += 1
+        end
       end
     end
+
+    def leave_if_else_statement(node)
+      @if_else_statement_chain -= 1
+    end
   end
 
   class FN_NEST < MetricMeasurement
@@ -661,7 +673,7 @@ module C #:nodoc:
     def do_prepare(context) end
     def do_execute(context) end
 
-    def enter_function(function_definition)
+    def enter_function(function_definition, function)
       if @fpath == function_definition.location.fpath
         @current_function = function_definition
 
@@ -676,7 +688,7 @@ module C #:nodoc:
       end
     end
 
-    def leave_function(function_definition)
+    def leave_function(function_definition, function)
       return unless @current_function
 
       FN_PATH(FunctionIdentifier.new(@current_function.identifier.value,

data/lib/adlint/c/object.rb

@@ -30,6 +30,7 @@
 #++
 
 require "adlint/util"
+require "adlint/c/syntax"
 require "adlint/c/value"
 require "adlint/c/scope"
 require "adlint/c/seqp"
@@ -92,6 +93,29 @@ module C #:nodoc:
 
     attr_reader :declarations_and_definitions
 
+    def storage_class_specifiers
+      @declarations_and_definitions.map { |decl_or_def|
+        decl_or_def.storage_class_specifier
+      }.compact
+    end
+
+    def declared_as_extern?
+      storage_class_specifiers.empty? ||
+        storage_class_specifiers.any? { |sc_spec| sc_spec.type == :EXTERN }
+    end
+
+    def declared_as_static?
+      storage_class_specifiers.any? { |sc_spec| sc_spec.type == :STATIC }
+    end
+
+    def declared_as_auto?
+      storage_class_specifiers.any? { |sc_spec| sc_spec.type == :AUTO }
+    end
+
+    def declared_as_register?
+      storage_class_specifiers.any? { |sc_spec| sc_spec.type == :REGISTER }
+    end
+
     def designated_by_lvalue?
       subclass_responsibility
     end
@@ -193,6 +217,30 @@ module C #:nodoc:
       self_value.exist?
     end
 
+    def enter_value_versioning_group
+      value.enter_versioning_group
+    end
+
+    def leave_value_versioning_group(raise_complement)
+      value.leave_versioning_group(raise_complement)
+    end
+
+    def begin_value_versioning
+      value.begin_versioning
+    end
+
+    def end_value_versioning
+      value.end_versioning
+    end
+
+    def rollback_latest_value_version!
+      value.rollback_latest_version!
+    end
+
+    def rollback_all_value_versions!
+      value.rollback_all_versions!
+    end
+
     private
     def relate_to_memory(memory)
       bind_to(memory)
@@ -210,6 +258,23 @@ module C #:nodoc:
     end
 
     attr_accessor :scope
+
+    def declared_as_extern?
+      if @scope.global?
+        super
+      else
+        storage_class_specifiers.all? { |sc_spec| sc_spec.type == :EXTERN }
+      end
+    end
+
+    def declared_as_auto?
+      if @scope.global?
+        super
+      else
+        storage_class_specifiers.empty? ||
+          storage_class_specifiers.any? { |sc_spec| sc_spec.type == :AUTO }
+      end
+    end
   end
 
   class OuterVariable < ScopedVariable
@@ -220,6 +285,60 @@ module C #:nodoc:
       @inner_variables = create_inner_variables(type, scope)
     end
 
+    def enter_value_versioning_group
+      super
+      if @inner_variables
+        @inner_variables.each do |inner|
+          inner.enter_value_versioning_group
+        end
+      end
+    end
+
+    def leave_value_versioning_group(raise_complement)
+      super
+      if @inner_variables
+        @inner_variables.each do |inner|
+          inner.leave_value_versioning_group(raise_complement)
+        end
+      end
+    end
+
+    def begin_value_versioning
+      super
+      if @inner_variables
+        @inner_variables.each do |inner|
+          inner.begin_value_versioning
+        end
+      end
+    end
+
+    def end_value_versioning
+      super
+      if @inner_variables
+        @inner_variables.each do |inner|
+          inner.end_value_versioning
+        end
+      end
+    end
+
+    def rollback_latest_value_version!
+      super
+      if @inner_variables
+        @inner_variables.each do |inner|
+          inner.rollback_latest_value_version!
+        end
+      end
+    end
+
+    def rollback_all_value_versions!
+      super
+      if @inner_variables
+        @inner_variables.each do |inner|
+          inner.rollback_all_value_versions!
+        end
+      end
+    end
+
     def inner_variable_at(index)
       if @type.array?
         # TODO: If linear searching is too slow, use an index of inner
@@ -345,17 +464,40 @@ module C #:nodoc:
     include Nameable
 
     def initialize(memory, outer_variable, type, component_name)
+      @owner = outer_variable
+      @component_name = component_name
       self.name = create_qualified_name(outer_variable, component_name)
 
       super(memory, nil, type, outer_variable.scope)
-
-      @owner = outer_variable
-      @component_name = component_name
     end
 
     attr_reader :owner
     attr_reader :component_name
 
+    def storage_class_specifiers
+      @owner.storage_class_specifiers
+    end
+
+    def declared_as_extern?
+      @owner.declared_as_extern?
+    end
+
+    def declared_as_static?
+      @owner.declared_as_static?
+    end
+
+    def declared_as_auto?
+      @owner.declared_as_auto?
+    end
+
+    def declared_as_register?
+      @owner.declared_as_register?
+    end
+
+    def named?
+      @owner.named?
+    end
+
     def temporary?
       @owner.temporary?
     end
@@ -437,7 +579,7 @@ module C #:nodoc:
         @memory_pool.free(variable.binding.memory)
       end
       @scope_stack.pop
-      rollback_all_variables! if current_scope.global?
+      rollback_all_global_variables_value! if current_scope.global?
     end
 
     def declare(declaration)
@@ -453,7 +595,14 @@ module C #:nodoc:
     end
 
     def define(definition, init_value = nil)
-      init_value ||= default_value_of(definition)
+      if storage_class_of(definition) == :static
+        # NOTE: Value of the global variable should be arbitrary because
+        #       execution of its accessors are out of order.
+        #       So, a value of the initializer should be ignored.
+        init_value = definition.type.arbitrary_value
+      else
+        init_value ||= definition.type.undefined_value
+      end
 
       if variable = lookup(definition.identifier.value)
         if variable.scope == current_scope
@@ -486,35 +635,35 @@ module C #:nodoc:
       nil
     end
 
-    def begin_versioning_group
+    def enter_variables_value_versioning_group
       @named_variables.each do |hash|
-        hash.each_value { |variable| variable.value.begin_versioning_group }
+        hash.each_value { |variable| variable.enter_value_versioning_group }
       end
     end
 
-    def end_versioning_group(raise_complement_values)
+    def leave_variables_value_versioning_group(raise_complement)
       @named_variables.each do |hash|
         hash.each_value do |variable|
-          variable.value.end_versioning_group(raise_complement_values)
+          variable.leave_value_versioning_group(raise_complement)
         end
       end
     end
 
-    def begin_versioning
+    def begin_variables_value_versioning
       @named_variables.each do |hash|
-        hash.each_value { |variable| variable.value.begin_versioning }
+        hash.each_value { |variable| variable.begin_value_versioning }
       end
     end
 
-    def end_versioning
+    def end_variables_value_versioning
       @named_variables.each do |hash|
-        hash.each_value { |variable| variable.value.end_versioning }
+        hash.each_value { |variable| variable.end_value_versioning }
       end
     end
 
-    def rollback_latest_version
+    def rollback_latest_variables_value_version!
       @named_variables.each do |hash|
-        hash.each_value { |variable| variable.value.rollback! }
+        hash.each_value { |variable| variable.rollback_latest_value_version! }
       end
     end
 
@@ -541,14 +690,6 @@ module C #:nodoc:
       end
     end
 
-    def default_value_of(definition)
-      if storage_class_of(definition) == :static
-        definition.type.zero_value
-      else
-        definition.type.undefined_value
-      end
-    end
-
     def storage_class_of(declaration_or_definition)
       storage_class_specifier =
         declaration_or_definition.storage_class_specifier
@@ -573,9 +714,9 @@ module C #:nodoc:
       @scope_stack.last
     end
 
-    def rollback_all_variables!
+    def rollback_all_global_variables_value!
       @named_variables.first.each_value do |variable|
-        variable.value.rollback_to_original!
+        variable.rollback_all_value_versions!
       end
     end
   end
@@ -745,9 +886,7 @@ module C #:nodoc:
     end
 
     def signature
-      "#{type.return_type.brief_image} #{name}(" +
-        type.parameter_types.map { |ptype| ptype.brief_image }.join(",") +
-        (type.have_va_list? ? ",...)" : ")")
+      FunctionSignature.new(name, type)
     end
   end
 
@@ -798,9 +937,7 @@ module C #:nodoc:
     end
 
     def signature
-      "#{type.return_type.brief_image} __adlint__anonymous_func(" +
-        type.parameter_types.map { |ptype| ptype.brief_image }.join(",") +
-        (type.have_va_list? ? ",...)" : ")")
+      FunctionSignature.new("__adlint__anonymous_func", type)
     end
   end
 

data/lib/adlint/c/parser.rb

@@ -1,6 +1,6 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.4.7
+# This file is automatically generated by Racc 1.4.8
 # from Racc grammer file "".
 #
 
@@ -235,7 +235,7 @@ clist = [
 '15,16,39,38,18,19,20,21,24,25,22,23,36,37,17,26,27,28,33,34,35,,,,,',
 ',,,,,,,,32,29,,400,,12,13,14,15,16,39,38,18,19,20,21,24,25,22,23,36',
 '37,17,26,27,28,33,34,35,,,,,,,,,,,,,,32' ]
-        racc_action_table = arr = Array.new(4442, nil)
+        racc_action_table = arr = ::Array.new(4442, nil)
         idx = 0
         clist.each do |str|
           str.split(',', -1).each do |i|
@@ -417,7 +417,7 @@ clist = [
 '343,343,,,,,,,,,,,,,,343,346,,343,,346,346,346,346,346,346,346,346,346',
 '346,346,346,346,346,346,346,346,346,346,346,346,346,346,346,,,,,,,,',
 ',,,,,346' ]
-        racc_action_check = arr = Array.new(4442, nil)
+        racc_action_check = arr = ::Array.new(4442, nil)
         idx = 0
         clist.each do |str|
           str.split(',', -1).each do |i|

data/lib/adlint/c/phase.rb

@@ -44,6 +44,15 @@ require "adlint/c/util"
 module AdLint #:nodoc:
 module C #:nodoc:
 
+  class Prepare1Phase < Phase
+    private
+    def do_execute(context)
+      monitored_region("pr3") do
+        context[:c_visitor] = SyntaxTreeMulticastVisitor.new
+      end
+    end
+  end
+
   class ParsePhase < Phase
     private
     def do_execute(context)
@@ -70,12 +79,11 @@ module C #:nodoc:
     end
   end
 
-  class PreparePhase < Phase
+  class Prepare2Phase < Phase
     private
     def do_execute(context)
-      monitored_region("pr2") do
+      monitored_region("pr4") do
         context[:c_interpreter] = Interpreter.new(context[:c_type_table])
-        context[:c_visitor] = SyntaxTreeMulticastVisitor.new
 
         context[:c_commands] = setup_code_extractions(context) +
                                setup_metric_measurements(context) +
@@ -566,6 +574,8 @@ module C #:nodoc:
         W0600.new(context),
         W0605.new(context),
         W0606.new(context),
+        W0607.new(context),
+        W0608.new(context),
         W0609.new(context),
         W0610.new(context),
         W0611.new(context),
@@ -575,6 +585,7 @@ module C #:nodoc:
         W0622.new(context),
         W0623.new(context),
         W0624.new(context),
+        W0625.new(context),
         W0626.new(context),
         W0627.new(context),
         W0629.new(context),
@@ -584,6 +595,7 @@ module C #:nodoc:
         W0638.new(context),
         W0639.new(context),
         W0640.new(context),
+        W0642.new(context),
         W0653.new(context),
         W0654.new(context),
         W0655.new(context),
@@ -624,6 +636,11 @@ module C #:nodoc:
         W0704.new(context),
         W0705.new(context),
         W0708.new(context),
+        W0711.new(context),
+        W0712.new(context),
+        W0713.new(context),
+        W0714.new(context),
+        W0715.new(context),
         W0720.new(context),
         W0721.new(context),
         W0722.new(context),