adlint 2.0.10 → 2.2.0

data/ChangeLog

@@ -1,3 +1,63 @@
+Wed Sep 12 10:59:42 2012  Yutaka Yanoh  <yanoh@users.sourceforge.net>
+
+	* release.ga : 2.2.0
+	  - Fix W0431 and W0432 detections not to warn about displaced
+	    beginning of the line tokens following upon a function-like macro
+	    call.
+	  - Fix W0787 detection not to warn about a definition of the local
+	    variable with type which is different from one of previously
+	    defined variable in the other scope.
+	  - Clarify W0025 and W0026 message texts.
+
+Tue Sep 11 16:00:48 2012  Yutaka Yanoh  <yanoh@users.sourceforge.net>
+
+	* release.rc : 2.1.2
+	  - Clarify W0025 and W0026 message texts.
+
+Tue Sep 11 15:51:13 2012  Yutaka Yanoh  <yanoh@users.sourceforge.net>
+
+	* lib/adlint/exam/c_builtin/cpp_check.rb : Clarify W0025 and W0026
+	  message texts.
+	* etc/mesg.d/c_builtin/ja_JP/messages.yml : Ditto.
+	* etc/mesg.d/c_builtin/en_US/messages.yml : Ditto.
+	* share/doc/users_guide_ja.texi : Ditto.
+	* share/doc/users_guide_en.texi : Ditto.
+
+Tue Sep 11 15:09:15 2012  Yutaka Yanoh  <yanoh@users.sourceforge.net>
+
+	* release.rc : 2.1.1
+	  - Fix W0787 detection not to warn about a definition of the local
+	    variable with type which is different from one of previously
+	    defined variable in the other scope.
+
+Tue Sep 11 14:32:17 2012  Yutaka Yanoh  <yanoh@users.sourceforge.net>
+
+	* features/code_check/W0787.feature : Add W0787 specification.
+	* MANIFEST : Ditto.
+
+	* lib/adlint/exam/c_builtin/c_check.rb : Fix W0787 detection not to
+	  warn about a definition of the local variable with type which is
+	  different from one of previously defined variable in the other scope.
+
+Tue Sep 11 13:03:09 2012  Yutaka Yanoh  <yanoh@users.sourceforge.net>
+
+	* release.rc : 2.1.0
+	  - Fix W0431 and W0432 detections not to warn about displaced
+	    beginning of the line tokens following upon a function-like macro
+	    call.
+
+Tue Sep 11 11:26:05 2012  Yutaka Yanoh  <yanoh@users.sourceforge.net>
+
+	* features/code_check/W0431.feature : Add W0431 specification.
+	* features/code_check/W0432.feature : Add W0432 specification.
+	* MANIFEST : Add W0431 and W0432 specifications.
+
+	* lib/adlint/cpp/macro.rb : Fix function-like macro replacement in
+	  order to correctly locate substituted argument tokens.
+	* lib/adlint/exam/c_builtin/c_check.rb : Fix W0431 and W0432 detections
+	  not to warn about displaced beginning of the line tokens following
+	  upon a function-like macro call.
+
 Thu Sep  6 15:54:41 2012  Yutaka Yanoh  <yanoh@users.sourceforge.net>
 
 	* release.ga : 2.0.10

data/MANIFEST

@@ -182,6 +182,8 @@ features/code_check/W0251.feature
 features/code_check/W0252.feature
 features/code_check/W0253.feature
 features/code_check/W0254.feature
+features/code_check/W0431.feature
+features/code_check/W0432.feature
 features/code_check/W0477.feature
 features/code_check/W0478.feature
 features/code_check/W0479.feature
@@ -258,6 +260,7 @@ features/code_check/W0769.feature
 features/code_check/W0780.feature
 features/code_check/W0781.feature
 features/code_check/W0783.feature
+features/code_check/W0787.feature
 features/code_check/W0792.feature
 features/code_check/W0793.feature
 features/code_check/W0794.feature

data/NEWS

@@ -21,6 +21,21 @@
 
 ++
 
+=== \AdLint 2.2.0 is released (2012-09-12)
+
+==== Changes since the 2.0.10 release
+
+* Fix W0431 and W0432 detections not to warn about displaced beginning of the
+  line tokens following upon a function-like macro call
+* Fix W0787 detection not to warn about a definition of the local variable with
+  type which is different from one of previously defined variable in the other
+  scope
+* Clarify W0025 and W0026 message texts
+
+See the file
+{ChangeLog}[http://adlint.sourceforge.net/pmwiki/upload.d/Main/ChangeLog]
+for more details.
+
 === \AdLint 2.0.10 is released (2012-09-06)
 
 ==== Changes since the 2.0.6 release
@@ -29,10 +44,6 @@
   controlling variables in complexly compounded controlling expression
 * Support environment variable substitution in the traits file
 
-See the file
-{ChangeLog}[http://adlint.sourceforge.net/pmwiki/upload.d/Main/ChangeLog]
-for more details.
-
 === \AdLint 2.0.6 is released (2012-08-30)
 
 ==== Changes since the 2.0.2 release

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

@@ -49,7 +49,7 @@
 #         - "ERR:X99"
 #       format: "Your custom message for the error of E9999."
 
-version: "2.0.10"
+version: "2.2.0"
 
 message_definition:
   W0001:
@@ -107,11 +107,11 @@ message_definition:
   W0025:
     classes:
       - "UNC:X99"
-    format: "A file is already included by directly."
+    format: "`%s' is already included by this file directly."
   W0026:
     classes:
       - "UNC:X99"
-    format: "A file is already included by indirectly."
+    format: "`%s' is already included by this file indirectly."
   W0027:
     classes:
       - "UNC:X99"

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

@@ -49,7 +49,7 @@
 #         - "ERR:X99"
 #       format: "Your custom message for the error of E9999."
 
-version: "2.0.10"
+version: "2.2.0"
 
 message_definition:
   W0001:
@@ -107,11 +107,11 @@ message_definition:
   W0025:
     classes:
       - "UNC:X99"
-    format: "ファイルは、既にこのファイルから直接インクルードされています。"
+    format: "`%s' は、既にこのファイルから直接インクルードされています。"
   W0026:
     classes:
       - "UNC:X99"
-    format: "ファイルは、既にこのファイルから間接的にインクルードされています。"
+    format: "`%s' は、既にこのファイルから間接的にインクルードされています。"
   W0027:
     classes:
       - "UNC:X99"

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

@@ -49,7 +49,7 @@
 #         - "ERR:X99"
 #       format: "Your custom message for the error of E9999."
 
-version: "2.0.10"
+version: "2.2.0"
 
 message_definition:
   X0001:

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

@@ -49,7 +49,7 @@
 #         - "ERR:X99"
 #       format: "Your custom message for the error of E9999."
 
-version: "2.0.10"
+version: "2.2.0"
 
 message_definition:
   X0001:

data/features/code_check/W0431.feature

@@ -0,0 +1,41 @@
+Feature: W0431
+
+  W0431 detects that start of this line is more indented than previous lines of
+  the same indentation level.
+
+  Scenario: function-like macro replacement
+    Given a target source named "fixture.c" with:
+      """
+      extern int foo(int, int);
+
+      #define bar(a, b) ((a) > 0) ? (a) : (b)
+      #define baz(a, b) \
+          ((a) > 0) ?   \
+          (a) : (b)
+
+      void qux(void)
+      {
+          int i = 0;
+
+          i = foo(1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1,  /* OK */
+                  2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2); /* OK */
+          i = bar(1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1,  /* OK */
+                  2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2); /* OK */
+          i = baz(1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1,  /* OK */
+                  2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2); /* OK */
+      }
+      """
+    When I successfully run `adlint fixture.c` on noarch
+    Then the output should exactly match with:
+      | mesg  | line | column |
+      | W0442 | 3    | 1      |
+      | W0442 | 4    | 1      |
+      | W0118 | 1    | 12     |
+      | W0117 | 8    | 6      |
+      | W0609 | 14   | 9      |
+      | W0609 | 16   | 9      |
+      | W0443 | 3    | 1      |
+      | W0443 | 4    | 1      |
+      | W0628 | 8    | 6      |
+
+# vim:ts=2:sw=2:sts=2:et:

data/features/code_check/W0432.feature

@@ -0,0 +1,41 @@
+Feature: W0432
+
+  W0432 detects that indentation of this line does not match with the project's
+  indentation style.
+
+  Scenario: function-like macro replacement
+    Given a target source named "fixture.c" with:
+      """
+      extern int foo(int, int);
+
+      #define bar(a, b) ((a) > 0) ? (a) : (b)
+      #define baz(a, b) \
+          ((a) > 0) ?   \
+          (a) : (b)
+
+      void qux(void)
+      {
+          int i = 0;
+
+          i = foo(1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1,  /* OK */
+                  2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2); /* OK */
+          i = bar(1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1,  /* OK */
+                  2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2); /* OK */
+          i = baz(1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1,  /* OK */
+                  2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2); /* OK */
+      }
+      """
+    When I successfully run `adlint fixture.c` on noarch
+    Then the output should exactly match with:
+      | mesg  | line | column |
+      | W0442 | 3    | 1      |
+      | W0442 | 4    | 1      |
+      | W0118 | 1    | 12     |
+      | W0117 | 8    | 6      |
+      | W0609 | 14   | 9      |
+      | W0609 | 16   | 9      |
+      | W0443 | 3    | 1      |
+      | W0443 | 4    | 1      |
+      | W0628 | 8    | 6      |
+
+# vim:ts=2:sw=2:sts=2:et:

data/features/code_check/W0787.feature

@@ -0,0 +1,61 @@
+Feature: W0787
+
+  W0787 detects that a variable defined with a type which is different with one
+  of previously defined variable in the other scope.
+
+  Scenario: different types of local variables of the same name
+    Given a target source named "fixture.c" with:
+      """
+      int foo(void)
+      {
+          int retval = 0;
+          return retval;
+      }
+
+      long bar(void)
+      {
+          long retval = 0; /* OK */
+          return retval;
+      }
+      """
+    When I successfully run `adlint fixture.c` on noarch
+    Then the output should exactly match with:
+      | mesg  | line | column |
+      | W0117 | 1    | 5      |
+      | W0100 | 3    | 9      |
+      | W0117 | 7    | 6      |
+      | W0100 | 9    | 10     |
+      | W0628 | 1    | 5      |
+      | W0628 | 7    | 6      |
+
+  Scenario: different types of `extern' variables of the same name
+    Given a target source named "fixture.c" with:
+      """
+      void foo(void)
+      {
+          extern int retval;
+          retval = 0;
+      }
+
+      void bar(void)
+      {
+          extern long retval; /* W0787 */
+          retval = 0;
+      }
+      """
+    When I successfully run `adlint fixture.c` on noarch
+    Then the output should exactly match with:
+      | mesg  | line | column |
+      | W0117 | 1    | 6      |
+      | W0118 | 3    | 16     |
+      | W0623 | 3    | 16     |
+      | W0117 | 7    | 6      |
+      | W0118 | 9    | 17     |
+      | W0623 | 9    | 17     |
+      | W0787 | 9    | 17     |
+      | W0628 | 1    | 6      |
+      | W0628 | 7    | 6      |
+      | W1037 | 3    | 16     |
+      | W1037 | 9    | 17     |
+
+# vim:ts=2:sw=2:sts=2:et:

data/lib/adlint/c/ctrlexpr.rb

@@ -130,7 +130,7 @@ module C #:nodoc:
 
     def complexly_compounded?
       # NOTE: This method determines whether the controlling expression is too
-      #       complex to thinning value domains of controlling variables.
+      #       complex to thin value domains of controlling variables.
       @expression && !collect_logical_and_expressions(@expression).empty?
     end
   end

data/lib/adlint/cpp/macro.rb

@@ -199,7 +199,7 @@ module Cpp #:nodoc:
 
         case
         when arg = args[curr_token.value]
-          substitute_argument(curr_token, next_token, arg, result,
+          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] || []
@@ -230,7 +230,7 @@ module Cpp #:nodoc:
       result
     end
 
-    def substitute_argument(param_token, next_token, arg, result,
+    def substitute_argument(param_token, next_token, arg, location, result,
                             macro_table, context)
       # NOTE: The ISO C99 standard saids;
       #
@@ -247,12 +247,12 @@ module Cpp #:nodoc:
 
       if next_token && next_token.value == "##"
         result.concat(arg.map { |t|
-          ReplacedToken.new(t.type, t.value, t.location, t.type_hint, false)
+          ReplacedToken.new(t.type, t.value, location, t.type_hint, false)
         })
       else
         macro_table.replace(arg, context)
         result.concat(arg.map { |t|
-          ReplacedToken.new(t.type, t.value, t.location, t.type_hint, true)
+          ReplacedToken.new(t.type, t.value, location, t.type_hint, true)
         })
       end
     end

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

@@ -7089,7 +7089,11 @@ module CBuiltin #:nodoc:
       @indent_level = 0
       @indent_widths = Hash.new(0)
       @paren_depth = 0
-      @last_line_no = 0
+      @last_token = nil
+    end
+
+    def last_line_no
+      @last_token ? @last_token.location.line_no : 0
     end
 
     def do_execute(context)
@@ -7107,7 +7111,7 @@ module CBuiltin #:nodoc:
 
         case token.type
         when :IF, :FOR, :WHILE
-          if @last_line_no < token.location.line_no
+          if last_line_no < token.location.line_no
             on_beginning_of_line(token)
           end
           skip_controlling_part
@@ -7115,21 +7119,21 @@ module CBuiltin #:nodoc:
             skip_simple_substatement
           end
         when :ELSE
-          if @last_line_no < token.location.line_no
+          if last_line_no < token.location.line_no
             on_beginning_of_line(token)
           end
           unless token = peek_token and token.type == :IF || token.type == "{"
             skip_simple_substatement
           end
         when :DO
-          if @last_line_no < token.location.line_no
+          if last_line_no < token.location.line_no
             on_beginning_of_line(token)
           end
           unless token = peek_token and token.type == "{"
             skip_simple_substatement
           end
         else
-          if @last_line_no < token.location.line_no
+          if last_line_no < token.location.line_no
             on_beginning_of_line(token)
           end
         end
@@ -7205,7 +7209,7 @@ module CBuiltin #:nodoc:
 
     def peek_token
       if token = @tokens[@index]
-        @last_line_no = @tokens[[0, @index - 1].max].location.line_no
+        @last_token = @tokens[[0, @index - 1].max]
         checkpoint(token.location)
       end
       token
@@ -7237,7 +7241,7 @@ module CBuiltin #:nodoc:
     end
 
     def on_beginning_of_line(token)
-      return if @paren_depth > 0
+      return if @paren_depth > 0 || @last_token.replaced?
 
       case token.type
       when "{"
@@ -7280,7 +7284,11 @@ module CBuiltin #:nodoc:
       @indent_level = 0
       @indent_width = indent_width
       @paren_depth = 0
-      @last_line_no = 0
+      @last_token = nil
+    end
+
+    def last_line_no
+      @last_token ? @last_token.location.line_no : 0
     end
 
     def do_execute(context)
@@ -7298,7 +7306,7 @@ module CBuiltin #:nodoc:
 
         case token.type
         when :IF, :FOR, :WHILE
-          if @last_line_no < token.location.line_no
+          if last_line_no < token.location.line_no
             on_beginning_of_line(token)
           end
           skip_controlling_part
@@ -7306,21 +7314,21 @@ module CBuiltin #:nodoc:
             process_simple_substatement
           end
         when :ELSE
-          if @last_line_no < token.location.line_no
+          if last_line_no < token.location.line_no
             on_beginning_of_line(token)
           end
           unless token = peek_token and token.type == :IF || token.type == "{"
             process_simple_substatement
           end
         when :DO
-          if @last_line_no < token.location.line_no
+          if last_line_no < token.location.line_no
             on_beginning_of_line(token)
           end
           unless token = peek_token and token.type == "{"
             process_simple_substatement
           end
         else
-          if @last_line_no < token.location.line_no
+          if last_line_no < token.location.line_no
             on_beginning_of_line(token)
           end
         end
@@ -7356,7 +7364,7 @@ module CBuiltin #:nodoc:
 
         case token.type
         when :IF, :FOR, :WHILE
-          if @last_line_no < token.location.line_no
+          if last_line_no < token.location.line_no
             on_beginning_of_line(token)
           end
           skip_controlling_part
@@ -7365,7 +7373,7 @@ module CBuiltin #:nodoc:
             break
           end
         when :ELSE
-          if @last_line_no < token.location.line_no
+          if last_line_no < token.location.line_no
             on_beginning_of_line(token)
           end
           unless token = peek_token and token.type == :IF || token.type == "{"
@@ -7373,7 +7381,7 @@ module CBuiltin #:nodoc:
             break
           end
         when :DO
-          if @last_line_no < token.location.line_no
+          if last_line_no < token.location.line_no
             on_beginning_of_line(token)
           end
           unless token = peek_token and token.type == "{"
@@ -7382,7 +7390,7 @@ module CBuiltin #:nodoc:
             break
           end
         else
-          if @last_line_no < token.location.line_no
+          if last_line_no < token.location.line_no
             on_beginning_of_line(token)
           end
           break if token.type == ";"
@@ -7413,7 +7421,7 @@ module CBuiltin #:nodoc:
 
     def peek_token
       if token = @tokens[@index]
-        @last_line_no = @tokens[[0, @index - 1].max].location.line_no
+        @last_token = @tokens[[0, @index - 1].max]
         checkpoint(token.location)
       end
       token
@@ -7445,7 +7453,7 @@ module CBuiltin #:nodoc:
     end
 
     def on_beginning_of_line(token)
-      return if @paren_depth > 0
+      return if @paren_depth > 0 || @last_token.replaced?
 
       case token.type
       when "{"
@@ -15836,7 +15844,9 @@ module CBuiltin #:nodoc:
     end
 
     private
-    def check_object_declaration(declaration_or_definition, *)
+    def check_object_declaration(declaration_or_definition, object)
+      return unless object.declared_as_extern?
+
       name = declaration_or_definition.identifier.value
       type = declaration_or_definition.type
 

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

@@ -79,7 +79,7 @@ module CBuiltin #:nodoc:
     private
     def check_user_include(user_include_line, user_header)
       if @user_header_fpaths.include?(user_header.fpath)
-        W(:W0025, user_include_line.location)
+        W(:W0025, user_include_line.location, user_include_line.fpath)
       else
         if user_include_line.include_depth == 1
           @user_header_fpaths.add(user_header.fpath)
@@ -89,7 +89,7 @@ module CBuiltin #:nodoc:
 
     def check_system_include(system_include_line, system_header)
       if @system_header_fpaths.include?(system_header.fpath)
-        W(:W0025, system_include_line.location)
+        W(:W0025, system_include_line.location, system_include_line.fpath)
       else
         if system_include_line.include_depth == 1
           @system_header_fpaths.add(system_header.fpath)
@@ -113,7 +113,7 @@ module CBuiltin #:nodoc:
     private
     def check_user_include(user_include_line, user_header)
       if @user_header_fpaths.include?(user_header.fpath)
-        W(:W0026, user_include_line.location)
+        W(:W0026, user_include_line.location, user_include_line.fpath)
       else
         if user_include_line.include_depth > 1
           @user_header_fpaths.add(user_header.fpath)
@@ -123,7 +123,7 @@ module CBuiltin #:nodoc:
 
     def check_system_include(system_include_line, system_header)
       if @system_header_fpaths.include?(system_header.fpath)
-        W(:W0026, system_include_line.location)
+        W(:W0026, system_include_line.location, system_include_line.fpath)
       else
         if system_include_line.include_depth > 1
           @system_header_fpaths.add(system_header.fpath)

data/lib/adlint/prelude.rb

@@ -307,12 +307,12 @@ end
 #         env_var_name      : [A-Za-z_][0-9A-Za-z_]*
 #
 #       Examples of environment variable as any scalar value;
-#         string_item_1: $VAR
+#         string_item: $VAR
 #         boolean_item: $VAR
 #         decimal_item: $VAR
 #
 #       Examples of embedding environment variable in string;
-#         string_item_1: "foo${VAR}baz"
+#         string_item: "foo${VAR}baz"
 #
 class Psych::TreeBuilder < Psych::Handler
   alias :_orig_scalar :scalar

data/lib/adlint/version.rb

@@ -32,9 +32,9 @@
 module AdLint #:nodoc:
 
   MAJOR_VERSION = 2
-  MINOR_VERSION = 0
-  PATCH_VERSION = 10
-  RELEASE_DATE  = "2012-09-06"
+  MINOR_VERSION = 2
+  PATCH_VERSION = 0
+  RELEASE_DATE  = "2012-09-12"
 
   TRAITS_SCHEMA_VERSION = "2.0.0"
 

data/share/doc/developers_guide_ja.html

@@ -1,8 +1,8 @@
 <html lang="ja">
 <head>
-<title>AdLint 2.0.10 開発者ガイド</title>
+<title>AdLint 2.2.0 開発者ガイド</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="description" content="AdLint 2.0.10 開発者ガイド">
+<meta name="description" content="AdLint 2.2.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.0.10 開発者ガイド</h1>
+<h1 class="settitle">AdLint 2.2.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.0.10 開発者ガイド
+@settitle AdLint 2.2.0 開発者ガイド
 
 @copying
 Copyright (C) 2010-2012, OGIS-RI Co.,Ltd.

data/share/doc/users_guide_en.html

@@ -1,8 +1,8 @@
 <html lang="en">
 <head>
-<title>AdLint 2.0.10 User's Guide</title>
+<title>AdLint 2.2.0 User's Guide</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="description" content="AdLint 2.0.10 User's Guide">
+<meta name="description" content="AdLint 2.2.0 User's Guide">
 <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.0.10 User's Guide</h1>
+<h1 class="settitle">AdLint 2.2.0 User's Guide</h1>
 <div class="node">
 <a name="Top"></a>
 <p><hr>
@@ -2286,8 +2286,8 @@ Up:&nbsp;<a rel="up" accesskey="u" href="#Top">Top</a>
 <li><a href="#W0021">W0021</a>: This pointer cast is danger because it delete volatile qualifier. 
 <li><a href="#W0023">W0023</a>: Arithmetic operation is being made by pointer variable. 
 <li><a href="#W0024">W0024</a>: Increment or decrement is being made by pointer variable. 
-<li><a href="#W0025">W0025</a>: A file is already included by directly. 
-<li><a href="#W0026">W0026</a>: A file is already included by indirectly. 
+<li><a href="#W0025">W0025</a>: `%s' is already included by this file directly. 
+<li><a href="#W0026">W0026</a>: `%s' is already included by this file indirectly. 
 <li><a href="#W0027">W0027</a>: Comparison operation is being made by pointer variable. 
 <li><a href="#W0028">W0028</a>: Indirect referencing is being made by NULL pointer. 
 <li><a href="#W0030">W0030</a>: Arithmetic operation is being made by NULL pointer. 
@@ -3987,7 +3987,7 @@ Up:&nbsp;<a rel="up" accesskey="u" href="#Messages">Messages</a>
 
 <h4 class="subsection">6.27.1 Message body</h4>
 
-<p>A file is already included by directly.
+<p>`%s' is already included by this file directly.
 
 <h4 class="subsection">6.27.2 Content</h4>
 
@@ -4003,7 +4003,7 @@ Up:&nbsp;<a rel="up" accesskey="u" href="#Messages">Messages</a>
 <h4 class="subsection">6.27.4 Related message</h4>
 
      <ul>
-<li><a href="#W0026">W0026</a> A file is already included by indirectly. 
+<li><a href="#W0026">W0026</a> `%s' is already included by this file indirectly. 
 </ul>
 
 <h4 class="subsection">6.27.5 Since</h4>
@@ -4025,7 +4025,7 @@ Up:&nbsp;<a rel="up" accesskey="u" href="#Messages">Messages</a>
 
 <h4 class="subsection">6.28.1 Message body</h4>
 
-<p>A file is already included by indirectly.
+<p>`%s' is already included by this file indirectly.
 
 <h4 class="subsection">6.28.2 Content</h4>
 
@@ -4045,7 +4045,7 @@ Up:&nbsp;<a rel="up" accesskey="u" href="#Messages">Messages</a>
 <h4 class="subsection">6.28.4 Related message</h4>
 
      <ul>
-<li><a href="#W0025">W0025</a> A file is already included by directly. 
+<li><a href="#W0025">W0025</a> `%s' is already included by this file directly. 
 </ul>
 
 <h4 class="subsection">6.28.5 Since</h4>

data/share/doc/users_guide_en.texi

@@ -2,7 +2,7 @@
 @setfilename users_guide_en.info
 @documentlanguage en
 @documentencoding utf-8
-@settitle AdLint 2.0.10 User's Guide
+@settitle AdLint 2.2.0 User's Guide
 
 @copying
 Copyright (C) 2010-2012, OGIS-RI Co.,Ltd.
@@ -2312,8 +2312,8 @@ context_line (in case of @ref{message_traits:message_with_class, message_with_cl
 * W0021::This pointer cast is danger because it delete volatile qualifier.
 * W0023::Arithmetic operation is being made by pointer variable.
 * W0024::Increment or decrement is being made by pointer variable.
-* W0025::A file is already included by directly.
-* W0026::A file is already included by indirectly.
+* W0025::`%s' is already included by this file directly.
+* W0026::`%s' is already included by this file indirectly.
 * W0027::Comparison operation is being made by pointer variable.
 * W0028::Indirect referencing is being made by NULL pointer.
 * W0030::Arithmetic operation is being made by NULL pointer.
@@ -3791,7 +3791,7 @@ p++; /* W0024 */
 
 @subsection Message body
 
-A file is already included by directly.
+`%s' is already included by this file directly.
 
 @subsection Content
 
@@ -3808,7 +3808,7 @@ Under construction.
 @subsection Related message
 
 @itemize
-@item @ref{W0026} A file is already included by indirectly.
+@item @ref{W0026} `%s' is already included by this file indirectly.
 @end itemize
 
 @subsection Since
@@ -3821,7 +3821,8 @@ Under construction.
 
 @subsection Message body
 
-A file is already included by indirectly.
+`%s' is already included by this file indirectly.
+
 @subsection Content
 
 Under construction.
@@ -3842,7 +3843,7 @@ Under construction.
 @subsection Related message
 
 @itemize
-@item @ref{W0025} A file is already included by directly.
+@item @ref{W0025} `%s' is already included by this file directly.
 @end itemize
 
 @subsection Since

data/share/doc/users_guide_ja.html

@@ -1,8 +1,8 @@
 <html lang="ja">
 <head>
-<title>AdLint 2.0.10 利用者ガイド</title>
+<title>AdLint 2.2.0 利用者ガイド</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="description" content="AdLint 2.0.10 利用者ガイド">
+<meta name="description" content="AdLint 2.2.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.0.10 利用者ガイド</h1>
+<h1 class="settitle">AdLint 2.2.0 利用者ガイド</h1>
 <div class="node">
 <a name="Top"></a>
 <p><hr>
@@ -2358,8 +2358,8 @@ Up:&nbsp;<a rel="up" accesskey="u" href="#Top">Top</a>
 <li><a href="#W0021">W0021</a>: このポインタキャストは、volatile 修飾を削除しているので危険です。
 <li><a href="#W0023">W0023</a>: ポインタ型の変数に対して算術演算が行われています。
 <li><a href="#W0024">W0024</a>: ポインタ型の変数に対してインクリメントまたはデクリメントが行われています。
-<li><a href="#W0025">W0025</a>: ファイルは、既にこのファイルから直接インクルードされています。
-<li><a href="#W0026">W0026</a>: ファイルは、既にこのファイルから間接的にインクルードされています。
+<li><a href="#W0025">W0025</a>: `%s' は、既にこのファイルから直接インクルードされています。
+<li><a href="#W0026">W0026</a>: `%s' は、既にこのファイルから間接的にインクルードされています。
 <li><a href="#W0027">W0027</a>: ポインタ型の変数に対して比較演算が行われています。
 <li><a href="#W0028">W0028</a>: NULL ポインタに対して間接参照が行われています。
 <li><a href="#W0030">W0030</a>: NULL ポインタに対して算術演算が行われています。
@@ -4084,7 +4084,7 @@ Up:&nbsp;<a rel="up" accesskey="u" href="#Messages">Messages</a>
 
 <h4 class="subsection">6.27.1 メッセージ本文</h4>
 
-<p>ファイルは、既にこのファイルから直接インクルードされています。
+<p>`%s' は、既にこのファイルから直接インクルードされています。
 
 <h4 class="subsection">6.27.2 内容</h4>
 
@@ -4100,7 +4100,7 @@ Up:&nbsp;<a rel="up" accesskey="u" href="#Messages">Messages</a>
 <h4 class="subsection">6.27.4 関連メッセージ</h4>
 
      <ul>
-<li><a href="#W0026">W0026</a> ファイルは、既にこのファイルから間接的にインクルードされています。
+<li><a href="#W0026">W0026</a> `%s' は、既にこのファイルから間接的にインクルードされています。
 </ul>
 
 <h4 class="subsection">6.27.5 対応バージョン</h4>
@@ -4122,7 +4122,7 @@ Up:&nbsp;<a rel="up" accesskey="u" href="#Messages">Messages</a>
 
 <h4 class="subsection">6.28.1 メッセージ本文</h4>
 
-<p>ファイルは、既にこのファイルから間接的にインクルードされています。
+<p>`%s' は、既にこのファイルから間接的にインクルードされています。
 
 <h4 class="subsection">6.28.2 内容</h4>
 
@@ -4142,7 +4142,7 @@ Up:&nbsp;<a rel="up" accesskey="u" href="#Messages">Messages</a>
 <h4 class="subsection">6.28.4 関連メッセージ</h4>
 
      <ul>
-<li><a href="#W0025">W0025</a> ファイルは、既にこのファイルから直接インクルードされています。
+<li><a href="#W0025">W0025</a> `%s' は、既にこのファイルから直接インクルードされています。
 </ul>
 
 <h4 class="subsection">6.28.5 対応バージョン</h4>

data/share/doc/users_guide_ja.texi

@@ -2,7 +2,7 @@
 @setfilename users_guide_ja.info
 @documentlanguage ja
 @documentencoding utf-8
-@settitle AdLint 2.0.10 利用者ガイド
+@settitle AdLint 2.2.0 利用者ガイド
 
 @copying
 Copyright (C) 2010-2012, OGIS-RI Co.,Ltd.
@@ -2377,8 +2377,8 @@ context_line (in case of @ref{message_traits:message_with_class, message_with_cl
 * W0021::このポインタキャストは、volatile 修飾を削除しているので危険です。
 * W0023::ポインタ型の変数に対して算術演算が行われています。
 * W0024::ポインタ型の変数に対してインクリメントまたはデクリメントが行われています。
-* W0025::ファイルは、既にこのファイルから直接インクルードされています。
-* W0026::ファイルは、既にこのファイルから間接的にインクルードされています。
+* W0025::`%s' は、既にこのファイルから直接インクルードされています。
+* W0026::`%s' は、既にこのファイルから間接的にインクルードされています。
 * W0027::ポインタ型の変数に対して比較演算が行われています。
 * W0028::NULL ポインタに対して間接参照が行われています。
 * W0030::NULL ポインタに対して算術演算が行われています。
@@ -3878,7 +3878,7 @@ p++; /* W0024 */
 
 @subsection メッセージ本文
 
-ファイルは、既にこのファイルから直接インクルードされています。
+`%s' は、既にこのファイルから直接インクルードされています。
 
 @subsection 内容
 
@@ -3895,7 +3895,7 @@ p++; /* W0024 */
 @subsection 関連メッセージ
 
 @itemize
-@item @ref{W0026} ファイルは、既にこのファイルから間接的にインクルードされています。
+@item @ref{W0026} `%s' は、既にこのファイルから間接的にインクルードされています。
 @end itemize
 
 @subsection 対応バージョン
@@ -3908,7 +3908,7 @@ p++; /* W0024 */
 
 @subsection メッセージ本文
 
-ファイルは、既にこのファイルから間接的にインクルードされています。
+`%s' は、既にこのファイルから間接的にインクルードされています。
 
 @subsection 内容
 
@@ -3930,7 +3930,7 @@ p++; /* W0024 */
 @subsection 関連メッセージ
 
 @itemize
-@item @ref{W0025} ファイルは、既にこのファイルから直接インクルードされています。
+@item @ref{W0025} `%s' は、既にこのファイルから直接インクルードされています。
 @end itemize
 
 @subsection 対応バージョン

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adlint
 version: !ruby/object:Gem::Version
-  version: 2.0.10
+  version: 2.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-06 00:00:00.000000000 Z
+date: 2012-09-12 00:00:00.000000000 Z
 dependencies: []
 description: ! 'AdLint is a source code static analyzer.
 
@@ -215,6 +215,8 @@ files:
 - features/code_check/W0252.feature
 - features/code_check/W0253.feature
 - features/code_check/W0254.feature
+- features/code_check/W0431.feature
+- features/code_check/W0432.feature
 - features/code_check/W0477.feature
 - features/code_check/W0478.feature
 - features/code_check/W0479.feature
@@ -291,6 +293,7 @@ files:
 - features/code_check/W0780.feature
 - features/code_check/W0781.feature
 - features/code_check/W0783.feature
+- features/code_check/W0787.feature
 - features/code_check/W0792.feature
 - features/code_check/W0793.feature
 - features/code_check/W0794.feature