egison 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f225dc3acddccd5aea65c3db3ffb9affee8ce561
-  data.tar.gz: 2263fd6df2e9b1e0fbc1bf35b62bf1f264e5f7a3
+  metadata.gz: 93830b57e70db21c121811db9cdb6dc290c8f1d4
+  data.tar.gz: f03a022950af1034baa7f5f05ec8c46bbcdfd27e
 SHA512:
-  metadata.gz: 9193ade5c394260922f051ecd0fc6010ba3f54b9a902b0a631c4b7c416d0ce0eb26e6c380639d31704ef7f401c107aaded9e673198582315c16e75de9850fa72
-  data.tar.gz: a4816f03440ab863e5430a319607ff06e37265bbe51cbf52e50fee9801931a48765909ce4f6ca617376bf90cb58acd263c160f51e135e19f88be0d776e370961
+  metadata.gz: 6dc21dd3b11e12c3db43dfec0631f922eb9da0e6873dbcc055777801746ba0d97a49d2fba8da89965044eaadda57aa3487930a2880834dc65b8f559b76638522
+  data.tar.gz: 39c8fc34bfb2533991fa7b896a660523107a1a58fb51015d4b98b92228c90cbdffce909136e3ae9d5ca3e9c30b47d49bd90b8208425f392ac07f121f791968e4

data/Makefile

@@ -1,3 +1,6 @@
 all:
 	gem build egison.gemspec
 	gem install egison-*.gem
+
+test:
+	bundle exec rspec spec

data/README.md

@@ -1,7 +1,6 @@
-# The Gem for Egison Pattern Matching 
+# The Gem for Egison Pattern Matching
 
-This Gem provides a way to access Egison pattern-matching from Ruby.
-Egison is the world's first programming language that can represent non-linear pattern-match against unfree data types.
+This Gem provides a way to access non-linear pattern-matching against unfree data types from Ruby.
 We can directly express pattern-matching against lists, multisets, and sets using this gem.
 
 ## Installation
@@ -15,8 +14,7 @@ or
 ```
 $ git clone https://github.com/egison/egison-ruby.git
 $ cd egison-ruby
-$ gem build egison.gemspec
-$ gem install egison-*.gem
+$ make
 ```
 
 or
@@ -24,7 +22,7 @@ or
 ```
 $ gem install bundler (if you need)
 $ echo "gem 'egison', :git => 'https://github.com/egison/egison-ruby.git'" > Gemfile
-$ bundle install --path vendor/bundle
+$ bundle install
 ```
 
 ## Basic Usage
@@ -87,24 +85,26 @@ 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>.
+`_` is a <i>wildcard</i>.
 It matches with any object.
+Note that `__` and `___` are also interpreted as a wildcard.
+This is because `_` and `__` are system variables and sometimes have its own meaning.
 
 ```
 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]]
@@ -114,7 +114,7 @@ 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]]
@@ -130,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]
@@ -140,13 +140,30 @@ 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]
 ```
 
-## Demonstration - Poker Hands
+## Demonstrations
+
+### Combinations
+
+We can enumerates all combinations of the elements of a collection with pattern-matching.
+
+```
+require 'egison'
+
+p(match_all([1,2,3,4,5]) do with(List.(*_, _x, *_, _y, *_)) { [x, y] } end)
+#=> [[1, 2], [1, 3], [1, 4], [1, 5], [2, 3], [2, 4], [2, 5], [3, 4], [3, 5], [4, 5]]
+
+p(match_all([1,2,3,4,5]) do with(List.(*_, _x, *_, _y, *_, _z, *_)) { [x, y, z] } end)
+#=> [[1, 2, 3], [1, 2, 4], [1, 2, 5], [1, 3, 4], [1, 3, 5], [1, 4, 5], [2, 3, 4], [2, 3, 5], [2, 4, 5], [3, 4, 5]]
+
+```
+
+### Poker Hands
 
 We can write patterns for all poker-hands in one single pattern.
 It is as follow.
@@ -160,28 +177,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/egison.gemspec

@@ -17,5 +17,7 @@ Gem::Specification.new do |s|
   s.executables      = `git ls-files -- bin/*`.split("\n").map{|f| File.basename(f) }
   s.require_paths    = ['lib']
   s.add_development_dependency 'rake'
+  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'simplecov'
   s.rdoc_options     = ['--main', 'README.rdoc']
 end

data/lib/egison/core.rb

@@ -257,8 +257,6 @@ module PatternMatch
           end
         end
         uscore
-      when 1
-        ValuePattern.new(@ctx, vals[0])
       else
         undefined
       end
@@ -267,13 +265,7 @@ module PatternMatch
     def __(*vals)
       case vals.length
       when 0
-        uscore = Wildcard.new()
-        class << uscore
-          def [](*args)
-            List.call(*args)
-          end
-        end
-        uscore
+        Wildcard.new()
       when 1
         ValuePattern.new(@ctx, vals[0])
       else
