egison 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94a489dfeb3722cf74e46e867076fec46fb389b7
-  data.tar.gz: 9b115c122986dd02864a4b25a7754273f4eadd9d
+  metadata.gz: 4220d772a26fbea06a65175e59f77466ef5696b2
+  data.tar.gz: 4c6a23d914dcd4a1c3c4c74f2b36258fce0c24ec
 SHA512:
-  metadata.gz: 896c6d1ad74e28517083ae6cfea6465895f1af804c5fbf51da7c291b51f16effdc120e0a50e5325b61273490e71ebd71b1e46924e3eb34ff2906c0eca2cd12f6
-  data.tar.gz: bb189940c54dcb19358b5d30b2e94b48d3e262fb2ec22f0c6e7e28299a0ed2853f50e935090f0f45d70266b82e351bfab15e7cdde854e87c4422b752c3aaf7ef
+  metadata.gz: 42cb47d6867e69defec1a397afbb0f5df6bfe75ed4182ca66496a1248a2c863bd486f9e13b4a5b8834ebcf85af7b29ba06cb9e08c4e21bfd2ed8219752fa05db
+  data.tar.gz: 5db2fa350525a714a6e514b3195a06f4adc0791cf664b92727e258956b5cf19fb24f2c4f2edf2703796693397cef633b07b5f7b8ca6811b7691e4d2c6a30d013

data/README.md

@@ -253,16 +253,45 @@ 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]]
 ```
 
+### Algebraic Data Types
+
+We can also patten match against algebraic data types as ordinary functional programming languages.
+Here is a simple example.
+Note that, the object in the pattern matches if the target object is equal with it.
+
+```
+class User < Struct.new(:name, :gender, :married, :doctor, :professor)
+  def greet
+    match(self) do
+      with(_[_name,       _,    _,    _, true]) { "Hello, Prof. #{name}!" }
+      with(_[_name,       _,    _, true,    _]) { "Hello, Dr. #{name}!" }
+      with(_[_name,   :male,    _,    _,    _]) { "Hello, Mr. #{name}!" }
+      with(_[_name, :female, true,    _,    _]) { "Hello, Mrs. #{name}!" }
+      with(_[_name, :female,    _,    _,    _]) { "Hello, Ms. #{name}!" }
+      with(_[_name,       _,    _,    _,    _]) { "Hello, #{name}!" }
+    end
+  end
+end
+
+u1 = User.new("Egi", :male, true, false, false)
+p(u1.greet)#=>"Hello, Mr. Egi!"
+
+u2 = User.new("Nanaka", :girl, false, false, false)
+p(u2.greet)#=>"Hello, Nanaka!"
+
+u3 = User.new("Hirai", :male, true, true, false)
+p(u3.greet)#=>"Hello, Dr. Hirai!"
+
+u4 = User.new("Hagiya", :male, true, true, true)
+p(u4.greet)#=>"Hello, Prof. Hagiya!"
+```
+
 You can find more demonstrations in the [`sample`](https://github.com/egison/egison-ruby/tree/master/sample) directory.
 
 ## About Egison
 
-If you get to love the above pattern-matching, please try [the Egison programming language](http://www.egison.org), too.
-<<<<<<< HEAD
+If you get to love the above pattern-matching, please try [the Egison programming language](https://github.com/egison/egison), too.
 Egison is the pattern-matching oriented, purely functional programming language.
-=======
-Egison is the pattern-matching oriented purely functional programming language.
->>>>>>> 39ede8d0f3300244c240fce2d8069dda3a2f065e
 Actually, the original pattern-matching system of Egison is more powerful.
 For example, we can do following things in the original Egison.
 

data/lib/egison/core.rb

@@ -1,5 +1,4 @@
 require 'egison/version'
-# require 'continuation'
 require 'egison/lazyarray'
 
 module PatternMatch
@@ -140,6 +139,7 @@ module PatternMatch
     end
 
     def match(tgt, bindings)
+      tgt = tgt.to_a
       if subpatterns.empty?
         if tgt.empty?
           return [[[], []]]
@@ -149,22 +149,33 @@ module PatternMatch
       else
         subpatterns = @subpatterns.clone
         px = subpatterns.shift
-        if px.quantified
-          if subpatterns.empty?
-            [[[[px.pattern, tgt]], []]]
+        if px.kind_of?(Pattern)
+          if px.quantified
+            if subpatterns.empty?
+              [[[[px.pattern, tgt]], []]]
+            else
+              unjoineds = @matcher.unjoin(tgt)
+              unjoineds.map do |xs, ys|
+                [[[px.pattern, xs], [PatternWithMatcher.new(@matcher, *subpatterns), ys]], []]
+              end
+            end
           else
-            unjoineds = @matcher.unjoin(tgt)
-            unjoineds.map do |xs, ys|
-              [[[px.pattern, xs], [PatternWithMatcher.new(@matcher, *subpatterns), ys]], []]
+            if tgt.empty?
+              []
+            else
+              unconseds = @matcher.uncons(tgt)
+              unconseds.map do |x, xs|
+                [[[px, x], [PatternWithMatcher.new(@matcher, *subpatterns), xs]], []]
+              end
             end
           end
         else
           if tgt.empty?
             []
           else
-            unconseds = @matcher.uncons(tgt)
+            unconseds = @matcher.uncons(tgt).select { |x, xs| px == x }
             unconseds.map do |x, xs|
-              [[[px, x], [PatternWithMatcher.new(@matcher, *subpatterns), xs]], []]
+              [[[PatternWithMatcher.new(@matcher, *subpatterns), xs]], []]
             end
           end
         end
@@ -179,18 +190,28 @@ module PatternMatch
       else
         subpatterns = @subpatterns.clone
         px = subpatterns.shift
-        if px.quantified
-          if subpatterns.empty?
-            block.([[[px.pattern, tgt]], []])
+        if px.kind_of?(Pattern)
+          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
-            @matcher.unjoin_stream(tgt) do |xs, ys|
-              block.([[px.pattern, xs], [PatternWithMatcher.new(@matcher, *subpatterns), ys]], [])
+            unless tgt.empty?
+              @matcher.uncons_stream(tgt) do |x, xs|
+                block.([[px, x], [PatternWithMatcher.new(@matcher, *subpatterns), xs]], [])
+              end
             end
           end
         else
           unless tgt.empty?
             @matcher.uncons_stream(tgt) do |x, xs|
-              block.([[px, x], [PatternWithMatcher.new(@matcher, *subpatterns), xs]], [])
+              if px == x
+                block.([[PatternWithMatcher.new(@matcher, *subpatterns), xs]], [])
+              end
             end
           end
         end
@@ -311,7 +332,7 @@ module PatternMatch
     def method_missing(name, *args)
       ::Kernel.raise ::ArgumentError, "wrong number of arguments (#{args.length} for 0)" unless args.empty?
       if /^__/.match(name.to_s)
-        ValuePattern.new(@ctx, name.to_s.gsub(/^__/, "").gsub("_plus_", "+").gsub("_minus_", "-"))
+        ValuePattern.new(@ctx, name.to_s.gsub(/^__/, ""))
       elsif /^_/.match(name.to_s)
         PatternVariable.new(name.to_s.gsub(/^_/, "").to_sym)
       else
@@ -393,13 +414,22 @@ module PatternMatch
     def with(pat, &block)
       ctx = @ctx
       tgt = @tgt
-      mstack = MatchingStateStack.new(pat,tgt)
-      mstack.match
-      if mstack.results.empty?
-        nil
+      if pat.kind_of?(Pattern)
+        mstack = MatchingStateStack.new(pat,tgt)
+        mstack.match
+        if mstack.results.empty?
+          nil
+        else
+          ret = with_bindings(ctx, mstack.results.first, &block)
+          ::Kernel.throw(:exit_match, ret)
+        end
       else
-        ret = with_bindings(ctx, mstack.results.first, &block)
-        ::Kernel.throw(:exit_match, ret)
+        if pat == tgt
+          ret = with_bindings(ctx, [], &block)
+          ::Kernel.throw(:exit_match, ret)
+        else
+          nil
+        end
       end
     rescue PatternNotMatch
     end

data/lib/egison/matcher-core.rb

@@ -14,10 +14,6 @@ class Class
 
   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)
@@ -26,13 +22,12 @@ end
 
 module Egison
   extend self
-  
+
   class List
   end
 
   class << List
     def uncons(val)
-      accept_array_only(val)
       val2 = val.clone
       x = val2.shift
       [[x, val2]]
@@ -48,7 +43,6 @@ module Egison
     end
 
     def unjoin(val)
-      accept_array_only(val)
       val2 = val.clone
       xs = []
       ys = val2.clone

data/lib/egison/matcher.rb

@@ -11,7 +11,6 @@ module Egison
 
   class << Multiset
     def uncons(val)
-      accept_array_only(val)
       match_all(val) do
         with(List.(*_hs, _x, *_ts)) do
           [x, hs + ts]
@@ -32,7 +31,6 @@ module Egison
     end
 
     def unjoin(val)
-      accept_array_only(val)
       val2 = val.clone
       xs = []
       ys = val2.clone
@@ -69,7 +67,6 @@ module Egison
 
   class << Set
     def uncons(val)
-      accept_array_only(val)
       match_all(val) do
         with(List.(*_, _x, *_)) do
           [x, val]
@@ -90,7 +87,6 @@ module Egison
     end
 
     def unjoin(val)
-      accept_array_only(val)
       val2 = val.clone
       xs = []
       ys = val2.clone

data/lib/egison/version.rb

@@ -1,3 +1,3 @@
 module Egison
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/sample/fib.rb

@@ -0,0 +1,15 @@
+require 'egison'
+
+include Egison
+
+def fib (n)
+  match(n) do
+    with(0) { 0 }
+    with(1) { 1 }
+    with(_) { fib(n - 1) + fib(n - 2) }
+  end
+end
+
+p(fib(0))
+p(fib(1))
+p(fib(10))

data/sample/greet.rb

@@ -0,0 +1,28 @@
+require 'egison'
+
+include Egison
+
+class User < Struct.new(:name, :gender, :married, :doctor, :professor)
+  def greet
+    match(self) do
+      with(_[_name,       _,    _,    _, true]) { "Hello, Prof. #{name}!" }
+      with(_[_name,       _,    _, true,    _]) { "Hello, Dr. #{name}!" }
+      with(_[_name,   :male,    _,    _,    _]) { "Hello, Mr. #{name}!" }
+      with(_[_name, :female, true,    _,    _]) { "Hello, Mrs. #{name}!" }
+      with(_[_name, :female,    _,    _,    _]) { "Hello, Ms. #{name}!" }
+      with(_[_name,       _,    _,    _,    _]) { "Hello, #{name}!" }
+    end
+  end
+end
+
+u1 = User.new("Egi", :male, true, false, false)
+p(u1.greet)
+
+u2 = User.new("Nanaka", :girl, false, false, false)
+p(u2.greet)
+
+u3 = User.new("Hirai", :male, true, true, false)
+p(u3.greet)
+
+u4 = User.new("Hagiya", :male, true, true, true)
+p(u4.greet)

data/sample/poker_hands.rb

@@ -4,6 +4,9 @@ include Egison
 
 def poker_hands cs
   match(cs) do
+    with(Multiset.(_[_s, 10], _[__s, 11], _[__s, 12], _[__s, 13], _[__s, 1])) do
+      "Royal Straight flush"
+    end
     with(Multiset.(_[_s, _n], _[__s, __("n+1")], _[__s, __("n+2")], _[__s, __("n+3")], _[__s, __("n+4")])) do
       "Straight flush"
     end
@@ -34,6 +37,7 @@ def poker_hands cs
   end
 end
 
+p(poker_hands([["diamond", 1], ["diamond", 10], ["diamond", 13], ["diamond", 12], ["diamond", 11]])) #=> "Straight flush"
 p(poker_hands([["diamond", 1], ["diamond", 3], ["diamond", 5], ["diamond", 4], ["diamond", 2]])) #=> "Straight flush"
 p(poker_hands([["diamond", 1], ["club", 2], ["club", 1], ["heart", 1], ["diamond", 2]])) #=> "Full house"
 p(poker_hands([["diamond", 4], ["club", 2], ["club", 5], ["heart", 1], ["diamond", 3]])) #=> "Straight"

data/sample/primes.rb

@@ -0,0 +1,12 @@
+require 'egison'
+require 'prime'
+
+include Egison
+
+twin_primes = match_stream(Prime) {
+  with(List.(*_, _x, __("x + 2"), *_)) {
+    [x, x + 2]
+  }
+}
+
+p twin_primes.take(10)

data/sample/stream.rb

@@ -1,17 +1,10 @@
 require 'egison'
-require 'prime'
 
 include Egison
 
 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)
+p(match_stream(1..5){ with(List.(*_, 2, *_, _y, *_)) { [2, y] } }.to_a)
 
 def nats
   (1..Float::INFINITY)

data/spec/sample/greet_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+require 'egison'
+
+include Egison
+
+class User < Struct.new(:name, :gender, :married, :doctor, :professor)
+  def greet
+    match(self) do
+      with(_[_name,       _,    _,    _, true]) { "Hello, Prof. #{name}!" }
+      with(_[_name,       _,    _, true,    _]) { "Hello, Dr. #{name}!" }
+      with(_[_name,   :male,    _,    _,    _]) { "Hello, Mr. #{name}!" }
+      with(_[_name, :female, true,    _,    _]) { "Hello, Mrs. #{name}!" }
+      with(_[_name, :female,    _,    _,    _]) { "Hello, Ms. #{name}!" }
+      with(_[_name,       _,    _,    _,    _]) { "Hello, #{name}!" }
+    end
+  end
+end
+
+describe "sample" do
+  describe "greet.rb" do
+    it %q{User.new("Egi", :male, true, false, false).greet} do
+      expect(User.new("Egi", :male, true, false, false).greet).to eq \
+        "Hello, Mr. Egi!"
+    end
+    it %q{User.new("Nanaka", :girl, false, false, false).greet} do
+      expect(User.new("Nanaka", :girl, false, false, false).greet).to eq \
+        "Hello, Nanaka!"
+    end
+    it %q{User.new("Hirai", :male, true, true, false).greet} do
+      expect(User.new("Hirai", :male, true, true, false).greet).to eq \
+        "Hello, Dr. Hirai!"
+    end
+    it %q{User.new("Hagiya", :male, true, true, true).greet} do
+      expect(User.new("Hagiya", :male, true, true, true).greet).to eq \
+        "Hello, Prof. Hagiya!"
+    end
+  end
+end
+

data/spec/sample/prime_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+require 'egison'
+require 'prime'
+
+include Egison
+
+def twin_primes
+  match_stream(Prime) {
+    with(List.(*_, _x, __("x + 2"), *_)) {
+      [x, x + 2]
+    }
+  }
+end
+
+describe "sample" do
+  describe "prime.rb" do
+
+    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
+
+    # assign to a variable, execute twice (or more), then obtain the same results. (for twin-primes)
+    it %q{assign to a variable, execute twice (or more), then obtain the same results. (for twin-primes)} do
+      tp = twin_primes
+      tp.take(10) # discard
+      expect(tp.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
+  end
+end

data/spec/sample/stream_spec.rb

@@ -1,17 +1,8 @@
 require 'spec_helper'
 require 'egison'
-require 'prime'
 
 include Egison
 
-def twin_primes
-  match_stream(Prime) {
-    with(List.(*_, _x, __("x + 2"), *_)) {
-      [x, x + 2]
-    }
-  }
-end
-
 def nats
   (1..Float::INFINITY)
 end
@@ -23,11 +14,6 @@ describe "sample" do
         [[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 \
@@ -53,13 +39,5 @@ describe "sample" do
         [[1, 1], [1, 2], [2, 1], [1, 3], [2, 2], [3, 1], [1, 4], [2, 3], [3, 2], [4, 1],
          [1, 5], [2, 4], [3, 3], [4, 2], [5, 1], [1, 6], [2, 5], [3, 4], [4, 3], [5, 2]]
     end
-
-    # assign to a variable, execute twice (or more), then obtain the same results. (for twin-primes)
-    it %q{assign to a variable, execute twice (or more), then obtain the same results. (for twin-primes)} do
-      tp = twin_primes
-      tp.take(10) # discard
-      expect(tp.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
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: egison
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Satoshi Egi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-22 00:00:00.000000000 Z
+date: 2014-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -74,17 +74,22 @@ files:
 - lib/egison/matcher.rb
 - lib/egison/version.rb
 - sample/combination.rb
+- sample/fib.rb
+- sample/greet.rb
 - sample/join.rb
 - sample/poker_hands.rb
+- sample/primes.rb
 - sample/set.rb
 - sample/stream.rb
 - spec/lib/egison/core_spec.rb
 - spec/lib/egison/matcher_spec.rb
 - spec/lib/egison_spec.rb
 - spec/sample/combination_spec.rb
+- spec/sample/greet_spec.rb
 - spec/sample/join_spec.rb
 - spec/sample/join_stream_spec.rb
 - spec/sample/poker_hands_spec.rb
+- spec/sample/prime_spec.rb
 - spec/sample/set_spec.rb
 - spec/sample/stream_spec.rb
 - spec/spec_helper.rb