skeem 0.2.15 → 0.2.16

data/lib/skeem/interpreter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'parser'
 require_relative 'skm_frame'
 require_relative 'runtime'
@@ -9,7 +11,7 @@ module Skeem
     attr_reader(:parser)
     attr_reader(:runtime)
 
-    def initialize(&aBlock)
+    def initialize
       @runtime = Runtime.new(SkmFrame.new)
       @parser = Parser.new
 
@@ -20,7 +22,7 @@ module Skeem
       end
     end
 
-    def add_default_procedures()
+    def add_default_procedures
       add_primitives(runtime)
       add_standard(runtime)
     end
@@ -57,4 +59,4 @@ module Skeem
       end
     end
   end # class
-end # module
+end # module

data/lib/skeem/parser.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'tokenizer'
 require_relative 'grammar'
 require_relative 's_expr_builder'
@@ -5,10 +7,10 @@ require_relative 's_expr_builder'
 module Skeem
   class Parser
     attr_reader(:engine)
-    
-    def initialize()
+
+    def initialize
       # Create a Rley facade object
-      @engine = Rley::Engine.new do |cfg| 
+      @engine = Rley::Engine.new do |cfg|
         cfg.diagnose = true
         cfg.repr_builder = SkmBuilder
       end
@@ -16,7 +18,7 @@ module Skeem
       # Step 1. Load Skeem grammar
       @engine.use_grammar(Skeem::Grammar)
     end
-      
+
     # Parse the given Skeem expression into a parse tree.
     # @param source [String] Skeem expression to parse
     # @return [ParseTree] A regexp object equivalent to the Skeem expression.

data/lib/skeem/primitive/primitive_builder.rb

@@ -1,5 +1,8 @@
+# frozen_string_literal: true
+
 require_relative 'primitive_procedure'
 require_relative '../datum_dsl'
+require_relative '../skm_exception'
 require_relative '../skm_pair'
 
 module Skeem
@@ -34,7 +37,7 @@ module Skeem
       def binary
         SkmArity.new(2, 2)
       end
-      
+
       def ternary
         SkmArity.new(3, 3)
       end
@@ -158,11 +161,12 @@ module Skeem
         create_map(aRuntime)
       end
 
-      def add_io_procedures(aRuntime)(aRuntime)
+      def add_io_procedures(aRuntime)
         create_display(aRuntime)
       end
 
       def add_special_procedures(aRuntime)
+        create_error(aRuntime)
         create_test_assert(aRuntime)
         create_debug(aRuntime)
         create_inspect(aRuntime)
@@ -170,7 +174,7 @@ module Skeem
 
       def create_plus(aRuntime)
         # arglist should be a Ruby Array
-        primitive = ->(_runtime, arglist) do
+        primitive = lambda do |_runtime, arglist|
           if arglist.empty?
             integer(0)
           else
@@ -184,7 +188,7 @@ module Skeem
       end
 
       def create_minus(aRuntime)
-        primitive = ->(_runtime, first_operand, arglist) do
+        primitive = lambda do |_runtime, first_operand, arglist|
           raw_result = first_operand.value
           if arglist.empty?
             raw_result = -raw_result
@@ -198,7 +202,7 @@ module Skeem
       end
 
       def create_multiply(aRuntime)
-        primitive = ->(_runtime, arglist) do
+        primitive = lambda do |_runtime, arglist|
           if arglist.empty?
             integer(1)
           else
@@ -212,7 +216,6 @@ module Skeem
       end
 
       def reciprocal(aLiteral)
-
         case aLiteral
           when Integer
             result = Rational(1, aLiteral)
@@ -226,29 +229,29 @@ module Skeem
       end
 
       def create_divide(aRuntime)
-        primitive = ->(_runtime, first_operand, arglist) do
+        primitive = lambda do |_runtime, first_operand, arglist|
           raw_result = first_operand.value
           if arglist.empty?
             raw_result = reciprocal(raw_result)
           else
             # Ugly: Ruby version dependency: Rubies older than 2.4 have class Fixnum instead of Integer
-            int_class = (RUBY_VERSION[0..2] < "2.4") ? Fixnum : Integer
+            int_class = (RUBY_VERSION[0..2] < '2.4') ? Fixnum : Integer
 
             arglist.each do |elem|
               elem_value = elem.value
               case [raw_result.class, elem_value.class]
                 when [int_class, int_class]
                   if raw_result.modulo(elem_value).zero?
-                    raw_result = raw_result / elem_value
+                    raw_result /= elem_value
                   else
                     raw_result = Rational(raw_result, elem_value)
                   end
 
                 when [int_class, Rational]
-                  raw_result = raw_result * reciprocal(elem_value)
+                  raw_result *= reciprocal(elem_value)
 
                 when [Rational, Rational]
-                  raw_result = raw_result * reciprocal(elem_value)
+                  raw_result *= reciprocal(elem_value)
                 else
                   raw_result = raw_result.to_f
                   raw_result /= elem_value
@@ -262,8 +265,8 @@ module Skeem
       end
 
       def create_floor_slash(aRuntime)
-        primitive = ->(_runtime, operand_1, operand_2) do
-          (quotient, modulus) = operand_1.value.divmod(operand_2.value)
+        primitive = lambda do |_runtime, operand1, operand2|
+          (quotient, modulus) = operand1.value.divmod(operand2.value)
           SkmPair.new(to_datum(quotient), to_datum(modulus)) # improper list!
         end
 
@@ -271,10 +274,10 @@ module Skeem
       end
 
       def create_truncate_slash(aRuntime)
-        primitive = ->(_runtime, operand_1, operand_2) do
-          modulo_ = operand_1.value / operand_2.value
-          modulo_ += 1 if modulo_ < 0
-          remainder_ = operand_1.value.remainder(operand_2.value)
+        primitive = lambda do |_runtime, operand1, operand2|
+          modulo_ = operand1.value / operand2.value
+          modulo_ += 1 if modulo_.negative?
+          remainder_ = operand1.value.remainder(operand2.value)
           SkmPair.new(to_datum(modulo_), to_datum(remainder_)) # improper list!
         end
 
@@ -282,7 +285,7 @@ module Skeem
       end
 
       def create_gcd(aRuntime)
-        primitive = ->(_runtime, arglist) do
+        primitive = lambda do |_runtime, arglist|
           if arglist.empty?
             integer(0)
           else
@@ -301,7 +304,7 @@ module Skeem
       end
 
       def create_lcm(aRuntime)
-        primitive = ->(_runtime, arglist) do
+        primitive = lambda do |_runtime, arglist|
           if arglist.empty?
             integer(1)
           else
@@ -315,7 +318,7 @@ module Skeem
       end
 
       def create_numerator(aRuntime)
-        primitive = ->(_runtime, arg_evaluated) do
+        primitive = lambda do |_runtime, arg_evaluated|
           case arg_evaluated
             when SkmInteger
               result = arg_evaluated
@@ -329,7 +332,7 @@ module Skeem
       end
 
       def create_denominator(aRuntime)
-        primitive = ->(_runtime, arg_evaluated) do
+        primitive = lambda do |_runtime, arg_evaluated|
           case arg_evaluated
             when SkmInteger
               result = 1
@@ -343,7 +346,7 @@ module Skeem
       end
 
       def create_floor(aRuntime)
-        primitive = ->(_runtime, arg_evaluated) do
+        primitive = lambda do |_runtime, arg_evaluated|
           result = arg_evaluated.value.floor
           integer(result)
         end
@@ -352,7 +355,7 @@ module Skeem
       end
 
       def create_ceiling(aRuntime)
-        primitive = ->(_runtime, arg_evaluated) do
+        primitive = lambda do |_runtime, arg_evaluated|
           result = arg_evaluated.value.ceil
           integer(result)
         end
@@ -361,7 +364,7 @@ module Skeem
       end
 
       def create_round(aRuntime)
-        primitive = ->(_runtime, arg_evaluated) do
+        primitive = lambda do |_runtime, arg_evaluated|
           result = arg_evaluated.value.round
           integer(result)
         end
