rbprolog 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d723ef7238bd43d66ba6107479b1b3ceb3f2c343
-  data.tar.gz: bfa0dc55e11633ec5d83ad1dcbbb02a5008dfa4c
+  metadata.gz: 1cea2edb5bbebc322e8b452964550d648524fc3c
+  data.tar.gz: a6fb9cea02cf48e00265a7a7b3f5f38e75e6f47d
 SHA512:
-  metadata.gz: da369f5d469d14ee459e145ac505a4b513aa3db32f1617bf5262268c08b2b19c46960bf54eff4b577afaf063c91b561a1432bfe44bed9b8a168eeb0837b3c977
-  data.tar.gz: 1c8216be63234451c9ac110cf1b02173198ec3491ffba96bcc6a6d5159550b82f7f819ee2c2de2753fbc4bb3ebd525ad94561d8077310eedb523b71fcfaab3f4
+  metadata.gz: 0d04a142120d61f6c8f2e367182c1f4359be3a50390b6529a77fdca925d41bb020824920fc1ad3b6706866c1206d107437538f7cafd218a71485984c37b44ac1
+  data.tar.gz: 25170cd1e81e96b96847ea6cc3f00df6efe040c9c98d1fba757ba8447b32d95c94314aaf0b4b797843fe1ff599d455da1be4628adb807ae4ff99fd4fd99c06c8

data/lib/rbprolog/deduction.rb

@@ -8,11 +8,11 @@ module Rbprolog
     end
 
     def each_deduce(context, rules, id)
-      print "#{"\t" * id.size}#{id.join('.')} #{@sym}?(#{@args.join(', ')})"
+      #print "#{"\t" * id.size}#{id.join('.')} #{@sym}?(#{@args.join(', ')})"
 
       rules.select {|rule| rule.sym == @sym}.each_with_index do |rule, rule_index|
         context.scope(self) do |scoped_args|
-          puts " => #{@sym}?(#{scoped_args.join(', ')})" if rule_index == 0
+          #puts " => #{@sym}?(#{scoped_args.join(', ')})" if rule_index == 0
 
           # rules.reject is to avoid endless loop caused by self reference
           rule.each_match(rules.reject {|item| item == rule}, *scoped_args, id + [rule_index]) do |hash|

data/lib/rbprolog/evaluation.rb

@@ -9,17 +9,18 @@ module Rbprolog
     end
 
     def each_deduce(context, rules, id)
-      print "#{"\t" * id.size}#{id.join('.')} ?(#{@args.join(', ')})"
+      #print "#{"\t" * id.size}#{id.join('.')} #{@expression}?)"
 
       context.scope(self) do |scoped_args|
-        puts " => ?(#{scoped_args.join(', ')})"
-
         kclass = Class.new
         kclass.send(:define_singleton_method, :const_missing) do |sym|
-          context.deduce(sym)
+          context.deduce(Var.new(sym))
         end
 
-        yield context.binds if kclass.class_eval(@expression)
+        evaluation = kclass.class_eval(@expression)
+        #puts " => #{evaluation}"
+
+        yield context.binds if evaluation
       end
     end
   end

data/lib/rbprolog/rule.rb

@@ -10,17 +10,17 @@ module Rbprolog
     end
 
     def each_match(rules, *args, id)
-      print "#{"\t" * id.size}#{id.join('.')} #{@sym}(#{@args.join(', ')}).deduce(#{args.join(', ')})"
+      #print "#{"\t" * id.size}#{id.join('.')} #{@sym}(#{@args.join(', ')}).deduce(#{args.join(', ')})"
 
       context = Context.new
       context.scope(self) do |scoped_args|
         if self.match!(context, args)
-          puts " => #{@sym}(#{@args.map {|arg| context.deduce(arg)}.join(', ')})"
+          #puts " => #{@sym}(#{@args.map {|arg| context.deduce(arg)}.join(', ')})"
           deduce_deductions(context, rules, *@deductions, id) do
             yield context.binds
           end
         else
-          print "\n"
+          #print "\n"
         end
       end
     end

data/lib/rbprolog/version.rb

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

data/test/test_evaluation.rb

@@ -9,8 +9,16 @@ class EvaluationLogic
 
   %w(a b c).each {|t| must 'win', t}
   must_not 'linux', 'd'
-  can_not X, Y, :if => [must?(U, Y), ->{'U != X'}]
-  can_not X, Y, :if => must_not?(X, Y)
+  must 'win', 'xp', 'e'
+
+  can_not TC, :if => must_not?(TC)
+
+  can_not X, TC, :if => [must?(U, TC), ->{'U != X'}]
+  can_not X, TC, :if => must_not?(X, TC)
+
+  can_not X, Y, TC, :if => [must?(U, V, TC), ->{'U != X || V != Y'}]
+  can_not X, TC, :if => must_not?(X, Y, TC)
+
   #can X, Y, :if => !can_not?(X, Y)
 end
 
@@ -25,5 +33,10 @@ class TestEvaluation < Test::Unit::TestCase
     assert_equal true, l.can_not?('linux', 'c')
 
     assert_equal(['a', 'b', 'c', 'd'], l.can_not!('linux', Rbprolog::Var.new(:G)).map {|hash| hash[:G]}.uniq.sort)
+    assert_equal([], l.can_not!('win', Rbprolog::Var.new(:G)).map {|hash| hash[:G]}.uniq.sort)
+
+    assert_equal true, l.must?('win', 'xp', 'e')
+    assert_equal([], l.can_not!('win', 'xp', Rbprolog::Var.new(:G)).map {|hash| hash[:G]}.uniq.sort)
+    assert_equal(['e'], l.can_not!('win', 'vista', Rbprolog::Var.new(:G)).map {|hash| hash[:G]}.uniq.sort)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbprolog
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Ruijia Li
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-29 00:00:00.000000000 Z
+date: 2013-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler