adlint-exam-c_staging 0.2.0 → 0.3.0

data/AUTHORS

@@ -3,7 +3,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.
 

data/ChangeLog

@@ -1,3 +1,18 @@
+Wed Mar 27 16:48:24 2013  Yutaka Yanoh  <yanoh@users.sourceforge.net>
+
+	* release.ga : 0.3.0
+	  - Correct to run with AdLint 3.0.0 or later.
+
+Thu Jan 17 14:24:37 2013  Yutaka Yanoh  <yanoh@users.sourceforge.net>
+
+	* release.rc : 0.2.1
+	  - Correct to run with AdLint 2.7.4 or later.
+
+Thu Jan 17 14:11:30 2013  Yutaka Yanoh  <yanoh@users.sourceforge.net>
+
+	* lib/adlint/exam/c_staging/cpp_check.rb : Correct to run with AdLint
+	  2.7.4 or later.
+
 Fri Sep 21 16:48:06 2012  Yutaka Yanoh  <yanoh@users.sourceforge.net>
 
 	* release.ga : 0.2.0

data/INSTALL

@@ -3,7 +3,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.
 

data/NEWS

@@ -3,7 +3,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.
 
@@ -21,6 +21,10 @@
 
 ++
 
+=== adlint-exam-c_staging 0.3.0 is released (2013-03-27)
+
+* Correct to run with AdLint 3.0.0 or later
+
 === adlint-exam-c_staging 0.2.0 is released (2012-09-21)
 
 ==== Including source code examination features

data/README

@@ -3,7 +3,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,7 +36,7 @@ for \AdLint.
 
 == License
 
-Copyright (C) 2010-2012, {OGIS-RI}[http://www.ogis-ri.co.jp/] Co.,Ltd.
+Copyright (C) 2010-2013, {OGIS-RI}[http://www.ogis-ri.co.jp/] Co.,Ltd.
 
 \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

data/Rakefile

@@ -3,7 +3,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.
 #
@@ -58,7 +58,7 @@ EOS
   s.extra_rdoc_files = %w(README)
   s.rdoc_options     = ["--main", "README", "--charset", "utf-8"]
 
-  s.add_dependency("adlint", ">= 2.3.0")
+  s.add_dependency("adlint", ">= 3.0.0")
 end
 
 Gem::PackageTask.new(gemspec) do |pkg|

data/TODO

@@ -3,7 +3,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.
 

data/etc/mesg.d/c_staging/en_US/messages.yml

@@ -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.
 #
 # This file is part of AdLint.
 #
@@ -39,7 +39,7 @@
 #         - "PRT:B20"
 #       format: "Your custom message for the warning of W9999."
 
-version: "0.2.0"
+version: "0.3.0"
 
 message_definition:
   W2001:

data/etc/mesg.d/c_staging/ja_JP/messages.yml

@@ -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.
 #
 # This file is part of AdLint.
 #
@@ -39,7 +39,7 @@
 #         - "PRT:B20"
 #       format: "Your custom message for the warning of W9999."
 
-version: "0.2.0"
+version: "0.3.0"
 
 message_definition:
   W2001:

data/features/support/env.rb

@@ -1,5 +1,5 @@
 NOARCH_TRAITS = <<EOF
-version: "2.4.0"
+version: "3.0.0"
 
 exam_packages:
   - "c_staging"
@@ -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,11 +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:
@@ -114,7 +114,19 @@ DUMMY_ASSERT_H = <<EOF
 #endif
 EOF
 
-require "pathname"
+DUMMY_STDDEF_H = <<EOF
+#if !defined(DUMMY_STDDEF_H)
+#define DUMMY_STDDEF_H
+
+typedef unsigned long size_t;
+
+#endif
+EOF
+
+require "adlint"
+
+$tmpdir = File.expand_path("../../cucumber-tmp", File.dirname(__FILE__))
+$:.unshift(File.expand_path("../../lib", File.dirname(__FILE__)))
 
 if ENV["ADLINT_COV"] =~ /1|on|true/
   require "simplecov"
@@ -122,23 +134,13 @@ if ENV["ADLINT_COV"] =~ /1|on|true/
   SimpleCov.start
 end
 
-$envdir = Pathname.new(__FILE__).realpath.dirname
-$prefix = Pathname.new("../..").expand_path($envdir)
-$bindir = Pathname.new("bin").expand_path($prefix)
-$libdir = Pathname.new("lib").expand_path($prefix)
-$tmpdir = Pathname.new("cucumber-tmp").expand_path($prefix)
-
-module Kernel
-  def exit(status)
-    # NOTE: To avoid terminating cucumber process.
-  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/
+      if line =~ /#{EXCL_FILES}.*:warning/
         nil
       else
         line.chomp
@@ -156,9 +158,21 @@ ensure
   Dir.chdir(orig_wd)
 end
 
+$noarch_traits_fname = Pathname.new("noarch_traits.yml")
+
 def exec(cmd, *args)
-  ENV["RUBYLIB"] = "#{$libdir}:#{ENV["RUBYLIB"]}"
-  system "#{cmd} #{args.join(" ")} 2>&1 >all_output"
+  orig_stdout = $stdout.dup
+  orig_stderr = $stderr.dup
+  File.open("all_output", "w") do |io|
+    $stdout.reopen(io)
+    $stderr.reopen(io)
+    adlint = AdLint::AdLint.new($noarch_traits_fname, Pathname.new("."), false)
+    adlint.run_sma!(Pathname.new(args.first), 0)
+    $stdout.flush
+    $stderr.flush
+  end
+  $stdout.reopen(orig_stdout)
+  $stderr.reopen(orig_stderr)
   File.read("all_output")
 end
 
@@ -168,12 +182,13 @@ end
 
 def create_adlint_files
   cd_to_tmpdir do
-    create_file("noarch_traits.yml", NOARCH_TRAITS)
+    create_file($noarch_traits_fname, NOARCH_TRAITS)
     create_file("empty_pinit.h")
     create_file("empty_cinit.h")
     create_file("stdio.h", DUMMY_STDIO_H)
     create_file("math.h", DUMMY_MATH_H)
     create_file("assert.h", DUMMY_ASSERT_H)
+    create_file("stddef.h", DUMMY_STDDEF_H)
   end
 end
 

data/lib/adlint/exam/c_staging.rb

@@ -1,7 +1,7 @@
 # Examination loader of adlint-exam-c_staging package.
 #
 # 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.
 #
@@ -41,9 +41,9 @@ module CStaging #:nodoc:
     cat.name = "c_staging"
 
     cat.major_version = 0
-    cat.minor_version = 2
+    cat.minor_version = 3
     cat.patch_version = 0
-    cat.release_date  = "2012-09-21"
+    cat.release_date  = "2013-03-27"
 
     cat.examination_classes = [
       W2001,

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

@@ -1,7 +1,7 @@
 # Code checkings (cpp-phase) of adlint-exam-c_staging package.
 #
 # 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.
 #
@@ -47,7 +47,7 @@ module CStaging #:nodoc:
     def check(include_line, *)
       header_name = include_line.header_name
       if Pathname.new(header_name.value.gsub(/["<>]/, "")).absolute?
-        W(:W2001, include_line.location, include_line.fpath)
+        W(include_line.location, include_line.fpath)
       end
     end
   end
@@ -59,16 +59,13 @@ module CStaging #:nodoc:
       super
       interp = context[:cpp_interpreter]
       interp.on_system_header_included += method(:check)
-      @project_root = Traits.instance.of_project.project_root.realpath
+      @project_root = traits.of_project.project_root
     end
 
     private
     def check(include_line, *)
-      include_line.fpath.realpath.descend do |path|
-        if path == @project_root
-          W(:W2002, include_line.location, include_line.fpath)
-          break
-        end
+      if include_line.fpath.under?(traits.of_project.project_root)
+        W(include_line.location, include_line.fpath)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adlint-exam-c_staging
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-21 00:00:00.000000000 Z
+date: 2013-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: adlint
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 3.0.0
 description: ! 'Experimental C language code examination package for AdLint
 
 '
@@ -78,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Experimental C language code examination package for AdLint