skeem 0.2.08 → 0.2.09

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd3683235600881fa4fdbef83d8921aff335ee90388eef9f564b60e3d9217e49
-  data.tar.gz: 90c6402cc9f6367438ff8121741222edeab5712f747d3e498dc4a55c50f7047b
+  metadata.gz: a85fc0a12d54eedba56c28e18d728d00ff35044c029e1a256d4381a98c6310a8
+  data.tar.gz: 934cc810162a891fdddffdbfb16466ed7d7c71da8d7c5cb77670c010b5bf83fe
 SHA512:
-  metadata.gz: dc0e68b644a532d23a8dfac125a48cbb2cf6c13e83e051e7757bf516a80a0d2fc721ea8d85f50d00461d0fa90aaf3e9fac4536f4c2818fbf061ad35110b64288
-  data.tar.gz: 7c8ea63a8b08532d8112ae85d0ea93d8c999f87a92ed43e5e6e8e97e0f168de7a69bdaa2d3f72fe0b42f756c158d4e3bcdbb0897312a6ac8be160f657c5a3fa3
+  metadata.gz: 6dcdf9eb8d85abdcd4d2f416b9e9fa6ed1d9b399b92c9921ff59fb8dc6d6f047e5064fd7ccffde3ae000771079a0a7d9f64643e0585ba0c39b0566b345a5b994
+  data.tar.gz: 60347248374f6723c91edc3699b1306056b02bfc7a91a52e9dcfa15690f72294bf89cfd1ef8551218a6e67751bdde59f972c6ec1ea0e42733436d7caa5b26bac

data/CHANGELOG.md

@@ -1,3 +1,26 @@
+## [0.2.09] - 2019-06-10
+- New procedures: `complex?`, `exact-integer?`
+- Support for `#| ... |#` block comments (including nesting)
+
+### Added
+- File `base.skm`: Added integer number predicate `exact-integer?`
+- File `primitive_builder.rb`: Added numeric type predicate `complex?`
+- New method `Tokenizer#skip_block_comment` to handle "| ... |#" comments (including their nesting)
+- New folder `test_skeem` containing a test suite in `Skeem`
+
+### Changed
+- Method 'PrimitiveProcedure#do_call' whenever possible, the arguments are evaluated before executing the primitive.
+- File `primitive_builder.rb`: Lambda expression refactoring as most argument evaluations became redundant.
+- Method `Tokenizer#_next_token` numeric literals with only zero(es) in their fractional part are implicitly converted to integers `3.0` => 3 
+- Method `Tokenizer#skip_whitespaces` refactoring & detection of block comments 
+
+### Fixed
+- File `base.skm`: predicate `positive?` returned #t when argument was zero. Now: (positive? 0) returns #f as expected.
+
+### Removed
+- Empty method `PrimitiveBuilder#add_binding` removed.
+
+
 ## [0.2.08] - 2019-06-02
 - New standard procedures implemented: `assq`, `assv`
 

data/README.md

@@ -166,6 +166,10 @@ Here are a few pointers for the Scheme programming language:
 
 
 ## Currently implemented R7RS features
+### Comments
+- Semi-colon delimited comments: `; This comment stops at the end of line`
+- Block `#| ... |#` comments
+
 ### Data type literals
 - Booleans: `#t`, `#true`, `#f`, `#false`
 - Of the number hierarchy:  
@@ -246,7 +250,8 @@ This section lists the implemented standard procedures
 * `boolean?`, `and`, `or`,  `not`
 
 #### Numerical operations
-* Number-level: `number?`, `real?`, `integer?`, `zero?`, `+`, `-`, `*`, `/`, `=`, `square`, `number->string`
+* Number-level: `number?`, `complex?`, `real?`, `integer?`, `zero?`, `exact?`, `inexact?`, `exact-integer?` , `+`, `-`, `*`, `/`,
+`=`, `square`, `number->string`
 * Real-level: `positive?`, `negative?`, `<`, `>`, `<=`, `>=`, `abs`, `floor-remainder`
 * Integer-level: `even?`, `odd?`
 

data/lib/skeem/primitive/primitive_builder.rb

@@ -1,14 +1,12 @@
 require_relative 'primitive_procedure'
 require_relative '../datum_dsl'
 require_relative '../skm_pair'
-# require_relative '../s_expr_nodes'
 
 module Skeem
   module Primitive
     module PrimitiveBuilder
       include DatumDSL
       def add_primitives(aRuntime)
-        add_binding(aRuntime)
         add_arithmetic(aRuntime)
         add_comparison(aRuntime)
         add_number_procedures(aRuntime)
@@ -48,9 +46,6 @@ module Skeem
         SkmArity.new(1, '*')
       end
 
-      def add_binding(aRuntime)
-      end
-
       def add_arithmetic(aRuntime)
         create_plus(aRuntime)
         create_minus(aRuntime)
@@ -72,6 +67,7 @@ module Skeem
 
       def add_number_procedures(aRuntime)
         create_object_predicate(aRuntime, 'number?')
+        create_object_predicate(aRuntime, 'complex?')
         create_object_predicate(aRuntime, 'real?')
         create_object_predicate(aRuntime, 'integer?')
         create_object_predicate(aRuntime, 'exact?')
@@ -141,14 +137,13 @@ module Skeem
 
       def create_plus(aRuntime)
         # arglist should be a Ruby Array
-        primitive = ->(runtime, arglist) do
+        primitive = ->(_runtime, arglist) do
           if arglist.empty?
             integer(0)
           else
-            first_one = arglist.first.evaluate(runtime)
+            first_one = arglist.shift
             raw_result = first_one.value
-            operands = remaining_args(arglist, runtime)
-            operands.each { |elem| raw_result += elem.value }
+            arglist.each { |elem| raw_result += elem.value }
             to_datum(raw_result)
           end
         end
@@ -156,14 +151,12 @@ module Skeem
       end
 
       def create_minus(aRuntime)
-        primitive = ->(runtime, first_operand, arglist) do
-          first_one = first_operand.evaluate(runtime)
-          raw_result = first_one.value
+        primitive = ->(_runtime, first_operand, arglist) do
+          raw_result = first_operand.value
           if arglist.empty?
             raw_result = -raw_result
           else
-            operands = arglist.evaluate(runtime).to_a
-            operands.each { |elem| raw_result -= elem.value }
+            arglist.each { |elem| raw_result -= elem.value }
           end
           to_datum(raw_result)
         end
@@ -172,14 +165,13 @@ module Skeem
       end
 
       def create_multiply(aRuntime)
-        primitive = ->(runtime, arglist) do
+        primitive = ->(_runtime, arglist) do
           if arglist.empty?
             integer(1)
           else
-            first_one = arglist.first.evaluate(runtime)
+            first_one = arglist.shift
             raw_result = first_one.value
-            operands = remaining_args(arglist, runtime)
-            operands.each { |elem| raw_result *= elem.value }
+            arglist.each { |elem| raw_result *= elem.value }
             to_datum(raw_result)
           end
         end
@@ -188,14 +180,12 @@ module Skeem
 
 
       def create_divide(aRuntime)
-        primitive = ->(runtime, first_operand, arglist) do
-          first_one = first_operand.evaluate(runtime)
-          raw_result = first_one.value
+        primitive = ->(_runtime, first_operand, arglist) do
+          raw_result = first_operand.value
           if arglist.empty?
             raw_result = 1 / raw_result.to_f
           else
-            operands = arglist.evaluate(runtime).to_a
-            operands.each do |elem|
+            arglist.each do |elem|
               if raw_result > elem.value && raw_result.modulo(elem.value).zero?
                 raw_result /= elem.value
               else
@@ -211,9 +201,7 @@ module Skeem
       end
 
       def create_modulo(aRuntime)
-        primitive = ->(runtime, argument1, argument2) do
-          operand_1 = argument1.evaluate(runtime)
-          operand_2 = argument2.evaluate(runtime)
+        primitive = ->(_runtime, operand_1, operand_2) do
           raw_result = operand_1.value.modulo(operand_2.value)
           to_datum(raw_result)
         end
@@ -227,9 +215,7 @@ module Skeem
       end
 
       def create_eqv?(aRuntime)
-        primitive = ->(runtime, argument1, argument2) do
-          operand_1 = argument1.evaluate(runtime)
-          operand_2 = argument2.evaluate(runtime)
+        primitive = ->(runtime, operand_1, operand_2) do
           core_eqv?(operand_1, operand_2)
         end
 
@@ -242,9 +228,7 @@ module Skeem
       end
 
       def create_eq?(aRuntime)
-        primitive = ->(runtime, argument1, argument2) do
-          operand_1 = argument1.evaluate(runtime)
-          operand_2 = argument2.evaluate(runtime)
+        primitive = ->(_runtime, operand_1, operand_2) do
           core_eq?(operand1, operand2)
         end
 
@@ -252,9 +236,7 @@ module Skeem
       end
 
       def create_equal?(aRuntime)
-        primitive = ->(runtime, argument1, argument2) do
-          operand_1 = argument1.evaluate(runtime)
-          operand_2 = argument2.evaluate(runtime)
+        primitive = ->(_runtime, operand_1, operand_2) do
           raw_result = operand_1.skm_equal?(operand_2)
           boolean(raw_result)
         end
@@ -263,14 +245,12 @@ module Skeem
       end
 
       def create_equal(aRuntime)
-        primitive = ->(runtime, first_operand, arglist) do
-          first_one = first_operand.evaluate(runtime)
+        primitive = ->(_runtime, first_operand, arglist) do
           if arglist.empty?
             boolean(true)
           else
-            operands = arglist.evaluate(runtime).to_a
-            first_value = first_one.value
-            all_equal = operands.all? { |elem| first_value == elem.value }
+            first_value = first_operand.value
+            all_equal = arglist.all? { |elem| first_value == elem.value }
             boolean(all_equal)
           end
         end
@@ -279,82 +259,70 @@ module Skeem
       end
 
       def create_lt(aRuntime)
-        primitive = ->(runtime, first_operand, arglist) do
+        primitive = ->(_runtime, first_operand, arglist) do
           if arglist.empty?
-            boolean(false)
+            result = false
           else
-            operands = [first_operand.evaluate(runtime)]
-            operands.concat(arglist.evaluate(runtime).to_a)
-            result = true
-            operands.each_cons(2) do |(elem1, elem2)|
-              result &&= elem1.value < elem2.value
-            end
-            boolean(result)
+            result = primitive_comparison(:<, _runtime, first_operand, arglist)
           end
+          boolean(result)
         end
 
         define_primitive_proc(aRuntime, '<', one_or_more, primitive)
       end
 
       def create_gt(aRuntime)
-        primitive = ->(runtime, first_operand, arglist) do
+        primitive = ->(_runtime, first_operand, arglist) do
           if arglist.empty?
-            boolean(false)
+            result = false
           else
-            operands = [first_operand.evaluate(runtime)]
-            operands.concat(arglist.evaluate(runtime).to_a)
-            result = true
-            operands.each_cons(2) do |(elem1, elem2)|
-              result &&= elem1.value > elem2.value
-            end
-            boolean(result)
+            result = primitive_comparison(:>, _runtime, first_operand, arglist)
           end
+          boolean(result)
         end
 
         define_primitive_proc(aRuntime, '>', one_or_more, primitive)
       end
 
       def create_lte(aRuntime)
-        primitive = ->(runtime, first_operand, arglist) do
+        primitive = ->(_runtime, first_operand, arglist) do
           if arglist.empty?
-            boolean(true)
-          else
-            operands = [first_operand.evaluate(runtime)]
-            operands.concat(arglist.evaluate(runtime).to_a)
             result = true
-            operands.each_cons(2) do |(elem1, elem2)|
-              result &&= elem1.value <= elem2.value
-            end
-            boolean(result)
+          else
+            result = primitive_comparison(:<=, _runtime, first_operand, arglist)
           end
+          boolean(result)
         end
 
         define_primitive_proc(aRuntime, '<=', one_or_more, primitive)
       end
 
       def create_gte(aRuntime)
-        primitive = ->(runtime, first_operand, arglist) do
+        primitive = ->(_runtime, first_operand, arglist) do
           if arglist.empty?
-            boolean(true)
-          else
-            operands = [first_operand.evaluate(runtime)]
-            operands.concat(arglist.evaluate(runtime).to_a)
             result = true
-            operands.each_cons(2) do |(elem1, elem2)|
-              result &&= elem1.value >= elem2.value
-            end
-
-            boolean(result)
+          else
+            result = primitive_comparison(:>=, _runtime, first_operand, arglist)
           end
+          boolean(result)
         end
 
         define_primitive_proc(aRuntime, '>=', one_or_more, primitive)
       end
+      
+      def primitive_comparison(operator, _runtime, first_operand, arglist)
+        operands = [first_operand].concat(arglist)
+        result = true
+        operands.each_cons(2) do |(elem1, elem2)|
+          result &&= elem1.value.send(operator, elem2.value)
+        end
+
+        boolean(result)      
+      end
 
       def create_number2string(aRuntime)
         # TODO: add support for radix argument
-        primitive = ->(runtime, arg) do
-          arg_evaluated = arg.evaluate(runtime)
+        primitive = ->(_runtime, arg_evaluated) do
           check_argtype(arg_evaluated, SkmNumber, 'number', 'number->string')
           string(arg_evaluated.value)
         end
@@ -364,6 +332,7 @@ module Skeem
 
       def create_and(aRuntime)
         # arglist should be a Ruby Array
+        # Arguments aren't evaluated yet!...
         primitive = ->(runtime, arglist) do
           if arglist.empty?
             boolean(true) # in conformance with 4.2.1
@@ -389,6 +358,7 @@ module Skeem
 
       def create_or(aRuntime)
         # arglist should be a Ruby Array
+        # Arguments aren't evaluated yet!...
         primitive = ->(runtime, arglist) do
           if arglist.empty?
             boolean(false) # in conformance with 4.2.1
@@ -409,14 +379,12 @@ module Skeem
       end
 
       def create_string_equal(aRuntime)
-        primitive = ->(runtime, first_operand, arglist) do
-          first_one = first_operand.evaluate(runtime)
+        primitive = ->(_runtime, first_operand, arglist) do
           if arglist.empty?
             boolean(true)
           else
-            operands = evaluate_arguments(arglist, runtime)
-            first_value = first_one.value
-            all_equal = operands.all? { |elem| first_value == elem.value }
+            first_value = first_operand.value
+            all_equal = arglist.all? { |elem| first_value == elem.value }
             boolean(all_equal)
           end
         end
@@ -425,12 +393,11 @@ module Skeem
       end
 
       def create_string_append(aRuntime)
-        primitive = ->(runtime, arglist) do
+        primitive = ->(_runtime, arglist) do
           if arglist.empty?
             value = ''
           else
-            parts = evaluate_arguments(arglist, aRuntime)
-            value = parts.reduce('') { |interim, substr| interim << substr.value }
+            value = arglist.reduce('') { |interim, substr| interim << substr.value }
           end
 
           string(value)
@@ -440,8 +407,7 @@ module Skeem
       end
 
       def create_string_length(aRuntime)
-        primitive = ->(runtime, arg) do
-          arg_evaluated = arg.evaluate(runtime)
+        primitive = ->(runtime, arg_evaluated) do
           check_argtype(arg_evaluated, SkmString, 'string', 'string-length')
           integer(arg_evaluated.length)
         end
@@ -450,8 +416,7 @@ module Skeem
       end
 
       def create_string2symbol(aRuntime)
-        primitive = ->(runtime, arg) do
-          arg_evaluated = arg.evaluate(runtime)
+        primitive = ->(runtime, arg_evaluated) do
           check_argtype(arg_evaluated, SkmString, 'string', 'string->symbol')
           identifier(arg_evaluated)
         end
@@ -460,8 +425,7 @@ module Skeem
       end
 
       def create_symbol2string(aRuntime)
-        primitive = ->(runtime, arg) do
-          arg_evaluated = arg.evaluate(runtime)
+        primitive = ->(runtime, arg_evaluated) do
           check_argtype(arg_evaluated, SkmIdentifier, 'symbol', 'symbol->string')
           string(arg_evaluated)
         end
@@ -470,8 +434,7 @@ module Skeem
       end
 
       def create_car(aRuntime)
-        primitive = ->(runtime, arg) do
-          arg_evaluated = arg.evaluate(runtime)
+        primitive = ->(runtime, arg_evaluated) do
           check_argtype(arg_evaluated, SkmPair, 'pair', 'car')
           arg_evaluated.car
         end
@@ -480,8 +443,7 @@ module Skeem
       end
 
       def create_cdr(aRuntime)
-        primitive = ->(runtime, arg) do
-          arg_evaluated = arg.evaluate(runtime)
+        primitive = ->(_runtime, arg_evaluated) do
           check_argtype(arg_evaluated, SkmPair, 'pair', 'cdr')
           arg_evaluated.cdr
         end
@@ -490,16 +452,15 @@ module Skeem
       end
 
       def create_cons(aRuntime)
-        primitive = ->(runtime, obj1, obj2) do
-          SkmPair.new(obj1.evaluate(aRuntime), obj2.evaluate(aRuntime))
+        primitive = ->(_runtime, obj1, obj2) do
+          SkmPair.new(obj1, obj2)
         end
 
         define_primitive_proc(aRuntime, 'cons', binary, primitive)
       end
 
       def create_length(aRuntime)
-        primitive = ->(runtime, arg) do
-          arg_evaluated = arg.evaluate(runtime)
+        primitive = ->(_runtime, arg_evaluated) do
           check_argtype(arg_evaluated, [SkmPair, SkmEmptyList], 'list', 'length')
           integer(arg_evaluated.length)
         end
@@ -508,8 +469,7 @@ module Skeem
       end
 
       def create_list2vector(aRuntime)
-        primitive = ->(runtime, arg) do
-          arg_evaluated = arg.evaluate(runtime)
+        primitive = ->(_runtime, arg_evaluated) do
           check_argtype(arg_evaluated, [SkmPair, SkmEmptyList], 'list', 'list->vector')
           vector(arg_evaluated.to_a)
         end
@@ -555,6 +515,7 @@ module Skeem
       end
 
       def create_append(aRuntime)
+        # Arguments aren't evaluated yet!...
         primitive = ->(runtime, arglist) do
           if arglist.size > 1
             arguments = evaluate_arguments(arglist, aRuntime)
@@ -569,6 +530,7 @@ module Skeem
       end
 
       def create_setcar(aRuntime)
+        # Arguments aren't evaluated yet!...
         primitive = ->(runtime, pair_arg, obj_arg) do
           case pair_arg
             when SkmPair
@@ -593,6 +555,7 @@ module Skeem
       end
 
       def create_setcdr(aRuntime)
+        # Arguments aren't evaluated yet!...
         primitive = ->(runtime, pair_arg, obj_arg) do
           case pair_arg
             when SkmPair
@@ -620,7 +583,7 @@ module Skeem
         primitive = ->(runtime, obj_arg, alist_arg) do
           assoc_list = alist_arg.evaluate(runtime)
           check_assoc_list(assoc_list, 'assq')
-          obj = obj_arg.evaluate(runtime)          
+          obj = obj_arg.evaluate(runtime)
           result = boolean(false)
           unless assoc_list.empty?
             pair = assoc_list
@@ -638,12 +601,10 @@ module Skeem
         end
         define_primitive_proc(aRuntime, 'assq', binary, primitive)
       end
-      
+
       def create_assv(aRuntime)
-        primitive = ->(runtime, obj_arg, alist_arg) do
-          assoc_list = alist_arg.evaluate(runtime)
+        primitive = ->(runtime, obj, assoc_list) do
           check_assoc_list(assoc_list, 'assq')
-          obj = obj_arg.evaluate(runtime)          
           result = boolean(false)
           unless assoc_list.empty?
             pair = assoc_list
@@ -659,8 +620,8 @@ module Skeem
 
           result
         end
-        define_primitive_proc(aRuntime, 'assv', binary, primitive)      
-      end      
+        define_primitive_proc(aRuntime, 'assv', binary, primitive)
+      end
 
       def check_assoc_list(alist, proc_name)
         check_argtype(alist, [SkmPair, SkmEmptyList], 'association list', proc_name)
@@ -675,24 +636,16 @@ module Skeem
       end
 
       def create_list_copy(aRuntime)
-        primitive = ->(runtime, arg) do
-          arg_evaluated = arg.evaluate(runtime)
+        primitive = ->(runtime, arg_evaluated) do
           check_argtype(arg_evaluated, [SkmPair, SkmEmptyList], 'list', 'list-copy')
-          arg.klone
+          arg_evaluated.klone # Previously: arg.klone
         end
 
         define_primitive_proc(aRuntime, 'list-copy', unary, primitive)
       end
 
-
       def create_vector(aRuntime)
-        primitive = ->(runtime, arglist) do
-          if arglist.empty?
-            elements = []
-          else
-            elements = evaluate_arguments(arglist, aRuntime)
-          end
-
+        primitive = ->(_runtime, elements) do
           vector(elements)
         end
 
@@ -700,8 +653,7 @@ module Skeem
       end
 
       def create_vector_length(aRuntime)
-        primitive = ->(runtime, arg) do
-          arg_evaluated = arg.evaluate(runtime)
+        primitive = ->(_runtime, arg_evaluated) do
           check_argtype(arg_evaluated, SkmVector, 'vector', 'vector-length')
           integer(arg_evaluated.length)
         end
@@ -716,7 +668,7 @@ module Skeem
           if arglist.empty?
             filler = SkmUndefined.instance
           else
-            filler = arglist.car.evaluate(runtime)
+            filler = arglist.first.evaluate(runtime)
           end
           elements = Array.new(count.value, filler)
 
@@ -728,10 +680,8 @@ module Skeem
 
       def create_vector_ref(aRuntime)
           # argument 1: a vector, argument 2: an index(integer)
-          primitive = ->(runtime, aVector, anIndex) do
-          vector = aVector.evaluate(runtime)
+          primitive = ->(runtime, vector, index) do
           check_argtype(vector, SkmVector, 'vector', 'vector-ref')
-          index = anIndex.evaluate(runtime)
           check_argtype(index, SkmInteger, 'integer', 'vector-ref')
           # TODO: index checking
           raw_result = vector.members[index.value]
@@ -742,8 +692,7 @@ module Skeem
       end
 
       def create_vector2list(aRuntime)
-        primitive = ->(runtime, arg) do
-          arg_evaluated = arg.evaluate(runtime)
+        primitive = ->(runtime, arg_evaluated) do
           check_argtype(arg_evaluated, SkmVector, 'vector', 'vector->list')
           SkmPair.create_from_a(arg_evaluated.members)
         end
@@ -752,13 +701,11 @@ module Skeem
       end
 
       def create_apply(aRuntime)
-        primitive = ->(runtime, first_operand, arglist) do
-          proc_arg = first_operand.evaluate(runtime)
+        primitive = ->(runtime, proc_arg, arglist) do
           if arglist.empty?
             result = SkmEmptyList.instance
           else
-            arguments = evaluate_arguments(arglist, runtime)
-            single_list = append_core(arguments)
+            single_list = append_core(arglist)
             invoke = ProcedureCall.new(nil, proc_arg, single_list.to_a)
             result = invoke.evaluate(runtime)
           end
@@ -768,13 +715,11 @@ module Skeem
       end
 
       def create_map(aRuntime)
