piece 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ab088dfe0e66ffc1450fc9eab486b2c10ca6d19
-  data.tar.gz: a0ec38dcea8530a04e2088a8364e7a80e2552a06
+  metadata.gz: e3a6516260ed0eeb0086f80f53372acff8f53f01
+  data.tar.gz: 377b91696da2e2cbbb5c6a41961ee58f6665708c
 SHA512:
-  metadata.gz: d54d5a7e9bcdb09df0264b9bb50bd52cdfc5b0ad5fd8cc7f4096a3b188595671e1bd85d06b39257f8e206a1b3f9181dca9c1ce66b1afaa14b1576b8769513e74
-  data.tar.gz: e9ac20ef0b1a3643ddcf861e9a448ebc968d56a78f04b213de6f5eb8d264d3d8bcbb2dc9eb11a08a6964d710cb38c3946ca2c90d6aea33f31db46d416ea0160a
+  metadata.gz: 1827e0dee1f479b25c541502d175960b9def8660216c874e861d98a4847f872e81388dce6dcd225bba3c75e0323bfec246d993310a0a311cbc0178f45cade208
+  data.tar.gz: bf6c142b95cdef0a738f0ca8e34d40dc4e6781c5347409a4777a0c67bfeee36c23583d640f8e9d8bc635d654f8c03087a5e4d160c6fedae45a4ddee62298ad05

data/lib/piece/rules.rb

@@ -1,4 +1,5 @@
 require 'piece/expression.tab'
+require 'piece/seq'
 
 module Piece
   class RulesError < StandardError
@@ -25,7 +26,7 @@ module Piece
     end
     alias :add :<<
 
-    def delete(*rule)
+    def delete(rule)
       return if rule.empty?
       parts = rule_parts(rule)
 
@@ -38,24 +39,26 @@ module Piece
       if group
         group.delete_if {|rule| rule == parts[-1]}
         if group.empty?
-          self.delete(*(parts[0..-2]))
+          self.delete(parts[0..-2])
         end
       end
     end
 
     def match?(*action)
-      self[*action][:match]
+      matching_seq(*action).match?
     end
 
     def [](*action)
-      ret = []
-      m = eval(@data, action_parts(action), ret)
-      {:match => m == :match, :reason => ret}
+      matching_seq(*action).to_a
     end
 
     private
+    def matching_seq(*action)
+      eval(@data, action_parts(action))
+    end
+
     def action_parts(action)
-      action.map{|part| part.to_s.split(':')}.flatten.map(&:strip).tap do |ret|
+      action.flatten.map{|part| part.to_s.split(':')}.flatten.map(&:strip).tap do |ret|
         if ret.any?{|part| part.include?('*')}
           raise InvalidAction, "Should not include '*' in an action"
         end
@@ -79,73 +82,82 @@ module Piece
       str =~ /^[\['"](.*)[\]'"]$/ ? $1 : str
     end
 
-    def apply(group, actions, backtrace)
+    def apply(group, actions)
       case group
       when ExpressionParser::Exp
         validate_rule_names(group)
         case group.op
         when '+'
-          sub = []
-          if r = apply(group.left, actions, sub)
-            backtrace.concat(sub)
-            r
+          left = apply(group.left, actions)
+          if left.match?
+            Seq[left] + Seq.match
           else
-            apply(group.right, actions, backtrace)
+            right = apply(group.right, actions)
+            if right.match?
+              Seq[right] + Seq.match
+            else
+              Seq[left] + Seq[right] + Seq.mismatch
+            end
           end
         when '-'
-          sub1, sub2 = [], []
-          if r = apply(group.left, actions, sub1)
-            if apply(group.right, actions, sub2).nil?
-              backtrace.concat(sub1)
-              r
+          left = apply(group.left, actions)
+          if left.match?
+            right = apply(group.right, actions)
+            if right.match?
+              Seq[right] + Seq.mismatch
             else
-              backtrace.concat(sub2)
-              nil
+              Seq[left] + Seq[right] + Seq.match
             end
           else
-            backtrace.concat(sub1)
-            nil
+            Seq[left] + Seq.mismatch
           end
         else
           raise "Unknown operator: #{group.op}"
         end
       when ExpressionParser::Id
         if @data.has_key?(group.val)
-          backtrace << group.val
-          eval(@data[group.val], actions, backtrace)
+          Seq[group.val] + eval(@data[group.val], actions)
         else
-          eval(group, actions, backtrace)
+          eval(group, actions)
         end
       else
         raise "Unknown type: #{group.inspect}"
       end
     end
 
-    def eval(data, actions, backtrace=[])
-      return data.nil? ? nil : :match if actions.empty?
-      case data
-      when Hash
-        backtrace << actions.first
-        eval(data[actions.first], actions[1..-1], backtrace)
-      when Array
-        backtrace << data
-        eval(data.first, actions) || eval(data[1..-1], actions)
-      when NilClass
-        nil
-      when ExpressionParser::Id
-        _match_?(data.val, actions.first) ? :match : nil
-      when String
-        backtrace << data
-        apply(ExpressionParser.new.parse(data), actions, backtrace)
+    def eval(data, actions)
+      if actions.empty?
+        Seq.match(!data.nil?)
       else
-        raise "Unknown type: #{group.inspect}"
+        case data
+        when Hash
+          Seq[actions.first] + eval(data[actions.first], actions[1..-1])
+        when Array
+          data.each do |ac|
+            ret = eval(ac, actions)
+            if ret.match?
+              return ret
+            end
+          end
+          Seq[data] + Seq.mismatch
+        when NilClass
+          Seq.mismatch
+        when ExpressionParser::Id
+          if data.val == '*'
+            Seq.match
+          elsif actions.size == 1
+            Seq.match(data.val == actions[0])
+          else
+            Seq.mismatch
+          end
+        when String
+          Seq[data] + apply(ExpressionParser.new.parse(data), actions)
+        else
+          raise "Unknown type: #{group.inspect}"
+        end
       end
     end
 
-    def _match_?(a, b)
-      a == b || a.nil? || a == '*' || b == '*'
-    end
-
     def validate_rule_names(exp)
       case exp
       when ExpressionParser::Exp

data/lib/piece/seq.rb

@@ -0,0 +1,42 @@
+module Piece
+  class Seq
+    def self.[](*data)
+      new(*data)
+    end
+
+    def self.match(m=true)
+      m ? new(:match) : mismatch
+    end
+
+    def self.mismatch
+      new(:mismatch)
+    end
+
+    def initialize(*data)
+      @data = data
+    end
+
+    def match?
+      @data.last == :match
+    end
+
+    def mismatch?
+      @data.last == :mismatch
+    end
+
+    def +(seq)
+      Seq.new(*(to_a.concat(seq.to_a)))
+    end
+
+    def to_a
+      @data.map do |d|
+        case d
+        when Seq
+          d.to_a
+        else
+          d
+        end
+      end
+    end
+  end
+end

data/lib/piece/version.rb

@@ -1,3 +1,3 @@
 module Piece
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: piece
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Xiao Li
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-06-06 00:00:00.000000000 Z
+date: 2015-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -87,6 +87,7 @@ files:
 - lib/piece/expression.tab.rb
 - lib/piece/expression.y
 - lib/piece/rules.rb
+- lib/piece/seq.rb
 - lib/piece/version.rb
 - piece.gemspec
 homepage: https://github.com/ThoughtWorksStudios/piece