mini_kraken 0.2.03 → 0.3.03

data/spec/support/factory_atomic.rb

@@ -0,0 +1,29 @@
+# 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 KString instance
+    # @param aString [String]
+    # @return [Core::KSymbol]
+    def k_string(aString)
+      Atomic::KString.new(aString)
+    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_composite.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require_relative '../../lib/mini_kraken/composite/list'
+
+module MiniKraken
+  # Mix-in module that provides convenience factory methods.
+  module FactoryComposite
+    # Factory method for constructing a ConsCell
+    # @param obj1 [Term]
+    # @param obj2 [Term]
+    # @return [Core::ConsCell]
+    def cons(obj1, obj2 = nil)
+      Composite::List.cons(obj1, obj2)
+    end
+
+    # Factory method that build a proper list with given elements
+    def make_list(*elems)
+      Composite::List.make_list(elems)
+    end
+  end # module
+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.3.03
 platform: ruby
 authors:
 - Dimitri Geshef
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-02 00:00:00.000000000 Z
+date: 2020-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,7 +52,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-description: Implementation of Minikanren language in Ruby. WIP
+description: Implementation of miniKanren language in Ruby. WIP
 email:
 - famished.tiger@yahoo.com
 executables: []
@@ -69,78 +69,96 @@ 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_string.rb
+- lib/mini_kraken/atomic/k_symbol.rb
+- lib/mini_kraken/composite/all_composite.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/composite/list.rb
+- lib/mini_kraken/core/all_core.rb
 - lib/mini_kraken/core/any_value.rb
+- lib/mini_kraken/core/arity.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
+- lib/mini_kraken/core/association_copy.rb
+- lib/mini_kraken/core/base_term.rb
+- lib/mini_kraken/core/blackboard.rb
+- lib/mini_kraken/core/bookmark.rb
+- lib/mini_kraken/core/context.rb
 - lib/mini_kraken/core/duck_fiber.rb
-- lib/mini_kraken/core/environment.rb
-- lib/mini_kraken/core/equals.rb
+- lib/mini_kraken/core/entry.rb
 - lib/mini_kraken/core/fail.rb
-- lib/mini_kraken/core/formal_arg.rb
-- lib/mini_kraken/core/formal_ref.rb
-- lib/mini_kraken/core/freshness.rb
+- lib/mini_kraken/core/fusion.rb
 - lib/mini_kraken/core/goal.rb
-- 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/parametrized_term.rb
 - lib/mini_kraken/core/relation.rb
+- lib/mini_kraken/core/scope.rb
+- lib/mini_kraken/core/solver_adapter.rb
+- lib/mini_kraken/core/specification.rb
 - lib/mini_kraken/core/succeed.rb
+- lib/mini_kraken/core/symbol_table.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
-- lib/mini_kraken/glue/fresh_env_factory.rb
 - lib/mini_kraken/glue/run_star_expression.rb
+- lib/mini_kraken/rela/all_rela.rb
+- lib/mini_kraken/rela/binary_relation.rb
+- lib/mini_kraken/rela/conde.rb
+- lib/mini_kraken/rela/conj2.rb
+- lib/mini_kraken/rela/def_relation.rb
+- lib/mini_kraken/rela/disj2.rb
+- lib/mini_kraken/rela/fresh.rb
+- lib/mini_kraken/rela/goal_relation.rb
+- lib/mini_kraken/rela/unify.rb
 - 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/composite/list_spec.rb
+- spec/core/any_value_spec.rb
+- spec/core/arity_spec.rb
+- spec/core/association_copy_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/blackboard_spec.rb
+- spec/core/bookmark_spec.rb
+- spec/core/context_spec.rb
+- spec/core/core_spec.rb
 - spec/core/duck_fiber_spec.rb
-- spec/core/environment_spec.rb
-- spec/core/equals_spec.rb
 - 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/outcome_spec.rb
+- spec/core/log_var_ref_spec.rb
+- spec/core/log_var_spec.rb
+- spec/core/nullary_relation_spec.rb
+- spec/core/parametrized_tem_spec.rb
+- spec/core/relation_spec.rb
+- spec/core/scope_spec.rb
+- spec/core/solver_adapter_spec.rb
+- spec/core/specification_spec.rb
 - spec/core/succeed_spec.rb
-- spec/core/variable_ref_spec.rb
-- spec/core/variable_spec.rb
-- spec/core/vocabulary_spec.rb
+- spec/core/symbol_table_spec.rb
 - spec/glue/dsl_chap1_spec.rb
 - spec/glue/dsl_chap2_spec.rb
-- spec/glue/fresh_env_factory_spec.rb
-- spec/glue/fresh_env_spec.rb
 - spec/glue/run_star_expression_spec.rb
 - spec/mini_kraken_spec.rb
+- spec/rela/conde_spec.rb
+- spec/rela/conj2_spec.rb
+- spec/rela/def_relation_spec.rb
+- spec/rela/disj2_spec.rb
+- spec/rela/fresh_spec.rb
+- spec/rela/unify_spec.rb
 - spec/spec_helper.rb
+- spec/support/factory_atomic.rb
+- spec/support/factory_composite.rb
 - spec/support/factory_methods.rb
 homepage: https://github.com/famished-tiger/mini_kraken
 licenses:
@@ -165,32 +183,42 @@ requirements: []
 rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: Implementation of Minikanren language in Ruby. WIP
+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/composite/list_spec.rb
+- spec/core/any_value_spec.rb
+- spec/core/arity_spec.rb
+- spec/core/association_copy_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/blackboard_spec.rb
+- spec/core/bookmark_spec.rb
+- spec/core/context_spec.rb
+- spec/core/core_spec.rb
 - spec/core/duck_fiber_spec.rb
-- spec/core/environment_spec.rb
-- spec/core/equals_spec.rb
 - 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/outcome_spec.rb
+- spec/core/log_var_ref_spec.rb
+- spec/core/log_var_spec.rb
+- spec/core/nullary_relation_spec.rb
+- spec/core/parametrized_tem_spec.rb
+- spec/core/relation_spec.rb
+- spec/core/scope_spec.rb
+- spec/core/solver_adapter_spec.rb
+- spec/core/specification_spec.rb
 - spec/core/succeed_spec.rb
-- spec/core/variable_ref_spec.rb
-- spec/core/variable_spec.rb
-- spec/core/vocabulary_spec.rb
+- spec/core/symbol_table_spec.rb
 - spec/glue/dsl_chap1_spec.rb
 - spec/glue/dsl_chap2_spec.rb
-- spec/glue/fresh_env_factory_spec.rb
-- spec/glue/fresh_env_spec.rb
 - spec/glue/run_star_expression_spec.rb
 - spec/mini_kraken_spec.rb
+- spec/rela/conde_spec.rb
+- spec/rela/conj2_spec.rb
+- spec/rela/def_relation_spec.rb
+- spec/rela/disj2_spec.rb
+- spec/rela/fresh_spec.rb
+- spec/rela/unify_spec.rb

data/lib/mini_kraken/core/association_walker.rb

@@ -1,183 +0,0 @@
-# frozen_string_literal: true
-
-require 'set'
-require_relative 'atomic_term'
-require_relative 'cons_cell'
-
-module MiniKraken
-  module Core
-    class AssociationWalker
-      attr_reader :visitees
-
-      def initialize
-        @visitees = Set.new
-      end
-
-      # @param aName [String]
-      # @param anEnv [Vocabulary]
-      # @return [Term, NilClass]
-      def find_ground(aName, anEnv)
-        # require 'debug'
-        assocs = anEnv[aName]
-        walk_assocs(assocs, anEnv)
-      end
-
-      def walk_assocs(assocs, anEnv)
-        # Treat easy cases first...
-        return nil if assocs.empty?
-
-        assoc_atomic = assocs.find { |assc| assc.value.kind_of?(AtomicTerm) }
-        return assoc_atomic.value if assoc_atomic
-
-        result = nil
-        assocs.each do |assc|
-          unless visitees.include?(assc)
-            visitees.add(assc)
-            sub_result = walk_value(assc.value, anEnv)
-            if sub_result
-              result = sub_result
-              break
-            end
-          end
-        end
-
-        result
-      end
-
-      def walk_value(aTerm, anEnv)
-        return aTerm if aTerm.kind_of?(AtomicTerm) || aTerm.kind_of?(AnyValue)
-
-        result = nil
-
-        if aTerm.kind_of?(CompositeTerm)
-          children = aTerm.children.compact
-          walk_results = children.map do |child|
-            walk_value(child, anEnv)
-          end
-          result = aTerm unless walk_results.any?(&:nil?)
-        else # VariableRef or Variable
-          name = aTerm.respond_to?(:name) ? aTerm.name : aTerm.var_name
-          result = find_ground(name, anEnv)
-        end
-
-        result
-      end
-
-      # A composite term is fresh when all its members are nil or all non-nil members
-      # are all fresh.
-      # A composite term is bound when it is not fresh and not ground
-      # A composite term is a ground term when all its non-nil members are ground.
-      # @param aTerm [Term]
-      # @param anEnv [Vocabulary]
-      # @return [Freshness]
-      def determine_freshness(aTerm, anEnv)
-        # require 'debug'
-        result = nil
-
-        if aTerm.kind_of?(AtomicTerm)
-          result = Freshness.new(:ground, aTerm)
-        elsif aTerm.kind_of?(CompositeTerm)
-          children = aTerm.children.compact
-          walk_results = children.map { |chd| determine_freshness(chd, anEnv) }
-
-          degree = nil
-          if walk_results.all?(&:fresh?)
-            degree = :fresh
-          elsif walk_results.all?(&:ground?)
-            degree = :ground
-          else
-            degree = :bound
-          end
-          result = Freshness.new(degree, aTerm)
-        else # VariableRef or Variable
-          name = aTerm.respond_to?(:name) ? aTerm.name : aTerm.var_name
-          assocs = anEnv[name]
-          if assocs.empty?
-            result = Freshness.new(:fresh, nil)
-          else
-            result = freshness_associated(assocs, anEnv)
-          end
-        end
-
-        result
-      end
-
-      def freshness_associated(assocs, anEnv)
-        assoc_atomic = assocs.find { |assc| assc.value.kind_of?(AtomicTerm) }
-        return Freshness.new(:ground, assoc_atomic.value) if assoc_atomic
-
-        raw_results = assocs.map do |assc|
-          unless visitees.include?(assc)
-            visitees.add(assc)
-            determine_freshness(assc.value, anEnv)
-          end
-        end
-
-        raw_results.compact!
-        result = nil
-        if raw_results.all?(&:fresh?)
-          # TODO: What if multiple bindings?...
-          result = Freshness.new(:bound, assocs[0].value)
-        elsif raw_results.any?(&:ground?)
-          ground_value = raw_results.find(&:ground?).associated
-          result = Freshness.new(:ground, ground_value)
-        else
-          # TODO: What if multiple bindings?...
-          result = Freshness.new(:bound, raw_results[0].associated)
-        end
-
-        result
-      end
-
-      def quote_term(aTerm, anEnv)
-        # require 'debug'
-        result = nil
-
-        if aTerm.kind_of?(AtomicTerm)
-          result = aTerm.quote(anEnv)
-        elsif aTerm.kind_of?(ConsCell)
-          result = aTerm.quote(anEnv)
-        else # VariableRef or Variable
-          name = aTerm.respond_to?(:name) ? aTerm.name : aTerm.var_name
-          assocs = anEnv[name]
-          if assocs.empty?
-            result = nil
-          else
-            result = quote_associated(assocs, anEnv)
-          end
-        end
-
-        result
-      end
-
-      def quote_associated(assocs, anEnv)
-        assoc_atomic = assocs.find { |assc| assc.value.kind_of?(AtomicTerm) }
-        return assoc_atomic.value if assoc_atomic
-
-        raw_results = assocs.map do |assc|
-          unless visitees.include?(assc)
-            visitees.add(assc)
-            quote_term(assc.value, anEnv)
-          end
-        end
-
-        raw_results.compact!
-        result = nil
-        if raw_results.empty?
-          result = nil
-        elsif raw_results.all? { |res| res.fresh?(anEnv) }
-          # TODO: What if multiple bindings?...
-          result = quote_term(assocs[0].value, anEnv)
-        elsif raw_results.any? { |res| res.ground?(anEnv) }
-          ground_res = raw_results.find { |res| res.ground?(anEnv) }
-          result = quote_term(ground_res, anEnv)
-        else
-          # TODO: What if multiple bindings?...
-          result = quote_term(raw_results[0], anEnv)
-        end
-
-        result
-      end
-    end # class
-  end # module
-end # module