-        primitive = ->(runtime, first_operand, list_of_lists) do
-          proc_arg = first_operand.evaluate(runtime)
-          if list_of_lists.empty?
+        primitive = ->(runtime, proc_arg, arglist) do
+          if arglist.empty?
             result = SkmEmptyList.instance
           else
-            arguments = evaluate_arguments(list_of_lists, runtime)
-            curr_cells = arguments.to_a
+            curr_cells = arglist
             arity = curr_cells.size
             initial_result = nil
             curr_result = nil
@@ -813,14 +758,13 @@ module Skeem
       end
 
       def create_test_assert(aRuntime)
-        primitive = ->(runtime, arg) do
-          arg_evaluated = arg.evaluate(runtime)
+        primitive = ->(runtime, arg_evaluated) do
           if arg_evaluated.boolean? && arg_evaluated.value == false
             assert_call = aRuntime.caller
             pos = assert_call.call_site
             # Error: assertion failed: (> 1 2)
             msg1 = "assertion failed on line #{pos.line}, column #{pos.column}"
-            msg2 = ", with #{arg.inspect}"
+            msg2 = ", with #{arg_evaluated.inspect}"
             raise StandardError, 'Error: ' + msg1 + msg2
           else
             boolean(true)
@@ -843,8 +787,7 @@ module Skeem
       # DON'T USE IT
       # Non-standard procedure reserved for internal testing/debugging purposes.
       def create_inspect(aRuntime)
-        primitive = ->(runtime, arg) do
-          arg_evaluated = arg.evaluate(runtime)
+        primitive = ->(runtime, arg_evaluated) do
           $stderr.puts 'INSPECT>' + arg_evaluated.inspect
           Skeem::SkmUndefined.instance
         end
@@ -853,21 +796,13 @@ module Skeem
 
       def create_object_predicate(aRuntime, predicate_name, msg_name = nil)
         msg_name = predicate_name if msg_name.nil?
-        primitive = ->(runtime, arg) do
-          arg_evaluated = arg.evaluate(runtime)
+        primitive = ->(runtime, arg_evaluated) do
           to_datum(arg_evaluated.send(msg_name))
         end
 
         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 define_primitive_proc(aRuntime, anIdentifier, anArity, aRubyLambda)
         primitive = PrimitiveProcedure.new(anIdentifier, anArity, aRubyLambda)
         @primitive_map = {} unless @primitives_map

data/lib/skeem/primitive/primitive_procedure.rb

@@ -114,19 +114,35 @@ module Skeem
           result = code.call(aRuntime)
         elsif arity.variadic? || (arity.low < arity.high)
           if arity.low.zero?
-            result = code.call(aRuntime, operands)
+            if ['and', 'or', 'append'].include? identifier
+              # Defer the evaluation of arguments to the primitive
+              result = code.call(aRuntime, operands)
+            else
+              evaluated_args = operands.map {|opernd| opernd.evaluate(aRuntime) }
+              result = code.call(aRuntime, evaluated_args)
+            end
           else
-            arguments = []
-            arguments << operands.take(arity.low).flatten
+            # require 'debug'
+            args = operands.take(arity.low)
+            args.map! { |arg| arg.evaluate(aRuntime) } unless args.empty?
             count_delta = operands.size - arity.low
-            arguments << SkmPair.create_from_a(operands.slice(-count_delta, count_delta))
+            remaining = operands.slice(-count_delta, count_delta).map do |arg|
+              arg.evaluate(aRuntime)
+            end
+            args << remaining.flatten
             # p operands.size
             # p count_delta
-            # p arguments.inspect
-            result = code.send(:call, aRuntime, *arguments.flatten)
+            # p args.inspect
+            result = code.send(:call, aRuntime, *args)
           end
         else # Fixed arity...
-          result = code.send(:call, aRuntime, *operands)
+          if identifier == 'set-car!' || identifier == 'set-cdr!'
+            # Defer evaluation inside the primitive
+            result = code.send(:call, aRuntime, *operands)
+          else
+            evaluated_args = operands.map {|opernd| opernd.evaluate(aRuntime) }
+            result = code.send(:call, aRuntime, *evaluated_args)          
+          end
         end
 
         result

data/lib/skeem/skm_simple_datum.rb

@@ -97,6 +97,10 @@ module Skeem
     def number?
       true
     end
+    
+    def complex?
+      false
+    end
 
     def eqv?(other)
       return true if self.equal?(other)
@@ -119,6 +123,10 @@ module Skeem
     def real?
       true
     end
+    
+    def complex?
+      true
+    end
 
     def exact?
       false

data/lib/skeem/standard/base.skm

@@ -1,7 +1,14 @@
 ; Standard R7RS procedures from section 6.2.6
 
-; (zero? z)
-; Returns true iff z is zero
+;; (exact-integer? z)
+(define exact-integer?
+  (lambda (z)
+    (and 
+      (exact? z)
+      (integer? z)))) 
+
+;; (zero? z)
+;; Returns true iff z is zero
 (define zero?
   (lambda (z)
     (if (= z 0)
@@ -9,10 +16,10 @@
       #f)))
 
 ; (positive? x)      
-; Return true if x greater or equal to zero; false otherwise
+; Return true if x greater than zero; false otherwise
 (define positive?
   (lambda (x)
-    (if (>= x 0)
+    (if (> x 0)
       #t
       #f)))
 
@@ -105,7 +112,7 @@
 ;; (test-eqv expected test-expr)
 (define test-eqv 
   (lambda (x y) 
-    (test-assert (equal? x y))))
+    (test-assert (eqv? x y))))
 
 ;; Test the equality (with equal? predicate) between an expected value and
 ;; an expression

data/lib/skeem/tokenizer.rb

@@ -92,10 +92,10 @@ module Skeem
       elsif (lexeme = scanner.scan(/(?:,@?)|(?:=>)/))
         token = build_token(@@lexeme2name[lexeme], lexeme)
       elsif (lexeme = scanner.scan(/#(?:(?:true)|(?:false)|(?:u8)|[\\\(tfeiodx]|(?:\d+[=#]))/))
-        token = cardinal_token(lexeme)        
-      elsif (lexeme = scanner.scan(/[+-]?[0-9]+(?=\s|[|()";]|$)/))
+        token = cardinal_token(lexeme)
+      elsif (lexeme = scanner.scan(/[+-]?[0-9]+(?:.0+)?(?=\s|[|()";]|$)/))
         token = build_token('INTEGER', lexeme) # Decimal radix
-      elsif (lexeme = scanner.scan(/[+-]?[0-9]+(?:\.[0-9]+)?(?:(?:e|E)[+-]?[0-9]+)?/))
+      elsif (lexeme = scanner.scan(/[+-]?[0-9]+(?:\.[0-9]*)?(?:(?:e|E)[+-]?[0-9]+)?/))
         # Order dependency: must be tested after INTEGER case
         token = build_token('REAL', lexeme)
       elsif (lexeme = scanner.scan(/"(?:\\"|[^"])*"/)) # Double quotes literal?
@@ -124,7 +124,7 @@ module Skeem
 
       return token
     end
-    
+
 =begin
 #t #f These are the boolean constants (section 6.3), along
 with the alternatives #true and #false.
@@ -138,7 +138,7 @@ numbers (section 6.2.5).
 #<n>= #<n># These are used for labeling and referencing
 other literal data (section 2.4).
         # token = build_token('BOOLEAN', lexeme)
-=end    
+=end
     def cardinal_token(aLexeme)
       case aLexeme
       when /^#true|false|t|f$/
@@ -146,7 +146,7 @@ other literal data (section 2.4).
       when '#('
         token = build_token(@@lexeme2name[aLexeme], aLexeme)
       end
-      
+
       return token
     end
 
@@ -175,7 +175,7 @@ other literal data (section 2.4).
       when 'STRING_LIT'
         value = to_string(aLexeme, aFormat)
       when 'IDENTIFIER'
-        value = to_identifier(aLexeme, aFormat)        
+        value = to_identifier(aLexeme, aFormat)
       else
         value = aLexeme
       end
@@ -204,7 +204,7 @@ other literal data (section 2.4).
 
       return value
     end
-    
+
     def to_string(aLexeme, aFormat)
       case aFormat
       when :default
@@ -212,7 +212,7 @@ other literal data (section 2.4).
       end
 
       return value
-    end  
+    end
 
     def to_identifier(aLexeme, aFormat)
       case aFormat
@@ -221,26 +221,27 @@ other literal data (section 2.4).
       end
 
       return value
-    end     
-    
+    end
+
     def skip_whitespaces
       pre_pos = scanner.pos
 
       loop do
-        ws_found = false
-        cmt_found = false
-        found = scanner.skip(/[ \t\f]+/)
-        ws_found = true if found
-        found = scanner.skip(/(?:\r\n)|\r|\n/)
-        if found
+        ws_found = scanner.skip(/[ \t\f]+/) ? true : false
+        nl_found = scanner.skip(/(?:\r\n)|\r|\n/)
+        if nl_found
           ws_found = true
           next_line
         end
+        cmt_found = false
         next_ch = scanner.peek(1)
         if next_ch == ';'
           cmt_found = true
           scanner.skip(/;[^\r\n]*(?:(?:\r\n)|\r|\n)?/)
           next_line
+        elsif scanner.peek(2) == '#|'
+          skip_block_comment
+          next
         end
         break unless ws_found or cmt_found
       end
@@ -248,7 +249,28 @@ other literal data (section 2.4).
       curr_pos = scanner.pos
       return if curr_pos == pre_pos
     end
-    
+
+    def skip_block_comment()
+      # require 'debug'
+      scanner.skip(/#\|/)
+      nesting_level = 1
+      loop do
+        comment_part = scanner.scan_until(/(?:\|\#)|(?:\#\|)|(?:(?:\r\n)|\r|\n)/)
+        unless comment_part
+          raise ScanError, "Unterminated '#| ... |#' comment on line #{lineno}"
+        end
+        case scanner.matched
+          when /(?:(?:\r\n)|\r|\n)/
+            next_line
+          when '|#'
+            nesting_level -= 1
+            break if nesting_level.zero?
+          when '#|'
+            nesting_level += 1
+        end
+      end
+    end
+
     def next_line
       @lineno += 1
       @line_start = scanner.pos

data/lib/skeem/version.rb

@@ -1,3 +1,3 @@
 module Skeem
-  VERSION = '0.2.08'.freeze
+  VERSION = '0.2.09'.freeze
 end

data/spec/skeem/interpreter_spec.rb

@@ -664,23 +664,8 @@ SKEEM
         checks = [
           ['(positive? 3.1)', true],
           ['(positive? -3.1)', false],
-          ['(positive? 0)', true],
-          ['(positive? 0.0)', true],
-          ['(positive? 3)', true],
-          ['(positive? -3)', false]
-        ]
-        checks.each do |(skeem_expr, expectation)|
-          result = subject.run(skeem_expr)
-          expect(result).to eq(expectation)
-        end
-      end
-
-      it 'should implement the positive? predicate' do
-        checks = [
-          ['(positive? 3.1)', true],
-          ['(positive? -3.1)', false],
-          ['(positive? 0)', true],
-          ['(positive? 0.0)', true],
+          ['(positive? 0)', false],
+          ['(positive? 0.0)', false],
           ['(positive? 3)', true],
           ['(positive? -3)', false]
         ]

data/spec/skeem/primitive/primitive_builder_spec.rb

@@ -100,7 +100,7 @@ SKEEM
             ["(eqv? 'a 'a)", true],
             ["(eqv? 'a 'b)", false],
             ['(eqv? 2 2)', true],
-            ['(eqv? 2 2.0)', false],
+            ['(eqv? 2 2.0)', true],
             ['(eqv? 3 2)', false],
             ["(eqv? '() '())", true],
             ['(eqv? 100000000 100000000)', true],

data/spec/skeem/primitive/primitive_procedure_spec.rb

@@ -146,7 +146,8 @@ module Skeem
           no_arg = []
           expect(pproc.call(rtime, no_arg)).to eq(0)
 
-          many = ['foo', 'bar', 'quux']
+          many = [SkmString.create('foo'), SkmString.create('bar'), 
+            SkmString.create('quux')]
           expect( pproc.call(rtime, many)).to eq(3)
         end
       end # context

data/spec/skeem/tokenizer_spec.rb

@@ -69,6 +69,7 @@ module Skeem
           [' 3', 3],
           ['+3 ', +3],
           ['-3', -3],
+          ['-3.0', -3],
           ['-1234', -1234]
         ]
 
@@ -167,7 +168,7 @@ module Skeem
       end
     end
 
-    context 'Semi-colon comments:' do
+    context 'Comments:' do
       it 'should skip heading comments' do
         input = "; Starting comment\n \"Some text\""
         subject.reinitialize(input)
@@ -197,6 +198,32 @@ module Skeem
         expect(token.terminal).to eq('STRING_LIT')
         expect(token.lexeme).to eq('Second text')
       end
+
+      it 'should skip block comments' do
+        input = '"First text" #| Middle comment |# "Second text"'
+        subject.reinitialize(input)
+        tokens = subject.tokens
+        expect(tokens.size).to eq(2)
+        token = tokens[0]
+        expect(token.terminal).to eq('STRING_LIT')
+        expect(token.lexeme).to eq('First text')
+        token = tokens[1]
+        expect(token.terminal).to eq('STRING_LIT')
+        expect(token.lexeme).to eq('Second text')
+      end
+      
+      it 'should cope with nested block comments' do
+        input = '"First text" #| One #| Two |# comment #| Three |# |# "Second text"'
+        subject.reinitialize(input)
+        tokens = subject.tokens
+        expect(tokens.size).to eq(2)
+        token = tokens[0]
+        expect(token.terminal).to eq('STRING_LIT')
+        expect(token.lexeme).to eq('First text')
+        token = tokens[1]
+        expect(token.terminal).to eq('STRING_LIT')
+        expect(token.lexeme).to eq('Second text')
+      end      
     end
 
     context 'Scanning Scheme sample code' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skeem
 version: !ruby/object:Gem::Version
-  version: 0.2.08
+  version: 0.2.09
 platform: ruby
 authors:
 - Dimitri Geshef
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-02 00:00:00.000000000 Z
+date: 2019-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rley