adlint 2.6.12 → 2.6.14

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

@@ -818,36 +818,34 @@ module CBuiltin #:nodoc:
     end
 
     private
-    def check(cast_expression, original_variable, result_variable)
-      return unless @rvalues
-      return unless original_variable.type.floating?
-
-      case expression = @rvalues[original_variable]
-      when C::AdditiveExpression, C::MultiplicativeExpression
-        if original_variable.type.same_as?(from_type) &&
-            result_variable.type.same_as?(to_type)
-          W(message_id, expression.location)
+    def check(*, orig_var, result_var)
+      if @rvalues && orig_var.type.floating?
+        case expr = @rvalues[orig_var]
+        when C::AdditiveExpression, C::MultiplicativeExpression
+          if orig_var.type.same_as?(from_type) &&
+              result_var.type.same_as?(to_type)
+            W(message_id, expr.location)
+          end
         end
       end
     end
 
-    def clear_rvalues(function_definition, function)
+    def clear_rvalues(*)
       @rvalues = {}
     end
 
-    def handle_additive(additive_expression,
-                        lhs_variable, rhs_variable, result_variable)
-      memorize_rvalue_derivation(result_variable, additive_expression)
+    def handle_additive(expr, lhs_var, rhs_var, result_var)
+      memorize_rvalue_derivation(result_var, expr)
     end
 
-    def handle_multiplicative(multiplicative_expression,
-                              lhs_variable, rhs_variable, result_variable)
-      return if multiplicative_expression.operator.type == "%"
-      memorize_rvalue_derivation(result_variable, multiplicative_expression)
+    def handle_multiplicative(expr, lhs_var, rhs_var, result_var)
+      unless expr.operator.type == "%"
+        memorize_rvalue_derivation(result_var, expr)
+      end
     end
 
-    def memorize_rvalue_derivation(rvalue_holder, expression)
-      @rvalues[rvalue_holder] = expression if @rvalues
+    def memorize_rvalue_derivation(rvalue_holder, expr)
+      @rvalues[rvalue_holder] = expr if @rvalues
     end
 
     def from_type

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

@@ -173,29 +173,43 @@ module CBuiltin #:nodoc:
 
     def initialize(context)
       super
-      context[:ld_function_traversal].on_definition += method(:check_function)
-      context[:ld_variable_traversal].on_definition += method(:check_variable)
+      func_traversal = context[:ld_function_traversal]
+      func_traversal.on_declaration += method(:check_function)
+      func_traversal.on_definition += method(:check_function)
+      var_traversal = context[:ld_variable_traversal]
+      var_traversal.on_declaration += method(:check_variable)
+      var_traversal.on_definition += method(:check_variable)
     end
 
     private
-    def check_function(function)
-      return unless function.extern?
+    def check_function(func)
+      return unless func.extern?
+
       mapping = @context[:ld_function_mapping]
-      declarations = mapping.lookup_function_declarations(function.name)
-      if declarations.size > 1
-        declarations.each do |declaration|
-          W(:W0770, declaration.location, declaration.signature)
+      similar_dcls = mapping.lookup_function_declarations(func.name)
+
+      if similar_dcls.size > 1
+        W(:W0770, func.location, func.signature)
+        similar_dcls.each do |pair_dcl|
+          unless pair_dcl == func
+            C(:C0001, pair_dcl.location, pair_dcl.signature)
+          end
         end
       end
     end
 
-    def check_variable(variable)
-      return unless variable.extern?
+    def check_variable(var)
+      return unless var.extern?
+
       mapping = @context[:ld_variable_mapping]
-      declarations = mapping.lookup_variable_declarations(variable.name)
-      if declarations.size > 1
-        declarations.each do |declaration|
-          W(:W0770, declaration.location, declaration.name)
+      similar_dcls = mapping.lookup_variable_declarations(var.name)
+
+      if similar_dcls.size > 1
+        W(:W0770, var.location, var.name)
+        similar_dcls.each do |pair_dcl|
+          unless pair_dcl == var
+            C(:C0001, pair_dcl.location, pair_dcl.name)
+          end
         end
       end
     end
@@ -215,21 +229,35 @@ module CBuiltin #:nodoc:
     end
 
     private
