egison 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0a67c9b1b9350d0d0c09b823f1b988626a5a100
-  data.tar.gz: 244276e1bb15b529bf0084c207f0e0735a640294
+  metadata.gz: 74ce8492a345ad492c9acb9e16c7c8d351a6b327
+  data.tar.gz: 26f3f0aef845aaf21312713df5e418b724d4cbb0
 SHA512:
-  metadata.gz: 9dbeac11189e83c9f9236c62dbbb4879a1137f368932021088e2472a4b503ad6dad0ead29be8095b53ca5bfab7d2214bfee866edab166d0b523989d91dfc34c0
-  data.tar.gz: 226cebb19768ea435db9ce4f420961c69a4160cfa9fb579535a55a631ad9e56d53975e41ea19df1e0ae6508d7928df9cb990c0e9ff21b2bad62a6b95e25061da
+  metadata.gz: 84f1a8ef64f513ea072ae2c6153c5bc3fd8868f065af6b74209797a949fe3573e0318a34f3de9b610003d76ee6745f8961c17856ca560be87f11e7e8bc20283e
+  data.tar.gz: dd5c108d612a531bdde3b27ac1238af2ddd136259059eb9114f6f7af5304d140b24307119a485a45d37dfdbf26e5829d47b2538908b4b6909f349f1760d742c1

data/README.md

@@ -146,6 +146,22 @@ match_all([1, 2, 3, 2, 5]) do
 end  #=> [2,2]
 ```
 
+### Pattern Matching against Stream (Infinite List)
+
+We can do pattern-matching against streams with the `match_stream` expression.
+
+```
+def nats
+  (1..Float::INFINITY)
+end
+
+match_stream(nats){ with(Multiset.(_m, _n, *_)) { [m, n] } }.take(10)
+#=>[[1, 2], [1, 3], [2, 1], [1, 4], [2, 3], [3, 1], [1, 5], [2, 4], [3, 2], [4, 1]]
+
+match_stream(nats){ with(Set.(_m, _n, *_)) { [m, n] } }.take(10)
+#=>[[1, 1], [1, 2], [2, 1], [1, 3], [2, 2], [3, 1], [1, 4], [2, 3], [3, 2], [4, 1]]
+```
+
 ## Demonstrations
 
 ### Combinations
@@ -210,6 +226,25 @@ p(poker_hands([["diamond", 4], ["club", 2], ["club", 5], ["heart", 1], ["diamond
 p(poker_hands([["diamond", 4], ["club", 10], ["club", 5], ["heart", 1], ["diamond", 3]])) #=> "Nothing"
 ```
 
