predicate 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 901370b7a22028c4557c52fb7f5cd8d3ac92c97a440cf4d0f772bd592198c3a5
-  data.tar.gz: 7dc1e4912f365fc08657fc1b7289f1796989511c8b5e7c5e219bf8fe9eb16ccd
+  metadata.gz: 4dfe13a9bf0be96cb22edabb43b170e58b312787bfb5f7af5e1f23cbf4d99f20
+  data.tar.gz: f27cd571b7d17b57d4e35cf2001062498e8a8b3b75a76cc9db3bbf235c3786e7
 SHA512:
-  metadata.gz: 9515618b5f501b1774cae70cd88784d8bc965f2c331132c5c1f11363e3f690df9233f423195e3d0938fdf42cde4f90a68a69f1273e544014a0f43b386b322b8b
-  data.tar.gz: 4c4870c03e0aa43e7082136e68d6c17873febcb5608090713fc5ee0873f8f5e5c061a74eb5d57159bac3962f3ca9ce906e629e329bd654c4fd4be61cedad4ea8
+  metadata.gz: 2aecdcbadfa7eee6a469ce56f2432cfd9f25cc3f5e4aaae882841d01178d4727ff1289d9bc47fb1ec14d2bb20f6ec4d53b1af4283037b72a3be4842111e56699
+  data.tar.gz: 96bc8391a261ba1587a146248e5f37947c136f98cdd3352ed50554ea10b8056338355c5a722b87e3df553300a3b6761a19be576d741f6c2d7519f76e3fa25550

data/lib/predicate/nodes/dyadic_comp.rb

@@ -22,8 +22,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/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

data/lib/predicate/nodes/in.rb

@@ -71,8 +71,8 @@ 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
 
   end

data/lib/predicate/version.rb

@@ -2,7 +2,7 @@ class Predicate
   module Version
     MAJOR = 2
     MINOR = 3
-    TINY  = 0
+    TINY  = 1
   end
   VERSION = "#{Version::MAJOR}.#{Version::MINOR}.#{Version::TINY}"
 end

data/spec/nodes/eq/test_and.rb

@@ -26,5 +26,11 @@ class Predicate
       it{ should be_a(And) }
     end
 
+    context 'with an IN having a placeholder' do
+      let(:right){ Factory.in(:x, Factory.placeholder) }
+
+      it{ should be_a(And) }
+    end
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: predicate
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Bernard Lambeau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-21 00:00:00.000000000 Z
+date: 2020-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sexpr
@@ -206,8 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Predicate provides a simple class and processors to encode and manipulate