@@ -375,8 +378,8 @@ module Skeem
       end
 
       def create_eqv?(aRuntime)
-        primitive = ->(runtime, operand_1, operand_2) do
-          core_eqv?(operand_1, operand_2)
+        primitive = lambda do |_runtime, operand1, operand2|
+          core_eqv?(operand1, operand2)
         end
 
         define_primitive_proc(aRuntime, 'eqv?', binary, primitive)
@@ -388,7 +391,7 @@ module Skeem
       end
 
       def create_eq?(aRuntime)
-        primitive = ->(_runtime, operand_1, operand_2) do
+        primitive = lambda do |_runtime, operand1, operand2|
           core_eq?(operand1, operand2)
         end
 
@@ -396,8 +399,8 @@ module Skeem
       end
 
       def create_equal?(aRuntime)
-        primitive = ->(_runtime, operand_1, operand_2) do
-          raw_result = operand_1.skm_equal?(operand_2)
+        primitive = lambda do |_runtime, operand1, operand2|
+          raw_result = operand1.skm_equal?(operand2)
           boolean(raw_result)
         end
 
@@ -405,7 +408,7 @@ module Skeem
       end
 
       def create_equal(aRuntime)
-        primitive = ->(_runtime, first_operand, arglist) do
+        primitive = lambda do |_runtime, first_operand, arglist|
           if arglist.empty?
             boolean(true)
           else
@@ -419,11 +422,11 @@ module Skeem
       end
 
       def create_lt(aRuntime)
-        primitive = ->(_runtime, first_operand, arglist) do
+        primitive = lambda do |runtime, first_operand, arglist|
           if arglist.empty?
             result = false
           else
-            result = primitive_comparison(:<, _runtime, first_operand, arglist)
+            result = primitive_comparison(:<, runtime, first_operand, arglist)
           end
           boolean(result)
         end
@@ -432,11 +435,11 @@ module Skeem
       end
 
       def create_gt(aRuntime)
-        primitive = ->(_runtime, first_operand, arglist) do
+        primitive = lambda do |runtime, first_operand, arglist|
           if arglist.empty?
             result = false
           else
-            result = primitive_comparison(:>, _runtime, first_operand, arglist)
+            result = primitive_comparison(:>, runtime, first_operand, arglist)
           end
           boolean(result)
         end
@@ -445,11 +448,11 @@ module Skeem
       end
 
       def create_lte(aRuntime)
-        primitive = ->(_runtime, first_operand, arglist) do
+        primitive = lambda do |runtime, first_operand, arglist|
           if arglist.empty?
             result = true
           else
-            result = primitive_comparison(:<=, _runtime, first_operand, arglist)
+            result = primitive_comparison(:<=, runtime, first_operand, arglist)
           end
           boolean(result)
         end
@@ -458,11 +461,11 @@ module Skeem
       end
 
       def create_gte(aRuntime)
-        primitive = ->(_runtime, first_operand, arglist) do
+        primitive = lambda do |runtime, first_operand, arglist|
           if arglist.empty?
             result = true
           else
-            result = primitive_comparison(:>=, _runtime, first_operand, arglist)
+            result = primitive_comparison(:>=, runtime, first_operand, arglist)
           end
           boolean(result)
         end
@@ -481,7 +484,7 @@ module Skeem
       end
 
       def create_max(aRuntime)
-        primitive = ->(_runtime, first_operand, arglist) do
+        primitive = lambda do |_runtime, first_operand, arglist|
           if arglist.empty?
             result = first_operand
           else
@@ -499,7 +502,7 @@ module Skeem
       end
 
       def create_min(aRuntime)
-        primitive = ->(_runtime, first_operand, arglist) do
+        primitive = lambda do |_runtime, first_operand, arglist|
           if arglist.empty?
             result = first_operand
           else
@@ -518,7 +521,7 @@ module Skeem
 
       def create_number2string(aRuntime)
         # TODO: add support for radix argument
-        primitive = ->(_runtime, arg_evaluated) do
+        primitive = lambda do |_runtime, arg_evaluated|
           check_argtype(arg_evaluated, SkmNumber, 'number', 'number->string')
           string(arg_evaluated.value)
         end
@@ -529,7 +532,7 @@ module Skeem
       def create_and(aRuntime)
         # arglist should be a Ruby Array
         # Arguments aren't evaluated yet!...
-        primitive = ->(runtime, arglist) do
+        primitive = lambda do |runtime, arglist|
           if arglist.empty?
             boolean(true) # in conformance with 4.2.1
           else
@@ -537,7 +540,7 @@ module Skeem
             last_result = nil
             # $stderr.puts arglist.inspect
             arglist.each do |raw_arg|
-              argument = raw_arg.evaluate(aRuntime)
+              argument = raw_arg.evaluate(runtime)
               last_result = argument
               raw_result &&= !(argument.boolean? && !argument.value)
               break unless raw_result # stop here, a false was found...
@@ -555,14 +558,14 @@ module Skeem
       def create_or(aRuntime)
         # arglist should be a Ruby Array
         # Arguments aren't evaluated yet!...
-        primitive = ->(runtime, arglist) do
+        primitive = lambda do |runtime, arglist|
           if arglist.empty?
             boolean(false) # in conformance with 4.2.1
           else
             raw_result = false
             last_result = nil
             arglist.each do |raw_arg|
-              argument = raw_arg.evaluate(aRuntime)
+              argument = raw_arg.evaluate(runtime)
               last_result = argument
               raw_result ||= (!argument.boolean? || argument.value)
               break if raw_result # stop here, a true was found...
@@ -602,7 +605,7 @@ module Skeem
       end
 
       def create_boolean_equal(aRuntime)
-        primitive = ->(_runtime, first_operand, arglist) do
+        primitive = lambda do |_runtime, first_operand, arglist|
           compare_all(first_operand, arglist, :==)
         end
 
@@ -610,7 +613,7 @@ module Skeem
       end
 
       def create_char2int(aRuntime)
-        primitive = ->(runtime, arg_evaluated) do
+        primitive = lambda do |_runtime, arg_evaluated|
           check_argtype(arg_evaluated, SkmChar, 'character', 'char->integer')
           integer(arg_evaluated.value.ord)
         end
@@ -619,7 +622,7 @@ module Skeem
       end
 
       def create_int2char(aRuntime)
-        primitive = ->(runtime, arg_evaluated) do
+        primitive = lambda do |_runtime, arg_evaluated|
           check_argtype(arg_evaluated, SkmInteger, 'integer', 'integer->char')
           char(arg_evaluated.value.ord)
         end
@@ -628,7 +631,7 @@ module Skeem
       end
 
       def create_char_equal(aRuntime)
-        primitive = ->(_runtime, first_operand, arglist) do
+        primitive = lambda do |_runtime, first_operand, arglist|
           compare_all(first_operand, arglist, :==)
         end
 
@@ -636,7 +639,7 @@ module Skeem
       end
 
       def create_char_lt(aRuntime)
-        primitive = ->(_runtime, first_operand, arglist) do
+        primitive = lambda do |_runtime, first_operand, arglist|
           compare_all(first_operand, arglist, :<)
         end
 
@@ -644,7 +647,7 @@ module Skeem
       end
 
       def create_char_gt(aRuntime)
-        primitive = ->(_runtime, first_operand, arglist) do
+        primitive = lambda do |_runtime, first_operand, arglist|
           compare_all(first_operand, arglist, :>)
         end
 
@@ -652,7 +655,7 @@ module Skeem
       end
 
       def create_char_lte(aRuntime)
-        primitive = ->(_runtime, first_operand, arglist) do
+        primitive = lambda do |_runtime, first_operand, arglist|
           compare_all(first_operand, arglist, :<=)
         end
 
@@ -660,16 +663,15 @@ module Skeem
       end
 
       def create_char_gte(aRuntime)
-        primitive = ->(_runtime, first_operand, arglist) do
+        primitive = lambda do |_runtime, first_operand, arglist|
           compare_all(first_operand, arglist, :>=)
         end
 
         define_primitive_proc(aRuntime, 'char>=?', one_or_more, primitive)
       end
 