+### Twin Primes
+
+The following code enumerates all twin primes with pattern-matching!
+I believe it is also a really exciting demonstration.
+
+```
+require 'egison'
+require 'prime'
+
+twin_primes = match_stream(Prime) {
+  with(List.(*_, _x, __("x + 2"), *_)) {
+    [x, x + 2]
+  }
+}
+
+p twin_primes.take(10)
+#=>[[3, 5], [5, 7], [11, 13], [17, 19], [29, 31], [41, 43], [59, 61], [71, 73], [101, 103], [107, 109]]
+```
+
 You can find more demonstrations in the [`sample`](https://github.com/egison/egison-ruby/tree/master/sample) directory.
 
 ## About Egison

data/THANKS.md

@@ -0,0 +1,5 @@
+I thank the following people for their great contribution.
+
+* [Takasuke Nakamura](https://github.com/xyx-is)
+* [Kazuki Tanaka](https://github.com/gogotanaka)
+* [Shunsuke Gotoh](https://github.com/antimon2)

data/lib/egison/core.rb

@@ -1,5 +1,6 @@
 require 'egison/version'
-require 'continuation'
+# require 'continuation'
+require 'egison/lazyarray'
 
 module PatternMatch
   module Matchable
@@ -47,6 +48,39 @@ module PatternMatch
     end
   end
 
+  class MatchingStateStream
+    def initialize(pat, tgt)
+      @states = [MatchingState.new(pat, tgt)]
+      @processes = []
+    end
+
+    def match(&block)
+      state = @states.shift
+      @processes << Egison::LazyArray.new(state.process_stream)
+      until @states.empty? && @processes.empty?
+        unless @processes.empty?
+          process(@processes.shift, &block)
+        end
+        unless @states.empty?
+          state = @states.shift
+          process(Egison::LazyArray.new(state.process_stream), &block)
+        end
+      end
+    end
+
+    def process(process_iter, &block)
+      unless process_iter.empty?
+        @processes << process_iter
+        ret = process_iter.shift
+        if ret.atoms.empty?
+          block.(ret.bindings)
+        else
+          @states << ret
+        end
+      end
+    end
+  end
+
   class MatchingState
     attr_accessor :atoms, :bindings
 
@@ -65,6 +99,17 @@ module PatternMatch
         new_state
       end
     end
+
+    def process_stream(&block)
+      return to_enum :process_stream unless block_given?
+      atom = @atoms.shift
+      atom.first.match_stream(atom.last, @bindings) do |new_atoms, new_bindings|
+        new_state = clone
+        new_state.atoms = new_atoms + new_state.atoms
+        new_state.bindings += new_bindings
+        block.(new_state)
+      end
+    end
   end
 
   class Pattern
@@ -76,6 +121,10 @@ module PatternMatch
     def match(tgt, bindings)
     end
 
+    def match_stream(tgt, bindings, &block)
+      match(tgt, bindings).each(&block)
+    end
+
     def to_a
       [PatternCollection.new(self)]
     end
@@ -128,6 +177,32 @@ module PatternMatch
         end
       end
     end
+
+    def match_stream(tgt, bindings, &block)
+      if subpatterns.empty?
+        if tgt.empty?
+          return block.([[], []])
+        end
+      else
+        subpatterns = @subpatterns.clone
+        px = subpatterns.shift
+        if px.quantified
+          if subpatterns.empty?
+            block.([[[px.pattern, tgt]], []])
+          else
+            @matcher.unjoin_stream(tgt) do |xs, ys|
+              block.([[px.pattern, xs], [PatternWithMatcher.new(@matcher, *subpatterns), ys]], [])
+            end
+          end
+        else
+          unless tgt.empty?
+            @matcher.uncons_stream(tgt) do |x, xs|
+              block.([[px, x], [PatternWithMatcher.new(@matcher, *subpatterns), xs]], [])
+            end
+          end
+        end
+      end
+    end
   end
 
   class Wildcard < PatternElement
@@ -337,6 +412,20 @@ module PatternMatch
     end
   end
 
+  class EnvE < Env
+    def with(pat, &block)
+      ctx = @ctx
+      tgt = @tgt
+      mstack = MatchingStateStream.new(pat,tgt)
+      ::Enumerator.new do |y|
+        mstack.match do |bindings|
+          y << with_bindings(ctx, bindings, &block)
+        end
+      end
+    rescue PatternNotMatch
+    end
+  end
+
   class PatternNotMatch < Exception; end
   class PatternMatchError < StandardError; end
   class NoMatchingPatternError < PatternMatchError; end
@@ -351,7 +440,7 @@ module PatternMatch
         private_constant c
       end
     end
-    private_constant :Env, :Env2
+    private_constant :Env, :Env2, :EnvE
   end
 end
 
@@ -363,6 +452,14 @@ module Kernel
     env.instance_eval(&block)
   end
 
+  def match_stream(tgt, &block)
+    if !(tgt.kind_of?(Array) || tgt.kind_of?(Egison::LazyArray))
+      tgt = Egison::LazyArray.new(tgt)
+    end
+    env = PatternMatch.const_get(:EnvE).new(self, tgt)
+    env.instance_eval(&block)
+  end
+
   def match(tgt, &block)
     env = PatternMatch.const_get(:Env2).new(self, tgt)
     catch(:exit_match) do
@@ -372,4 +469,3 @@ module Kernel
 
   alias match_single match
 end
-

data/lib/egison/lazyarray.rb

@@ -0,0 +1,166 @@
+module Egison
+  class LazyArray
+    include Enumerable
+
+    class OrgEnum
+      def initialize(org_enum)
+        @src_enums = []
+        if org_enum.kind_of?(::Array)
+          @org_enum = [].to_enum  # DUMMY
+          @cache = org_enum
+          @index = -1
+          @terminated = true
+        else
+          @org_enum = org_enum.to_enum
+          @cache = []
+          @index = -1
+          @terminated = false
+        end
+      end
+
+      def next
+        index = @index += 1
+        return @cache[index] if @cache.size > index
+        raise StopIteration.new('iteration reached an end') if @terminated
+        el = org_enum_next
+        @cache << el
+        el
+      rescue StopIteration => ex
+        @index -= 1
+        raise ex
+      end
+
+      def rewind(index=0)
+        @index = index - 1
+      end
+
+      def clone
+        obj = super
+        obj.instance_eval do
+          @src_enums = @src_enums.clone
+        end
+        obj
+      end
+
+      def concat other
+        if @terminated && other.kind_of?(::Array)
+          @cache.concat(other)
+        else
+          @src_enums.push(other)
+          @terminated = false
+        end
+        self
+      end
+
+      private
+      def org_enum_next
+        el = nil
+        while el.nil?
+          begin
+            el = @org_enum.next
+          rescue StopIteration => ex
+            if @src_enums.empty?
+              @terminated = true
+              raise ex
+            end
+            @org_enum = @src_enums.shift.to_enum
+            @cache = @cache.clone
+          end
+        end
+        el
+      end
+    end
+
+    private_constant :OrgEnum if respond_to?(:private_constant)
+
+    def initialize(org_enum)
+      @org_enum = OrgEnum.new(org_enum)
+      @cache = []
+      @terminated = false
+    end
+
+    def each(&block)
+      return to_enum unless block_given?
+      @cache.each(&block)
+      return if @terminated
+      while true  # StopIteration will NOT be raised if `loop do ... end`
+        el = @org_enum.next
+        @cache.push(el)
+        block.(el)
+      end
+    rescue StopIteration => ex
+      @terminated = true
+    end
+
+    def shift
+      if @cache.size > 0
+        @cache.shift
+      elsif @terminated
+        nil
+      else
+        begin
+          @org_enum.next
+        rescue StopIteration => ex
+          @terminated = true
+          nil
+        end
+      end
+    end
+
+    def unshift(*obj)
+      @cache.unshift(*obj)
+      self
+    end
+
+    def empty?
+      return false unless @cache.empty?
+      return true if @terminated
+      begin
+        @cache << @org_enum.next
+        false
+      rescue StopIteration => ex
+        @terminated = true
+        true
+      end
+    end
+
+    def size
+      @terminated ? @cache.size : nil
+    end
+    alias :length :size
+
+    def clone
+      obj = super
+      obj.instance_eval do
+        @org_enum = @org_enum.clone
+        @cache = @cache.clone
+      end
+      obj
+    end
+    alias :dup :clone
+
+    def concat other
+      @org_enum.concat(other)
+      @terminated = false
+      self
+    end
+
+    def + other
+      clone.concat(other)
+    end
+
+    def inspect
+      "\#<#{self.class.name}#{@terminated ? @cache.inspect : "[#{@cache.join(', ')}...]"}>"
+    end
+  end
+end
+
+class ::Array
+  alias :org_plus_meth_esc_by_egison_lazyarray :+
+  def + other
+    if other.kind_of?(Egison::LazyArray)
+      return other.clone.unshift(*self)
+    end
+    org_plus_meth_esc_by_egison_lazyarray(other)
+  end
+end

data/lib/egison/matcher-core.rb

@@ -1,4 +1,5 @@
 require 'egison/core'
+require 'egison/lazyarray'
 
 class Class
   include PatternMatch::Matchable
@@ -7,11 +8,20 @@ class Class
     raise NotImplementedError, "need to define `#{__method__}'"
   end
 
+  def uncons_stream(val, &block)
+    raise NotImplementedError, "need to define `#{__method__}'"
+  end
+
   private
 
   def accept_array_only(val)
     raise PatternMatch::PatternNotMatch unless val.kind_of?(Array)
   end
+
+  def test_conv_lazy_array(val)
+    raise PatternMatch::PatternNotMatch unless val.respond_to?(:each)
+    Egison::LazyArray.new(val)
+  end
 end
 
 class List
@@ -25,6 +35,15 @@ class << List
     [[x, val2]]
   end
 
+  def uncons_stream(val, &block)
+    if !(val.kind_of?(Array) || val.kind_of?(Egison::LazyArray))
+      val = test_conv_lazy_array(val)
+    end
+    val2 = val.clone
+    x = val2.shift
+    block.([x, val2])
+  end
+
   def unjoin(val)
     accept_array_only(val)
     val2 = val.clone
@@ -39,4 +58,20 @@ class << List
     end
     rets
   end
+
+  def unjoin_stream(val, &block)
+    if !(val.kind_of?(Array) || val.kind_of?(Egison::LazyArray))
+      val = test_conv_lazy_array(val)
+    end
+    val2 = val.clone
+    xs = []
+    ys = val2.clone
+    block.([xs, ys])
+    until val2.empty?
+      x = val2.shift
+      ys = val2.clone
+      xs += [x]
+      block.([xs, ys])
+    end
+  end
 end

data/lib/egison/matcher.rb

@@ -1,4 +1,5 @@
 require 'egison/core'
+require 'egison/lazyarray'
 require 'egison/matcher-core'
 require 'set'
 
@@ -15,6 +16,18 @@ class << Multiset
     end
   end
 
+  def uncons_stream(val, &block)
+    if !(val.kind_of?(Array) || val.kind_of?(Egison::LazyArray))
+      val = test_conv_lazy_array(val)
+    end
+    stream = match_stream(val) {
+      with(List.(*_hs, _x, *_ts)) do
+        [x, hs + ts]
+      end
+    }
+    stream.each(&block)
+  end
+
   def unjoin(val)
     accept_array_only(val)
     val2 = val.clone
@@ -31,6 +44,26 @@ class << Multiset
       rets
     end
   end
+
+  def unjoin_stream(val, &block)
+    if !(val.kind_of?(Array) || val.kind_of?(Egison::LazyArray))
+      val = test_conv_lazy_array(val)
+    end
+    val2 = val.clone
+    xs = []
+    ys = val2.clone
+    if val2.empty?
+      block.([xs, ys])
+    else
+      x = val2.shift
+      ys = val2.clone
+      rets_stream = Egison::LazyArray.new(to_enum(:unjoin_stream, ys))
+      # rets_stream.each{|xs2, ys2| block.([xs2, [x] + ys2])}
+      rets_stream.each{|xs2, ys2| block.([xs2, ys2.clone.unshift(x)])}
+      # rets_stream.each{|xs2, ys2| block.([[x] + xs2, ys2])}
+      rets_stream.each{|xs2, ys2| block.([xs2.clone.unshift(x), ys2])}
+    end
+  end
 end
 
 class << Set
@@ -43,6 +76,18 @@ class << Set
     end
   end
 
+  def uncons_stream(val, &block)
+    if !(val.kind_of?(Array) || val.kind_of?(Egison::LazyArray))
+      val = test_conv_lazy_array(val)
+    end
+    stream = match_stream(val) {
+      with(List.(*_, _x, *_)) do
+        [x, val]
+      end
+    }
+    stream.each(&block)
+  end
+
   def unjoin(val)
     accept_array_only(val)
     val2 = val.clone
@@ -59,4 +104,22 @@ class << Set
       rets
     end
   end
+
+  def unjoin_stream(val, &block)
+    if !(val.kind_of?(Array) || val.kind_of?(Egison::LazyArray))
+      val = test_conv_lazy_array(val)
+    end
+    val2 = val.clone
+    xs = []
+    ys = val2.clone
+    if val2.empty?
+      block.([xs, ys])
+    else
+      x = val2.shift
+      ys2 = val2.clone
+      rets_stream = Egison::LazyArray.new(to_enum(:unjoin_stream, ys2))
+      rets_stream.each{|xs2, _| block.([xs2, ys])}
+      rets_stream.each{|xs2, _| block.([xs2.clone.unshift(x), ys])}
+    end
+  end
 end

data/lib/egison/version.rb

@@ -1,3 +1,3 @@
 module Egison
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/sample/stream.rb

@@ -0,0 +1,20 @@
+require 'egison'
+require 'prime'
+
+p(match_stream(1..5){ with(List.(*_, _x, *_, _y, *_)) { [x, y] } }.to_a)
+
+twin_primes = match_stream(Prime) {
+  with(List.(*_, _x, __("x + 2"), *_)) {
+    [x, x + 2]
+  }
+}
+
+p twin_primes.take(10)
+
+def nats
+  (1..Float::INFINITY)
+end
+
+p match_stream(nats){ with(Multiset.(_m, _n, *_)) { [m, n] } }.take(10)
+
+p match_stream(nats){ with(Set.(_m, _n, *_)) { [m, n] } }.take(10)

data/spec/sample/stream_spec.rb

@@ -0,0 +1,41 @@
+require 'spec_helper'
+require 'egison'
+require 'prime'
+
+def twin_primes
+  match_stream(Prime) {
+    with(List.(*_, _x, __("x + 2"), *_)) {
+      [x, x + 2]
+    }
+  }
+end
+
+def nats
+  (1..Float::INFINITY)
+end
+
+describe "sample" do
+  describe "stream.rb" do
+    it %q{match_stream(1..5){ with(List.(*_, _x, *_, _y, *_)) { [x, y] } }.to_a } do
+      expect(match_stream(1..5){ with(List.(*_, _x, *_, _y, *_)) { [x, y] } }.to_a).to eq \
+        [[1, 2], [1, 3], [2, 3], [1, 4], [2, 4], [3, 4], [1, 5], [2, 5], [3, 5], [4, 5]]
+    end
+
+    it %q{twin_primes.take(10)} do
+      expect(twin_primes.take(10)).to eq \
+        [[3, 5], [5, 7], [11, 13], [17, 19], [29, 31], [41, 43], [59, 61], [71, 73], [101, 103], [107, 109]]
+    end
+
+    # (take 10 (match-all nats (multiset integer) [<cons $m <cons $n _>> [m n]]))
+    it %q{match_stream(nats){ with(Multiset.(_m, _n, *_)) { [m, n] } }.take(10)} do
+      expect(match_stream(nats){ with(Multiset.(_m, _n, *_)) { [m, n] } }.take(10)).to eq \
+        [[1, 2], [1, 3], [2, 1], [1, 4], [2, 3], [3, 1], [1, 5], [2, 4], [3, 2], [4, 1]]
+    end
+
+    # (take 10 (match-all nats (set integer) [<cons $m <cons $n _>> [m n]]))
+    it %q{match_stream(nats){ with(Set.(_m, _n, *_)) { [m, n] } }.take(10)} do
+      expect(match_stream(nats){ with(Set.(_m, _n, *_)) { [m, n] } }.take(10)).to eq \
+        [[1, 1], [1, 2], [2, 1], [1, 3], [2, 2], [3, 1], [1, 4], [2, 3], [3, 2], [4, 1]]
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: egison
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Satoshi Egi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-29 00:00:00.000000000 Z
+date: 2014-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -65,9 +65,11 @@ files:
 - Makefile
 - README.md
 - Rakefile
+- THANKS.md
 - egison.gemspec
 - lib/egison.rb
 - lib/egison/core.rb
+- lib/egison/lazyarray.rb
 - lib/egison/matcher-core.rb
 - lib/egison/matcher.rb
 - lib/egison/version.rb
@@ -75,6 +77,7 @@ files:
 - sample/join.rb
 - sample/poker_hands.rb
 - sample/set.rb
+- sample/stream.rb
 - spec/lib/egison/core_spec.rb
 - spec/lib/egison/matcher_spec.rb
 - spec/lib/egison_spec.rb
@@ -82,6 +85,7 @@ files:
 - spec/sample/join_spec.rb
 - spec/sample/poker_hands_spec.rb
 - spec/sample/set_spec.rb
+- spec/sample/stream_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/egisatoshi/egison-ruby
 licenses: []