skeem 0.2.06 → 0.2.07

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f14377aa793138a9eb14281b8f72ea29a8008da684b5d462c0060f635b2b5a9b
-  data.tar.gz: 2e37d741b3a156c4dabf20138cc604db4e9fb59dd78e2a8b518ad59566c2ecb5
+  metadata.gz: 3dd3d2443ae53822f3ebf6f0ce042b52455fff6592bd8aa26e91e4ac548c2c87
+  data.tar.gz: 8eb8851aa0bf2b643949c1dd21284178a83891982eff75cffc1ec10ab1fbe537
 SHA512:
-  metadata.gz: 45a19a92c4c3e9b7033edebb197af870b20cd139db4246d14c6e9d9520105f6057435a60bdef2ad39466fa86b5179404cd19b79a604f70ea7d30abfc6ea80803
-  data.tar.gz: 5ecb615aef9290a912919272c6f47f372b2b9b990a3867f66205fcc2cf21005c2b0d7cfc38479dad9137c142969d36b7b856ded9cd297a426a0c6ba1f8ea0e64
+  metadata.gz: ebe0ba16a14e6c08638c63fabb83a38cd001914277a58bada5419020f92fbd83bfe7ad382ffa1bb44bb6307175f34108a407e60401f0c5657f11d484c97973aa
+  data.tar.gz: 4d61121cce897e2d4c4a6d3cb2b070522aa32785e76c18059cd86d6150bcd5e3d6ac6eb6c4bd2e1531dde19448341c938dc88b0d0722fd3ed1a6d605c7112344

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## [0.2.07] - 2019-05-31
+- New standard procedures implemented: `list-copy`, `procedure?`, `apply` and `map`
+
+### Added
+- File `primitive_builder.rb`. New methods for implementing `list-copy`, `procedure?`, `apply` and `map`
+
+### Changed
+- File `README.md` Added mentions to new procedures. 
+
 ## [0.2.06] - 2019-05-30
 - NEW Special `cond` (= condional) form implemented. Supports `else` alternative and arrow (=>) syntax.
 - FIX Corner case in procedure `append`.

data/README.md

@@ -160,7 +160,6 @@ Here are a few pointers for the Scheme programming language:
     (signum -3)
   SKEEM
 
