adlint 1.8.10 → 1.10.0

data/features/support/env.rb

@@ -0,0 +1,58 @@
+require "aruba/cucumber"
+
+NOARCH_TRAITS = <<EOF
+version: "1.0.0"
+
+project_traits:
+  project_name: "features"
+  include_path:
+  initial_header: "empty_pinit.h"
+  coding_style:
+    indent_style: "K&R"
+    tab_width: 8
+    indent_width: 4
+  file_encoding:
+
+compiler_traits:
+  initial_header: "empty_cinit.h"
+  standard_type:
+    char_size: 8
+    char_alignment: 8
+    short_size: 16
+    short_alignment: 16
+    int_size: 32
+    int_alignment: 32
+    long_size: 32
+    long_alignment: 32
+    long_long_size: 64
+    long_long_alignment: 64
+    float_size: 32
+    float_alignment: 32
+    double_size: 64
+    double_alignment: 64
+    long_double_size: 96
+    long_double_alignment: 96
+    code_ptr_size: 32
+    code_ptr_alignment: 32
+    data_ptr_size: 32
+    data_ptr_alignment: 32
+    char_as_unsigned_char: true
+  include_path:
+  arithmetic:
+    logical_right_shift: true
+  extension_substitution:
+  arbitrary_substitution:
+    "typeof": "__typeof__"
+    "__typeof": "__typeof__"
+    "alignof": "__alignof__"
+    "__alignof": "__alignof__"
+  identifier_max: 128
+
+linker_traits:
+  identifier_max: 128
+  identifier_ignore_case: false
+
+message_traits:
+  language: "ja_JP"
+  change_list:
+EOF

data/lib/adlint/c/branch.rb

@@ -30,19 +30,13 @@
 #++
 
 require "adlint/c/ctrlexpr"
+require "adlint/c/option"
 
 module AdLint #:nodoc:
 module C #:nodoc:
 
   class Branch
-    module Option
-      NARROWING = :narrowing
-      WIDENING = :widening
-      FIRST = :first
-      FINAL = :final
-      SMOTHER_BREAK = :smother_break
-      IMPLICIT_CONDITION = :implicit_condition
-    end
+    include BranchOptions
 
     def initialize(branch_group, *options)
       @group = branch_group
@@ -61,27 +55,27 @@ module C #:nodoc:
     end
 
     def narrowing?
-      @options.include?(Option::NARROWING)
+      @options.include?(NARROWING)
     end
 
     def widening?
-      @options.include?(Option::WIDENING)
+      @options.include?(WIDENING)
     end
 
     def first?
-      @options.include?(Option::FIRST)
+      @options.include?(FIRST)
     end
 
     def final?
-      @options.include?(Option::FINAL)
+      @options.include?(FINAL)
     end
 
     def smother_break?
-      @options.include?(Option::SMOTHER_BREAK)
+      @options.include?(SMOTHER_BREAK)
     end
 
     def implicit_condition?
-      @options.include?(Option::IMPLICIT_CONDITION)
+      @options.include?(IMPLICIT_CONDITION)
     end
 
     def execute(interpreter, expression = nil, &block)
@@ -134,7 +128,7 @@ module C #:nodoc:
       else
         raise "branch must be for narrowing or widening."
       end
-      @group.all_condition_variables_value_exist?
+      @group.all_controlling_variables_value_exist?
     end
 
     def rethrow_break_event
@@ -152,9 +146,8 @@ module C #:nodoc:
   end
 
   class BranchGroup
-    module Option
-      COMPLETE = :complete
-    end
+    include BranchOptions
+    include BranchGroupOptions
 
     def initialize(environment, *options)
       @environment = environment
@@ -169,11 +162,11 @@ module C #:nodoc:
     end
 
     def complete?
-      @options.include?(Option::COMPLETE)
+      @options.include?(COMPLETE)
     end
 
     def create_first_branch(*options)
-      new_branch = Branch.new(self, Branch::Option::FIRST, *options)
+      new_branch = Branch.new(self, FIRST, *options)
       @branches.push(new_branch)
       new_branch
     end
@@ -184,15 +177,15 @@ module C #:nodoc:
       new_branch
     end
 
-    def all_condition_variables
+    def all_controlling_variables
       @branches.map { |branch|
         branch.controlling_expression ?
           branch.controlling_expression.affected_variables : []
       }.flatten.uniq
     end
 
-    def all_condition_variables_value_exist?
-      all_condition_variables.all? { |variable| variable.value.exist? }
+    def all_controlling_variables_value_exist?
+      all_controlling_variables.all? { |variable| variable.value.exist? }
     end
 
     def all_branches_break_with_break?

data/lib/adlint/c/code.rb

@@ -213,10 +213,7 @@ module C #:nodoc:
     def initialize(context)
       super
       interp = context[:c_interpreter]
-      interp.on_function_started += method(:extract_function)
-      interp.on_block_started += method(:enter_block)
-      interp.on_block_ended += method(:leave_block)
-      @block_level = 0
+      interp.on_function_defined += method(:extract_function)
     end
 
     private
@@ -237,14 +234,6 @@ module C #:nodoc:
                 function_definition.lines)
       end
     end
-
-    def enter_block(*)
-      @block_level += 1
-    end
-
-    def leave_block(*)
-      @block_level -= 1
-    end
   end
 
   class LabelDefExtraction < CodeExtraction

data/lib/adlint/c/conv.rb

@@ -48,7 +48,7 @@ module C #:nodoc:
       return original unless original.type.integer?
 
       promoted_type = original.type.integer_promoted_type
-      if promoted_type.same_as?(original.type)
+      if original.type.same_as?(promoted_type)
         original
       else
         do_conversion(original, promoted_type) || original
@@ -62,13 +62,13 @@ module C #:nodoc:
 
       arith_type = lhs_original.type.arithmetic_type_with(rhs_original.type)
 
-      if arith_type.same_as?(lhs_original.type)
+      if lhs_original.type.same_as?(arith_type)
         lhs_converted = lhs_original
       else
         lhs_converted = do_conversion(lhs_original, arith_type) || lhs_original
       end
 
-      if arith_type.same_as?(rhs_original.type)
+      if rhs_original.type.same_as?(arith_type)
         rhs_converted = rhs_original
       else
         rhs_converted = do_conversion(rhs_original, arith_type) || rhs_original
@@ -79,7 +79,7 @@ module C #:nodoc:
 
     def do_default_argument_promotion(original)
       promoted_type = original.type.argument_promoted_type
-      if promoted_type.same_as?(original.type)
+      if original.type.same_as?(promoted_type)
         original
       else
         do_conversion(original, promoted_type) || original

data/lib/adlint/c/ctrlexpr.rb

@@ -64,12 +64,12 @@ module C #:nodoc:
         new_manip = ValueDomainNarrower.new(@interpreter, expression)
         begin
           if @branch.implicit_condition?
-            @interpreter._suppress_notification = true
+            @interpreter._quiet = true
           end
           new_manip.prepare!
         ensure
           if @branch.implicit_condition?
-            @interpreter._suppress_notification = false
+            @interpreter._quiet = false
           end
         end
       else
@@ -86,12 +86,12 @@ module C #:nodoc:
         new_manip = ValueDomainWidener.new(@interpreter, expression)
         begin
           if @branch.implicit_condition?
-            @interpreter._suppress_notification = true
+            @interpreter._quiet = true
           end
           new_manip.prepare!
         ensure
           if @branch.implicit_condition?
-            @interpreter._suppress_notification = false
+            @interpreter._quiet = false
           end
         end
       else
@@ -595,7 +595,7 @@ module C #:nodoc:
 
     private
     def commit_changes(narrowing)
-      @branch_group.all_condition_variables.each do |variable|
+      @branch_group.all_controlling_variables.each do |variable|
         variable.narrow_value_domain!(:==, variable.type.arbitrary_value)
       end
       true
@@ -614,7 +614,7 @@ module C #:nodoc:
 
     private
     def commit_changes(narrowing)
-      @branch_group.all_condition_variables.each do |variable|
+      @branch_group.all_controlling_variables.each do |variable|
         variable.widen_value_domain!(:==, variable.type.arbitrary_value)
       end
       true
@@ -649,6 +649,10 @@ module C #:nodoc:
       @children.each do |narrowing|
         @narrowed_values = narrowing.narrowed_values.merge(@narrowed_values)
       end
+    ensure
+      if sequence_point = node.subsequent_sequence_point
+        notify_sequence_point_reached(sequence_point)
+      end
     end
 
     def ensure_result_equal_to(value)

data/lib/adlint/c/domain.rb

@@ -4849,10 +4849,10 @@ module C #:nodoc:
         ValueDomain.of_unlimited
       else
         case
-        when lhs_domain.value < 0
-          ValueDomain.of_unlimited
         when lhs_domain.value >= 0
           ValueDomain.greater_than(0)
+        when lhs_domain.value < 0
+          ValueDomain.less_than(0)
         end
       end
     end

data/lib/adlint/c/expr.rb

@@ -815,7 +815,7 @@ module C #:nodoc:
                                        rhs_object, rhs_variable)
       end
 
-      if lhs_variable.type.same_as?(rhs_variable.type)
+      if rhs_variable.type.same_as?(lhs_variable.type)
         rhs_converted = rhs_variable
       else
         rhs_converted =
@@ -911,7 +911,7 @@ module C #:nodoc:
       notify_multiplicative_expr_evaled(node, lhs_variable, rhs_variable,
                                         result_variable)
 
-      if lhs_variable.type.same_as?(result_variable.type)
+      if result_variable.type.same_as?(lhs_variable.type)
         result_converted = result_variable
       else
         result_converted =
@@ -962,7 +962,7 @@ module C #:nodoc:
       notify_multiplicative_expr_evaled(node, lhs_variable, rhs_variable,
                                         result_variable)
 
-      if lhs_variable.type.same_as?(result_variable.type)
+      if result_variable.type.same_as?(lhs_variable.type)
         result_converted = result_variable
       else
         result_converted =
@@ -1013,7 +1013,7 @@ module C #:nodoc:
       notify_multiplicative_expr_evaled(node, lhs_variable, rhs_variable,
                                         result_variable)
 
-      if lhs_variable.type.same_as?(result_variable.type)
+      if result_variable.type.same_as?(lhs_variable.type)
         result_converted = result_variable
       else
         result_converted =
@@ -1063,7 +1063,7 @@ module C #:nodoc:
       notify_additive_expr_evaled(node, lhs_variable, rhs_variable,
                                   result_variable)
 
-      if lhs_variable.type.same_as?(result_variable.type)
+      if result_variable.type.same_as?(lhs_variable.type)
         result_converted = result_variable
       else
         result_converted =
@@ -1113,7 +1113,7 @@ module C #:nodoc:
       notify_additive_expr_evaled(node, lhs_variable, rhs_variable,
                                   result_variable)
 
-      if lhs_variable.type.same_as?(result_variable.type)
+      if result_variable.type.same_as?(lhs_variable.type)
         result_converted = result_variable
       else
         result_converted =
@@ -1171,7 +1171,7 @@ module C #:nodoc:
       notify_shift_expr_evaled(node, lhs_converted, rhs_converted,
                                result_variable)
 
-      if lhs_variable.type.same_as?(result_variable.type)
+      if result_variable.type.same_as?(lhs_variable.type)
         result_converted = result_variable
       else
         result_converted =
@@ -1229,7 +1229,7 @@ module C #:nodoc:
       notify_shift_expr_evaled(node, lhs_converted, rhs_converted,
                                result_variable)
 
-      if lhs_variable.type.same_as?(result_variable.type)
+      if result_variable.type.same_as?(lhs_variable.type)
         result_converted = result_variable
       else
         result_converted =
@@ -1278,7 +1278,7 @@ module C #:nodoc:
 
       notify_and_expr_evaled(node, lhs_variable, rhs_variable, result_variable)
 
-      if lhs_variable.type.same_as?(result_variable.type)
+      if result_variable.type.same_as?(lhs_variable.type)
         result_converted = result_variable
       else
         result_converted =
@@ -1328,7 +1328,7 @@ module C #:nodoc:
       notify_exclusive_or_expr_evaled(node, lhs_variable, rhs_variable,
                                       result_variable)
 
-      if lhs_variable.type.same_as?(result_variable.type)
+      if result_variable.type.same_as?(lhs_variable.type)
         result_converted = result_variable
       else
         result_converted =
@@ -1378,7 +1378,7 @@ module C #:nodoc:
       notify_inclusive_or_expr_evaled(node, lhs_variable, rhs_variable,
                                       result_variable)
 
-      if lhs_variable.type.same_as?(result_variable.type)
+      if result_variable.type.same_as?(lhs_variable.type)
         result_converted = result_variable
       else
         result_converted =
@@ -1796,28 +1796,6 @@ module C #:nodoc:
       result
     end
 
-    def visit_conditional_expression(node)
-      checkpoint(node.location)
-
-      condition_variable = object_to_variable(node.condition.accept(self))
-
-      case
-      when condition_variable.value.must_be_true?
-        result_variable = object_to_variable(node.then_expression.accept(self))
-      when condition_variable.value.must_be_false?
-        result_variable = object_to_variable(node.else_expression.accept(self))
-      else
-        then_var = object_to_variable(node.then_expression.accept(self))
-        else_var = object_to_variable(node.else_expression.accept(self))
-        result_value = then_var.value.single_value_unified_with(else_var.value)
-        result_variable = temporary_variable(then_var.type, result_value)
-      end
-
-      notify_conditional_expr_evaled(node, condition_variable, result_variable)
-
-      result_variable
-    end
-
     def visit_simple_assignment_expression(node)
       checkpoint(node.location)
 

data/lib/adlint/c/format.rb

@@ -765,15 +765,15 @@ module C #:nodoc:
       # Boolean -- True if types of arguments match this directive.
       def acceptable?
         if @field_width_argument
-          unless signed_int_type.same_as?(@field_width_argument.type) ||
-              unsigned_int_type.same_as?(@field_width_argument.type)
+          unless @field_width_argument.type.convertible?(signed_int_type) ||
+              @field_width_argument.type.convertible?(unsigned_int_type)
             return false
           end
         end
 
         if @precision_argument
-          unless signed_int_type.same_as?(@precision_argument.type) ||
-              unsigned_int_type.same_as?(@precision_argument.type)
+          unless @precision_argument.type.convertible?(signed_int_type) ||
+              @precision_argument.type.convertible?(unsigned_int_type)
             return false
           end
         end
@@ -781,7 +781,7 @@ module C #:nodoc:
         if @conversion_argument
           if argument_types
             argument_types.any? do |arg_type|
-              arg_type.same_as?(@conversion_argument.type)
+              @conversion_argument.type.convertible?(arg_type)
             end
           else
             true
@@ -2502,7 +2502,7 @@ module C #:nodoc:
         if @conversion_argument
           if argument_types
             argument_types.any? do |arg_type|
-              arg_type.same_as?(@conversion_argument.type)
+              @conversion_argument.type.convertible?(arg_type)
             end
           else
             true