skeem 0.2.17 → 0.2.18

data/lib/skeem/grammar.rb

@@ -9,7 +9,7 @@ module Skeem
   # Official Small Scheme grammar is available at:
   # https://bitbucket.org/cowan/r7rs/src/draft-10/rnrs/r7rs.pdf
   # Names of grammar elements are based on the R7RS documentation
-  builder = Rley::Syntax::GrammarBuilder.new do
+  builder = Rley::grammar_builder do
     # Delimiters, separators...
     add_terminals('APOSTROPHE', 'COMMA', 'COMMA_AT_SIGN')
     add_terminals('GRAVE_ACCENT', 'LPAREN', 'RPAREN')
@@ -22,7 +22,7 @@ module Skeem
 
     # Keywords...
     add_terminals('BEGIN', 'COND', 'DEFINE', 'DEFINE-SYNTAX', 'DO')
-    add_terminals('ELSE', 'IF', 'INCLUDE', 'LAMBDA', 'LET', 'LET*')
+    add_terminals('ELSE', 'IF', 'INCLUDE', 'LAMBDA', 'LET', 'LET_STAR')
     add_terminals('QUOTE', 'QUASIQUOTE', 'SET!', 'SYNTAX-RULES')
     add_terminals('UNQUOTE', 'UNQUOTE-SPLICING')
 
@@ -108,7 +108,7 @@ module Skeem
     rule('derived_expression' => 'LPAREN LET LPAREN binding_spec_star RPAREN body RPAREN').as 'short_let_form'
     # TODO: implement "named let"
     rule('derived_expression' => 'LPAREN LET IDENTIFIER LPAREN binding_spec_star RPAREN body RPAREN') # .as 'named_form'
-    rule('derived_expression' => 'LPAREN LET* LPAREN binding_spec_star RPAREN body RPAREN').as 'let_star_form'
+    rule('derived_expression' => 'LPAREN LET_STAR LPAREN binding_spec_star RPAREN body RPAREN').as 'let_star_form'
 
     # As the R7RS grammar is too restrictive,
     # the next rule was made more general than its standard counterpart

data/lib/skeem/interpreter.rb

@@ -45,7 +45,7 @@ module Skeem
     end
 
     def add_standard(_runtime)
-      std_pathname = File.dirname(__FILE__) + '/standard/base.skm'
+      std_pathname = "#{File.dirname(__FILE__)}/standard/base.skm"
       load_lib(std_pathname)
     end
 

data/lib/skeem/primitive/primitive_builder.rb

@@ -234,20 +234,17 @@ module Skeem
           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
-
             arglist.each do |elem|
               elem_value = elem.value
               case [raw_result.class, elem_value.class]
-                when [int_class, int_class]
+                when [Integer, Integer]
                   if raw_result.modulo(elem_value).zero?
                     raw_result /= elem_value
                   else
                     raw_result = Rational(raw_result, elem_value)
                   end
 
-                when [int_class, Rational]
+                when [Integer, Rational]
                   raw_result *= reciprocal(elem_value)
 
                 when [Rational, Rational]
@@ -827,8 +824,6 @@ module Skeem
                 cloned = arg.klone
                 if result.kind_of?(SkmEmptyList)
                   result = cloned
-                elsif result.kind_of?(SkmEmptyList)
-                  result = SkmPair.new(arg, SkmEmptyList.instance)
                 else
                   result.append_list(cloned)
                 end
@@ -945,7 +940,7 @@ module Skeem
                 break
               end
               pair = pair.cdr
-              break unless pair&.kind_of?(SkmPair)
+              break unless pair.kind_of?(SkmPair)
             end
           end
 
@@ -967,7 +962,7 @@ module Skeem
                 break
               end
               pair = pair.cdr
-              break unless pair&.kind_of?(SkmPair)
+              break unless pair.kind_of?(SkmPair)
             end
           end
 
@@ -1142,7 +1137,7 @@ module Skeem
             # Error: assertion failed: (> 1 2)
             msg1 = "assertion failed on line #{pos.line}, column #{pos.column}"
             msg2 = ", with #{arg_evaluated.inspect}"
-            raise StandardError, 'Error: ' + msg1 + msg2
+            raise StandardError, "Error: #{msg1}#{msg2}"
           else
             boolean(true)
           end
