skeem 0.2.18 → 0.2.21

data/CHANGELOG.md

@@ -1,3 +1,28 @@
+## [0.2.21] - 2022-04-24
+- Dependencies updates, minor changes
+
+### Changed
+- File `.rubocop.yml` Incorporating new Rubocop cops (up to version 1.28)
+- File `grammar.rb`: Refactoring of a rule with grouping parentheses
+- File `s_expr_builder` Change to relfect changes in grammar
+- File `skeem.gempsec` Updated dependencies; minimal Ruby version is now 2.6+
+
+## [0.2.20] - 2021-11-01
+- Code update to cope with changes in `Rley` v. 0.8.08
+
+
+- File `s_expr_builder.rb`: Refactoring to cope with ? quantifier changes
+- File `skeem.gemspec` dependency updated for `Rley` v. 0.8.08
+
+## [0.2.19] - 2021-08-30
+- Grammar refactoring: use ?, * and + modifiers in Rley 0.8.03 rules
+
+### Changed
+- File `grammar.rb`: Remove redundant rules after introduction of ?, * and + modifiers
+- Class `SkmBuilder`: Removal of useless methods after removal of their rule counterpart
+
+
+
 ## [0.2.18] - 2021-08-29
 - Minor refactoring for Rley 0.8.03
 - Code restyling to please rubocop 1.19.1.

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2018-2019 Dimitri Geshef
+Copyright (c) 2018-2022 Dimitri Geshef
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -392,7 +392,7 @@ This project is intended to be a safe, welcoming space for collaboration, and co
 
 Copyright
 ---------
-Copyright (c) 2018-2019, Dimitri Geshef.  
+Copyright (c) 2018-2021, Dimitri Geshef.  
 __Skeem__ is released under the MIT License see [LICENSE.txt](https://github.com/famished-tiger/Skeem/blob/master/LICENSE.txt) for details.
 
 ## Code of Conduct

data/lib/skeem/grammar.rb

@@ -6,7 +6,7 @@ require 'rley' # Load the gem
 module Skeem
   ########################################
   # Define a grammar for Skeem
-  # Official Small Scheme grammar is available at:
+  # The official Small Scheme language 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::grammar_builder do
@@ -36,7 +36,7 @@ module Skeem
     rule('definition' => 'LPAREN DEFINE IDENTIFIER expression RPAREN').as 'definition'
     rule('definition' => 'LPAREN DEFINE LPAREN IDENTIFIER def_formals RPAREN body RPAREN').as 'alt_definition'
     rule('definition' => 'syntax_definition')
-    rule('definition' => 'LPAREN BEGIN definition_star RPAREN').as 'definitions_within_begin'
+    rule('definition' => 'LPAREN BEGIN definition* RPAREN').as 'definitions_within_begin'
     rule('expression' => 'IDENTIFIER').as 'variable_reference'
     rule 'expression' => 'literal'
     rule 'expression' => 'procedure_call'
@@ -63,143 +63,103 @@ module Skeem
     rule 'simple_datum' => 'symbol'
     rule 'compound_datum' => 'list'
     rule 'compound_datum' => 'vector'
-    rule('list' => 'LPAREN datum_star RPAREN').as 'list'
+    rule('list' => 'LPAREN datum* RPAREN').as 'list'
     rule('list' => 'LPAREN datum_plus PERIOD datum RPAREN').as 'dotted_list'
-    rule('vector' => 'VECTOR_BEGIN datum_star RPAREN').as 'vector'
+    rule('vector' => 'VECTOR_BEGIN datum* RPAREN').as 'vector'
     rule('datum_plus' => 'datum_plus datum').as 'multiple_datums'
     rule('datum_plus' => 'datum').as 'last_datum'
-    rule('datum_star' => 'datum_star datum').as 'star_default'
-    rule('datum_star' => []).as 'star_base' ## 'no_datum_yet'
     rule 'symbol' => 'IDENTIFIER'
     rule('procedure_call' => 'LPAREN operator RPAREN').as 'proc_call_nullary'
-    rule('procedure_call' => 'LPAREN operator operand_plus RPAREN').as 'proc_call_args'
-    rule('operand_plus' => 'operand_plus operand').as 'multiple_operands'
-    rule('operand_plus' => 'operand').as 'last_operand'
+    rule('procedure_call' => 'LPAREN operator operand+ RPAREN').as 'proc_call_args'
     rule 'operator' => 'expression'
     rule 'operand' => 'expression'
-    rule('def_formals' => 'identifier_star').as 'def_formals'
-    rule('def_formals' => 'identifier_star PERIOD IDENTIFIER').as 'pair_formals'
+    rule('def_formals' => 'IDENTIFIER*').as 'def_formals'
+    rule('def_formals' => 'IDENTIFIER* PERIOD IDENTIFIER').as 'pair_formals'
     rule('lambda_expression' => 'LPAREN LAMBDA formals body RPAREN').as 'lambda_expression'
-    rule('formals' => 'LPAREN identifier_star RPAREN').as 'fixed_arity_formals'
+    rule('formals' => 'LPAREN IDENTIFIER* RPAREN').as 'fixed_arity_formals'
     rule('formals' => 'IDENTIFIER').as 'variadic_formals'
-    rule('formals' => 'LPAREN identifier_plus PERIOD IDENTIFIER RPAREN').as 'dotted_formals'
+    rule('formals' => 'LPAREN IDENTIFIER+ PERIOD IDENTIFIER RPAREN').as 'dotted_formals'
     rule('syntax_definition' => 'LPAREN DEFINE-SYNTAX keyword transformer_spec RPAREN').as 'syntax_definition'
-    rule('identifier_star' => 'identifier_star IDENTIFIER').as 'star_default'
-    rule('identifier_star' => []).as 'star_base' ## 'no_identifier_yet'
-    rule('identifier_plus' => 'identifier_plus IDENTIFIER').as 'multiple_identifiers'
-    rule('identifier_plus' => 'IDENTIFIER').as 'last_identifier'
-    rule('body' => 'definition_star sequence').as 'body'
-    rule('definition_star' => 'definition_star definition').as 'star_default'
-    rule('definition_star' => []).as 'star_base' ## 'no_definition_yet'
-    rule('sequence' => 'command_star expression').as 'sequence'
-    rule('command_star' => 'command_star command').as 'star_default'
-    rule('command_star' => []).as 'star_base' ## 'no_command_yet'
-    rule('conditional' => 'LPAREN IF test consequent alternate RPAREN').as 'conditional'
+    rule('body' => 'definition* sequence').as 'body'
+    rule('sequence' => 'command* expression').as 'sequence'
+    rule('conditional' => 'LPAREN IF test consequent expression? RPAREN').as 'conditional'
     rule 'test' => 'expression'
     rule 'consequent' => 'expression'
-    rule 'alternate' => 'expression'
-    rule 'alternate' => []
     rule 'number' => 'INTEGER'
     rule 'number' => 'RATIONAL'
     rule 'number' => 'REAL'
     rule('assignment' => 'LPAREN SET! IDENTIFIER expression RPAREN').as 'assignment'
-    rule('derived_expression' => 'LPAREN COND cond_clause_plus RPAREN').as 'cond_form'
-    rule('derived_expression' => 'LPAREN COND cond_clause_star LPAREN ELSE sequence RPAREN RPAREN').as 'cond_else_form'
-    rule('derived_expression' => 'LPAREN LET LPAREN binding_spec_star RPAREN body RPAREN').as 'short_let_form'
+    rule('derived_expression' => 'LPAREN COND cond_clause* (LPAREN ELSE sequence RPAREN)? RPAREN').as 'cond_form'
+    rule('derived_expression' => 'LPAREN LET LPAREN binding_spec* 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_STAR LPAREN binding_spec_star RPAREN body RPAREN').as 'let_star_form'
+    rule('derived_expression' => 'LPAREN LET IDENTIFIER LPAREN binding_spec* RPAREN body RPAREN') # .as 'named_form'
+    rule('derived_expression' => 'LPAREN LET_STAR LPAREN binding_spec* 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
     rule('derived_expression' => 'LPAREN BEGIN body RPAREN').as 'begin_expression'
     do_syntax = <<-END_SYNTAX
-    LPAREN DO LPAREN iteration_spec_star RPAREN
+    LPAREN DO LPAREN iteration_spec* RPAREN
       LPAREN test do_result RPAREN
-      command_star RPAREN
+      rep_command_star RPAREN
 END_SYNTAX
     rule('derived_expression' => do_syntax).as 'do_expression'
     rule 'derived_expression' => 'quasiquotation'
-    rule('cond_clause_plus' => 'cond_clause_plus cond_clause').as 'multiple_cond_clauses'
-    rule('cond_clause_plus' => 'cond_clause').as 'last_cond_clauses'
-    rule('cond_clause_star' => 'cond_clause_star cond_clause').as 'star_default'
-    rule('cond_clause_star' => []).as 'star_base' ## 'last_cond_clauses_star'
     rule('cond_clause' => 'LPAREN test sequence RPAREN').as 'cond_clause'
     rule('cond_clause' => 'LPAREN test RPAREN')
     rule('cond_clause' => 'LPAREN test ARROW recipient RPAREN').as 'cond_arrow_clause'
     rule('recipient' => 'expression')
     rule('quasiquotation' => 'LPAREN QUASIQUOTE qq_template RPAREN').as 'quasiquotation'
     rule('quasiquotation' => 'GRAVE_ACCENT qq_template').as 'quasiquotation_short'
-    rule('binding_spec_star' => 'binding_spec_star binding_spec').as 'star_default'
-    rule('binding_spec_star' => []).as 'star_base' ## 'no_binding_spec_yet'
     rule('binding_spec' => 'LPAREN IDENTIFIER expression RPAREN').as 'binding_spec'
-    rule('iteration_spec_star' => 'iteration_spec_star iteration_spec').as 'star_default'
-    rule('iteration_spec_star' => []).as 'star_base' ## 'no_iter_spec_yet'
     rule('iteration_spec' => 'LPAREN IDENTIFIER init step RPAREN').as 'iteration_spec_long'
     rule('iteration_spec' => 'LPAREN IDENTIFIER init RPAREN').as 'iteration_spec_short'
     rule('init' => 'expression')
     rule('step' => 'expression')
-    rule 'do_result' => 'sequence'
-    rule('do_result' => []).as 'star_base' ## 'empty_do_result'
+    rule('do_result' => 'sequence?').tag 'do_result'
     rule('keyword' => 'IDENTIFIER')
-    rule('includer' => 'LPAREN INCLUDE string_plus RPAREN').as 'include'
-    rule('string_plus' => 'string_plus STRING_LIT').as 'multiple_string'
-    rule('string_plus' => 'STRING_LIT').as 'last_single_string'
+    rule('includer' => 'LPAREN INCLUDE STRING_LIT+ RPAREN').as 'include'
     rule 'qq_template' => 'simple_datum'
     rule 'qq_template' => 'list_qq_template'
     rule 'qq_template' => 'vector_qq_template'
     rule 'qq_template' => 'unquotation'
-    rule('list_qq_template' => 'LPAREN qq_template_or_splice_star RPAREN').as 'list_qq'
-    rule 'list_qq_template' => 'LPAREN qq_template_or_splice_plus PERIOD qq_template RPAREN'
+    rule('list_qq_template' => 'LPAREN qq_template_or_splice* RPAREN').as 'list_qq'
+    rule 'list_qq_template' => 'LPAREN qq_template_or_splice+ PERIOD qq_template RPAREN'
     rule 'list_qq_template' => 'GRAVE_ACCENT qq_template'
-    rule('vector_qq_template' => 'VECTOR_BEGIN qq_template_or_splice_star RPAREN').as 'vector_qq'
+    rule('vector_qq_template' => 'VECTOR_BEGIN qq_template_or_splice* RPAREN').as 'vector_qq'
     rule('unquotation' => 'COMMA qq_template').as 'unquotation_short'
     rule 'unquotation' => 'LPAREN UNQUOTE qq_template RPAREN'
-    rule('qq_template_or_splice_star' => 'qq_template_or_splice_star qq_template_or_splice').as 'star_default'
-    rule('qq_template_or_splice_star' => []).as 'star_base' ## 'no_template_splice_yet'
-    rule 'qq_template_or_splice_plus' => 'qq_template_or_splice_plus qq_template_or_splice'
-    rule 'qq_template_or_splice_plus' => 'qq_template_or_splice'
     rule 'qq_template_or_splice' => 'qq_template'
     rule 'qq_template_or_splice' => 'splicing_unquotation'
     rule 'splicing_unquotation' => 'COMMA_AT_SIGN qq_template'
     rule 'splicing_unquotation' => 'LPAREN UNQUOTE-SPLICING qq_template RPAREN'
-    rule('transformer_spec' => 'LPAREN SYNTAX-RULES LPAREN identifier_star RPAREN syntax_rule_star RPAREN').as 'transformer_syntax'
-    rule('transformer_spec' => 'LPAREN SYNTAX-RULES IDENTIFIER LPAREN identifier_star RPAREN syntax_rule_star RPAREN')
-    rule('syntax_rule_star' => 'syntax_rule_star syntax_rule').as 'star_default'
-    rule('syntax_rule_star' => []).as 'star_base'
+    rule('transformer_spec' => 'LPAREN SYNTAX-RULES LPAREN IDENTIFIER* RPAREN syntax_rule* RPAREN').as 'transformer_syntax'
+    rule('transformer_spec' => 'LPAREN SYNTAX-RULES IDENTIFIER LPAREN IDENTIFIER* RPAREN syntax_rule* RPAREN')
     rule('syntax_rule' => 'LPAREN pattern template RPAREN').as 'syntax_rule'
     rule('pattern' => 'pattern_identifier')
     rule('pattern' =>  'UNDERSCORE')
-    rule('pattern' =>  'LPAREN pattern_star RPAREN')
-    rule('pattern' =>  'LPAREN pattern_plus PERIOD pattern RPAREN')
-    rule('pattern' =>  'LPAREN pattern_plus ELLIPSIS pattern_star RPAREN')
-    rule('pattern' =>  'LPAREN pattern_plus ELLIPSIS pattern_star PERIOD pattern RPAREN')
-    rule('pattern' =>  'VECTOR_BEGIN pattern_star RPAREN')
-    rule('pattern' =>  'VECTOR_BEGIN pattern_plus ELLIPSIS pattern_star RPAREN')
+    rule('pattern' =>  'LPAREN pattern* RPAREN')
+    rule('pattern' =>  'LPAREN pattern+ PERIOD pattern RPAREN')
+    rule('pattern' =>  'LPAREN pattern+ ELLIPSIS pattern* RPAREN')
+    rule('pattern' =>  'LPAREN pattern+ ELLIPSIS pattern* PERIOD pattern RPAREN')
+    rule('pattern' =>  'VECTOR_BEGIN pattern* RPAREN')
+    rule('pattern' =>  'VECTOR_BEGIN pattern+ ELLIPSIS pattern* RPAREN')
     rule('pattern' =>  'pattern_datum')
-    rule('pattern_star' => 'pattern_star pattern').as 'star_default'
-    rule('pattern_star' => []).as 'star_base'
-    rule('pattern_plus' => 'pattern_plus pattern')
-    rule('pattern_plus' => 'pattern')
     rule('pattern_datum' => 'STRING_LIT')
     rule('pattern_datum' => 'CHAR')
     rule('pattern_datum' => 'BOOLEAN')
     rule('pattern_datum' => 'number')
     # rule('pattern_datum' => 'bytevector')
     rule('template' => 'pattern_identifier')
-    rule('template' => 'LPAREN template_element_star RPAREN')
-    rule('template' => 'LPAREN template_element_plus PERIOD template RPAREN')
-    rule('template' =>  'VECTOR_BEGIN template_element_star RPAREN')
+    rule('template' => 'LPAREN template_element* RPAREN')
+    rule('template' => 'LPAREN template_element+ PERIOD template RPAREN')
+    rule('template' =>  'VECTOR_BEGIN template_element* RPAREN')
     rule('template' =>  'template_datum')
-    rule('template_element_star' => 'template_element_star template_element').as 'star_default'
-    rule('template_element_star' => []).as 'star_base'
-    rule('template_element_plus' => 'template_element_plus template_element')
-    rule('template_element_plus' => 'template_element')
     rule('template_element' =>  'template')
     rule('template_element' =>  'template ELLIPSIS')
     rule('template_datum' =>  'pattern_datum')
     rule('pattern_identifier' => 'IDENTIFIER')
-    # Ugly: specailized production rule per keyword...
+    # Ugly: specialized production rule per keyword...
     rule('pattern_identifier' => 'BEGIN')
     rule('pattern_identifier' => 'COND')
     rule('pattern_identifier' => 'DEFINE')

data/lib/skeem/interpreter.rb

@@ -8,7 +8,11 @@ require_relative './primitive/primitive_builder'
 module Skeem
   class Interpreter
     include Primitive::PrimitiveBuilder
+
+    # @return [Skeem::Parser] Link to Skeem parser
     attr_reader(:parser)
+
+    # @return [Skeem::Runtime] Link to runtime object (holds call stack & frames)
     attr_reader(:runtime)
 
     def initialize

data/lib/skeem/parser.rb

@@ -36,7 +36,7 @@ module Skeem
         raise StandardError, line1 + line2
       end
 
-      return engine.to_ptree(result)
+      engine.to_ptree(result)
     end
   end # class
 end # module

data/lib/skeem/primitive/primitive_builder.rb

@@ -6,6 +6,7 @@ require_relative '../skm_exception'
 require_relative '../skm_pair'
 
 module Skeem
+  # rubocop: disable Metrics/ModuleLength
   module Primitive
     module PrimitiveBuilder
       include DatumDSL
@@ -244,10 +245,7 @@ module Skeem
                     raw_result = Rational(raw_result, elem_value)
                   end
 
-                when [Integer, Rational]
-                  raw_result *= reciprocal(elem_value)
-
-                when [Rational, Rational]
+                when [Integer, Rational], [Rational, Rational]
                   raw_result *= reciprocal(elem_value)
                 else
                   raw_result = raw_result.to_f
@@ -1234,7 +1232,7 @@ module Skeem
       def remaining_args(arglist, aRuntime)
         case arglist
         when Array
-          raw_arg = arglist[1..-1]
+          raw_arg = arglist[1..]
         when SkmPair
           raw_arg = arglist.cdr.to_a
         end
@@ -1242,4 +1240,5 @@ module Skeem
       end
     end # module
   end # module
+  # rubocop: enable Metrics/ModuleLength
 end # module

data/lib/skeem/primitive/primitive_procedure.rb

@@ -5,8 +5,13 @@ require_relative '../s_expr_nodes'
 module Skeem
   module Primitive
     class PrimitiveProcedure
+      # @return [Skeem::SkmIdentifier] 'name' of the procedure
       attr_reader(:identifier)
+
+      # @return [Skeem::Arity] number of arguments of the procedure
       attr_reader(:arity)
+
+      # @return [Proc] A Ruby lambda that implements the primitive procedure
       attr_reader(:code)
 
       # param [anArity] Arity of the lambda code (ignoring the runtime object)

data/lib/skeem/runtime.rb

@@ -80,7 +80,7 @@ module Skeem
     end
 
     def depth
-      return env_stack.size
+      env_stack.size
     end
 
     def push(anEnvironment)

data/lib/skeem/s_expr_builder.rb

@@ -157,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)
@@ -202,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]
@@ -225,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'
@@ -233,14 +214,14 @@ module Skeem
       SkmUpdateBinding.new(theChildren[2], theChildren[3])
     end
 
-    # rule('derived_expression' => 'LPAREN COND cond_clause_plus RPAREN').as 'cond_form'
+    # rule('derived_expression' => 'LPAREN COND cond_clause* (LPAREN ELSE sequence RPAREN)? RPAREN')
     def reduce_cond_form(_production, aRange, _tokens, theChildren)
-      SkmConditional.new(aRange.low, theChildren[2], nil)
-    end
-
-    # rule('derived_expression' => 'LPAREN COND cond_clause_star LPAREN ELSE sequence RPAREN RPAREN').as 'cond_else_form'
-    def reduce_cond_else_form(_production, aRange, _tokens, theChildren)
-      SkmConditional.new(aRange.low, theChildren[2], SkmSequencingBlock.new(theChildren[5]))
+      if theChildren[3]
+        else_part = SkmSequencingBlock.new(theChildren[3][2])
+      else
+        else_part = nil
+      end
+      SkmConditional.new(aRange.low, theChildren[2], else_part)
     end
 
     # rule('derived_expression' => 'LPAREN LET LPAREN binding_spec_star RPAREN body RPAREN').as 'short_let_form'
@@ -273,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]))]
@@ -318,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
@@ -143,6 +145,8 @@ module Skeem
       [:callee, callee]
     end
 
+    # rubocop: disable Style/RedundantAssignment
+
     def fetch_callee(aRuntime, var_key)
       begin
         aRuntime.include?(var_key.value)
@@ -172,6 +176,8 @@ module Skeem
       callee
     end
 
+    # rubocop: enable Style/RedundantAssignment
+
     def transform_operands(aRuntime)
       return [] if operands == SkmEmptyList.instance
 
@@ -817,11 +823,11 @@ module Skeem
         else
           result = cmd.evaluate(aRuntime)
         end
-        rescue NoMethodError => e
-          $stderr.puts inspect
-          $stderr.puts sequence.inspect
-          $stderr.puts cmd.inspect
-          raise e
+      rescue NoMethodError => e
+        $stderr.puts inspect
+        $stderr.puts sequence.inspect
+        $stderr.puts cmd.inspect
+        raise e
       end
 
       result
@@ -843,6 +849,8 @@ module Skeem
       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)}"
@@ -856,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
@@ -915,4 +925,6 @@ module Skeem
     end
   end # class
 end # module
+
+# rubocop: enable Style/AccessorGrouping
 # End of file

data/lib/skeem/skm_simple_datum.rb

@@ -21,7 +21,7 @@ module Skeem
     def self.create(aValue)
       lightweight = allocate
       lightweight.init_value(aValue)
-      return lightweight
+      lightweight
     end
 
     def symbol
@@ -62,7 +62,7 @@ module Skeem
     # Reminder: terminals evaluate to themselves.
     # @param _runtime [Skeem::Runtime]
     def evaluate(_runtime)
-      return self
+      self
     end
 
     # Return this object un-evaluated.

data/lib/skeem/tokenizer.rb

@@ -58,7 +58,7 @@ module Skeem
       SYNTAX-RULES
       UNQUOTE
       UNQUOTE-SPLICING
-    ].map { |x| [x, x.sub(/\*$/, '_STAR')] }.to_h
+    ].to_h { |x| [x, x.sub(/\*$/, '_STAR')] }
 
     class ScanError < StandardError; end
 
@@ -89,6 +89,8 @@ module Skeem
 
     private
 
+    # rubocop: disable Lint/DuplicateBranch
+
     def _next_token
       skip_intertoken_spaces
       curr_ch = scanner.peek(1)
@@ -114,7 +116,7 @@ module Skeem
       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(/#(?:(?:true)|(?:false)|(?:u8)|[\\\(tfeiodx]|(?:\d+[=#]))/))
+      elsif (lexeme = scanner.scan(/#(?:(?:true)|(?:false)|(?:u8)|[\\(tfeiodx]|(?:\d+[=#]))/))
         token = cardinal_token(lexeme)
       elsif (lexeme = scanner.scan(/"(?:\\"|[^"])*"/)) # Double quotes literal?
         token = build_token('STRING_LIT', lexeme)
@@ -124,7 +126,7 @@ module Skeem
         token = build_token(tok_type, lexeme)
       elsif (lexeme = scanner.scan(/\|(?:[^|])*\|/)) # Vertical bar delimited
         token = build_token('IDENTIFIER', lexeme)
-      elsif (lexeme = scanner.scan(/([\+\-])((?=\s|[|()";])|$)/))
+      elsif (lexeme = scanner.scan(/([+\-])((?=\s|[|()";])|$)/))
         #  # R7RS peculiar identifiers case 1: isolated plus and minus as identifiers
         token = build_token('IDENTIFIER', lexeme)
       elsif (lexeme = scanner.scan(/[+-][a-zA-Z!$%&*\/:<=>?@^_~+-@][a-zA-Z0-9!$%&*+-.\/:<=>?@^_~+-]*/))
@@ -143,6 +145,8 @@ module Skeem
       return token
     end
 
+    # rubocop: enable Lint/DuplicateBranch
+
 =begin
 #u8( This introduces a bytevector constant (section 6.9).
 Bytevector constants are terminated by ) .
@@ -285,7 +289,7 @@ other literal data (section 2.4).
         value = aLexeme.gsub(/(^")|("$)/, '')
       end
 
-      return value
+      value
     end
 
     def to_identifier(aLexeme, aFormat)
@@ -294,7 +298,7 @@ other literal data (section 2.4).
         value = aLexeme
       end
 
-      return value
+      value
     end
 
     def named_char(aLexeme)

data/lib/skeem/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Skeem
-  VERSION = '0.2.18'
+  VERSION = '0.2.21'
 end

data/skeem.gemspec

@@ -54,7 +54,7 @@ DESCR
 SUMMARY
   spec.homepage      = 'https://github.com/famished-tiger/Skeem'
   spec.license       = 'MIT'
-  spec.required_ruby_version = '>= 2.5.0'
+  spec.required_ruby_version = '>= 2.6.0'
 
   spec.bindir = 'bin'
   spec.executables << 'skeem'
@@ -62,10 +62,10 @@ SUMMARY
   PkgExtending.pkg_files(spec)
   PkgExtending.pkg_documentation(spec)
   # Runtime dependencies
-  spec.add_dependency 'rley', '~> 0.8.03'
+  spec.add_dependency 'rley', '~> 0.8.11'
 
   # Development dependencies
   spec.add_development_dependency 'bundler', '~> 2.0'
-  spec.add_development_dependency 'rake', '~> 12.0'
+  spec.add_development_dependency 'rake', '>= 12.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
 end

data/spec/skeem/skm_simple_datum_spec.rb

@@ -5,6 +5,7 @@ require_relative '../spec_helper' # Use the RSpec framework
 require_relative '../../lib/skeem/skm_simple_datum' # Load the classes under test
 
 module Skeem
+  # rubocop: disable Style/OpenStructUse
   describe SkmSimpleDatum do
     let(:pos) { double('fake-position') }
     let(:dummy_symbol) { double('fake-symbol') }
@@ -298,4 +299,5 @@ module Skeem
       end
     end # context
   end # describe
+  # rubocop: enable Style/OpenStructUse
 end # module