mini_kraken 0.2.01 → 0.2.02

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f51855ac3179a111a4ace328340402fa167818773086076abf90ed845c31d248
-  data.tar.gz: f6bde0d3d7b872461d7cb0b087eaab821240f14317445e95f4d832d09af51e2f
+  metadata.gz: 24222422e142dde60f6f5a3c92ca1b4967eb358f26d29a0d834f719d25fcab11
+  data.tar.gz: 855880806c2210763e6c77d442f8d0463c39b9bde81072ff91f65ca21a275998
 SHA512:
-  metadata.gz: ae6319164a2f6212bdbdea35dd5b5befa86648b685063dea79d220b70e5852c3e8b343d2d37ebfe6584aa3966b44174e91df2866d63e03a219a0008a5b382d66
-  data.tar.gz: 70eb204ab842ea45527bd5ca8661dcd98081422cae4d6848d220bc70e080da94b3b7078f3602f1143535821a9894309b9bec39ec5f4d6c60edcfd21cfa5c8f4f
+  metadata.gz: e7840d5f469d0924b5018a87ca9e349f7c17f81fb23c1b8001890f9b5ca752125fae2de08eb10af1e8fc430347dba3c1a635e25fe7c188196f93415ccaecbe95
+  data.tar.gz: 3a16f04afa89e31dbe572af6c26eeafb169143dc5d55419f4db1ee0c90b0268c60e0a1bee643a3bcdce769e3fd524dd6be37b8ad60211d814321f5b90e7f3350

data/CHANGELOG.md

@@ -1,10 +1,17 @@
+## [0.2.02] - 2020-08-08
+- The DSL (Domain Specific Language) now supports `conde` and passes all examples from Chapter 1.
+
+### NEW
+- Method`Glue::DSL#conde` to implement conde goals.
+- Method `KBoolean#to_s` returns a text representation of a boolean value.
+
 ## [0.2.01] - 2020-08-07
 - The DSL (Domain Specific Language) now supports `defrel` and boolean literals.
 
 ### CHANGED
 - Constructor `DefRelation#initialize` now freezes any new class instance.  
 - Constructor `GoalTemplate#initialize` now freezes any new class instance.  
-- Mixin module `Core::DSL` new method `defrel` to build custom relations.
+- Mixin module `Glue::DSL` new method `defrel` to build custom relations.
 - File `.rubocop.yml` to please Rubocop 0.89
 
 ## [0.2.00] - 2020-07-12

data/lib/mini_kraken.rb

@@ -6,10 +6,10 @@
 require_relative './mini_kraken/version'
 require_relative './mini_kraken/glue/dsl'
 
-
-# End of file
-
 module MiniKraken
   class Error < StandardError; end
   # Your code goes here...
 end
+
+# End of file
+

data/lib/mini_kraken/core/formal_ref.rb

@@ -7,7 +7,7 @@ module MiniKraken
     # A formal reference represents the occurrence of a formal argument name in a
     # goal template argument list.
     class FormalRef < BaseArg
-      # @return [String]
+      # @return [String] The name of a formal argument.
       attr_reader :name
 
       def initialize(aName)

data/lib/mini_kraken/core/k_boolean.rb

@@ -11,6 +11,10 @@ module MiniKraken
       def initialize(aValue)
         super(validated_value(aValue))
       end
+      
+      def to_s
+        value.to_s
+      end
 
       private
 

data/lib/mini_kraken/glue/dsl.rb

@@ -2,6 +2,7 @@
 
 require 'set'
 require_relative '../core/any_value'
+require_relative '../core/conde'
 require_relative '../core/conj2'
 require_relative '../core/cons_cell'
 require_relative '../core/def_relation'
@@ -10,6 +11,7 @@ require_relative '../core/equals'
 require_relative '../core/fail'
 require_relative '../core/formal_arg'
 require_relative '../core/formal_ref'
+require_relative '../glue/fresh_env'
 require_relative '../core/goal_template'
 require_relative '../core/k_boolean'
 require_relative '../core/k_symbol'
@@ -33,6 +35,19 @@ module MiniKraken
         program.run
       end
 
+      def conde(*goals)
+        # require 'debug'
+        args = goals.map do |goal_maybe|
+          if goal_maybe.kind_of?(Array)
+            goal_maybe.map { |g| convert(g)}
+          else
+            convert(goal_maybe)
+          end
+        end
+
+        Core::Goal.new(Core::Conde.instance, args)
+      end
+
       # conj2 stands for conjunction of two arguments.
       # Returns a goal linked to the Core::Conj2 relation.
       # The rule of that relation succeeds when both arguments succeed.
@@ -142,6 +157,8 @@ module MiniKraken
             converted = anArgument
           when Core::FormalRef
             converted = anArgument
+          when FreshEnv
+            converted = anArgument            
           when Core::Goal
             converted = anArgument
           when Core::GoalTemplate

data/lib/mini_kraken/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MiniKraken
-  VERSION = '0.2.01'
+  VERSION = '0.2.02'
 end

data/spec/core/conde_spec.rb

@@ -58,7 +58,7 @@ module MiniKraken
           expect { subject.solver_for([pea, succeeds], env) }.to raise_error(err)
         end
 
