egison 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de7ad9f50fc2017c4546ff5ec489cd05e73fb13e
-  data.tar.gz: 093963280669d6413a0729c82902bf342e321c82
+  metadata.gz: f225dc3acddccd5aea65c3db3ffb9affee8ce561
+  data.tar.gz: 2263fd6df2e9b1e0fbc1bf35b62bf1f264e5f7a3
 SHA512:
-  metadata.gz: 00bdaec6a09f92e11144f45bdd4835c06ade096c13769350d9766a55ab27a0b5a92ab8c25186e8c5e604ba8adf5b76a722986434e9f3c9ae498c5c1488e33d5f
-  data.tar.gz: 314486adbe83a12d08f46c92e0dc062c52555d9f152e158103b0962bd1300f1b3f75093a95b3d3b3948a7529c6580b51021071486923a5e27d927e34a2226cfd
+  metadata.gz: 9193ade5c394260922f051ecd0fc6010ba3f54b9a902b0a631c4b7c416d0ce0eb26e6c380639d31704ef7f401c107aaded9e673198582315c16e75de9850fa72
+  data.tar.gz: a4816f03440ab863e5430a319607ff06e37265bbe51cbf52e50fee9801931a48765909ce4f6ca617376bf90cb58acd263c160f51e135e19f88be0d776e370961

data/README.md

@@ -87,31 +87,34 @@ We can write pattern-matching against lists, multisets, and sets.
 When we regard an array as a multiset, the order of elements is ignored.
 When we regard an array as a set, the duplicates and order of elements are ignored.
 
+`__` is a <i>wildcard</i>.
+It matches with any object.
+
 ```
 match_all([1, 2, 3]) do
-  with(List.(_a, _b, *_)) do
+  with(List.(_a, _b, *__)) do
     [a, b]
   end
 end  #=> [[1, 2]]
 
 match_all([1, 2, 3]) do
-  with(Multiset.(_a, _b, *_)) do
+  with(Multiset.(_a, _b, *__)) do
     [a, b]
   end
 end  #=> [[1, 2], [1, 3], [2, 1], [2, 3], [3, 1], [3, 2]]
 
 match_all([1, 2, 3]) do
-  with(Set.(_a, _b, *_)) do
+  with(Set.(_a, _b, *__)) do
     [a, b]
   end
 end  #=> [[1, 1],[1, 2],[1, 3],[2, 1],[2, 2],[2, 3],[3, 1],[3, 2],[3, 3]]
 ```
 
-Note that <code>_[]</code> is provided as syntactic sugar for <code>List.()</code>.
+Note that `_[]` is provided as syntactic sugar for `List.()`.
 
 ```
 match_all([1, 2, 3]) do
-  with(_[_a, _b, *_]) do
+  with(_[_a, _b, *__]) do
     [a, b]
   end
 end  #=> [[1, 2]]
@@ -127,7 +130,7 @@ It matches the target when the target is equal with the value that `...` evaluat
 
 ```
 match_all([5, 3, 4, 1, 2]) do
-  with(Multiset.(_a, __("a + 1"), __("a + 2"), *_)) do
+  with(Multiset.(_a, __("a + 1"), __("a + 2"), *__)) do
     a
   end
 end  #=> [1,2,3]
@@ -137,7 +140,7 @@ When, the expression in the place of `...` is a single variable, we can omit `("
 
 ```
 match_all([1, 2, 3, 2, 5]) do
-  with(Multiset.(_a, __a, *_)) do
+  with(Multiset.(_a, __a, *__)) do
     a
   end
 end  #=> [2,2]
@@ -157,28 +160,28 @@ def poker_hands cs
     with(Multiset.(_[_s, _n], _[__s, __("n+1")], _[__s, __("n+2")], _[__s, __("n+3")], _[__s, __("n+4")])) do
       "Straight flush"
     end
-    with(Multiset.(_[_, _n], _[_, __n], _[_, __n], _[_, __n], _)) do
+    with(Multiset.(_[__, _n], _[__, __n], _[__, __n], _[__, __n], __)) do
       "Four of kind"
     end
-    with(Multiset.(_[_, _m], _[_, __m], _[_, __m], _[_, _n], _[_, __n])) do
+    with(Multiset.(_[__, _m], _[__, __m], _[__, __m], _[__, _n], _[__, __n])) do
       "Full house"
     end
     with(Multiset.(_[_s, _], _[__s, _], _[__s, _], _[__s, _], _[__s, _])) do
       "Flush"
     end
-    with(Multiset.(_[_, _n], _[_, __("n+1")], _[_, __("n+2")], _[_, __("n+3")], _[_, __("n+4")])) do
+    with(Multiset.(_[__, _n], _[__, __("n+1")], _[__, __("n+2")], _[__, __("n+3")], _[__, __("n+4")])) do
       "Straight"
     end
-    with(Multiset.(_[_, _n], _[_, __n], _[_, __n], _, _)) do
+    with(Multiset.(_[__, _n], _[__, __n], _[__, __n], __, __)) do
       "Three of kind"
     end
