skeem 0.0.27 → 0.0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a462458401748edba53f3c95f80b56478d7cfeb0
-  data.tar.gz: bca52ec89e55cfe23c95e644da601fd2557877c8
+  metadata.gz: 9c6cb859a4082620c599599f02f5948ee5608d79
+  data.tar.gz: 742acc6b351efce05a6d40f7c9b558368c734fd5
 SHA512:
-  metadata.gz: fbcbaf830c1ba588cd34700f7ebc4f7815b0972efa8ddd496fbda977538e2d5921cdb88830e880ee2cc4c6a7ecb6f214d903ea945a970b46653d366de22b4fc0
-  data.tar.gz: 959251339c07128dc76a7557761d915cacea326432bf4ab0e3728d894f63bf2fe609d743ea07b1b0753ca65d728528e2d4fe8b3b246bf381ddd0b74533aca1ca
+  metadata.gz: fc51a07506b30450c78fd538a9127926378d6fdc3d165a1a3e075424295876a2727734bc4b969895f6f6bc76ea3f7c6a5e5ea6cdaec9495556a34b3d8e7c8c80
+  data.tar.gz: 076b28ff2fc211ed0ae3e2bf3cdfa08f4d220f5682c72f8f59e98dfe84f2555aa9ebbb529e08d94c24349e3845aad836c64eb541c5c2f414f917678fc36f096b

data/lib/skeem/environment.rb

@@ -47,19 +47,34 @@ module Skeem
 
       my_result
     end
-    
-    # The number of outer parents the current environment has. 
+
+    # The number of outer parents the current environment has.
     # @return [Integer] The nesting levels
     def depth
       count = 0
-      
+
       curr_env = self
       while curr_env.outer
         count += 1
         curr_env = curr_env.outer
       end
-      
+
       count
     end
+
+    def inspect
+      result = ''
+      if outer
+        result << outer.inspect
+      else
+        return "\n"
+      end
+      result << "\n----\n"
+      bindings.each_pair do |key, expr|
+        result << "#{key.inspect} => #{expr.inspect}\n"
+      end
+
+      result
+    end
   end # class
 end # module

data/lib/skeem/primitive/primitive_builder.rb

@@ -164,7 +164,14 @@ module Skeem
             first_one = arglist.first.evaluate(runtime)
             raw_result = first_one.value
             operands = evaluate_tail(arglist, runtime)
+            begin
             operands.each { |elem| raw_result *= elem.value }
+            rescue NoMethodError => exc
+              # $stderr.puts aRuntime.environment.inspect
+              # $stderr.puts first_one.inspect
+              # $stderr.puts operands.inspect
+              raise exc
+            end
             to_datum(raw_result)
           end
         end

data/lib/skeem/runtime.rb

@@ -3,7 +3,10 @@ require_relative 'environment'
 
 module Skeem
   class Runtime
+    # @return [Environment]
     attr_reader(:environment)
+
+    # @return [Array<ProcedureCall>] The call stack
     attr_reader(:call_stack)
 
     def initialize(anEnvironment)
@@ -14,7 +17,7 @@ module Skeem
     def include?(anIdentifier)
       environment.include?(normalize_key(anIdentifier))
     end
-    
+
     def fetch(aKey)
       key_value = normalize_key(aKey)
       include?(key_value) ? environment.fetch(key_value) : nil
@@ -28,14 +31,24 @@ module Skeem
       key_value = normalize_key(aKey)
       if include?(key_value)
         entry = environment.fetch(key_value)
-        case entry
-          when Primitive::PrimitiveProcedure
-            entry
-          when SkmDefinition
-            entry.expression.evaluate(self)
-          else
-            raise StandardError, entry.inspect
+        result = nil
+        begin
+          case entry
+            when Primitive::PrimitiveProcedure
+              result = entry
+            when SkmDefinition
+              result = entry.expression.evaluate(self)
+            else
+              raise StandardError, entry.inspect
+          end
+        rescue NoMethodError => exc
+          # $stderr.puts 'In rescue block'
+          # $stderr.puts key_value.inspect
+          # $stderr.puts entry.inspect
+          # $stderr.puts entry.expression.inspect
+          raise exc
         end
+        result
       else
         err = StandardError
         key = aKey.kind_of?(SkmIdentifier) ? aKey.value : key_value
@@ -43,7 +56,7 @@ module Skeem
         raise err, err_msg
       end
     end
-    
+
     # @param aList[SkmList] first member is an identifier.
     def evaluate_form(aList)
       # TODO: manage the cases where first_member is a keyword
@@ -69,30 +82,35 @@ module Skeem
 
     def push(anEnvironment)
       @environment = anEnvironment
-    end    
-    
+    end
+
     # Make the outer enviromnent thecurrent one inside the provided block
     def pop
       env = environment
       @environment = environment.outer
       env
     end
-    
+
     def push_call(aProcCall)
       if aProcCall.kind_of?(ProcedureCall)
         call_stack.push(aProcCall)
       else
         raise StandardError, "Invalid call object #{aProcCall.inspect}"
       end
+      # $stderr.puts 'CALL STACK vvvv'
+      call_stack.each do |proc_call|
+      # $stderr.puts proc_call.inspect
+      end
+      # $stderr.puts 'CALL STACK ^^^^'
     end
-    
+
     def pop_call()
       if call_stack.empty?
         raise StandardError, 'Skeem call stack empty!'
       end
       call_stack.pop
     end
-    
+
     def caller(index = -1)
       call_stack[index]
     end

data/lib/skeem/s_expr_nodes.rb

@@ -68,7 +68,7 @@ module Skeem
               end
             end
           else
-            # INFINITE LOOP DANGER: definition of 'x' is a reference to 'x'!
+            # INFINITE LOOP DANGER: definition of 'x' has a reference to 'x'!
             # Way out: the lookup for the reference should start from outer
             # environment.
             env = aRuntime.pop
@@ -96,11 +96,14 @@ module Skeem
 
     # call method should only invoked when the expression is a SkmLambda
     def call(aRuntime, aProcedureCall)
-      unless [SkmLambda, Primitive::PrimitiveProcedure].include?(expression.class)
-        err_msg = "Expected a SkmLambda instead of #{expression.class}"
+      expr = expression
+      expr = expr.evaluate(aRuntime) if expr.kind_of?(SkmVariableReference)
+      unless [SkmLambda, Primitive::PrimitiveProcedure].include?(expr.class)
+        err_msg = "Expected a SkmLambda instead of #{expr.class}"
         raise StandardError, err_msg
       end
-      expression.call(aRuntime, aProcedureCall)
+      # $stderr.puts "SkmDefinition#call #{aProcedureCall.inspect}"
+      expr.call(aRuntime, aProcedureCall)
     end
 
     def inspect
@@ -146,13 +149,14 @@ module Skeem
         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 "^^^^^^^^^^^^^^^"
+        rescue NoMethodError => exc
+          # $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 "^^^^^^^^^^^^^^^"
+          raise exc
         end
         unless aRuntime.include?(var_key.value)
           err = StandardError
@@ -162,11 +166,13 @@ module Skeem
         end
         procedure = aRuntime.environment.fetch(var_key.value)
       end
-      # $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
+      unless var_key.nil?
+        # $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
+      end
       result = procedure.call(aRuntime, self)
       operands_consumed = true
       aRuntime.pop_call
@@ -321,7 +327,8 @@ module Skeem
     end
 
     def evaluate(aRuntime)
-      formals.evaluate(aRuntime)
+      # formals.evaluate(aRuntime)
+      self
     end
 =begin
   TODO
@@ -336,7 +343,9 @@ module Skeem
     def call(aRuntime, aProcedureCall)
       aRuntime.nest
       bind_locals(aRuntime, aProcedureCall)
+      # $stderr.puts 'LOCALS vvvvvvvvvvv'
       # $stderr.puts aRuntime.environment.inspect
+      # $stderr.puts 'LOCALS ^^^^^^^^^^^'
       result = evaluate_defs(aRuntime)
       result = evaluate_sequence(aRuntime)
       aRuntime.unnest
@@ -391,6 +400,7 @@ module Skeem
         a_def = SkmDefinition.new(position, variadic_arg_name, args_coll)
         a_def.evaluate(aRuntime)
       end
+      aProcedureCall.operands_consumed = true
     end
 
     def evaluate_defs(aRuntime)
@@ -402,8 +412,16 @@ module Skeem
       if sequence
         sequence.each do |cmd|
           if cmd.kind_of?(SkmLambda)
-            aRuntime.caller(-2).operands_consumed = true
-            result = cmd.call(aRuntime, aRuntime.caller(-2))
+            caller_index = -2
+            loop do
+              raise StandardError, "Missing argument" unless aRuntime.caller(caller_index)
+              unless aRuntime.caller(caller_index).operands_consumed
+                aRuntime.caller(caller_index).operands_consumed = true
+                result = cmd.call(aRuntime, aRuntime.caller(caller_index))
+                break
+              end
+              caller_index -= 1
+            end
           else
             result = cmd.evaluate(aRuntime)
           end
@@ -413,9 +431,11 @@ module Skeem
       result
     end
 
+    # Purpose: bind each formal from lambda to an actual value from the call
     def bind_required_locals(aRuntime, aProcedureCall)
       max_index = required_arity - 1
       actuals =  aProcedureCall.operands.members
+      formal_names = formals.formals.map(&:value)
 
       formals.formals.each_with_index do |arg_name, index|
         arg = actuals[index]
@@ -430,8 +450,13 @@ module Skeem
         # IMPORTANT: execute procedure call in argument list now
         arg = arg.evaluate(aRuntime) if arg.kind_of?(ProcedureCall)
         a_def = SkmDefinition.new(position, arg_name, arg)
-        a_def.evaluate(aRuntime)
-        # $stderr.puts "LOCAL #{a_def.inspect}"
+        # $stderr.puts "Procedure call #{aProcedureCall.operator.inspect}"
+        # $stderr.puts "LOCAL #{arg_name.value} #{arg.inspect}"
+        if arg.kind_of?(SkmVariableReference) && !formal_names.include?(arg.value)
+          aRuntime.define(arg_name, a_def)
+        else
+          a_def.evaluate(aRuntime)
+        end
         break if index >= max_index
       end
     end

data/lib/skeem/skm_unary_expression.rb

@@ -88,13 +88,14 @@ module Skeem
 
   class SkmVariableReference  < SkmUnaryExpression
     alias variable child
-    
+
     def eqv?(other)
       child == other.child
     end
 
     def evaluate(aRuntime)
       var_key = variable.evaluate(aRuntime)
+      # $stderr.puts "Variable #{variable.inspect}"
       aRuntime.evaluate(var_key)
     end
 

data/lib/skeem/version.rb

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

data/spec/skeem/interpreter_spec.rb

@@ -621,6 +621,24 @@ SKEEM
         result = subject.run(source)
         expect(result.last.members).to eq([25])
       end
+
+      it 'should implement lambda that calls second-order functions' do
+        source = <<-SKEEM
+  (define twice
+    (lambda (x)
+      (* 2 x)))
+  (define compose
+    (lambda (f g)
+      (lambda (x)
+        (f (g x)))))
+  (define repeat
+    (lambda (f)
+      (compose f f)))
+  ((repeat twice) 5)
+SKEEM
+        result = subject.run(source)
+        expect(result.members.last).to eq(20)
+      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.27
+  version: 0.0.28
 platform: ruby
 authors:
 - Dimitri Geshef
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-03 00:00:00.000000000 Z
+date: 2018-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rley