adlint 1.10.0 → 1.12.0

data/lib/adlint/c/value.rb

@@ -30,6 +30,7 @@
 #++
 
 require "adlint/c/domain"
+require "adlint/c/operator"
 
 module AdLint #:nodoc:
 module C #:nodoc:
@@ -79,6 +80,14 @@ module C #:nodoc:
       subclass_responsibility
     end
 
+    def definite?
+      subclass_responsibility
+    end
+
+    def contain?(value)
+      subclass_responsibility
+    end
+
     def multiple?
       subclass_responsibility
     end
@@ -87,11 +96,11 @@ module C #:nodoc:
       subclass_responsibility
     end
 
-    def narrow_domain!(operator_symbol, operand_value)
+    def narrow_domain!(operator, operand_value)
       subclass_responsibility
     end
 
-    def widen_domain!(operator_symbol, operand_value)
+    def widen_domain!(operator, operand_value)
       subclass_responsibility
     end
 
@@ -370,6 +379,19 @@ module C #:nodoc:
       !@domain.empty?
     end
 
+    def definite?
+      @domain.kind_of?(EqualToValueDomain)
+    end
+
+    def contain?(value)
+      case single_value = value.to_single_value
+      when ScalarValue
+        @domain.contain?(single_value.domain)
+      else
+        false
+      end
+    end
+
     def undefined?
       @domain.undefined?
     end
@@ -387,22 +409,22 @@ module C #:nodoc:
       end
     end
 
-    def narrow_domain!(operator_symbol, operand_value)
+    def narrow_domain!(operator, operand_value)
       case operand_single_value = operand_value.to_single_value
       when ScalarValue
         orig_domain = @domain
-        @domain = @domain.narrow(operator_symbol, operand_single_value.domain)
+        @domain = @domain.narrow(operator, operand_single_value.domain)
         !@domain.equal?(orig_domain)
       else
         raise TypeError, "cannot narrow scalar value domain with non-scalar."
       end
     end
 
-    def widen_domain!(operator_symbol, operand_value)
+    def widen_domain!(operator, operand_value)
       case operand_single_value = operand_value.to_single_value
       when ScalarValue
         orig_domain = @domain
-        @domain = @domain.widen(operator_symbol, operand_single_value.domain)
+        @domain = @domain.widen(operator, operand_single_value.domain)
         !@domain.equal?(orig_domain)
       else
         raise TypeError, "cannot widen scalar value domain with non-scalar."
@@ -605,7 +627,7 @@ module C #:nodoc:
       when ScalarValue
         comp_result = (self == single_value)
         single_value.invert_domain!
-        single_value.narrow_domain!(:==, self)
+        single_value.narrow_domain!(Operator::EQ, self)
         comp_result.domain.intersect?(ScalarValue.of_true.domain) &&
           !comp_result.domain.contain?(ScalarValue.of_false.domain) &&
           !@domain.intersect?(single_value.domain)
@@ -752,6 +774,25 @@ module C #:nodoc:
       @values.empty? ? true : @values.all? { |value| value.exist? }
     end
 
+    def definite?
+      @values.empty? ? true : @values.all? { |value| value.definite? }
+    end
+
+    def contain?(value)
+      case single_value = value.to_single_value
+      when ArrayValue
+        if @values.size == single_value.values.size
+          @values.zip(single_value.values).all? do |lhs, rhs|
+            lhs.contain?(rhs)
+          end
+        else
+          false
+        end
+      else
+        false
+      end
+    end
+
     def undefined?
       @values.empty? ? false : @values.all? { |value| value.undefined? }
     end
@@ -771,12 +812,12 @@ module C #:nodoc:
       end
     end
 