-    with(Multiset.(_[_, _m], _[_, __m], _[_, _n], _[_, __n], _)) do
+    with(Multiset.(_[__, _m], _[__, __m], _[__, _n], _[__, __n], __)) do
       "Two pairs"
     end
-    with(Multiset.(_[_, _n], _[_, __n], _, _, _)) do
+    with(Multiset.(_[__, _n], _[__, __n], __, __, __)) do
       "One pair"
     end
-    with(Multiset.(_, _, _, _, _)) do
+    with(Multiset.(__, __, __, __, __)) do
       "Nothing"
     end
   end

data/lib/egison/core.rb

@@ -264,10 +264,23 @@ module PatternMatch
       end
     end
 
-    def __(val)
-      ValuePattern.new(@ctx, val)
+    def __(*vals)
+      case vals.length
+      when 0
+        uscore = Wildcard.new()
+        class << uscore
+          def [](*args)
+            List.call(*args)
+          end
+        end
+        uscore
+      when 1
+        ValuePattern.new(@ctx, vals[0])
+      else
+        undefined
+      end
     end
-
+    
     class BindingModule < ::Module
     end
 
@@ -353,3 +366,4 @@ module Kernel
   end
 
 end
+

data/lib/egison/matcher-core.rb

@@ -0,0 +1,42 @@
+require 'egison/core'
+
+class Class
+  include PatternMatch::Matchable
+
+  def uncons(val)
+    raise NotImplementedError, "need to define `#{__method__}'"
+  end
+
+  private
+
+  def accept_array_only(val)
+    raise PatternMatch::PatternNotMatch unless val.kind_of?(Array)
+  end
+end
+
+class List
+end
+
+class << List
+  def uncons(val)
+    accept_array_only(val)
+    val2 = val.clone
+    x = val2.shift
+    [[x, val2]]
+  end
+
+  def unjoin(val)
+    accept_array_only(val)
+    val2 = val.clone
+    xs = []
+    ys = val2.clone
+    rets = [[xs, ys]]
+    while !val2.empty? do
+      x = val2.shift
+      ys = val2.clone
+      xs = xs + [x]
+      rets = rets + [[xs, ys]]
+    end
+    rets
+  end
+end

data/lib/egison/matcher.rb

@@ -1,45 +1,5 @@
 require 'egison/core'
-
-class Class
-  include PatternMatch::Matchable
-
-  def uncons(val)
-    raise NotImplementedError, "need to define `#{__method__}'"
-  end
-
-  private
-
-  def accept_array_only(val)
-    raise PatternMatch::PatternNotMatch unless val.kind_of?(Array)
-  end
-end
-
-class List
-end
-
-class << List
-  def uncons(val)
-    accept_array_only(val)
-    val2 = val.clone
-    x = val2.shift
-    [[x, val2]]
-  end
-
-  def unjoin(val)
-    accept_array_only(val)
-    val2 = val.clone
-    xs = []
-    ys = val2.clone
-    rets = [[xs, ys]]
-    while !val2.empty? do
-      x = val2.shift
-      ys = val2.clone
-      xs = xs + [x]
-      rets = rets + [[xs, ys]]
-    end
-    rets
-  end
-end
+require 'egison/matcher-core'
 
 class Multiset
 end
@@ -47,12 +7,11 @@ end
 class << Multiset
   def uncons(val)
     accept_array_only(val)
-    rets = val.map {|x|
-      val2 = val.clone
-      val2.delete_at(val2.find_index(x))
-      [x, val2]
-    }
-    rets
+    match_all(val) do
+      with(List.(*_hs, _x, *_ts)) do
+        [x, hs + ts]
+      end
+    end
   end
   
   def unjoin(val)
@@ -79,12 +38,13 @@ end
 class << Set
   def uncons(val)
     accept_array_only(val)
-    rets = val.map {|x|
-      val2 = val.clone
-      [x, val2]
-    }
-    rets
+    match_all(val) do
+      with(List.(*_, _x, *_)) do
+        [x, val]
+      end
+    end
   end
+  
   def unjoin(val)
     accept_array_only(val)
     val2 = val.clone

data/lib/egison/version.rb

@@ -1,3 +1,3 @@
 module Egison
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

data/sample/join.rb

@@ -0,0 +1,7 @@
+require 'egison'
+
+p(match_all([1,2,3,4,5]) do with(List.(*_hs, *_ts)) { [hs, ts] } end)
+
+p(match_all([1,2,3,4,5]) do with(Multiset.(*_hs, *_ts)) { [hs, ts] } end)
+
+p(match_all([1,2,3,4,5]) do with(Set.(*_hs, *_ts)) { [hs, ts] } end)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: egison
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Satoshi Egi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-12 00:00:00.000000000 Z
+date: 2014-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -40,9 +40,11 @@ files:
 - egison.gemspec
 - lib/egison.rb
 - lib/egison/core.rb
+- lib/egison/matcher-core.rb
 - lib/egison/matcher.rb
 - lib/egison/version.rb
 - sample/combination.rb
+- sample/join.rb
 - sample/poker_hands.rb
 - sample/set.rb
 homepage: https://github.com/egisatoshi/egison-ruby