skeem 0.2.20 → 0.2.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f17c469661c1ebfa3ad17ae7685ac52a90b30fcd4b31d1d01b5af1c54ccfb765
-  data.tar.gz: ccb061b50470a01a740c99f3e01c89a5e962216fa80d3147fa5d7bbc759b6a1d
+  metadata.gz: 60bb3901b33cd2d27438d530516ead6eba76ddad2b1b25bc1714b138cd4eea98
+  data.tar.gz: 2d1e4862d0be1fad47146fde29c31598e7dbcc096de7cdb061809b098fa3c49e
 SHA512:
-  metadata.gz: bf7120cc110af075a3c5c3294492e5246e2857fe86d6090fba57fd8b8425f47871249710af82b1acf4471dc2ab2bf34770977acee3e98cee1cc7631382953930
-  data.tar.gz: af3025b621249db56813fa5c91fee6b33a47943d025a18cf50e5490f92d99b6750225b2af47d66c57bd72947faafb6e96f84cf4ab3038bf437e306308c09fa89
+  metadata.gz: 4c6928ec6c977253e8f22f2ace0e09fb26117a39f17c599240e1eae8380fd136e65cfda81aeb01907faee608c8c88a7c785358eda8ccc1d8683bee0904a682b9
+  data.tar.gz: c5e07ae2fc4edefd4a17e63dd27bc2044d8646e2165c2d50dbe5614f6b985f2f0a9f7cd0f2d2ce1d0da50f9bf13b036322245f829376a79f4bc1620bd4a890a6

data/.rubocop.yml

@@ -2,8 +2,10 @@ AllCops:
   Exclude:
     - 'exp/**/*'
     - 'demo/**/*'
+  NewCops: enable
+  SuggestExtensions: false
 
-Gemspec/DateAssignment:
+Gemspec/RequireMFA: # new in 1.23
   Enabled: true
 
 Layout/ArgumentAlignment:
@@ -50,124 +52,13 @@ Layout/IndentationConsistency:
 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
 
@@ -207,12 +98,6 @@ Naming/ConstantName:
 Naming/ClassAndModuleCamelCase:
   Enabled: false
 
-Naming/BlockParameterName:
-  Enabled: true
-
-Naming/InclusiveLanguage:
-  Enabled: true
-
 Naming/MethodParameterName:
   Enabled: false
 
@@ -222,15 +107,6 @@ Naming/MethodName:
 Naming/VariableName:
   Enabled: false
 
-Security/IoMethods: # new in 1.22
-  Enabled: true
-
-Style/Alias:
-  Enabled: true
-
-Style/ArgumentsForwarding:
-  Enabled: true
-
 Style/AsciiComments:
   Enabled: false
 
@@ -249,9 +125,6 @@ Style/ClassCheck:
 Style/ClassVars:
   Enabled: false
 
-Style/CollectionCompact:
-  Enabled: true
-
 Style/ColonMethodCall:
   Enabled: false
 
@@ -264,210 +137,72 @@ Style/CommentedKeyword:
 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
+## Optional rubocop-rspec plugin rule checking
+#RSpec/ContextWording:
+#  Enabled: false
+#
+#RSpec/DescribeClass:
+#  Enabled: false
+#
+#RSpec/ExampleLength:
+#  Max: 45
+#
+#RSpec/MultipleExpectations:
+#  Max: 25
+#
+#RSpec/NoExpectationExample:
+#  Enabled: false
+#
+#RSpec/RepeatedDescription:
+#  Enabled: false
+#
+#RSpec/RepeatedExample:
+#  Enabled: false
+#
+#RSpec/RepeatedExampleGroupDescription:
+#  Enabled: false
+#
+#RSpec/VerifiedDoubles:
+#  Enabled: false
+#
+#RSpec/IdenticalEqualityAssertion:
+#  Enabled: false

data/CHANGELOG.md

@@ -1,8 +1,23 @@
+## [0.2.22] - 2025-03-30
+- Dependency updates, minor changes, tested against Ruby 3.4.1.
+
+### Changed
+- Files updated to please Rubocop 1.75.1 
+- Files `*_spec.rb` updated to please `rubocop-rspec`.
+
+## [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
 
-### 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
 

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2018-2019 Dimitri Geshef
+Copyright (c) 2018-2025 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/lib/skeem/grammar.rb

@@ -89,8 +89,7 @@ module Skeem
     rule 'number' => 'RATIONAL'
     rule 'number' => 'REAL'
     rule('assignment' => 'LPAREN SET! IDENTIFIER expression RPAREN').as 'assignment'
-    rule('derived_expression' => 'LPAREN COND cond_clause+ RPAREN').as 'cond_form'
-    rule('derived_expression' => 'LPAREN COND cond_clause* LPAREN ELSE sequence RPAREN RPAREN').as 'cond_else_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* RPAREN body RPAREN') # .as 'named_form'
@@ -138,14 +137,14 @@ END_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* 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' => 'UNDERSCORE')
+    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_datum' => 'STRING_LIT')
     rule('pattern_datum' => 'CHAR')
     rule('pattern_datum' => 'BOOLEAN')
@@ -154,11 +153,11 @@ END_SYNTAX
     rule('template' => 'pattern_identifier')
     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' =>  'template')
-    rule('template_element' =>  'template ELLIPSIS')
-    rule('template_datum' =>  'pattern_datum')
+    rule('template' => 'VECTOR_BEGIN template_element* RPAREN')
+    rule('template' => 'template_datum')
+    rule('template_element' => 'template')
+    rule('template_element' => 'template ELLIPSIS')
+    rule('template_datum' => 'pattern_datum')
     rule('pattern_identifier' => 'IDENTIFIER')
     # Ugly: specialized production rule per keyword...
     rule('pattern_identifier' => 'BEGIN')

data/lib/skeem/interpreter.rb

@@ -3,7 +3,7 @@
 require_relative 'parser'
 require_relative 'skm_frame'
 require_relative 'runtime'
-require_relative './primitive/primitive_builder'
+require_relative 'primitive/primitive_builder'
 
 module Skeem
   class Interpreter

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
@@ -1111,7 +1112,7 @@ module Skeem
       def create_display(aRuntime)
         primitive = lambda do |_runtime, arg_evaluated|
           # @TODO: make output stream configurable
-          print arg_evaluated.value.to_s
+          print arg_evaluated.value
           SkmUndefined.instance
         end
 
@@ -1231,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
@@ -1239,4 +1240,5 @@ module Skeem
       end
     end # module
   end # module
+  # rubocop: enable Metrics/ModuleLength
 end # module

data/lib/skeem/primitive/primitive_procedure.rb

@@ -70,7 +70,7 @@ module Skeem
         unless aRubyLambda.lambda?
           error_lambda('must be implemented with a Ruby lambda.')
         end
-        if aRubyLambda.parameters.size.zero?
+        if aRubyLambda.parameters.empty?
           error_lambda('lambda takes no parameter.')
         end
 

data/lib/skeem/runtime.rb

@@ -35,6 +35,7 @@ module Skeem
     def update_binding(aKey, anEntry)
       environment.update_binding(aKey, anEntry)
     end
+    # rubocop: disable Lint/UselessRescue
 
     def evaluate(aKey)
       key_value = normalize_key(aKey)
@@ -58,6 +59,7 @@ module Skeem
         raise err, err_msg
       end
     end
+    # rubocop: enable Lint/UselessRescue
 
     # @param aList[SkmPair] first member is an identifier.
     def evaluate_form(aList)
@@ -80,7 +82,7 @@ module Skeem
     end
 
     def depth
-      return env_stack.size
+      env_stack.size
     end
 
     def push(anEnvironment)

data/lib/skeem/s_expr_builder.rb

@@ -214,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'

data/lib/skeem/s_expr_nodes.rb

@@ -105,7 +105,7 @@ module Skeem
     end
 
     def inspect
-      result = +"#{inspect_prefix}#{operator.inspect}, "
+      result = "#{inspect_prefix}#{operator.inspect}, "
       result << "@operands #{operands.inspect}#{inspect_suffix}"
       result
     end
@@ -146,6 +146,7 @@ module Skeem
     end
 
     # rubocop: disable Style/RedundantAssignment
+    # rubocop: disable Lint/UselessRescue
 
     def fetch_callee(aRuntime, var_key)
       begin
@@ -176,6 +177,7 @@ module Skeem
       callee
     end
 
+    # rubocop: enable Lint/UselessRescue
     # rubocop: enable Style/RedundantAssignment
 
     def transform_operands(aRuntime)
@@ -229,7 +231,7 @@ module Skeem
     end
 
     def inspect
-      result = +"#{inspect_prefix}@test #{test.inspect}, "
+      result = "#{inspect_prefix}@test #{test.inspect}, "
       result << "@consequent #{consequent.inspect}, "
       result << "@alternate #{alternate.inspect}#{inspect_suffix}"
       result
@@ -277,7 +279,7 @@ module Skeem
           consequent_qq = consequent.quasiquote(aRuntime)
           [test_qq, consequent_qq]
       end
-      quasi_alternate = alternate ? alternate.quasiquote(aRuntime) : nil
+      quasi_alternate = alternate&.quasiquote(aRuntime)
 
       self.class.new(position, quasi_clauses, quasi_alternate)
     end

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.