skeem 0.2.03 → 0.2.04

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d5dc31ad0db5984772c42897c9ce30f51b5d97b44e7c1b9e65a277f4294c767
-  data.tar.gz: cdb6ad6e66f703a65327fee0523be67a898215d2efa0e91371ec5b75b5262daa
+  metadata.gz: 8efda1e2bcaf2e4d07ca4bc52f3708c0e217b27c191d6ed0a42d3b7125e26de5
+  data.tar.gz: '0359bae57e376f724f17b0e10bcc819f6fe8ee1f2478d2b330111c16546ab8ec'
 SHA512:
-  metadata.gz: ca03f6c15d90bbebae93cea809aaadd0dae35099bdcf6f7562182963e4c86c703d82a1955b3dde8ccd31369f85072a5e7a38cecaf8b8f4494775f3cf28c71611
-  data.tar.gz: 8167282d129ecf2e18563b5d6cceb1de387dab5ed4f8e63fc56655f33fc593fc79eeb8a650c72e88520d790b69d967e369e03552b261ce28052c709072867bbe
+  metadata.gz: 48f64eea51bbbe3e701214101ad7bf114cf45ef4281db722de2b2786d0e932793cf6945bd2cfbb6afc8ea320264ca7eb920fc79d0f7a81ac49efd1cd9af863c1
+  data.tar.gz: d4ae84b2ebf2d3a20efcbb950d11ea1fc2b31b06a62d33c5fd375df6ff726a0a0b51f2a693f8cb3d0a47864de59ed79f2fbafe2cad9e99092ce25f0784271944

data/CHANGELOG.md

@@ -1,7 +1,18 @@
+## [0.2.04] - 2019-04-29
+- Support for local definitions [initial]
+
+### Changed
+- File `grammar.rb` Added one production rule for third `begin` form syntax.
+- Method `SkmBuilder#reduce_begin_cmd` added to implement semantic action for new `begin...` production rule.
+- File `README.md` Added a couple of links for additional Scheme resources.
+
+
+### Removed
+- Method `SkmLambda#evaluate_defs` replaced by homonymous method in `SkmProcedureExec` class.
+
 ## [0.2.03] - 2019-04-26
 ### Changed
 - File `README.md` added new example with procedures holding each their local states.
-
 ### Fixed
 - The nesting of a lambda expression nested in a let construct caused an aliasing of the bindings.
 

data/README.md

@@ -39,6 +39,8 @@ Here are a few pointers for the Scheme programming language:
 #### Online tutorials and books:
 - [The Scheme Programming Language, 4th Edition](https://www.scheme.com/tspl4/) by Kent Dybvig. A complete, introductory textbook on Scheme based on the older R5RS standard.
 - [Teach Yourself Scheme in Fixnum Days](http://ds26gte.github.io/tyscheme/index.html) by Dorai Sitaram
+- [Yet Another Scheme Tutorial](http://www.shido.info/lisp/idx_scm_e.html) by Shido Takafumi
+- [An Introduction to Scheme and its Implementation](http://www.cs.utexas.edu/ftp/garbage/cs345/schintro-v14/schintro_toc.html) by Paul R. Wilson
 
 ## Usage
 
@@ -253,6 +255,7 @@ Here are a few other ones:
 
 - [rubic gem](https://rubygems.org/gems/rubic). The last commit for the [project](https://github.com/notozeki/rubic) is June 2015.
 
+- [RLisp](https://github.com/davydovanton/rlisp) ...Simple scheme interpreter written on ruby
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/famished-tiger/Skeem.

data/lib/skeem/grammar.rb

@@ -29,7 +29,7 @@ module Skeem
     rule('cmd_or_def_plus' => 'cmd_or_def').as 'last_cmd_def'
     rule 'cmd_or_def' => 'command'
     rule 'cmd_or_def' => 'definition'
-    # TODO: add BEGIN here p. 64 R7RS
+    rule('cmd_or_def' => 'LPAREN BEGIN cmd_or_def_plus RPAREN').as 'begin_cmd'
     rule 'command' => 'expression'
     rule('definition' => 'LPAREN DEFINE IDENTIFIER expression RPAREN').as 'definition'
     rule('definition' => 'LPAREN DEFINE LPAREN IDENTIFIER def_formals RPAREN body RPAREN').as 'alt_definition'

data/lib/skeem/primitive/primitive_builder.rb

@@ -616,8 +616,9 @@ module Skeem
             assert_call = aRuntime.caller
             pos = assert_call.call_site
             # Error: assertion failed: (> 1 2)
-            msg = "assertion failed on line #{pos.line}, column #{pos.column}"
-            raise StandardError, 'Error: ' + msg
+            msg1 = "assertion failed on line #{pos.line}, column #{pos.column}"
+            msg2 = ", with #{arg.inspect}"
+            raise StandardError, 'Error: ' + msg1 + msg2
           else
             boolean(true)
           end

data/lib/skeem/s_expr_builder.rb

@@ -58,6 +58,11 @@ module Skeem
     def reduce_last_cmd_def(_production, _range, _tokens, theChildren)
       SkmPair.create_from_a([theChildren.last])
     end
+    
+    # rule('cmd_or_def' => 'LPAREN BEGIN cmd_or_def_plus RPAREN').as 'begin_cmd'
+    def reduce_begin_cmd(_production, _range, _tokens, theChildren)
+       SkmSequencingBlock.new(theChildren[2])  
+    end    
 
     # rule('definition' => 'LPAREN DEFINE IDENTIFIER expression RPAREN')
     #  .as 'definition'

data/lib/skeem/s_expr_nodes.rb

@@ -342,24 +342,6 @@ require_relative 'skm_procedure_exec'
       set_cond_environment(aRuntime.environment) # Last chance for anonymous lambda
       application = SkmProcedureExec.new(self)
       application.run!(aRuntime, theActuals)
-=begin
-      # $stderr.puts "Start of lambda #{object_id.to_s(16)}"
-      aRuntime.nest
-      # $stderr.puts '  Before bind_locals'
-      bind_locals(aRuntime, aProcedureCall)
-      # $stderr.puts '  After bind_locals'
-      # $stderr.puts 'LOCALS vvvvvvvvvvv'
-      # $stderr.puts aRuntime.environment.inspect
-      # $stderr.puts 'LOCALS ^^^^^^^^^^^'
-      result = evaluate_defs(aRuntime)
-      # $stderr.puts '  Before evaluate_sequence'
-      result = evaluate_sequence(aRuntime)
-      # $stderr.puts '  After evaluate_sequence'
-      aRuntime.unnest
-      # $stderr.puts "  Result: #{result.inspect}"
-      # $stderr.puts "End of lambda #{object_id.to_s(16)}"
-      result
-=end
     end
 
     def arity
@@ -414,7 +396,6 @@ require_relative 'skm_procedure_exec'
         end
         variadic_arg_name = formals.formals.last
         args_coll = SkmPair.create_from_a(variadic_part)
-        # a_def = SkmDefinition.new(position, variadic_arg_name, args_coll)
         a_def = SkmBinding.new(variadic_arg_name, args_coll)
         a_def.evaluate(aRuntime)
         aRuntime.add_binding(a_def.variable, a_def.value)
@@ -427,10 +408,6 @@ require_relative 'skm_procedure_exec'
       #aProcedureCall.operands_consumed = true
     end
 
-    def evaluate_defs(aRuntime)
-      definitions.each { |a_def| a_def.evaluate(runtime) }
-    end
-
     def evaluate_sequence(aRuntime)
       result = nil
       if sequence

data/lib/skeem/skm_procedure_exec.rb

@@ -18,14 +18,25 @@ module Skeem
       runtime = aRuntime
       runtime.push(frame)
       definition.bind_locals(runtime, theActuals)
+      evaluate_defs(aRuntime)
+      # definition.evaluate_defs(runtime)
       # $stderr.puts "Locals"
-      # $stderr.puts frame.bindings.keys.join(', ')
-      definition.evaluate_defs(runtime)
+      # $stderr.puts frame.bindings.keys.join(', ')      
       result = definition.evaluate_sequence(runtime)
       runtime.pop
       # $stderr.puts "Lambda result: #{result.object_id.to_s(16)}" if result.kind_of?(SkmLambda)
       
       result
     end
+    
+    private
+    
+    def evaluate_defs(aRuntime)
+      definition.definitions.each do |bndng|
+        var = bndng.variable.evaluate(aRuntime)
+        val = bndng.value.evaluate(aRuntime)
+        frame.add_binding(var, val)
+      end    
+    end
   end # class
 end # module

data/lib/skeem/version.rb

@@ -1,3 +1,3 @@
 module Skeem
-  VERSION = '0.2.03'.freeze
+  VERSION = '0.2.04'.freeze
 end

data/spec/skeem/interpreter_spec.rb

@@ -304,6 +304,20 @@ SKEEM
           result = subject.run(source)
           expect(result.last.last.value).to eq(4)
       end
+      
+      
+      it 'should support the nested define construct' do
+        source = <<-SKEEM
+  (define (quadruple x)
+    (define (double x) ; define a local procedure double
+      (+ x x))
+    (double (double x))) ; nested calls to the local procedure
+ 
+  (quadruple 5) ; => 20
+SKEEM
+        result = subject.run(source)
+        expect(result.last.value).to eq(20)    
+      end
     end # context
 
     context 'Binding constructs:' do

data/spec/skeem/primitive/primitive_builder_spec.rb

@@ -696,8 +696,9 @@ SKEEM
   (test-assert (> x y))
 SKEEM
           err = StandardError
-          msg = 'Error: assertion failed on line 3, column 4'
-          expect { subject.run(source) }.to raise_error(err, msg)
+          msg1 = 'Error: assertion failed on line 3, column 4'
+          msg2 = 'with <Skeem::SkmBoolean: false>'
+          expect { subject.run(source) }.to raise_error(err, msg1 + ', '+ msg2)
         end
       end # context
     end # describe

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skeem
 version: !ruby/object:Gem::Version
-  version: 0.2.03
+  version: 0.2.04
 platform: ruby
 authors:
 - Dimitri Geshef
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-26 00:00:00.000000000 Z
+date: 2019-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rley