adlint 1.6.0 → 1.8.0

data/lib/adlint/c/syntax.rb

@@ -31,7 +31,6 @@
 
 require "adlint/symbol"
 require "adlint/util"
-require "adlint/c/enum"
 require "adlint/c/seqp"
 
 module AdLint #:nodoc:
@@ -226,6 +225,17 @@ module C #:nodoc:
     end
     module_function :collect_identifier_declarators
 
+    def collect_typedef_type_specifiers(node)
+      if node
+        TypedefTypeSpecifierCollector.new.tap { |collector|
+          node.accept(collector)
+        }.typedef_type_specifiers
+      else
+        []
+      end
+    end
+    module_function :collect_typedef_type_specifiers
+
     def collect_function_declarators(node)
       if node
         FunctionDeclaratorCollector.new.tap { |collector|
@@ -424,6 +434,10 @@ module C #:nodoc:
       }.object_specifiers
     end
 
+    def logical?
+      subclass_responsibility
+    end
+
     def to_s
       subclass_responsibility
     end
@@ -443,6 +457,10 @@ module C #:nodoc:
       true
     end
 
+    def logical?
+      false
+    end
+
     def to_s
       @error_token.value
     end
@@ -457,6 +475,10 @@ module C #:nodoc:
     def have_side_effect?
       false
     end
+
+    def logical?
+      false
+    end
   end
 
   class ObjectSpecifier < PrimaryExpression
@@ -471,6 +493,10 @@ module C #:nodoc:
       @identifier.location
     end
 
+    def logical?
+      false
+    end
+
     def to_s
       @identifier.value
     end
@@ -505,6 +531,10 @@ module C #:nodoc:
       @constant.value =~ /'.*'/
     end
 
+    def logical?
+      false
+    end
+
     def to_s
       @constant.value
     end
@@ -531,6 +561,10 @@ module C #:nodoc:
       @literal.value.scan(/\AL/i).first
     end
 
+    def logical?
+      false
+    end
+
     def to_s
       @literal.value
     end
@@ -553,6 +587,10 @@ module C #:nodoc:
       @token.location
     end
 
+    def logical?
+      false
+    end
+
     def to_s
       @token.value
     end
@@ -579,6 +617,10 @@ module C #:nodoc:
       @expression.have_side_effect?
     end
 
+    def logical?
+      @expression.logical?
+    end
+
     def to_s
       "(#{expression.to_s})"
     end
@@ -599,6 +641,10 @@ module C #:nodoc:
     def location
       @operator.location
     end
+
+    def logical?
+      false
+    end
   end
 
   class ArraySubscriptExpression < PostfixExpression
@@ -849,21 +895,45 @@ module C #:nodoc:
     def have_side_effect?
       true
     end
+
+    def logical?
+      false
+    end
   end
 
   class PrefixDecrementExpression < UnaryExpression
     def have_side_effect?
       true
     end
+
+    def logical?
+      false
+    end
   end
 
-  class AddressExpression < UnaryExpression; end
+  class AddressExpression < UnaryExpression
+    def logical?
+      false
+    end
+  end
 
-  class IndirectionExpression < UnaryExpression; end
+  class IndirectionExpression < UnaryExpression
+    def logical?
+      false
+    end
+  end
 
-  class UnaryArithmeticExpression < UnaryExpression; end
+  class UnaryArithmeticExpression < UnaryExpression
+    def logical?
+      @operator.type == "!"
+    end
+  end
 
   class SizeofExpression < UnaryExpression
+    def logical?
+      false
+    end
+
     def to_s
       "sizeof(#{@operand.to_s})"
     end
@@ -874,12 +944,20 @@ module C #:nodoc:
       false
     end
 
+    def logical?
+      false
+    end
+
     def to_s
       "sizeof(#{@operand.to_s})"
     end
   end
 
   class AlignofExpression < UnaryExpression
+    def logical?
+      false
+    end
+
     def to_s
       "alignof(#{@operand.to_s})"
     end
@@ -890,6 +968,10 @@ module C #:nodoc:
       false
     end
 
+    def logical?
+      false
+    end
+
     def to_s
       "alignof(#{@operand.to_s})"
     end
@@ -913,6 +995,10 @@ module C #:nodoc:
       @operand.have_side_effect?
     end
 
+    def logical?
+      false
+    end
+
     def to_s
       "(#{@type_name.to_s}) #{@operand.to_s}"
     end
@@ -953,21 +1039,53 @@ module C #:nodoc:
     end
   end
 
-  class MultiplicativeExpression < BinaryExpression; end
+  class MultiplicativeExpression < BinaryExpression
+    def logical?
+      false
+    end
+  end
 
