adlint 2.6.12 → 2.6.14

data/features/code_check/W0719.feature

@@ -16,7 +16,6 @@ Feature: W0719
       | mesg  | line | column |
       | W0117 | 1    | 5      |
       | W0123 | 3    | 12     |
-      | W0246 | 3    | 12     |
       | W0116 | 3    | 14     |
       | W0719 | 3    | 14     |
       | W0104 | 1    | 14     |
@@ -35,7 +34,6 @@ Feature: W0719
       | mesg  | line | column |
       | W0117 | 1    | 5      |
       | W0123 | 3    | 12     |
-      | W0246 | 3    | 12     |
       | W0719 | 3    | 14     |
       | W0104 | 1    | 14     |
       | W0628 | 1    | 5      |
@@ -53,7 +51,6 @@ Feature: W0719
       | mesg  | line | column |
       | W0117 | 1    | 5      |
       | W0123 | 3    | 12     |
-      | W0246 | 3    | 12     |
       | W0116 | 3    | 14     |
       | W0104 | 1    | 14     |
       | W0628 | 1    | 5      |
@@ -71,7 +68,6 @@ Feature: W0719
       | mesg  | line | column |
       | W0117 | 1    | 5      |
       | W0123 | 3    | 12     |
-      | W0246 | 3    | 12     |
       | W0104 | 1    | 14     |
       | W0628 | 1    | 5      |
 
@@ -88,11 +84,9 @@ Feature: W0719
       | mesg  | line | column |
       | W0117 | 1    | 6      |
       | W0123 | 3    | 5      |
-      | W0246 | 3    | 5      |
       | W0116 | 3    | 7      |
       | W0719 | 3    | 7      |
       | W0136 | 3    | 5      |
-      | W0165 | 3    | 5      |
       | W0628 | 1    | 6      |
 
   Scenario: 31-bit right shift-expression of `char' value
@@ -108,7 +102,6 @@ Feature: W0719
       | mesg  | line | column |
       | W0117 | 1    | 5      |
       | W0123 | 3    | 12     |
-      | W0246 | 3    | 12     |
       | W0719 | 3    | 14     |
       | W0104 | 1    | 14     |
       | W0628 | 1    | 5      |
@@ -126,11 +119,9 @@ Feature: W0719
       | mesg  | line | column |
       | W0117 | 1    | 6      |
       | W0123 | 3    | 5      |
-      | W0246 | 3    | 5      |
       | W0116 | 3    | 7      |
       | W0650 | 3    | 7      |
       | W0136 | 3    | 5      |
-      | W0165 | 3    | 5      |
       | W0628 | 1    | 6      |
 
   Scenario: 63-bit right shift-expression of `char' value
@@ -146,7 +137,6 @@ Feature: W0719
       | mesg  | line | column |
       | W0117 | 1    | 5      |
       | W0123 | 3    | 12     |
-      | W0246 | 3    | 12     |
       | W0650 | 3    | 14     |
       | W0104 | 1    | 14     |
       | W0628 | 1    | 5      |

data/features/code_check/W0748.feature

@@ -15,7 +15,6 @@ Feature: W0748
     Then the output should exactly match with:
       | mesg  | line | column |
       | W0117 | 1    | 6      |
-      | W0135 | 3    | 23     |
       | W0748 | 3    | 23     |
       | W0100 | 3    | 19     |
       | W0104 | 1    | 25     |
@@ -50,7 +49,6 @@ Feature: W0748
     Then the output should exactly match with:
       | mesg  | line | column |
       | W0117 | 1    | 6      |
-      | W0135 | 4    | 9      |
       | W0748 | 4    | 9      |
       | W0100 | 3    | 19     |
       | W0104 | 1    | 25     |
@@ -88,7 +86,6 @@ Feature: W0748
       | mesg  | line | column |
       | W0118 | 1    | 13     |
       | W0117 | 3    | 6      |
-      | W0135 | 5    | 9      |
       | W0748 | 5    | 9      |
       | W0104 | 3    | 25     |
       | W0628 | 3    | 6      |
@@ -123,9 +120,7 @@ Feature: W0748
     Then the output should exactly match with:
       | mesg  | line | column |
       | W0117 | 1    | 15     |
-      | W0135 | 3    | 12     |
       | W0748 | 3    | 12     |
-      | W0271 | 3    | 5      |
       | W0382 | 3    | 5      |
       | W0104 | 1    | 34     |
       | W0628 | 1    | 15     |

data/features/code_check/W0751.feature

