adlint 2.2.0 → 2.4.0

data/lib/adlint/cpp/macro.rb

@@ -109,18 +109,28 @@ module Cpp #:nodoc:
     def replaceable_size(tokens)
       return 0 unless name.value == tokens.first.value
       args, index = parse_arguments(tokens, 1)
-      args && @parameter_names.size >= args.size ? index + 1 : 0
+      case
+      when args && @parameter_names.empty?
+        index + 1
+      when args && @parameter_names.size >= args.size
+        index + 1
+      else
+        0
+      end
     end
 
     def expand(tokens, macro_table, context)
       super
 
       args, * = parse_arguments(tokens, 1)
-      result = expand_replacement_list(
-        @parameter_names.each_with_index.with_object({}) { |(name, i), hash|
-          arg = args[i] and hash[name] = arg
-        }, tokens.first.location, macro_table, context)
+      args = [] if @parameter_names.empty?
+      args_hash =
+        @parameter_names.zip(args).each_with_object({}) { |(name, arg), hash|
+          hash[name] = arg
+        }
 
+      result = expand_replacement_list(args_hash, tokens.first.location,
+                                       macro_table, context)
       macro_table.notify_function_like_macro_replacement(self, tokens, args,
                                                          result)
       result
@@ -144,15 +154,10 @@ module Cpp #:nodoc:
       return nil, index unless token
 
       args = []
-      while token = tokens[index]
-        if token.value == ","
-          args.push(nil)
-          index += 1
-        else
-          arg, index = parse_one_argument(tokens, index)
-          break unless arg
-          args.push(arg)
-        end
+      loop do
+        arg, index, last = parse_one_argument(tokens, index)
+        args.push(arg)
+        break if last
       end
       return args, index
     end
@@ -163,30 +168,29 @@ module Cpp #:nodoc:
       while token = tokens[index]
         case token.value
         when "("
-          arg << token
+          arg.push(token)
           paren_depth += 1
         when ")"
           paren_depth -= 1
           if paren_depth >= 0
-            arg << token
+            arg.push(token)
           else
-            break
+            return arg, index, true
           end
         when ","
           if paren_depth > 0
-            arg << token
+            arg.push(token)
           else
-            index += 1
-            break
+            return arg, index + 1, false
           end
         when "\n"
           ;
         else
-          arg << token
+          arg.push(token)
         end
         index += 1
       end
-      return (arg.empty? ? nil : arg), index
+      return arg, index, true # NOTREACHED
     end
 
     def expand_replacement_list(args, location, macro_table, context)
@@ -202,15 +206,16 @@ module Cpp #:nodoc:
           substitute_argument(curr_token, next_token, arg, location, result,
                               macro_table, context)
         when curr_token.value == "#"
-          if next_token and arg = args[next_token.value] || []
-            stringized = stringize_argument(arg, location, macro_table)
+          if next_token
+            stringized = stringize_argument(args[next_token.value], location,
+                                            macro_table)
             result.push(stringized)
             index += 1
           end
         when curr_token.value == "##" && next_token.value == "#"
-          if next_next_token = replacement_list.tokens[index + 2] and
-              arg = args[next_next_token.value] || []
-            stringized = stringize_argument(arg, location, macro_table)
+          if next_next_token = replacement_list.tokens[index + 2]
+            stringized = stringize_argument(args[next_next_token.value],
+                                            location, macro_table)
             concat_with_last_token([stringized], location, result, macro_table)
             index += 2
           end
@@ -336,21 +341,28 @@ module Cpp #:nodoc:
       #   The resulting token is available for further macro replacement.  The
       #   order of evaluation of ## operators is unspecified.
 
-      if lhs = result_tokens.pop and rhs = arg_tokens.first
-        # NOTE: To avoid syntax error when the concatenated token can be
-        #       retokenize to two or more tokens.
-        new_tokens = StringToPPTokensLexer.new(lhs.value + rhs.value).execute
-        new_tokens.map! do |token|
-          ReplacedToken.new(token.type, token.value, expansion_location,
-                            token.type_hint, false)
+      if lhs = result_tokens.pop
+        if rhs = arg_tokens.first
+          # NOTE: To avoid syntax error when the concatenated token can be
+          #       retokenize to two or more tokens.
+          new_tokens = StringToPPTokensLexer.new(lhs.value + rhs.value).execute
+          new_tokens.map! do |token|
+            ReplacedToken.new(token.type, token.value, expansion_location,
+                              token.type_hint, false)
+          end
+          result_tokens.concat(new_tokens)
+          result_tokens.concat(arg_tokens[1..-1].map { |token|
+            ReplacedToken.new(token.type, token.value, expansion_location,
+                              token.type_hint, false)
+          })
+        else
+          new_tokens = [ReplacedToken.new(lhs.type, lhs.value,
+                                          expansion_location, lhs.type_hint,
+                                          false)]
+          result_tokens.concat(new_tokens)
         end
-        macro_table.notify_sharpsharp_operator_evaled(lhs, rhs, new_tokens)
 
-        result_tokens.concat(new_tokens)
-        result_tokens.concat(arg_tokens[1..-1].map { |token|
-          ReplacedToken.new(token.type, token.value, expansion_location,
-                            token.type_hint, false)
-        })
+        macro_table.notify_sharpsharp_operator_evaled(lhs, rhs, new_tokens)
       end
     end
   end

data/lib/adlint/exam/c_builtin/c_check.rb

@@ -1926,7 +1926,16 @@ module CBuiltin #:nodoc:
       interp.on_variable_value_updated += method(:write_variable)
       interp.on_block_started += method(:enter_block)
       interp.on_block_ended += method(:leave_block)
+      interp.on_while_stmt_started += method(:enter_iteration)
+      interp.on_while_stmt_ended += method(:leave_iteration)
+      interp.on_do_stmt_started += method(:enter_iteration)
+      interp.on_do_stmt_ended += method(:leave_iteration)
+      interp.on_for_stmt_started += method(:enter_iteration)
+      interp.on_for_stmt_ended += method(:leave_iteration)
+      interp.on_c99_for_stmt_started += method(:enter_iteration)
+      interp.on_c99_for_stmt_ended += method(:leave_iteration)
       @variable_stack = [{}]
+      @iteration_stmt_stack = []
     end
 
     private
@@ -1957,11 +1966,26 @@ module CBuiltin #:nodoc:
 
       @variable_stack.reverse_each do |variables|
         if record = variables[variable]
-          record[1] += 1
+          if @iteration_stmt_stack.empty?
+            record[1] += 1
+          else
+            # NOTE: Update twice in order not to over-warn about this variable,
+            #       because an iteration is treated as a normal selection by
+            #       the abstract interpreter.
+            record[1] += 2
+          end
         end
       end
     end
 
+    def enter_iteration(iteration_stmt)
+      @iteration_stmt_stack.push(iteration_stmt)
+    end
+
+    def leave_iteration(iteration_stmt)
+      @iteration_stmt_stack.pop
+    end
+
     def check_constant_variables(variables)
       variables.each do |variable, (location, assign_count)|
         case
@@ -6948,122 +6972,132 @@ module CBuiltin #:nodoc:
 
       def initialize(context)
         @context = context
-        @decl_location = Location.new
-        @stmt_location = Location.new
+        @last_decl_or_stmt_location = Location.new
+        @last_memb_decl_location = Location.new
       end
 
       def visit_function_declaration(node)
-        check_declaration(node)
+        check_decl_or_stmt(node)
+        @last_decl_or_stmt_location = node.location
       end
 
       def visit_variable_declaration(node)
-        check_declaration(node)
+        check_decl_or_stmt(node)
+        @last_decl_or_stmt_location = node.location
       end
 
       def visit_variable_definition(node)
-        check_declaration(node)
+        check_decl_or_stmt(node)
+        @last_decl_or_stmt_location = node.location
       end
 
       def visit_typedef_declaration(node)
-        check_declaration(node)
+        check_decl_or_stmt(node)
+        @last_decl_or_stmt_location = node.location
       end
 
-      def visit_struct_type_declaration(node)
-        check_declaration(node)
-      end
-
-      def visit_union_type_declaration(node)
-        check_declaration(node)
-      end
-
-      def visit_enum_type_declaration(node)
-        check_declaration(node)
+      def visit_member_declaration(node)
+        check_member_decl(node)
+        @last_memb_decl_location = node.location
       end
 
       def visit_generic_labeled_statement(node)
-        check_statement(node)
+        check_decl_or_stmt(node)
+        @last_decl_or_stmt_location = node.location
       end
 
       def visit_case_labeled_statement(node)
-        check_statement(node)
+        check_decl_or_stmt(node)
+        @last_decl_or_stmt_location = node.location
       end
 
       def visit_default_labeled_statement(node)
-        check_statement(node)
+        check_decl_or_stmt(node)
+        @last_decl_or_stmt_location = node.location
       end
 
       def visit_expression_statement(node)
-        check_statement(node)
+        check_decl_or_stmt(node)
+        @last_decl_or_stmt_location = node.location
       end
 
       def visit_if_statement(node)
-        check_statement(node)
+        check_decl_or_stmt(node)
         node.statement.accept(self)
+        @last_decl_or_stmt_location = node.location
       end
 
       def visit_if_else_statement(node)
-        check_statement(node)
+        check_decl_or_stmt(node)
+        orig_location = @last_decl_or_stmt_location
         node.then_statement.accept(self)
+        @last_decl_or_stmt_location = orig_location
         node.else_statement.accept(self)
+        @last_decl_or_stmt_location = node.location
       end
 
       def visit_switch_statement(node)
-        check_statement(node)
+        check_decl_or_stmt(node)
         node.statement.accept(self)
+        @last_decl_or_stmt_location = node.location
       end
 
       def visit_while_statement(node)
-        check_statement(node)
+        check_decl_or_stmt(node)
         node.statement.accept(self)
+        @last_decl_or_stmt_location = node.location
       end
 
       def visit_do_statement(node)
-        check_statement(node)
+        check_decl_or_stmt(node)
         node.statement.accept(self)
+        @last_decl_or_stmt_location = node.location
       end
 
       def visit_for_statement(node)
-        check_statement(node)
+        check_decl_or_stmt(node)
         node.body_statement.accept(self)
+        @last_decl_or_stmt_location = node.location
       end
 
       def visit_c99_for_statement(node)
-        check_statement(node)
+        check_decl_or_stmt(node)
         node.body_statement.accept(self)
+        @last_decl_or_stmt_location = node.location
       end
 
       def visit_goto_statement(node)
-        check_statement(node)
+        check_decl_or_stmt(node)
+        @last_decl_or_stmt_location = node.location
       end
 
       def visit_continue_statement(node)
-        check_statement(node)
+        check_decl_or_stmt(node)
+        @last_decl_or_stmt_location = node.location
       end
 
       def visit_break_statement(node)
-        check_statement(node)
+        check_decl_or_stmt(node)
+        @last_decl_or_stmt_location = node.location
       end
 
       def visit_return_statement(node)
-        check_statement(node)
+        check_decl_or_stmt(node)
+        @last_decl_or_stmt_location = node.location
       end
 
       private
-      def check_declaration(node)
-        if @decl_location.fpath == node.location.fpath &&
-            @decl_location.line_no == node.location.line_no
+      def check_decl_or_stmt(node)
+        if @last_decl_or_stmt_location.fpath == node.location.fpath &&
+            @last_decl_or_stmt_location.line_no == node.location.line_no
           W(:W0425, node.location)
-        else
-          @decl_location = node.location
         end
       end
 
-      def check_statement(node)
-        if @stmt_location.fpath == node.location.fpath &&
-            @stmt_location.line_no == node.location.line_no
+      def check_member_decl(node)
+        if @last_memb_decl_location.fpath == node.location.fpath &&
+            @last_memb_decl_location.line_no == node.location.line_no
           W(:W0425, node.location)
-        else
-          @stmt_location = node.location
         end
       end
 

data/lib/adlint/exam/c_builtin/cpp_check.rb

@@ -1153,8 +1153,10 @@ module CBuiltin #:nodoc:
 
     private
     def check(macro, replacing_tokens, args, *)
-      if args.empty?
-        W(:W0692, replacing_tokens.first.location, macro.name.value)
+      unless macro.parameter_names.empty?
+        if args.any? { |arg| arg.empty? }
+          W(:W0692, replacing_tokens.first.location, macro.name.value)
+        end
       end
     end
   end

data/lib/adlint/traits.rb

@@ -90,7 +90,7 @@ module AdLint #:nodoc:
         end
         validate_version(doc["version"])
 
-        @exam_packages = doc["exam_packages"].uniq.map { |name|
+        @exam_packages = (doc["exam_packages"] || []).uniq.map { |name|
           ExaminationPackage.new(name)
         }.freeze
 
@@ -105,7 +105,7 @@ module AdLint #:nodoc:
     def validate_version(version)
       version == TRAITS_SCHEMA_VERSION or
         raise "invalid version of the trailts file.\n" +
-              "please, regenerate traits file by new `adlintize' command."
+              "regenerate or migrate traits file by new `adlintize' command."
     end
   end
 
@@ -114,13 +114,11 @@ module AdLint #:nodoc:
 
     def initialize(doc)
       @project_name = doc["project_name"]
-
-      if path_strs = doc["include_path"]
-        @include_path = path_strs.map { |str| Pathname.new(str) }
-      else
-        @include_path = []
-      end
-
+      @project_root = Pathname.new(doc["project_root"])
+      @include_path =
+        (doc["include_path"] || []).compact.map { |compound_path_str|
+          compound_path_str.split(":").map { |str| Pathname.new(str) }
+        }.flatten
       @initial_header = doc["initial_header"]
       @coding_style = CodingStyle.new(doc["coding_style"])
       @file_encoding = doc["file_encoding"]
@@ -133,6 +131,9 @@ module AdLint #:nodoc:
     attr_reader :project_name
     ensure_presence_of :project_name
 
+    attr_reader :project_root
+    ensure_dir_presence_of :project_root
+
     attr_reader :include_path
     ensure_dirs_presence_of :include_path
 
@@ -197,13 +198,10 @@ module AdLint #:nodoc:
 
     def initialize(doc)
       @standard_type = StandardType.new(doc["standard_type"])
-
-      if path_strs = doc["include_path"]
-        @include_path = path_strs.map { |str| Pathname.new(str) }
-      else
-        @include_path = []
-      end
-
+      @include_path =
+        (doc["include_path"] || []).compact.map { |compound_path_str|
+          compound_path_str.split(":").map { |str| Pathname.new(str) }
+        }.flatten
       @initial_header = doc["initial_header"]
       @arithmetic = Arithmetic.new(doc["arithmetic"])
       @extension_substitution = doc["extension_substitution"] || {}
@@ -491,14 +489,21 @@ module AdLint #:nodoc:
     def initialize(doc)
       @language = doc["language"]
       @message_with_class = doc["message_with_class"]
-      @warn_only_files_in = doc["warn_only_files_in"]
+      @warn_files_in =
+        (doc["warn_files_in"] || []).compact.map { |compound_path_str|
+          compound_path_str.split(":").map { |str| Pathname.new(str) }
+        }.flatten
+      @warn_files_not_in =
+        (doc["warn_files_not_in"] || []).compact.map { |compound_path_str|
+          compound_path_str.split(":").map { |str| Pathname.new(str) }
+        }.flatten
       @individual_selection = doc["individual_selection"]
       @exclusion = Exclusion.new(doc["exclusion"])
       @inclusion = Inclusion.new(doc["inclusion"])
-      str_hash_array = doc["change_list"] || []
-      @change_list = str_hash_array.each_with_object({}) { |(id, content), h|
-        h[[content["package"], id.intern]] = content
-      }
+      @change_list =
+        (doc["change_list"] || []).each_with_object({}) { |(id, content), hash|
+          hash[[content["package"], id.intern]] = content
+        }
     end
 
     def name
@@ -511,8 +516,11 @@ module AdLint #:nodoc:
     attr_reader :message_with_class
     ensure_true_or_false_of :message_with_class
 
-    attr_reader :warn_only_files_in
-    ensure_dir_presence_of :warn_only_files_in, :allow_nil => true
+    attr_reader :warn_files_in
+    ensure_dirs_presence_of :warn_files_in
+
+    attr_reader :warn_files_not_in
+    ensure_dirs_presence_of :warn_files_not_in
 
     attr_reader :individual_selection
     ensure_true_or_false_of :individual_selection
@@ -589,6 +597,12 @@ module AdLint #:nodoc:
 
     def freeze
       @language.freeze
+      @message_with_class.freeze
+      @warn_files_in.freeze
+      @warn_files_not_in.freeze
+      @individual_selection.freeze
+      @exclusion.freeze
+      @inclusion.freeze
       @change_list.freeze
       super
     end

data/lib/adlint/util.rb

@@ -367,6 +367,12 @@ module AdLint #:nodoc:
       def execute(attr_owner)
         value = target_value(attr_owner)
 
+        if value.empty?
+          @errors.push("`#{qualified_attr_name(attr_owner)}' " +
+                       "is not specified.")
+          return false
+        end
+
         bad_exams = value.reject { |exam_package| exam_package.load }
 
         unless bad_exams.empty?

data/lib/adlint/version.rb

@@ -32,11 +32,11 @@
 module AdLint #:nodoc:
 
   MAJOR_VERSION = 2
-  MINOR_VERSION = 2
+  MINOR_VERSION = 4
   PATCH_VERSION = 0
-  RELEASE_DATE  = "2012-09-12"
+  RELEASE_DATE  = "2012-09-21"
 
-  TRAITS_SCHEMA_VERSION = "2.0.0"
+  TRAITS_SCHEMA_VERSION = "2.4.0"
 
   SHORT_VERSION = "#{MAJOR_VERSION}.#{MINOR_VERSION}.#{PATCH_VERSION}"
 

data/share/doc/developers_guide_ja.html

@@ -1,8 +1,8 @@
 <html lang="ja">
 <head>
-<title>AdLint 2.2.0 開発者ガイド</title>
+<title>AdLint 2.4.0 開発者ガイド</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="description" content="AdLint 2.2.0 開発者ガイド">
+<meta name="description" content="AdLint 2.4.0 開発者ガイド">
 <meta name="generator" content="makeinfo 4.13">
 <link title="Top" rel="top" href="#Top">
 <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
@@ -44,7 +44,7 @@ td { border: 1px solid black; }
 --></style>
 </head>
 <body>
-<h1 class="settitle">AdLint 2.2.0 開発者ガイド</h1>
+<h1 class="settitle">AdLint 2.4.0 開発者ガイド</h1>
 <div class="contents">
 <h2>Table of Contents</h2>
 <ul>

data/share/doc/developers_guide_ja.texi

@@ -2,7 +2,7 @@
 @setfilename developers_guide_ja.info
 @documentlanguage ja
 @documentencoding utf-8
-@settitle AdLint 2.2.0 開発者ガイド
+@settitle AdLint 2.4.0 開発者ガイド
 
 @copying
 Copyright (C) 2010-2012, OGIS-RI Co.,Ltd.