srl_ruby 0.4.11 → 0.4.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a2509164bd980bf2145d41c15281608694674f633b2a6f2b482b6298db7d36a
-  data.tar.gz: 3112162a2a27268dd4d0c1e8cf4b0af25b98a158152e7ceca9e9d5f34c347c96
+  metadata.gz: a1aca92632a6d6009140d3df47adbacc96ec7237b665c8c7677192134b0dbffa
+  data.tar.gz: 4d9b6f2143a4d37b2092a179406aec2a5bfacff28e67383ce933a9f533cd1666
 SHA512:
-  metadata.gz: 51099a1c625930c9e139079f73647524caf6db7ed23ccdcdee475a720dcdb238d4e48ad0632f6ec7b0cee8e57785a25ce7b5f4232c605811f382a95d11b31afa
-  data.tar.gz: a4a7383ce66944d5b5c834200a8e5b2367660912a93daaca13dc27eb95fd56f0b655317c575a4013dd5e69b22af804a4dcbfb5ce5a5804249bf78d7495d5a4e9
+  metadata.gz: f154f7efc63ee2130369cc1f95e7d02d9883f13f747001c612851e2cc7cda964062a908015f5e2a852912587f35443ccbaef7163667644acd7bbf67de4d8835b
+  data.tar.gz: 4cfe10c6fcabe4b04ebb12da4e91eef6e416539dc6f54a9e590b8e1458fae3be284ca1c5d2d58be0dfa9d22ec8cbd4720674d1eb637ee8c3861781e7490cdd6d

data/.rubocop.yml

@@ -2,12 +2,14 @@ AllCops:
   Exclude:
     - 'exp/**/*'
     - 'demo/**/*'
+  NewCops: enable
+  SuggestExtensions: false
+
+Gemspec/DevelopmentDependencies:
+  EnforcedStyle: gemspec
 
-Gemspec/DateAssignment:
-  Enabled: true
-  
 Gemspec/RequireMFA: # new in 1.23
-  Enabled: false  
+  Enabled: true
 
 Layout/ArgumentAlignment:
   Enabled: false
@@ -47,136 +49,19 @@ Layout/HashAlignment:
 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/RefinementImportMethods: # new in 1.27
-  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/UselessRuby2Keywords: # new in 1.23
-  Enabled: true  
-
 Lint/Void:
   Enabled: false
 
-Lint/UselessAssignment:
-  Enabled: true
-
 Metrics/AbcSize:
   Enabled: false
 
@@ -215,15 +100,6 @@ Naming/ConstantName:
 
 Naming/ClassAndModuleCamelCase:
   Enabled: false
-  
-Naming/BlockForwarding: # new in 1.24
-  Enabled: true  
-
-Naming/BlockParameterName:
-  Enabled: true
-
-Naming/InclusiveLanguage:
-  Enabled: true
 
 Naming/MethodParameterName:
   Enabled: false
@@ -234,15 +110,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
 
@@ -276,9 +143,6 @@ Style/CommentedKeyword:
 Style/ConditionalAssignment:
   Enabled: false
 
-Style/DefWithParentheses:
-  Enabled: true
-
 Style/Documentation:
   Enabled: false
 
@@ -288,92 +152,23 @@ Style/DocumentDynamicEvalDefinition:
 Style/ExpandPathArguments:
   Enabled: false
 
-Style/ExponentialNotation:
-  Enabled: true
-  
-Style/FileRead: # new in 1.24
-  Enabled: true  
-
-Style/FileWrite: # new in 1.24
-  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/MapToHash: # new in 1.24
-  Enabled: true  
 
 Style/MissingRespondToMissing:
   Enabled: false
 
-Style/MultilineInPatternThen:
-  Enabled: true
-
-Style/NegatedIfElseCondition:
-  Enabled: true
-
-Style/NestedFileDirname: # new in 1.26
-  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/OpenStructUse: # new in 1.23
-  Enabled: true  
-
-Style/QuotedSymbols:
-  Enabled: true
-
-Style/RaiseArgs:
-  Enabled: true
-
-Style/RedundantArgument:
-  Enabled: true
-  
-Style/RedundantInitialize: # new in 1.27
-  Enabled: true  
-
-Style/RedundantReturn:
-  Enabled: false
-
-Style/RedundantSelf:
-  Enabled: true
-
-Style/RedundantSelfAssignmentBranch:
-  Enabled: true
 
 Style/RegexpLiteral:
   Enabled: false
@@ -381,123 +176,11 @@ Style/RegexpLiteral:
 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,3 +1,20 @@
+## [0.4.13] - 2025-02-22
+- Tested against MRI Ruby 3.4.1
+
+### Changed
+- Shortened `.rubocop.yml` file
+
+### Fixed
+- Fixed all "offences" reported by Rubocop 1.72.2 
+
+## [0.4.12] - 2022-04-22
+- Code refactoring.
+
+### Changed
+- Refactoring class `SrlRuby::Tokenizer`: use of manifest constants, simplified newline and whitespace processing.
+- Updated of `.rubocop.yml` to integrate newer cops (from version 1.28)
+- Code refactoring: removal of redundant `return`
+
 ## [0.4.11] - 2022-04-17
 - Fixed code breaking change in Ruby 3.1+: prime library is no longer part of stdlib.
 

data/LICENSE.txt

@@ -5,7 +5,7 @@ the 'srl_test' directory, which is subject to its own license.
 
 The MIT License (MIT)
 
-Copyright (c) 2018-2021 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/README.md

@@ -405,8 +405,4 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/famish
 
 ## License
 
-The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
-
-## Code of Conduct
-
-Everyone interacting in the SrlRuby project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/srl_ruby/blob/master/CODE_OF_CONDUCT.md).
+The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/Rakefile

@@ -2,19 +2,18 @@
 
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task' # Rspec as testing tool
-# require 'cucumber/rake/task' # Cucumber as testing tool
+require 'cucumber/rake/task' # Cucumber as testing tool
 
 # desc 'Run RSpec'
 RSpec::Core::RakeTask.new(:spec)
 
-# Cucumber::Rake::Task.new do |_|
-  # # Comment
-# end
+Cucumber::Rake::Task.new do |_|
+  # Comment
+end
 
 # Combine RSpec and Cucumber tests
 desc 'Run tests, with RSpec and Cucumber'
-task test: :spec
-# task test: %i[spec cucumber]
+task test: %i[spec cucumber]
 
 
 # Default rake task

data/cucumber.yml

@@ -1,4 +1,4 @@
-default: --strict -v -b  --format progress features
+default: --strict -v -b --publish-quiet --format progress features
 
 
 

data/lib/regex/abstract_method.rb

@@ -17,7 +17,7 @@ module AbstractMethod
   # end
   def abstract_method
     # Determine the short class name of self
-    className = self.class.name.split(/::/).last
+    className = self.class.name.split('::').last
 
     # Retrieve the top text line of the call stack
     top_line = caller(1..1)

data/lib/regex/atomic_expression.rb

@@ -11,7 +11,7 @@ module Regex # This module is used as a namespace
     # Redefined method.
     # @return [TrueClass] Return true since it may not have any child.
     def atomic?
-      return true
+      true
     end
 
     # Notification that the parse tree construction is complete.

data/lib/regex/char_class.rb

@@ -30,9 +30,7 @@ module Regex # This module is used as a namespace
         end
         sub_result << child.to_str
       end
-      result = "[#{negated ? '^' : ''}#{result_children}]"
-
-      return result
+      "[#{negated ? '^' : ''}#{result_children}]"
     end
   end # class
 end # module

data/lib/regex/char_range.rb

@@ -44,7 +44,7 @@ module Regex # This module is used as a namespace
       msg = 'Character range error: lower bound is greater than upper bound.'
       raise StandardError, msg if theLowerBound.codepoint > theUpperBound.codepoint
 
-      return [theLowerBound, theUpperBound]
+      [theLowerBound, theUpperBound]
     end
   end # class
 end # module

data/lib/regex/char_shorthand.rb

@@ -45,7 +45,7 @@ module Regex # This module is used as a namespace
       msg = "Unknown predefined character class \\#{aShortname}"
       raise StandardError, msg unless StandardCClasses.include? aShortname
 
-      return aShortname
+      aShortname
     end
   end # class
 end # module

data/lib/regex/character.rb

@@ -93,7 +93,7 @@ module Regex # This module is used as a namespace
       aChar.ord
     end
 
-    # Convertion method that returns the codepoint for the given escape
+    # Conversion method that returns the codepoint for the given escape
     # sequence (a String).
     # Recognized escaped characters are: \a (alarm, 0x07), \n (newline, 0xA),
     # \r (carriage return, 0xD), \t (tab, 0x9), \e (escape, 0x1B), \f (form feed,
@@ -104,12 +104,10 @@ module Regex # This module is used as a namespace
     # Example:
     # RegAn::Character::esc2codepoint('\n') # Returns: 0xd
     def self.esc2codepoint(esc_seq)
-      msg = "Escape sequence #{esc_seq} does not begin with a backslash (\)."
+      msg = "Escape sequence #{esc_seq} does not begin with a backslash (\\)."
       raise StandardError, msg unless esc_seq[0] == '\\'
 
-      result = (esc_seq.length == 2) ? digram2codepoint(esc_seq) : esc_number2codepoint(esc_seq)
-
-      return result
+      (esc_seq.length == 2) ? digram2codepoint(esc_seq) : esc_number2codepoint(esc_seq)
     end
 
     # Return the character as a String object
@@ -127,7 +125,7 @@ module Regex # This module is used as a namespace
     # newOne == 0x03a3  # true. The Integer is compared to the codepoint value.
     # Will test equality with any Object that knows the to_s method
     def ==(other)
-      result = case other
+      case other
         when Character
           to_str == other.to_str
 
@@ -141,8 +139,6 @@ module Regex # This module is used as a namespace
           # Unknown type: try with a convertion
           self == other.to_s # Recursive call
       end
-
-      return result
     end
 
     # Return a plain English description of the character
@@ -160,7 +156,7 @@ module Regex # This module is used as a namespace
     def text_repr
       return char if lexeme.nil?
 
-      return lexeme.dup
+      lexeme.dup
     end
 
     # Convertion method that returns a codepoint for the given two characters
@@ -178,7 +174,7 @@ module Regex # This module is used as a namespace
       # If it not a special sequence, then escaped character is
       # considered literally (the backslash is 'dummy')
       result = char2codepoint(aDigram[-1]) if result.nil?
-      return result
+      result
     end
 
     private_class_method :digram2codepoint
@@ -199,7 +195,7 @@ module Regex # This module is used as a namespace
 
         # Extract the hexadecimal number
         hexliteral = hexa # shorterSeq.sub(/^[xXu]\{?([0-9a-fA-F]+)}?$/, '\1')
-        return hexliteral.hex
+        hexliteral.hex
       end
     end
 

data/lib/regex/concatenation.rb

@@ -19,11 +19,9 @@ module Regex # This module is used as a namespace
     # Conversion method re-definition.
     # Purpose: Return the String representation of the concatented expressions.
     def text_repr
-      outcome = children.inject(+'') do |result, child|
+      children.inject(+'') do |result, child|
         result << child.to_str
       end
-
-      return outcome
     end
   end # class
 end # module

data/lib/regex/expression.rb

@@ -26,8 +26,7 @@ module Regex # This module is used as a namespace
     # @param theParentOptions [Hash] matching options. They are overridden
     # by options with same name that are bound to this object.
     def options(theParentOptions)
-      resulting_options = theParentOptions.merge(@local_options)
-      return resulting_options
+      theParentOptions.merge(@local_options)
     end
 
     # Template method.
@@ -38,7 +37,7 @@ module Regex # This module is used as a namespace
       result << text_repr
       result << suffix
 
-      return result
+      result
     end
 
     protected

data/lib/regex/lookaround.rb

