mini_kraken 0.2.03 → 0.2.04

data/spec/glue/dsl_chap2_spec.rb

@@ -12,8 +12,18 @@ module MiniKraken
       include DSL
 
       context 'Chapter 2 examples:' do
+        # ((:a) (:b) (:c))
+        let(:abc) { cons(cons(:a), cons(cons(:b), cons(cons(:c)))) }
+
+        # '(:a :c :o :r :n)
         let(:acorn) { cons(:a, cons(:c, cons(:o, cons(:r, cons(:n))))) }
 
+        # '(:c :o :r :n)
+        let(:corn) { cons(:c, cons(:o, cons(:r, cons(:n)))) }
+
+        # '(:grape :raisin :pear)'
+        let(:fruits) { cons(:grape, cons(:raisin, cons(:pear))) }
+
         it 'accepts caro definition inspired from frame 2:6' do
           # Reasoned S2, frame 2:6
           # (defrel (caro p a)
@@ -38,10 +48,10 @@ module MiniKraken
         # In Scheme:
         # (defrel (caro p a)
         #   (fresh (d)
-        #   (== (cons a d) p)))
-        # In Ruby, `p`is a stnadard Kernel method => replaced by `r`
+        #   (== p (cons a d))))
+        # In Ruby, `p`is a standard Kernel method => replace it by `r`
         def defrel_caro
-          defrel('caro', %w[r a]) { fresh('d', equals(cons(a, d), r)) }
+          defrel('caro', %w[r a]) { fresh('d', equals(r, cons(a, d))) }
         end
 
         it 'passes frame 2:3' do
@@ -83,10 +93,6 @@ module MiniKraken
           #     (caro '(grape raisin pear) x)
           #     (caro '((a) (b) (c)) y)
           #     (== (cons x y) r))) ;; r => ((grape a))
-          fruits = cons(:grape, cons(:raisin, cons(:pear)))
-          expect(fruits.to_s).to eq('(:grape :raisin :pear)')
-          abc = cons(cons(:a), cons(cons(:b), cons(cons(:c))))
-          expect(abc.to_s).to eq('((:a) (:b) (:c))')
 
           result = run_star('r', fresh(%w[x y],
             [caro(fruits, x),
@@ -94,6 +100,108 @@ module MiniKraken
               equals(cons(x, y), r)]))
           expect(result.car).to eq(cons(:grape, cons(:a)))
         end
+
+        it 'accepts cdro definition inspired from frame 2:13' do
+          # Reasoned S2, frame 2:13
+          # (defrel (cdro p d)
+          #   (fresh (a)
+          #   (== (cons a d) p)))
+
+          # As 'p' has a special meaning in Ruby, the argument has been remaned to 'r'
+          cdro_rel = defrel('cdro', %w[r d]) do
+            fresh('a', equals(cons(a, d), r))
+          end
+
+          expect(cdro_rel).to be_kind_of(Core::DefRelation)
+          expect(cdro_rel.name).to eq('cdro')
+          expect(cdro_rel.arity).to eq(2)
+          expect(cdro_rel.formals[0].name).to eq('r')
+          expect(cdro_rel.formals[1].name).to eq('d')
+          g_template = cdro_rel.goal_template
+          expect(g_template).to be_kind_of(FreshEnvFactory)
+          expect(g_template.names).to include('a')
+        end
+
+        # In Scheme:
+        # (defrel (cdro p d)
+        #   (fresh (a)
+        #   (== p (cons a d))))
+        # In Ruby, `p`is a standard Kernel method => replace it by `r`
+        def defrel_cdro
+          defrel('cdro', %w[r d]) { fresh('aa', equals(r, cons(aa, d))) }
+        end
+
+        it 'passes unnesting process in frame 2:12' do
+          defrel_caro
+          defrel_cdro
+
+          # (run* r
+          #   (fresh (v)
+          #     (cdro '(acorn) v)
+          #     (fresh (w)
+          #       (cdro v w)
+          #       (caro w r))) ;; r => (o)
+
+          result = run_star('r', fresh('v',
+            [cdro(acorn, v),
+              fresh('w',
+                [cdro(v, w),
+                  caro(w, r)])]))
+          expect(result.car).to eq(:o)
+        end
+
+        it 'passes frame 2:15' do
+          defrel_caro
+          defrel_cdro
+
+          # (run* r
+          #   (fresh (x y)
+          #     (cdro '(grape raisin pear) x)
+          #     (caro '((a) (b) (c)) y)
+          #     (== (cons x y) r))) ;; r => (((raisin pear) a))
+
+          result = run_star('r', fresh(%w[x y],
+            [cdro(fruits, x),
+              caro(abc, y),
+              equals(cons(x, y), r)]))
+          expect(result.to_s).to eq('(((:raisin :pear) :a))')
+        end
+
+        it 'passes frame 2:16' do
+          defrel_cdro
+
+          # (run* q
+          #   (cdro '(a c o r n) '(c o r n))) ;; => (_0)
+          result = run_star('r', cdro(acorn, corn))
+          expect(result.car).to eq(:_0)
+        end
+
+        it 'passes frame 2:17' do
+          defrel_cdro
+
+          # (run* x
+          #   (cdro '(c o r n) '(,x r n))) ;; => (o)
+          result = run_star('x', cdro(corn, cons(x, cons(:r, cons(:n)))))
+          expect(result.car).to eq(:o)
+        end
+
+        # it 'passes frame 2:18' do
+          # defrel_caro
+          # defrel_cdro
+
+          # # (run* l
+          # #   (fresh (x)
+          # #     (cdro l '(c o r n))
+          # #     (caro l x)
+          # #     (== 'a x))) ;; l => ('(a c o r n))
+
+          # result = run_star('l', fresh('x',
+            # [tap(cdro(l, corn)), # WRONG l => a c o r n (side effect from other tests)
+              # caro(l, x),
+              # equals(:aa, x)
+            # ]))
+          # expect(result.to_s).to eq('((:a :c :o :r :n))')
+        # end
       end # context
     end # describe
   end # module

data/spec/glue/fresh_env_factory_spec.rb

@@ -5,6 +5,7 @@ require_relative '../../lib/mini_kraken/core/formal_arg'
 require_relative '../../lib/mini_kraken/core/formal_ref'
 require_relative '../../lib/mini_kraken/core/goal_template'
 
+require_relative '../support/factory_atomic'
 require_relative '../support/factory_methods'
 
 # Load the class under test
@@ -14,6 +15,7 @@ require_relative '../../lib/mini_kraken/glue/fresh_env_factory'
 module MiniKraken
   module Glue
     describe FreshEnvFactory do
+      include MiniKraken::FactoryAtomic # Use mix-in module
       include FactoryMethods
 
       # (fresh (d) (== d r))
@@ -48,7 +50,7 @@ module MiniKraken
         let(:q_ref) { var_ref('q') }
         let(:r_formal) { Core::FormalRef.new('r') }
         let(:a_formal) { Core::FormalRef.new('a') }
-        let(:t_param1) { Core::ConsCell.new(a_formal, d_ref) }
+        let(:t_param1) { Composite::ConsCell.new(a_formal, d_ref) }
         let(:other_goal_t) do
           Core::GoalTemplate.new(Core::Equals.instance, [t_param1, r_formal])
         end
@@ -59,14 +61,14 @@ module MiniKraken
 
           # Are variables correctly built?
           expect(created).to be_kind_of(FreshEnv)
-          expect(created.vars['d']).to be_kind_of(Core::Variable)
+          expect(created.vars['d']).to be_kind_of(Core::LogVar)
 
           # Is the goal correectly built?
           goal = created.goal
           expect(goal.relation).to eq(Core::Equals.instance)
-          expect(goal.actuals[0]).to be_kind_of(Core::VariableRef)
+          expect(goal.actuals[0]).to be_kind_of(Core::LogVarRef)
           expect(goal.actuals[0].name).to eq('d')
-          expect(goal.actuals[1]).to be_kind_of(Core::KSymbol)
+          expect(goal.actuals[1]).to be_kind_of(Atomic::KSymbol)
           expect(goal.actuals[1]).to eq(:pea)
         end
 
@@ -78,17 +80,17 @@ module MiniKraken
 
           # Are variables correctly built?
           expect(created).to be_kind_of(FreshEnv)
-          expect(created.vars['d']).to be_kind_of(Core::Variable)
+          expect(created.vars['d']).to be_kind_of(Core::LogVar)
 
           # Is the goal correctly built?
           goal = created.goal
           expect(goal.relation).to eq(Core::Equals.instance)
-          expect(goal.actuals[0]).to be_kind_of(Core::ConsCell)
-          expect(goal.actuals[0].car).to be_kind_of(Core::VariableRef)
+          expect(goal.actuals[0]).to be_kind_of(Composite::ConsCell)
+          expect(goal.actuals[0].car).to be_kind_of(Core::LogVarRef)
           expect(goal.actuals[0].car.name).to eq('q')
-          expect(goal.actuals[0].cdr).to be_kind_of(Core::VariableRef)
+          expect(goal.actuals[0].cdr).to be_kind_of(Core::LogVarRef)
           expect(goal.actuals[0].cdr.name).to eq('d')