-    def narrow_domain!(operator_symbol, operand_value)
+    def narrow_domain!(operator, operand_value)
       case operand_single_value = operand_value.to_single_value
       when ArrayValue
         @values.zip(operand_single_value.values).map { |lhs, rhs|
           if rhs
-            lhs.narrow_domain!(operator_symbol, rhs)
+            lhs.narrow_domain!(operator, rhs)
           else
             next
           end
@@ -786,12 +827,12 @@ module C #:nodoc:
       end
     end
 
-    def widen_domain!(operator_symbol, operand_value)
+    def widen_domain!(operator, operand_value)
       case operand_single_value = operand_value.to_single_value
       when ArrayValue
         @values.zip(operand_single_value.values).map { |lhs, rhs|
           if rhs
-            lhs.widen_domain!(operator_symbol, rhs)
+            lhs.widen_domain!(operator, rhs)
           else
             next
           end
@@ -1227,6 +1268,25 @@ module C #:nodoc:
       @values.empty? ? true : @values.all? { |value| value.exist? }
     end
 
+    def definite?
+      @values.empty? ? true : @values.all? { |value| value.definite? }
+    end
+
+    def contain?(value)
+      case single_value = value.to_single_value
+      when CompositeValue
+        if @values.size == single_value.values.size
+          @values.zip(single_value.values).all? do |lhs, rhs|
+            lhs.contain?(rhs)
+          end
+        else
+          false
+        end
+      else
+        false
+      end
+    end
+
     def undefined?
       @values.empty? ? false : @values.all? { |value| value.undefined? }
     end
@@ -1246,12 +1306,12 @@ module C #:nodoc:
       end
     end
 
-    def narrow_domain!(operator_symbol, operand_value)
+    def narrow_domain!(operator, operand_value)
       case operand_single_value = operand_value.to_single_value
       when CompositeValue
         @values.zip(operand_single_value.values).map { |lhs, rhs|
           if rhs
-            lhs.narrow_domain!(operator_symbol, rhs)
+            lhs.narrow_domain!(operator, rhs)
           else
             next
           end
@@ -1262,12 +1322,12 @@ module C #:nodoc:
       end
     end
 
-    def widen_domain!(operator_symbol, operand_value)
+    def widen_domain!(operator, operand_value)
       case operand_single_value = operand_value.to_single_value
       when CompositeValue
         @values.zip(operand_single_value.values).map { |lhs, rhs|
           if rhs
-            lhs.widen_domain!(operator_symbol, rhs)
+            lhs.widen_domain!(operator, rhs)
           else
             next
           end
@@ -1671,6 +1731,17 @@ module C #:nodoc:
       effective_values.any? { |multi_value| multi_value.base_value.exist? }
     end
 
+    def definite?
+      effective_values.all? { |multi_value| multi_value.base_value.definite? }
+    end
+
+    def contain?(value)
+      single_value = value.to_single_value
+      effective_values.all? do |multi_value|
+        multi_value.base_value.contain?(single_value)
+      end
+    end
+
     def multiple?
       true
     end
@@ -1682,27 +1753,25 @@ module C #:nodoc:
       end
     end
 
-    def narrow_domain!(operator_symbol, operand_value)
+    def narrow_domain!(operator, operand_value)
       operand_single_value = operand_value.to_single_value
       effective_values.map { |multi_value|
         if ancestor = multi_value.ancestor
-          ancestor.base_value.narrow_domain!(operator_symbol.invert,
+          ancestor.base_value.narrow_domain!(operator.for_complement,
                                              operand_single_value)
         end
-        multi_value.base_value.narrow_domain!(operator_symbol,
-                                              operand_single_value)
+        multi_value.base_value.narrow_domain!(operator, operand_single_value)
       }.any?
     end
 
-    def widen_domain!(operator_symbol, operand_value)
+    def widen_domain!(operator, operand_value)
       operand_single_value = operand_value.to_single_value
       effective_values.map { |multi_value|
         if ancestor = multi_value.ancestor
-          ancestor.base_value.narrow_domain!(operator_symbol.invert,
+          ancestor.base_value.narrow_domain!(operator.for_complement,
                                              operand_single_value)
         end
-        multi_value.base_value.widen_domain!(operator_symbol,
-                                             operand_single_value)
+        multi_value.base_value.widen_domain!(operator, operand_single_value)
       }.any?
     end
 
@@ -2047,13 +2116,13 @@ module C #:nodoc:
       invalidate_memo!
     end
 
-    def narrow_domain!(operator_symbol, operand_value)
+    def narrow_domain!(operator, operand_value)
       @version_controller.fork_current_version
       super
       invalidate_memo!
     end
 
-    def widen_domain!(operator_symbol, operand_value)
+    def widen_domain!(operator, operand_value)
       @version_controller.fork_current_version
       super
       invalidate_memo!
@@ -2326,6 +2395,8 @@ module C #:nodoc:
     def_delegator :@versioned_value, :composite?
     def_delegator :@versioned_value, :undefined?
     def_delegator :@versioned_value, :exist?
+    def_delegator :@versioned_value, :definite?
+    def_delegator :@versioned_value, :contain?
     def_delegator :@versioned_value, :multiple?
     def_delegator :@versioned_value, :enter_versioning_group
     def_delegator :@versioned_value, :leave_versioning_group

data/lib/adlint/c.rb

@@ -47,6 +47,7 @@ require "adlint/c/message"
 require "adlint/c/message_shima"
 require "adlint/c/metric"
 require "adlint/c/object"
+require "adlint/c/operator"
 require "adlint/c/option"
 require "adlint/c/parser"
 require "adlint/c/phase"

data/lib/adlint/prelude.rb

@@ -34,6 +34,12 @@ module Kernel
   def subclass_responsibility
     raise NotImplementedError, self.class.name
   end
+  module_function :subclass_responsibility
+
+  def __NOTREACHED__
+    raise "NOTREACHED"
+  end
+  module_function :__NOTREACHED__
 
   def print_elapsed_time(io)
     tms = Process.times
@@ -58,7 +64,7 @@ end
 class Module
   # NOTE: Module.private_constant is added in Ruby 1.9.3-p0.
   unless public_instance_methods.include?(:private_constant)
-    def private_constant(*name) end
+    def private_constant(*) end
   end
 end
 
@@ -120,20 +126,6 @@ class Integer
   end
 end
 
-class Symbol
-  INVERSION_TABLE = {
-    :== => :!=, :!= => :==, :< => :>=, :> => :<=, :<= => :>, :>= => :<
-  }
-
-  def invert
-    if result = INVERSION_TABLE[self]
-      result
-    else
-      self
-    end
-  end
-end
-
 class Pathname
   def components
     self.each_filename.to_a
@@ -283,9 +275,15 @@ class SuffixArray < Array
   def create_substring_pairs(index, length)
     base_suffix = self[index][0]
 
-    create_entry = base_suffix.lhs? ?
-      lambda { |lhs, rhs, len| SubstringPair.new(lhs, rhs, len) } :
-      lambda { |rhs, lhs, len| SubstringPair.new(lhs, rhs, len) }
+    if base_suffix.lhs?
+      create_entry = lambda { |lhs, rhs, len|
+        SubstringPair.new(lhs, rhs, len)
+      }
+    else
+      create_entry = lambda { |rhs, lhs, len|
+        SubstringPair.new(lhs, rhs, len)
+      }
+    end
 
     result = []
 

data/lib/adlint/version.rb

@@ -32,9 +32,9 @@
 module AdLint #:nodoc:
 
   MAJOR_VERSION = 1
-  MINOR_VERSION = 10
+  MINOR_VERSION = 12
   PATCH_VERSION = 0
-  RELEASE_DATE  = "2012-06-06"
+  RELEASE_DATE  = "2012-06-20"
 
   TRAITS_SCHEMA_VERSION = "1.0.0"
 

data/share/doc/developers_guide_ja.html

@@ -1,8 +1,8 @@
 <html lang="ja">
 <head>
-<title>AdLint 1.10.0 開発者ガイド</title>
+<title>AdLint 1.12.0 開発者ガイド</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="description" content="AdLint 1.10.0 開発者ガイド">
+<meta name="description" content="AdLint 1.12.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 1.10.0 開発者ガイド</h1>
+<h1 class="settitle">AdLint 1.12.0 開発者ガイド</h1>
 <div class="contents">
 <h2>Table of Contents</h2>
 <ul>
@@ -95,11 +95,17 @@ along with AdLint.  If not, see &lt;<a href="http://www.gnu.org/licenses/">http:
 
 <p><table summary=""><tr align="left"><th valign="top" width="10%">名称 </th><th valign="top" width="10%">バージョン </th><th valign="top" width="30%">用途
 <br></th></tr><tr align="left"><td valign="top" width="10%"><a href="http://www.ruby-lang.org/">Ruby</a>
-</td><td valign="top" width="10%"><code>1.9.3-p0</code>
+</td><td valign="top" width="10%"><code>1.9.3-p194</code>
 </td><td valign="top" width="30%">ベースとなる実装言語
 <br></td></tr><tr align="left"><td valign="top" width="10%"><a href="http://rubyforge.org/projects/racc/">Racc</a>
-</td><td valign="top" width="10%"><code>1.4.7</code>
+</td><td valign="top" width="10%"><code>1.4.8</code>
 </td><td valign="top" width="30%">構文解析器の生成
+<br></td></tr><tr align="left"><td valign="top" width="10%"><a href="http://rspec.info/">RSpec</a>
+</td><td valign="top" width="10%"><code>2.10.0</code>
+</td><td valign="top" width="30%">単体仕様の記述と回帰テスト
+<br></td></tr><tr align="left"><td valign="top" width="10%"><a href="http://cukes.info/">Cucumber</a>
+</td><td valign="top" width="10%"><code>1.2.0</code>
+</td><td valign="top" width="30%">機能仕様の記述と回帰テスト
 <br></td></tr></table>
 
 <h3 class="unnumberedsec">文書化環境</h3>

data/share/doc/developers_guide_ja.texi

@@ -2,7 +2,7 @@
 @setfilename developers_guide_ja.info
 @documentlanguage ja
 @documentencoding utf-8
-@settitle AdLint 1.10.0 開発者ガイド
+@settitle AdLint 1.12.0 開発者ガイド
 
 @copying
 Copyright (C) 2010-2012, OGIS-RI Co.,Ltd.
@@ -41,11 +41,17 @@ along with AdLint.  If not, see <@uref{http://www.gnu.org/licenses/}>.
 @multitable @columnfractions .1 .1 .3
 @headitem 名称 @tab バージョン @tab 用途
 @item @uref{http://www.ruby-lang.org/, Ruby}
-@tab @code{1.9.3-p0}
+@tab @code{1.9.3-p194}
 @tab ベースとなる実装言語
 @item @uref{http://rubyforge.org/projects/racc/, Racc}
-@tab @code{1.4.7}
+@tab @code{1.4.8}
 @tab 構文解析器の生成
+@item @uref{http://rspec.info/, RSpec}
+@tab @code{2.10.0}
+@tab 単体仕様の記述と回帰テスト
+@item @uref{http://cukes.info/, Cucumber}
+@tab @code{1.2.0}
+@tab 機能仕様の記述と回帰テスト
 @end multitable
 
 @unnumberedsec 文書化環境