skeem 0.2.19 → 0.2.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ab3868544bc84674f7828b4bf258177afc7f1192ca46ea3979328ca4a410a8c
-  data.tar.gz: 178e5b66fed7677ef7f7a6409cd7c8fb91284654622935389cd3a0c4009b3fed
+  metadata.gz: f17c469661c1ebfa3ad17ae7685ac52a90b30fcd4b31d1d01b5af1c54ccfb765
+  data.tar.gz: ccb061b50470a01a740c99f3e01c89a5e962216fa80d3147fa5d7bbc759b6a1d
 SHA512:
-  metadata.gz: 33868367a6683ed547c5ebe19cbad9e2dee76c6b0dbd07e4a0077b6012b698a8e8d551095e82484911a71df0590f373d24e7b11a334fa760c23507e030a44314
-  data.tar.gz: f9726a3849a9eee31061404cf900e9529fa07db9d63663b9334105397b4c02fe2754951561049419c5e436cf846635548cd15c02e006e17ad4170e33a24be487
+  metadata.gz: bf7120cc110af075a3c5c3294492e5246e2857fe86d6090fba57fd8b8425f47871249710af82b1acf4471dc2ab2bf34770977acee3e98cee1cc7631382953930
+  data.tar.gz: af3025b621249db56813fa5c91fee6b33a47943d025a18cf50e5490f92d99b6750225b2af47d66c57bd72947faafb6e96f84cf4ab3038bf437e306308c09fa89

data/.rubocop.yml

@@ -1,451 +1,473 @@
-AllCops:
-  Exclude:
-    - 'exp/**/*'
-
-Gemspec/DateAssignment:
-  Enabled: true
-
-Layout/ArgumentAlignment:
-  Enabled: false
-
-Layout/ArrayAlignment:
-  Enabled: true
-  EnforcedStyle: with_fixed_indentation
-
-Layout/CaseIndentation:
-  Enabled: false
-
-Layout/ClosingHeredocIndentation:
-  Enabled: false
-
-Layout/CommentIndentation:
-  Enabled: false
-
-Layout/ElseAlignment:
-  Enabled: false
-
-Layout/EmptyLines:
-  Enabled: false
-
-Layout/EndAlignment:
-  Enabled: false
-
-Layout/EndOfLine:
-  Enabled: true
-  EnforcedStyle: lf
-
-Layout/FirstArgumentIndentation:
-  Enabled: false
-
-Layout/HashAlignment:
-  Enabled: false
-
-Layout/IndentationWidth:
-  Enabled: false
-
-Layout/IndentationConsistency:
-  Enabled: true
-
-Layout/HeredocIndentation:
-  Enabled: false
-
-Layout/LineEndStringConcatenationIndentation:
-  Enabled: true
-
-Layout/MultilineHashBraceLayout:
-  Enabled: true
-
-Layout/MultilineMethodCallBraceLayout:
-  Enabled: true
-  EnforcedStyle: same_line
-
-Layout/SpaceAroundOperators:
-  Enabled: true
-
-Layout/SpaceBeforeBrackets:
-  Enabled: true
-
-Layout/SpaceInsideParens:
-  Enabled: true
-
-Layout/IndentationStyle:
-  Enabled: true
-
-Layout/SpaceAroundMethodCallOperator:
-  Enabled: true
-
-Layout/TrailingEmptyLines:
-  Enabled: true
-
-Layout/TrailingWhitespace:
-  Enabled: true
-
-Lint/AmbiguousAssignment:
-  Enabled: true
-
-Lint/AmbiguousRange:
-  Enabled: true
-
-Lint/DeprecatedConstants:
-  Enabled: true
-
-Lint/DuplicateBranch:
-  Enabled: true
-
-Lint/DuplicateRegexpCharacterClassElement:
-  Enabled: true
-
-Lint/EmptyBlock:
-  Enabled: true
-
-Lint/EmptyClass:
-  Enabled: false
-
-Lint/EmptyInPattern:
-  Enabled: true
-
-Lint/LambdaWithoutLiteralBlock:
-  Enabled: true
-
-Lint/Loop:
-  Enabled: true
-
-Lint/NoReturnInBeginEndBlocks:
-  Enabled: true
-
-Lint/NumberedParameterAssignment:
-  Enabled: true
-
-Lint/OrAssignmentToConstant:
-  Enabled: true
-
-Lint/RaiseException:
-  Enabled: true
-
-Lint/RedundantDirGlobSort:
-  Enabled: true
-
-Lint/RescueException:
-  Enabled: true
-
-Lint/StructNewOverride:
-  Enabled: true
-
-Lint/SymbolConversion:
-  Enabled: true
-
-Lint/ToEnumArguments:
-  Enabled: true
-
-Lint/TripleQuotes:
-  Enabled: true
-
-Lint/UnexpectedBlockArity:
-  Enabled: true
-
-Lint/UnmodifiedReduceAccumulator:
-  Enabled: true
-
-Lint/UnusedMethodArgument:
-  Enabled: true
-
-Lint/UselessAccessModifier:
-  Enabled: true
-
-Lint/Void:
-  Enabled: false
-
-Lint/UselessAssignment:
-  Enabled: true
-
-Metrics/AbcSize:
-  Enabled: false
-
-Metrics/BlockLength:
-  Enabled: true
-  Max: 350
-
-Metrics/BlockNesting:
-  Enabled: true
-  Max: 5
-
-Metrics/ClassLength:
-  Enabled: true
-  Max: 450
-
-Metrics/CyclomaticComplexity:
-  Enabled: false
-
-Layout/LineLength:
-  Enabled: false
-  Max: 90
-
-Metrics/MethodLength:
-  Enabled: true
-  Max: 60
-
-Metrics/ModuleLength:
-  Enabled: true
-  Max: 500
-
-Metrics/PerceivedComplexity:
-  Enabled: false
-
-Naming/ConstantName:
-  Enabled: false
-
-Naming/ClassAndModuleCamelCase:
-  Enabled: false
-
-Naming/BlockParameterName:
-  Enabled: true
-
-Naming/InclusiveLanguage:
-  Enabled: true
-
-Naming/MethodParameterName:
-  Enabled: false
-
-Naming/MethodName:
-  Enabled: false
-
-Naming/VariableName:
-  Enabled: false
-
-Style/AccessorGrouping:
-  Enabled: false
-
-Style/Alias:
-  Enabled: true
-
-Style/ArgumentsForwarding:
-  Enabled: true
-
-Style/AsciiComments:
-  Enabled: false
-
-Style/BarePercentLiterals:
-  Enabled: false
-
-Style/BlockComments:
-  Enabled: false
-
-Style/CharacterLiteral:
-  Enabled: false
-
-Style/ClassCheck:
-  Enabled: false
-
-Style/ClassVars:
-  Enabled: false
-
-Style/CollectionCompact:
-  Enabled: true
-
-Style/ColonMethodCall:
-  Enabled: false
-
-Style/CommentAnnotation:
-  Enabled: false
-
-Style/CommentedKeyword:
-  Enabled: false
-
-Style/ConditionalAssignment:
-  Enabled: false
-
-Style/DefWithParentheses:
-  Enabled: true
-
-Style/Documentation:
-  Enabled: false
-
-Style/DocumentDynamicEvalDefinition:
-  Enabled: false
-
-Style/ExpandPathArguments:
-  Enabled: false
-
-Style/ExponentialNotation:
-  Enabled: true
-
-Style/GuardClause:
-  Enabled: false
-
-Style/HashEachMethods:
-  Enabled: true
-
-Style/HashExcept:
-  Enabled: true
-
-Style/HashTransformKeys:
-  Enabled: true
-
-Style/HashTransformValues:
-  Enabled: true
-
-Style/IfUnlessModifier:
-  Enabled: false
-
-Style/InPatternThen:
-  Enabled: true
-
-Style/InverseMethods:
-  Enabled: false
-
-Style/MissingRespondToMissing:
-  Enabled: false
-
-Style/MultilineInPatternThen:
-  Enabled: true
-
-Style/NegatedIfElseCondition:
-  Enabled: true
-
-Style/Next:
-  Enabled: false
-
-Style/NilLambda:
-  Enabled: true
-
-Style/NumericLiterals:
-  Enabled: false
-
-Style/QuotedSymbols:
-  Enabled: true
-
-Style/RaiseArgs:
-  Enabled: true
-
-Style/RedundantArgument:
-  Enabled: true
-
-Style/RedundantReturn:
-  Enabled: false
-
-Style/RedundantSelf:
-  Enabled: true
-
-Style/RedundantSelfAssignmentBranch:
-  Enabled: true
-
-Style/RegexpLiteral:
-  Enabled: false
-
-Style/PercentLiteralDelimiters:
-  Enabled: false
-
-Style/StderrPuts:
-  Enabled: false
-
-Style/StringLiterals:
-  Enabled: true
-
-Style/SwapValues:
-  Enabled: true
-
-Style/TernaryParentheses:
-  Enabled: false
-
-Style/UnlessElse:
-  Enabled: false
-
-# Rubocop complains when it doesn't find an explicit setting for the following cops:
-Layout/EmptyLinesAroundAttributeAccessor:
-  Enabled: true
-
-Lint/BinaryOperatorWithIdenticalOperands:
-  Enabled: true
-
-Lint/DeprecatedOpenSSLConstant:
-  Enabled: true
-
-Lint/DuplicateElsifCondition:
-  Enabled: true
-
-Lint/DuplicateRescueException:
-  Enabled: true
-
-Lint/EmptyConditionalBody:
-  Enabled: true
-
-Lint/FloatComparison:
-  Enabled: true
-
-Lint/MissingSuper:
-  Enabled: true
-
-Lint/MixedRegexpCaptureTypes:
-  Enabled: true
-
-Lint/OutOfRangeRegexpRef:
-  Enabled: true
-
-Lint/SelfAssignment:
-  Enabled: true
-
-Lint/TopLevelReturnWithArgument:
-  Enabled: true
-
-Lint/UnreachableLoop:
-  Enabled: true
-
-Style/ArrayCoercion:
-  Enabled: true
-
-Style/BisectedAttrAccessor:
-  Enabled: true
-
-Style/CaseLikeIf:
-  Enabled: true
-
-Style/EndlessMethod:
-  Enabled: true
-
-Style/ExplicitBlockArgument:
-  Enabled: true
-
-Style/GlobalStdStream:
-  Enabled: true
-
-Style/HashAsLastArrayItem:
-  Enabled: true
-
-Style/HashConversion:
-  Enabled: true
-
-Style/HashLikeCase:
-  Enabled: true
-
-Style/IfWithBooleanLiteralBranches:
-  Enabled: true
-
-Style/OptionalBooleanParameter:
-  Enabled: true
-
-Style/RedundantAssignment:
-  Enabled: true
-
-Style/RedundantFetchBlock:
-  Enabled: true
-
-Style/RedundantFileExtensionInRequire:
-  Enabled: true
-
-Style/RedundantRegexpCharacterClass:
-  Enabled: true
-
-Style/RedundantRegexpEscape:
-  Enabled: true
-
-Style/SingleArgumentDig:
-  Enabled: true
-
-Style/SlicingWithRange:
-  Enabled: true
-
-Style/StringChars:
-  Enabled: true
-
-Style/StringConcatenation:
-  Enabled: true
+AllCops:
+  Exclude:
+    - 'exp/**/*'
+    - 'demo/**/*'
+
+Gemspec/DateAssignment:
+  Enabled: true
+
+Layout/ArgumentAlignment:
+  Enabled: false
+
+Layout/ArrayAlignment:
+  Enabled: true
+  EnforcedStyle: with_fixed_indentation
+
+Layout/CaseIndentation:
+  Enabled: false
+
+Layout/ClosingHeredocIndentation:
+  Enabled: false
+
+Layout/CommentIndentation:
+  Enabled: false
+
+Layout/ElseAlignment:
+  Enabled: false
+
+Layout/EmptyLines:
+  Enabled: false
+
+Layout/EndAlignment:
+  Enabled: false
+
+Layout/EndOfLine:
+  Enabled: true
+  EnforcedStyle: lf
+
+Layout/FirstArgumentIndentation:
+  Enabled: false
+
+Layout/HashAlignment:
+  Enabled: false
+
+Layout/IndentationWidth:
+  Enabled: false
+
+Layout/IndentationConsistency:
+  Enabled: true
+
+Layout/HeredocIndentation:
+  Enabled: false
+
+Layout/LineEndStringConcatenationIndentation:
+  Enabled: true
+
+Layout/MultilineHashBraceLayout:
+  Enabled: true
+
+Layout/MultilineMethodCallBraceLayout:
+  Enabled: true
+  EnforcedStyle: same_line
+
+Layout/SpaceAroundOperators:
+  Enabled: true
+
+Layout/SpaceBeforeBrackets:
+  Enabled: true
+
+Layout/SpaceInsideParens:
+  Enabled: true
+
+Layout/IndentationStyle:
+  Enabled: true
+
+Layout/SpaceAroundMethodCallOperator:
+  Enabled: true
+
+Layout/TrailingEmptyLines:
+  Enabled: true
+
+Layout/TrailingWhitespace:
+  Enabled: true
+
+Lint/AmbiguousAssignment:
+  Enabled: true
+
+Lint/AmbiguousOperatorPrecedence: # new in 1.21
+  Enabled: true
+
+Lint/AmbiguousRange:
+  Enabled: true
+
+Lint/DeprecatedConstants:
+  Enabled: true
+
+Lint/DuplicateBranch:
+  Enabled: true
+
+Lint/DuplicateRegexpCharacterClassElement:
+  Enabled: true
+
+Lint/EmptyBlock:
+  Enabled: true
+
+Lint/EmptyClass:
+  Enabled: false
+
+Lint/EmptyInPattern:
+  Enabled: true
+
+Lint/IncompatibleIoSelectWithFiberScheduler: # new in 1.21
+  Enabled: true
+
+Lint/LambdaWithoutLiteralBlock:
+  Enabled: true
+
+Lint/Loop:
+  Enabled: true
+
+Lint/NoReturnInBeginEndBlocks:
+  Enabled: true
+
+Lint/NumberedParameterAssignment:
+  Enabled: true
+
+Lint/OrAssignmentToConstant:
+  Enabled: true
+
+Lint/RaiseException:
+  Enabled: true
+
+Lint/RedundantDirGlobSort:
+  Enabled: true
+
+Lint/RequireRelativeSelfPath: # new in 1.22
+  Enabled: true
+
+Lint/RescueException:
+  Enabled: true
+
+Lint/StructNewOverride:
+  Enabled: true
+
+Lint/SymbolConversion:
+  Enabled: true
+
+Lint/ToEnumArguments:
+  Enabled: true
+
+Lint/TripleQuotes:
+  Enabled: true
+
+Lint/UnexpectedBlockArity:
+  Enabled: true
+
+Lint/UnmodifiedReduceAccumulator:
+  Enabled: true
+
+Lint/UnusedMethodArgument:
+  Enabled: true
+
+Lint/UselessAccessModifier:
+  Enabled: true
+
+Lint/Void:
+  Enabled: false
+
+Lint/UselessAssignment:
+  Enabled: true
+
+Metrics/AbcSize:
+  Enabled: false
+
+Metrics/BlockLength:
+  Enabled: true
+  Max: 350
+
+Metrics/BlockNesting:
+  Enabled: true
+  Max: 5
+
+Metrics/ClassLength:
+  Enabled: true
+  Max: 450
+
+Metrics/CyclomaticComplexity:
+  Enabled: false
+
+Layout/LineLength:
+  Enabled: false
+  Max: 90
+
+Metrics/MethodLength:
+  Enabled: true
+  Max: 60
+
+Metrics/ModuleLength:
+  Enabled: true
+  Max: 500
+
+Metrics/PerceivedComplexity:
+  Enabled: false
+
+Naming/ConstantName:
+  Enabled: false
+
+Naming/ClassAndModuleCamelCase:
+  Enabled: false
+
+Naming/BlockParameterName:
+  Enabled: true
+
+Naming/InclusiveLanguage:
+  Enabled: true
+
+Naming/MethodParameterName:
+  Enabled: false
+
+Naming/MethodName:
+  Enabled: false
+
+Naming/VariableName:
+  Enabled: false
+
+Security/IoMethods: # new in 1.22
+  Enabled: true
+
+Style/Alias:
+  Enabled: true
+
+Style/ArgumentsForwarding:
+  Enabled: true
+
+Style/AsciiComments:
+  Enabled: false
+
+Style/BarePercentLiterals:
+  Enabled: false
+
+Style/BlockComments:
+  Enabled: false
+
+Style/CharacterLiteral:
+  Enabled: false
+
+Style/ClassCheck:
+  Enabled: false
+
+Style/ClassVars:
+  Enabled: false
+
+Style/CollectionCompact:
+  Enabled: true
+
+Style/ColonMethodCall:
+  Enabled: false
+
+Style/CommentAnnotation:
+  Enabled: false
+
+Style/CommentedKeyword:
+  Enabled: false
+
+Style/ConditionalAssignment:
+  Enabled: false
+
+Style/DefWithParentheses:
+  Enabled: true
+
+Style/Documentation:
+  Enabled: false
+
+Style/DocumentDynamicEvalDefinition:
+  Enabled: true
+
+Style/ExpandPathArguments:
+  Enabled: false
+
+Style/ExponentialNotation:
+  Enabled: true
+
+Style/GuardClause:
+  Enabled: false
+
+Style/HashEachMethods:
+  Enabled: true
+
+Style/HashExcept:
+  Enabled: true
+
+Style/HashTransformKeys:
+  Enabled: true
+
+Style/HashTransformValues:
+  Enabled: true
+
+Style/IfUnlessModifier:
+  Enabled: false
+
+Style/InPatternThen:
+  Enabled: true
+
+Style/InverseMethods:
+  Enabled: false
+
+Style/MissingRespondToMissing:
+  Enabled: false
+
+Style/MultilineInPatternThen:
+  Enabled: true
+
+Style/NegatedIfElseCondition:
+  Enabled: true
+
+Style/Next:
+  Enabled: false
+
+Style/NilLambda:
+  Enabled: true
+
+Style/NumberedParameters: # new in 1.22
+  Enabled: true
+
+Style/NumberedParametersLimit: # new in 1.22
+  Enabled: true
+
+Style/NumericLiterals:
+  Enabled: false
+
+Style/QuotedSymbols:
+  Enabled: true
+
+Style/RaiseArgs:
+  Enabled: true
+
+Style/RedundantArgument:
+  Enabled: true
+
+Style/RedundantReturn:
+  Enabled: false
+
+Style/RedundantSelf:
+  Enabled: true
+
+Style/RedundantSelfAssignmentBranch:
+  Enabled: true
+
+Style/RegexpLiteral:
+  Enabled: false
+
+Style/PercentLiteralDelimiters:
+  Enabled: false
+
+Style/SelectByRegexp: # new in 1.22
+  Enabled: true
+
+Style/StderrPuts:
+  Enabled: false
+
+Style/StringLiterals:
+  Enabled: true
+
+Style/SwapValues:
+  Enabled: true
+
+Style/TernaryParentheses:
+  Enabled: false
+
+Style/UnlessElse:
+  Enabled: false
+
+# Rubocop complains when it doesn't find an explicit setting for the following cops:
+Layout/EmptyLinesAroundAttributeAccessor:
+  Enabled: true
+
+Lint/BinaryOperatorWithIdenticalOperands:
+  Enabled: true
+
+Lint/DeprecatedOpenSSLConstant:
+  Enabled: true
+
+Lint/DuplicateElsifCondition:
+  Enabled: true
+
+Lint/DuplicateRescueException:
+  Enabled: true
+
+Lint/EmptyConditionalBody:
+  Enabled: true
+
+Lint/FloatComparison:
+  Enabled: true
+
+Lint/MissingSuper:
+  Enabled: true
+
+Lint/MixedRegexpCaptureTypes:
+  Enabled: true
+
+Lint/OutOfRangeRegexpRef:
+  Enabled: true
+
+Lint/SelfAssignment:
+  Enabled: true
+
+Lint/TopLevelReturnWithArgument:
+  Enabled: true
+
+Lint/UnreachableLoop:
+  Enabled: true
+
+Style/AccessorGrouping:
+  Enabled: true
+
+Style/ArrayCoercion:
+  Enabled: true
+
+Style/BisectedAttrAccessor:
+  Enabled: true
+
+Style/CaseLikeIf:
+  Enabled: true
+
+Style/EndlessMethod:
+  Enabled: true
+
+Style/ExplicitBlockArgument:
+  Enabled: true
+
+Style/GlobalStdStream:
+  Enabled: true
+
+Style/HashAsLastArrayItem:
+  Enabled: true
+
+Style/HashConversion:
+  Enabled: true
+
+Style/HashLikeCase:
+  Enabled: true
+
+Style/IfWithBooleanLiteralBranches:
+  Enabled: true
+
+Style/OptionalBooleanParameter:
+  Enabled: true
+
+Style/RedundantAssignment:
+  Enabled: true
+
+Style/RedundantFetchBlock:
+  Enabled: true
+
+Style/RedundantFileExtensionInRequire:
+  Enabled: true
+
+Style/RedundantRegexpCharacterClass:
+  Enabled: true
+
+Style/RedundantRegexpEscape:
+  Enabled: true
+
+Style/SingleArgumentDig:
+  Enabled: true
+
+Style/SlicingWithRange:
+  Enabled: true
+
+Style/StringChars:
+  Enabled: true
+
+Style/StringConcatenation:
+  Enabled: true

data/CHANGELOG.md

@@ -1,8 +1,16 @@
+## [0.2.20] - 2021-11-01
+- Code update to cope with changes in `Rley` v. 0.8.08
+
+### Changed
+- File `grammar.rb`: Refactoring to cope with ? quantifier changes
+- 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 og ?, * and + modifiers
+- File `grammar.rb`: Remove redundant rules after introduction of ?, * and + modifiers
 - Class `SkmBuilder`: Removal of useless methods after removal of their rule counterpart
 
 

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
@@ -102,7 +102,7 @@ module Skeem
     do_syntax = <<-END_SYNTAX
     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'
@@ -117,7 +117,7 @@ END_SYNTAX
     rule('iteration_spec' => 'LPAREN IDENTIFIER init RPAREN').as 'iteration_spec_short'
     rule('init' => 'expression')
     rule('step' => 'expression')
-    rule 'do_result' => 'sequence?'
+    rule('do_result' => 'sequence?').tag 'do_result'
     rule('keyword' => 'IDENTIFIER')
     rule('includer' => 'LPAREN INCLUDE STRING_LIT+ RPAREN').as 'include'
     rule 'qq_template' => 'simple_datum'

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/primitive/primitive_builder.rb

@@ -244,10 +244,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

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/s_expr_builder.rb

@@ -205,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'
@@ -288,11 +289,21 @@ 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])

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/tokenizer.rb

@@ -89,6 +89,8 @@ module Skeem
 
     private
 
+    # rubocop: disable Lint/DuplicateBranch
+
     def _next_token
       skip_intertoken_spaces
       curr_ch = scanner.peek(1)
@@ -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 ) .

data/lib/skeem/version.rb

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

data/skeem.gemspec

@@ -62,7 +62,7 @@ SUMMARY
   PkgExtending.pkg_files(spec)
   PkgExtending.pkg_documentation(spec)
   # Runtime dependencies
-  spec.add_dependency 'rley', '~> 0.8.03'
+  spec.add_dependency 'rley', '~> 0.8.08'
 
   # Development dependencies
   spec.add_development_dependency 'bundler', '~> 2.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skeem
 version: !ruby/object:Gem::Version
-  version: 0.2.19
+  version: 0.2.20
 platform: ruby
 authors:
 - Dimitri Geshef
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-30 00:00:00.000000000 Z
+date: 2021-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rley
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.03
+        version: 0.8.08
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.03
+        version: 0.8.08
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement