egison 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93830b57e70db21c121811db9cdb6dc290c8f1d4
-  data.tar.gz: f03a022950af1034baa7f5f05ec8c46bbcdfd27e
+  metadata.gz: c0a67c9b1b9350d0d0c09b823f1b988626a5a100
+  data.tar.gz: 244276e1bb15b529bf0084c207f0e0735a640294
 SHA512:
-  metadata.gz: 6dc21dd3b11e12c3db43dfec0631f922eb9da0e6873dbcc055777801746ba0d97a49d2fba8da89965044eaadda57aa3487930a2880834dc65b8f559b76638522
-  data.tar.gz: 39c8fc34bfb2533991fa7b896a660523107a1a58fb51015d4b98b92228c90cbdffce909136e3ae9d5ca3e9c30b47d49bd90b8208425f392ac07f121f791968e4
+  metadata.gz: 9dbeac11189e83c9f9236c62dbbb4879a1137f368932021088e2472a4b503ad6dad0ead29be8095b53ca5bfab7d2214bfee866edab166d0b523989d91dfc34c0
+  data.tar.gz: 226cebb19768ea435db9ce4f420961c69a4160cfa9fb579535a55a631ad9e56d53975e41ea19df1e0ae6508d7928df9cb990c0e9ff21b2bad62a6b95e25061da

data/Makefile

@@ -1,4 +1,7 @@
 all:
+	make compile
+	make test
+compile:
 	gem build egison.gemspec
 	gem install egison-*.gem
 

data/lib/egison/core.rb

@@ -19,30 +19,30 @@ module PatternMatch
   class MatchingStateStack
     attr_accessor :states
     attr_accessor :results
-    
+
     def initialize(pat, tgt)
       @states = [MatchingState.new(pat, tgt)]
       @results = []
     end
 
     def match
-      while !@states.empty? do
+      until @states.empty? do
         process
       end
       @results
     end
-    
+
     def process
       state = @states.shift
       rets = state.process
       new_states = []
-      rets.each { |ret|
-        if ret.atoms.empty? then
-          @results = @results + [ret.bindings]
+      rets.each do |ret|
+        if ret.atoms.empty?
+          @results += [ret.bindings]
         else
-          new_states = new_states + [ret]
+          new_states += [ret]
         end
-      }
+      end
       @states = new_states + @states
     end
   end
@@ -58,18 +58,18 @@ module PatternMatch
     def process
       atom = @atoms.shift
       rets = atom.first.match(atom.last, @bindings)
-      rets.map { |new_atoms, new_bindings|
-        new_state = self.clone
+      rets.map do |new_atoms, new_bindings|
+        new_state = clone
         new_state.atoms = new_atoms + new_state.atoms
-        new_state.bindings = new_state.bindings + new_bindings
+        new_state.bindings += new_bindings
         new_state
-      }
+      end
     end
   end
 
   class Pattern
     attr_accessor :quantified
-    
+
     def initialize
     end
 
@@ -98,8 +98,8 @@ module PatternMatch
     end
 
     def match(tgt, bindings)
-      if subpatterns.empty? then
-        if tgt.empty? then
+      if subpatterns.empty?
+        if tgt.empty?
           return [[[], []]]
         else
           return []
@@ -107,19 +107,23 @@ module PatternMatch
       else
         subpatterns = @subpatterns.clone
         px = subpatterns.shift
-        if px.quantified then
-          if subpatterns.empty? then
+        if px.quantified
+          if subpatterns.empty?
             [[[[px.pattern, tgt]], []]]
           else
             unjoineds = @matcher.unjoin(tgt)
-            unjoineds.map { |xs, ys| [[[px.pattern, xs], [PatternWithMatcher.new(@matcher, *subpatterns), ys]], []] }
+            unjoineds.map do |xs, ys|
+              [[[px.pattern, xs], [PatternWithMatcher.new(@matcher, *subpatterns), ys]], []]
+            end
           end
         else
-          if tgt.empty? then
+          if tgt.empty?
             []
           else
             unconseds = @matcher.uncons(tgt)
-            unconseds.map { |x, xs| [[[px, x], [PatternWithMatcher.new(@matcher, *subpatterns), xs]], []] }
+            unconseds.map do |x, xs|
+              [[[px, x], [PatternWithMatcher.new(@matcher, *subpatterns), xs]], []]
+            end
           end
         end
       end
@@ -158,7 +162,7 @@ module PatternMatch
 
     def match(tgt, bindings)
       val = with_bindings(@ctx, bindings, {:expr => @expr}) { eval expr }
-      if val.__send__(:===, tgt) then
+      if val.__send__(:===, tgt)
         [[[], []]]
       else
         []
@@ -192,7 +196,7 @@ module PatternMatch
     end
 
     def binding_module(obj)
-      m = obj.singleton_class.ancestors.find {|i| i.kind_of?(BindingModule) }
+      m = obj.singleton_class.ancestors.find { |i| i.kind_of?(BindingModule) }
       unless m
         m = BindingModule.new
         obj.singleton_class.class_eval do
@@ -209,7 +213,7 @@ module PatternMatch
 
   class PatternCollection < Pattern
     attr_accessor :pattern
-    
+
     def initialize(pat)
       super()
       @quantified = true
@@ -272,7 +276,7 @@ module PatternMatch
         undefined
       end
     end
-    
+
     def ___(*vals)
       case vals.length
       when 0
@@ -302,7 +306,7 @@ module PatternMatch
     end
 
     def binding_module(obj)
-      m = obj.singleton_class.ancestors.find {|i| i.kind_of?(BindingModule) }
+      m = obj.singleton_class.ancestors.find { |i| i.kind_of?(BindingModule) }
       unless m
         m = BindingModule.new
         obj.singleton_class.class_eval do
@@ -323,7 +327,7 @@ module PatternMatch
       tgt = @tgt
       mstack = MatchingStateStack.new(pat,tgt)
       mstack.match
-      if mstack.results.empty? then
+      if mstack.results.empty?
         nil
       else
         ret = with_bindings(ctx, mstack.results.first, &block)
@@ -332,7 +336,7 @@ module PatternMatch
     rescue PatternNotMatch
     end
   end
-    
+
   class PatternNotMatch < Exception; end
   class PatternMatchError < StandardError; end
   class NoMatchingPatternError < PatternMatchError; end
@@ -365,8 +369,7 @@ module Kernel
       env.instance_eval(&block)
     end
   end
-  
-  alias match_single match
 
+  alias match_single match
 end
 

data/lib/egison/matcher-core.rb

@@ -31,11 +31,11 @@ class << List
     xs = []
     ys = val2.clone
     rets = [[xs, ys]]
-    while !val2.empty? do
+    until val2.empty? do
       x = val2.shift
       ys = val2.clone
-      xs = xs + [x]
-      rets = rets + [[xs, ys]]
+      xs += [x]
+      rets += [[xs, ys]]
     end
     rets
   end

data/lib/egison/matcher.rb

@@ -1,5 +1,6 @@
 require 'egison/core'
 require 'egison/matcher-core'
+require 'set'
 
 class Multiset
 end
@@ -13,28 +14,25 @@ class << Multiset
       end
     end
   end
-  
+
   def unjoin(val)
     accept_array_only(val)
     val2 = val.clone
     xs = []
     ys = val2.clone
     rets = [[xs, ys]]
-    if !val2.empty? then
+    if val2.empty?
+      rets
+    else
       x = val2.shift
       ys = val2.clone
       rets2 = unjoin(ys)
-      rets = (rets2.map {|xs2, ys2| [xs2, [x]+ys2]}) + (rets2.map {|xs2, ys2| [[x]+xs2, ys2]})
-      rets
-    else
+      rets = (rets2.map { |xs2, ys2| [xs2, [x] + ys2] }) + (rets2.map { |xs2, ys2| [[x] + xs2, ys2] })
       rets
     end
   end
 end
 
-class Set
-end
-
 class << Set
   def uncons(val)
     accept_array_only(val)
@@ -44,20 +42,20 @@ class << Set
       end
     end
   end
-  
+
   def unjoin(val)
     accept_array_only(val)
     val2 = val.clone
     xs = []
     ys = val2.clone
     rets = [[xs, ys]]
-    if !val2.empty? then
+    if val2.empty?
+      rets
+    else
       x = val2.shift
       ys2 = val2.clone
       rets2 = unjoin(ys2)
-      rets = (rets2.map {|xs2, _| [xs2, ys]}) + (rets2.map {|xs2, ys2| [[x]+xs2, ys]})
-      rets
-    else
+      rets = (rets2.map { |xs2, _| [xs2, ys] }) + (rets2.map { |xs2, ys2| [[x] + xs2, ys] })
       rets
     end
   end

data/lib/egison/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: egison
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Satoshi Egi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-28 00:00:00.000000000 Z
+date: 2014-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake