skeem 0.2.20 → 0.2.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f17c469661c1ebfa3ad17ae7685ac52a90b30fcd4b31d1d01b5af1c54ccfb765
-  data.tar.gz: ccb061b50470a01a740c99f3e01c89a5e962216fa80d3147fa5d7bbc759b6a1d
+  metadata.gz: '0800d07342e60be56e4ecbd4d2040eb22f593586347eff9c51cf26b999c3b37d'
+  data.tar.gz: 1e31cc8f1cc6e0f60d229e62fbef4f29670cb20d5c22709d5d31ae7ca54a74ec
 SHA512:
-  metadata.gz: bf7120cc110af075a3c5c3294492e5246e2857fe86d6090fba57fd8b8425f47871249710af82b1acf4471dc2ab2bf34770977acee3e98cee1cc7631382953930
-  data.tar.gz: af3025b621249db56813fa5c91fee6b33a47943d025a18cf50e5490f92d99b6750225b2af47d66c57bd72947faafb6e96f84cf4ab3038bf437e306308c09fa89
+  metadata.gz: 35d189903d0c8089151a6a5d0235326c812df8f750a10a23b6e9cedfd31451c614f5a151ff1348f1ed2207a5b5f08cb8751ae3d4760a92a4530c4426f7514632
+  data.tar.gz: e9e7ad4c789da7fef78486914314e5491262a8d769b495cb1130bdffdc339d5234b44c320a0cb97eacbbf0b646e57541c9bb6799c4d31e3625d41ae05f14d35a

data/.rubocop.yml

@@ -6,6 +6,9 @@ AllCops:
 Gemspec/DateAssignment:
   Enabled: true
 
+Gemspec/RequireMFA: # new in 1.23
+  Enabled: false
+
 Layout/ArgumentAlignment:
   Enabled: false
 
@@ -132,6 +135,9 @@ Lint/RaiseException:
 Lint/RedundantDirGlobSort:
   Enabled: true
 
+Lint/RefinementImportMethods: # new in 1.27
+  Enabled: true
+
 Lint/RequireRelativeSelfPath: # new in 1.22
   Enabled: true
 
@@ -162,12 +168,15 @@ Lint/UnusedMethodArgument:
 Lint/UselessAccessModifier:
   Enabled: true
 
-Lint/Void:
-  Enabled: false
-
 Lint/UselessAssignment:
   Enabled: true
 
+Lint/UselessRuby2Keywords: # new in 1.23
+  Enabled: true
+
+Lint/Void:
+  Enabled: false
+
 Metrics/AbcSize:
   Enabled: false
 
@@ -201,15 +210,18 @@ Metrics/ModuleLength:
 Metrics/PerceivedComplexity:
   Enabled: false
 
+Naming/BlockForwarding: # new in 1.24
+  Enabled: true
+
+Naming/BlockParameterName:
+  Enabled: true
+
 Naming/ConstantName:
   Enabled: false
 
 Naming/ClassAndModuleCamelCase:
   Enabled: false
 
-Naming/BlockParameterName:
-  Enabled: true
-
 Naming/InclusiveLanguage:
   Enabled: true
 
@@ -222,6 +234,9 @@ Naming/MethodName:
 Naming/VariableName:
   Enabled: false
 
+Security/CompoundHash: # new in 1.28
+  Enabled: true
+
 Security/IoMethods: # new in 1.22
   Enabled: true
 
@@ -279,6 +294,15 @@ Style/ExpandPathArguments:
 Style/ExponentialNotation:
   Enabled: true
 
+Style/FetchEnvVar: # new in 1.28
+  Enabled: true
+
+Style/FileRead: # new in 1.24
+  Enabled: true
+
+Style/FileWrite: # new in 1.24
+  Enabled: true
+
 Style/GuardClause:
   Enabled: false
 
@@ -303,6 +327,9 @@ Style/InPatternThen:
 Style/InverseMethods:
   Enabled: false
 
+Style/MapToHash: # new in 1.24
+  Enabled: true
+
 Style/MissingRespondToMissing:
   Enabled: false
 
@@ -312,6 +339,9 @@ Style/MultilineInPatternThen:
 Style/NegatedIfElseCondition:
   Enabled: true
 
+Style/NestedFileDirname: # new in 1.26
+  Enabled: true
+
 Style/Next:
   Enabled: false
 
@@ -327,6 +357,12 @@ Style/NumberedParametersLimit: # new in 1.22
 Style/NumericLiterals:
   Enabled: false
 
+Style/ObjectThen: # new in 1.28
+  Enabled: true
+
+Style/OpenStructUse: # new in 1.23
+  Enabled: true
+
 Style/QuotedSymbols:
   Enabled: true
 
@@ -335,9 +371,12 @@ Style/RaiseArgs:
 
 Style/RedundantArgument:
   Enabled: true
+  
+Style/RedundantInitialize: # new in 1.27
+  Enabled: true  
 
 Style/RedundantReturn:
-  Enabled: false
+  Enabled: true
 
 Style/RedundantSelf:
   Enabled: true

data/CHANGELOG.md

@@ -1,8 +1,16 @@
+## [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-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/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'

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
@@ -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/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

@@ -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/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
 
@@ -289,7 +289,7 @@ other literal data (section 2.4).
         value = aLexeme.gsub(/(^")|("$)/, '')
       end
 
-      return value
+      value
     end
 
     def to_identifier(aLexeme, aFormat)
@@ -298,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.20'
+  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.08'
+  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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skeem
 version: !ruby/object:Gem::Version
-  version: 0.2.20
+  version: 0.2.21
 platform: ruby
 authors:
 - Dimitri Geshef
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-01 00:00:00.000000000 Z
+date: 2022-04-24 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.08
+        version: 0.8.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.08
+        version: 0.8.11
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -42,14 +42,14 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '12.0'
 - !ruby/object:Gem::Dependency
@@ -149,14 +149,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Skeem is an interpreter of a subset of the Scheme programming language. Scheme
@@ -170,6 +170,7 @@ test_files:
 - spec/skeem/primitive/primitive_builder_spec.rb
 - spec/skeem/primitive/primitive_procedure_spec.rb
 - spec/skeem/runtime_spec.rb
+- spec/skeem/s_expr_nodes_spec.rb
 - spec/skeem/skm_compound_datum_spec.rb
 - spec/skeem/skm_element_spec.rb
 - spec/skeem/skm_empty_list_spec.rb
@@ -178,6 +179,5 @@ test_files:
 - spec/skeem/skm_procedure_exec_spec.rb
 - spec/skeem/skm_simple_datum_spec.rb
 - spec/skeem/skm_unary_expression_spec.rb
-- spec/skeem/s_expr_nodes_spec.rb
 - spec/skeem/tokenizer_spec.rb
 - spec/skeem_spec.rb