-
       def create_make_string(aRuntime)
-        primitive = ->(runtime, count_arg, arglist) do
+        primitive = lambda do |_runtime, count_arg, arglist|
           count = count_arg
           check_argtype(count, SkmInteger, 'integer', 'make-string')
           if arglist.empty?
@@ -685,11 +687,11 @@ module Skeem
       end
 
       def create_string_string(aRuntime)
-        primitive = ->(_runtime, arglist) do
+        primitive = lambda do |_runtime, arglist|
           if arglist.empty?
             value = ''
           else
-            value = arglist.reduce('') do |interim, some_char|
+            value = arglist.reduce(+'') do |interim, some_char|
               check_argtype(some_char, SkmChar, 'character', 'string')
               interim << some_char.value
             end
@@ -702,7 +704,7 @@ module Skeem
       end
 
       def create_string_equal(aRuntime)
-        primitive = ->(_runtime, first_operand, arglist) do
+        primitive = lambda do |_runtime, first_operand, arglist|
           all_same?(first_operand, arglist)
         end
 
@@ -710,11 +712,11 @@ module Skeem
       end
 
       def create_string_append(aRuntime)
-        primitive = ->(_runtime, arglist) do
+        primitive = lambda do |_runtime, arglist|
           if arglist.empty?
             value = ''
           else
-            value = arglist.reduce('') { |interim, substr| interim << substr.value }
+            value = arglist.reduce(+'') { |interim, substr| interim << substr.value }
           end
 
           string(value)
@@ -724,7 +726,7 @@ module Skeem
       end
 
       def create_string_length(aRuntime)
-        primitive = ->(runtime, arg_evaluated) do
+        primitive = lambda do |_runtime, arg_evaluated|
           check_argtype(arg_evaluated, SkmString, 'string', 'string-length')
           integer(arg_evaluated.length)
         end
@@ -733,7 +735,7 @@ module Skeem
       end
 
       def create_string2symbol(aRuntime)
-        primitive = ->(runtime, arg_evaluated) do
+        primitive = lambda do |_runtime, arg_evaluated|
           check_argtype(arg_evaluated, SkmString, 'string', 'string->symbol')
           identifier(arg_evaluated)
         end
@@ -742,7 +744,7 @@ module Skeem
       end
 
       def create_symbol2string(aRuntime)
-        primitive = ->(runtime, arg_evaluated) do
+        primitive = lambda do |_runtime, arg_evaluated|
           check_argtype(arg_evaluated, SkmIdentifier, 'symbol', 'symbol->string')
           string(arg_evaluated)
         end
@@ -751,7 +753,7 @@ module Skeem
       end
 
       def create_car(aRuntime)
-        primitive = ->(runtime, arg_evaluated) do
+        primitive = lambda do |_runtime, arg_evaluated|
           check_argtype(arg_evaluated, SkmPair, 'pair', 'car')
           arg_evaluated.car
         end
@@ -760,7 +762,7 @@ module Skeem
       end
 
       def create_cdr(aRuntime)
-        primitive = ->(_runtime, arg_evaluated) do
+        primitive = lambda do |_runtime, arg_evaluated|
           check_argtype(arg_evaluated, SkmPair, 'pair', 'cdr')
           arg_evaluated.cdr
         end
@@ -769,15 +771,15 @@ module Skeem
       end
 
       def create_cons(aRuntime)
-        primitive = ->(_runtime, obj1, obj2) do
+        primitive = lambda do |_runtime, obj1, obj2|
           SkmPair.new(obj1, obj2)
         end
 
         define_primitive_proc(aRuntime, 'cons', binary, primitive)
       end
-      
+
       def create_make_list(aRuntime)
-        primitive = ->(runtime, count_arg, arglist) do
+        primitive = lambda do |_runtime, count_arg, arglist|
           count = count_arg
           check_argtype(count, SkmInteger, 'integer', 'make-list')
           if arglist.empty?
@@ -789,11 +791,11 @@ module Skeem
           SkmPair.create_from_a(arr)
         end
 
-        define_primitive_proc(aRuntime, 'make-list', one_or_two, primitive)      
+        define_primitive_proc(aRuntime, 'make-list', one_or_two, primitive)
       end
 
       def create_length(aRuntime)
-        primitive = ->(_runtime, arg_evaluated) do
+        primitive = lambda do |_runtime, arg_evaluated|
           check_argtype(arg_evaluated, [SkmPair, SkmEmptyList], 'list', 'length')
           integer(arg_evaluated.length)
         end
@@ -802,7 +804,7 @@ module Skeem
       end
 
       def create_list2vector(aRuntime)
-        primitive = ->(_runtime, arg_evaluated) do
+        primitive = lambda do |_runtime, arg_evaluated|
           check_argtype(arg_evaluated, [SkmPair, SkmEmptyList], 'list', 'list->vector')
           vector(arg_evaluated.to_a)
         end
@@ -818,19 +820,17 @@ module Skeem
         else
           but_last = arglist.take(arglist.length - 1)
           check_arguments(but_last, [SkmPair, SkmEmptyList], 'list', 'append')
-          result = arglist.shift.klone  # First list is taken
+          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
+                elsif result.kind_of?(SkmEmptyList)
+                  result = SkmPair.new(arg, SkmEmptyList.instance)
                 else
-                  if result.kind_of?(SkmEmptyList)
-                    result = SkmPair.new(arg, SkmEmptyList.instance)
-                  else
-                    result.append_list(cloned)
-                  end
+                  result.append_list(cloned)
                 end
               when SkmEmptyList
                 # Do nothing
@@ -849,9 +849,9 @@ module Skeem
 
       def create_append(aRuntime)
         # Arguments aren't evaluated yet!...
-        primitive = ->(runtime, arglist) do
+        primitive = lambda do |runtime, arglist|
           if arglist.size > 1
-            arguments = evaluate_arguments(arglist, aRuntime)
+            arguments = evaluate_arguments(arglist, runtime)
           else
             arguments = arglist
           end
@@ -863,13 +863,14 @@ module Skeem
       end
 
       def create_reverse(aRuntime)
-        primitive = ->(_runtime, arg_evaluated) do
+        primitive = lambda do |_runtime, arg_evaluated|
           check_argtype(arg_evaluated, [SkmPair, SkmEmptyList], 'list', 'reverse')
           if arg_evaluated == SkmEmptyList.instance
             result = arg_evaluated
           else
             err_msg = 'reverse procedure requires a proper list as argument'
-            raise StandardError, err_msg  unless arg_evaluated.proper?
+            raise StandardError, err_msg unless arg_evaluated.proper?
+
             elems_reversed = arg_evaluated.to_a.reverse
             result = SkmPair.create_from_a(elems_reversed)
           end
@@ -881,7 +882,7 @@ module Skeem
 
       def create_setcar(aRuntime)
         # Arguments aren't evaluated yet!...
-        primitive = ->(runtime, pair_arg, obj_arg) do
+        primitive = lambda do |runtime, pair_arg, obj_arg|
           case pair_arg
             when SkmPair
               pair = pair_arg
@@ -906,7 +907,7 @@ module Skeem
 
       def create_setcdr(aRuntime)
         # Arguments aren't evaluated yet!...
-        primitive = ->(runtime, pair_arg, obj_arg) do
+        primitive = lambda do |runtime, pair_arg, obj_arg|
           case pair_arg
             when SkmPair
               pair = pair_arg
@@ -930,21 +931,22 @@ module Skeem
       end
 
       def create_assq(aRuntime)
-        primitive = ->(runtime, obj_arg, alist_arg) do
+        primitive = lambda do |runtime, obj_arg, alist_arg|
           assoc_list = alist_arg.evaluate(runtime)
           check_assoc_list(assoc_list, 'assq')
           obj = obj_arg.evaluate(runtime)
           result = boolean(false)
           unless assoc_list.empty?
             pair = assoc_list
-            begin
+            loop do
               are_equal = core_eq?(pair.car.car, obj)
               if are_equal.value
                 result = pair.car
                 break
               end
               pair = pair.cdr
-            end while (pair && (pair.kind_of?(SkmPair)))
+              break unless pair&.kind_of?(SkmPair)
+            end
           end
 
           result
@@ -953,19 +955,20 @@ module Skeem
       end
 
       def create_assv(aRuntime)
-        primitive = ->(runtime, obj, assoc_list) do
+        primitive = lambda do |_runtime, obj, assoc_list|
           check_assoc_list(assoc_list, 'assq')
           result = boolean(false)
           unless assoc_list.empty?
             pair = assoc_list
-            begin
+            loop do
               are_equal = core_eqv?(pair.car.car, obj)
               if are_equal.value
                 result = pair.car
                 break
               end
               pair = pair.cdr
-            end while (pair && (pair.kind_of?(SkmPair)))
+              break unless pair&.kind_of?(SkmPair)
+            end
           end
 
           result
@@ -978,15 +981,16 @@ module Skeem
 
         unless alist.empty?
           cell = SkmPair.new(integer(1), alist)
-          begin
+          loop do
             cell = cell.cdr
             check_argtype(cell, SkmPair, 'association list', proc_name)
-          end while cell.cdr.kind_of?(SkmPair)
+            break unless cell.cdr.kind_of?(SkmPair)
+          end
         end
       end
 
       def create_list_copy(aRuntime)
-        primitive = ->(runtime, arg_evaluated) do
+        primitive = lambda do |_runtime, arg_evaluated|
           check_argtype(arg_evaluated, [SkmPair, SkmEmptyList], 'list', 'list-copy')
           arg_evaluated.klone # Previously: arg.klone
         end
@@ -995,7 +999,7 @@ module Skeem
       end
 
       def create_vector(aRuntime)
-        primitive = ->(_runtime, elements) do
+        primitive = lambda do |_runtime, elements|
           vector(elements)
         end
 
@@ -1003,7 +1007,7 @@ module Skeem
       end
 
       def create_vector_length(aRuntime)
-        primitive = ->(_runtime, arg_evaluated) do
+        primitive = lambda do |_runtime, arg_evaluated|
           check_argtype(arg_evaluated, SkmVector, 'vector', 'vector-length')
           integer(arg_evaluated.length)
         end
@@ -1012,7 +1016,7 @@ module Skeem
       end
 
       def create_make_vector(aRuntime)
-        primitive = ->(runtime, count_arg, arglist) do
+        primitive = lambda do |runtime, count_arg, arglist|
           count = count_arg.evaluate(runtime)
           check_argtype(count, SkmInteger, 'integer', 'make_vector')
           if arglist.empty?
@@ -1028,8 +1032,8 @@ module Skeem
       end
 
       def create_vector_ref(aRuntime)
-          # argument 1: a vector, argument 2: an index(integer)
-          primitive = ->(runtime, vector, index) do
+        # argument 1: a vector, argument 2: an index(integer)
+        primitive = lambda do |_runtime, vector, index|
           check_argtype(vector, SkmVector, 'vector', 'vector-ref')
           check_argtype(index, SkmInteger, 'integer', 'vector-ref')
           # TODO: index checking
@@ -1039,10 +1043,10 @@ module Skeem
 
         define_primitive_proc(aRuntime, 'vector-ref', binary, primitive)
       end
-      
+
       def create_vector_set(aRuntime)
-          # Arguments aren't evaluated yet!...
-          primitive = ->(runtime, vector, k, object) do
+        # Arguments aren't evaluated yet!...
+        primitive = lambda do |runtime, vector, k, object|
           index = k.evaluate(runtime)
           check_argtype(vector, SkmVector, 'vector', 'vector-set!')
           check_argtype(index, SkmInteger, 'integer', 'vector-set!')
@@ -1050,12 +1054,12 @@ module Skeem
           vector.members[index.value] = object
           vector
         end
-        
+
         define_primitive_proc(aRuntime, 'vector-set!', ternary, primitive)
       end
 
       def create_vector2list(aRuntime)
-        primitive = ->(runtime, arg_evaluated) do
+        primitive = lambda do |_runtime, arg_evaluated|
           check_argtype(arg_evaluated, SkmVector, 'vector', 'vector->list')
           SkmPair.create_from_a(arg_evaluated.members)
         end
@@ -1064,7 +1068,7 @@ module Skeem
       end
 
       def create_apply(aRuntime)
-        primitive = ->(runtime, proc_arg, arglist) do
+        primitive = lambda do |runtime, proc_arg, arglist|
           if arglist.empty?
             result = SkmEmptyList.instance
           else
@@ -1072,18 +1076,19 @@ module Skeem
             invoke = ProcedureCall.new(nil, proc_arg, single_list.to_a)
             result = invoke.evaluate(runtime)
           end
+          result
         end
 
         define_primitive_proc(aRuntime, 'apply', one_or_more, primitive)
       end
 
       def create_map(aRuntime)
-        primitive = ->(runtime, proc_arg, arglist) do
+        primitive = lambda do |runtime, proc_arg, arglist|
           if arglist.empty?
             result = SkmEmptyList.instance
           else
             curr_cells = arglist
-            arity = curr_cells.size
+            # arity = curr_cells.size
             initial_result = nil
             curr_result = nil
             loop do
@@ -1099,7 +1104,7 @@ module Skeem
               curr_result = new_result
 
               curr_cells.map!(&:cdr)
-              break if curr_cells.find { |cdr_entry| ! cdr_entry.kind_of?(SkmPair) }
+              break if curr_cells.find { |cdr_entry| !cdr_entry.kind_of?(SkmPair) }
             end
 
             result = initial_result
@@ -1110,19 +1115,27 @@ module Skeem
 
         define_primitive_proc(aRuntime, 'map', one_or_more, primitive)
       end
-      
+
       def create_display(aRuntime)
-        primitive = ->(runtime, arg_evaluated) do
+        primitive = lambda do |_runtime, arg_evaluated|
           # @TODO: make output stream configurable
           print arg_evaluated.value.to_s
           SkmUndefined.instance
         end
-        
-        define_primitive_proc(aRuntime, 'display', unary, primitive)      
+
+        define_primitive_proc(aRuntime, 'display', unary, primitive)
+      end
+
+      def create_error(aRuntime)
+        primitive = lambda do |_runtime, arg_evaluated|
+          raise SkmError, arg_evaluated.value
+        end
+
+        define_primitive_proc(aRuntime, 'error', unary, primitive)
       end
 
       def create_test_assert(aRuntime)
-        primitive = ->(runtime, arg_evaluated) do
+        primitive = lambda do |_runtime, arg_evaluated|
           if arg_evaluated.boolean? && arg_evaluated.value == false
             assert_call = aRuntime.caller
             pos = assert_call.call_site
@@ -1141,7 +1154,7 @@ module Skeem
       # DON'T USE IT
       # Non-standard procedure reserved for internal testing/debugging purposes.
       def create_debug(aRuntime)
-        primitive = ->(runtime) do
+        primitive = lambda do |_runtime|
           require 'debug'
         end
 
@@ -1151,7 +1164,7 @@ module Skeem
       # DON'T USE IT
       # Non-standard procedure reserved for internal testing/debugging purposes.
       def create_inspect(aRuntime)
-        primitive = ->(runtime, arg_evaluated) do
+        primitive = lambda do |_runtime, arg_evaluated|
           $stderr.puts 'INSPECT>' + arg_evaluated.inspect
           Skeem::SkmUndefined.instance
         end
@@ -1160,7 +1173,7 @@ module Skeem
 
       def create_object_predicate(aRuntime, predicate_name, msg_name = nil)
         msg_name = predicate_name if msg_name.nil?
-        primitive = ->(runtime, arg_evaluated) do
+        primitive = lambda do |_runtime, arg_evaluated|
           to_datum(arg_evaluated.send(msg_name))
         end
 
@@ -1234,4 +1247,4 @@ module Skeem
       end
     end # module
   end # module
-end # module
+end # module