skeem 0.0.16 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b34c77d5c2d4f0893f69e79e8973b4c6eca3481
-  data.tar.gz: f10a360e77925612bd6c95bb5e160417ba538983
+  metadata.gz: 0c8a2b41577b541764b4ff1e2702ba30502020a4
+  data.tar.gz: f2844f165479416e313c25452ed7e6d05a8cf722
 SHA512:
-  metadata.gz: da4f16148a354cb6ee8553d46e204ed97e27a88a117727a1c6a18f8441b5ed08a93fe56db11ade0fc903e934b60002315a98a70ef9b1a83d5015f7246f27ab4a
-  data.tar.gz: c75610b85fa5fa4a56c66832e19e193b401118dce728c5dacd755f5d570d3898939a11c2aa46ba83b9d1a6cde23d1a9e865657957dccc565e90c02c8806499aa
+  metadata.gz: a070f9dd299720eb3b5c2b71a3133270183d923a766b9d3a6d10ed62e539875bd59f9fc30aec016756ba82ff359978dec03a8f76a12771710c1f58cdeac64c1d
+  data.tar.gz: 364f3f3d0da779b2cd0e6e083902b9db9fd97368b6254ac80cc700069c53187524fdaf9f1e9724fd3d4dd176cccaa0a0cf786265006fff8b1dd69190641107ba

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## [0.0.17] - 2018-10-06
+- Fix: now support calls of anonymous lambda procedures.
+
+### Fixed
+- Method `SkmProcedureCall#evaluate` Fix: no procedure name lookup for anonymous ones!
+
 ## [0.0.16] - 2018-10-06
 - Added built-in procedures `odd?`, `even?`, `square`, and `floor-remainder` (`modulo`).
 - Supports procedures without argument.

data/lib/skeem/interpreter.rb

@@ -18,6 +18,7 @@ module Skeem
     def run(source)
       @parser ||= Parser.new
       @ptree = parser.parse(source)
+      # $stderr.puts @ptree.root.inspect
       return @ptree.root.evaluate(runtime)
     end
     

data/lib/skeem/s_expr_nodes.rb

@@ -340,16 +340,20 @@ module Skeem
     end
 
     def evaluate(aRuntime)
-      var_key = operator.evaluate(aRuntime)
-      unless aRuntime.include?(var_key.value)
-        err = StandardError
-        key = var_key.kind_of?(SkmIdentifier) ? var_key.value : var_key
-        err_msg = "Unknown procedure '#{key}'"
-        raise err, err_msg
+      if operator.kind_of?(SkmLambda)
+        procedure = operator
+      else
+        var_key = operator.evaluate(aRuntime)
+        unless aRuntime.include?(var_key.value)
+          err = StandardError
+          key = var_key.kind_of?(SkmIdentifier) ? var_key.value : var_key
+          err_msg = "Unknown procedure '#{key}'"
+          raise err, err_msg
+        end
+        procedure = aRuntime.environment.fetch(var_key.value)
+        # $stderr.puts "## CALL(#{var_key.value}) ###################"
+        # $stderr.puts operands.inspect
       end
-      procedure = aRuntime.environment.fetch(var_key.value)
-      # $stderr.puts "## CALL(#{var_key.value}) ###################"
-      # $stderr.puts operands.inspect
       result = procedure.call(aRuntime, self)
       # $stderr.puts "## RETURN #{result.inspect}"
       result
@@ -357,7 +361,7 @@ module Skeem
 
     def inspect
       result = inspect_prefix + operator.inspect + ', '
-      result << operands.inspect + inspect_suffix
+      result << '@operands ' + operands.inspect + inspect_suffix
       result
     end
 

data/lib/skeem/version.rb

@@ -1,3 +1,3 @@
 module Skeem
-  VERSION = '0.0.16'.freeze
+  VERSION = '0.0.17'.freeze
 end

data/spec/skeem/interpreter_spec.rb

@@ -171,16 +171,22 @@ SKEEM
         expect(result.value).to eq(3628800)    
       end
       
-    it 'should implement the compact define + lambda syntax' do
-        source = <<-SKEEM
+      it 'should implement the compact define + lambda syntax' do
+          source = <<-SKEEM
   ; Alternative syntax to: (define f (lambda x (+ x 42)))
   (define (f x)
     (+ x 42))
   (f 23)
 SKEEM
+          result = subject.run(source)
+          expect(result.value).to eq(65)      
+      end
+      
+      it 'should call anonymous procedure' do
+        source = '((lambda (x) (+ x x)) 4)'
         result = subject.run(source)
-        expect(result.value).to eq(65)      
-    end
+        expect(result.value).to eq(8)        
+      end
     end # context
 
     context 'Built-in primitive procedures' do

data/spec/skeem/s_expr_nodes_spec.rb

@@ -330,7 +330,7 @@ describe SkmIdentifier do
     context 'Provided services:' do
       it 'should return its text representation' do
         txt1 = '<Skeem::ProcedureCall: <Skeem::SkmIdentifier: +>, '
-        txt2 = '<Skeem::SkmList: 1, 2, 3>>'
+        txt2 = '@operands <Skeem::SkmList: 1, 2, 3>>'
         expect(subject.inspect).to eq(txt1 + txt2)
       end
     end # context

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: skeem
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors:
 - Dimitri Geshef