predicate 2.4.0 → 2.5.0

data/lib/predicate/nodes/${op_name}.rb.jeny

@@ -0,0 +1,12 @@
+#jeny(predicate)
+class Predicate
+  module ${OpName}
+    include ${Arity}Func
+
+    def evaluate(tuple)
+      # TODO: implement this
+      raise NotImplementedError
+    end
+
+  end
+end

data/lib/predicate/nodes/binary_func.rb

@@ -0,0 +1,20 @@
+class Predicate
+  module BinaryFunc
+    include Expr
+
+    def priority; 80; end
+
+    def left
+      self[1]
+    end
+
+    def right
+      self[2]
+    end
+
+    def free_variables
+      @free_variables ||= left.free_variables | right.free_variables
+    end
+
+  end
+end

data/lib/predicate/nodes/contradiction.rb

@@ -18,13 +18,8 @@ class Predicate
       other
     end
 
-    def dyadic_priority
-      1000
-    end
-
-    def priority
-      100
-    end
+    def dyadic_priority; 1000; end
+    def priority; 100; end
 
     def free_variables
       @free_variables ||= []

data/lib/predicate/nodes/dyadic_comp.rb

@@ -2,9 +2,7 @@ class Predicate
   module DyadicComp
     include Expr
 
-    def priority
-      50
-    end
+    def priority; 50; end
 
     def !
       Factory.send(OP_NEGATIONS[first], self[1], self[2])

data/lib/predicate/nodes/empty.rb

@@ -0,0 +1,14 @@
+class Predicate
+  module Empty
+    include UnaryFunc
+
+    def evaluate(tuple)
+      value = operand.evaluate(tuple)
+      unless value.respond_to?(:empty?)
+        raise TypeError, "Expected #{value} to respond to empty?"
+      end
+      value.empty?
+    end
+
+  end
+end

data/lib/predicate/nodes/eq.rb

@@ -40,9 +40,7 @@ class Predicate
       end
     end
 
-    def dyadic_priority
-      900
-    end
+    def dyadic_priority; 900; end
 
     def evaluate(tuple)
       left.evaluate(tuple) == right.evaluate(tuple)

data/lib/predicate/nodes/expr.rb

@@ -35,9 +35,7 @@ class Predicate
       sexpr([:not, self])
     end
 
-    def dyadic_priority
-      0
-    end
+    def dyadic_priority; 0; end
 
     def &(other)
       return other if other.contradiction?

data/lib/predicate/nodes/has_size.rb

@@ -0,0 +1,14 @@
+class Predicate
+  module HasSize
+    include BinaryFunc
+
+    def evaluate(tuple)
+      l, r = left.evaluate(tuple), right.evaluate(tuple)
+      r = r..r if r.is_a?(Integer)
+      raise Error, "Expected Range, got #{r}" unless r.is_a?(Range)
+      raise Error, "Expected #{l} to respond to :size" unless l.respond_to?(:size)
+      r === l.size
+    end
+
+  end
+end

data/lib/predicate/nodes/identifier.rb

@@ -2,9 +2,7 @@ class Predicate
   module Identifier
     include Expr
 
-    def priority
-      100
-    end
+    def priority; 100; end
 
     def name
       self[1]

data/lib/predicate/nodes/in.rb

@@ -2,9 +2,7 @@ class Predicate
   module In
     include Expr
 
-    def priority
-      80
-    end
+    def priority; 80; end
 
     def left
       self[1]
@@ -61,9 +59,7 @@ class Predicate
       end
     end
 
-    def dyadic_priority
-      800
-    end
+    def dyadic_priority; 800; end
 
     def evaluate(tuple)
       values = right.evaluate(tuple)

data/lib/predicate/nodes/intersect.rb

@@ -1,30 +1,10 @@
 class Predicate
   module Intersect
-    include Expr
-
-    def priority
-      80
-    end
-
-    def identifier
-      self[1]
-    end
-
-    def values
-      self[2]
-    end
-
-    def free_variables
-      @free_variables ||= identifier.free_variables
-    end
-
-    def constant_variables
-      []
-    end
+    include SetOp
 
     def evaluate(tuple)
-      t_x = identifier.evaluate(tuple)
-      t_x && !(t_x & values).empty?
+      x, y = left.evaluate(tuple), right.evaluate(tuple)
+      x && y && !(x & y).empty?
     end
 
   end

data/lib/predicate/nodes/literal.rb

@@ -2,9 +2,7 @@ class Predicate
   module Literal
     include Expr
 
-    def priority
-      100
-    end
+    def priority; 100; end
 
     def free_variables
       @free_variables ||= []

data/lib/predicate/nodes/match.rb

@@ -1,23 +1,11 @@
 class Predicate
   module Match
-    include Expr
+    include BinaryFunc
 
     DEFAULT_OPTIONS = {
       case_sensitive: true
     }
 
-    def priority
-      80
-    end
-
-    def left
-      self[1]
-    end
-
-    def right
-      self[2]
-    end
-
     def options
       @options ||= DEFAULT_OPTIONS.merge(self[3] || {})
     end
@@ -26,14 +14,6 @@ class Predicate
       options[:case_sensitive]
     end
 
