mini_kraken 0.2.03 → 0.2.04

data/spec/{core → atomic}/k_symbol_spec.rb

@@ -4,10 +4,10 @@ require_relative '../spec_helper' # Use the RSpec framework
 require 'ostruct'
 
 # Load the class under test
-require_relative '../../lib/mini_kraken/core/k_symbol'
+require_relative '../../lib/mini_kraken/atomic/k_symbol'
 
 module MiniKraken
-  module Core
+  module Atomic
     describe KSymbol do
       let(:a_value) { :pea }
       subject { KSymbol.new(a_value) }
@@ -37,7 +37,7 @@ module MiniKraken
           another = KSymbol.new(:pod)
           expect(subject).not_to be_eql(another)
 
-          # Different type, same value
+          # Different duck type, same value
           yet_another = OpenStruct.new(value: :pea)
           expect(subject).not_to be_eql(yet_another)
         end
@@ -51,14 +51,6 @@ module MiniKraken
           another = KSymbol.new(:pod)
           expect(subject == another).to be_falsy
 
-          # Same duck type, same value
-          yet_another = OpenStruct.new(value: :pea)
-          expect(subject == yet_another).to be_truthy
-
-          # Different duck type, different value
-          still_another = OpenStruct.new(value: :pod)
-          expect(subject == still_another).to be_falsy
-
           # Default Ruby representation, same value
           expect(subject == :pea).to be_truthy
 

data/spec/{core → composite}/cons_cell_spec.rb

@@ -1,17 +1,19 @@
 # frozen_string_literal: true
 
 require_relative '../spec_helper' # Use the RSpec framework
-require_relative '../../lib/mini_kraken/core/k_symbol'
+require_relative '../support/factory_atomic'
 
 # Load the class under test
-require_relative '../../lib/mini_kraken/core/cons_cell'
+require_relative '../../lib/mini_kraken/composite/cons_cell'
 
 module MiniKraken
-  module Core
+  module Composite
     describe ConsCell do
-      let(:pea) { KSymbol.new(:pea) }
-      let(:pod) { KSymbol.new(:pod) }
-      let(:corn) { KSymbol.new(:corn) }
+      include MiniKraken::FactoryAtomic # Use mix-in module
+
+      let(:pea) { k_symbol(:pea) }
+      let(:pod) { k_symbol(:pod) }
+      let(:corn) { k_symbol(:corn) }
       subject { ConsCell.new(pea, pod) }
 
       context 'Initialization:' do
@@ -66,10 +68,10 @@ module MiniKraken
           expect(subject.eql?(different)).to be_falsey
         end
 
-        it 'should append another cons cell' do
+        it 'should set_cdr! another cons cell' do
           instance = ConsCell.new(pea)
           trail = ConsCell.new(pod)
-          instance.append(trail)
+          instance.set_cdr!(trail)
           expect(instance.car).to eq(pea)
           expect(instance.cdr).to eq(trail)
         end

data/spec/{core → composite}/cons_cell_visitor_spec.rb

@@ -1,27 +1,28 @@
 # frozen_string_literal: true
 
 require_relative '../spec_helper' # Use the RSpec framework
-require_relative '../../lib/mini_kraken/core/k_symbol'
-require_relative '../../lib/mini_kraken/core/variable_ref'
+require_relative '../support/factory_atomic'
+require_relative '../../lib/mini_kraken/core/log_var_ref'
 
 # Load the class under test
-require_relative '../../lib/mini_kraken/core/cons_cell_visitor'
-
+require_relative '../../lib/mini_kraken/composite/cons_cell_visitor'
 
 module MiniKraken
-  module Core
+  module Composite
     describe ConsCellVisitor do
-      let(:pea) { KSymbol.new(:pea) }
-      let(:pod) { KSymbol.new(:pod) }
-      let(:corn) { KSymbol.new(:corn) }
-      let(:ref_q) { VariableRef.new('q') }
+      include MiniKraken::FactoryAtomic # Use mix-in module
+
+      let(:pea) { k_symbol(:pea) }
+      let(:pod) { k_symbol(:pod) }
+      let(:corn) { k_symbol(:corn) }
+      let(:ref_q) { LogVarRef.new('q') }
       let(:l_pea) { ConsCell.new(pea) }
       let(:l_pea_pod) { ConsCell.new(pea, ConsCell.new(pod)) }
       let(:l_pea_pod_corn) { ConsCell.new(pea, ConsCell.new(pod, ConsCell.new(corn))) }
       subject { ConsCellVisitor }
 
       context 'Provided services:' do