-          expect(goal.actuals[1]).to be_kind_of(Core::ConsCell)
+          expect(goal.actuals[1]).to be_kind_of(Composite::ConsCell)
           expect(goal.actuals[1].to_s).to eq('(:a :c :o :r :n)')
         end
       end # context

data/spec/glue/fresh_env_spec.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 require_relative '../spec_helper' # Use the RSpec framework
+require_relative '../../lib/mini_kraken/atomic/k_symbol'
 require_relative '../../lib/mini_kraken/core/goal'
 require_relative '../../lib/mini_kraken/core/equals'
 require_relative '../../lib/mini_kraken/core/fail'
-require_relative '../../lib/mini_kraken/core/k_symbol'
 require_relative '../../lib/mini_kraken/core/succeed'
 
 # Load the class under test
@@ -14,8 +14,8 @@ require_relative '../../lib/mini_kraken/glue/fresh_env'
 module MiniKraken
   module Glue
     describe FreshEnv do
-      let(:pea) { Core::KSymbol.new(:pea) }
-      let(:pod) { Core::KSymbol.new(:pod) }
+      let(:pea) { Atomic::KSymbol.new(:pea) }
+      let(:pod) { Atomic::KSymbol.new(:pod) }
       let(:sample_goal) do
         Core::Goal.new(Core::Equals.instance, [pea, pod])
       end

data/spec/glue/run_star_expression_spec.rb

@@ -13,6 +13,7 @@ require_relative '../../lib/mini_kraken/core/formal_ref'
 require_relative '../../lib/mini_kraken/core/goal_template'
 require_relative '../../lib/mini_kraken/core/succeed'
 
+require_relative '../support/factory_atomic'
 require_relative '../support/factory_methods'
 
 # Load the class under test
@@ -22,6 +23,7 @@ require_relative '../../lib/mini_kraken/glue/run_star_expression'
 module MiniKraken
   module Glue
     describe RunStarExpression do
+      include MiniKraken::FactoryAtomic # Use mix-in module
       include FactoryMethods
 
       let(:pea) { k_symbol(:pea) }
@@ -70,15 +72,15 @@ module MiniKraken
         let(:split) { k_symbol(:split) }
         let(:tea) { k_symbol(:tea) }
         let(:virgin) { k_symbol(:virgin) }
-        let(:ref_q) { Core::VariableRef.new('q') }
-        let(:ref_r) { Core::VariableRef.new('r') }
-        let(:ref_x) { Core::VariableRef.new('x') }
-        let(:ref_y) { Core::VariableRef.new('y') }
-        let(:ref_z) { Core::VariableRef.new('z') }
-        let(:ref_s) { Core::VariableRef.new('s') }
-        let(:ref_t) { Core::VariableRef.new('t') }
-        let(:ref_u) { Core::VariableRef.new('u') }
-        let(:ref_z) { Core::VariableRef.new('z') }
+        let(:ref_q) { Core::LogVarRef.new('q') }
+        let(:ref_r) { Core::LogVarRef.new('r') }
+        let(:ref_x) { Core::LogVarRef.new('x') }
+        let(:ref_y) { Core::LogVarRef.new('y') }
+        let(:ref_z) { Core::LogVarRef.new('z') }
+        let(:ref_s) { Core::LogVarRef.new('s') }
+        let(:ref_t) { Core::LogVarRef.new('t') }
+        let(:ref_u) { Core::LogVarRef.new('u') }
+        let(:ref_z) { Core::LogVarRef.new('z') }
         let(:t_ref) { Core::FormalRef.new('t') }
         let(:equals_tea) { Core::GoalTemplate.new(Core::Equals.instance, [tea, t_ref]) }
         let(:equals_cup) { Core::GoalTemplate.new(Core::Equals.instance, [cup, t_ref]) }
@@ -148,8 +150,8 @@ module MiniKraken
         end
 
         it 'should keep variable fresh when no unification occurs (II)' do
-          ref1_q = Core::VariableRef.new('q')
-          ref2_q = Core::VariableRef.new('q')
+          ref1_q = Core::LogVarRef.new('q')
+          ref2_q = Core::LogVarRef.new('q')
           goal = equals_goal(ref1_q, ref2_q)
           instance = RunStarExpression.new('q', goal)
 

data/spec/support/factory_atomic.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require_relative '../../lib/mini_kraken/atomic/all_atomic'
+
+module MiniKraken
+  # Mix-in module that provides convenience factory methods.
+  module FactoryAtomic
+    # Factory method for constructing a KBoolean instance
+    # @param aValue [Boolean]
+    # @return [Core::KBoolean]
+    def k_boolean(aValue)
+      Atomic::KBoolean.new(aValue)
+    end
+
+    # Factory method for constructing a KSymbol instance
+    # @param aSymbol [Symbol]
+    # @return [Core::KSymbol]
+    def k_symbol(aSymbol)
+      Atomic::KSymbol.new(aSymbol)
+    end
+  end # end
+end # module

data/spec/support/factory_methods.rb

@@ -1,11 +1,10 @@
 # frozen_string_literal: true
 
 require_relative '../../lib/mini_kraken/core/any_value'
-require_relative '../../lib/mini_kraken/core/cons_cell'
-require_relative '../../lib/mini_kraken/core/k_boolean'
-require_relative '../../lib/mini_kraken/core/k_symbol'
-require_relative '../../lib/mini_kraken/core/variable'
-require_relative '../../lib/mini_kraken/core/variable_ref'
+require_relative '../../lib/mini_kraken/atomic/all_atomic'
+require_relative '../../lib/mini_kraken/composite/cons_cell'
+require_relative '../../lib/mini_kraken/core/log_var'
+require_relative '../../lib/mini_kraken/core/log_var_ref'
 
 module MiniKraken
   # Mix-in module that provides convenience factory methods.
@@ -24,7 +23,7 @@ module MiniKraken
     # @param obj2 [Term]
     # @return [Core::ConsCell]
     def cons(obj1, obj2 = nil)
-      Core::ConsCell.new(obj1, obj2)
+      Composite::ConsCell.new(obj1, obj2)
     end
 
     # Factory method for constructing a goal using the Equals relation.
@@ -58,32 +57,18 @@ module MiniKraken
       Core::Goal.new(Core::Disj2.instance, [g1, g2])
     end
 
-    # Factory method for constructing a KBoolean instance
-    # @param aValue [Boolean]
-    # @return [Core::KBoolean]
-    def k_boolean(aValue)
-      Core::KBoolean.new(aValue)
-    end
-
-    # Factory method for constructing a KSymbol instance
-    # @param aSymbol [Symbol]
-    # @return [Core::KSymbol]
-    def k_symbol(aSymbol)
-      Core::KSymbol.new(aSymbol)
-    end
-
-    # Factory method for constructing a Variable
+    # Factory method for constructing a LogVar
     # @param var_name [String]
-    # @return [Core::Variable]
+    # @return [Core::LogVar]
     def variable(var_name)
-      Core::Variable.new(var_name)
+      Core::LogVar.new(var_name)
     end
 
-    # Factory method for constructing a VariableRef
+    # Factory method for constructing a LogVarRef
     # @param var_name [String]
-    # @return [Core::VariableRef]
+    # @return [Core::LogVarRef]
     def var_ref(var_name)
-      Core::VariableRef.new(var_name)
+      Core::LogVarRef.new(var_name)
     end
   end # end
 end # module

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mini_kraken
 version: !ruby/object:Gem::Version
-  version: 0.2.03
+  version: 0.2.04
 platform: ruby
 authors:
 - Dimitri Geshef
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-02 00:00:00.000000000 Z
+date: 2020-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -69,18 +69,22 @@ files:
 - README.md
 - Rakefile
 - lib/mini_kraken.rb
+- lib/mini_kraken/atomic/all_atomic.rb
+- lib/mini_kraken/atomic/atomic_term.rb
+- lib/mini_kraken/atomic/k_boolean.rb
+- lib/mini_kraken/atomic/k_integer.rb
+- lib/mini_kraken/atomic/k_symbol.rb
+- lib/mini_kraken/composite/composite_term.rb
+- lib/mini_kraken/composite/cons_cell.rb
+- lib/mini_kraken/composite/cons_cell_visitor.rb
 - lib/mini_kraken/core/any_value.rb
 - lib/mini_kraken/core/association.rb
 - lib/mini_kraken/core/association_walker.rb
-- lib/mini_kraken/core/atomic_term.rb
 - lib/mini_kraken/core/base_arg.rb
 - lib/mini_kraken/core/binary_relation.rb
 - lib/mini_kraken/core/composite_goal.rb
-- lib/mini_kraken/core/composite_term.rb
 - lib/mini_kraken/core/conde.rb
 - lib/mini_kraken/core/conj2.rb
-- lib/mini_kraken/core/cons_cell.rb
-- lib/mini_kraken/core/cons_cell_visitor.rb
 - lib/mini_kraken/core/def_relation.rb
 - lib/mini_kraken/core/designation.rb
 - lib/mini_kraken/core/disj2.rb
