adlint 3.0.0 → 3.0.2

data/ChangeLog

@@ -1,3 +1,44 @@
+Thu Apr 12 10:48:11 2013  Yutaka Yanoh  <yanoh@users.sourceforge.net>
+
+	* release.ga : 3.0.2
+	  - Add missing transparency between a pointer to array and an array
+	    variable in expression evaluation.
+	  - Add missing transparency between a pointer function and a function
+	    in expression evaluation.
+	  - Clarify W0100 message text.
+	  - Refactor memoizing utility in preparation for performance tuning.
+
+Wed Apr 10 17:18:42 2013  Yutaka Yanoh  <yanoh@users.sourceforge.net>
+
+	* lib/adlint/memo.rb : Refactor memoizing utility in preparation for
+	  performance improvement.
+
+Tue Apr  2 17:22:02 2013  Yutaka Yanoh  <yanoh@users.sourceforge.net>
+
+	* release.rc : 3.0.1
+	  - Add missing transparency between a pointer to array and an array
+	    variable in expression evaluation.
+	  - Add missing transparency between a pointer function and a function
+	    in expression evaluation.
+	  - Clarify W0100 message text.
+
+Tue Apr  2 16:50:12 2013  Yutaka Yanoh  <yanoh@users.sourceforge.net>
+
+	* etc/mesg.d/c_builtin/ja_JP/messages.yml : Clarify W0100 message text.
+	* etc/mesg.d/c_builtin/en_US/messages.yml : Ditto.
+
+Mon Apr  1 15:55:03 2013  Yutaka Yanoh  <yanoh@users.sourceforge.net>
+
+	* lib/adlint/cc1/expr.rb : Add missing transparency between a pointer
+	  function and a function in expression evaluation.
+	* lib/adlint/cc1/interp.rb : Ditto.
+
+Thu Apr  1 10:08:45 2013  Yutaka Yanoh  <yanoh@users.sourceforge.net>
+
+	* lib/adlint/cc1/expr.rb : Add missing transparency between a pointer
+	  to array and an array variable in expression evaluation.
+	* lib/adlint/cc1/interp.rb : Ditto.
+
 Tue Mar 26 17:01:16 2013  Yutaka Yanoh  <yanoh@users.sourceforge.net>
 
 	* release.ga : 3.0.0

data/INSTALL

@@ -21,7 +21,7 @@
 
 ++
 
-=== Requirements
+=== Requirement
 
 * Ruby 1.9.3-p0 or later for normal use [*mandatory*]
 * GNU Make 3 or later to use adlintized Makefile [optional but recommended]

data/NEWS

@@ -21,6 +21,20 @@
 
 ++
 
+=== \AdLint 3.0.2 is released (2013-04-12)
+
+==== Changes since the 3.0.0 release
+
+* Add missing transparency between a pointer to array and an array variable in
+  expression evaluation
+* Add missing transparency between a pointer function and a function in
+  expression evaluation
+* Clarify W0100 message text
+
+See the file
+{ChangeLog}[http://adlint.sourceforge.net/pmwiki/upload.d/Main/ChangeLog]
+for more details.
+
 === \AdLint 3.0.0 is released (2013-03-27)
 
 ==== Changes since the 2.6.14 release
@@ -50,10 +64,6 @@
   the terminating execution path
 * Support Ruby 2.0.0-p0
 
-See the file
-{ChangeLog}[http://adlint.sourceforge.net/pmwiki/upload.d/Main/ChangeLog]
-for more details.
-
 === \AdLint 2.6.14 is released (2012-12-17)
 
 ==== Changes since the 2.6.12 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: "3.0.0"
+version: "3.0.2"
 
 message_definition:
   W0001:
@@ -335,7 +335,7 @@ message_definition:
   W0100:
     classes:
       - "UNC:X99"
-    format: "The value of variable `%s' is not change. It can be declarable with 'const'."
+    format: "The variable `%s' has not been reassigned since the initial value is assigned. It may be able to be defined as `const' with an initial value."
   W0101:
     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: "3.0.0"
+version: "3.0.2"
 
 message_definition:
   W0001:
@@ -335,7 +335,7 @@ message_definition:
   W0100:
     classes:
       - "UNC:X99"
-    format: "変数 `%s' は値が変わりません。const 付きで宣言できる可能性があります。"
+    format: "変数 `%s' は初期値を設定後に再代入されません。変数を const 付きで初期値を指定して定義できる可能性があります。"
   W0101:
     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: "3.0.0"
+version: "3.0.2"
 
 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: "3.0.0"
+version: "3.0.2"
 
 message_definition:
   X0001:

data/lib/adlint/cc1/expr.rb

@@ -461,7 +461,7 @@ module Cc1 #:nodoc:
       end
 
       def eval_array_subscript_expr(node, obj, subs)
-        unless obj.variable? && (obj.type.array? || obj.type.pointer?)
+        unless obj.variable? and obj.type.array? || obj.type.pointer?
           return create_tmpvar
         end
 
@@ -627,9 +627,9 @@ module Cc1 #:nodoc:
       end
 
       def eval_postfix_increment_expr(node, obj)
-        if obj.variable? && obj.type.scalar?
-          var = obj
-        else
+        var = object_to_variable(obj)
+        if !var.type.scalar? && !var.type.void?
+          # NOTE: To detect bad value reference of `void' expressions.
           return create_tmpvar
         end
 
@@ -650,9 +650,9 @@ module Cc1 #:nodoc:
       end
 
       def eval_postfix_decrement_expr(node, obj)
-        if obj.variable? && obj.type.scalar?
-          var = obj
-        else
+        var = object_to_variable(obj)
+        if !var.type.scalar? && !var.type.void?
+          # NOTE: To detect bad value reference of `void' expressions.
           return create_tmpvar
         end
 
@@ -673,9 +673,9 @@ module Cc1 #:nodoc:
       end
 
       def eval_prefix_increment_expr(node, obj)
-        if obj.variable? && obj.type.scalar?
-          var = obj
-        else
+        var = object_to_variable(obj)
+        if !var.type.scalar? && !var.type.void?
+          # NOTE: To detect bad value reference of `void' expressions.
           return create_tmpvar
         end
 
@@ -696,9 +696,9 @@ module Cc1 #:nodoc:
       end
 
       def eval_prefix_decrement_expr(node, obj)
-        if obj.variable? && obj.type.scalar?
-          var = obj
-        else
+        var = object_to_variable(obj)
+        if !var.type.scalar? && !var.type.void?
+          # NOTE: To detect bad value reference of `void' expressions.
           return create_tmpvar
         end
 
@@ -730,8 +730,9 @@ module Cc1 #:nodoc:
       end
 
       def eval_indirection_expr(node, obj)
-        if obj.variable? && obj.type.pointer?
-          ptr = obj
+        var = object_to_variable(obj)
+        if var.type.pointer?
+          ptr = var
         else
           return create_tmpvar
         end
@@ -768,12 +769,9 @@ module Cc1 #:nodoc:
 
       def eval_unary_arithmetic_expr(node, obj)
         var = object_to_variable(obj)
-        case
-        when !var.type.scalar? && !var.type.void?
+        if !var.type.scalar? && !var.type.void?
           # NOTE: To detect bad value reference of `void' expressions.
           return create_tmpvar
-        when var != obj
-          notify_implicit_conv_performed(node.operand, obj, var)
         end
 
         case node.operator.type
@@ -813,21 +811,15 @@ module Cc1 #:nodoc:
 
       def eval_multiplicative_expr(node, lhs_obj, rhs_obj)
         lhs_var = object_to_variable(lhs_obj)
-        case
-        when !lhs_var.type.scalar? && !lhs_var.type.void?
+        if !lhs_var.type.scalar? && !lhs_var.type.void?
           # NOTE: To detect bad value reference of `void' expressions.
           return create_tmpvar
-        when lhs_var != lhs_obj
-          notify_implicit_conv_performed(node.lhs_operand, lhs_obj, lhs_var)
         end
 
         rhs_var = object_to_variable(rhs_obj)
-        case
-        when !rhs_var.type.scalar? && !rhs_var.type.void?
+        if !rhs_var.type.scalar? && !rhs_var.type.void?
           # NOTE: To detect bad value reference of `void' expressions.
           return create_tmpvar
-        when rhs_var != rhs_obj
-          notify_implicit_conv_performed(node.rhs_operand, rhs_obj, rhs_var)
         end
 
         lhs_conved, rhs_conved =
@@ -872,21 +864,15 @@ module Cc1 #:nodoc:
 
       def eval_additive_expr(node, lhs_obj, rhs_obj)
         lhs_var = object_to_variable(lhs_obj)
-        case
-        when !lhs_var.type.scalar? && !lhs_var.type.void?
+        if !lhs_var.type.scalar? && !lhs_var.type.void?
           # NOTE: To detect bad value reference of `void' expressions.
           return create_tmpvar
-        when lhs_var != lhs_obj
-          notify_implicit_conv_performed(node.lhs_operand, lhs_obj, lhs_var)
         end
 
         rhs_var = object_to_variable(rhs_obj)
-        case
-        when !rhs_var.type.scalar? && !rhs_var.type.void?
+        if !rhs_var.type.scalar? && !rhs_var.type.void?
           # NOTE: To detect bad value reference of `void' expressions.
           return create_tmpvar
-        when rhs_var != rhs_obj
-          notify_implicit_conv_performed(node.rhs_operand, rhs_obj, rhs_var)
         end
 
         lhs_conved, rhs_conved =
@@ -923,21 +909,15 @@ module Cc1 #:nodoc:
 
       def eval_shift_expr(node, lhs_obj, rhs_obj)
         lhs_var = object_to_variable(lhs_obj)
-        case
-        when !lhs_var.type.scalar? && !lhs_var.type.void?
+        if !lhs_var.type.scalar? && !lhs_var.type.void?
           # NOTE: To detect bad value reference of `void' expressions.
           return create_tmpvar
-        when lhs_var != lhs_obj
-          notify_implicit_conv_performed(node.lhs_operand, lhs_obj, lhs_var)
         end
 
         rhs_var = object_to_variable(rhs_obj)
-        case
-        when !rhs_var.type.scalar? && !rhs_var.type.void?
+        if !rhs_var.type.scalar? && !rhs_var.type.void?
           # NOTE: To detect bad value reference of `void' expressions.
           return create_tmpvar
-        when rhs_var != rhs_obj
-          notify_implicit_conv_performed(node.rhs_operand, rhs_obj, rhs_var)
         end
 
         # NOTE: The ISO C99 standard says;
@@ -984,21 +964,15 @@ module Cc1 #:nodoc:
 
       def eval_relational_expr(node, lhs_obj, rhs_obj)
         lhs_var = object_to_variable(lhs_obj)
-        case
-        when !lhs_var.type.scalar? && !lhs_var.type.void?
+        if !lhs_var.type.scalar? && !lhs_var.type.void?
           # NOTE: To detect bad value reference of `void' expressions.
           return create_tmpvar(int_t, scalar_value_of_arbitrary)
-        when lhs_var != lhs_obj
-          notify_implicit_conv_performed(node.lhs_operand, lhs_obj, lhs_var)
         end
 
         rhs_var = object_to_variable(rhs_obj)
-        case
-        when !rhs_var.type.scalar? && !rhs_var.type.void?
+        if !rhs_var.type.scalar? && !rhs_var.type.void?
           # NOTE: To detect bad value reference of `void' expressions.
           return create_tmpvar(int_t, scalar_value_of_arbitrary)
-        when rhs_var != rhs_obj
-          notify_implicit_conv_performed(node.rhs_operand, rhs_obj, rhs_var)
         end
 
         lhs_conved, rhs_conved =
@@ -1035,21 +1009,15 @@ module Cc1 #:nodoc:
 
       def eval_equality_expr(node, lhs_obj, rhs_obj)
         lhs_var = object_to_variable(lhs_obj)
-        case
-        when !lhs_var.type.scalar? && !lhs_var.type.void?
+        if !lhs_var.type.scalar? && !lhs_var.type.void?
           # NOTE: To detect bad value reference of `void' expressions.
           return create_tmpvar(int_t, scalar_value_of_arbitrary)
-        when lhs_var != lhs_obj
-          notify_implicit_conv_performed(node.lhs_operand, lhs_obj, lhs_var)
         end
 
         rhs_var = object_to_variable(rhs_obj)
-        case
-        when !rhs_var.type.scalar? && !rhs_var.type.void?
+        if !rhs_var.type.scalar? && !rhs_var.type.void?
           # NOTE: To detect bad value reference of `void' expressions.
           return create_tmpvar(int_t, scalar_value_of_arbitrary)
-        when rhs_var != rhs_obj
-          notify_implicit_conv_performed(node.rhs_operand, rhs_obj, rhs_var)
         end
 
         lhs_conved, rhs_conved =
@@ -1082,21 +1050,15 @@ module Cc1 #:nodoc:
 
       def eval_and_expr(node, lhs_obj, rhs_obj)
         lhs_var = object_to_variable(lhs_obj)
-        case
-        when !lhs_var.type.scalar? && !lhs_var.type.void?
+        if !lhs_var.type.scalar? && !lhs_var.type.void?
           # NOTE: To detect bad value reference of `void' expressions.
           return create_tmpvar
-        when lhs_var != lhs_obj
-          notify_implicit_conv_performed(node.lhs_operand, lhs_obj, lhs_var)
         end
 
         rhs_var = object_to_variable(rhs_obj)
-        case
-        when !rhs_var.type.scalar? && !rhs_var.type.void?
+        if !rhs_var.type.scalar? && !rhs_var.type.void?
           # NOTE: To detect bad value reference of `void' expressions.
           return create_tmpvar
-        when rhs_var != rhs_obj
-          notify_implicit_conv_performed(node.rhs_operand, rhs_obj, rhs_var)
         end
 
         lhs_conved, rhs_conved =
@@ -1124,21 +1086,15 @@ module Cc1 #:nodoc:
 
       def eval_exclusive_or_expr(node, lhs_obj, rhs_obj)
         lhs_var = object_to_variable(lhs_obj)
-        case
-        when !lhs_var.type.scalar? && !lhs_var.type.void?
+        if !lhs_var.type.scalar? && !lhs_var.type.void?
           # NOTE: To detect bad value reference of `void' expressions.
           return create_tmpvar
-        when lhs_var != lhs_obj
-          notify_implicit_conv_performed(node.lhs_operand, lhs_obj, lhs_var)
         end
 
         rhs_var = object_to_variable(rhs_obj)
-        case
-        when !rhs_var.type.scalar? && !rhs_var.type.void?
+        if !rhs_var.type.scalar? && !rhs_var.type.void?
           # NOTE: To detect bad value reference of `void' expressions.
           return create_tmpvar
-        when rhs_var != rhs_obj
-          notify_implicit_conv_performed(node.rhs_operand, rhs_obj, rhs_var)
         end
 
         lhs_conved, rhs_conved =
@@ -1166,21 +1122,15 @@ module Cc1 #:nodoc:
 
       def eval_inclusive_or_expr(node, lhs_obj, rhs_obj)
         lhs_var = object_to_variable(lhs_obj)
-        case
-        when !lhs_var.type.scalar? && !lhs_var.type.void?
+        if !lhs_var.type.scalar? && !lhs_var.type.void?
           # NOTE: To detect bad value reference of `void' expressions.
           return create_tmpvar
-        when lhs_var != lhs_obj
-          notify_implicit_conv_performed(node.lhs_operand, lhs_obj, lhs_var)
         end
 
         rhs_var = object_to_variable(rhs_obj)
-        case
-        when !rhs_var.type.scalar? && !rhs_var.type.void?
+        if !rhs_var.type.scalar? && !rhs_var.type.void?
           # NOTE: To detect bad value reference of `void' expressions.
           return create_tmpvar
-        when rhs_var != rhs_obj
-          notify_implicit_conv_performed(node.rhs_operand, rhs_obj, rhs_var)
         end
 
         lhs_conved, rhs_conved =
@@ -1207,16 +1157,8 @@ module Cc1 #:nodoc:
       end
 
       def eval_simple_assignment_expr(node, lhs_obj, rhs_obj)
-        if lhs_obj.variable?
-          lhs_var = lhs_obj
-        else
-          return lhs_obj
-        end
-
+        lhs_var = object_to_variable(lhs_obj)
         rhs_var = object_to_variable(rhs_obj)
-        unless rhs_var == rhs_obj
-          notify_implicit_conv_performed(node.rhs_operand, rhs_obj, rhs_var)
-        end
 
         if rhs_var.type.same_as?(lhs_var.type)
           rhs_conved = rhs_var
@@ -1240,19 +1182,16 @@ module Cc1 #:nodoc:
       end
 
       def eval_compound_assignment_expr(node, lhs_obj, rhs_obj)
-        if lhs_obj.variable? && lhs_obj.type.scalar?
-          lhs_var = lhs_obj
-        else
+        lhs_var = object_to_variable(lhs_obj)
+        if !lhs_var.type.scalar? && !lhs_var.type.void?
+          # NOTE: To detect bad value reference of `void' expressions.
           return lhs_obj
         end
 
         rhs_var = object_to_variable(rhs_obj)
-        case
-        when !rhs_var.type.scalar? && !rhs_var.type.void?
+        if !rhs_var.type.scalar? && !rhs_var.type.void?
           # NOTE: To detect bad value reference of `void' expressions.
-          return create_tmpvar
-        when rhs_var != rhs_obj
-          notify_implicit_conv_performed(node.rhs_operand, rhs_obj, rhs_var)
+          return lhs_var
         end
 
         case node.operator.type

data/lib/adlint/cc1/interp.rb

@@ -430,14 +430,22 @@ module Cc1 #:nodoc:
     def object_to_variable(obj)
       case
       when obj.function?
-        create_tmpvar(pointer_type(obj.type), pointer_value_of(obj))
-      when obj.type.array?
-        create_tmpvar(pointer_type(obj.type.base_type), pointer_value_of(obj))
+        function_to_pointer(obj)
+      when obj.variable? && obj.type.array?
+        array_to_pointer(obj)
       else
         obj
       end
     end
 
+    def function_to_pointer(fun)
+      create_tmpvar(pointer_type(fun.type), pointer_value_of(fun))
+    end
+
+    def array_to_pointer(ary)
+      create_tmpvar(pointer_type(ary.type.base_type), pointer_value_of(ary))
+    end
+
     def value_of(obj)
       if obj.type.array? || obj.type.function?
         pointer_value_of(obj)

data/lib/adlint/memo.rb

@@ -33,124 +33,125 @@ module AdLint #:nodoc:
 
   module Memoizable
     def memoize(name, *key_indices)
-      var_name = name.to_s.sub("?", "Q")
-      org_name = "_org_#{name}"
+      if instance_method(name).arity == 0
+        memoize_noarg_method(name)
+      else
+        memoize_ordinary_method(name, key_indices)
+      end
+    end
+
+    private
+    def memoize_noarg_method(name)
+      save_memoizing_method(name)
+      prepare_noarg_method_cache(name)
       class_eval <<-EOS
-        alias_method("#{org_name}", "#{name}")
-        private("#{org_name}")
-      EOS
-      if key_indices.empty?
-        if instance_method("#{name}").arity == 0
-          define_cache_manipulator(name, var_name)
-          class_eval <<-EOS
-            define_method("#{name}") do
-              @_cache_of__#{var_name}_initialized ||= false
-              if @_cache_of__#{var_name}_initialized
-                @_cache_of__#{var_name}_forbidden = false
-                @_cache_of__#{var_name}
-              else
-                @_cache_of__#{var_name}_forbidden ||= false
-                if @_cache_of__#{var_name}_forbidden
-                  @_cache_of__#{var_name}_forbidden = false
-                  #{org_name}
-                else
-                  @_cache_of__#{var_name}_initialized = true
-                  @_cache_of__#{var_name} = #{org_name}
-                end
-              end
-            end
-          EOS
-        else
-          define_cache_manipulator(name, var_name, key_indices)
-          class_eval <<-EOS
-            define_method("#{name}") do |*args|
-              @_cache_of__#{var_name}_initialized ||= false
-              if @_cache_of__#{var_name}_initialized
-                @_cache_of__#{var_name}_forbidden = false
-                if @_cache_of__#{var_name}.include?(args)
-                  @_cache_of__#{var_name}[args]
-                else
-                  @_cache_of__#{var_name}[args] = #{org_name}(*args)
-                end
-              else
-                @_cache_of__#{var_name}_forbidden ||= false
-                if @_cache_of__#{var_name}_forbidden
-                  @_cache_of__#{var_name}_forbidden = false
-                  #{org_name}(*args)
-                else
-                  @_cache_of__#{var_name}_initialized = true
-                  @_cache_of__#{var_name} = {}
-                  @_cache_of__#{var_name}[args] = #{org_name}(*args)
-                end
-              end
+        define_method(:#{name}) do
+          if #{cache_name_of(name)}_initialized ||= false
+            #{cache_name_of(name)}_forbidden = false
+            #{cache_name_of(name)}
+          else
+            if #{cache_name_of(name)}_forbidden ||= false
+              #{cache_name_of(name)}_forbidden = false
+              #{org_name_of(name)}
+            else
+              #{cache_name_of(name)}_initialized = true
+              #{cache_name_of(name)} = #{org_name_of(name)}
             end
-          EOS
+          end
         end
-      else
-        define_cache_manipulator(name, var_name, key_indices)
-        class_eval <<-EOS
-          define_method("#{name}") do |*args|
-            @_cache_of__#{var_name}_initialized ||= false
-            key = args.values_at(#{key_indices.join(',')})
-            if @_cache_of__#{var_name}_initialized
-              @_cache_of__#{var_name}_forbidden = false
-              if @_cache_of__#{var_name}.include?(key)
-                @_cache_of__#{var_name}[key]
-              else
-                @_cache_of__#{var_name}[key] = #{org_name}(*args)
-              end
+      EOS
+    end
+
+    def memoize_ordinary_method(name, key_indices)
+      save_memoizing_method(name)
+      prepare_ordinary_method_cache(name, key_indices)
+      class_eval <<-EOS
+        define_method(:#{name}) do |*args|
+          key = __key_for_#{name}(*args)
+          if #{cache_name_of(name)}_initialized ||= false
+            #{cache_name_of(name)}_forbidden = false
+            if #{cache_name_of(name)}.include?(key)
+              #{cache_name_of(name)}[key]
+            else
+              #{cache_name_of(name)}[key] = #{org_name_of(name)}(*args)
+            end
+          else
+            if #{cache_name_of(name)}_forbidden ||= false
+              #{cache_name_of(name)}_forbidden = false
+              #{org_name_of(name)}(*args)
             else
-              @_cache_of__#{var_name}_forbidden ||= false
-              if @_cache_of__#{var_name}_forbidden
-                @_cache_of__#{var_name}_forbidden = false
-                #{org_name}(*args)
-              else
-                @_cache_of__#{var_name}_initialized = true
-                @_cache_of__#{var_name} = {}
-                @_cache_of__#{var_name}[key] = #{org_name}(*args)
-              end
+              #{cache_name_of(name)}_initialized = true
+              #{cache_name_of(name)} = {}
+              #{cache_name_of(name)}[key] = #{org_name_of(name)}(*args)
             end
           end
-        EOS
-      end
+        end
+      EOS
     end
 
-    private
-    def define_cache_manipulator(name, var_name, key_indices = nil)
+    def prepare_noarg_method_cache(name)
       class_eval <<-EOS
-        define_method("forbid_once_memo_of__#{name}") do
-          @_cache_of__#{var_name}_forbidden = true
+        define_method(:forbid_once_memo_of__#{name}) do
+          #{cache_name_of(name)}_forbidden = true
         end
-        define_method("clear_memo_of__#{name}") do
-          @_cache_of__#{var_name} = nil
-          @_cache_of__#{var_name}_initialized = false
+        define_method(:clear_memo_of__#{name}) do
+          #{cache_name_of(name)} = nil
+          #{cache_name_of(name)}_initialized = false
+        end
+        define_method(:forget_memo_of__#{name}) do
+          clear_memo_of__#{name}
         end
       EOS
-      case
-      when key_indices && key_indices.empty?
-        class_eval <<-EOS
-          define_method("forget_memo_of__#{name}") do |*args|
-            if @_cache_of__#{var_name}_initialized
-              @_cache_of__#{var_name}.delete(args)
-            end
+    end
+
+    def prepare_ordinary_method_cache(name, key_indices)
+      define_key_generator(name, key_indices)
+      class_eval <<-EOS
+        define_method(:forbid_once_memo_of__#{name}) do
+          #{cache_name_of(name)}_forbidden = true
+        end
+        define_method(:clear_memo_of__#{name}) do
+          #{cache_name_of(name)} = nil
+          #{cache_name_of(name)}_initialized = false
+        end
+        define_method(:forget_memo_of__#{name}) do |*args|
+          if #{cache_name_of(name)}_initialized
+            #{cache_name_of(name)}.delete(__key_for_#{name}(*args))
           end
-        EOS
-      when key_indices
+        end
+      EOS
+    end
+
+    def define_key_generator(name, key_indices)
+      if key_indices.empty?
         class_eval <<-EOS
-          define_method("forget_memo_of__#{name}") do |*args|
-            if @_cache_of__#{var_name}_initialized
-              key = args.values_at(#{key_indices.join(',')})
-              @_cache_of__#{var_name}.delete(key)
-            end
+          define_method(:__key_for_#{name}) do |*args|
+            args
           end
         EOS
       else
         class_eval <<-EOS
-          define_method("forget_memo_of__#{name}") do
-            clear_memo_of__#{name}
+          define_method(:__key_for_#{name}) do |*args|
+            args.values_at(#{key_indices.join(',')})
           end
         EOS
       end
+      class_eval "private(:__key_for_#{name})"
+    end
+
+    def save_memoizing_method(name)
+      class_eval <<-EOS
+        alias_method(:#{org_name_of(name)}, :#{name})
+        private(:#{org_name_of(name)})
+      EOS
+    end
+
+    def cache_name_of(name)
+      "@__cache_of__#{name.to_s.sub("?", "Q")}"
+    end
+
+    def org_name_of(name)
+      "__org_#{name}"
     end
   end
 

data/lib/adlint/version.rb

@@ -33,8 +33,8 @@ module AdLint #:nodoc:
 
   MAJOR_VERSION = 3
   MINOR_VERSION = 0
-  PATCH_VERSION = 0
-  RELEASE_DATE  = "2013-03-27"
+  PATCH_VERSION = 2
+  RELEASE_DATE  = "2013-04-12"
 
   TRAITS_SCHEMA_VERSION = "3.0.0"
 

data/share/doc/developers_guide_ja.html

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

data/share/doc/users_guide_en.html

@@ -1,8 +1,8 @@
 <html lang="en">
 <head>
-<title>AdLint 3.0.0 User's Guide</title>
+<title>AdLint 3.0.2 User's Guide</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="description" content="AdLint 3.0.0 User's Guide">
+<meta name="description" content="AdLint 3.0.2 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 3.0.0 User's Guide</h1>
+<h1 class="settitle">AdLint 3.0.2 User's Guide</h1>
 <div class="node">
 <a name="Top"></a>
 <p><hr>
@@ -2420,7 +2420,7 @@ Up:&nbsp;<a rel="up" accesskey="u" href="#Top">Top</a>
 <li><a href="#W0093">W0093</a>: This expression may cause division-by-zero. 
 <li><a href="#W0096">W0096</a>: It divided by a constant expression which definitely zero. 
 <li><a href="#W0097">W0097</a>: This expression must cause division-by-zero. 
-<li><a href="#W0100">W0100</a>: The value of variable `%s' is not change. It can be declarable with 'const'. 
+<li><a href="#W0100">W0100</a>: The variable `%s' has not been reassigned since the initial value is assigned. It may be able to be defined as `const' with an initial value. 
 <li><a href="#W0101">W0101</a>: An address of auto variable is substituted for a pointer which has a longer life. This program is danger. 
 <li><a href="#W0102">W0102</a>: An address of auto variable is returned via formal argument to functions. This program is danger. 
 <li><a href="#W0103">W0103</a>: An address of auto variable is returned as return value from a function. This program is danger. 
@@ -6270,7 +6270,7 @@ Up:&nbsp;<a rel="up" accesskey="u" href="#Messages">Messages</a>
 
 <h4 class="subsection">6.83.1 Message body</h4>
 
-<p>The value of variable `%s' is not change. It can be declarable with 'const'.
+<p>The variable `%s' has not been reassigned since the initial value is assigned. It may be able to be defined as `const' with an initial value.
 
 <h4 class="subsection">6.83.2 Content</h4>
 

data/share/doc/users_guide_en.texi

@@ -2,7 +2,7 @@
 @setfilename users_guide_en.info
 @documentlanguage en
 @documentencoding utf-8
-@settitle AdLint 3.0.0 User's Guide
+@settitle AdLint 3.0.2 User's Guide
 
 @copying
 Copyright (C) 2010-2013, OGIS-RI Co.,Ltd.
@@ -2457,7 +2457,7 @@ context_line
 * W0093::This expression may cause division-by-zero.
 * W0096::It divided by a constant expression which definitely zero.
 * W0097::This expression must cause division-by-zero.
-* W0100::The value of variable `%s' is not change. It can be declarable with 'const'.
+* W0100::The variable `%s' has not been reassigned since the initial value is assigned. It may be able to be defined as `const' with an initial value.
 * W0101::An address of auto variable is substituted for a pointer which has a longer life. This program is danger.
 * W0102::An address of auto variable is returned via formal argument to functions. This program is danger.
 * W0103::An address of auto variable is returned as return value from a function. This program is danger.
@@ -5646,7 +5646,7 @@ None.
 
 @subsection Message body
 
-The value of variable `%s' is not change. It can be declarable with 'const'.
+The variable `%s' has not been reassigned since the initial value is assigned. It may be able to be defined as `const' with an initial value.
 
 @subsection Content
 

data/share/doc/users_guide_ja.html

@@ -1,8 +1,8 @@
 <html lang="ja">
 <head>
-<title>AdLint 3.0.0 利用者ガイド</title>
+<title>AdLint 3.0.2 利用者ガイド</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="description" content="AdLint 3.0.0 利用者ガイド">
+<meta name="description" content="AdLint 3.0.2 利用者ガイド">
 <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 3.0.0 利用者ガイド</h1>
+<h1 class="settitle">AdLint 3.0.2 利用者ガイド</h1>
 <div class="node">
 <a name="Top"></a>
 <p><hr>
@@ -2486,7 +2486,7 @@ Up:&nbsp;<a rel="up" accesskey="u" href="#Top">Top</a>
 <li><a href="#W0093">W0093</a>: ゼロで除算される恐れがあります。
 <li><a href="#W0096">W0096</a>: ゼロになる定数式で除算しています。
 <li><a href="#W0097">W0097</a>: ゼロの値で除算しています。
-<li><a href="#W0100">W0100</a>: 変数 `%s' は値が変わりません。const 付きで宣言できる可能性があります。
+<li><a href="#W0100">W0100</a>: 変数 `%s' は初期値を設定後に再代入されません。変数を const 付きで初期値を指定して定義できる可能性があります。
 <li><a href="#W0101">W0101</a>: 自動変数のアドレスが、より長い寿命を持つポインタに代入されています。このプログラムは危険です。
 <li><a href="#W0102">W0102</a>: 自動変数のアドレスが、関数の仮引数を介して戻されています。このプログラムは危険です。
 <li><a href="#W0103">W0103</a>: 自動変数のアドレスが、戻り値として関数から返されています。このプログラムは危険です。
@@ -6390,7 +6390,7 @@ Up:&nbsp;<a rel="up" accesskey="u" href="#Messages">Messages</a>
 
 <h4 class="subsection">6.83.1 メッセージ本文</h4>
 
-<p>変数 `%s' は値が変わりません。const 付きで宣言できる可能性があります。
+<p>変数 `%s' は初期値を設定後に再代入されません。変数を const 付きで初期値を指定して定義できる可能性があります。
 
 <h4 class="subsection">6.83.2 内容</h4>
 

data/share/doc/users_guide_ja.texi

@@ -2,7 +2,7 @@
 @setfilename users_guide_ja.info
 @documentlanguage ja
 @documentencoding utf-8
-@settitle AdLint 3.0.0 利用者ガイド
+@settitle AdLint 3.0.2 利用者ガイド
 
 @copying
 Copyright (C) 2010-2013, OGIS-RI Co.,Ltd.
@@ -2517,7 +2517,7 @@ context_line
 * W0093::ゼロで除算される恐れがあります。
 * W0096::ゼロになる定数式で除算しています。
 * W0097::ゼロの値で除算しています。
-* W0100::変数 `%s' は値が変わりません。const 付きで宣言できる可能性があります。
+* W0100::変数 `%s' は初期値を設定後に再代入されません。変数を const 付きで初期値を指定して定義できる可能性があります。
 * W0101::自動変数のアドレスが、より長い寿命を持つポインタに代入されています。このプログラムは危険です。
 * W0102::自動変数のアドレスが、関数の仮引数を介して戻されています。このプログラムは危険です。
 * W0103::自動変数のアドレスが、戻り値として関数から返されています。このプログラムは危険です。
@@ -5753,7 +5753,7 @@ int func(int a, int b)
 
 @subsection メッセージ本文
 
-変数 `%s' は値が変わりません。const 付きで宣言できる可能性があります。
+変数 `%s' は初期値を設定後に再代入されません。変数を const 付きで初期値を指定して定義できる可能性があります。
 
 @subsection 内容
 

data/share/sample/ruby-1.9.3-p0/adlint/ext-coverage/adlint_traits.yml

@@ -52,7 +52,7 @@ project_traits:
   #       - "../bar/baz"
   target_files:
     inclusion_paths:
-        - "../../ruby-1.9.3-p0"
+      - "../../ruby-1.9.3-p0"
     exclusion_paths:
 
   # Pathname of the project specific initial header file.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adlint
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-27 00:00:00.000000000 Z
+date: 2013-04-12 00:00:00.000000000 Z
 dependencies: []
 description: ! 'AdLint is a source code static analyzer.