@@ -281,6 +273,15 @@ module PatternMatch
       end
     end
     
+    def ___(*vals)
+      case vals.length
+      when 0
+        Wildcard.new()
+      else
+        undefined
+      end
+    end
+
     class BindingModule < ::Module
     end
 
@@ -364,6 +365,8 @@ module Kernel
       env.instance_eval(&block)
     end
   end
+  
+  alias match_single match
 
 end
 

data/lib/egison/version.rb

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

data/spec/lib/egison/core_spec.rb

@@ -0,0 +1,3 @@
+require 'spec_helper'
+require 'egison/core'
+

data/spec/lib/egison/matcher_spec.rb

@@ -0,0 +1,4 @@
+require 'spec_helper'
+require 'egison/core'
+require 'egison/matcher'
+

data/spec/lib/egison_spec.rb

@@ -0,0 +1,3 @@
+require 'spec_helper'
+require 'egison'
+

data/spec/sample/combination_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+require 'egison'
+
+describe "sample" do
+  describe "combination.rb" do
+    it %q{match_all([1,2,3,4,5]) do with(List.(*_, _x, *_, _y, *_)) { [x, y] } end} do
+      expect(match_all([1,2,3,4,5]) do with(List.(*_, _x, *_, _y, *_)) { [x, y] } end).to eq \
+        [[1, 2], [1, 3], [1, 4], [1, 5], [2, 3], [2, 4], [2, 5], [3, 4], [3, 5], [4, 5]]
+    end
+    it %q{match_all([1,2,3,4,5]) do with(List.(*_, _x, *_, _y, *_, _z, *_)) { [x, y, z] } end} do
+      expect(match_all([1,2,3,4,5]) do with(List.(*_, _x, *_, _y, *_, _z, *_)) { [x, y, z] } end).to eq \
+        [[1, 2, 3], [1, 2, 4], [1, 2, 5], [1, 3, 4], [1, 3, 5], [1, 4, 5], [2, 3, 4], [2, 3, 5], [2, 4, 5], [3, 4, 5]]
+    end
+  end
+end
+

data/spec/sample/join_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+require 'egison'
+
+describe "sample" do
+  describe "join.rb" do
+    it %q{match_all([1,2,3,4,5]) do with(List.(*_hs, *_ts)) { [hs, ts] } end} do
+      expect(match_all([1,2,3,4,5]) do with(List.(*_hs, *_ts)) { [hs, ts] } end).to eq \
+        [[[], [1, 2, 3, 4, 5]], [[1], [2, 3, 4, 5]], [[1, 2], [3, 4, 5]], [[1, 2, 3], [4, 5]], [[1, 2, 3, 4], [5]], [[1, 2, 3, 4, 5], []]]
+    end
+    it %q{match_all([1,2,3,4,5]) do with(Multiset.(*_hs, *_ts)) { [hs, ts] } end} do
+      expect(match_all([1,2,3,4,5]) do with(Multiset.(*_hs, *_ts)) { [hs, ts] } end).to eq \
+        [[[], [1, 2, 3, 4, 5]], [[5], [1, 2, 3, 4]], [[4], [1, 2, 3, 5]], [[4, 5], [1, 2, 3]], [[3], [1, 2, 4, 5]], [[3, 5], [1, 2, 4]], [[3, 4], [1, 2, 5]], [[3, 4, 5], [1, 2]], [[2], [1, 3, 4, 5]], [[2, 5], [1, 3, 4]], [[2, 4], [1, 3, 5]], [[2, 4, 5], [1, 3]], [[2, 3], [1, 4, 5]], [[2, 3, 5], [1, 4]], [[2, 3, 4], [1, 5]], [[2, 3, 4, 5], [1]], [[1], [2, 3, 4, 5]], [[1, 5], [2, 3, 4]], [[1, 4], [2, 3, 5]], [[1, 4, 5], [2, 3]], [[1, 3], [2, 4, 5]], [[1, 3, 5], [2, 4]], [[1, 3, 4], [2, 5]], [[1, 3, 4, 5], [2]], [[1, 2], [3, 4, 5]], [[1, 2, 5], [3, 4]], [[1, 2, 4], [3, 5]], [[1, 2, 4, 5], [3]], [[1, 2, 3], [4, 5]], [[1, 2, 3, 5], [4]], [[1, 2, 3, 4], [5]], [[1, 2, 3, 4, 5], []]]
+    end
+    it %q{match_all([1,2,3,4,5]) do with(Set.(*_hs, *_ts)) { [hs, ts] } end} do
+      expect(match_all([1,2,3,4,5]) do with(Set.(*_hs, *_ts)) { [hs, ts] } end).to eq \
+        [[[], [1, 2, 3, 4, 5]], [[5], [1, 2, 3, 4, 5]], [[4], [1, 2, 3, 4, 5]], [[4, 5], [1, 2, 3, 4, 5]], [[3], [1, 2, 3, 4, 5]], [[3, 5], [1, 2, 3, 4, 5]], [[3, 4], [1, 2, 3, 4, 5]], [[3, 4, 5], [1, 2, 3, 4, 5]], [[2], [1, 2, 3, 4, 5]], [[2, 5],[1, 2, 3, 4, 5]], [[2, 4], [1, 2, 3, 4, 5]], [[2, 4, 5], [1, 2, 3, 4, 5]], [[2,3], [1, 2, 3, 4, 5]], [[2, 3, 5], [1, 2, 3, 4, 5]], [[2, 3, 4], [1, 2, 3, 4, 5]], [[2, 3, 4, 5], [1, 2, 3, 4, 5]], [[1], [1, 2, 3, 4, 5]], [[1, 5], [1, 2, 3, 4, 5]], [[1, 4], [1, 2, 3, 4, 5]], [[1, 4, 5], [1, 2, 3, 4, 5]], [[1, 3], [1, 2, 3, 4, 5]], [[1, 3, 5], [1, 2, 3, 4, 5]], [[1, 3, 4], [1, 2, 3, 4, 5]], [[1, 3, 4, 5], [1, 2, 3, 4, 5]], [[1, 2], [1, 2, 3, 4, 5]], [[1, 2, 5], [1, 2, 3, 4, 5]],[[1, 2, 4], [1, 2, 3, 4, 5]], [[1, 2, 4, 5], [1, 2, 3, 4, 5]], [[1, 2, 3], [1, 2, 3, 4, 5]], [[1, 2, 3, 5], [1, 2, 3, 4, 5]], [[1, 2, 3, 4], [1, 2, 3, 4, 5]], [[1, 2, 3, 4, 5], [1, 2, 3, 4, 5]]]
+    end
+  end
+end
+

data/spec/sample/poker_hands_spec.rb

@@ -0,0 +1,52 @@
+require 'spec_helper'
+require 'egison'
+
+def poker_hands cs
+  match_single(cs) do
+    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
+      "Four of kind"
+    end
+    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
+      "Straight"
+    end
+    with(Multiset.(_[_, _n], _[_, __n], _[_, __n], _, _)) do
+      "Three of kind"
+    end
+    with(Multiset.(_[_, _m], _[_, __m], _[_, _n], _[_, __n], _)) do
+      "Two pairs"
+    end
+    with(Multiset.(_[_, _n], _[_, __n], _, _, _)) do
+      "One pair"
+    end
+    with(Multiset.(_, _, _, _, _)) do
+      "Nothing"
+    end
+  end
+end
+
+describe "sample" do
+  describe "poker.rb" do
+    it "Straight flush" do
+      expect(poker_hands([["diamond", 1], ["diamond", 3], ["diamond", 5], ["diamond", 4], ["diamond", 2]])).to eq "Straight flush"
+    end
+    it "Full house" do
+      expect(poker_hands([["diamond", 1], ["club", 2], ["club", 1], ["heart", 1], ["diamond", 2]])).to eq "Full house"
+    end
+    it "Straight" do
+      expect(poker_hands([["diamond", 4], ["club", 2], ["club", 5], ["heart", 1], ["diamond", 3]])).to eq "Straight"
+    end
+    it "Nothing" do
+      expect(poker_hands([["diamond", 4], ["club", 10], ["club", 5], ["heart", 1], ["diamond", 3]])).to eq "Nothing"
+    end
+  end
+end
+

data/spec/sample/set_spec.rb

@@ -0,0 +1,12 @@
+require 'spec_helper'
+require 'egison'
+
+describe "sample" do
+  describe "set.rb" do
+    it %q{match_all([1,2,3,4,5]) do with(Set.(_x,_y, *_)) { [x, y] } end} do
+      expect(match_all([1,2,3,4,5]) do with(Set.(_x,_y, *_)) { [x, y] } end).to eq \
+        [[1, 1], [1, 2], [1, 3], [1, 4], [1, 5], [2, 1], [2, 2], [2, 3], [2, 4], [2, 5], [3, 1], [3, 2], [3, 3], [3, 4], [3, 5], [4, 1], [4, 2], [4, 3], [4, 4], [4, 5], [5, 1], [5, 2], [5, 3], [5, 4], [5, 5]]
+    end
+  end
+end
+

data/spec/spec_helper.rb

@@ -0,0 +1,8 @@
+require 'simplecov'
+
+SimpleCov.start do
+  add_filter '/spec/'
+end
+
+RSpec.configure do |config|
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: egison
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Satoshi Egi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-14 00:00:00.000000000 Z
+date: 2014-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -24,6 +24,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: The library to access Egison pattern-matching from Ruby.
 email:
 - egi@egison.org
@@ -47,6 +75,14 @@ files:
 - sample/join.rb
 - sample/poker_hands.rb
 - sample/set.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/join_spec.rb
+- spec/sample/poker_hands_spec.rb
+- spec/sample/set_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/egisatoshi/egison-ruby
 licenses: []
 metadata: {}