-        it 'should fails if when all goals fail' do
+        it 'should fail when all goals fail' do
           solver = subject.solver_for([fails, fails, fails], env)
           expect(solver.resume).not_to be_successful
           expect(solver.resume).to be_nil

data/spec/core/k_boolean_spec.rb

@@ -101,6 +101,12 @@ module MiniKraken
           # Default Ruby representation, different value
           expect(subject == false).to be_falsy
         end
+
+        it 'provides a text representation of itself' do
+          expect(subject.to_s).to eq('true')
+          other = KBoolean.new('#f')
+          expect(other.to_s).to eq('false')
+        end
       end # context
     end # describe
   end # module

data/spec/glue/dsl_chap1_spec.rb

@@ -565,9 +565,7 @@ module MiniKraken
 
           defrel_teacupo
           result = run_star(%w[x y], [teacupo(x), teacupo(x)])
-
-          expect(result.car).to eq(cons(:tea, cons(:_0)))
-          expect(result.cdr.car).to eq(cons(:cup, cons(:_0)))
+          expect(result.to_s).to eq('((:tea _0) (:cup _0))')
         end
 
         it 'passes frame 1:87' do
@@ -583,11 +581,90 @@ module MiniKraken
               conj2(equals('#f', x), teacupo(y))))
 
           # Order of solutions differs from RS book
+          expected = '((:tea _0) (:cup _0) (false :tea) (false :cup))'
+          expect(result.to_s).to eq(expected)
           expect(result.car).to eq(cons(:tea, cons(:_0)))
           expect(result.cdr.car).to eq(cons(:cup, cons(:_0)))
           expect(result.cdr.cdr.car).to eq(cons(false, cons(:tea)))
           expect(result.cdr.cdr.cdr.car).to eq(cons(false, cons(:cup)))
         end
+
+        it 'supports conde and passes frame 1:88 (i)' do
+          # Reasoned S2, frame 1:88
+          # (run* (x y)
+          #   (conde
+          #     ((teacupo x) (teacupo x))
+          #     ((== #f x) (teacupo y)))) ;; => ((#f tea)(#f cup)(tea _0)(cup _0))
+
+          defrel_teacupo
+          result = run_star(%w[x y], conde(
+              [teacupo(x), teacupo(x)],
+              [equals('#f', x), teacupo(y)]))
+
+          # Order of solutions differs from RS book
+          expected = '((:tea _0) (:cup _0) (false :tea) (false :cup))'
+          expect(result.to_s).to eq(expected)
+        end
+
+        it 'supports conde and passes frame 1:88 (ii)' do
+          # Reasoned S2, frame 1:88 (second part, a rewrite of 1:76)
+          # (run* (x y)
+          #   (conde
+          #     ((== 'split x) (== 'pea y))
+          #     ((== 'red x) (== 'bean y)))) ;; => ((split pea)(red bean))
+          result = run_star(%w[x y], conde(
+            [equals(:split, x), equals(:pea, y)],
+            [equals(:red, x), equals(:bean, y)]))
+
+          expected = '((:split :pea) (:red :bean))'
+          expect(result.to_s).to eq(expected)
+        end
+
+        it 'passes frame 1:89' do
+          # Reasoned S2, frame 1:89 (rewrite of 1:62)
+          # (run* x
+          #   (conde
+          #     ((== 'olive x) fail)
+          #     ('oil x))) ;; => (oil)
+
+          result = run_star('x', conde(
+            [equals(:olive, x), _fail],
+            equals(:oil, x)))
+
+          expect(result.to_s).to eq('(:oil)')
+        end
+
+        it 'passes frame 1:90' do
+          # Reasoned S2, frame 1:90
+          # (run* (x y)
+          #   (conde
+          #     ((fresh (z)
+          #       (== 'lentil z)))
+          #     ((== x y)))) ;; => ((_0 _1)(_0 _0))
+
+          result = run_star(%w[x y], conde(
+            [fresh(%w[z], equals(:lentil, z))],
+            [equals(x, y)]))
+
+          expect(result.to_s).to eq('((_0 _1) (_0 _0))')
+        end
+
+        it 'passes frame 1:91' do
+          # Reasoned S2, frame 1:91
+          # (run* (x y)
+          #   (conde
+          #     ((== 'split x) (== 'pea y))
+          #     ((== 'red x) (== 'bean y))
+          #     ((== 'green x) (== 'lentil y))))
+          # ;; => ((split pea)(red bean)(green lentil))
+          result = run_star(%w[x y], conde(
+            [equals(:split, x), equals(:pea, y)],
+            [equals(:red, x), equals(:bean, y)],
+            [equals(:green, x), equals(:lentil, y)]))
+
+          expected = '((:split :pea) (:red :bean) (:green :lentil))'
+          expect(result.to_s).to eq(expected)
+        end
       end # context
     end # describe
   end # module

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mini_kraken
 version: !ruby/object:Gem::Version
-  version: 0.2.01
+  version: 0.2.02
 platform: ruby
 authors:
 - Dimitri Geshef
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-07 00:00:00.000000000 Z
+date: 2020-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler