skeem 0.2.16 → 0.2.20

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
@@ -168,16 +157,6 @@ module Skeem
       pcall
     end
 
-    # rule('operand_plus' => 'operand_plus operand').as 'multiple_operands'
-    def reduce_multiple_operands(_production, _range, _tokens, theChildren)
-      theChildren[0] << theChildren[1]
-    end
-
-    # rule('operand_plus' => 'operand').as 'last_operand'
-    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)
@@ -191,9 +170,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'
@@ -212,16 +192,6 @@ module Skeem
       SkmFormals.new(formals, :variadic)
     end
 
-    # rule('identifier_plus' => 'identifier_plus IDENTIFIER').as 'multiple_identifiers'
-    def reduce_multiple_identifiers(_production, _range, _tokens, theChildren)
-      theChildren[0] << theChildren[1]
-    end
-
-    # rule('identifier_plus' => 'IDENTIFIER').as 'last_identifier'
-    def reduce_last_identifier(_production, _range, _tokens, theChildren)
-      [theChildren[0]]
-    end
-
     # rule('body' => 'definition_star sequence').as 'body'
     def reduce_body(_production, _range, _tokens, theChildren)
       definitions = theChildren[0].nil? ? [] : theChildren[0]
@@ -235,7 +205,8 @@ module Skeem
 
     # rule('conditional' => 'LPAREN IF test consequent alternate RPAREN').as 'conditional'
     def reduce_conditional(_production, aRange, _tokens, theChildren)
-      SkmCondition.new(aRange, theChildren[2], theChildren[3], theChildren[4])
+      children = theChildren.flatten
+      SkmCondition.new(aRange, children[2], children[3], children[4])
     end
 
     # rule('assignment' => 'LPAREN SET! IDENTIFIER expression RPAREN').as 'assignment'
@@ -283,16 +254,6 @@ module Skeem
       SkmBindingBlock.new(:let_star, worker.bindings, body)
     end
 
-    # rule('cond_clause_plus' => 'cond_clause_plus cond_clause').as 'multiple_cond_clauses'
-    def reduce_multiple_cond_clauses(_production, _range, _tokens, theChildren)
-      theChildren[0] << theChildren[1]
-    end
-
-    # rule('cond_clause_plus' => 'cond_clause').as 'last_cond_clauses'
-    def reduce_last_cond_clauses(_production, _range, _tokens, theChildren)
-      [theChildren[0]]
-    end
-
     # rule('cond_clause' => 'LPAREN test sequence RPAREN').as 'cond_clause'
     def reduce_cond_clause(_production, _range, _tokens, theChildren)
       [theChildren[1], SkmSequencingBlock.new(SkmPair.create_from_a(theChildren[2]))]
@@ -328,27 +289,27 @@ module Skeem
       SkmIterationSpec.new(theChildren[1], theChildren[2], nil)
     end
 
-    # rule('do_result' => []).as 'empty_do_result'
-    def reduce_empty_do_result(_production, _range, _tokens, _children)
-      SkmEmptyList.instance
+    # rule('do_result' => 'sequence?')
+    def reduce_do_result(_production, _range, _tokens, theChildren)
+      children = theChildren.flatten
+      if children.empty?
+        SkmEmptyList.instance
+      else
+        children[0]
+      end
     end
 
+    # rule('do_result' => []).as 'empty_do_result'
+    # def reduce_empty_do_result(_production, _range, _tokens, _children)
+    #   SkmEmptyList.instance
+    # end
+
     # rule('includer' => 'LPAREN INCLUDE string_plus RPAREN').as 'include'
     def reduce_include(_production, _range, _tokens, theChildren)
       includer = SkmIncluder.new(theChildren[2])
       includer.build
     end
 
-    # rule('string_plus' => 'string_plus STRING_LIT').as 'multiple_string'
-    def reduce_multiple_string(_production, _range, _tokens, theChildren)
-      theChildren[0] << theChildren[1]
-    end
-
-    # rule('string_plus' => 'STRING_LIT').as 'last_single_string'
-    def reduce_last_single_string(_production, _range, _tokens, theChildren)
-      [theChildren[0]]
-    end
-
     # rule('list_qq_template' => 'LPAREN qq_template_or_splice_star RPAREN').as 'list_qq'
     def reduce_list_qq(_production, _range, _tokens, theChildren)
       SkmPair.create_from_a(theChildren[1])

data/lib/skeem/s_expr_nodes.rb

@@ -9,6 +9,8 @@ require_relative 'datum_dsl'
 require_relative 'skm_unary_expression'
 require_relative 'skm_procedure_exec'
 
+# rubocop: disable Style/AccessorGrouping
+
 module Skeem
   class SkmUndefined
     include Singleton
@@ -103,8 +105,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 +129,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)
@@ -145,6 +145,8 @@ module Skeem
       [:callee, callee]
     end
 
+    # rubocop: disable Style/RedundantAssignment
+
     def fetch_callee(aRuntime, var_key)
       begin
         aRuntime.include?(var_key.value)
@@ -174,6 +176,8 @@ module Skeem
       callee
     end
 
+    # rubocop: enable Style/RedundantAssignment
+
     def transform_operands(aRuntime)
       return [] if operands == SkmEmptyList.instance
 
@@ -225,9 +229,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 +240,6 @@ module Skeem
     end
   end # class
 
-
   class SkmConditional < SkmMultiExpression
     # An array of couples [test, sequence]
     attr_reader :clauses
@@ -280,20 +283,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 +452,7 @@ module Skeem
     attr_reader :update_steps
 
     def initialize(aTest, doResult, theCommands, theUpdates)
+      super(nil)
       @test = aTest
       @do_result = doResult
       @commands = theCommands
@@ -546,7 +553,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 +635,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 +701,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 +719,7 @@ module Skeem
     def_delegators(:@representation, :formals, :definitions, :sequence)
 
     def initialize(aRepresentation, aRuntime)
+      super(nil)
       @representation = aRepresentation
       @environment = aRuntime.environment
     end
@@ -790,9 +795,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,21 +817,17 @@ module Skeem
 
     def evaluate_sequence(aRuntime)
       result = nil
-      if sequence
-        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
@@ -836,24 +835,22 @@ 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
 
+    # rubocop: disable Naming/AccessorMethodName
+
     def set_cond_environment(theFrame)
       # $stderr.puts "Lambda #{object_id.to_s(16)}, env [#{environment.object_id.to_s(16)}]"
       # $stderr.puts "  Runtime environment: #{theFrame.object_id.to_s(16)}"
@@ -867,6 +864,8 @@ module Skeem
       end
     end
 
+    # rubocop: enable Naming/AccessorMethodName
+
     private
 
     # Purpose: bind each formal from lambda to an actual value from the call
@@ -918,12 +917,14 @@ 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
   end # class
 end # module
+
+# rubocop: enable Style/AccessorGrouping
 # End of file

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

data/lib/skeem/skm_element.rb

@@ -138,7 +138,7 @@ module Skeem
     end
 
     def inspect_specific
-      raise NotImplementedError, "Missing #{self.class.to_s + '#' + 'inspect_specific'}"
+      raise NotImplementedError, "Missing #{self.class}#inspect_specific"
     end
   end # struct
 end # module

data/lib/skeem/skm_pair.rb

@@ -4,7 +4,10 @@ require_relative 'skm_empty_list'
 
 module Skeem
   class SkmPair < SkmElement
+    # @return [SkmElement]
     attr_accessor :car
+
+    # @return [SkmElement]
     attr_accessor :cdr
 
     alias first car
@@ -168,8 +171,8 @@ module Skeem
         begin
           result = clone_evaluate(aRuntime)
         rescue NoMethodError => e
-          $stderr.puts 'SkmPair#evaluate:   ' + inspect
-          $stderr.puts 'SkmPair as Array:   ' + to_a.inspect
+          $stderr.puts "SkmPair#evaluate:   #{inspect}"
+          $stderr.puts "SkmPair as Array:   #{to_a.inspect}"
           raise e
         end
       end

data/lib/skeem/skm_procedure_exec.rb

@@ -4,7 +4,10 @@ require_relative 'runtime'
 
 module Skeem
   class SkmProcedureExec
+    # @return [SkmFrame]
     attr_reader :frame
+
+    # @return [SkmLambda]
     attr_reader :definition
 
     def initialize(aLambda)

data/lib/skeem/skm_simple_datum.rb

@@ -6,7 +6,10 @@ module Skeem
   # Abstract class. Root of class hierarchy needed for Interpreter
   # design pattern
   class SkmSimpleDatum < SkmElement
+    # @return [Rley::Syntax::Token] token object corresponding to Skeem element
     attr_reader :token
+
+    # @return [Object]
     attr_reader :value
 
     def initialize(aToken, aPosition)
@@ -37,13 +40,11 @@ module Skeem
     def ==(other)
       return true if equal?(other)
 
-      result = if other.kind_of?(SkmSimpleDatum)
-          value == other.value
-        else
-          value == other
-        end
-
-      result
+      if other.kind_of?(SkmSimpleDatum)
+        value == other.value
+      else
+        value == other
+      end
     end
 
     alias eqv? ==
@@ -104,10 +105,12 @@ module Skeem
       false
     end
 
+    # rubocop: disable Style/NegatedIfElseCondition
+
     def eqv?(other)
       return true if equal?(other)
 
-      result = if other.kind_of?(SkmNumber)
+      if other.kind_of?(SkmNumber)
         if exact? != other.exact?
           false
         else
@@ -116,9 +119,8 @@ module Skeem
       else
         value == other
       end
-
-      result
     end
+    # rubocop: enable Style/NegatedIfElseCondition
   end # class
 
   class SkmReal < SkmNumber

data/lib/skeem/skm_unary_expression.rb

@@ -76,8 +76,7 @@ module Skeem
     end
 
     def quasiquote(aRuntime)
-      result = evaluate(aRuntime)
-      result
+      evaluate(aRuntime)
     end
 
     protected
@@ -115,7 +114,10 @@ module Skeem
   class SkmBindingBlock < SkmUnaryExpression
     alias body child
 
+    # @return [Symbol] One of: :let, :let_star
     attr_reader :kind
+
+    # @return [Array<SkmBinding>]
     attr_reader :bindings
 
     def initialize(theKind, theBindings, aBody)
@@ -126,14 +128,15 @@ module Skeem
 
     def evaluate(aRuntime)
       aRuntime.push(SkmFrame.new(aRuntime.environment))
-      if kind == :let
+      case kind
+      when :let
         locals = bindings.map do |bnd|
           SkmBinding.new(bnd.variable, bnd.value.evaluate(aRuntime))
         end
         locals.each do |bnd|
           aRuntime.add_binding(bnd.variable.evaluate(aRuntime), bnd.value)
         end
-      elsif kind == :let_star
+      when :let_star
         bindings.each do |bnd|
           val = bnd.value.evaluate(aRuntime)
           aRuntime.add_binding(bnd.variable.evaluate(aRuntime), val)
@@ -186,18 +189,16 @@ module Skeem
     def eval_pair(aRuntime)
       result = nil
       sequence.to_a.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
+        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
@@ -215,18 +216,16 @@ module Skeem
 
       if sequence[:sequence].kind_of?(SkmPair)
         sequence[:sequence].to_a.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[:sequence].inspect
-            $stderr.puts cmd.inspect
-            raise e
+          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[:sequence].inspect
+          $stderr.puts cmd.inspect
+          raise e
         end
       else
         result = sequence.evaluate(aRuntime)