@@ -1165,7 +1160,7 @@ module Skeem
       # Non-standard procedure reserved for internal testing/debugging purposes.
       def create_inspect(aRuntime)
         primitive = lambda do |_runtime, arg_evaluated|
-          $stderr.puts 'INSPECT>' + arg_evaluated.inspect
+          $stderr.puts "INSPECT>#{arg_evaluated.inspect}"
           Skeem::SkmUndefined.instance
         end
         define_primitive_proc(aRuntime, '_inspect', unary, primitive)
@@ -1233,7 +1228,7 @@ module Skeem
         else
           msg2 = "but got #{argument.class}"
         end
-        raise StandardError, msg1 + ' ' + msg2
+        raise StandardError, "#{msg1} #{msg2}"
       end
 
       def remaining_args(arglist, aRuntime)

data/lib/skeem/primitive/primitive_procedure.rb

@@ -42,10 +42,11 @@ module Skeem
         check_actual_count(actuals)
         # TODO: check that next line became useless
         # aProcedureCall.operands_consumed = true
-        result = do_call(aRuntime, actuals)
+        # result = do_call(aRuntime, actuals)
         # $stderr.puts "  Result: #{result.inspect}"
         # $stderr.puts "--- End of procedure #{identifier}"
-        result
+        # result
+        do_call(aRuntime, actuals)
       end
 
       def skm_equal?(other)
@@ -146,20 +147,20 @@ module Skeem
 
       def error_lambda(message_suffix)
         msg1 = "Primitive procedure '#{identifier.value}'"
-        raise StandardError, msg1 + ' ' + message_suffix
+        raise StandardError, "#{msg1} #{message_suffix}"
       end
 
       def discrepancy_arity_argument_count(arity_required, count_param, delta)
         msg1 = "Discrepancy in primitive procedure '#{identifier.value}'"
         msg2 = "between arity (#{arity_required}) + #{delta}"
         msg3 = "and parameter count of lambda #{count_param}."
-        raise StandardError, msg1 + ' ' + msg2 + ' ' + msg3
+        raise StandardError, "#{msg1} #{msg2} #{msg3}"
       end
 
       def wrong_number_arguments(required, actual)
         msg1 = "Wrong number of arguments for #<Procedure #{identifier.value}>"
         msg2 = "(required at least #{required}, got #{actual})"
-        raise StandardError, msg1 + ' ' + msg2
+        raise StandardError, "#{msg1} #{msg2}"
       end
     end # class
   end # module

data/lib/skeem/runtime.rb

@@ -124,16 +124,14 @@ module Skeem
     private
 
     def normalize_key(aKey)
-      result = case aKey
-                 when String
-                   aKey
-                 when SkmVariableReference
-                    aKey.child.value
-                 else
-                   aKey.evaluate(self).value
-               end
-
-      result
+      case aKey
+        when String
+          aKey
+        when SkmVariableReference
+          aKey.child.value
+        else
+          aKey.evaluate(self).value
+      end
     end
   end # class
 end # module

data/lib/skeem/s_expr_builder.rb

@@ -24,17 +24,6 @@ module Skeem
       'STRING_LIT' => SkmString
     }.freeze
 
-    # Create a new AST builder instance.
-    # @param theTokens [Array<Token>] The sequence of input tokens.
-    def initialize(theTokens)
-      super(theTokens)
-    end
-
-    # Notification that the parse tree construction is complete.
-    def done!
-      super
-    end
-
     protected
 
     def terminal2node
@@ -191,9 +180,10 @@ module Skeem
 
     # rule('lambda_expression' => 'LPAREN LAMBDA formals body RPAREN').as 'lambda_expression'
     def reduce_lambda_expression(_production, aRange, _tokens, theChildren)
-      lmbd = SkmLambdaRep.new(aRange, theChildren[2], theChildren[3])
+      # lmbd = SkmLambdaRep.new(aRange, theChildren[2], theChildren[3])
       # $stderr.puts lmbd.inspect
-      lmbd
+      # lmbd
+      SkmLambdaRep.new(aRange, theChildren[2], theChildren[3])
     end
 
     # rule('formals' => 'LPAREN identifier_star RPAREN').as 'fixed_arity_formals'

data/lib/skeem/s_expr_nodes.rb

@@ -103,8 +103,8 @@ module Skeem
     end
 
     def inspect
-      result = inspect_prefix + operator.inspect + ', '
-      result << '@operands ' + operands.inspect + inspect_suffix
+      result = +"#{inspect_prefix}#{operator.inspect}, "
+      result << "@operands #{operands.inspect}#{inspect_suffix}"
       result
     end
 
@@ -127,12 +127,10 @@ module Skeem
 
           callee = result
           # callee = fetch_callee(aRuntime, result)
-        when Primitive::PrimitiveProcedure
+        when Primitive::PrimitiveProcedure, SkmLambda
           callee = operator
         when SkmLambdaRep
           callee = operator.evaluate(aRuntime)
-        when SkmLambda
-          callee = operator
         else
           result = operator.evaluate(aRuntime)
           if result.kind_of?(Primitive::PrimitiveProcedure)
@@ -225,9 +223,9 @@ module Skeem
     end
 
     def inspect
-      result = inspect_prefix + '@test ' + test.inspect + ', '
-      result << '@consequent ' + consequent.inspect + ', '
-      result << '@alternate ' + alternate.inspect + inspect_suffix
+      result = +"#{inspect_prefix}@test #{test.inspect}, "
+      result << "@consequent #{consequent.inspect}, "
+      result << "@alternate #{alternate.inspect}#{inspect_suffix}"
       result
     end
 
@@ -236,7 +234,6 @@ module Skeem
     end
   end # class
 
-
   class SkmConditional < SkmMultiExpression
     # An array of couples [test, sequence]
     attr_reader :clauses
@@ -280,20 +277,23 @@ module Skeem
     end
 
     def inspect
-      result = inspect_prefix + '@test ' + test.inspect + ', '
+      result = "#{inspect_prefix}@test #{test.inspect} , "
       result << "@clauses \n"
       clauses.each do |(test, consequent)|
         result << '  ' << test.inspect << ' ' << consequent.inspect << "\n"
       end
-      result << '@alternate ' + alternate.inspect + inspect_suffix
+      result << "@alternate #{alternate.inspect}#{inspect_suffix}"
       result
     end
   end # class
 
   SkmArity = Struct.new(:low, :high) do
+    # rubocop: disable Style/NumericPredicate
+
     def nullary?
       low.zero? && high == 0
     end
+    # rubocop: enable Style/NumericPredicate
 
     def variadic?
       high == '*'
@@ -446,6 +446,7 @@ module Skeem
     attr_reader :update_steps
 
     def initialize(aTest, doResult, theCommands, theUpdates)
+      super(nil)
       @test = aTest
       @do_result = doResult
       @commands = theCommands
@@ -546,7 +547,6 @@ module Skeem
     end
   end # class
 
-
   # Parse tree representation of a Lambda
   # - Not bound to a frame (aka environment)
   # - Knows the parse representation of its embedded definitions
@@ -629,9 +629,7 @@ module Skeem
         variadic_part_raw = actuals.drop(required_arity)
         variadic_part = variadic_part_raw.map do |actual|
           case actual
-            when ProcedureCall
-              actual.evaluate(aRuntime)
-            when SkmQuotation
+            when ProcedureCall, SkmQuotation
               actual.evaluate(aRuntime)
             else
               to_datum(actual)
@@ -697,9 +695,9 @@ module Skeem
 
     def inspect_specific
       result = +''
-      result << '@formals ' + formals.inspect + ', '
-      result << '@definitions ' + definitions.inspect + ', '
-      result << '@sequence ' + sequence.inspect + inspect_suffix
+      result << "@formals #{formals.inspect}, "
+      result << "@definitions #{definitions.inspect}, "
+      result << "@sequence #{sequence.inspect}#{inspect_suffix}"
 
       result
     end
@@ -715,6 +713,7 @@ module Skeem
     def_delegators(:@representation, :formals, :definitions, :sequence)
 
     def initialize(aRepresentation, aRuntime)
+      super(nil)
       @representation = aRepresentation
       @environment = aRuntime.environment
     end
@@ -790,9 +789,7 @@ module Skeem
         variadic_part_raw = actuals.drop(required_arity)
         variadic_part = variadic_part_raw.map do |actual|
           case actual
-            when ProcedureCall
-              actual.evaluate(aRuntime)
-            when SkmQuotation
+            when ProcedureCall, SkmQuotation
               actual.evaluate(aRuntime)
             else
               to_datum(actual)
@@ -814,20 +811,17 @@ module Skeem
 
     def evaluate_sequence(aRuntime)
       result = nil
-      if sequence&.each do |cmd|
-          begin
-            if cmd.kind_of?(SkmLambda)
-              result = cmd.dup_cond(aRuntime)
-            else
-              result = cmd.evaluate(aRuntime)
-            end
-          rescue NoMethodError => e
-            $stderr.puts inspect
-            $stderr.puts sequence.inspect
-            $stderr.puts cmd.inspect
-            raise e
-          end
+      sequence&.each do |cmd|
+        if cmd.kind_of?(SkmLambda)
+          result = cmd.dup_cond(aRuntime)
+        else
+          result = cmd.evaluate(aRuntime)
         end
+        rescue NoMethodError => e
+          $stderr.puts inspect
+          $stderr.puts sequence.inspect
+          $stderr.puts cmd.inspect
+          raise e
       end
 
       result
@@ -835,22 +829,18 @@ module Skeem
 
     def dup_cond(aRuntime)
       if environment
-        result = self
+        self
       else
         twin = dup
         twin.set_cond_environment(aRuntime.environment)
-        result = twin
+        twin
       end
-
-      result
     end
 
     def doppelganger(aRuntime)
       twin = dup
       twin.set_cond_environment(aRuntime.environment.dup)
-      result = twin
-
-      result
+      twin
     end
 
     def set_cond_environment(theFrame)
@@ -917,9 +907,9 @@ module Skeem
         result << "Parent environment #{environment.parent.object_id.to_s(16)}, "
         result << environment.inspect
       end
-      result << '@formals ' + formals.inspect + ', '
-      result << '@definitions ' + definitions.inspect + ', '
-      result << '@sequence ' + sequence.inspect + inspect_suffix
+      result << "@formals #{formals.inspect}, "
+      result << "@definitions #{definitions.inspect}, "
+      result << "@sequence #{sequence.inspect}#{inspect_suffix}"
 
       result
     end

data/lib/skeem/skeem_exception.rb

@@ -0,0 +1 @@
+# frozen_string_literal: true

data/lib/skeem/skm_binding.rb

@@ -17,10 +17,13 @@ module Skeem
     # @param anIdentifier [SkmIdentifier] The variable name
     # @param aValue [SkmElement] The value to bind to the variable.
     def initialize(anIdentifier, aValue)
+      super(nil)
       @variable = anIdentifier
       @value = aValue
     end
 
+    # rubocop: disable Style/NegatedIfElseCondition
+
     def evaluate(aRuntime)
       name = variable.evaluate(aRuntime)
 
@@ -42,6 +45,7 @@ module Skeem
       binding_action(aRuntime, name, result)
       result
     end
+    # rubocop: enable Style/NegatedIfElseCondition
 
     protected
 
@@ -59,7 +63,6 @@ module Skeem
     end
   end # class
 
-
   class SkmUpdateBinding < SkmBinding
     protected
 
@@ -71,10 +74,6 @@ module Skeem
   class SkmDelayedUpdateBinding < SkmBinding
     attr_reader :new_val
 
-    def initialize(anIdentifier, aValue)
-      super(anIdentifier, aValue)
-    end
-
     def do_it!(aRuntime)
       aRuntime.update_binding(variable, new_val)
     end

data/lib/skeem/skm_compound_datum.rb

@@ -22,13 +22,12 @@ module Skeem
     def ==(other)
       return true if equal?(other)
 
-      result = case other
+      case other
         when SkmCompoundDatum
           self.class == other.class && members == other.members
         when Array
           members == other
       end
-      result
     end
 
     alias eqv? equal?
@@ -70,7 +69,7 @@ module Skeem
 
     def inspect_specific
       result = +''
-      members.each { |elem| result << elem.inspect + ', ' }
+      members.each { |elem| result << "#{elem.inspect}, " }
       result.sub!(/, $/, '')
       result
     end