-        it 'acts as a factory of Enumerator' do
+        it 'acts as a factory of Fiber objects' do
           expect(subject.df_visitor(l_pea)).to be_kind_of(Fiber)
         end
       end # context

data/spec/core/association_spec.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 require_relative '../spec_helper' # Use the RSpec framework
-require_relative '../../lib/mini_kraken/core/k_symbol'
-require_relative '../../lib/mini_kraken/core/variable'
+require_relative '../support/factory_atomic'
+require_relative '../../lib/mini_kraken/core/log_var'
 
 # Load the class under test
 require_relative '../../lib/mini_kraken/core/association'
@@ -10,7 +10,9 @@ require_relative '../../lib/mini_kraken/core/association'
 module MiniKraken
   module Core
     describe Association do
-      let(:pea) { KSymbol.new(:pea) }
+      include MiniKraken::FactoryAtomic # Use mix-in module
+
+      let(:pea) { k_symbol(:pea) }
       subject { Association.new('q', pea) }
 
       context 'Initialization:' do
@@ -19,7 +21,7 @@ module MiniKraken
         end
 
         it 'should be initialized with a variable and a value' do
-          expect { Association.new(Variable.new('p'), pea) }.not_to raise_error
+          expect { Association.new(LogVar.new('p'), pea) }.not_to raise_error
         end
 
         it 'should know the variable name' do

data/spec/core/association_walker_spec.rb

@@ -2,6 +2,7 @@
 
 require_relative '../spec_helper' # Use the RSpec framework
 require_relative '../../lib/mini_kraken/core/environment'
+require_relative '../support/factory_atomic'
 require_relative '../support/factory_methods'
 
 # Load the class under test
@@ -11,6 +12,7 @@ require_relative '../../lib/mini_kraken/core/association_walker'
 module MiniKraken
   module Core
     describe AssociationWalker do
+      include MiniKraken::FactoryAtomic # Use mix-in module
       include FactoryMethods
 
       subject { AssociationWalker.new }
@@ -26,12 +28,12 @@ module MiniKraken
       end # context
 
       context 'Provided services:' do
-        let(:pea) { KSymbol.new(:pea) }
-        let(:pod) { KSymbol.new(:pod) }
-        let(:var_q) { Variable.new('q') }
-        let(:ref_q) { VariableRef.new('q') }
-        let(:var_x) { Variable.new('x') }
-        let(:ref_x) { VariableRef.new('x') }
+        let(:pea) { k_symbol(:pea) }
+        let(:pod) { k_symbol(:pod) }
+        let(:var_q) { LogVar.new('q') }
+        let(:ref_q) { LogVarRef.new('q') }
+        let(:var_x) { LogVar.new('x') }
+        let(:ref_x) { LogVarRef.new('x') }
         let(:env) { Environment.new }
 
         it 'should return composite when it has only atomic term(s)' do

data/spec/core/conde_spec.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
 require_relative '../spec_helper' # Use the RSpec framework
-require_relative '../../lib/mini_kraken/core/k_symbol'
+require_relative '../support/factory_atomic'
 require_relative '../../lib/mini_kraken/core/fail'
 require_relative '../../lib/mini_kraken/core/succeed'
 require_relative '../../lib/mini_kraken/core/equals'
 require_relative '../../lib/mini_kraken/core/environment'
-require_relative '../../lib/mini_kraken/core/variable'
-require_relative '../../lib/mini_kraken/core/variable_ref'
+require_relative '../../lib/mini_kraken/core/log_var'
+require_relative '../../lib/mini_kraken/core/log_var_ref'
 
 # Load the class under test
 require_relative '../../lib/mini_kraken/core/conde'
@@ -15,6 +15,8 @@ require_relative '../../lib/mini_kraken/core/conde'
 module MiniKraken
   module Core
     describe Conde do
+      include MiniKraken::FactoryAtomic # Use mix-in module
+
       subject { Conde.instance }
 
       context 'Initialization:' do
@@ -28,22 +30,22 @@ module MiniKraken
       end # context
 
       context 'Provided services:' do
