patternmatching 0.2.2 → 0.2.3

data/History.txt

@@ -1,3 +1,8 @@
+== 0.2.3 2007-06-06
+
+* 1 minor enhancement:
+  * Duplicated codes removed
+
 == 0.2.2 2007-06-06
 
 * 1 major enhancement:

data/lib/patternmatching/pattern.rb

@@ -1,16 +1,91 @@
 
 module PatternMatching
-  #Private Exception for stop matching
-  class NotMatched < Exception
+  # Domain Specific Language style methods for inside block
+  module DSL_INSIDE
+    #A pattern matches description inside block
+    #=== Usage
+    # seems as {some pattern...} do ... end
+    def as(&block)
+      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 
+    def something
+      proc {_}
+    end    
   end
   
-  #Private class for build structured data
-  class NodeBuilder
-    private
-    def method_missing(name, *args)
-      Node.new(name, args)
+  # Domain Specific Language style methods for outside
+  module DSL_OUTSIDE
+    include DSL_INSIDE
+    #Build structured data
+    #=== Usage
+    # build {[foo(bar, 100), foo(buzz, "abc")]}
+    def build(&block)
+      NodeBuilder.new.instance_eval(&block)
+    end
+    
+    #Build structured data
+    #=== Usage
+    # PatternMatching.build {[foo(bar, 100), foo(buzz, "abc")]}
+    def self.build(&block)
+      NodeBuilder.new.instance_eval(&block)
+    end
+    
+    #Do pattern matching 
+    #===Usage
+    # make TARGET do 
+    #   seems as {PATTERN_1} do ACTION_1 end
+    #   seems as {PATTERN_2} do ACTION_2 end
+    #   seems something do ACTION_DEFAULT end
+    # end
+    def make(target, &block)
+      patterns = []
+      PatternFragments.new(patterns).instance_eval(&block)
+      MatchExec.exec_as(target, patterns, self)
+    end
+    
+    #Define method as partial style
+    #=== Usage
+    # func(NAME).seems as {PATTERN_1} do ACTION_1 end
+    # func(NAME).seems as {PATTERN_2} do ACTION_2 end
+    # func(NAME).seems something do ACTION_DEFAULT end
+    #
+    #or
+    #
+    # func NAME do 
+    #   seems as {PATTERN_1} do ACTION_1 end
+    #   seems as {PATTERN_2} do ACTION_2 end
+    #   seems something do ACTION_DEFAULT end
+    # end
+    #
+    def func(name, &block)
+      pattern_name = ("@_pattern_" + name.to_s ).to_sym
+      unless method_defined?(name)
+        patterns = []
+        instance_variable_set(pattern_name, patterns)
+        define_method(name) do |target|
+          MatchExec.exec_as(target, patterns, self)
+        end
+      end
+      patterns = instance_variable_get(pattern_name)
+      fragments = PatternFragments.new(patterns)
+      if block
+        fragments.instance_eval(&block)
+      end
+      fragments
     end
   end
+  include DSL_OUTSIDE
   
   #Class for structured data/patterns
   class Node
@@ -27,6 +102,19 @@ module PatternMatching
     end
   end
   
+  private
+  #Private Exception for stop matching
+  class NotMatched < Exception
+  end
+  
+  #Private class for build structured data
+  class NodeBuilder
+    private
+    def method_missing(name, *args)
+      Node.new(name, args)
+    end
+  end
+  
   #Private module for pattern matching and to collect var/val pairs
   module Collector
     def self.walk(source, target, list)
@@ -130,6 +218,7 @@ module PatternMatching
       def initialize(receiver)
         @receiver = receiver
       end
+      private
       def method_missing(name, *args)
         begin
           @receiver.send(name, *args)
@@ -159,6 +248,7 @@ module PatternMatching
       def the
         @wrapper
       end
+      private
       def method_missing(name, *args)
         return @args[name] if @args.key?(name)
         @receiver.send(name, *args)
@@ -168,6 +258,8 @@ module PatternMatching
   
   #Private class for collecting pattern/action fragments
   class PatternFragments
+    include DSL_INSIDE
+    
     def initialize(patterns)
       @patterns = patterns
     end
@@ -175,97 +267,5 @@ module PatternMatching
       @patterns << [pattern, action, condition]
       self
     end
