adlint 2.4.6 → 2.4.10

data/features/code_check/W9001.feature

@@ -29,5 +29,3 @@ Feature: W9001
     When I successfully run `adlint fixture.c` on noarch
     Then the output should exactly match with:
       | mesg  | line | column |
-
-# vim:ts=2:sw=2:sts=2:et:

data/features/code_check/W9003.feature

@@ -123,7 +123,6 @@ Feature: W9003
       | W0629 | 3    | 12     |
       | W0490 | 5    | 9      |
       | W0497 | 5    | 9      |
-      | W0497 | 5    | 9      |
       | W0502 | 5    | 9      |
       | W0628 | 3    | 12     |
 
@@ -141,6 +140,7 @@ Feature: W9003
     Then the output should exactly match with:
       | mesg  | line | column |
       | W0117 | 3    | 8      |
+      | W0031 | 3    | 16     |
       | W0104 | 3    | 16     |
       | W0628 | 3    | 8      |
 
@@ -161,6 +161,7 @@ Feature: W9003
       | W0150 | 5    | 12     |
       | W9003 | 5    | 12     |
       | W0286 | 5    | 5      |
+      | W0031 | 3    | 13     |
       | W0104 | 3    | 13     |
       | W0628 | 3    | 5      |
 
@@ -178,7 +179,6 @@ Feature: W9003
     Then the output should exactly match with:
       | mesg  | line | column |
       | W0117 | 3    | 5      |
+      | W0031 | 3    | 13     |
       | W0104 | 3    | 13     |
       | W0628 | 3    | 5      |
-
-# vim:ts=2:sw=2:sts=2:et:

data/lib/adlint/c/branch.rb

@@ -96,9 +96,9 @@ module C #:nodoc:
         # TODO: Study about introducing inter-value-constraints to correctly
         #       manage value domains of controlling variables related with each
         #       other.
-        environment.end_versioning(false)
+        environment.end_versioning(break_with_return?, true)
       else
-        environment.end_versioning(break_with_return?)
+        environment.end_versioning(break_with_return?, false)
       end
       environment.leave_versioning_group(!@group.complete?) if final?
 

data/lib/adlint/c/environ.rb

@@ -121,9 +121,9 @@ module C #:nodoc:
       @variable_table.begin_variables_value_versioning
     end
 
-    def end_versioning(rollback_this_version)
-      if rollback_this_version
-        @variable_table.rollback_latest_variables_value_version!
+    def end_versioning(thin_this_version, with_rollback = thin_this_version)
+      if thin_this_version
+        @variable_table.thin_latest_variables_value_version!(with_rollback)
       end
       @variable_table.end_variables_value_versioning
     end

data/lib/adlint/c/expr.rb

@@ -1664,22 +1664,25 @@ module C #:nodoc:
     def visit_sizeof_expression(node)
       checkpoint(node.location)
 
-      if size_t_type = type_of(UserTypeId.new("size_t"))
-        result_type = size_t_type
-      else
-        result_type = unsigned_long_type
-      end
+      variable = result = nil
+      eval_without_side_effect do
+        if size_t_type = type_of(UserTypeId.new("size_t"))
+          result_type = size_t_type
+        else
+          result_type = unsigned_long_type
+        end
 
-      object = node.operand.accept(self)
-      if object.variable?
-        variable = object
-        result = temporary_variable(
-          result_type, ScalarValue.of(variable.type.aligned_byte_size))
-        notify_sizeof_expr_evaled(node, variable, result)
-      else
-        result = temporary_variable(result_type)
+        object = node.operand.accept(self)
+        if object.variable?
+          variable = object
+          result = temporary_variable(
+            result_type, ScalarValue.of(variable.type.aligned_byte_size))
+        else
+          return temporary_variable(result_type)
+        end
       end
 
+      notify_sizeof_expr_evaled(node, variable, result)
       result
     end
 
@@ -1688,35 +1691,40 @@ module C #:nodoc:
 
       resolve_unresolved_type(node.operand)
 
-      if size_t_type = type_of(UserTypeId.new("size_t"))
-        result_type = size_t_type
-      else
-        result_type = unsigned_long_type
+      result = nil
+      eval_without_side_effect do
+        if size_t_type = type_of(UserTypeId.new("size_t"))
+          result_type = size_t_type
+        else
+          result_type = unsigned_long_type
+        end
+
+        result = temporary_variable(
+          result_type, ScalarValue.of(node.operand.type.aligned_byte_size))
       end
 
-      result = temporary_variable(
-        result_type, ScalarValue.of(node.operand.type.aligned_byte_size))
       notify_sizeof_type_expr_evaled(node, node.operand.type, result)
-
       result
     end
 
     def visit_alignof_expression(node)
       checkpoint(node.location)
 
-      if size_t_type = type_of(UserTypeId.new("size_t"))
-        result_type = size_t_type
-      else
-        result_type = unsigned_long_type
-      end
+      eval_without_side_effect do
+        if size_t_type = type_of(UserTypeId.new("size_t"))
+          result_type = size_t_type
+        else
+          result_type = unsigned_long_type
+        end
 
-      object = node.operand.accept(self)
-      if object.variable?
-        variable = object
-        temporary_variable(result_type,
-                           ScalarValue.of(variable.type.byte_alignment))
-      else
-        temporary_variable(result_type)
+        object = node.operand.accept(self)
+        if object.variable?
+          variable = object
+          temporary_variable(result_type,
+                             ScalarValue.of(variable.type.byte_alignment))
+        else
+          temporary_variable(result_type)
+        end
       end
     end
 
@@ -1725,14 +1733,16 @@ module C #:nodoc:
 
       resolve_unresolved_type(node.operand)
 
-      if size_t_type = type_of(UserTypeId.new("size_t"))
-        result_type = size_t_type
-      else
-        result_type = unsigned_long_type
-      end
+      eval_without_side_effect do
+        if size_t_type = type_of(UserTypeId.new("size_t"))
+          result_type = size_t_type
+        else
+          result_type = unsigned_long_type
+        end
 
-      temporary_variable(result_type,
-                         ScalarValue.of(node.operand.type.aligned_byte_size))
+        temporary_variable(result_type,
+                           ScalarValue.of(node.operand.type.aligned_byte_size))
+      end
     end
 
     def visit_cast_expression(node)
@@ -1929,6 +1939,24 @@ module C #:nodoc:
 
       node.expressions.map { |expression| expression.accept(self) }.last
     end
+
+    private
+    def eval_without_side_effect(&block)
+      originally_quiet = interpreter.quiet_without_side_effect?
+      unless originally_quiet
+        interpreter._quiet_without_side_effect = true
+      end
+      yield
+    ensure
+      unless originally_quiet
+        interpreter._quiet_without_side_effect = false
+        # FIXME: Evaluation of an object-specifier doesn't refer to value
+        #        of a variable.  Thus, no cross-reference record on a
+        #        sizeof-expression because cross-reference extraction
+        #        watches variable value reference not variable reference.
+        # collect_object_specifiers(node).each { |os| os.accept(self) }
+      end
+    end
   end
 
 end

data/lib/adlint/c/interp.rb

@@ -484,6 +484,15 @@ module C #:nodoc:
       current_options.include?(QUIET_WITHOUT_SIDE_EFFECT)
     end
 
+    def _quiet_without_side_effect=(quiet_without_side_effect)
+      # NOTE: This method is called only from ExpressionEvaluator.
+      if quiet_without_side_effect
+        current_options.add(QUIET_WITHOUT_SIDE_EFFECT)
+      else
+        current_options.delete(QUIET_WITHOUT_SIDE_EFFECT)
+      end
+    end
+
     def _active_function
       # NOTE: This method is called only from
       #       StatementInterpreter#visit_return_statement.
@@ -796,7 +805,7 @@ module C #:nodoc:
         #   than one named member may have incomplete array type; such a
         #   structure (and any union containing, possibly recursively, a
         #   member that is such a structure) shall not be a member of a