-  class AdditiveExpression < BinaryExpression; end
+  class AdditiveExpression < BinaryExpression
+    def logical?
+      false
+    end
+  end
 
-  class ShiftExpression < BinaryExpression; end
+  class ShiftExpression < BinaryExpression
+    def logical?
+      false
+    end
+  end
 
-  class RelationalExpression < BinaryExpression; end
+  class RelationalExpression < BinaryExpression
+    def logical?
+      true
+    end
+  end
 
-  class EqualityExpression < BinaryExpression; end
+  class EqualityExpression < BinaryExpression
+    def logical?
+      true
+    end
+  end
 
-  class AndExpression < BinaryExpression; end
+  class AndExpression < BinaryExpression
+    def logical?
+      false
+    end
+  end
 
-  class ExclusiveOrExpression < BinaryExpression; end
+  class ExclusiveOrExpression < BinaryExpression
+    def logical?
+      false
+    end
+  end
 
-  class InclusiveOrExpression < BinaryExpression; end
+  class InclusiveOrExpression < BinaryExpression
+    def logical?
+      false
+    end
+  end
 
   class LogicalAndExpression < BinaryExpression
     def initialize(operator, lhs_operand, rhs_operand)
@@ -985,6 +1103,10 @@ module C #:nodoc:
       #   to 0, the second operand is not evaluated.
       @lhs_operand.append_sequence_point!
     end
+
+    def logical?
+      true
+    end
   end
 
   class LogicalOrExpression < BinaryExpression
@@ -1003,6 +1125,10 @@ module C #:nodoc:
       #   unequal to 0, the second operand is not evaluated.
       @lhs_operand.append_sequence_point!
     end
+
+    def logical?
+      true
+    end
   end
 
   class ConditionalExpression < Expression
@@ -1044,6 +1170,10 @@ module C #:nodoc:
         @else_expression.have_side_effect?
     end
 
+    def logical?
+      @then_expression.logical? || @else_expression.logical?
+    end
+
     def to_s
       "#{@condition.to_s} ? " +
         "#{@then_expression.to_s} : #{@else_expression.to_s}"
@@ -1061,12 +1191,20 @@ module C #:nodoc:
     def have_side_effect?
       true
     end
+
+    def logical?
+      @rhs_operand.logical?
+    end
   end
 
   class CompoundAssignmentExpression < BinaryExpression
     def have_side_effect?
       true
     end
+
+    def logical?
+      false
+    end
   end
 
   class CommaSeparatedExpression < Expression
@@ -1086,6 +1224,10 @@ module C #:nodoc:
       @expressions.any? { |expr| expr.have_side_effect? }
     end
 
+    def logical?
+      @expressions.last.logical?
+    end
+
     def to_s
       @expressions.map { |expr| expr.to_s }.join(",")
     end
@@ -1285,7 +1427,7 @@ module C #:nodoc:
     end
 
     def signature
-      FunctionSignature.new(identifier, @type)
+      FunctionSignature.new(identifier.value, @type)
     end
 
     def function_declarator
@@ -2804,7 +2946,7 @@ module C #:nodoc:
     end
 
     def signature
-      FunctionSignature.new(identifier, @type)
+      FunctionSignature.new(identifier.value, @type)
     end
 
     def function_declarator
@@ -3195,14 +3337,14 @@ module C #:nodoc:
 
     def ==(rhs)
       if @type.parameter_types.empty? || rhs.type.parameter_types.empty?
-        @name.value == rhs.name.value
+        @name == rhs.name
       else
-        @name.value == rhs.name.value && @type == rhs.type
+        @name == rhs.name && @type == rhs.type
       end
     end
 
     def to_s
-      "#{@type.return_type.brief_image} #{@name.value}(" +
+      "#{@type.return_type.brief_image} #{@name}(" +
         @type.parameter_types.map { |t| t.brief_image }.join(",") +
         (@type.have_va_list? ? ",...)" : ")")
     end
@@ -4294,6 +4436,22 @@ module C #:nodoc:
     end
   end
 
+  class TypedefTypeSpecifierCollector < SyntaxTreeVisitor
+    def initialize
+      @typedef_type_specifiers = []
+    end
+
+    attr_reader :typedef_type_specifiers
+
+    def visit_variable_definition(node)
+    end
+
+    def visit_typedef_type_specifier(node)
+      super
+      @typedef_type_specifiers.push(node)
+    end
+  end
+
   class FunctionDeclaratorCollector < SyntaxTreeVisitor
     def initialize
       @function_declarators = []