-    def free_variables
-      @free_variables ||= left.free_variables | right.free_variables
-    end
-
-    def dyadic_priority
-      800
-    end
-
     def evaluate(tuple)
       l = left.evaluate(tuple)
       r = right.evaluate(tuple)

data/lib/predicate/nodes/nadic_bool.rb

@@ -2,9 +2,7 @@ class Predicate
   module NadicBool
     include Expr
 
-    def priority
-      60
-    end
+    def priority; 60; end
 
     def free_variables
       @free_variables ||= sexpr_body.inject([]){|list,term| 

data/lib/predicate/nodes/native.rb

@@ -2,9 +2,7 @@ class Predicate
   module Native
     include Expr
 
-    def priority
-      90
-    end
+    def priority; 90; end
 
     def proc
       self[1]

data/lib/predicate/nodes/not.rb

@@ -6,9 +6,7 @@ class Predicate
       :'!'
     end
 
-    def priority
-      90
-    end
+    def priority; 90; end
 
     def !
       last

data/lib/predicate/nodes/opaque.rb

@@ -2,9 +2,7 @@ class Predicate
   module Opaque
     include Expr
 
-    def priority
-      100
-    end
+    def priority; 100; end
 
     def free_variables
       @free_variables ||= []

data/lib/predicate/nodes/qualified_identifier.rb

@@ -2,9 +2,7 @@ class Predicate
   module QualifiedIdentifier
     include Expr
 
-    def priority
-      100
-    end
+    def priority; 100; end
 
     def qualifier
       self[1]

data/lib/predicate/nodes/set_op.rb

@@ -0,0 +1,26 @@
+class Predicate
+  module SetOp
+    include Expr
+
+    def priority; 80; end
+
+    def left
+      self[1]
+    end
+    alias :identifier :left
+
+    def right
+      self[2]
+    end
+    alias :values :right
+
+    def free_variables
+      @free_variables ||= left.free_variables | right.free_variables
+    end
+
+    def constant_variables
+      []
+    end
+
+  end
+end

data/lib/predicate/nodes/subset.rb

@@ -0,0 +1,11 @@
+class Predicate
+  module Subset
+    include SetOp
+
+    def evaluate(tuple)
+      x, y = left.evaluate(tuple), right.evaluate(tuple)
+      x && y && (x & y == x)
+    end
+
+  end
+end

data/lib/predicate/nodes/superset.rb

@@ -0,0 +1,11 @@
+class Predicate
+  module Superset
+    include SetOp
+
+    def evaluate(tuple)
+      x, y = left.evaluate(tuple), right.evaluate(tuple)
+      x && y && (x & y == y)
+    end
+
+  end
+end

data/lib/predicate/nodes/tautology.rb

@@ -18,13 +18,8 @@ class Predicate
       self
     end
 
-    def dyadic_priority
-      1000
-    end
-
-    def priority
-      100
-    end
+    def dyadic_priority; 1000; end
+    def priority; 100; end
 
     def free_variables
       @free_variables ||= []

data/lib/predicate/nodes/unary_func.rb

@@ -0,0 +1,16 @@
+class Predicate
+  module UnaryFunc
+    include Expr
+
+    def priority; 80; end
+
+    def operand
+      self[1]
+    end
+
+    def free_variables
+      @free_variables ||= operand.free_variables
+    end
+
+  end
+end

data/lib/predicate/nodes/var.rb

@@ -0,0 +1,46 @@
+class Predicate
+  module Var
+    include Expr
+
+    def priority; 100; end
+
+    def formaldef
+      self[1]
+    end
+
+    def semantics
+      self[2]
+    end
+
+    def free_variables
+      @free_variables ||= [ [formaldef, semantics] ]
+    end
+
+    def dig_terms
+      @dig_terms ||= case formaldef
+      when String
+        formaldef.split(".").map{|elm|
+          elm =~ /^\d+$/ ? elm.to_i : elm.to_sym
+        }
+      when Array
+        formaldef
+      else
+        raise ArgumentError, "Unrecognized variable def `#{formaldef}`"
+      end
+    end
+
+    def evaluate(on)
+      case semantics
+      when :dig
+        dig_terms.inject(on){|ctx,elm| ctx.dig(elm) }
+      when :send
+        dig_terms.inject(on){|ctx,elm| ctx.__send__(elm.to_sym) }
+      when :public_send
+        dig_terms.inject(on){|ctx,elm| ctx.public_send(elm.to_sym) }
+      else
+        raise ArgumentError, "Unrecognized variable semantics `#{semantics}`"
+      end
+    end
+
+  end
+end

data/lib/predicate/processors/qualifier.rb

@@ -22,6 +22,10 @@ class Predicate
       raise NotSupportedError
     end
 
+    def on_var(sexpr)
+      raise NotSupportedError
+    end
+
     alias :on_missing :copy_and_apply
 
   end

data/lib/predicate/processors/renamer.rb

@@ -19,6 +19,10 @@ class Predicate
       raise NotSupportedError
     end
 
+    def on_var(sexpr)
+      raise NotSupportedError
+    end
+
     alias :on_missing :copy_and_apply
 
   end