-    def check_function(function)
-      return unless function.extern?
+    def check_function(func)
+      return unless func.extern?
+
       mapping = @context[:ld_function_mapping]
-      functions = mapping.lookup_functions(function.name)
-      if functions.size > 1
-        functions.each { |func| W(:W0791, func.location, func.signature) }
+      similar_funcs = mapping.lookup_functions(func.name)
+
+      if similar_funcs.size > 1
+        W(:W0791, func.location, func.signature)
+        similar_funcs.each do |pair_func|
+          unless pair_func == func
+            C(:C0001, pair_func.location, pair_func.signature)
+          end
+        end
       end
     end
 
-    def check_variable(variable)
-      return unless variable.extern?
+    def check_variable(var)
+      return unless var.extern?
+
       mapping = @context[:ld_variable_mapping]
-      variables = mapping.lookup_variables(variable.name)
-      if variables.size > 1
-        variables.each { |var| W(:W0791, var.location, var.name) }
+      similar_vars = mapping.lookup_variables(var.name)
+
+      if similar_vars.size > 1
+        W(:W0791, var.location, var.name)
+        similar_vars.each do |pair_var|
+          unless pair_var == var
+            C(:C0001, pair_var.location, pair_var.name)
+          end
+        end
       end
     end
   end
@@ -243,34 +271,48 @@ module CBuiltin #:nodoc:
 
     def initialize(context)
       super
-      function_traversal = context[:ld_function_traversal]
-      function_traversal.on_declaration += method(:check_function)
-      function_traversal.on_definition += method(:check_function)
-      variable_traversal = context[:ld_variable_traversal]
-      variable_traversal.on_declaration += method(:check_variable)
-      variable_traversal.on_definition += method(:check_variable)
+      func_traversal = context[:ld_function_traversal]
+      func_traversal.on_declaration += method(:check_function)
+      func_traversal.on_definition += method(:check_function)
+      var_traversal = context[:ld_variable_traversal]
+      var_traversal.on_declaration += method(:check_variable)
+      var_traversal.on_definition += method(:check_variable)
     end
 
     private
-    def check_function(function)
-      return unless function.extern?
+    def check_function(func)
+      return unless func.extern?
+
       mapping = @context[:ld_function_mapping]
-      defs_and_decls =
-        (mapping.lookup_function_declarations(function.name) +
-         mapping.lookup_functions(function.name)).select { |f| f.extern? }
-      if defs_and_decls.any? { |f| f.signature != function.signature }
-        defs_and_decls.each { |f| W(:W1037, f.location, f.name) }
+      similar_dcls_or_funcs =
+        (mapping.lookup_function_declarations(func.name) +
+         mapping.lookup_functions(func.name)).select { |dcl_or_func|
+           dcl_or_func.extern? && dcl_or_func.signature != func.signature
+         }
+
+      unless similar_dcls_or_funcs.empty?
+        W(:W1037, func.location, func.signature)
+        similar_dcls_or_funcs.each do |pair_dcl_or_func|
+          C(:C0001, pair_dcl_or_func.location, pair_dcl_or_func.signature)
+        end
       end
     end
 
-    def check_variable(variable)
-      return unless variable.extern?
+    def check_variable(var)
+      return unless var.extern?
+
       mapping = @context[:ld_variable_mapping]
-      defs_and_decls =
-        (mapping.lookup_variable_declarations(variable.name) +
-         mapping.lookup_variables(variable.name)).select { |var| var.extern? }
-      if defs_and_decls.any? { |var| var.type != variable.type }
-        defs_and_decls.each { |var| W(:W1037, var.location, var.name) }
+      similar_dcls_or_vars =
+        (mapping.lookup_variable_declarations(var.name) +
+         mapping.lookup_variables(var.name)).select { |dcl_or_var|
+           dcl_or_var.extern? && dcl_or_var.type != var.type
+         }
+
+      unless similar_dcls_or_vars.empty?
+        W(:W1037, var.location, var.name)
+        similar_dcls_or_vars.each do |pair_dcl_or_var|
+          C(:C0001, pair_dcl_or_var.location, pair_dcl_or_var.name)
+        end
       end
     end
   end

data/lib/adlint/message.rb

