skeem 0.0.26 → 0.0.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dac0bc87694eef9365c7c7ba6dab9b1827eab533
-  data.tar.gz: 5097264ce99da2c1e9a8e662e2276144a31b1660
+  metadata.gz: a462458401748edba53f3c95f80b56478d7cfeb0
+  data.tar.gz: bca52ec89e55cfe23c95e644da601fd2557877c8
 SHA512:
-  metadata.gz: 25d09cd405ff9463eba60c098933df4804ff28051a663af4b1bed8217aee280ebfba0a4ff86391d7500b606ccbede4f3cb2021e9713c0535600ce0c30291f72d
-  data.tar.gz: 5e36e23fe874f945b394adb866b4ffb85b62a014a7afacd5653c279d4d7d9902f2b012ddf19b680259e8cc73e69385a0a9bd556b47f2c4ae46b7a35297d2974b
+  metadata.gz: fbcbaf830c1ba588cd34700f7ebc4f7815b0972efa8ddd496fbda977538e2d5921cdb88830e880ee2cc4c6a7ecb6f214d903ea945a970b46653d366de22b4fc0
+  data.tar.gz: 959251339c07128dc76a7557761d915cacea326432bf4ab0e3728d894f63bf2fe609d743ea07b1b0753ca65d728528e2d4fe8b3b246bf381ddd0b74533aca1ca

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## [0.0.27] - 2018-11-25
+### Fixed
+- The interpreter failed with second-order lambdas (lambda expression that contains another lambda)
+- Added a specific test in `interpreter_spec.rb`
+
+
 ## [0.0.26] - 2018-11-25
 
 ### Added

data/lib/skeem/primitive/primitive_procedure.rb

@@ -17,6 +17,7 @@ module Skeem
       # Arguments are positional in a primitive procedure.
       def call(aRuntime, aProcedureCall)
         check_actual_count(aProcedureCall)
+        aProcedureCall.operands_consumed = true
         do_call(aRuntime, aProcedureCall.operands.to_a)
       end
 

data/lib/skeem/runtime.rb

@@ -93,8 +93,8 @@ module Skeem
       call_stack.pop
     end
     
-    def caller
-      call_stack.last
+    def caller(index = -1)
+      call_stack[index]
     end
 
     private

data/lib/skeem/s_expr_nodes.rb

@@ -121,6 +121,7 @@ module Skeem
     attr_reader :operator
     attr_reader :operands
     attr_accessor :call_site
+    attr_accessor :operands_consumed
 
     def initialize(aPosition, anOperator, theOperands)
       super(aPosition)
@@ -131,13 +132,28 @@ module Skeem
         @operator = anOperator
       end
       @operands = SkmList.new(theOperands)
+      @operands_consumed = false
     end
 
     def evaluate(aRuntime)
+      aRuntime.push_call(self)
       if operator.kind_of?(SkmLambda)
         procedure = operator
       else
         var_key = operator.evaluate(aRuntime)
+        if operator.kind_of?(ProcedureCall) && operands_consumed
+          return var_key
+        end
+        begin
+          aRuntime.include?(var_key.value)
+        rescue NoMethodError
+          $stderr.puts "VVVVVVVVVVVVVVV"
+          $stderr.puts 'var_key: ' + var_key.inspect
+          $stderr.puts 'operator: ' + operator.inspect
+          $stderr.puts 'operands: ' + operands.inspect
+          $stderr.puts 'operands_consumed: ' + operands_consumed.inspect
+          $stderr.puts "^^^^^^^^^^^^^^^"
+        end
         unless aRuntime.include?(var_key.value)
           err = StandardError
           key = var_key.kind_of?(SkmIdentifier) ? var_key.value : var_key
@@ -145,13 +161,16 @@ module Skeem
           raise err, err_msg
         end
         procedure = aRuntime.environment.fetch(var_key.value)
-        # $stderr.puts "## CALL(#{var_key.value}) ###################"
-        # $stderr.puts operands.inspect
       end
-      aRuntime.push_call(self)
+      # $stderr.puts "## In ProcCall #{var_key.value} #############"
+      # $stderr.puts 'operator: ' + operator.inspect
+      # $stderr.puts 'operands: ' + operands.inspect
+      # $stderr.puts "## CALL(#{var_key.value}) ###################"
+      # $stderr.puts 'callee: ' + procedure.inspect
       result = procedure.call(aRuntime, self)
+      operands_consumed = true
       aRuntime.pop_call
-      # $stderr.puts "## RETURN #{result.inspect}"
+      # $stderr.puts "## RETURN #{result.inspect} from #{var_key.value}"
       result
     end
 
@@ -317,7 +336,6 @@ module Skeem
     def call(aRuntime, aProcedureCall)
       aRuntime.nest
       bind_locals(aRuntime, aProcedureCall)
-      # TODO remove next line
       # $stderr.puts aRuntime.environment.inspect
       result = evaluate_defs(aRuntime)
       result = evaluate_sequence(aRuntime)
@@ -382,7 +400,14 @@ module Skeem
     def evaluate_sequence(aRuntime)
       result = nil
       if sequence
-        sequence.each { |cmd| result = cmd.evaluate(aRuntime) }
+        sequence.each do |cmd|
+          if cmd.kind_of?(SkmLambda)
+            aRuntime.caller(-2).operands_consumed = true
+            result = cmd.call(aRuntime, aRuntime.caller(-2))
+          else
+            result = cmd.evaluate(aRuntime)
+          end
+        end
       end
 
       result