@@ -15,7 +15,6 @@ Feature: W0751
     Then the output should exactly match with:
       | mesg  | line | column |
       | W0117 | 1    | 6      |
-      | W0137 | 3    | 23     |
       | W0751 | 3    | 23     |
       | W0100 | 3    | 19     |
       | W0104 | 1    | 23     |
@@ -50,7 +49,6 @@ Feature: W0751
     Then the output should exactly match with:
       | mesg  | line | column |
       | W0117 | 1    | 6      |
-      | W0137 | 4    | 9      |
       | W0751 | 4    | 9      |
       | W0100 | 3    | 19     |
       | W0104 | 1    | 23     |
@@ -88,7 +86,6 @@ Feature: W0751
       | mesg  | line | column |
       | W0118 | 1    | 13     |
       | W0117 | 3    | 6      |
-      | W0137 | 5    | 9      |
       | W0751 | 5    | 9      |
       | W0104 | 3    | 23     |
       | W0628 | 3    | 6      |
@@ -123,9 +120,7 @@ Feature: W0751
     Then the output should exactly match with:
       | mesg  | line | column |
       | W0117 | 1    | 15     |
-      | W0137 | 3    | 12     |
       | W0751 | 3    | 12     |
-      | W0273 | 3    | 5      |
       | W0385 | 3    | 5      |
       | W0104 | 1    | 32     |
       | W0628 | 1    | 15     |

data/features/code_check/W0756.feature

@@ -15,7 +15,6 @@ Feature: W0756
     Then the output should exactly match with:
       | mesg  | line | column |
       | W0117 | 1    | 6      |
-      | W0139 | 3    | 23     |
       | W0756 | 3    | 23     |
       | W0100 | 3    | 19     |
       | W0104 | 1    | 24     |
@@ -50,7 +49,6 @@ Feature: W0756
     Then the output should exactly match with:
       | mesg  | line | column |
       | W0117 | 1    | 6      |
-      | W0139 | 4    | 9      |
       | W0756 | 4    | 9      |
       | W0100 | 3    | 19     |
       | W0104 | 1    | 24     |
@@ -88,7 +86,6 @@ Feature: W0756
       | mesg  | line | column |
       | W0118 | 1    | 13     |
       | W0117 | 3    | 6      |
-      | W0139 | 5    | 9      |
       | W0756 | 5    | 9      |
       | W0104 | 3    | 24     |
       | W0628 | 3    | 6      |
@@ -123,9 +120,7 @@ Feature: W0756
     Then the output should exactly match with:
       | mesg  | line | column |
       | W0117 | 1    | 15     |
-      | W0139 | 3    | 12     |
       | W0756 | 3    | 12     |
-      | W0275 | 3    | 5      |
       | W0390 | 3    | 5      |
       | W0104 | 1    | 33     |
       | W0628 | 1    | 15     |

data/features/code_check/W0763.feature

@@ -15,7 +15,6 @@ Feature: W0763
     Then the output should exactly match with:
       | mesg  | line | column |
       | W0117 | 1    | 6      |
-      | W0141 | 3    | 23     |
       | W0763 | 3    | 23     |
       | W0100 | 3    | 19     |
       | W0104 | 1    | 29     |
@@ -52,7 +51,6 @@ Feature: W0763
     Then the output should exactly match with:
       | mesg  | line | column |
       | W0117 | 1    | 6      |
-      | W0141 | 4    | 9      |
       | W0763 | 4    | 9      |
       | W0100 | 3    | 19     |
       | W0104 | 1    | 29     |
@@ -92,7 +90,6 @@ Feature: W0763
       | mesg  | line | column |
       | W0118 | 1    | 13     |
       | W0117 | 3    | 6      |
-      | W0141 | 5    | 9      |
       | W0763 | 5    | 9      |
       | W0104 | 3    | 29     |
       | W0834 | 3    | 10     |
@@ -129,9 +126,7 @@ Feature: W0763
     Then the output should exactly match with:
       | mesg  | line | column |
       | W0117 | 1    | 15     |
-      | W0141 | 3    | 12     |
       | W0763 | 3    | 12     |
-      | W0277 | 3    | 5      |
       | W0397 | 3    | 5      |
       | W0104 | 1    | 38     |
       | W0834 | 1    | 19     |

data/features/code_check/W0787.feature

@@ -53,7 +53,14 @@ Feature: W0787
       | W0118 | 9    | 17     |
       | W0623 | 9    | 17     |
       | W0787 | 9    | 17     |
+      | C0001 | 3    | 16     |
       | W0628 | 1    | 6      |
       | W0628 | 7    | 6      |
