predicate 2.3.0 → 2.5.0

data/lib/predicate/grammar.sexp.yml

@@ -3,6 +3,8 @@ rules:
     - tautology
     - contradiction
     - identifier
+    - qualified_identifier
+    - var
     - not
     - and
     - or
@@ -14,8 +16,13 @@ rules:
     - gte
     - in
     - intersect
+    - subset
+    - superset
     - match
     - native
+    - empty
+    - has_size
+    #jeny(predicate) - ${op_name}
   tautology:
     - [ true ]
   contradiction:
@@ -24,6 +31,8 @@ rules:
     - [ name ]
   qualified_identifier:
     - [ name, name ]
+  var:
+    - [ formaldef, semantics ]
   not:
     - [ predicate ]
   and:
@@ -46,8 +55,18 @@ rules:
     - [ varref, term ]
   intersect:
     - [ term, term ]
+  subset:
+    - [ term, term ]
+  superset:
+    - [ term, term ]
   match:
     - [ term, term, options ]
+  empty:
+    - [ term ]
+  has_size:
+    - [ term, term ]
+#jeny(predicate)   ${op_name}:
+#jeny(predicate)     - [ TODO ]
   term:
     - varref
     - literal
@@ -56,6 +75,7 @@ rules:
   varref:
     - qualified_identifier
     - identifier
+    - var
   native:
     - [ "::Proc" ]
   literal:
@@ -68,3 +88,12 @@ rules:
     - "::Hash"
   name:
     !ruby/regexp /^[a-zA-Z0-9_]+[?!]?$/
+  semantics:
+    !ruby/regexp /^(dig)$/
+  formaldef:
+    - string_formaldef
+    - array_formaldef
+  string_formaldef:
+    - "::String"
+  array_formaldef:
+    - "::Array"

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/and.rb

@@ -53,5 +53,14 @@ class Predicate
       sexpr_body.all?{|operand| operand.evaluate(tuple) }
     end
 
+    def to_hash
+      sexpr_body.inject({}) do |p,term|
+        p.merge(term.to_hash){|k,v1,v2|
+          super unless v1 == v2
+          v1
+        }
+      end
+    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])
@@ -22,8 +20,8 @@ class Predicate
       @free_variables ||= left.free_variables | right.free_variables
     end
 
-    def var_against_literal?
-      left.identifier? && right.literal?
+    def var_against_literal_value?
+      left.identifier? && right.literal? && !right.has_placeholder?
     end
 
   end

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

@@ -13,9 +13,8 @@ class Predicate
         return self if constants == other.constants
         return contradiction
       when In
-        return super unless var_against_literal? && other.var_against_literal?
-        mine = self.right.value
-        hers = other.right.value
+        return super unless var_against_literal_value? && other.var_against_literal_value?
+        mine, hers = self.right.value, other.right.value
         return self if hers.include?(mine)
         contradiction
       else
@@ -41,13 +40,21 @@ class Predicate
       end
     end
 
-    def dyadic_priority
-      900
-    end
+    def dyadic_priority; 900; end
 
     def evaluate(tuple)
       left.evaluate(tuple) == right.evaluate(tuple)
     end
 
+    def to_hash
+      if left.identifier? && right.literal? && !right.has_placeholder?
+        { left.name => right.value }
+      elsif right.identifier? && left.literal? && !left.has_placeholder?
+        { right.name => left.value }
+      else
+        super
+      end
+    end
+
   end
 end

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?
@@ -77,6 +75,10 @@ class Predicate
       Qualifier.new(qualifier).call(self)
     end
 
+    def unqualify
+      Unqualifier.new.call(self)
+    end
+
     def bind(binding)
       Binder.new(binding).call(self)
     end
@@ -93,6 +95,10 @@ class Predicate
       ToS.call(self, scope: scope)
     end
 
+    def to_hash
+      raise ArgumentError, "Unable to represent #{self} to a Hash"
+    end
+
     def sexpr(arg)
       Factory.sexpr(arg)
     end

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)
@@ -71,8 +67,13 @@ class Predicate
       values.include?(identifier.evaluate(tuple))
     end
 
-    def var_against_literal?
-      left.identifier? && right.literal?
+    def var_against_literal_value?
+      left.identifier? && right.literal? && !right.has_placeholder?
+    end
+
+    def to_hash
+      return super unless var_against_literal_value?
+      { identifier.name => right.value }
     end
 
   end

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]
@@ -15,7 +13,7 @@ class Predicate
     end
 
     def free_variables
-      @free_variables ||= [ name ]
+      @free_variables ||= [ :"#{qualifier}.#{name}" ]
     end
 
     def evaluate(tuple)