@@ -411,10 +436,10 @@ module Skeem
       end
     end
 
-    def msg_arity_mismatch(aProcedureCall)
+    def msg_arity_mismatch(aProcCall)
       # *** ERROR: wrong number of arguments for #<closure morph> (required 2, got 1)
-      msg1 = "Wrong number of arguments for procedure #{operator} "
-      count_actuals = aProcedureCall.operands.members.size
+      msg1 = "Wrong number of arguments for procedure #{aProcCall.operator} "
+      count_actuals = aProcCall.operands.members.size
       msg2 = "(required #{required_arity}, got #{count_actuals})"
       msg1 + msg2
     end

data/lib/skeem/version.rb

@@ -1,3 +1,3 @@
 module Skeem
-  VERSION = '0.0.26'.freeze
+  VERSION = '0.0.27'.freeze
 end

data/spec/skeem/interpreter_spec.rb

@@ -202,7 +202,7 @@ SKEEM
         result = subject.run(source)
         expect(result).to be_kind_of(SkmList)
         expect(result).to be_null
-      end      
+      end
 
       it 'should implement the lambda function with one arg' do
         source = <<-SKEEM
@@ -332,7 +332,7 @@ SKEEM
           expect(result.members[index]).to eq(value)
         end
       end
-      
+
       it 'should implement the unquote of vectors' do
         source = '`#( ,(+ 1 2) 4)'
         result = subject.run(source)
@@ -350,7 +350,7 @@ SKEEM
         result = subject.run(source)
         expect(result).to be_kind_of(SkmVector)
         expect(result).to be_empty
-        
+
         # Nested vectors
         source = '`#(a b #(,(+ 2 3) c) d)'
         result = subject.run(source)
@@ -365,9 +365,9 @@ SKEEM
         predictions.each_with_index do |(type, value), index|
           expect(result.members[index]).to be_kind_of(type)
           expect(result.members[index]).to eq(value)
-        end        
-      end      
-            
+        end
+      end
+
       it 'should implement the quasiquotation of lists' do
         source = '(quasiquote (+ 1 2))'
         result = subject.run(source)
@@ -387,7 +387,7 @@ SKEEM
         expect(result).to be_kind_of(SkmList)
         expect(result).to be_null
       end
-      
+
       it 'should implement the unquote of lists' do
         source = '`(list ,(+ 1 2) 4)'
         result = subject.run(source)
@@ -406,7 +406,7 @@ SKEEM
         result = subject.run(source)
         expect(result).to be_kind_of(SkmList)
         expect(result).to be_null
-        
+
         # nested lists
         source = '`(a b (,(+ 2 3) c) d)'
         result = subject.run(source)
@@ -421,22 +421,22 @@ SKEEM
         predictions.each_with_index do |(type, value), index|
           expect(result.members[index]).to be_kind_of(type)
           expect(result.members[index]).to eq(value)
-        end        
+        end
       end
 =begin
 `(+ 2 ,(* 3 4))  (+ 2 12)
 `(a b ,(reverse '(c d e)) f g)  (a b (e d c) f g)
 (let ([a 1] [b 2])
-  `(,a . ,b))  (1 . 2) 
+  `(,a . ,b))  (1 . 2)
 
 `(+ ,@(cdr '(* 2 3)))  (+ 2 3)
 `(a b ,@(reverse '(c d e)) f g)  (a b e d c f g)
 (let ([a 1] [b 2])
   `(,a ,@b))  (1 . 2)
-`#(,@(list 1 2 3))  #(1 2 3) 
+`#(,@(list 1 2 3))  #(1 2 3)
 
 '`,(cons 'a 'b)  `,(cons 'a 'b)
-`',(cons 'a 'b)  '(a . b) 
+`',(cons 'a 'b)  '(a . b)
 =end
     end # context
 
@@ -567,7 +567,7 @@ SKEEM
           expect(result).to eq(expectation)
         end
       end
-      
+
       it 'should implement the not procedure' do
         checks = [
           ['(not #t)', false],
@@ -582,8 +582,8 @@ SKEEM
           result = subject.run(skeem_expr)
           expect(result).to eq(expectation)
         end
-      end      
-      
+      end
+
       it 'should implement the list procedure' do
         checks = [
           ['(list)', []],
@@ -595,7 +595,7 @@ SKEEM
           expect(result.members).to eq(expectation)
         end
       end
-      
+
       it 'should implement the symbol=? procedure' do
         checks = [
           ["(symbol=? 'a 'a)", true],
@@ -606,7 +606,21 @@ SKEEM
           result = subject.run(skeem_expr)
           expect(result).to eq(expectation)
         end
-      end      
+      end
+    end # context
+
+    context 'More advanced tests' do
+      it 'should implement second-order functions' do
+        source = <<-SKEEM
+  (define compose
+    (lambda (f g)
+      (lambda (x)
+        (f (g x)))))
+  ((compose list square) 5)
+SKEEM
+        result = subject.run(source)
+        expect(result.last.members).to eq([25])
+      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.0.26
+  version: 0.0.27
 platform: ruby
 authors:
 - Dimitri Geshef
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-25 00:00:00.000000000 Z
+date: 2018-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rley