+      | W0770 | 3    | 16     |
+      | C0001 | 9    | 17     |
       | W1037 | 3    | 16     |
+      | C0001 | 9    | 17     |
+      | W0770 | 9    | 17     |
+      | C0001 | 3    | 16     |
       | W1037 | 9    | 17     |
+      | C0001 | 3    | 16     |

data/features/code_check/W0794.feature

@@ -81,7 +81,6 @@ Feature: W0794
     Then the output should exactly match with:
       | mesg  | line | column |
       | W0117 | 1    | 5      |
-      | W0123 | 3    | 12     |
       | W0246 | 3    | 12     |
       | W0116 | 3    | 15     |
       | W0104 | 1    | 24     |

data/features/code_check/W1052.feature

@@ -15,9 +15,7 @@ Feature: W1052
     Then the output should exactly match with:
       | mesg  | line | column |
       | W1076 | 1    | 21     |
-      | W0123 | 3    | 12     |
       | W0246 | 3    | 12     |
-      | W0123 | 3    | 16     |
       | W0246 | 3    | 16     |
       | W0167 | 3    | 14     |
       | W0303 | 3    | 5      |

data/features/support/env.rb

@@ -122,19 +122,14 @@ typedef unsigned long size_t;
 #endif
 EOF
 
-require "pathname"
-require "stringio"
-
 if ENV["ADLINT_COV"] =~ /1|on|true/
   require "simplecov"
   require "simplecov-html"
   SimpleCov.start
 end
 
-$envdir = Pathname.new(__FILE__).realpath.dirname
-$prefix = Pathname.new("../..").expand_path($envdir)
-$bindir = Pathname.new("bin").expand_path($prefix)
-$tmpdir = Pathname.new("cucumber-tmp").expand_path($prefix)
+$bindir = File.expand_path("../../bin", File.dirname(__FILE__))
+$tmpdir = File.expand_path("../../cucumber-tmp", File.dirname(__FILE__))
 
 module Kernel
   def exit(status)

data/lib/adlint/c/syntax.rb

@@ -945,7 +945,7 @@ module C #:nodoc:
     def inspect(indent = 0)
       ([" " * indent + "#{short_class_name} (#{location.inspect})"] +
        [@expression.inspect(indent + 1)] +
-         @argument_expressions.map { |a| a.inspect(indent + 1) }).join("\n")
+       @argument_expressions.map { |a| a.inspect(indent + 1) }).join("\n")
     end
   end
 
@@ -1285,7 +1285,7 @@ module C #:nodoc:
 
     def inspect(indent = 0)
       " " * indent + "#{short_class_name} (#{location.inspect}) " +
-          @initializers.map { |init| init.inspect }.join(",")
+        @initializers.map { |init| init.inspect }.join(",")
     end
   end
 
@@ -2581,7 +2581,7 @@ module C #:nodoc:
     def inspect(indent = 0)
       " " * indent + "#{short_class_name} (#{location.inspect}) " +
         "#{identifier.value}\n" +
-          @struct_declarations.map { |sd| sd.inspect(indent + 1) }.join("\n")
+        @struct_declarations.map { |sd| sd.inspect(indent + 1) }.join("\n")
     end
   end
 
@@ -2616,7 +2616,7 @@ module C #:nodoc:
     def inspect(indent = 0)
       " " * indent + "#{short_class_name} (#{location.inspect}) " +
         "#{identifier.value}\n" +
-          @struct_declarations.map { |sd| sd.inspect(indent + 1) }.join("\n")
+        @struct_declarations.map { |sd| sd.inspect(indent + 1) }.join("\n")
     end
   end
 
@@ -2787,8 +2787,7 @@ module C #:nodoc:
           "struct #{identifier.value} {}"
         else
           "struct #{identifier.value} { " +
-            @struct_declarations.map { |decl| decl.to_s }.join(" ") +
-            " }"
+            @struct_declarations.map { |decl| decl.to_s }.join(" ") + " }"
         end
       else
         "struct #{identifier.value}"
@@ -3413,8 +3412,7 @@ module C #:nodoc:
 
     def inspect(indent = 0)
       " " * indent + "#{short_class_name}\n" +
-        @expression.inspect(indent + 1) + "\n" +
-        @statement.inspect(indent + 1)
+        @expression.inspect(indent + 1) + "\n" + @statement.inspect(indent + 1)
     end
   end
 
@@ -3492,8 +3490,7 @@ module C #:nodoc:
 
     def inspect(indent = 0)
       " " * indent + "#{short_class_name}\n" +
-        @expression.inspect(indent + 1) + "\n" +
-        @statement.inspect(indent + 1)
+        @expression.inspect(indent + 1) + "\n" + @statement.inspect(indent + 1)
     end
   end
 
@@ -3543,8 +3540,7 @@ module C #:nodoc:
 
     def inspect(indent = 0)
       " " * indent + "#{short_class_name}\n" +
-        @expression.inspect(indent + 1) + "\n" +
-        @statement.inspect(indent + 1)
+        @expression.inspect(indent + 1) + "\n" + @statement.inspect(indent + 1)
     end
 
     private
@@ -3752,8 +3748,7 @@ module C #:nodoc:
 
     def inspect(indent = 0)
       " " * indent + "#{short_class_name}\n" +
-        @expression.inspect(indent + 1) + "\n" +
-        @statement.inspect(indent + 1)
+        @expression.inspect(indent + 1) + "\n" + @statement.inspect(indent + 1)
     end
   end
 
@@ -3794,8 +3789,7 @@ module C #:nodoc:
 
     def inspect(indent = 0)
       " " * indent + "#{short_class_name}\n" +
-        @statement.inspect(indent + 1) + "\n" +
-        @expression.inspect(indent + 1)
+        @statement.inspect(indent + 1) + "\n" + @expression.inspect(indent + 1)
     end
   end
 

data/lib/adlint/cpp/macro.rb

@@ -528,6 +528,94 @@ module Cpp #:nodoc:
     end
   end
 
+  class LintSpecificMacro1 < SpecialMacro
+    def initialize
+      super("__LINT__")
+    end
+
+    private
+    def generate_replacement_list(token)
+      PPTokens.new.push(Token.new(:PP_TOKEN, "1", token.location, :CONSTANT))
+    end
+  end
+
+  class LintSpecificMacro2 < SpecialMacro
+    def initialize
+      super("lint")
+    end
+
+    private
+    def generate_replacement_list(token)
+      PPTokens.new.push(Token.new(:PP_TOKEN, "1", token.location, :CONSTANT))
+    end
+  end
+
+  class LintSpecificMacro3 < SpecialMacro
+    def initialize
+      super("__lint")
+    end
+
+    private
+    def generate_replacement_list(token)
+      PPTokens.new.push(Token.new(:PP_TOKEN, "1", token.location, :CONSTANT))
+    end
+  end
+
+  class LintSpecificMacro4 < SpecialMacro
+    def initialize
+      super("__lint__")
+    end
+
+    private
+    def generate_replacement_list(token)
+      PPTokens.new.push(Token.new(:PP_TOKEN, "1", token.location, :CONSTANT))
+    end
+  end
+
+  class AdLintSpecificMacro1 < SpecialMacro
+    def initialize
+      super("__ADLINT__")
+    end
+
+    private
+    def generate_replacement_list(token)
+      PPTokens.new.push(Token.new(:PP_TOKEN, "1", token.location, :CONSTANT))
+    end
+  end
+
+  class AdLintSpecificMacro2 < SpecialMacro
+    def initialize
+      super("adlint")
+    end
+
+    private
+    def generate_replacement_list(token)
+      PPTokens.new.push(Token.new(:PP_TOKEN, "1", token.location, :CONSTANT))
+    end
+  end
+
+  class AdLintSpecificMacro3 < SpecialMacro
+    def initialize
+      super("__adlint")
+    end
+
+    private
+    def generate_replacement_list(token)
+      PPTokens.new.push(Token.new(:PP_TOKEN, "1", token.location, :CONSTANT))
+    end
+  end
+
+  class AdLintSpecificMacro4 < SpecialMacro
+    def initialize
+      super("__adlint__")
+    end
+
+    private
+    def generate_replacement_list(token)
+      PPTokens.new.push(Token.new(:PP_TOKEN, "1", token.location, :CONSTANT))
+    end
+  end
+
   class MacroReplacementContext
     def initialize
       @hide_sets = Hash.new { |h, k| h[k] = Set.new }
@@ -671,6 +759,14 @@ module Cpp #:nodoc:
       define(StdcIec559ComplexMacro.new)
       define(StdcIso10646Macro.new)
       define(PragmaOperator.new)
+      define(LintSpecificMacro1.new)
+      define(LintSpecificMacro2.new)
+      define(LintSpecificMacro3.new)
+      define(LintSpecificMacro4.new)
+      define(AdLintSpecificMacro1.new)
+      define(AdLintSpecificMacro2.new)
+      define(AdLintSpecificMacro3.new)
+      define(AdLintSpecificMacro4.new)
     end
   end