adlint 2.6.14 → 3.0.0

data/bin/adlint_cma

@@ -3,7 +3,7 @@
 # Cross module analyzer.
 #
 # 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>
@@ -13,7 +13,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.
 #
@@ -53,7 +53,7 @@ EOS
 
 require "getoptlong"
 
-parser = GetoptLong.new(
+getopt = GetoptLong.new(
   ["--traits",     "-t", GetoptLong::REQUIRED_ARGUMENT],
   ["--output-dir", "-o", GetoptLong::REQUIRED_ARGUMENT],
   ["--verbose",    "-v", GetoptLong::NO_ARGUMENT],
@@ -68,12 +68,12 @@ begin
   output_dpath = nil
   verbose      = false
 
-  parser.each_option do |option, value|
-    case option
+  getopt.each_option do |opt_name, opt_val|
+    case opt_name
     when "--traits"
-      traits_fpath = Pathname.new(value)
+      traits_fpath = Pathname.new(opt_val)
     when "--output-dir"
-      output_dpath = Pathname.new(value)
+      output_dpath = Pathname.new(opt_val)
     when "--verbose"
       verbose = true
     when "--version"
@@ -95,9 +95,9 @@ rescue
   exit 1
 end
 
-fpaths = ARGV.map { |str| Pathname.new(str) }
+input_fpaths = ARGV.map { |str| Pathname.new(str) }
 
-if fpaths.empty?
+if input_fpaths.empty?
   $stderr.puts "#{File.basename(__FILE__)}: no input files"
   $stderr.puts usage
   exit 1
@@ -109,8 +109,13 @@ unless traits_fpath
   exit 1
 end
 
-AdLint.setup(File.basename(__FILE__), traits_fpath, verbose)
-
-AdLint.cma(fpaths, output_dpath)
+begin
+  adlint = AdLint::AdLint.new(traits_fpath, output_dpath, verbose)
+  adlint.run_cma!(input_fpaths) or exit 5
+rescue => ex
+  $stderr.puts ex.message, ex.backtrace
+  $stderr.puts
+  exit 2
+end
 
 exit 0

data/bin/adlint_sma

@@ -3,7 +3,7 @@
 # Single module analyzer.
 #
 # 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>
@@ -13,7 +13,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.
 #
@@ -56,7 +56,7 @@ EOS
 
 require "getoptlong"
 
-parser = GetoptLong.new(
+getopt = GetoptLong.new(
   ["--traits",     "-t", GetoptLong::REQUIRED_ARGUMENT],
   ["--output-dir", "-o", GetoptLong::REQUIRED_ARGUMENT],
   ["--strip",      "-p", GetoptLong::REQUIRED_ARGUMENT],
@@ -73,14 +73,14 @@ begin
   strip_num    = 0
   verbose      = false
 
-  parser.each_option do |option, value|
-    case option
+  getopt.each_option do |opt_name, opt_val|
+    case opt_name
     when "--traits"
-      traits_fpath = Pathname.new(value)
+      traits_fpath = Pathname.new(opt_val)
     when "--output-dir"
-      output_dpath = Pathname.new(value)
+      output_dpath = Pathname.new(opt_val)
     when "--strip"
-      strip_num = value.to_i
+      strip_num = opt_val.to_i
     when "--verbose"
       verbose = true
     when "--version"
@@ -102,9 +102,9 @@ rescue
   exit 1
 end
 
-fpaths = ARGV.map { |str| Pathname.new(str) }
+input_fpaths = ARGV.map { |str| Pathname.new(str) }
 
-if fpaths.empty?
+if input_fpaths.empty?
   $stderr.puts "#{File.basename(__FILE__)}: no input files"
   $stderr.puts usage
   exit 1
@@ -116,8 +116,18 @@ unless traits_fpath
   exit 1
 end
 
-AdLint.setup(File.basename(__FILE__), traits_fpath, verbose)
+begin
+  adlint = AdLint::AdLint.new(traits_fpath, output_dpath, verbose)
 
-AdLint.sma(fpaths, strip_num, output_dpath)
+  failed = false
+  input_fpaths.each do |fpath|
+    adlint.run_sma!(fpath, strip_num) or failed = true
+  end
+  exit 4 if failed
+rescue => ex
+  $stderr.puts ex.message, ex.backtrace
+  $stderr.puts
+  exit 2
+end
 
 exit 0

data/bin/adlintize

@@ -3,7 +3,7 @@
 # AdLint project generator.
 #
 # 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>
@@ -13,7 +13,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.
 #
@@ -73,8 +73,8 @@ def print_environments
       next
     end
 
-    traits_pattern = "#{AdLint::Config[:etcdir]}/conf.d/#{dirent}/traits-*.erb"
-    Dir.glob(traits_pattern).each do |traits_fpath|
+    traits_ptn = "#{AdLint::Config[:etcdir]}/conf.d/#{dirent}/traits-*.erb"
+    Dir.glob(traits_ptn).each do |traits_fpath|
       basename = File.basename(traits_fpath, ".erb")
       puts "#{dirent}-#{basename.sub(/\Atraits-/, "")}"
     end
@@ -93,8 +93,14 @@ def migrate_traits_schema(traits_fpath)
   case contents
   when /^version: "1\.0\.0"$/
     migrate_traits_schema_from_1_0_0(traits_fpath, contents)
+    contents = File.open(traits_fpath, "r:utf-8") { |io| io.read }
+    migrate_traits_schema_from_2_4_0(traits_fpath, contents)
   when /^version: "2\.0\.0"$/
     migrate_traits_schema_from_2_0_0(traits_fpath, contents)
+    contents = File.open(traits_fpath, "r:utf-8") { |io| io.read }
+    migrate_traits_schema_from_2_4_0(traits_fpath, contents)
+  when /^version: "2\.4\.0"$/
+    migrate_traits_schema_from_2_4_0(traits_fpath, contents)
   else
     $stderr.puts "nothing to be done"
   end
@@ -247,6 +253,81 @@ EOS
   end
 end
 
+# TODO: Refine this ad-hoc schema migration.
+def migrate_traits_schema_from_2_4_0(traits_fpath, contents)
+  File.open(traits_fpath, "w:utf-8") do |io|
+    in_warn_files_in = in_warn_files_not_in = false
+
+    io.puts "# Traits file migrated by adlintize #{AdLint::SHORT_VERSION}.", ""
+    contents.lines.map { |str| str.chomp }.each do |line|
+      case line
+      when /\Aversion:/
+        io.puts "version: \"3.0.0\"", ""
+      when /\Aproject_traits:/
+        io.puts <<EOS
+project_traits:
+
+  # Analysys target selection.
+  # Ex.
+  #   target_files:
+  #     inclusion_paths:
+  #       - "../foo"
+  #       - "../bar"
+  #     exclusion_paths:
+  #       - "../bar/baz"
+  target_files:
+    inclusion_paths:
+      - "#{vpath_from_traits_fpath(traits_fpath)}"
+    exclusion_paths:
+EOS
+      when /\A  include_path:/
+        io.puts <<EOS
+  # include_paths is obsolete
+
+  # include-file search paths.
+  # Ex.
+  #   file_search_paths:
+  #     - "include/foo"
+  #     - "../include/bar"
+  #     - "/opt/baz/include"
+  file_search_paths:
+EOS
+      when /\A  standard_type:/
+        io.puts "  standard_types:"
+      when /\A  extension_substitution:/
+        io.puts "  extension_substitutions:"
+      when /\A  arbitrary_substitution:/
+        io.puts "  arbitrary_substitutions:"
+      when /\A  individual_selection:/
+        io.puts "  individual_suppression:"
+      when /\A  (message_with_class:.*)\z/
+        io.puts <<EOS
+  # #{$1} is obsolete
+EOS
+      when /\A  warn_files_in:/
+        in_warn_files_in = true
+        io.puts <<EOS
+  # warn_files_in: is obsolete
+EOS
+      when /\A  warn_files_not_in:/
+        in_warn_files_not_in = true
+        io.puts <<EOS
+  # warn_files_not_in: is obsolete
+EOS
+      when ""
+        in_warn_files_in = in_warn_files_not_in = false
+        io.puts
+      else
+        if in_warn_files_in || in_warn_files_not_in
+          io.puts "  ##{line}"
+        else
+          io.puts line
+        end
+      end
+    end
+  end
+end
+
 def vpath_from_traits_fpath(traits_fpath)
   Pathname.pwd.relative_path_from(Pathname.new(traits_fpath.dirname).realpath)
 end
@@ -263,7 +344,7 @@ end
 
 require "getoptlong"
 
-parser = GetoptLong.new(
+getopt = GetoptLong.new(
   ["--traits",           "-t", GetoptLong::REQUIRED_ARGUMENT],
   ["--pinit-hdr",        "-p", GetoptLong::REQUIRED_ARGUMENT],
   ["--cinit-hdr",        "-c", GetoptLong::REQUIRED_ARGUMENT],
@@ -294,26 +375,26 @@ begin
   environment     = nil
   force_overwrite = false
 
-  parser.each do |option, value|
-    case option
+  getopt.each do |opt_name, opt_val|
+    case opt_name
     when "--traits"
-      traits_fpath = Pathname.new(value)
+      traits_fpath = Pathname.new(opt_val)
     when "--pinit-hdr"
-      pinit_fpath = Pathname.new(value)
+      pinit_fpath = Pathname.new(opt_val)
     when "--cinit-hdr"
-      cinit_fpath = Pathname.new(value)
+      cinit_fpath = Pathname.new(opt_val)
     when "--list-file"
-      list_fpath = Pathname.new(value)
+      list_fpath = Pathname.new(opt_val)
     when "--makefile"
-      make_fpath = Pathname.new(value)
+      make_fpath = Pathname.new(opt_val)
     when "--sh-script"
-      sh_fpath = Pathname.new(value)
+      sh_fpath = Pathname.new(opt_val)
     when "--bat-file"
-      bat_fpath = Pathname.new(value)
+      bat_fpath = Pathname.new(opt_val)
     when "--output-dir"
-      output_dpath = Pathname.new(value)
+      output_dpath = Pathname.new(opt_val)
     when "--environment"
-      environment = value
+      environment = opt_val
     when "--list-environment"
       print_environments
       exit 0
@@ -329,7 +410,7 @@ begin
       puts AdLint::Config[:prefix]
       exit 0
     when "--migrate"
-      migrate_traits_schema(Pathname.new(value))
+      migrate_traits_schema(Pathname.new(opt_val))
       exit 0
     when "--help"
       puts usage

data/etc/conf.d/fallback/cinit.erb

@@ -2,7 +2,7 @@
  *    /   |  / _  |/ /   / / | / /__  __/          Source Code Static Analyzer
  *   / /| | / / / / /   / /  |/ /  / /                  AdLint - Advanced Lint
  *  / __  |/ /_/ / /___/ / /|  /  / /
- * /_/  |_|_____/_____/_/_/ |_/  /_/  Copyright (C) 2010-2012, OGIS-RI Co.,Ltd.
+ * /_/  |_|_____/_____/_/_/ |_/  /_/  Copyright (C) 2010-2013, OGIS-RI Co.,Ltd.
  *
  * Compiler specific initial header file generated by adlintize <%= AdLint::SHORT_VERSION %>
  * at <%= Time.now %>.

data/etc/conf.d/fallback/traits.erb

@@ -2,7 +2,7 @@
 #    /   |  / _  |/ /   / / | / /__  __/           Source Code Static Analyzer
 #   / /| | / / / / /   / /  |/ /  / /                   AdLint - Advanced Lint
 #  / __  |/ /_/ / /___/ / /|  /  / /
-# /_/  |_|_____/_____/_/_/ |_/  /_/   Copyright (C) 2010-2012, OGIS-RI Co.,Ltd.
+# /_/  |_|_____/_____/_/_/ |_/  /_/   Copyright (C) 2010-2013, OGIS-RI Co.,Ltd.
 #
 # Traits file generated by adlintize <%= AdLint::SHORT_VERSION %> at <%= Time.now %>.
 
@@ -29,19 +29,32 @@ project_traits:
   # Project root directory.
   project_root: "<%= vpath %>"
 
-  # Project specific additional include paths.
+  # Analysys target selection.
   # Ex.
-  #   include_path:
-  #     - "include/foo"
-  #     - "../include/bar"
-  #     - "/opt/baz/include"
-  include_path:
+  #   target_files:
+  #     inclusion_paths:
+  #       - "../foo"
+  #       - "../bar"
+  #     exclusion_paths:
+  #       - "../bar/baz"
+  target_files:
+    inclusion_paths:
+      - "<%= vpath %>"
+    exclusion_paths:
 
   # Pathname of the project specific initial header file.
   # This header file is automatically included above the first line of the
   # target source file.
   initial_header: "<%= pinit_fpath.basename %>"
 
+  # Project specific additional include paths.
+  # Ex.
+  #   file_search_paths:
+  #     - "include/foo"
+  #     - "../include/bar"
+  #     - "/opt/baz/include"
+  file_search_paths:
+
   #
   # Project specific coding style section
   #
@@ -100,10 +113,17 @@ compiler_traits:
   # project specific initial header file.
   initial_header: "<%= cinit_fpath.basename %>"
 
+  # Compiler specific include paths.
+  # Ex.
+  #   file_search_paths:
+  #     - "/usr/include"
+  #     - "/usr/local/include"
+  file_search_paths:
+
   #
   # Compiler specific standard type section
   #
-  standard_type:
+  standard_types:
 
     # Bit size of the `char' type family.
     char_size: 8
@@ -158,47 +178,40 @@ compiler_traits:
     # Treat the `char' type as same as the `unsigned char' type?
     char_as_unsigned_char: true
 
-  # Compiler specific include paths.
-  # Ex.
-  #   include_path:
-  #     - "/usr/include"
-  #     - "/usr/local/include"
-  include_path:
-
   # Treat the `>>' operator as a logical shift, not an arithmetic shift?
   arithmetic:
     logical_right_shift: true
 
+  # Max length of all symbols can be identified by the compiler.
+  identifier_max: 128
+
   # Token substitution setting to warn the use of compiler specific extensions.
   #
   # If your compiler supports `__attribute__(...)' extension and you want to
   # know the use of this extension, specify as below.
-  #   extension_substitution:
+  #   extension_substitutions:
   #     "__attribute__(__adlint__any)": ""
   # The token sequence consists of `__attribute__', `(', any kind of tokens,
   # `)' will be replaced with nothing (erased) after the preprocessing phase.
   # And this substitution will be warned by the message W0061.
-  extension_substitution:
+  extension_substitutions:
 
   # Token substitution setting to silently ignore the use of compiler specific
   # extensions.
   #
   # If your compiler supports `__asm__ volatile (...)' extension and you do not
   # mind the use of this extension, specify as below.
-  #   arbitrary_substitution:
+  #   arbitrary_substitutions:
   #     "__asm__ __adlint__any(__adlint__any)": ""
   # The token sequence consists of `__asm__', any kind of tokens, `(', any kind
   # of tokens, `)' will be replaced with nothing (erased) silently after the
   # preprocessing phase.
-  arbitrary_substitution:
+  arbitrary_substitutions:
     "typeof": "__typeof__"
     "__typeof": "__typeof__"
     "alignof": "__alignof__"
     "__alignof": "__alignof__"
 
-  # Max length of all symbols can be identified by the compiler.
-  identifier_max: 128
-
 #
 # Linker specific traits section
 #
@@ -220,21 +233,8 @@ message_traits:
   # Please help to translate the message catalog into your language.
   language: "<%= lang %>"
 
-  # Output messages with category and severity information?
-  message_with_class: false
-
-  # Warn only files in the specified directory.
-  # If omitted, all files including system headers will be warned.
-  warn_files_in:
-    - "<%= vpath %>"
-
-  # Don't warn files in the specified directory.
-  # You can specify 3rd-party library header directories imported in the
-  # project to suppress warnings about unconcerned headers.
-  warn_files_not_in:
-
-  # Enable translation-unit specific code check selection?
-  individual_selection: true
+  # Enable inline annotation based message suppression?
+  individual_suppression: true
 
   # Project-wide code check exclusion settings.
   # Ex.