-        let(:bean) { KSymbol.new(:bean) }
-        let(:corn) { KSymbol.new(:corn) }
-        let(:meal) { KSymbol.new(:meal) }
-        let(:oil) { KSymbol.new(:oil) }
-        let(:olive) { KSymbol.new(:olive) }
-        let(:pea) { KSymbol.new(:pea) }
-        let(:red) { KSymbol.new(:red) }
-        let(:split) { KSymbol.new(:split) }
+        let(:bean) { k_symbol(:bean) }
+        let(:corn) {k_symbol(:corn) }
+        let(:meal) { k_symbol(:meal) }
+        let(:oil) { k_symbol(:oil) }
+        let(:olive) { k_symbol(:olive) }
+        let(:pea) { k_symbol(:pea) }
+        let(:red) { k_symbol(:red) }
+        let(:split) { k_symbol(:split) }
         let(:fails) { Goal.new(Fail.instance, []) }
         let(:succeeds) { Goal.new(Succeed.instance, []) }
-        let(:var_q) { Variable.new('q') }
-        let(:var_x) { Variable.new('x') }
-        let(:var_y) { Variable.new('y') }
-        let(:ref_q) { VariableRef.new('q') }
-        let(:ref_x) { VariableRef.new('x') }
-        let(:ref_y) { VariableRef.new('y') }
+        let(:var_q) { LogVar.new('q') }
+        let(:var_x) { LogVar.new('x') }
+        let(:var_y) { LogVar.new('y') }
+        let(:ref_q) { LogVarRef.new('q') }
+        let(:ref_x) { LogVarRef.new('x') }
+        let(:ref_y) { LogVarRef.new('y') }
         let(:env) do
           e = Environment.new
           e.add_var(var_q)

data/spec/core/conj2_spec.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
 require_relative '../spec_helper' # Use the RSpec framework
-require_relative '../../lib/mini_kraken/core/k_symbol'
+require_relative '../support/factory_atomic'
 require_relative '../../lib/mini_kraken/core/fail'
 require_relative '../../lib/mini_kraken/core/succeed'
 require_relative '../../lib/mini_kraken/core/equals'
 require_relative '../../lib/mini_kraken/core/environment'
-require_relative '../../lib/mini_kraken/core/variable'
-require_relative '../../lib/mini_kraken/core/variable_ref'
+require_relative '../../lib/mini_kraken/core/log_var'
+require_relative '../../lib/mini_kraken/core/log_var_ref'
 
 # Load the class under test
 require_relative '../../lib/mini_kraken/core/conj2'
@@ -16,6 +16,8 @@ require_relative '../../lib/mini_kraken/core/conj2'
 module MiniKraken
   module Core
     describe Conj2 do
+      include MiniKraken::FactoryAtomic # Use mix-in module
+
       subject { Conj2.instance }
 
       context 'Initialization:' do
@@ -30,13 +32,13 @@ module MiniKraken
 
       context 'Provided services:' do
         let(:env) { Environment.new }
-        let(:pea) { KSymbol.new(:pea) }
-        let(:corn) { KSymbol.new(:corn) }
-        let(:meal) { KSymbol.new(:meal) }
+        let(:pea) { k_symbol(:pea) }
+        let(:corn) { k_symbol(:corn) }
+        let(:meal) { k_symbol(:meal) }
         let(:fails) { Goal.new(Fail.instance, []) }
         let(:succeeds) { Goal.new(Succeed.instance, []) }
-        let(:var_q) { Variable.new('q') }
-        let(:ref_q) { VariableRef.new('q') }
+        let(:var_q) { LogVar.new('q') }
+        let(:ref_q) { LogVarRef.new('q') }
 
         it 'should complain when one of its argument is not a goal' do
           err = StandardError

data/spec/core/def_relation_spec.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
 require_relative '../spec_helper' # Use the RSpec framework
+require_relative '../support/factory_atomic'
 require_relative '../../lib/mini_kraken/core/disj2'
 require_relative '../../lib/mini_kraken/core/equals'
 require_relative '../../lib/mini_kraken/core/formal_arg'
 require_relative '../../lib/mini_kraken/core/formal_ref'
 require_relative '../../lib/mini_kraken/core/goal'
 require_relative '../../lib/mini_kraken/core/goal_template'
-require_relative '../../lib/mini_kraken/core/k_symbol'
-require_relative '../../lib/mini_kraken/core/variable_ref'
+require_relative '../../lib/mini_kraken/core/log_var_ref'
 require_relative '../../lib/mini_kraken/core/environment'
 
 # Load the class under test
@@ -17,8 +17,10 @@ require_relative '../../lib/mini_kraken/core/def_relation'
 module MiniKraken
   module Core
     describe DefRelation do
+      include MiniKraken::FactoryAtomic # Use mix-in module
+
       # (defrel (teao t) (== 'tea t))
-      let(:tea) { KSymbol.new(:tea) }
+      let(:tea) { k_symbol(:tea) }
       let(:formal_t) { FormalArg.new('t') }
       let(:t_ref) { FormalRef.new('t') }
       let(:equals_tea) { GoalTemplate.new(Equals.instance, [tea, t_ref]) }
@@ -43,8 +45,8 @@ module MiniKraken
       end # context
 
       context 'Provided services:' do
-        let(:cup) { KSymbol.new(:cup) }
-        let(:ref_x) { VariableRef.new('x') }
+        let(:cup) { Atomic::KSymbol.new(:cup) }
+        let(:ref_x) { LogVarRef.new('x') }
         let(:equals_cup) { GoalTemplate.new(Equals.instance, [cup, t_ref]) }
         let(:g_template) { GoalTemplate.new(Disj2.instance, [equals_tea, equals_cup]) }
         subject { DefRelation.new('teacup', g_template, [formal_t]) }
@@ -67,7 +69,7 @@ module MiniKraken
 
         it 'should provide solver for a single-node goal' do
           defrel = DefRelation.new('teao', equals_tea, [formal_t])
-          env.add_var(Variable.new('x'))
+          env.add_var(LogVar.new('x'))
           solver = defrel.solver_for([ref_x], env)
           outcome = solver.resume
           expect(outcome).to be_success
@@ -78,7 +80,7 @@ module MiniKraken
         end
 
         it 'should provide solver for a single-node goal' do
-          env.add_var(Variable.new('x'))
+          env.add_var(LogVar.new('x'))
           solver = subject.solver_for([ref_x], env)
           outcome = solver.resume
           expect(outcome).to be_success

data/spec/core/disj2_spec.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
 require_relative '../spec_helper' # Use the RSpec framework
-require_relative '../../lib/mini_kraken/core/k_symbol'
+require_relative '../support/factory_atomic'
 require_relative '../../lib/mini_kraken/core/fail'
 require_relative '../../lib/mini_kraken/core/succeed'
 require_relative '../../lib/mini_kraken/core/equals'
 require_relative '../../lib/mini_kraken/core/environment'
-require_relative '../../lib/mini_kraken/core/variable'
-require_relative '../../lib/mini_kraken/core/variable_ref'
+require_relative '../../lib/mini_kraken/core/log_var'
+require_relative '../../lib/mini_kraken/core/log_var_ref'
 
 # Load the class under test
 require_relative '../../lib/mini_kraken/core/disj2'
@@ -15,6 +15,7 @@ require_relative '../../lib/mini_kraken/core/disj2'
 module MiniKraken
   module Core
     describe Disj2 do
+      include MiniKraken::FactoryAtomic # Use mix-in module    
       subject { Disj2.instance }
 
       context 'Initialization:' do
@@ -28,15 +29,15 @@ module MiniKraken
       end # context
 
       context 'Provided services:' do
-        let(:corn) { KSymbol.new(:corn) }
-        let(:meal) { KSymbol.new(:meal) }
-        let(:oil) { KSymbol.new(:oil) }
-        let(:olive) { KSymbol.new(:olive) }
-        let(:pea) { KSymbol.new(:pea) }
+        let(:corn) { k_symbol(:corn) }
+        let(:meal) { k_symbol(:meal) }
+        let(:oil) { k_symbol(:oil) }
+        let(:olive) { k_symbol(:olive) }
+        let(:pea) { k_symbol(:pea) }
         let(:fails) { Goal.new(Fail.instance, []) }
         let(:succeeds) { Goal.new(Succeed.instance, []) }
-        let(:var_q) { Variable.new('q') }
-        let(:ref_q) { VariableRef.new('q') }
+        let(:var_q) { LogVar.new('q') }
+        let(:ref_q) { LogVarRef.new('q') }
         let(:env) do
           e = Environment.new
           e.add_var(var_q)

data/spec/core/environment_spec.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 require_relative '../spec_helper' # Use the RSpec framework
-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 '../support/factory_atomic'
+require_relative '../../lib/mini_kraken/core/log_var'
+require_relative '../../lib/mini_kraken/core/log_var_ref'
 require_relative '../../lib/mini_kraken/core/outcome'
 
 # Load the class under test
@@ -12,6 +12,8 @@ require_relative '../../lib/mini_kraken/core/environment'
 module MiniKraken
   module Core
     describe Environment do
+      include MiniKraken::FactoryAtomic # Use mix-in module
+
       subject { Environment.new }
 
       context 'Initialization:' do
@@ -40,13 +42,13 @@ module MiniKraken
       end # context
 
       context 'Provided services:' do
-        let(:var_a) { Variable.new('a') }
-        let(:var_b) { Variable.new('b') }
-        let(:var_c) { Variable.new('c') }
-        let(:var_c_bis) { Variable.new('c') }
-        let(:pea) { KSymbol.new(:pea) }
-        let(:pod) { KSymbol.new(:pod) }
-        let(:pad) { KSymbol.new(:pad) }
+        let(:var_a) { LogVar.new('a') }
+        let(:var_b) { LogVar.new('b') }
+        let(:var_c) { LogVar.new('c') }
+        let(:var_c_bis) { LogVar.new('c') }
+        let(:pea) { k_symbol(:pea) }
+        let(:pod) { k_symbol(:pod) }
+        let(:pad) { k_symbol(:pad) }
 
         it 'should accept the addition of a variable' do
           subject.add_var(var_a)

data/spec/core/equals_spec.rb

@@ -3,6 +3,7 @@
 require_relative '../spec_helper' # Use the RSpec framework
 require_relative '../../lib/mini_kraken/core/environment'
 
+require_relative '../support/factory_atomic'
 require_relative '../support/factory_methods'
 # Load the class under test
 require_relative '../../lib/mini_kraken/core/equals'
@@ -10,6 +11,7 @@ require_relative '../../lib/mini_kraken/core/equals'
 module MiniKraken
   module Core
     describe Equals do
+      include MiniKraken::FactoryAtomic # Use mix-in module
       include FactoryMethods
 
       subject { Equals.instance }
@@ -26,13 +28,13 @@ module MiniKraken
 
       context 'Provided services:' do
         def build_var(aName)
-          new_var = Variable.new(aName)
+          new_var = LogVar.new(aName)
           env.add_var(new_var)
           new_var
         end
 
         def build_var_ref(aName)
-          VariableRef.new(aName)
+          LogVarRef.new(aName)
         end
 
         def solve_for(arg1, arg2)
@@ -42,10 +44,10 @@ module MiniKraken
           outcome
         end
 
-        let(:pea) { KSymbol.new(:pea) }
-        let(:pod) { KSymbol.new(:pod) }
-        let(:sample_cons) { ConsCell.new(pea) }
-        let(:a_composite) { ConsCell.new(pod) }
+        let(:pea) { k_symbol(:pea) }
+        let(:pod) { k_symbol(:pod) }
+        let(:sample_cons) { Composite::ConsCell.new(pea) }
+        let(:a_composite) { Composite::ConsCell.new(pod) }
         let(:env) { Environment.new }
         let(:var_q) { build_var('q') }
         let(:ref_q) do
@@ -183,7 +185,7 @@ module MiniKraken
 
         it 'should succeed for a right-handed bound equal argument' do
           ref_q.associate(sample_cons, env)
-          composite = ConsCell.new(pea)
+          composite = Composite::ConsCell.new(pea)
           result = solve_for(composite, ref_q)
 
           expect(result).to be_success
@@ -194,7 +196,7 @@ module MiniKraken
 
         it 'should succeed for a left-handed bound equal argument' do
           ref_q.associate(sample_cons, env)
-          composite = ConsCell.new(pea)
+          composite = Composite::ConsCell.new(pea)
           result = solve_for(ref_q, composite)
 
           expect(result).to be_success
@@ -205,7 +207,7 @@ module MiniKraken
 
         it 'should succeed for a right-handed bound unequal argument' do
           ref_q.associate(sample_cons, env)
-          composite = ConsCell.new(pod)
+          composite = Composite::ConsCell.new(pod)
           result = solve_for(composite, ref_q)
 
           expect(result).to be_failure
@@ -216,7 +218,7 @@ module MiniKraken
 
         it 'should succeed for a left-handed bound unequal argument' do
           ref_q.associate(sample_cons, env)
-          composite = ConsCell.new(pod)
+          composite = Composite::ConsCell.new(pod)
           result = solve_for(ref_q, composite)
 
           expect(result).not_to be_success