@@ -95,16 +99,14 @@ files:
 - lib/mini_kraken/core/goal_arg.rb
 - lib/mini_kraken/core/goal_relation.rb
 - lib/mini_kraken/core/goal_template.rb
-- lib/mini_kraken/core/k_boolean.rb
-- lib/mini_kraken/core/k_integer.rb
-- lib/mini_kraken/core/k_symbol.rb
+- lib/mini_kraken/core/log_var.rb
+- lib/mini_kraken/core/log_var_ref.rb
 - lib/mini_kraken/core/nullary_relation.rb
 - lib/mini_kraken/core/outcome.rb
 - lib/mini_kraken/core/relation.rb
 - lib/mini_kraken/core/succeed.rb
+- lib/mini_kraken/core/tap.rb
 - lib/mini_kraken/core/term.rb
-- lib/mini_kraken/core/variable.rb
-- lib/mini_kraken/core/variable_ref.rb
 - lib/mini_kraken/core/vocabulary.rb
 - lib/mini_kraken/glue/dsl.rb
 - lib/mini_kraken/glue/fresh_env.rb
@@ -113,12 +115,15 @@ files:
 - lib/mini_kraken/version.rb
 - mini_kraken.gemspec
 - spec/.rubocop.yml
+- spec/atomic/atomic_term_spec.rb
+- spec/atomic/k_boolean_spec.rb
+- spec/atomic/k_symbol_spec.rb
+- spec/composite/cons_cell_spec.rb
+- spec/composite/cons_cell_visitor_spec.rb
 - spec/core/association_spec.rb
 - spec/core/association_walker_spec.rb
 - spec/core/conde_spec.rb
 - spec/core/conj2_spec.rb
-- spec/core/cons_cell_spec.rb
-- spec/core/cons_cell_visitor_spec.rb
 - spec/core/def_relation_spec.rb
 - spec/core/disj2_spec.rb
 - spec/core/duck_fiber_spec.rb
@@ -127,12 +132,10 @@ files:
 - spec/core/fail_spec.rb
 - spec/core/goal_spec.rb
 - spec/core/goal_template_spec.rb
-- spec/core/k_boolean_spec.rb
-- spec/core/k_symbol_spec.rb
+- spec/core/log_var_ref_spec.rb
+- spec/core/log_var_spec.rb
 - spec/core/outcome_spec.rb
 - spec/core/succeed_spec.rb
-- spec/core/variable_ref_spec.rb
-- spec/core/variable_spec.rb
 - spec/core/vocabulary_spec.rb
 - spec/glue/dsl_chap1_spec.rb
 - spec/glue/dsl_chap2_spec.rb
@@ -141,6 +144,7 @@ files:
 - spec/glue/run_star_expression_spec.rb
 - spec/mini_kraken_spec.rb
 - spec/spec_helper.rb
+- spec/support/factory_atomic.rb
 - spec/support/factory_methods.rb
 homepage: https://github.com/famished-tiger/mini_kraken
 licenses:
@@ -167,12 +171,15 @@ signing_key:
 specification_version: 4
 summary: Implementation of Minikanren language in Ruby. WIP
 test_files:
+- spec/atomic/atomic_term_spec.rb
+- spec/atomic/k_boolean_spec.rb
+- spec/atomic/k_symbol_spec.rb
+- spec/composite/cons_cell_spec.rb
+- spec/composite/cons_cell_visitor_spec.rb
 - spec/core/association_spec.rb
 - spec/core/association_walker_spec.rb
 - spec/core/conde_spec.rb
 - spec/core/conj2_spec.rb
-- spec/core/cons_cell_spec.rb
-- spec/core/cons_cell_visitor_spec.rb
 - spec/core/def_relation_spec.rb
 - spec/core/disj2_spec.rb
 - spec/core/duck_fiber_spec.rb
@@ -181,12 +188,10 @@ test_files:
 - spec/core/fail_spec.rb
 - spec/core/goal_spec.rb
 - spec/core/goal_template_spec.rb
-- spec/core/k_boolean_spec.rb
-- spec/core/k_symbol_spec.rb
+- spec/core/log_var_ref_spec.rb
+- spec/core/log_var_spec.rb
 - spec/core/outcome_spec.rb
 - spec/core/succeed_spec.rb
-- spec/core/variable_ref_spec.rb
-- spec/core/variable_spec.rb
 - spec/core/vocabulary_spec.rb
 - spec/glue/dsl_chap1_spec.rb
 - spec/glue/dsl_chap2_spec.rb