-        #   structure or an element of an array.  
+        #   structure or an element of an array.
         #
         # NOTE: Size of the last incomplete array member should not be
         #       deducted in initialization.  It is treated as a pointer.

data/lib/adlint/c/object.rb

@@ -246,8 +246,8 @@ module C #:nodoc:
       value.end_versioning
     end
 
-    def rollback_latest_value_version!
-      value.rollback_latest_version!
+    def thin_latest_value_version!(with_rollback)
+      value.thin_latest_version!(with_rollback)
     end
 
     def rollback_all_value_versions!
@@ -678,9 +678,11 @@ module C #:nodoc:
       end
     end
 
-    def rollback_latest_variables_value_version!
+    def thin_latest_variables_value_version!(with_rollback)
       @named_variables.each do |hash|
-        hash.each_value { |variable| variable.rollback_latest_value_version! }
+        hash.each_value do |variable|
+          variable.thin_latest_value_version!(with_rollback)
+        end
       end
     end
 

data/lib/adlint/c/parser.rb

@@ -1,6 +1,6 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.4.8
+# This file is automatically generated by Racc 1.4.9
 # from Racc grammer file "".
 #
 

data/lib/adlint/c/value.rb

@@ -2093,15 +2093,17 @@ module C #:nodoc:
       invalidate_memo!
     end
 
-    def rollback_latest_version!
-      if @version_controller.rollback
+    def thin_latest_version!(with_rollback)
+      if @version_controller.thin_current_version(with_rollback)
         invalidate_memo!
       end
     end
 
     def rollback_all_versions!
       delete_descendants!
-      _orig_overwrite!(@version_controller.original_value)
+      original_value = @version_controller.original_value
+      @version_controller = nil
+      _orig_overwrite!(original_value)
       @version_controller = ValueVersionController.new(self)
       invalidate_memo!
     end
@@ -2138,7 +2140,7 @@ module C #:nodoc:
     end
 
     def effective_values
-      @version_controller.current_values
+      @version_controller ? @version_controller.current_values : [self]
     end
 
     extend Memoizable
@@ -2191,17 +2193,27 @@ module C #:nodoc:
       fork_all_versions
     end
 
-    def rollback
+    def thin_current_version(with_rollback)
+      # NOTE: This method must be called in the forking section.
       return false unless current_version.forked?
 
-      # NOTE: This method must be called in the forking section.
-      current_versioning_group.delete_current_version
-      current_versioning_group.base_values.each do |multi_value|
-        multi_value.rollback!
+      if with_rollback
+        initial_values = current_version.initial_values
+        current_versioning_group.delete_current_version
+        base_values = current_versioning_group.base_values
+        base_values.zip(initial_values).each do |multi_value, init_value|
+          multi_value.rollback!
+          multi_value.overwrite!(init_value) if init_value
+        end
+      else
+        current_versioning_group.delete_current_version
+        current_versioning_group.base_values.each do |multi_value|
+          multi_value.rollback!
+        end
       end
+
       begin_forking
       mark_current_versioning_group_as_sticky
-
       true
     end
 
@@ -2355,10 +2367,12 @@ module C #:nodoc:
     class Version
       def initialize(values, original = false)
         @values = values
+        @initial_values = []
         @state = original ? :original : :forking
       end
 
       attr_accessor :values
+      attr_reader :initial_values
 
       def original?
         @state == :original
@@ -2375,6 +2389,9 @@ module C #:nodoc:
       def fork_from(base_version)
         if forking?
           @values = base_version.values.map { |multi_value| multi_value.fork }
+          @initial_values = @values.each_with_object([]) { |value, ary|
+            ary.push(value.to_single_value.dup)
+          }
           @state = :forked
         end
       end

data/lib/adlint/cpp/constexpr.rb

@@ -1,6 +1,6 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.4.8
+# This file is automatically generated by Racc 1.4.9
 # from Racc grammer file "".
 #