adlint 2.6.14 → 3.0.0

data/features/code_check/W9003.feature

@@ -163,6 +163,7 @@ Feature: W9003
       | W0286 | 5    | 5      |
       | W0031 | 3    | 13     |
       | W0104 | 3    | 13     |
+      | W0070 | 1    | 1      |
       | W0628 | 3    | 5      |
 
   Scenario: explicit conversion of size_t value
@@ -181,6 +182,7 @@ Feature: W9003
       | W0117 | 3    | 5      |
       | W0031 | 3    | 13     |
       | W0104 | 3    | 13     |
+      | W0070 | 1    | 1      |
       | W0628 | 3    | 5      |
 
   Scenario: implicit conversion to void pointer

data/features/step_definitions/code_check_steps.rb

@@ -8,6 +8,7 @@ When /^I successfully run `(.*)` on noarch$/ do |abbrev_cmd|
 end
 
 Then /^the output should exactly match with:$/ do |mesg_table|
+  $all_output.lines.to_a.size.should == mesg_table.hashes.size
   $all_output.each_line.zip(mesg_table.hashes).each do |line, row|
     if row
       line.should =~ /#{row[:line]}:#{row[:column]}:.*:.*:#{row[:mesg]}/

data/features/support/env.rb

@@ -1,5 +1,5 @@
 NOARCH_TRAITS = <<EOF
-version: "2.4.0"
+version: "3.0.0"
 
 exam_packages:
   - "c_builtin"
@@ -7,8 +7,12 @@ exam_packages:
 project_traits:
   project_name: "features"
   project_root: "."
-  include_path:
+  target_files:
+    inclusion_paths:
+      - "."
+    exclusion_paths:
   initial_header: "empty_pinit.h"
+  file_search_paths:
   coding_style:
     indent_style: "K&R"
     tab_width: 8
@@ -17,7 +21,9 @@ project_traits:
 
 compiler_traits:
   initial_header: "empty_cinit.h"
-  standard_type:
+  file_search_paths:
+    - "."
+  standard_types:
     char_size: 8
     char_alignment: 8
     short_size: 16
@@ -39,11 +45,10 @@ compiler_traits:
     data_ptr_size: 32
     data_ptr_alignment: 32
     char_as_unsigned_char: true
-  include_path:
-    - "."
   arithmetic:
     logical_right_shift: true
-  extension_substitution:
+  identifier_max: 128
+  extension_substitutions:
     "pascal": ""
     "__pascal": ""
     "fortran": ""
@@ -58,12 +63,11 @@ compiler_traits:
     "__huge": ""
     "__extension__": ""
     "__attribute__(__adlint__any)": ""
-  arbitrary_substitution:
+  arbitrary_substitutions:
     "typeof": "__typeof__"
     "__typeof": "__typeof__"
     "alignof": "__alignof__"
     "__alignof": "__alignof__"
-  identifier_max: 128
 
 linker_traits:
   identifier_max: 128
@@ -71,10 +75,7 @@ linker_traits:
 
 message_traits:
   language: "ja_JP"
-  message_with_class: false
-  warn_files_in:
-  warn_files_not_in:
-  individual_selection: true
+  individual_suppression: true
   exclusion:
   inclusion:
   change_list:
@@ -137,11 +138,13 @@ module Kernel
   end
 end
 
+EXCL_FILES = /_pinit\.h|_cinit\.h|stdio\.h|math\.h|assert\.h|stddef\.h/
+
 def run_adlint(cmd, *args)
   create_adlint_files
   cd_to_tmpdir do
     $all_output = exec(cmd, *args).each_line.map { |line|
-      if line =~ /_pinit\.h|_cinit\.h|stdio\.h|math\.h|assert\.h|stddef\.h/
+      if line =~ /#{EXCL_FILES}.*:warning/
         nil
       else
         line.chomp

data/lib/adlint.rb

@@ -1,7 +1,7 @@
 # AdLint package loader.
 #
 # Author::    Yutaka Yanoh <mailto:yanoh@users.sourceforge.net>
-# Copyright:: Copyright (C) 2010-2012, OGIS-RI Co.,Ltd.
+# Copyright:: Copyright (C) 2010-2013, OGIS-RI Co.,Ltd.
 # License::   GPLv3+: GNU General Public License version 3 or later
 #
 # Owner::     Yutaka Yanoh <mailto:yanoh@users.sourceforge.net>
@@ -11,7 +11,7 @@
 #    /   |  / _  |/ /   / / | / /__  __/           Source Code Static Analyzer
 #   / /| | / / / / /   / /  |/ /  / /                   AdLint - Advanced Lint
 #  / __  |/ /_/ / /___/ / /|  /  / /
-# /_/  |_|_____/_____/_/_/ |_/  /_/   Copyright (C) 2010-2012, OGIS-RI Co.,Ltd.
+# /_/  |_|_____/_____/_/_/ |_/  /_/   Copyright (C) 2010-2013, OGIS-RI Co.,Ltd.
 #
 # This file is part of AdLint.
 #
@@ -38,12 +38,13 @@ require "psych"
 require "yaml"
 require "strscan"
 require "stringio"
-require "singleton"
 require "forwardable"
 require "logger"
 
+require "adlint/memo"
 require "adlint/prelude"
 require "adlint/analyzer"
+require "adlint/annot"
 require "adlint/code"
 require "adlint/exam"
 require "adlint/traits"
@@ -57,13 +58,15 @@ require "adlint/monitor"
 require "adlint/phase"
 require "adlint/report"
 require "adlint/source"
+require "adlint/supp"
 require "adlint/symbol"
+require "adlint/location"
 require "adlint/token"
 require "adlint/util"
 require "adlint/version"
 
 require "adlint/cpp"
-require "adlint/c"
+require "adlint/cc1"
 require "adlint/ld"
 
 module AdLint #:nodoc:

data/lib/adlint/analyzer.rb

@@ -1,7 +1,7 @@
 # Analyzer classes.
 #
 # Author::    Yutaka Yanoh <mailto:yanoh@users.sourceforge.net>
-# Copyright:: Copyright (C) 2010-2012, OGIS-RI Co.,Ltd.
+# Copyright:: Copyright (C) 2010-2013, OGIS-RI Co.,Ltd.
 # License::   GPLv3+: GNU General Public License version 3 or later
 #
 # Owner::     Yutaka Yanoh <mailto:yanoh@users.sourceforge.net>
@@ -11,7 +11,7 @@
 #    /   |  / _  |/ /   / / | / /__  __/           Source Code Static Analyzer
 #   / /| | / / / / /   / /  |/ /  / /                   AdLint - Advanced Lint
 #  / __  |/ /_/ / /___/ / /|  /  / /
-# /_/  |_|_____/_____/_/_/ |_/  /_/   Copyright (C) 2010-2012, OGIS-RI Co.,Ltd.
+# /_/  |_|_____/_____/_/_/ |_/  /_/   Copyright (C) 2010-2013, OGIS-RI Co.,Ltd.
 #
 # This file is part of AdLint.
 #
@@ -36,274 +36,248 @@ require "adlint/metric"
 require "adlint/phase"
 require "adlint/lang"
 require "adlint/source"
+require "adlint/supp"
 require "adlint/symbol"
 require "adlint/monitor"
+require "adlint/util"
 require "adlint/ld/phase"
 
 module AdLint #:nodoc:
 
   class Analyzer
-    def self.current
-      @@current
+    def initialize(name, traits, msg_catalog, target_name, output_dpath,
+                   log_basename, verbose)
+      @name            = name
+      @traits          = traits
+      @message_catalog = msg_catalog
+      @target_name     = target_name
+      @output_dpath    = output_dpath
+      @log_basename    = log_basename
+      @verbose         = verbose
+      @logger          = nil
     end
 
-    def self.current=(analyzer)
-      @@current = analyzer
-    end
-
-    def initialize(name, log_base_fpath, output_dpath = nil)
-      @name = name
-      @log_base_fpath = log_base_fpath
-      @output_dpath = output_dpath
-    end
+    attr_reader :traits
+    attr_reader :message_catalog
+    attr_reader :logger
 
     def run
       File.open(log_fpath, "w") do |log_io|
-        @logger = Logger.new(log_io)
-        @logger.progname = @name
-        @logger.datetime_format = "%F %T "
+        @logger = Logger.new(log_io).tap { |logger|
+          logger.progname = @name
+          logger.datetime_format = "%F %T "
+        }
         begin
-          Analyzer.current = self
           log_start_analysis
-          execute
+          execute(ProgressMonitor.new(@target_name, phases.size, @verbose))
         rescue => ex
-          fatal(ex)
+          @logger.fatal(ex)
           return false
-        ensure
-          Analyzer.current = nil
         end
       end
       true
     end
 
-    extend Forwardable
-
-    def_delegator :@logger, :fatal
-    def_delegator :@logger, :error
-    def_delegator :@logger, :warn
-    def_delegator :@logger, :info
-    def_delegator :@logger, :debug
-
     private
-    def execute
+    def execute(monitor)
+      subclass_responsibility
+    end
+
+    def phases
       subclass_responsibility
     end
 
     def log_fpath
-      if @output_dpath
-        @output_dpath.join(@log_base_fpath).add_ext(".log")
-      else
-        @log_base_fpath.add_ext(".log")
-      end
+      log_fname = @log_basename.add_ext(".log")
+      @output_dpath ? @output_dpath.join(log_fname) : log_fname
     end
 
     def log_start_analysis
-      exam_versions = Traits.instance.exam_packages.map { |exam_package|
-        exam_package.catalog
-      }.map { |catalog| "#{catalog.name}-#{catalog.short_version}" }
+      exam_vers = @traits.exam_packages.map { |exam_pkg|
+        exam_pkg.catalog
+      }.map { |exam_cat| "#{exam_cat.name}-#{exam_cat.short_version}" }
 
-      mesg = "start analysis by adlint-#{SHORT_VERSION} with "
-      if exam_versions.size < 3
-        mesg += exam_versions.join(" and ")
+      msg = "start analysis by adlint-#{SHORT_VERSION} with "
+      if exam_vers.size < 3
+        msg += exam_vers.join(" and ")
       else
-        mesg += exam_versions[0..-2].join(", ") + " and " + exam_versions.last
+        msg += exam_vers[0..-2].join(", ") + " and " + exam_vers.last
       end
 
-      info("#{mesg}.")
+      @logger.info("#{msg}.")
     end
   end
 
   # == Single module analysis driver.
   class SingleModuleAnalyzer < Analyzer
-    def initialize(fpath, strip_num = 0, output_dpath = nil)
-      super("SMA-#{SHORT_VERSION}", fpath.strip(strip_num), output_dpath)
-
-      @fpath = fpath
+    def initialize(traits, msg_catalog, src_fpath, strip_num, output_dpath,
+                   verbose)
+      super("SMA-#{SHORT_VERSION}", traits, msg_catalog, src_fpath.to_s,
+            output_dpath, src_fpath.strip(strip_num), verbose)
+      @src_fpath = src_fpath
       @strip_num = strip_num
     end
 
     private
-    def execute
-      lang = Language.of(@fpath)
-      return unless lang
-
-      ProgressMonitor.instance.reset(@fpath, lang.single_module_phases.size)
-
-      Report.new(msg_fpath, met_fpath) do |report|
-        context = PhaseContext.new(report, log_fpath)
+    def execute(monitor)
+      Report.new(msg_fpath, met_fpath, log_fpath, @verbose) do |report|
+        src = Source.new(@src_fpath, @traits.of_project.file_encoding)
 
-        context[:sources] = [Source.new(@fpath)]
-        context[:symbol_table] = SymbolTable.new
+        phase_ctxt = PhaseContext.new(self, report, monitor)
+        phase_ctxt[:sources]      = [src]
+        phase_ctxt[:annotations]  = []
+        phase_ctxt[:suppressors]  = MessageSuppressorSet.new
+        phase_ctxt[:symbol_table] = SymbolTable.new
 
         begin
-          lang.single_module_phases.each do |phase_class|
-            phase_class.new(context).execute
-          end
+          phases.each { |phase| phase.new(phase_ctxt).execute }
+          phase_ctxt.flush_deferred_report!
         ensure
           File.open(i_fpath, "w") do |io|
             io.set_encoding(Encoding.default_external)
-            io.puts(context[:c_source].to_s)
+            io.puts(phase_ctxt[:cc1_source].to_s)
           end
         end
       end
     rescue
-      if verbose?
-        $stderr.puts "An error was occurred while processing `#{@fpath}'."
+      if @verbose
+        $stderr.puts "An error was occurred while processing `#{@src_fpath}'."
         $stderr.puts "See `#{msg_fpath}' and `#{log_fpath}' for more details."
       end
       raise
     end
 
+    def phases
+      (lang = Language.of(@src_fpath)) ? lang.single_module_phases : []
+    end
+
     def msg_fpath
-      if @output_dpath
-        @output_dpath.join(@fpath.strip(@strip_num)).add_ext(".msg.csv")
-      else
-        @fpath.strip(@strip_num).add_ext(".msg.csv")
-      end
+      msg_fname = @src_fpath.strip(@strip_num).add_ext(".msg.csv")
+      @output_dpath ? @output_dpath.join(msg_fname) : msg_fname
     end
 
     def met_fpath
-      if @output_dpath
-        @output_dpath.join(@fpath.strip(@strip_num)).add_ext(".met.csv")
-      else
-        @fpath.strip(@strip_num).add_ext(".met.csv")
-      end
+      met_fname = @src_fpath.strip(@strip_num).add_ext(".met.csv")
+      @output_dpath ? @output_dpath.join(met_fname) : met_fname
     end
 
     def i_fpath
-      if @output_dpath
-        @output_dpath.join(@fpath.strip(@strip_num)).sub_ext(".i")
-      else
-        @fpath.strip(@strip_num).sub_ext(".i")
-      end
+      i_fname = @src_fpath.strip(@strip_num).sub_ext(".i")
+      @output_dpath ? @output_dpath.join(i_fname) : i_fname
     end
   end
 
   class CrossModuleAnalyzer < Analyzer
-    def initialize(fpaths, output_dpath = nil)
-      @project_name = Traits.instance.of_project.project_name
-      super("CMA-#{SHORT_VERSION}", Pathname.new(@project_name), output_dpath)
-
-      @fpaths = fpaths
+    def initialize(traits, msg_catalog, met_fpaths, output_dpath, verbose)
+      proj_name = traits.of_project.project_name
+      super("CMA-#{SHORT_VERSION}", traits, msg_catalog, proj_name,
+            output_dpath, Pathname.new(proj_name), verbose)
+      @met_fpaths = met_fpaths
     end
 
     private
-    PHASE_CLASSES = [
-      AdLint::Ld::MapTypedefPhase,
-      AdLint::Ld::MapFunctionPhase,
-      AdLint::Ld::MapVariablePhase,
-      AdLint::Ld::LinkFunctionPhase,
-      AdLint::Ld::LinkVariablePhase,
-      AdLint::Ld::PreparePhase,
-      AdLint::Ld::TypedefReviewPhase,
-      AdLint::Ld::FunctionReviewPhase,
-      AdLint::Ld::VariableReviewPhase,
-      AdLint::Ld::ExaminationPhase
-    ].freeze
-    private_constant :PHASE_CLASSES
-
-    def execute
-      ProgressMonitor.instance.reset(@project_name, PHASE_CLASSES.size)
-
-      Report.new(msg_fpath, met_fpath) do |report|
-        context = PhaseContext.new(report, log_fpath)
-
-        context[:project_name] = @project_name
-        context[:metric_fpaths] = @fpaths
-
-        PHASE_CLASSES.each do |phase_class|
-          phase_class.new(context).execute
-        end
+    def execute(monitor)
+      Report.new(msg_fpath, met_fpath, log_fpath, @verbose) do |report|
+        phase_ctxt = PhaseContext.new(self, report, monitor)
+        phase_ctxt[:metric_fpaths] = @met_fpaths
+        phase_ctxt[:annotations]   = []
+        phase_ctxt[:suppressors]   = MessageSuppressorSet.new
+
+        phases.each { |phase| phase.new(phase_ctxt).execute }
+        phase_ctxt.flush_deferred_report!
       end
     rescue
-      if verbose?
-        $stderr.puts "An error was occurred while executing " +
-          "cross module analysis."
+      if @verbose
+        $stderr.puts "Error was occurred in cross module analysis."
         $stderr.puts "See `#{log_fpath}' for more details."
       end
       raise
     end
 
+    def phases
+      [
+        Ld::MapTypedefPhase,
+        Ld::MapFunctionPhase,
+        Ld::MapVariablePhase,
+        Ld::LinkFunctionPhase,
+        Ld::LinkVariablePhase,
+        Ld::PreparePhase,
+        Ld::TypedefReviewPhase,
+        Ld::FunctionReviewPhase,
+        Ld::VariableReviewPhase,
+        Ld::ExaminationPhase
+      ]
+    end
+
     def msg_fpath
-      if @output_dpath
-        @output_dpath.join(Pathname.new(@project_name)).add_ext(".msg.csv")
-      else
-        Pathname.new(@project_name).add_ext(".msg.csv")
-      end
+      proj_name = @traits.of_project.project_name
+      msg_fname = Pathname.new(proj_name).add_ext(".msg.csv")
+      @output_dpath ? @output_dpath.join(msg_fname) : msg_fname
     end
 
     def met_fpath
-      if @output_dpath
-        @output_dpath.join(Pathname.new(@project_name)).add_ext(".met.csv")
-      else
-        Pathname.new(@project_name).add_ext(".met.csv")
-      end
+      proj_name = @traits.of_project.project_name
+      met_fname = Pathname.new(proj_name).add_ext(".met.csv")
+      @output_dpath ? @output_dpath.join(met_fname) : met_fname
     end
   end
 
   # == Configuration files validator.
   class ConfigurationValidator < Analyzer
-    def initialize(fpath, strip_num = 0, output_dpath = nil)
-      super("CHK-#{SHORT_VERSION}", fpath.strip(strip_num), output_dpath)
-
-      @fpath = fpath
+    def initialize(traits, msg_catalog, src_fpath, strip_num, output_dpath,
+                   verbose)
+      super("CHK-#{SHORT_VERSION}", traits, msg_catalog, src_fpath.to_s,
+            output_dpath, src_fpath.strip(strip_num), verbose)
+      @src_fpath = src_fpath
       @strip_num = strip_num
     end
 
     private
-    def execute
-      lang = Language.of(@fpath)
-      return unless lang
-
-      ProgressMonitor.instance.reset(@fpath, lang.check_phases.size)
+    def execute(monitor)
+      Report.new(msg_fpath, met_fpath, log_fpath, @verbose) do |report|
+        src = Source.new(@src_fpath, @traits.of_project.file_encoding)
 
-      Report.new(msg_fpath, met_fpath) do |report|
-        context = PhaseContext.new(report, log_fpath)
-
-        context[:sources] = [Source.new(@fpath)]
-        context[:symbol_table] = SymbolTable.new
+        phase_ctxt = PhaseContext.new(self, report, monitor)
+        phase_ctxt[:sources]      = [src]
+        phase_ctxt[:annotations]  = []
+        phase_ctxt[:suppressors]  = MessageSuppressorSet.new
+        phase_ctxt[:symbol_table] = SymbolTable.new
 
         begin
-          lang.check_phases.each do |phase_class|
-            phase_class.new(context).execute
-          end
+          phases.each { |phase| phase.new(phase_ctxt).execute }
+          phase_ctxt.flush_deferred_report!
         ensure
           File.open(i_fpath, "w") do |io|
             io.set_encoding(Encoding.default_external)
-            io.puts(context[:c_source].to_s)
+            io.puts(phase_ctxt[:cc1_source].to_s)
           end
         end
       end
     rescue
-      if verbose?
-        $stderr.puts "An error was occurred while processing `#{@fpath}'."
+      if @verbose
+        $stderr.puts "An error was occurred while processing `#{@src_fpath}'."
         $stderr.puts "See `#{msg_fpath}' and `#{log_fpath}' for more details."
       end
       raise
     end
 
+    def phases
+      (lang = Language.of(@src_fpath)) ? lang.check_phases : []
+    end
+
     def msg_fpath
-      if @output_dpath
-        @output_dpath.join(@fpath.strip(@strip_num)).add_ext(".msg.csv")
-      else
-        @fpath.strip(@strip_num).add_ext(".msg.csv")
-      end
+      msg_fname = @src_fpath.strip(@strip_num).add_ext(".msg.csv")
+      @output_dpath ? @output_dpath.join(msg_fname) : msg_fname
     end
 
     def met_fpath
-      if @output_dpath
-        @output_dpath.join(@fpath.strip(@strip_num)).add_ext(".met.csv")
-      else
-        @fpath.strip(@strip_num).add_ext(".met.csv")
-      end
+      met_fname = @fpath.strip(@strip_num).add_ext(".met.csv")
+      @output_dpath ? @output_dpath.join(met_fname) : met_fname
     end
 
     def i_fpath
-      if @output_dpath
-        @output_dpath.join(@fpath.strip(@strip_num)).sub_ext(".i")
-      else
-        @fpath.strip(@strip_num).sub_ext(".i")
-      end
+      i_fname = @fpath.strip(@strip_num).sub_ext(".i")
+      @output_dpath ? @output_dpath.join(i_fname) : i_fname
     end
   end