@@ -42,8 +42,7 @@ module Regex # This module is used as a namespace
     def to_str
       dir_syntax = (dir == :ahead) ? '' : '<'
       kind_syntax = (kind == :positive) ? '=' : '!'
-      result = "(?#{dir_syntax}#{kind_syntax}#{child.to_str})"
-      return result
+      "(?#{dir_syntax}#{kind_syntax}#{child.to_str})"
     end
   end # class
 end # module

data/lib/regex/match_option.rb

@@ -26,7 +26,7 @@ module Regex # This module is used as a namespace
       result = 0
       flags.each { |f| result |= f }
 
-      return result
+      result
     end
 
     # Equality operator
@@ -35,12 +35,12 @@ module Regex # This module is used as a namespace
       return true if object_id == other.object_id
 
       if other.kind_of?(MatchOption)
-        isEqual = ((flags == other.flags) && (child == other.child))
+        isEqual = (flags == other.flags) && (child == other.child)
       else
         isEqual = false
       end
 
-      return isEqual
+      isEqual
     end
 
     protected

data/lib/regex/monadic_expression.rb

@@ -32,9 +32,7 @@ module Regex # This module is used as a namespace
 
     # Return the text representation of the child (if any)
     def all_child_text
-      result = child.nil? ? '' : child.to_str
-
-      return result
+      child.nil? ? '' : child.to_str
     end
   end # class
 end # module

data/lib/regex/multiplicity.rb

@@ -56,7 +56,7 @@ module Regex # This module is used as a namespace
         possessive: '+'
       }
 
-      return subresult + policy2suffix[policy]
+      subresult + policy2suffix[policy]
     end
 
     private
@@ -66,7 +66,7 @@ module Regex # This module is used as a namespace
       err_msg = "Invalid lower bound of repetition count #{aLowerBound}"
       raise StandardError, err_msg unless aLowerBound.kind_of?(Integer)
 
-      return aLowerBound
+      aLowerBound
     end
 
     # Validation method. Return the validated lower bound value
@@ -76,7 +76,7 @@ module Regex # This module is used as a namespace
         raise StandardError, err_msg
       end
 
-      return anUpperBound
+      anUpperBound
     end
 
     # Validation method. Return the validated policy value.
@@ -85,7 +85,7 @@ module Regex # This module is used as a namespace
       valid_policies = %i[greedy lazy possessive]
       raise StandardError, err_msg unless valid_policies.include? aPolicy
 
-      return aPolicy
+      aPolicy
     end
   end # class
 end # module

data/lib/regex/non_capturing_group.rb

@@ -22,8 +22,7 @@ module Regex # This module is used as a namespace
     # Conversion method re-definition.
     # Purpose: Return the String representation of the captured expression.
     def text_repr
-      result = "(?:#{all_child_text})"
-      return result
+      "(?:#{all_child_text})"
     end
   end # class
 end # module

data/lib/regex/polyadic_expression.rb

@@ -24,7 +24,7 @@ module Regex # This module is used as a namespace
     def <<(aChild)
       @children << aChild
 
-      return self
+      self
     end
 
     # Notification that the parse tree construction is complete.
@@ -52,7 +52,7 @@ module Regex # This module is used as a namespace
     def df_visitor
       root = children # The visit will start from the children of this object
 
-      visitor = Enumerator.new do |result| # result is a Yielder
+      Enumerator.new do |result| # result is a Yielder
         # Initialization part: will run once
         visit_stack = [root] # The LIFO queue of nodes to visit
 
@@ -78,8 +78,6 @@ module Regex # This module is used as a namespace
           break if visit_stack.empty?
         end
       end
-
-      return visitor
     end
   end # class
 end # module

data/lib/regex/quantifiable.rb

@@ -8,7 +8,7 @@ module Regex # This module is used as a namespace
   module Quantifiable
     # Redefined method. Return true since it may not have any child.
     def quantified?
-      return !@quantifier.nil?
+      !@quantifier.nil?
     end
 
     def quantifier

data/lib/regex/repetition.rb

@@ -30,8 +30,7 @@ module Regex # This module is used as a namespace
     # Conversion method re-definition.
     # @return [String] String representation of the concatented expressions.
     def text_repr
-      result = all_child_text + multiplicity.to_str
-      return result
+      all_child_text + multiplicity.to_str
     end
   end # class
 end # module

data/lib/srl_ruby/ast_builder.rb

@@ -19,7 +19,7 @@ module SrlRuby
     # Create a new AST builder instance.
     # @param theTokens [Array<Token>] The sequence of input tokens.
     def initialize(theTokens)
-      super(theTokens)
+      super
       @options = []
     end
 
@@ -59,13 +59,11 @@ module SrlRuby
     # @param aTokenPosition [Integer] Position of token in the input stream
     # @param aToken [Rley::Lexical::Token] The input token
     def new_leaf_node(_production, _terminal, aTokenPosition, aToken)
-      node = Rley::PTree::TerminalNode.new(aToken, aTokenPosition)
-
-      return node
+      Rley::PTree::TerminalNode.new(aToken, aTokenPosition)
     end
 
     def multiplicity(lowerBound, upperBound)
-      return Regex::Multiplicity.new(lowerBound, upperBound, :greedy)
+      Regex::Multiplicity.new(lowerBound, upperBound, :greedy)
     end
 
     # rubocop: disable Style/OptionalBooleanParameter
@@ -88,14 +86,14 @@ module SrlRuby
         result = Regex::Character.new(aString)
       end
 
-      return result
+      result
     end
     # rubocop: enable Style/OptionalBooleanParameter
 
     def char_range(lowerBound, upperBound)
       lower = Regex::Character.new(lowerBound)
       upper = Regex::Character.new(upperBound)
-      return Regex::CharRange.new(lower, upper)
+      Regex::CharRange.new(lower, upper)
     end
 
     def char_class(toNegate, *theChildren)
@@ -283,7 +281,7 @@ module SrlRuby
       end
 
       # TODO check other implementations
-      return Regex::CharClass.new(false, *alternatives)
+      Regex::CharClass.new(false, *alternatives)
     end
 
     # rule('character_class' => %w[NONE OF STRING_LIT]).tag 'none_of'
@@ -337,13 +335,13 @@ module SrlRuby
       # What if literal is empty?...
 
       raw_literal = theChildren[-1].token.lexeme.dup
-      return string_literal(raw_literal)
+      string_literal(raw_literal)
     end
 
     # rule('raw' => %w[RAW STRING_LIT]).tag 'raw_literal'
     def reduce_raw_literal(_production, _range, _tokens, theChildren)
       raw_literal = theChildren[-1].token.lexeme.dup
-      return Regex::RawExpression.new(raw_literal)
+      Regex::RawExpression.new(raw_literal)
     end
 
     # rule('alternation' => %w[ANY OF LPAREN alternatives RPAREN]).tag 'any_of'
@@ -358,12 +356,12 @@ module SrlRuby
         result = Regex::Alternation.new(*theChildren[3])
       end
 
-      return result
+      result
     end
 
     # rule('alternatives' => %w[alternatives separator quantifiable]).tag 'alternative_list'
     def reduce_alternative_list(_production, _range, _tokens, theChildren)
-      return theChildren[0] << theChildren[-1]
+      theChildren[0] << theChildren[-1]
     end
 
     # rule('alternatives' => 'quantifiable').tag 'simple_alternative'
@@ -418,7 +416,7 @@ module SrlRuby
       make_last_repetition_lazy(theChildren[1])
       group = Regex::CapturingGroup.new(theChildren[1], name)
       (_, until_expr) = theChildren[4]
-      return Regex::Concatenation.new(group, until_expr)
+      Regex::Concatenation.new(group, until_expr)
     end
 
     # rule('quantifier' => 'ONCE').tag 'once'

data/lib/srl_ruby/tokenizer.rb

@@ -17,6 +17,16 @@ module SrlRuby
   # Delimiters: parentheses '(' and ')'
   # Separators: comma (optional)
   class Tokenizer
+    PATT_CHAR_CLASS = /[^,"\s]{2,}/.freeze
+    PATT_DIGIT_LIT = /[0-9]((?=\s|,|\))|$)/.freeze
+    PATT_IDENTIFIER = /[a-zA-Z_][a-zA-Z0-9_]+/.freeze
+    PATT_INTEGER = /[0-9]{2,}((?=\s|,|\))|$)/.freeze # An integer has 2..* digits
+    PATT_LETTER_LIT = /[a-zA-Z]((?=\s|,|\))|$)/.freeze
+    PATT_NEWLINE = /(?:\r\n)|\r|\n/.freeze
+    PATT_STR_DBL_QUOTE = /"(?:\\"|[^"])*"/.freeze # Double quotes literal?
+    PATT_STR_SNGL_QUOTE = /'(?:\\'|[^'])*'/.freeze # Single quotes literal?
+    PATT_WHITESPACE = /[ \t\f]+/.freeze
+
     # @return [StringScanner]
     attr_reader(:scanner)
 
@@ -26,14 +36,14 @@ module SrlRuby
     # @return [Integer] offset of start of current line within input
     attr_reader(:line_start)
 
-    @@lexeme2name = {
+    Lexeme2name = {
       '(' => 'LPAREN',
       ')' => 'RPAREN',
       ',' => 'COMMA'
     }.freeze
 
     # Here are all the SRL keywords (in uppercase)
-    @@keywords = %w[
+    Keywords = %w[
       ALL
       ALREADY
       AND
@@ -109,47 +119,55 @@ module SrlRuby
         tok_sequence << token unless token.nil?
       end
 
-      return tok_sequence
+      tok_sequence
     end
 
     private
 
     def _next_token
-      skip_whitespaces
-      curr_ch = scanner.peek(1)
-      return nil if curr_ch.nil? || curr_ch.empty?
-
       token = nil
 
-      if '(),'.include? curr_ch
-        # Delimiters, separators => single character token
-        token = build_token(@@lexeme2name[curr_ch], scanner.getch)
-      elsif (lexeme = scanner.scan(/[0-9]{2,}((?=\s|,|\))|$)/))
-        token = build_token('INTEGER', lexeme) # An integer has 2..* digits
-      elsif (lexeme = scanner.scan(/[0-9]((?=\s|,|\))|$)/))
-      token = build_token('DIGIT_LIT', lexeme)
-      elsif (lexeme = scanner.scan(/"(?:\\"|[^"])*"/)) # Double quotes literal?
-        unquoted = lexeme.gsub(/(^")|("$)/, '')
-        token = build_token('STRING_LIT', unquoted)
-      elsif (lexeme = scanner.scan(/'(?:\\'|[^'])*'/)) # Single quotes literal?
-        unquoted = lexeme.gsub(/(^')|('$)/, '')
-        token = build_token('STRING_LIT', unquoted)
-      elsif (lexeme = scanner.scan(/[a-zA-Z]((?=\s|,|\))|$)/))
-        token = build_token('LETTER_LIT', lexeme)
-      elsif (lexeme = scanner.scan(/[a-zA-Z_][a-zA-Z0-9_]+/))
-        keyw = @@keywords[lexeme.upcase]
-        tok_type = keyw || 'IDENTIFIER'
-        token = build_token(tok_type, lexeme)
-      elsif (lexeme = scanner.scan(/[^,"\s]{2,}/))
-        token = build_token('CHAR_CLASS', lexeme)
-      else # Unknown token
-        erroneous = curr_ch.nil? ? '' : scanner.scan(/./)
-        sequel = scanner.scan(/.{1,20}/)
-        erroneous += sequel unless sequel.nil?
-        raise ScanError, "Unknown token #{erroneous} on line #{lineno}"
-      end
+      # Loop until end of input reached or token found
+      until token || scanner.eos?
+
+        if scanner.skip(PATT_NEWLINE)
+          next_line_scanned
+          next
+        end
+        next if scanner.skip(PATT_WHITESPACE) # Skip whitespaces
+
+        curr_ch = scanner.peek(1)
+
+        token = if '(),'.include? curr_ch
+          # Delimiters, separators => single character token
+          build_token(Lexeme2name[curr_ch], scanner.getch)
+        elsif (lexeme = scanner.scan(PATT_INTEGER))
+          build_token('INTEGER', lexeme)
+        elsif (lexeme = scanner.scan(PATT_DIGIT_LIT))
+          build_token('DIGIT_LIT', lexeme)
+        elsif (lexeme = scanner.scan(PATT_STR_DBL_QUOTE))
+          unquoted = lexeme.gsub(/(^")|("$)/, '')
+          build_token('STRING_LIT', unquoted)
+        elsif (lexeme = scanner.scan(PATT_STR_SNGL_QUOTE))
+          unquoted = lexeme.gsub(/(^')|('$)/, '')
+          build_token('STRING_LIT', unquoted)
+        elsif (lexeme = scanner.scan(PATT_LETTER_LIT))
+          build_token('LETTER_LIT', lexeme)
+        elsif (lexeme = scanner.scan(PATT_IDENTIFIER))
+          keyw = Keywords[lexeme.upcase]
+          tok_type = keyw || 'IDENTIFIER'
+          build_token(tok_type, lexeme)
+        elsif (lexeme = scanner.scan(PATT_CHAR_CLASS))
+          build_token('CHAR_CLASS', lexeme)
+        else # Unknown token
+          erroneous = curr_ch.nil? ? '' : scanner.scan(/./)
+          sequel = scanner.scan(/.{1,20}/)
+          erroneous += sequel unless sequel.nil?
+          raise ScanError, "Unknown token #{erroneous} on line #{lineno}"
+        end
+      end # until
 
-      return token
+      token
     end
 
     def build_token(aSymbolName, aLexeme)
@@ -162,38 +180,13 @@ module SrlRuby
         raise e
       end
 
-      return token
-    end
-
-    def skip_whitespaces
-      pre_pos = scanner.pos
-
-      loop do
-        ws_found = false
-        found = scanner.skip(/[ \t\f]+/)
-        ws_found = true if found
-        found = scanner.skip(/(?:\r\n)|\r|\n/)
-        if found
-          ws_found = true
-          @lineno += 1
-          @line_start = scanner.pos
-        end
-        break unless ws_found
-      end
-
-      curr_pos = scanner.pos
-      return if curr_pos == pre_pos
-      # skipped = scanner.string.slice(Range.new(pre_pos, curr_pos))
-      # triplet = skipped.rpartition(/\n|\r/)
-      # @column = 1 unless triplet[1].empty?
-
-      # Correction for the tabs
-      # tab_count = triplet[2].chars.count { |ch| ch =~ /\t/ }
-      # @column += triplet[2].size + tab_count * (tab_size - 1) - 1
+      token
     end
 
-    def tab_size
-      2
+    # Event: next line detected.
+    def next_line_scanned
+      @lineno += 1
+      @line_start = scanner.pos
     end
   end # class
 end # module

data/lib/srl_ruby/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SrlRuby
-  VERSION = '0.4.11'
+  VERSION = '0.4.13'
 end

data/lib/srl_ruby.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require_relative './srl_ruby/version'
-require_relative './srl_ruby/tokenizer'
-require_relative './srl_ruby/grammar'
-require_relative './srl_ruby/ast_builder'
+require_relative 'srl_ruby/version'
+require_relative 'srl_ruby/tokenizer'
+require_relative 'srl_ruby/grammar'
+require_relative 'srl_ruby/ast_builder'
 
 module SrlRuby
   # Compile the SRL expression in given filename into a Regexp object.
@@ -14,7 +14,7 @@ module SrlRuby
     File.open(filename, 'r') { |f| source = f.read }
     return source if source.nil? || source.empty?
 
-    return parse(source)
+    parse(source)
   end
 
   # Compile the given SRL expression into its Regexp equivalent.
@@ -52,6 +52,6 @@ module SrlRuby
     # Now output the regexp literal
     root = ast_ptree.root
     options = root.is_a?(Regex::MatchOption) ? root.combine_opts : nil
-    return Regexp.new(root.to_str, options)
+    Regexp.new(root.to_str, options)
   end
 end # module

data/spec/acceptance/srl_test_suite_spec.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require_relative '../spec_helper'
-require_relative './support/rule_file_parser'
+require_relative 'support/rule_file_parser'
 require_relative '../../lib/srl_ruby'
 
 ##############################

data/spec/acceptance/support/rule_file_ast_builder.rb

@@ -46,7 +46,7 @@ module Acceptance
         end
       end
 
-      return rule_file
+      rule_file
     end
 
     # rule('srl_heading' => %w[SRL: SRL_SOURCE]).as 'srl_source'

data/spec/acceptance/support/rule_file_parser.rb

@@ -14,7 +14,7 @@ module Acceptance # This module is used as a namespace
       File.open(filename, 'r') { |f| source = f.read }
       return source if source.nil? || source.empty?
 
-      return parse(source)
+      parse(source)
     end
 
     # Parse the rule file
@@ -41,8 +41,7 @@ module Acceptance # This module is used as a namespace
       ast_ptree = engine.convert(result)
 
       # Now output the regexp literal
-      root = ast_ptree.root
-      return root
+      ast_ptree.root
     end
   end
 end # module

data/spec/acceptance/support/rule_file_tokenizer.rb

@@ -4,7 +4,6 @@
 # Tokenizer for SimpleRegex Test-Rule files
 # [File format](https://github.com/SimpleRegex/Test-Rules/blob/master/README.md)
 require 'strscan'
-require 'pp'
 require 'rley'
 
 module Acceptance
@@ -58,7 +57,7 @@ module Acceptance
         tok_sequence << token unless token.nil?
       end
 
-      return tok_sequence
+      tok_sequence
     end
 
     private
@@ -68,13 +67,11 @@ module Acceptance
       curr_ch = scanner.peek(1)
       return nil if curr_ch.nil? || curr_ch.empty?
 
-      token = if state == :default
+      if state == :default
         default_mode
       else
         expecting_srl
       end
-
-      return token
     end
 
     def default_mode
@@ -103,7 +100,7 @@ module Acceptance
         raise ScanError, "Unknown token #{erroneous}"
       end
 
-      return token
+      token
     end
 
     def expecting_srl
@@ -123,7 +120,7 @@ module Acceptance
         raise e
       end
 
-      return token
+      token
     end
 
     def skip_noise
@@ -152,7 +149,7 @@ module Acceptance
       end
 
       curr_pos = scanner.pos
-      return curr_pos != pre_pos
+      curr_pos != pre_pos
     end
 
     def skip_comment

data/srl_ruby.gemspec

@@ -65,7 +65,7 @@ SUMMARY
   spec.require_paths = ['lib']
   PkgExtending.pkg_files(spec)
   PkgExtending.pkg_documentation(spec)
-  spec.required_ruby_version = '>= 2.5.0'
+  spec.required_ruby_version = '>= 3.2.0'
 
   # Runtime dependencies
   spec.add_dependency 'rley', '~> 0.8.11'
@@ -75,4 +75,5 @@ SUMMARY
   spec.add_development_dependency 'cucumber', '>= 3.1.2'
   spec.add_development_dependency 'rake', '>= 12.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.metadata = { 'rubygems_mfa_required' => 'true' }
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: srl_ruby
 version: !ruby/object:Gem::Version
-  version: 0.4.11
+  version: 0.4.13
 platform: ruby
 authors:
 - Dimitri Geshef
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-17 00:00:00.000000000 Z
+date: 2025-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rley
@@ -189,8 +188,8 @@ files:
 homepage: https://github.com/famished-tiger/SRL-Ruby
 licenses:
 - MIT
-metadata: {}
-post_install_message:
+metadata:
+  rubygems_mfa_required: 'true'
 rdoc_options:
 - --charset=UTF-8 --exclude="examples|spec"
 require_paths:
@@ -199,15 +198,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: A parser for the [Simple Regex Language](https://simple-regex.com/). It translates
   patterns expressed in SRL into plain Ruby Regexp objects or in regex literals. Use