@@ -372,7 +372,7 @@ module AdLint #:nodoc:
 
     private
     def base_dpath
-      Pathname.new("mesg.d/core").expand_path($etcdir)
+      Pathname.new("mesg.d/core").expand_path(Config[:etcdir])
     end
   end
 

data/lib/adlint/util.rb

@@ -445,7 +445,7 @@ module AdLint #:nodoc:
       if key_indices.empty?
         if instance_method("#{name}").arity == 0
           define_cache_manipulator(name)
-          class_eval(<<-EOS, "util.rb", 71)
+          class_eval <<-EOS
             define_method("#{name}") do |*args|
               @_#{name}_cache ||= nil
               @_#{name}_cache_forbidden ||= false
@@ -464,7 +464,7 @@ module AdLint #:nodoc:
           EOS
         else
           define_cache_manipulator(name, key_indices)
-          class_eval(<<-EOS, "util.rb", 90)
+          class_eval <<-EOS
             define_method("#{name}") do |*args|
               @_#{name}_cache ||= {}
               @_#{name}_cache_forbidden ||= false
@@ -484,7 +484,7 @@ module AdLint #:nodoc:
         end
       else
         define_cache_manipulator(name, key_indices)
-        class_eval(<<-EOS, "util.rb", 110)
+        class_eval <<-EOS
           define_method("#{name}") do |*args|
             @_#{name}_cache ||= {}
             @_#{name}_cache_forbidden ||= false
@@ -507,14 +507,14 @@ module AdLint #:nodoc:
 
     private
     def define_cache_manipulator(name, key_indices = nil)
-      class_eval(<<-EOS, "util.rb", 133)
+      class_eval <<-EOS
         define_method("forbid_#{name}_memoizing_once") do |*args|
           @_#{name}_cache_forbidden = true
         end
       EOS
       case
       when key_indices && key_indices.empty?
-        class_eval(<<-EOS, "util.rb", 140)
+        class_eval <<-EOS
           define_method("forget_#{name}_memo") do |*args|
             @_#{name}_cache.delete(args) if defined?(@_#{name}_cache)
           end
@@ -523,7 +523,7 @@ module AdLint #:nodoc:
           end
         EOS
       when key_indices
-        class_eval(<<-EOS, "util.rb", 149)
+        class_eval <<-EOS
           define_method("forget_#{name}_memo") do |*args|
             if defined?(@_#{name}_cache)
               @_#{name}_cache.delete(args.values_at(#{key_indices.join(',')}))
@@ -534,7 +534,7 @@ module AdLint #:nodoc:
           end
         EOS
       else
-        class_eval(<<-EOS, "util.rb", 160)
+        class_eval <<-EOS
           define_method("forget_#{name}_memo") do |*args|
             @_#{name}_cache = nil
           end
@@ -562,7 +562,7 @@ module AdLint #:nodoc:
 
   module Pluggable
     def def_plugin(event)
-      class_eval(<<-EOS, "util.rb", 188)
+      class_eval <<-EOS
         define_method("#{event}") do |*args|
           @#{event}_plugin ||= Plugin.new
         end

data/lib/adlint/version.rb

@@ -33,8 +33,8 @@ module AdLint #:nodoc:
 
   MAJOR_VERSION = 2
   MINOR_VERSION = 6
-  PATCH_VERSION = 12
-  RELEASE_DATE  = "2012-11-29"
+  PATCH_VERSION = 14
+  RELEASE_DATE  = "2012-12-17"
 
   TRAITS_SCHEMA_VERSION = "2.4.0"
 

data/lib/adlint.rb

@@ -65,3 +65,11 @@ require "adlint/version"
 require "adlint/cpp"
 require "adlint/c"
 require "adlint/ld"
+
+module AdLint #:nodoc:
+  Config = Hash.new
+  Config[:libdir] = Pathname.new(__FILE__).realpath.dirname
+  Config[:prefix] = Pathname.new("..").expand_path(Config[:libdir])
+  Config[:bindir] = Pathname.new("bin").expand_path(Config[:prefix])
+  Config[:etcdir] = Pathname.new("etc").expand_path(Config[:prefix])
+end

data/share/doc/developers_guide_ja.html

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