-    def as(&block)
-      block
-    end
-    def with(&block)
-      block
-    end
-    def something
-      proc {_}
-    end
-  end
-  
-  # Domain Specific Language style methods
-  module DSL
-    #Build structured data
-    #=== Usage
-    # build {[foo(bar, 100), foo(buzz, "abc")]}
-    def build(&block)
-      NodeBuilder.new.instance_eval(&block)
-    end
-    
-    #Build structured data
-    #=== Usage
-    # PatternMatching.build {[foo(bar, 100), foo(buzz, "abc")]}
-    def self.build(&block)
-      NodeBuilder.new.instance_eval(&block)
-    end
-    
-    #Do pattern matching 
-    #===Usage
-    # make TARGET do 
-    #   seems as {PATTERN_1} do ACTION_1 end
-    #   seems as {PATTERN_2} do ACTION_2 end
-    #   seems something do ACTION_DEFAULT end
-    # end
-    def make(target, &block)
-      patterns = []
-      PatternFragments.new(patterns).instance_eval(&block)
-      MatchExec.exec_as(target, patterns, self)
-    end
-    
-    #A pattern matches description inside block
-    #=== Usage
-    # seems as {some pattern...} do ... end
-    def as(&block)
-      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 
-    def something
-      proc {_}
-    end
-    
-    #Define method as partial style
-    #=== Usage
-    # func(NAME).seems as {PATTERN_1} do ACTION_1 end
-    # func(NAME).seems as {PATTERN_2} do ACTION_2 end
-    # func(NAME).seems something do ACTION_DEFAULT end
-    #
-    #or
-    #
-    # func NAME do 
-    #   seems as {PATTERN_1} do ACTION_1 end
-    #   seems as {PATTERN_2} do ACTION_2 end
-    #   seems something do ACTION_DEFAULT end
-    # end
-    #
-    def func(name, &block)
-      pattern_name = ("@_pattern_" + name.to_s ).to_sym
-      unless method_defined?(name)
-        patterns = []
-        instance_variable_set(pattern_name, patterns)
-        define_method(name) do |target|
-          MatchExec.exec_as(target, patterns, self)
-        end
-      end
-      patterns = instance_variable_get(pattern_name)
-      fragments = PatternFragments.new(patterns)
-      if block
-        fragments.instance_eval(&block)
-      end
-      fragments
-    end
   end
-  include DSL
 end

data/lib/patternmatching/version.rb

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

data/lib/patternmatching.rb

@@ -3,7 +3,7 @@ require 'patternmatching/version'
 require 'patternmatching/pattern'
 
 module PatternMatching
-  # The module is only for showing example docs.
+  # The module is only for showing usage...
   #== Using module
   # # If installed from rubygems
   # require "rubygems"
@@ -33,25 +33,6 @@ module PatternMatching
   # 
   # p Calc.new.calcm(code)
   #
-  #== Another partial style method example
-  # class CalcX
-  #   extend PatternMatching
-  #  
-  #   func(:calcx) do
-  #     seems as {plus(:a, :b)} do
-  #       calcx(a) + calcx(b)
-  #     end
-  #     seems as {mul(:a, :b)} do
-  #       calcx(a) * calcx(b)
-  #     end
-  #   end
-  #   func(:calcx).seems as {:value} do
-  #     value
-  #   end
-  # end
-  # 
-  # p CalcX.new.calcx(code)
-  #
   #== Pattern matching example
   # include PatternMatching
   # 
@@ -65,47 +46,8 @@ module PatternMatching
   # 
   # p calc(code)
   #
-  #== Enumerable matching example
-  # is = build { exact([1,2,3,4,5]) }
-  # make is do
-  #   seems as {exact([:a,:b, _!(:c)])} do
-  #     puts a.to_s + ", " + b.to_s  + " and " + c.to_s 
-  #   end
-  #   seems something do
-  #     puts "not matched"
-  #   end
-  # end
-  #
-  #== Hash to Hash matching example
-  # dict = build { {:name => "Taro", :age => 5} }
-  # make dict do
-  #   seems as {{:name => :name}} do
-  #     puts "He is " + name
-  #   end
-  #   seems something do
-  #     puts "no name"
-  #   end
-  # end
-  #
-  #== Hash to non-Hash object matching example
-  # class Person
-  #   def initialize(name, age)
-  #     @name = name
-  #     @age = age
-  #   end
-  #   attr :name
-  #   attr :age
-  # end
-  # 
-  # make Person.new("Jiro", 3) do
-  #   seems as {{:name => :name}} do
-  #     puts "He is " + name
-  #   end
-  #   seems something do
-  #     puts "no name"
-  #   end
-  # end
-  #
-  module EXAMPLES
+  #== For more 
+  #see README.txt
+  module USAGE
   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.2</a>
+      <a href="http://rubyforge.org/projects/patternmatching" class="numbers">0.2.3</a>
     </div>
     <h1>&#x2192; &#8216;patternmatching&#8217;</h1>
 

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: patternmatching
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 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: