patternmatching 0.1.4 → 0.2.0

data/README.txt

@@ -23,9 +23,7 @@ Note: Default equivalence used in structured pattern matching is
 based on "pattern === data", 
 so "foo(Numeric)" matches "foo(100)".
 
-Notice: Current implementation is not thread safe now. 
-Need the receiver object(NOT an argument) calling pattern matching 
-synchronized when multi-threaded access.
+From ver. 0.2.0, thread unsafeness restriction is removed.
 
 == Demonstration of usage
 
@@ -142,6 +140,45 @@ to the following block when the pattern matched.
    end
  end # => "He is Jiro"
 
+=== Field Access Example
+It is ver. 0.2.0 API
+
+ require "patternmatching"
+ 
+ include PatternMatching
+ 
+ class Foo 
+   def initialize
+     @name = "Foo"
+   end
+   attr :name
+   def foo
+   end
+ 
+   def bar
+     make "bar" do
+       seems as {:val} do
+         foo
+         # To access fields like this.name or this.name = ...
+         the.name = val
+         # To access self as this
+         this
+       end
+     end
+   end
+   
+   func(:buzz).seems as {:val} do 
+     the.name = val
+     this
+   end
+ end
+ 
+ o = Foo.new
+ p o.bar == o #=> true
+ p o.name #=> "bar"
+ p o.buzz("buzz") == o #=> true
+ p o.name #=> "buzz"
+
 == Forum
 
 Visit the project forum in RubyForge. 
@@ -158,11 +195,11 @@ for anonymous access.
 
 This code is free to use under the terms of the MIT license. 
 
-== Link
+== Links
 
-* Web Site: http://patternmatching.rubyforge.org/
-* Project Page: http://rubyforge.org/projects/patternmatching/
-* API Doc:  http://patternmatching.rubyforge.org/rdoc/
+* {Web Site}[http://patternmatching.rubyforge.org/]
+* {Project Page}[http://rubyforge.org/projects/patternmatching/]
+* {API Doc}[http://patternmatching.rubyforge.org/rdoc/]
 
 == Contact
 

data/Rakefile

@@ -107,7 +107,7 @@ end
 
 desc 'Generate and upload website files'
 # task :website => [:website_generate]
-task :website => [:website_generate, :website_upload]
+task :website => [:website_generate, :website_upload, :publish_docs]
 
 desc 'Release the website and new gem version'
 task :deploy => [:check_version, :website, :release] do

data/examples/match_inside_class.rb

@@ -7,22 +7,29 @@ class Foo
     @name = "Foo"
   end
   attr :name
+  def foo
+  end
 
   def bar
     make "bar" do
       seems as {:val} do
-        @name = val
+        foo
+        # To access fields like this.name or this.name = ...
+        the.name = val
+        # To access self as this
+        this
       end
     end
   end
   
   func(:buzz).seems as {:val} do 
-    @name = val
+    the.name = val
+    this
   end
 end
 
 o = Foo.new
-o.bar
+p o.bar == o #=> true 
 p o.name #=> "bar"
-o.buzz("buzz")
+p o.buzz("buzz") == o #=> true
 p o.name #=> "buzz"

data/lib/patternmatching/pattern.rb

@@ -117,34 +117,47 @@ module PatternMatching
         rescue NotMatched
           next
         end
-        return ExecuteAs.new(args, receiver).call(&action)
+        return ExecuteAs.new(args, receiver).instance_eval(&action)
       end      
     end
     
+    # Private class to access instance valiables of the receiver
+    class InstanceVariableAccessor
+      def initialize(receiver)
+        @receiver = receiver
+      end
+      def method_missing(name, *args)
+        begin
+          @receiver.send(name, *args)
+        rescue NameError
+          if name.to_s[-1,1] == "="
+            field = "@" + name.to_s[0...-1]
+            @receiver.instance_variable_set(field, args[0])
+          else
+            field = "@" + name.to_s
+            @receiver.instance_variable_get(field, args[0])
+          end
+        end
+      end
+    end
+    
     #Private class enabling to use the name of symbols in patterns 
     #like a local variables in action blocks
     class ExecuteAs
       def initialize(args, receiver)
-        @this = receiver
+        @receiver = receiver
+        @wrapper = InstanceVariableAccessor.new receiver
         @args = args
       end
-      def call(&action)
-        args = @args
-        mod = Module.new
-        mod.instance_eval do
-          define_method(:method_missing) do |name, *margs|
-            return args[name] if args.key?(name)
-            super(name, *margs)
-          end
-        end
-        # this block is not thread safe
-        @this.extend mod
-        result = @this.instance_eval(&action)
-        mod.instance_eval do
-          remove_method(:method_missing)
-        end
-        # 
-        result
+      def this
+        @receiver
+      end
+      def the
+        @wrapper
+      end
+      def method_missing(name, *args)
+        return @args[name] if @args.key?(name)
+        @receiver.send(name, *args)
       end
     end
   end

data/lib/patternmatching/version.rb

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

data/spec/patternmatching_spec.rb

@@ -48,17 +48,24 @@ class PartialStyleDefs
     @name = "Foo"
   end
   attr :name
-
+  def foo
+    self
+  end
+  
   def bar
     make "bar" do
       seems as {:val} do
-        @name = val
+        foo
+        the.name = val
+        this
       end
     end
   end
 
   func(:buzz).seems as {:val} do
-    @name = val
+    foo
+    the.name = val
+    this
   end
 end
 
@@ -183,9 +190,9 @@ describe "PatternMatching from Example" do
   it "should update fields from block" do
     o = PartialStyleDefs.new
     o.name.should == "Foo"
-    o.bar
+    o.bar.should == o
     o.name.should == "bar"
-    o.buzz("buzz")
+    o.buzz("buzz").should == o
     o.name.should == "buzz"
   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.1.4</a>
+      <a href="http://rubyforge.org/projects/patternmatching" class="numbers">0.2.0</a>
     </div>
     <h1>&#x2192; &#8216;patternmatching&#8217;</h1>
 
@@ -71,9 +71,7 @@ based on &#8220;<code>pattern === data</code>&#8221;,
 so &#8220;<code>foo(Numeric)</code>&#8221; matches &#8220;<code>foo(100)</code>&#8221;.</p>
 
 
-	<p>Notice: Current implementation is not thread safe now. 
-Need the receiver object(NOT an argument) calling pattern matching 
-synchronized when multi-threaded access.</p>
+	<p>From ver. 0.2.0, thread unsafeness restriction is removed.</p>
 
 
 	<h2>Demonstration of usage</h2>
@@ -197,6 +195,46 @@ make person do
     puts "no name" 
   end
 end # =&gt; "He is Jiro" 
+</pre>
+
+<h3>Field Access Example</h3>
+It is ver 0.2.0 <span class="caps">API</span>
+<pre>
+require "patternmatching" 
+
+include PatternMatching
+
+class Foo 
+  def initialize
+    @name = "Foo" 
+  end
+  attr :name
+  def foo
+  end
+
+  def bar
+    make "bar" do
+      seems as {:val} do
+        foo
+        # To access fields like this.name or this.name = ...
+        the.name = val
+        # To access self as this
+        this
+      end
+    end
+  end
+
+  func(:buzz).seems as {:val} do 
+    the.name = val
+    this
+  end
+end
+
+o = Foo.new
+p o.bar == o #=&gt; true 
+p o.name #=&gt; "bar" 
+p o.buzz("buzz") == o #=&gt; true
+p o.name #=&gt; "buzz" 
 </pre>
 
 	<h2>Forum</h2>
@@ -220,7 +258,7 @@ end # =&gt; "He is Jiro"
 	<p>This code is free to use under the terms of the <span class="caps">MIT</span> license.</p>
 
 
-	<h2>Link</h2>
+	<h2>Links</h2>
 
 
 	<ul>

data/website/index.txt

@@ -24,9 +24,7 @@ Note: Default equivalence used in structured pattern matching is
 based on "<code>pattern === data</code>", 
 so "<code>foo(Numeric)</code>" matches "<code>foo(100)</code>".
 
-Notice: Current implementation is not thread safe now. 
-Need the receiver object(NOT an argument) calling pattern matching 
-synchronized when multi-threaded access.
+From ver. 0.2.0, thread unsafeness restriction is removed.
 
 h2. Demonstration of usage
 
@@ -149,6 +147,47 @@ make person do
 end # => "He is Jiro"
 </pre>
 
+<h3>Field Access Example</h3>
+It is ver 0.2.0 API
+<pre>
+require "patternmatching"
+
+include PatternMatching
+
+class Foo 
+  def initialize
+    @name = "Foo"
+  end
+  attr :name
+  def foo
+  end
+
+  def bar
+    make "bar" do
+      seems as {:val} do
+        foo
+        # To access fields like this.name or this.name = ...
+        the.name = val
+        # To access self as this
+        this
+      end
+    end
+  end
+  
+  func(:buzz).seems as {:val} do 
+    the.name = val
+    this
+  end
+end
+
+o = Foo.new
+p o.bar == o #=> true 
+p o.name #=> "bar"
+p o.buzz("buzz") == o #=> true
+p o.name #=> "buzz"
+</pre>
+
+
 h2. Forum
 
 Visit RubyForge project forum. 
@@ -163,7 +202,7 @@ h2. License
 
 This code is free to use under the terms of the MIT license. 
 
-h2. Link
+h2. Links
 
 * "Web Site":http://patternmatching.rubyforge.org/
 * "Project Page":http://rubyforge.org/projects/patternmatching/

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: patternmatching
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.2.0
 date: 2007-06-05 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: