skeem 0.2.00 → 0.2.01

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f8a75ad0a0ead374dc7ec59e94abc9edd04826901be7f2e8230c9047c256845
-  data.tar.gz: 854f4e2e64dff8224046420ee7ccd035b23cf409c016ecec667206c02a5aae87
+  metadata.gz: 5f5189dc1b13c7998cdf1ee98579ff1f70ae057493897f1e9bc64614ddb08a50
+  data.tar.gz: c302f6dce9b86a5ef7d5c644afbd164a8957d848ddaf5ab729e8f66a58b5bd55
 SHA512:
-  metadata.gz: ea925e74fbbab68290d6b6cb13e7af3caa735e9f5709e5d9f50423410695d5db0a9c50d077e594e2683e16c7b4f6b85c02b1d72629d97dc6e9348f7a1e32533c
-  data.tar.gz: 4930db824c351c76d56f006491f8838e88b64e2e2200fb13412c848c0bc90c6f9effa839983ac3e5bd926e0c0ab162bfb87e3a8217f8d2f14410ce35a4ff2d46
+  metadata.gz: b2e87e734659cff72352271a51ee76be8af918287ba2db9c267993774b03f04e3203aea62d130ee73678d8ad8011d4cca485ce3126116915685c33c6ac9ba326
+  data.tar.gz: 95a6027ac7ce681dbc4ab9dbe7a3f9ae96c8b19ff37bd61d4932ca869f2f1ab94495759c54d332fbf84772cfa0affb5a1dea610aa1002de48e0d64c61cb81228

data/CHANGELOG.md

@@ -1,9 +1,10 @@
-## [0.1.04] - 2019-01-19
+## [0.2.01] - 2019-04-19
 ### Added
-- Method `SkmDefinition#redefine`: a given variable can point to another expression.
+- Skeem now supports 'let' local binding construct
 
-### Fixed
-- Procedure `set!` caused infinite loops when redefinition involved a procedure call.
+
+## [0.2.00] - 2019-04-14
+### Major refactoring
 
 ## [0.1.03] - 2019-01-15
 ### Added

data/README.md

@@ -161,6 +161,11 @@ __Purpose:__ Assign to an existing variable an expression/value to it.
 __Syntax:__   
 * (set! <identifier\> <expression\>)  
 
+### Derived expressions
+#### let  
+__Purpose:__ Define one or more variable local to the block.  
+__Syntax:__   
+* (let (<binding_spec\*\>) <body\>)
 
 
 ### Standard library

data/lib/skeem/datum_dsl.rb

@@ -106,6 +106,7 @@ module Skeem
       return aLiteral if aLiteral.kind_of?(SkmSimpleDatum)
       return list(aLiteral.members) if aLiteral.kind_of?(SkmList)
       return vector(aLiteral.members) if aLiteral.kind_of?(SkmVector)
+      return aLiteral if aLiteral.kind_of?(Primitive::PrimitiveProcedure)
 
       result = case aLiteral
         when Array

data/lib/skeem/grammar.rb

@@ -19,7 +19,7 @@ module Skeem
     add_terminals('STRING_LIT', 'IDENTIFIER')
 
     # Keywords...
-    add_terminals('DEFINE', 'IF', 'LAMBDA')
+    add_terminals('DEFINE', 'IF', 'LAMBDA', 'LET')
     add_terminals('QUOTE', 'QUASIQUOTE', 'SET!')
     add_terminals('UNQUOTE', 'UNQUOTE-SPLICING')
 
@@ -92,9 +92,13 @@ module Skeem
     rule 'number' => 'INTEGER'
     rule 'number' => 'REAL'
     rule('assignment' => 'LPAREN SET! IDENTIFIER expression RPAREN').as 'assignment'
+    rule('derived_expression' => 'LPAREN LET LPAREN binding_spec_star RPAREN body RPAREN').as 'short_let_form'
     rule 'derived_expression' => 'quasiquotation'
     rule('quasiquotation' => 'LPAREN QUASIQUOTE qq_template RPAREN').as 'quasiquotation'
     rule('quasiquotation' => 'GRAVE_ACCENT qq_template').as 'quasiquotation_short'
+    rule('binding_spec_star' => 'binding_spec_star binding_spec').as 'multiple_binding_specs'
+    rule('binding_spec_star' => []).as 'no_binding_spec_yet'
+    rule('binding_spec' => 'LPAREN IDENTIFIER expression RPAREN').as 'binding_spec'
     rule 'qq_template' => 'simple_datum'
     rule 'qq_template' => 'list_qq_template'
     rule 'qq_template' => 'vector_qq_template'

data/lib/skeem/s_expr_builder.rb

@@ -95,7 +95,7 @@ module Skeem
         theChildren[2]
       else
         SkmQuotation.new(theChildren[2])
-      end      
+      end
     end
 
     # rule('list' => 'LPAREN datum_star RPAREN').as 'list'
@@ -106,7 +106,7 @@ module Skeem
       end
       SkmPair.create_from_a(theChildren[1])
     end
-    
+
     # rule('list' => 'LPAREN datum_plus PERIOD datum RPAREN').as 'dotted_list'
     def reduce_dotted_list(_production, _range, _tokens, theChildren)
       # if theChildren[1].kind_of?(Array)
@@ -118,9 +118,9 @@ module Skeem
       # else
         # car_arg = theChildren[1]
       # end
-      
+
       SkmPair.new(theChildren[1], theChildren[3])
-    end    
+    end
 
     # rule('vector' => 'VECTOR_BEGIN datum_star RPAREN').as 'vector'
     def reduce_vector(_production, aRange, _tokens, theChildren)
@@ -246,12 +246,17 @@ module Skeem
     def reduce_conditional(_production, aRange, _tokens, theChildren)
       SkmCondition.new(aRange, theChildren[2], theChildren[3], theChildren[4])
     end
-    
+
     # rule('assignment' => 'LPAREN SET! IDENTIFIER expression RPAREN').as 'assignment'
     def reduce_assignment(_production, _range, _tokens, theChildren)
       SkmUpdateBinding.new(theChildren[2], theChildren[3])
     end
 
+    # rule('derived_expression' => 'LPAREN LET LPAREN binding_spec_star RPAREN body RPAREN').as 'short_let_form'
+    def reduce_short_let_form(_production, aRange, _tokens, theChildren)
+      SkmBindingBlock.new(:let, theChildren[3], theChildren[5])
+    end
+
     # rule('quasiquotation' => 'LPAREN QUASIQUOTE qq_template RPAREN').as 'quasiquotation'
     def reduce_quasiquotation(_production, aRange, _tokens, theChildren)
       SkmQuasiquotation.new(theChildren[2])
@@ -262,6 +267,21 @@ module Skeem
       SkmQuasiquotation.new(theChildren[1])
     end
 
+    # rule('binding_spec_star' => 'binding_spec_star binding_spec').as 'multiple_binding_specs'
+    def reduce_multiple_binding_specs(_production, aRange, _tokens, theChildren)
+      theChildren[0] << theChildren[1]
+    end
+
+    # rule('binding_spec_star' => []).as 'no_binding_spec_yet'
+    def reduce_no_binding_spec_yet(_production, aRange, _tokens, _children)
+      []
+    end
+
+    # rule('binding_spec' => 'LPAREN IDENTIFIER expression RPAREN').as 'binding_spec'
+    def reduce_binding_spec(production, _range, _tokens, theChildren)
+      SkmBinding.new(theChildren[1], theChildren[2])
+    end
+
     # rule('list_qq_template' => 'LPAREN qq_template_or_splice_star RPAREN').as 'list_qq'
     def reduce_list_qq(_production, _range, _tokens, theChildren)
       SkmPair.create_from_a(theChildren[1])

data/lib/skeem/s_expr_nodes.rb

@@ -129,7 +129,11 @@ module Skeem
           callee = operator
         else
           result = operator.evaluate(aRuntime)
-          callee = fetch_callee(aRuntime, result)
+          if result.kind_of?(Primitive::PrimitiveProcedure)
+            callee = result
+          else
+            callee = fetch_callee(aRuntime, result)
+          end
       end
 
       [:callee, callee]

data/lib/skeem/skm_unary_expression.rb

@@ -110,4 +110,36 @@ module Skeem
       variable.value
     end
   end # class
+  
+  # Used to represent local binding constructs (let, let*, letrec, letrec*)
+  class SkmBindingBlock < SkmUnaryExpression
+    alias body child
+    
+    attr_reader :kind
+    attr_reader :bindings
+    
+    def initialize(theKind, theBindings, aBody)
+      @kind = theKind
+      @bindings = theBindings
+      super(nil, aBody)
+    end
+    
+    def evaluate(aRuntime)
+      if kind == :let
+        aRuntime.push(SkmFrame.new(aRuntime.environment))
+        locals = bindings.map do |bnd|
+          SkmBinding.new(bnd.variable, bnd.value.evaluate(aRuntime))
+        end
+        locals.each do |bnd|
+          aRuntime.add_binding(bnd.variable.evaluate(aRuntime), bnd.value)
+        end
+      end
+      
+      result = body[:sequence].evaluate(aRuntime)
+      aRuntime.pop
+      result.kind_of?(SkmPair) ? result.last : result
+    end
+    
+  end # class
+  
 end # module

data/lib/skeem/tokenizer.rb

@@ -29,12 +29,13 @@ module Skeem
       '#(' => 'VECTOR_BEGIN'
     }.freeze
 
-    # Here are all the Scheme keywords (in uppercase)
+    # Here are all the implemented Scheme keywords (in uppercase)
     @@keywords = %w[
       BEGIN
       DEFINE
       IF
       LAMBDA
+      LET
       QUASIQUOTE
       QUOTE
       SET!

data/lib/skeem/version.rb

@@ -1,3 +1,3 @@
 module Skeem
-  VERSION = '0.2.00'.freeze
+  VERSION = '0.2.01'.freeze
 end

data/spec/skeem/interpreter_spec.rb

@@ -305,6 +305,42 @@ SKEEM
           expect(result.last.last.value).to eq(4)
       end
     end # context
+    
+    context 'Binding constructs:' do
+      it 'should implement local bindings' do
+        source = <<-SKEEM
+  (let ((x 2)
+        (y 3))
+    (* x y))
+SKEEM
+        result = subject.run(source)
+        expect(result).to eq(6)
+      end
+      
+      it 'should implement precedence of local bindings' do
+        source = <<-SKEEM
+  (define x 23)
+  (define y 42)
+
+  ; local variable y in let block "shadows" the global one
+  (let ((y 43))
+    (+ x y))
+SKEEM
+        result = subject.run(source)
+        expect(result.last).to eq(66)
+      end      
+      
+     it 'should support the nesting of local bindings' do
+        source = <<-SKEEM
+  (let ((x 2) (y 3))
+  (let ((x 7)
+    (z (+ x y)))
+  (* z x)))
+SKEEM
+        result = subject.run(source)
+        expect(result).to eq(35)
+      end      
+    end # context
 
     context 'Quasiquotation:' do
       it 'should implement the quasiquotation of constant literals' do
@@ -660,8 +696,8 @@ SKEEM
       end
     end # context
 
-    context 'More advanced tests' do
-      it 'should implement lambda that calls second-order functions' do
+    context 'Second-order functions' do
+      it 'should implement lambda that calls second-order function' do
         source = <<-SKEEM
   (define twice
     (lambda (x)
@@ -679,9 +715,7 @@ SKEEM
         expect(result.last).to eq(20)
       end
 
-#=begin
-      it 'under construction' do
-        # Fails
+      it 'should implement the composition of second-order functions' do
         source = <<-SKEEM
   (define twice
     (lambda (x)
@@ -698,7 +732,6 @@ SKEEM
         result = subject.run(source)
         expect(result.last).to eq(80)
       end
-#=end
     end # context
   end # describe
 end # module

metadata

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