adlint 1.0.0 → 1.2.0

data/lib/adlint/cpp/eval.rb

@@ -377,9 +377,9 @@ module Cpp #:nodoc:
       unless new_line = context.next_token and new_line.type == :NEW_LINE
         return nil
       end
-      tokens = PPTokensNormalizer.normalize(pp_tokens, context)
-      return nil if tokens.empty?
-      case parameter = tokens.map { |t| t.value }.join
+      PPTokensNormalizer.normalize(pp_tokens, context)
+      return nil if pp_tokens.tokens.empty?
+      case parameter = pp_tokens.tokens.map { |t| t.value }.join
       when /\A".*"\z/
         user_include_line = UserIncludeLine.new(
           keyword, Token.new(:USR_HEADER_NAME, parameter,
@@ -405,9 +405,9 @@ module Cpp #:nodoc:
       unless new_line = context.next_token and new_line.type == :NEW_LINE
         return nil
       end
-      tokens = PPTokensNormalizer.normalize(pp_tokens, context)
-      return nil if tokens.empty?
-      case parameter = tokens.map { |t| t.value }.join
+      PPTokensNormalizer.normalize(pp_tokens, context)
+      return nil if pp_tokens.tokens.empty?
+      case parameter = pp_tokens.tokens.map { |t| t.value }.join
       when /\A".*"\z/
         user_include_next_line = UserIncludeNextLine.new(
           keyword, Token.new(:USR_HEADER_NAME, parameter,
@@ -498,12 +498,27 @@ module Cpp #:nodoc:
 
     def line_line(context)
       keyword = context.next_token
-      unless pp_tokens = pp_tokens(context)
-        return nil
-      end
+      pp_tokens = pp_tokens(context)
       unless new_line = context.next_token and new_line.type == :NEW_LINE
         return nil
       end
+
+      # NOTE: The ISO C99 standard saids;
+      #
+      # 6.10.4 Line control
+      #
+      # Semantics
+      #
+      # 5 A preprocessing directive of the form
+      #    # line pp-tokens new-line
+      #   that does not match one of the two previous forms is permitted.  The
+      #   preprocessing tokens after line on the directive are processed just
+      #   as in normal text (each identifier currently defined as a macro name
+      #   is replaced by its replacement list of preprocessing tokens).  The
+      #   directive resulting after all replacements shall match one of the two
+      #   previous forms and is then processed as appropriate.
+      PPTokensNormalizer.normalize(pp_tokens, context) if pp_tokens
+
       LineLine.new(keyword, pp_tokens)
     end
 
@@ -523,7 +538,8 @@ module Cpp #:nodoc:
         return nil
       end
       pragma_line = PragmaLine.new(keyword, pp_tokens)
-      if pp_tokens.tokens.size == 1 && pp_tokens.tokens.first.value == "once"
+      if pp_tokens && pp_tokens.tokens.size == 1 &&
+          pp_tokens.tokens.first.value == "once"
         context.once_set.add(keyword.location.fpath)
       else
         notify_unknown_pragma_evaled(pragma_line)
@@ -912,15 +928,15 @@ module Cpp #:nodoc:
   module PPTokensNormalizer
     def normalize(pp_tokens, context)
       context.macro_table.replace(pp_tokens.tokens)
-      pp_tokens.tokens
+      pp_tokens
     end
     module_function :normalize
   end
 
   module ExpressionNormalizer
     def normalize(pp_tokens, context, preprocessor = nil)
-      tokens = PPTokensNormalizer.normalize(pp_tokens, context)
-      const_expr = ConstantExpression.new(context, tokens)
+      PPTokensNormalizer.normalize(pp_tokens, context)
+      const_expr = ConstantExpression.new(context, pp_tokens.tokens)
       if preprocessor
         const_expr.on_illformed_defined_op_found +=
           preprocessor.method(:notify_illformed_defined_op_found)

data/lib/adlint/cpp/message.rb

@@ -37,8 +37,8 @@ module AdLint #:nodoc:
 module Cpp #:nodoc:
 
   class W0001 < PassiveMessageDetection
-    # NOTE: W0001 may be duplicative when the source file includes the same
-    #       header which has the deeply grouped expression.
+    # NOTE: W0001 may be duplicative when the same header which has the deeply
+    #       grouped expression is included twice or more.
     ensure_uniqueness_of :W0001
 
     def initialize(context)
@@ -190,8 +190,8 @@ module Cpp #:nodoc:
   end
 
   class W0056 < PassiveMessageDetection
-    # NOTE: W0056 may be duplicative when the source file includes the same
-    #       header which has macro definition with too many parameters.
+    # NOTE: W0056 may be duplicative when the same header which has macro
+    #       definition with too many parameters is included twice or more.
     ensure_uniqueness_of :W0056
 
     def initialize(context)
@@ -210,8 +210,8 @@ module Cpp #:nodoc:
   end
 
   class W0057 < PassiveMessageDetection
-    # NOTE: W0057 may be duplicative when the source file includes the same
-    #       header which has macro call with too many arguments.
+    # NOTE: W0057 may be duplicative when the same header which has macro call
+    #       with too many arguments is included twice or more.
     ensure_uniqueness_of :W0057
 
     def initialize(context)
@@ -227,8 +227,8 @@ module Cpp #:nodoc:
   end
 
   class W0059 < PassiveMessageDetection
-    # NOTE: W0059 may be duplicative when the source file includes the same
-    #       header which has carriage return at end of lines.
+    # NOTE: W0059 may be duplicative when the same header which has carriage
+    #       return at end of lines is included twice or more.
     ensure_uniqueness_of :W0059
 
     def initialize(context)
@@ -239,8 +239,8 @@ module Cpp #:nodoc:
   end
 
   class W0060 < PassiveMessageDetection
-    # NOTE: W0060 may be duplicative when the source file includes the same
-    #       header with the end-of-file mark.
+    # NOTE: W0060 may be duplicative when the same header which has the
+    #       end-of-file mark is included twice or more.
     ensure_uniqueness_of :W0060
 
     def initialize(context)
@@ -251,9 +251,9 @@ module Cpp #:nodoc:
   end
 
   class W0061 < PassiveMessageDetection
-    # NOTE: W0061 may be duplicative when the source file includes the same
-    #       header which has the token sequence of the compiler specific
-    #       extension.
+    # NOTE: W0061 may be duplicative when the same header which has the token
+    #       sequence of the compiler specific extension is included twice or
+    #       more.
     ensure_uniqueness_of :W0061
 
     def initialize(context)
@@ -264,8 +264,8 @@ module Cpp #:nodoc:
   end
 
   class W0069 < PassiveMessageDetection
-    # NOTE: W0069 may be duplicative when the source file includes the same
-    #       header which has the nested block comment.
+    # NOTE: W0069 may be duplicative when the same header which has the nested
+    #       block comment is included twice or more.
     ensure_uniqueness_of :W0069
 
     def initialize(context)
@@ -276,9 +276,9 @@ module Cpp #:nodoc:
   end
 
   class W0072 < PassiveMessageDetection
-    # NOTE: W0072 may be duplicative when the source file includes the same
-    #       header which has non basic-source-character in the #include
-    #       directive.
+    # NOTE: W0072 may be duplicative when the same header which has non
+    #       basic-source-character in the #include directive is included twice
+    #       or more.
     ensure_uniqueness_of :W0072
 
     def initialize(context)
@@ -303,8 +303,8 @@ module Cpp #:nodoc:
   end
 
   class W0073 < PassiveMessageDetection
-    # NOTE: W0073 may be duplicative when the source file includes the same
-    #       header without the include-guard.
+    # NOTE: W0073 may be duplicative when the same header without the
+    #       include-guard is included twice or more.
     ensure_uniqueness_of :W0073
 
     def initialize(context)
@@ -381,8 +381,8 @@ module Cpp #:nodoc:
   end
 
   class W0442 < PassiveMessageDetection
-    # NOTE: W0442 may be duplicative when the source file includes the same
-    #       header which has function-like macro definitions.
+    # NOTE: W0442 may be duplicative when the same header which has
+    #       function-like macro definitions is included twice or more.
     ensure_uniqueness_of :W0442
 
     def initialize(context)
@@ -410,8 +410,9 @@ module Cpp #:nodoc:
   end
 
   class W0443 < PassiveMessageDetection
-    # NOTE: W0443 may be duplicative when the source file includes the same
-    #       header which has functionizable function-like macro definitions.
+    # NOTE: W0443 may be duplicative when the same header which has
+    #       functionizable function-like macro definitions is included twice or
+    #       more.
     ensure_uniqueness_of :W0443
 
     def initialize(context)
@@ -475,9 +476,9 @@ module Cpp #:nodoc:
   end
 
   class W0444 < PassiveMessageDetection
-    # NOTE: W0444 may be duplicative when the source file includes the same
-    #       header which has the function-like macro definition with `#' and
-    #       `##' operators.
+    # NOTE: W0444 may be duplicative when the same header which has the
+    #       function-like macro definition with `#' and `##' operators is
+    #       included twice or more.
     ensure_uniqueness_of :W0444
 
     def initialize(context)
@@ -510,9 +511,9 @@ module Cpp #:nodoc:
   end
 
   class W0445 < PassiveMessageDetection
-    # NOTE: W0445 may be duplicative when the source file includes the same
-    #       header which has the function-like macro definition with two or
-    #       more `##' operators.
+    # NOTE: W0445 may be duplicative when the same header which has the
+    #       function-like macro definition with two or more `##' operators is
+    #       included twice or more.
     ensure_uniqueness_of :W0445
 
     def initialize(context)
@@ -541,9 +542,9 @@ module Cpp #:nodoc:
   end
 
   class W0477 < PassiveMessageDetection
-    # NOTE: W0477 may be duplicative when the source file includes the same
-    #       header which has the macro definition with unbalanced grouping
-    #       tokens.
+    # NOTE: W0477 may be duplicative when the same header which has the macro
+    #       definition with unbalanced grouping tokens is included twice or
+    #       more.
     ensure_uniqueness_of :W0477
 
     def initialize(context)
@@ -585,8 +586,8 @@ module Cpp #:nodoc:
   end
 
   class W0478 < PassiveMessageDetection
-    # NOTE: W0478 may be duplicative when the source file includes the same
-    #       header which has this warning.
+    # NOTE: W0478 may be duplicative when the same header which causes this
+    #       warning is included twice or more.
     ensure_uniqueness_of :W0478
 
     def initialize(context)
@@ -614,8 +615,8 @@ module Cpp #:nodoc:
   end
 
   class W0479 < PassiveMessageDetection
-    # NOTE: W0479 may be duplicative when the source file includes the same
-    #       header which has typdef-able macro definition.
+    # NOTE: W0479 may be duplicative when the same header which has
+    #       typedef-able macro definition is included twice or more.
     ensure_uniqueness_of :W0479
 
     def initialize(context)
@@ -635,8 +636,8 @@ module Cpp #:nodoc:
   end
 
   class W0480 < PassiveMessageDetection
-    # NOTE: W0480 may be duplicative when the source file includes the same
-    #       header which has this warning.
+    # NOTE: W0480 may be duplicative when the same header which causes this
+    #       warning is included twice or more.
     ensure_uniqueness_of :W0480
 
     def initialize(context)
@@ -659,8 +660,8 @@ module Cpp #:nodoc:
   end
 
   class W0481 < PassiveMessageDetection
-    # NOTE: W0481 may be duplicative when the source file includes the same
-    #       header which has this warning.
+    # NOTE: W0481 may be duplicative when the same header which causes this
+    #       warning is included twice or more.
     ensure_uniqueness_of :W0481
 
     def initialize(context)
@@ -681,8 +682,8 @@ module Cpp #:nodoc:
   end
 
   class W0482 < PassiveMessageDetection
-    # NOTE: W0482 may be duplicative when the source file includes the same
-    #       header which has this warning.
+    # NOTE: W0482 may be duplicative when the same header which causes this
+    #       warning is included twice or more.
     ensure_uniqueness_of :W0482
 
     def initialize(context)
@@ -716,8 +717,8 @@ module Cpp #:nodoc:
   end
 
   class W0483 < PassiveMessageDetection
-    # NOTE: W0483 may be duplicative when the source file includes the same
-    #       header which has this warning.
+    # NOTE: W0483 may be duplicative when the same header which causes this
+    #       warning is included twice or more.
     ensure_uniqueness_of :W0483
 
     def initialize(context)
@@ -737,8 +738,8 @@ module Cpp #:nodoc:
   end
 
   class W0511 < PassiveMessageDetection
-    # NOTE: W0511 may be duplicative when the source file includes the same
-    #       header which has line comments.
+    # NOTE: W0511 may be duplicative when the same header which causes this
+    #       warning is included twice or more.
     ensure_uniqueness_of :W0511
 
     def initialize(context)
@@ -749,8 +750,8 @@ module Cpp #:nodoc:
   end
 
   class W0528 < PassiveMessageDetection
-    # NOTE: W0528 may be duplicative when the source file includes the same
-    #       header which has this warning.
+    # NOTE: W0528 may be duplicative when the same header which causes this
+    #       warning is included twice or more.
     ensure_uniqueness_of :W0528
 
     def initialize(context)
@@ -771,8 +772,8 @@ module Cpp #:nodoc:
   end
 
   class W0549 < PassiveMessageDetection
-    # NOTE: W0549 may be duplicative when the source file includes the same
-    #       header which has this warning.
+    # NOTE: W0549 may be duplicative when the same header which causes this
+    #       warning is included twice or more.
     ensure_uniqueness_of :W0549
 
     def initialize(context)
@@ -811,8 +812,8 @@ module Cpp #:nodoc:
   end
 
   class W0554 < PassiveMessageDetection
-    # NOTE: W0554 may be duplicative when the source file includes the same
-    #       header which has this warning.
+    # NOTE: W0554 may be duplicative when the same header which causes this
+    #       warning is included twice or more.
     ensure_uniqueness_of :W0554
 
     def initialize(context)
@@ -824,13 +825,13 @@ module Cpp #:nodoc:
     private
     def check(pragma_line)
       W(:W0554, pragma_line.location,
-        pragma_line.pp_tokens.tokens.map { |token| token.value }.join(" "))
+        pragma_line.pp_tokens ? pragma_line.pp_tokens.to_s : "")
     end
   end
 
   class W0574 < PassiveMessageDetection
-    # NOTE: W0574 may be duplicative when the source file includes the same
-    #       header which has this warning.
+    # NOTE: W0574 may be duplicative when the same header which causes this
+    #       warning is included twice or more.
     ensure_uniqueness_of :W0574
 
     def initialize(context)
@@ -859,8 +860,8 @@ module Cpp #:nodoc:
   end
 
   class W0575 < PassiveMessageDetection
-    # NOTE: W0575 may be duplicative when the source file includes the same
-    #       header which has this warning.
+    # NOTE: W0575 may be duplicative when the same header which causes this
+    #       warning is included twice or more.
     ensure_uniqueness_of :W0575
 
     def initialize(context)
@@ -889,8 +890,8 @@ module Cpp #:nodoc:
   end
 
   class W0576 < PassiveMessageDetection
-    # NOTE: W0576 may be duplicative when the source file includes the same
-    #       header which has this warning.
+    # NOTE: W0576 may be duplicative when the same header which causes this
+    #       warning is included twice or more.
     ensure_uniqueness_of :W0576
 
     def initialize(context)
@@ -914,8 +915,8 @@ module Cpp #:nodoc:
   end
 
   class W0577 < PassiveMessageDetection
-    # NOTE: W0577 may be duplicative when the source file includes the same
-    #       header which has this warning.
+    # NOTE: W0577 may be duplicative when the same header which causes this
+    #       warning is included twice or more.
     ensure_uniqueness_of :W0577
 
     def initialize(context)
@@ -935,8 +936,8 @@ module Cpp #:nodoc:
   end
 
   class W0696 < PassiveMessageDetection
-    # NOTE: W0696 may be duplicative when the source file includes the same
-    #       header which has references to the undefined macro.
+    # NOTE: W0696 may be duplicative when the same header which has references
+    #       to the undefined macro is included twice or more.
     ensure_uniqueness_of :W0696
 
     def initialize(context)
@@ -948,8 +949,8 @@ module Cpp #:nodoc:
   end
 
   class W0804 < PassiveMessageDetection
-    # NOTE: W0804 may be duplicative when the source file includes the same
-    #       header which has this warning.
+    # NOTE: W0804 may be duplicative when the same header which causes this
+    #       warning is included twice or more.
     ensure_uniqueness_of :W0804
 
     def initialize(context)
@@ -960,8 +961,8 @@ module Cpp #:nodoc:
   end
 
   class W0831 < PassiveMessageDetection
-    # NOTE: W0831 may be duplicative when the source file includes the same
-    #       header which has this warning.
+    # NOTE: W0831 may be duplicative when the same header which causes this
+    #       warning is included twice or more.
     ensure_uniqueness_of :W0831
 
     def initialize(context)
@@ -977,8 +978,8 @@ module Cpp #:nodoc:
   end
 
   class W9002 < PassiveMessageDetection
-    # NOTE: W9002 may be duplicative when the source file includes the same
-    #       header which has no newline at end of the file.
+    # NOTE: W9002 may be duplicative when the same header which has no newline
+    #       at end of the file is included twice or more.
     ensure_uniqueness_of :W9002
 
     def initialize(context)

data/lib/adlint/cpp/message_shima.rb

@@ -0,0 +1,100 @@
+# Message detection classes for C preprocessor language.
+#
+# Author::    Rie Shima <mailto:rkakuuchi@users.sourceforge.net>
+# Copyright:: Copyright (C) 2010-2012, OGIS-RI Co.,Ltd.
+# License::   GPLv3+: GNU General Public License version 3 or later
+#
+# Owner::     Rie Shima <mailto:rkakuuchi@users.sourceforge.net>
+
+#--
+#     ___    ____  __    ___   _________
+#    /   |  / _  |/ /   / / | / /__  __/           Source Code Static Analyzer
+#   / /| | / / / / /   / /  |/ /  / /                   AdLint - Advanced Lint
+#  / __  |/ /_/ / /___/ / /|  /  / /
+# /_/  |_|_____/_____/_/_/ |_/  /_/   Copyright (C) 2010-2012, OGIS-RI Co.,Ltd.
+#
+# This file is part of AdLint.
+#
+# AdLint is free software: you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation, either version 3 of the License, or (at your option) any later
+# version.
+#
+# AdLint is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# AdLint.  If not, see <http://www.gnu.org/licenses/>.
+#
+#++
+
+require "adlint/report"
+require "adlint/message"
+
+module AdLint #:nodoc:
+module Cpp #:nodoc:
+
+  class W0688 < PassiveMessageDetection
+    # NOTE: W0688 may be duplicative when the same header which causes this
+    #       warning is included twice or more.
+    ensure_uniqueness_of :W0688
+
+    def initialize(context)
+      super
+      visitor = context[:cpp_visitor]
+      visitor.enter_line_line += method(:check)
+    end
+
+    private
+    def check(line_line)
+      if line_no_arg = line_no_argument(line_line)
+        line_no = Integer(line_no_arg.value)
+        unless line_no > 0 && line_no < 32768
+          W(:W0688, line_no_arg.location)
+        end
+      end
+    rescue
+    end
+
+    def line_no_argument(line_line)
+      line_line.pp_tokens ? line_line.pp_tokens.tokens.first : nil
+    end
+  end
+
+  class W0689 < W0688
+    # NOTE: W0689 may be duplicative when the same header which causes this
+    #       warning is included twice or more.
+    ensure_uniqueness_of :W0689
+
+    private
+    def check(line_line)
+      if fname_arg = file_name_argument(line_line)
+        unless fname_arg.value =~ /\A".*"\z/
+          W(:W0689, fname_arg.location)
+        end
+      end
+    end
+
+    def file_name_argument(line_line)
+      line_line.pp_tokens ? line_line.pp_tokens.tokens[1] : nil
+    end
+  end
+
+  class W0690 < W0688
+    # NOTE: W0690 may be duplicative when the same header which causes this
+    #       warning is included twice or more.
+    ensure_uniqueness_of :W0690
+
+    private
+    def check(line_line)
+      if line_no_arg = line_no_argument(line_line)
+        Integer(line_no_arg.value)
+      end
+    rescue
+      W(:W0690, line_no_arg.location)
+    end
+  end
+
+end
+end

data/lib/adlint/cpp/phase.rb

@@ -35,6 +35,7 @@ require "adlint/cpp/lexer"
 require "adlint/cpp/eval"
 require "adlint/cpp/code"
 require "adlint/cpp/message"
+require "adlint/cpp/message_shima"
 require "adlint/cpp/util"
 
 module AdLint #:nodoc:
@@ -99,6 +100,9 @@ module Cpp #:nodoc:
         W0575.new(context),
         W0576.new(context),
         W0577.new(context),
+        W0688.new(context),
+        W0689.new(context),
+        W0690.new(context),
         W0696.new(context),
         W0804.new(context),
         W0831.new(context),

data/lib/adlint/cpp/syntax.rb

@@ -678,8 +678,12 @@ module Cpp #:nodoc:
       end
     end
 
+    def to_s
+      @tokens.map { |t| t.value }.join(" ")
+    end
+
     def inspect(indent = 0)
-      " " * indent + @tokens.map { |t| t.value }.join(" ")
+      " " * indent + self.to_s
     end
   end
 

data/lib/adlint/cpp.rb

@@ -35,6 +35,7 @@ require "adlint/cpp/constexpr"
 require "adlint/cpp/lexer"
 require "adlint/cpp/macro"
 require "adlint/cpp/message"
+require "adlint/cpp/message_shima"
 require "adlint/cpp/phase"
 require "adlint/cpp/scanner"
 require "adlint/cpp/source"

data/lib/adlint/message.rb

@@ -312,9 +312,12 @@ module AdLint #:nodoc:
     # === RETURN VALUE
     # None.
     def validate_version(version)
-      version =~ SCHEMA_VERSION_RE or
-        raise "invalid version of the message definition file."
-      nil
+      # NOTE: Version field of the message catalog does not mean the schema
+      #       version of the catalog file, but a revision number of the catalog
+      #       contents.
+      #       When AdLint is installed normally, the schema version of the
+      #       catalog is always valid.  So, schema version validation is
+      #       unnecessary.
     end
   end
 

data/lib/adlint/traits.rb

@@ -94,7 +94,7 @@ module AdLint #:nodoc:
 
     private
     def validate_version(version)
-      version =~ SCHEMA_VERSION_RE or
+      version == TRAITS_SCHEMA_VERSION or
         raise "invalid version of the trailts file."
     end
   end

data/lib/adlint/version.rb

@@ -32,16 +32,16 @@
 module AdLint #:nodoc:
 
   MAJOR_VERSION = 1
-  MINOR_VERSION = 0
+  MINOR_VERSION = 2
   PATCH_VERSION = 0
-  RELEASE_DATE  = "2012-02-28"
+  RELEASE_DATE  = "2012-03-21"
+
+  TRAITS_SCHEMA_VERSION = "1.0.0"
 
   SHORT_VERSION = "#{MAJOR_VERSION}.#{MINOR_VERSION}.#{PATCH_VERSION}"
 
   VERSION = "#{SHORT_VERSION} (#{RELEASE_DATE})"
 
-  SCHEMA_VERSION_RE = /\A#{MAJOR_VERSION}\.#{MINOR_VERSION}\.\d+\z/
-
   COPYRIGHT = <<EOS
      ___    ____  __    ___   _________
     /   |  / _  |/ /   / / | / /__  __/            Source Code Static Analyzer
@@ -64,7 +64,7 @@ module AdLint #:nodoc:
 EOS
 
   AUTHOR = <<EOS
-Written by Yutaka Yanoh and Code Quality Assessment Team of OGIS-RI Co.,Ltd.
+Written by Yutaka Yanoh, Rie Shima and Code Quality Assessment Team of OGIS-RI Co.,Ltd.
 
 EOS
 

data/share/demo/Makefile

@@ -10,6 +10,7 @@ bad_const \
 bad_conv \
 bad_indent \
 bad_init \
+bad_line \
 bad_macro \
 bitwise_expr \
 call_by_value \
@@ -25,8 +26,8 @@ funptr_cast \
 goto_stmt \
 id_hiding \
 ill_defined \
-implicit_int \
 implicit_conv \
+implicit_int \
 incomplete_type \
 indirect_recur \
 intro_demo \
@@ -58,6 +59,7 @@ output_by_param \
 overflow \
 press_release \
 retn_lvar_addr \
+sequence_point \
 shift_expr \
 should_be_typedef \
 static_paths \