patternmatching 0.2.1 → 0.2.2

data/History.txt

@@ -1,3 +1,8 @@
+== 0.2.2 2007-06-06
+
+* 1 major enhancement:
+  * Accept pattern with condition
+
 == 0.2.1 2007-06-05
 
 * 1 minor enhancement:

data/Manifest.txt

@@ -7,7 +7,9 @@ examples/enumerable_matching.rb
 examples/hash_matching.rb
 examples/match_inside_class.rb
 examples/matching.rb
+examples/matching_with_condition.rb
 examples/object_matching.rb
+examples/overhead.rb
 examples/partial_style_method.rb
 examples/partial_style_method2.rb
 lib/patternmatching.rb

data/README.txt

@@ -179,6 +179,25 @@ It is ver. 0.2.0 API
  p o.buzz("buzz") == o #=> true
  p o.name #=> "buzz"
 
+=== Pattern with Condition Example
+It is from ver. 0.2.2 API
+
+ require "patternmatching"
+ 
+ include PatternMatching
+ 
+ num = 100
+ result = make num do
+   seems as {:n}, with {n < 10} do
+     true
+   end
+   seems as {:n}, with {n >= 10} do
+     false
+   end
+ end
+ 
+ p result #=> false
+
 == Forum
 
 Visit the project forum in RubyForge. 

data/examples/matching_with_condition.rb

@@ -0,0 +1,16 @@
+
+require "patternmatching"
+
+include PatternMatching
+
+num = 100
+result = make num do
+  seems as {:n}, with {n < 10} do
+    true
+  end
+  seems as {:n}, with {n >= 10} do
+    false
+  end
+end
+
+p result #=> false

data/examples/overhead.rb

@@ -0,0 +1,68 @@
+
+require "patternmatching"
+
+include PatternMatching
+
+class Through
+  def plain(n)
+    n
+  end
+  
+  func(:pattern).seems as {:n} do n end
+end
+
+count = 10000
+
+plain = Through.new
+start = Time.new
+count.times do |i|
+  plain.plain(i)
+end
+plain_time = Time.new - start
+
+pattern = Through.new
+start = Time.new
+count.times do |i|
+  pattern.pattern(i)
+end
+pattern_time = Time.new - start
+
+puts "Check Through call " + count.to_s + " times" 
+puts "Standard Method cost: " + plain_time.to_s  + " sec"
+puts "Partial Method cost: " + pattern_time.to_s  + " sec"
+
+puts "Overhead/method: " + 
+  ((pattern_time - plain_time).to_f / count * 1000).to_s + " msec"
+
+
+
+class Recursive
+  def plain(n)
+    if n > 0
+      plain(n - 1)
+    end
+  end
+  
+  func(:pattern).seems as {:n}, with {n > 0} do 
+    pattern(n-1) 
+  end
+end
+
+count = 300 # depends on system stack size
+
+plain = Recursive.new
+start = Time.new
+plain.plain(count)
+plain_time = Time.new - start
+
+pattern = Recursive.new
+start = Time.new
+pattern.pattern(count)
+pattern_time = Time.new - start
+
+puts "Check Recursive call " + count.to_s + " times" 
+puts "Standard Method cost: " + plain_time.to_s  + " sec"
+puts "Partial Method cost: " + pattern_time.to_s  + " sec"
+puts "Overhead/method: " + 
+  ((pattern_time - plain_time).to_f / count * 1000).to_s + " msec"
+

data/lib/patternmatching/pattern.rb

@@ -107,9 +107,10 @@ module PatternMatching
   #Private class to run pattern matching
   class MatchExec
     def self.exec_as(target, patterns, receiver)
-      patterns.each do |pair|
-        pattern = pair.keys[0]
-        action = pair[pattern]
+      patterns.each do |tuple|
+        pattern = tuple[0]
+        action = tuple[1]
+        condition = tuple[2]
         source = NodeBuilder.new.instance_eval(&pattern)
         args = {}
         begin
@@ -117,8 +118,11 @@ module PatternMatching
         rescue NotMatched
           next
         end
-        return ExecuteAs.new(args, receiver).instance_eval(&action)
-      end      
+        executer = ExecuteAs.new(args, receiver)
+        next if condition != nil and not executer.instance_eval(&condition)
+        return executer.instance_eval(&action)
+      end
+      nil
     end
     
     # Private class to access instance valiables of the receiver
@@ -167,13 +171,16 @@ module PatternMatching
     def initialize(patterns)
       @patterns = patterns
     end
-    def seems(pattern, &action)
-      @patterns << {pattern => action}
+    def seems(pattern, condition = nil, &action)
+      @patterns << [pattern, action, condition]
       self
     end
     def as(&block)
       block
     end
+    def with(&block)
+      block
+    end
     def something
       proc {_}
     end
@@ -215,6 +222,13 @@ module PatternMatching
       block
     end
     
+    #A pattern restriction, must boolean
+    #=== Usage
+    # seems as {PATTERN}, with {CONDITION} do ... end
+    def with(&block)
+      block
+    end
+    
     #A pattern matches anything
     #=== Usage
     # seems something do ... end 

data/lib/patternmatching/version.rb

@@ -2,7 +2,7 @@ module PatternMatching #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 2
-    TINY  = 1
+    TINY  = 2
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/spec/patternmatching_spec.rb

@@ -195,4 +195,13 @@ describe "PatternMatching from Example" do
     o.buzz("buzz").should == o
     o.name.should == "buzz"
   end
+  
+  it "should check pattern with condition" do
+    make(100) do
+      seems as {:a}, with {a > 10} do a end
+    end.should == 100
+    make(1) do
+      seems as {:a}, with {a > 10} do a end
+    end.should == nil
+  end
 end

data/website/index.html

@@ -33,7 +33,7 @@
     <h1>PatternMatching module</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/patternmatching"; return false'>
       Get Version
-      <a href="http://rubyforge.org/projects/patternmatching" class="numbers">0.2.1</a>
+      <a href="http://rubyforge.org/projects/patternmatching" class="numbers">0.2.2</a>
     </div>
     <h1>&#x2192; &#8216;patternmatching&#8217;</h1>
 
@@ -235,6 +235,26 @@ p o.bar == o #=&gt; true
 p o.name #=&gt; "bar" 
 p o.buzz("buzz") == o #=&gt; true
 p o.name #=&gt; "buzz" 
+</pre>
+
+<h3>Pattern with Condition  Example</h3>
+It is from ver 0.2.2 <span class="caps">API</span>
+<pre>
+require "patternmatching" 
+
+include PatternMatching
+
+num = 100
+result = make num do
+  seems as {:n}, with {n &lt; 10} do
+    true
+  end
+  seems as {:n}, with {n &gt;= 10} do
+    false
+  end
+end
+
+p result #=&gt; false
 </pre>
 
 	<h2>Forum</h2>
@@ -285,7 +305,7 @@ p o.name #=&gt; "buzz"
 	<p><a href="http://d.hatena.ne.jp/bellbind/">My blog</a> (written in Japanese) 
 could be help you.</p>
     <p class="coda">
-      <a href="mailto:drnicwilliams@gmail.com">Dr Nic</a>, 5th June 2007<br>
+      <a href="mailto:drnicwilliams@gmail.com">Dr Nic</a>, 6th June 2007<br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>

data/website/index.txt

@@ -187,6 +187,25 @@ p o.buzz("buzz") == o #=> true
 p o.name #=> "buzz"
 </pre>
 
+<h3>Pattern with Condition  Example</h3>
+It is from ver 0.2.2 API
+<pre>
+require "patternmatching"
+
+include PatternMatching
+
+num = 100
+result = make num do
+  seems as {:n}, with {n < 10} do
+    true
+  end
+  seems as {:n}, with {n >= 10} do
+    false
+  end
+end
+
+p result #=> false
+</pre>
 
 h2. Forum
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: patternmatching
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
-date: 2007-06-05 00:00:00 +09:00
+  version: 0.2.2
+date: 2007-06-06 00:00:00 +09:00
 summary: Provide a pure ruby module that  can build structured objects easily,  can enable pattern match of objects,  and can define method as a partial function style.
 require_paths: 
 - lib
@@ -38,7 +38,9 @@ files:
 - examples/hash_matching.rb
 - examples/match_inside_class.rb
 - examples/matching.rb
+- examples/matching_with_condition.rb
 - examples/object_matching.rb
+- examples/overhead.rb
 - examples/partial_style_method.rb
 - examples/partial_style_method2.rb
 - lib/patternmatching.rb