skeem 0.0.23 → 0.0.24

data/lib/skeem/primitive/primitive_builder.rb

@@ -1,10 +1,10 @@
 require_relative 'primitive_procedure'
-require_relative '../convertible'
+require_relative '../datum_dsl'
 
 module Skeem
   module Primitive
     module PrimitiveBuilder
-      include Convertible
+      include DatumDSL
       def add_primitives(aRuntime)
         add_arithmetic(aRuntime)
         add_comparison(aRuntime)
@@ -73,6 +73,7 @@ module Skeem
       def add_string_procedures(aRuntime)
         create_object_predicate(aRuntime, 'string?')
         create_string_append(aRuntime)
+        create_string_length(aRuntime)
         create_string2symbol(aRuntime)
       end
 
@@ -105,13 +106,13 @@ module Skeem
         # arglist should be a Ruby Array
         primitive = ->(runtime, arglist) do
           if arglist.empty?
-            to_skm(0)
+            integer(0)
           else
             first_one = arglist.first.evaluate(runtime)
             raw_result = first_one.value
             operands = evaluate_tail(arglist, runtime)
             operands.each { |elem| raw_result += elem.value }
-            to_skm(raw_result)
+            to_datum(raw_result)
           end
         end
         define_primitive_proc(aRuntime, '+', zero_or_more, primitive)
@@ -127,7 +128,7 @@ module Skeem
             operands = evaluate_array(arglist, runtime)
             operands.each { |elem| raw_result -= elem.value }
           end
-          to_skm(raw_result)
+          to_datum(raw_result)
         end
 
         define_primitive_proc(aRuntime, '-', one_or_more, primitive)
@@ -136,13 +137,13 @@ module Skeem
       def create_multiply(aRuntime)
         primitive = ->(runtime, arglist) do
           if arglist.empty?
-            to_skm(1)
+            integer(1)
           else
             first_one = arglist.first.evaluate(runtime)
             raw_result = first_one.value
             operands = evaluate_tail(arglist, runtime)
             operands.each { |elem| raw_result *= elem.value }
-            to_skm(raw_result)
+            to_datum(raw_result)
           end
         end
         define_primitive_proc(aRuntime, '*', zero_or_more, primitive)
@@ -166,7 +167,7 @@ module Skeem
               end
             end
           end
-          to_skm(raw_result)
+          to_datum(raw_result)
         end
 
         define_primitive_proc(aRuntime, '/', one_or_more, primitive)
@@ -177,7 +178,7 @@ module Skeem
           operand_1 = argument1.evaluate(runtime)
           operand_2 = argument2.evaluate(runtime)
           raw_result = operand_1.value.modulo(operand_2.value)
-          to_skm(raw_result)
+          to_datum(raw_result)
         end
 
         define_primitive_proc(aRuntime, 'floor-remainder', binary, primitive)
@@ -187,12 +188,12 @@ module Skeem
         primitive = ->(runtime, first_operand, arglist) do
           first_one = first_operand.evaluate(runtime)
           if arglist.empty?
-            to_skm(true)
+            boolean(true)
           else
             operands = evaluate_array(arglist, runtime)
             first_value = first_one.value
             all_equal = operands.all? { |elem| first_value == elem.value }
-            to_skm(all_equal)
+            boolean(all_equal)
           end
         end
 
@@ -202,7 +203,7 @@ module Skeem
       def create_lt(aRuntime)
         primitive = ->(runtime, first_operand, arglist) do
           if arglist.empty?
-            to_skm(false)
+            boolean(false)
           else
             operands = [first_operand.evaluate(runtime)]
             operands.concat(evaluate_array(arglist, runtime))
@@ -210,7 +211,7 @@ module Skeem
             operands.each_cons(2) do |(elem1, elem2)|
               result &&= elem1.value < elem2.value
             end
-            to_skm(result)
+            boolean(result)
           end
         end
 
@@ -220,7 +221,7 @@ module Skeem
       def create_gt(aRuntime)
         primitive = ->(runtime, first_operand, arglist) do
           if arglist.empty?
-            to_skm(false)
+            boolean(false)
           else
             operands = [first_operand.evaluate(runtime)]
             operands.concat(evaluate_array(arglist, runtime))
@@ -228,7 +229,7 @@ module Skeem
             operands.each_cons(2) do |(elem1, elem2)|
               result &&= elem1.value > elem2.value
             end
-            to_skm(result)
+            boolean(result)
           end
         end
 
@@ -238,7 +239,7 @@ module Skeem
       def create_lte(aRuntime)
         primitive = ->(runtime, first_operand, arglist) do
           if arglist.empty?
-            to_skm(true)
+            boolean(true)
           else
             operands = [first_operand.evaluate(runtime)]
             operands.concat(evaluate_array(arglist, runtime))
@@ -246,7 +247,7 @@ module Skeem
             operands.each_cons(2) do |(elem1, elem2)|
               result &&= elem1.value <= elem2.value
             end
-            to_skm(result)
+            boolean(result)
           end
         end
 
@@ -256,7 +257,7 @@ module Skeem
       def create_gte(aRuntime)
         primitive = ->(runtime, first_operand, arglist) do
           if arglist.empty?
-            to_skm(true)
+            boolean(true)
           else
             operands = [first_operand.evaluate(runtime)]
             operands.concat(evaluate_array(arglist, runtime))
@@ -264,7 +265,7 @@ module Skeem
             operands.each_cons(2) do |(elem1, elem2)|
               result &&= elem1.value >= elem2.value
             end
-            to_skm(result)
+            boolean(result)
           end
         end
 
@@ -276,7 +277,7 @@ module Skeem
         primitive = ->(runtime, arg) do
           arg_evaluated = arg.evaluate(runtime)
           check_argtype(arg_evaluated, SkmNumber, 'number', 'number->string')
-          to_skm(arg_evaluated.value.to_s)
+          string(arg_evaluated.value)
         end
 
         define_primitive_proc(aRuntime, 'number->string', unary, primitive)
@@ -286,9 +287,9 @@ module Skeem
         primitive = ->(runtime, arg) do
           arg_evaluated = arg.evaluate(runtime)
           if arg_evaluated.boolean? && arg_evaluated.value == false
-            to_skm(true)
+            boolean(true)
           else
-            to_skm(false)
+            boolean(false)
           end
         end
 
@@ -299,7 +300,7 @@ module Skeem
         # arglist should be a Ruby Array
         primitive = ->(runtime, arglist) do
           if arglist.empty?
-            to_skm(true) # in conformance with 4.2.1
+            boolean(true) # in conformance with 4.2.1
           else
             raw_result = true
             last_result = nil
@@ -310,7 +311,7 @@ module Skeem
               break unless raw_result
             end
             raw_result = last_result if raw_result
-            to_skm(raw_result)
+            to_datum(raw_result)
           end
         end
         define_primitive_proc(aRuntime, 'and', zero_or_more, primitive)
@@ -320,7 +321,7 @@ module Skeem
         # arglist should be a Ruby Array
         primitive = ->(runtime, arglist) do
           if arglist.empty?
-            to_skm(false) # in conformance with 4.2.1
+            boolean(false) # in conformance with 4.2.1
           else
             raw_result = false
             last_result = nil
@@ -331,12 +332,12 @@ module Skeem
               break if raw_result
             end
             raw_result = last_result if raw_result
-            to_skm(raw_result)
+            to_datum(raw_result)
           end
         end
         define_primitive_proc(aRuntime, 'or', zero_or_more, primitive)
       end
-      
+
       def create_string_append(aRuntime)
         primitive = ->(runtime, arglist) do
           if arglist.empty?
@@ -346,17 +347,27 @@ module Skeem
             value = parts.reduce('') { |interim, substr| interim << substr.value }
           end
 
-          SkmString.create(value)
+          string(value)
+        end
+
+        define_primitive_proc(aRuntime, 'string-append', zero_or_more, primitive)
+      end
+
+      def create_string_length(aRuntime)
+        primitive = ->(runtime, arg) do
+          arg_evaluated = arg.evaluate(runtime)
+          check_argtype(arg_evaluated, SkmString, 'string', 'string-length')
+          integer(arg_evaluated.length)
         end
 
-        define_primitive_proc(aRuntime, 'string-append', zero_or_more, primitive)      
+        define_primitive_proc(aRuntime, 'string-length', unary, primitive)
       end
 
       def create_string2symbol(aRuntime)
         primitive = ->(runtime, arg) do
           arg_evaluated = arg.evaluate(runtime)
           check_argtype(arg_evaluated, SkmString, 'string', 'string->symbol')
-          SkmIdentifier.create(arg_evaluated.value)
+          identifier(arg_evaluated)
         end
 
         define_primitive_proc(aRuntime, 'string->symbol', unary, primitive)
@@ -366,7 +377,7 @@ module Skeem
         primitive = ->(runtime, arg) do
           arg_evaluated = arg.evaluate(runtime)
           check_argtype(arg_evaluated, SkmList, 'list', 'length')
-          to_skm(arg_evaluated.length)
+          integer(arg_evaluated.length)
         end
 
         define_primitive_proc(aRuntime, 'length', unary, primitive)
@@ -380,7 +391,7 @@ module Skeem
             elements = evaluate_array(arglist, aRuntime)
           end
 
-          SkmVector.new(elements)
+          vector(elements)
         end
 
         define_primitive_proc(aRuntime, 'vector', zero_or_more, primitive)
@@ -390,7 +401,7 @@ module Skeem
         primitive = ->(runtime, arg) do
           arg_evaluated = arg.evaluate(runtime)
           check_argtype(arg_evaluated, SkmVector, 'vector', 'vector-length')
-          to_skm(arg_evaluated.length)
+          integer(arg_evaluated.length)
         end
 
         define_primitive_proc(aRuntime, 'vector-length', unary, primitive)
@@ -404,8 +415,8 @@ module Skeem
           index = anIndex.evaluate(runtime)
           check_argtype(index, SkmInteger, 'integer', 'vector-ref')
           # TODO: index checking
-          raw_result = vector.elements[index.value]
-          to_skm(raw_result)
+          raw_result = vector.members[index.value]
+          to_datum(raw_result) # What if non-datum result?
         end
 
         define_primitive_proc(aRuntime, 'vector-ref', binary, primitive)
@@ -432,13 +443,12 @@ module Skeem
         msg_name = predicate_name if msg_name.nil?
         primitive = ->(runtime, arg) do
           arg_evaluated = arg.evaluate(runtime)
-          to_skm(arg_evaluated.send(msg_name))
+          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)

data/lib/skeem/runtime.rb

@@ -1,3 +1,6 @@
+require_relative 's_expr_nodes'
+require_relative 'environment'
+
 module Skeem
   class Runtime
     attr_reader(:environment)
@@ -13,29 +16,50 @@ module Skeem
     def define(aKey, anEntry)
       environment.define(normalize_key(aKey), anEntry)
     end
+
+    def evaluate(aKey)
+      key_value = normalize_key(aKey)
+      if include?(key_value)
+        definition = environment.fetch(key_value)
+        definition.expression.evaluate(self)
+      else
+        err = StandardError
+        key = aKey.kind_of?(SkmIdentifier) ? aKey.value : key_value
+        err_msg = "Unbound variable: '#{key}'"
+        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
+      first_member = aList.first
+      invokation = ProcedureCall.new(nil, first_member, aList.tail.members)
+      invokation.evaluate(self)
+    end
+
     def nest()
       nested = Environment.new(environment)
       @environment = nested
     end
-    
+
     def unnest()
       raise StandardError, 'Cannot unnest environment' unless environment.outer
       environment.bindings.clear
       @environment = environment.outer
     end
-    
+
     def depth()
       return environment.depth
     end
-    
+
     # Make the outer enviromnent thecurrent one inside the provided block
     def pop
       env = environment
       @environment = environment.outer
       env
     end
-    
+
     def push(anEnvironment)
       @environment = anEnvironment
     end

data/lib/skeem/s_expr_builder.rb

@@ -74,37 +74,37 @@ module Skeem
     def reduce_variable_reference(_production, aRange, _tokens, theChildren)
       SkmVariableReference.new(aRange, theChildren[0])
     end
-    
-    # rule('quotation' => 'APOSTROPHE datum').as 'quotation_abbrev'
-    def reduce_quotation_abbrev(_production, aRange, _tokens, theChildren)
+
+    # rule('quotation' => 'APOSTROPHE datum').as 'quotation_short'
+    def reduce_quotation_short(_production, aRange, _tokens, theChildren)
       SkmQuotation.new(theChildren[1])
-    end      
+    end
 
     # rule('quotation' => 'LPAREN QUOTE datum RPAREN').as 'quotation'
     def reduce_quotation(_production, aRange, _tokens, theChildren)
       SkmQuotation.new(theChildren[2])
     end
-    
+
     # rule('list' => 'LPAREN datum_star RPAREN').as 'list'
     def reduce_list(_production, aRange, _tokens, theChildren)
       SkmList.new(theChildren[1])
-    end     
-    
+    end
+
     # rule('vector' => 'VECTOR_BEGIN datum_star RPAREN').as 'vector'
     def reduce_vector(_production, aRange, _tokens, theChildren)
       SkmVector.new(theChildren[1])
-    end    
-    
+    end
+
     # rule('datum_star' => 'datum_star datum').as 'datum_star'
     def reduce_datum_star(_production, aRange, _tokens, theChildren)
       theChildren[0] << theChildren[1]
-    end    
-    
+    end
+
     # rule('datum_star' => []).as 'no_datum_yet'
     def reduce_no_datum_yet(_production, aRange, _tokens, theChildren)
       []
     end
-    
+
     # rule('procedure_call' => 'LPAREN operator RPAREN').as 'proc_call_nullary'
     def reduce_proc_call_nullary(_production, aRange, _tokens, theChildren)
       ProcedureCall.new(aRange, theChildren[1], [])
@@ -129,24 +129,24 @@ module Skeem
     def reduce_last_operand(_production, _range, _tokens, theChildren)
       [theChildren.last]
     end
-    
+
     # rule('def_formals' => 'identifier_star').as 'def_formals'
     def reduce_def_formals(_production, _range, _tokens, theChildren)
       SkmFormals.new(theChildren[0], :fixed)
-    end    
-    
+    end
+
     # rule('def_formals' => 'identifier_star PERIOD identifier').as 'pair_formals'
     def reduce_pair_formals(_production, _range, _tokens, theChildren)
       formals = theChildren[0] << theChildren[2]
-      SkmFormals.new(formals, :variadic)      
-    end    
-    
+      SkmFormals.new(formals, :variadic)
+    end
+
     # rule('lambda_expression' => 'LPAREN LAMBDA formals body RPAREN').as 'lambda_expression'
     def reduce_lambda_expression(_production, aRange, _tokens, theChildren)
       lmbd = SkmLambda.new(aRange, theChildren[2], theChildren[3])
       # $stderr.puts lmbd.inspect
       lmbd
-    end    
+    end
 
     # rule('formals' => 'LPAREN identifier_star RPAREN').as 'fixed_arity_formals'
     def reduce_fixed_arity_formals(_production, _range, _tokens, theChildren)
@@ -157,12 +157,12 @@ module Skeem
     def reduce_variadic_formals(_production, _range, _tokens, theChildren)
       SkmFormals.new([theChildren[0]], :variadic)
     end
-    
+
     # rule('formals' => 'LPAREN identifier_plus PERIOD IDENTIFIER RPAREN').as 'dotted_formals'
     def reduce_dotted_formals(_production, _range, _tokens, theChildren)
       formals = theChildren[1] << theChildren[3]
       SkmFormals.new(formals, :variadic)
-    end    
+    end
 
     # rule('identifier_star' => 'identifier_star IDENTIFIER').as 'identifier_star'
     def reduce_identifier_star(_production, _range, _tokens, theChildren)
@@ -173,16 +173,16 @@ module Skeem
     def reduce_no_identifier_yet(_production, _range, _tokens, theChildren)
       []
     end
-    
+
     # rule('identifier_plus' => 'identifier_plus IDENTIFIER').as 'multiple_identifiers'
     def reduce_multiple_identifiers(_production, _range, _tokens, theChildren)
       theChildren[0] << theChildren[1]
-    end    
-    
+    end
+
     # rule('identifier_plus' => 'IDENTIFIER').as 'last_identifier'
     def reduce_last_identifier(_production, _range, _tokens, theChildren)
       [theChildren[0]]
-    end    
+    end
 
     # rule('body' => 'definition_star sequence').as 'body'
     def reduce_body(_production, _range, _tokens, theChildren)
@@ -209,6 +209,45 @@ module Skeem
     def reduce_conditional(_production, aRange, _tokens, theChildren)
       SkmCondition.new(aRange, theChildren[2], theChildren[3], theChildren[4])
     end
+
+    # rule('quasiquotation' => 'LPAREN QUASIQUOTE qq_template RPAREN').as 'quasiquotation'
+    def reduce_quasiquotation(_production, aRange, _tokens, theChildren)
+      SkmQuasiquotation.new(theChildren[2])
+    end
+
+    # rule('quasiquotation' => 'GRAVE_ACCENT qq_template').as 'quasiquotation_short'
+    def reduce_quasiquotation_short(_production, aRange, _tokens, theChildren)
+      # $stderr.puts theChildren[1].inspect
+      SkmQuasiquotation.new(theChildren[1])
+    end
+    
+    # rule('list_qq_template' => 'LPAREN qq_template_or_splice_star RPAREN').as 'list_qq'
+    def reduce_list_qq(_production, _range, _tokens, theChildren)
+      SkmList.new(theChildren[1])
+    end    
+
+    # rule('vector_qq_template' => 'VECTOR_BEGIN qq_template_or_splice_star RPAREN').as 'vector_qq'
+    def reduce_vector_qq(_production, _range, _tokens, theChildren)
+      SkmVector.new(theChildren[1])
+    end
+    
+    # rule('unquotation' => 'COMMA qq_template').as 'unquotation_short'
+    def reduce_unquotation_short(_production, aRange, _tokens, theChildren)
+      SkmUnquotation.new(theChildren[1])
+    end
+    
+
+    # rule('qq_template_or_splice_star' => 'qq_template_or_splice_star qq_template_or_splice').as 'multiple_template_splice'
+    def reduce_multiple_template_splice(_production, _range, _tokens, theChildren)
+      theChildren[0] << theChildren[1]
+    end
+
+    # rule('qq_template_or_splice_star' => []).as 'no_template_splice_yet'
+    def reduce_no_template_splice_yet(_production, _range, _tokens, theChildren)
+      []
+    end
+
+
   end # class
 end # module
 # End of file