-  # Ask Ruby to execute Scheme code
   result = schemer.run(scheme_code)
   puts result.value # => -1
 ```
@@ -187,6 +186,7 @@ Here are a few pointers for the Scheme programming language:
 - Conditionals (if, cond)
 - Definitions
 - Assignments
+- Control procedures
 
 ### Standard syntactic forms
 #### define  
@@ -251,7 +251,7 @@ This section lists the implemented standard procedures
 * Integer-level: `even?`, `odd?`
 
 #### List procedures
-* `list?`, `null?`, `pair?`, `append`, `car`, `cdr`, `caar`, `cadr`, `cdar`, `cddr`,  `cons`,  `length`, `list`, `list->vector`, `set-car!`, `set-cdr!`
+* `list?`, `null?`, `pair?`, `append`, `car`, `cdr`, `caar`, `cadr`, `cdar`, `cddr`,  `cons`,  `length`, `list`, `list-copy`, `list->vector`, `set-car!`, `set-cdr!`
 
 #### String procedures
 * `string?`, `string=?`,  `string-append`, `string-length`, `string->symbol`
@@ -262,6 +262,9 @@ This section lists the implemented standard procedures
 #### Vector procedures
 * `vector?`, `make-vector`, `vector`, `vector-length`, `vector-set!`, `vector->list`
 
+#### Control procedures
+* `procedure?`, `apply`, `map`
+
 #### Input/output procedures
 * `newline`
 

data/lib/skeem/primitive/primitive_builder.rb

@@ -17,6 +17,7 @@ module Skeem
         add_symbol_procedures(aRuntime)
         add_list_procedures(aRuntime)
         add_vector_procedures(aRuntime)
+        add_control_procedures(aRuntime)
         add_io_procedures(aRuntime)
         add_special_procedures(aRuntime)
       end
@@ -41,8 +42,8 @@ module Skeem
 
       def one_or_two
         SkmArity.new(1, 2)
-      end      
-      
+      end
+
       def one_or_more
         SkmArity.new(1, '*')
       end
@@ -107,6 +108,9 @@ module Skeem
         create_append(aRuntime)
         create_setcar(aRuntime)
         create_setcdr(aRuntime)
+        create_assq(aRuntime)
+        create_assv(aRuntime)
+        create_list_copy(aRuntime)
       end
 
       def add_vector_procedures(aRuntime)
@@ -118,6 +122,12 @@ module Skeem
         create_vector2list(aRuntime)
       end
 
+      def add_control_procedures(aRuntime)
+        create_object_predicate(aRuntime, 'procedure?')
+        create_apply(aRuntime)
+        create_map(aRuntime)
+      end
+
       def add_io_procedures(aRuntime)(aRuntime)
         create_newline(aRuntime)
       end
@@ -486,46 +496,55 @@ module Skeem
 
         define_primitive_proc(aRuntime, 'list->vector', unary, primitive)
       end
-      
-      def create_append(aRuntime)
-        primitive = ->(runtime, arglist) do
-          if arglist.empty?
-            result = SkmEmptyList.instance
-          elsif arglist.size == 1
-            result = arglist[0]
-          else
-            parts = evaluate_arguments(arglist, aRuntime)
-            but_last = parts.take(parts.length - 1)
-            check_arguments(but_last, [SkmPair, SkmEmptyList], 'list', 'append')
-            result = parts.shift.klone  # First list is taken 
-            parts.each do |arg|
-              case arg
-                when SkmPair
-                  cloned = arg.klone
-                  if result.kind_of?(SkmEmptyList)
-                    result = cloned
-                  else
-                    if result.kind_of?(SkmEmptyList)
-                      result = SkmPair.new(arg, SkmEmptyList.instance)
-                    else
-                      result.append_list(cloned)
-                    end
-                  end
-                when SkmEmptyList
-                  # Do nothing
+
+      def append_core(arglist)
+        if arglist.empty?
+          result = SkmEmptyList.instance
+        elsif arglist.size == 1
+          result = arglist[0]
+        else
+          but_last = arglist.take(arglist.length - 1)
+          check_arguments(but_last, [SkmPair, SkmEmptyList], 'list', 'append')
+          result = arglist.shift.klone  # First list is taken
+          arglist.each do |arg|
+            case arg
+              when SkmPair
+                cloned = arg.klone
+                if result.kind_of?(SkmEmptyList)
+                  result = cloned
                 else
                   if result.kind_of?(SkmEmptyList)
-                    result = arg
+                    result = SkmPair.new(arg, SkmEmptyList.instance)
                   else
-                    result.append(arg)
+                    result.append_list(cloned)
                   end
-              end
+                end
+              when SkmEmptyList
+                # Do nothing
+              else
+                if result.kind_of?(SkmEmptyList)
+                  result = arg
+                else
+                  result.append(arg)
+                end
             end
           end
+        end
+
+        result
+      end
+
+      def create_append(aRuntime)
+        primitive = ->(runtime, arglist) do
+          if arglist.size > 1
+            arguments = evaluate_arguments(arglist, aRuntime)
+          else
+            arguments = arglist
+          end
+
+          append_core(arguments)
+        end
 
-          result
-        end      
-      
         define_primitive_proc(aRuntime, 'append', zero_or_more, primitive)
       end
 
@@ -577,6 +596,47 @@ module Skeem
         define_primitive_proc(aRuntime, 'set-cdr!', binary, primitive)
       end
 
+        # create_assv(aRuntime)
+      def create_assq(aRuntime)
+        primitive = ->(runtime, obj_arg, alist_arg) do
+          # assoc_list = alist_arg.evaluate(runtime)
+          # check_assoc_list(assoc_list, 'assq')
+          # result = boolean(false)
+          # pair = assoc_list
+          # while (pair.cdr && (pair.cdr.kind_of?(SkmPair)) do
+            # are_equal = @primitive_map['equal?'].call(runtime, pair.car, obj_arg)
+            # if are_equal
+              # result = pair
+              # break
+            # else
+              # pair = pair.cdr
+            # end
+          # end
+
+          # result
+        end
+        define_primitive_proc(aRuntime, 'assq', binary, primitive)
+      end
+
+      def check_assoc_list(alist, proc_name)
+        check_argtype(alist, SkmPair, 'association list', 'proc_name')
+      end
+
+      def create_assv(aRuntime)
+      end
+
+
+      def create_list_copy(aRuntime)
+        primitive = ->(runtime, arg) do
+          arg_evaluated = arg.evaluate(runtime)
+          check_argtype(arg_evaluated, [SkmPair, SkmEmptyList], 'list', 'list-copy')
+          arg.klone
+        end
+
+        define_primitive_proc(aRuntime, 'list-copy', unary, primitive)
+      end
+
+
       def create_vector(aRuntime)
         primitive = ->(runtime, arglist) do
           if arglist.empty?
@@ -600,7 +660,7 @@ module Skeem
 
         define_primitive_proc(aRuntime, 'vector-length', unary, primitive)
       end
-      
+
       def create_make_vector(aRuntime)
         primitive = ->(runtime, count_arg, arglist) do
           count = count_arg.evaluate(runtime)
@@ -612,11 +672,11 @@ module Skeem
           end
           elements = Array.new(count.value, filler)
 
-          vector(elements)      
+          vector(elements)
         end
 
         define_primitive_proc(aRuntime, 'make-vector', one_or_two, primitive)
-      end      
+      end
 
       def create_vector_ref(aRuntime)
           # argument 1: a vector, argument 2: an index(integer)
@@ -643,6 +703,58 @@ module Skeem
         define_primitive_proc(aRuntime, 'vector->list', unary, primitive)
       end
 
+      def create_apply(aRuntime)
+        primitive = ->(runtime, first_operand, arglist) do
+          proc_arg = first_operand.evaluate(runtime)
+          if arglist.empty?
+            result = SkmEmptyList.instance
+          else
+            arguments = evaluate_arguments(arglist, runtime)
+            single_list = append_core(arguments)
+            invoke = ProcedureCall.new(nil, proc_arg, single_list.to_a)
+            result = invoke.evaluate(runtime)
+          end
+        end
+
+        define_primitive_proc(aRuntime, 'apply', one_or_more, primitive)
+      end
+
+      def create_map(aRuntime)
+        primitive = ->(runtime, first_operand, list_of_lists) do
+          proc_arg = first_operand.evaluate(runtime)
+          if list_of_lists.empty?
+            result = SkmEmptyList.instance
+          else
+            arguments = evaluate_arguments(list_of_lists, runtime)
+            curr_cells = arguments.to_a
+            arity = curr_cells.size
+            initial_result = nil
+            curr_result = nil
+            loop do
+              call_args = curr_cells.map(&:car)
+              invoke = ProcedureCall.new(nil, proc_arg, call_args)
+              call_result = invoke.evaluate(runtime)
+              new_result = SkmPair.new(call_result, SkmEmptyList.instance)
+              if initial_result
+                curr_result.cdr = new_result
+              else
+                initial_result = new_result
+              end
+              curr_result = new_result
+
+              curr_cells.map!(&:cdr)
+              break if curr_cells.find { |cdr_entry| ! cdr_entry.kind_of?(SkmPair) }
+            end
+
+            result = initial_result
+          end
+
+          result
+        end
+
+        define_primitive_proc(aRuntime, 'map', one_or_more, primitive)
+      end
+
       def create_newline(aRuntime)
         primitive = ->(runtime) do
           # @TODO: make output stream configurable
@@ -671,7 +783,7 @@ module Skeem
       end
 
       # DON'T USE IT
-      # Non-standard procedure reserved for internal testing/debugging purposes.      
+      # Non-standard procedure reserved for internal testing/debugging purposes.
       def create_debug(aRuntime)
         primitive = ->(runtime) do
           require 'debug'
@@ -679,7 +791,7 @@ module Skeem
 
         define_primitive_proc(aRuntime, 'debug', nullary, primitive)
       end
-      
+
       # DON'T USE IT
       # Non-standard procedure reserved for internal testing/debugging purposes.
       def create_inspect(aRuntime)
@@ -688,7 +800,7 @@ module Skeem
           $stderr.puts 'INSPECT>' + arg_evaluated.inspect
           Skeem::SkmUndefined.instance
         end
-        define_primitive_proc(aRuntime, '_inspect', unary, primitive)      
+        define_primitive_proc(aRuntime, '_inspect', unary, primitive)
       end
 
       def create_object_predicate(aRuntime, predicate_name, msg_name = nil)
@@ -701,15 +813,17 @@ module Skeem
         define_primitive_proc(aRuntime, predicate_name, unary, primitive)
       end
 
-      def def_procedure(aRuntime, pairs)
-        pairs.each_slice(2) do |(name, code)|
-          func = PrimitiveProcedure.new(name, code)
-          define(aRuntime, func.identifier, func)
-        end
-      end
+      # def def_procedure(aRuntime, pairs)
+        # pairs.each_slice(2) do |(name, code)|
+          # func = PrimitiveProcedure.new(name, code)
+          # define(aRuntime, func.identifier, func)
+        # end
+      # end
 
       def define_primitive_proc(aRuntime, anIdentifier, anArity, aRubyLambda)
         primitive = PrimitiveProcedure.new(anIdentifier, anArity, aRubyLambda)
+        @primitive_map = {} unless @primitives_map
+        @primitive_map[primitive.identifier] = primitive.code
         define(aRuntime, primitive.identifier, primitive)
       end
 
@@ -725,7 +839,7 @@ module Skeem
           arglist.evaluate(aRuntime).to_a
         end
       end
-      
+
       def check_arguments(arguments, requiredRubyClass, requiredSkmType, aProcName)
         arguments.each do |argument|
           if requiredRubyClass.kind_of?(Array)
@@ -738,7 +852,7 @@ module Skeem
             end
           end
         end
-      end 
+      end
 
       def check_argtype(argument, requiredRubyClass, requiredSkmType, aProcName)
         if requiredRubyClass.kind_of?(Array)

data/lib/skeem/primitive/primitive_procedure.rb

@@ -17,6 +17,10 @@ module Skeem
       def callable?
         true
       end
+      
+      def procedure?
+        true
+      end
 
       # This method should be invoked when the procedure isn't
       # explicitly called (with arguments). In this case, the name

data/lib/skeem/s_expr_nodes.rb

@@ -384,6 +384,10 @@ module Skeem
     def callable?
       true
     end
+    
+    def procedure?
+      true
+    end
 
     def call(aRuntime, theActuals)
       set_cond_environment(aRuntime.environment) # Last chance for anonymous lambda
@@ -536,6 +540,10 @@ require_relative 'skm_procedure_exec'
     def callable?
       true
     end
+    
+    def procedure?
+      true
+    end    
 =begin
   TODO
     def quasiquote(aRuntime)

data/lib/skeem/skm_element.rb

@@ -44,6 +44,10 @@ module Skeem
     def pair?
       false
     end
+    
+    def procedure?
+      false
+    end
 
     def vector?
       false

data/lib/skeem/version.rb

@@ -1,3 +1,3 @@
 module Skeem
-  VERSION = '0.2.06'.freeze
+  VERSION = '0.2.07'.freeze
 end

data/spec/skeem/primitive/primitive_builder_spec.rb

@@ -633,6 +633,28 @@ SKEEM
           result = subject.run(source)
           expect(result.last.cdr).to eq(1)
         end
+
+        it 'should implement the list-copy procedure' do
+          checks = [
+            ["(list-copy '())", []],
+            ["(list-copy '(a b c))", ['a', 'b', 'c']]
+          ]
+          checks.each do |(skeem_expr, expectation)|
+            result = subject.run(skeem_expr)
+            expect(result.to_a).to eq(expectation)
+          end
+
+          source =<<-SKEEM
+  (define a '(1 8 2 8)) ; a may be immutable
+  (define b (list-copy a))
+  (set-car! b 3) ; b is mutable
+SKEEM
+          subject.run(source)
+          result = subject.run('b')
+          expect(result.to_a).to eq([3, 8, 2, 8])
+          result = subject.run('a')
+          expect(result.to_a).to eq([1, 8, 2, 8])
+        end
       end # context
 
       context 'Vector procedures:' do
@@ -709,6 +731,42 @@ SKEEM
         end
       end # context
 
+      context 'Control procedures:' do
+        it 'should implement the procedure? predicate' do
+          checks = [
+            ["(procedure? car)", true],
+            ["(procedure? 'car)", false],
+            ["(procedure? (lambda (x) (* x x)))", true],
+            # ["(procedure? '(lambda (x) (* x x)))", false] # Parse failure!
+          ]
+          checks.each do |(skeem_expr, expectation)|
+            result = subject.run(skeem_expr)
+            expect(result).to eq(expectation)
+          end
+        end
+
+        it 'should implement the apply procedure' do
+          checks = [
+            ["(apply + '(3 4))", 7]
+          ]
+          checks.each do |(skeem_expr, expectation)|
+            result = subject.run(skeem_expr)
+            expect(result).to eq(expectation)
+          end
+        end
+        
+        it 'should implement the map procedure' do
+          checks = [
+            ["(map car '((a b) (d e) (g h)))", ['a', 'd', 'g']],
+            ["(map + '(1 2 3) '(4 5 6 7))", [5, 7, 9]]
+          ]
+          checks.each do |(skeem_expr, expectation)|
+            result = subject.run(skeem_expr)
+            expect(result.to_a).to eq(expectation)
+          end
+        end        
+      end # context
+
       context 'IO procedures:' do
         it 'should implement the newline procedure' do
           default_stdout = $stdout

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skeem
 version: !ruby/object:Gem::Version
-  version: 0.2.06
+  version: 0.2.07
 platform: ruby
 authors:
 - Dimitri Geshef
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-30 00:00:00.000000000 Z
+date: 2019-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rley