srl_ruby 0.4.9 → 0.4.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53f0b4c07147644a3298d66dd4db0b7108fc1cc630debc1be7dc5721bca244bf
-  data.tar.gz: 410029ea6b5ddc36c6161d50701500af1cb406e8b39bbfa2b6d6d60839db41eb
+  metadata.gz: d1bd1a0bcdf03aad4c52a4df83bc252cf3f99ec3d9156c1d49a073f020f4c59c
+  data.tar.gz: 38de02e4dc7a6d7cf99a0d62f76adb89642e7785871834303f2c5df754d50dc4
 SHA512:
-  metadata.gz: 0e6124858fe023541f5fc291790251c2c87a2c36cbf28f9285d4b4ed6b87c3705ce381da3536c5e70627101f17c3b203673ea175fbb3fe58f7d193219ef959c0
-  data.tar.gz: a74fb973b4d74fe3546e10e9466654998f0f675ebaf9253932d8fb04b516feea767ab511c86fd11522df58084049a2b0f6455e1fd54ecde7920fd8f32550fc0b
+  metadata.gz: 636462883d5d49e79bde56104fface3d68694a9e6e99ffd7329bb3f990707a4cf15373546ad93c7e0fb135605f50bce96b2cefe64936fbb690a57273f8103b7f
+  data.tar.gz: 561f4d2aed5fb6c425095ca666128fe00f15b72ddf84d6b27f5ab6778d0a6b0a5657e69b7c71651c11b7d346cbfc914b3c42bc491ae3626e04d9841828190ac4

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,6 +168,9 @@ Lint/UnusedMethodArgument:
 Lint/UselessAccessModifier:
   Enabled: true
 
+Lint/UselessRuby2Keywords: # new in 1.23
+  Enabled: true
+
 Lint/Void:
   Enabled: false
 
@@ -207,6 +216,9 @@ Naming/ConstantName:
 Naming/ClassAndModuleCamelCase:
   Enabled: false
 
+Naming/BlockForwarding: # new in 1.24
+  Enabled: true
+
 Naming/BlockParameterName:
   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
 
@@ -336,8 +372,11 @@ 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,3 +1,20 @@
+## [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.
+
+### Fixed
+- File `srl-ruby.gemspec` has a dependency to `Rley 0.8.11`. Necessary to fix change in CRuby 3.1:  `prime` library is no more part of stdlib.
+
+### Changed
+- Minor style refactoring to please Runocop 1.27
+
 ## [0.4.9] - 2021-11-01
 - Code update to align with `Rley` v. 0.8.08
 

data/Rakefile

@@ -4,10 +4,8 @@ require 'bundler/gem_tasks'
 require 'rspec/core/rake_task' # Rspec as testing tool
 require 'cucumber/rake/task' # Cucumber as testing tool
 
-desc 'Run RSpec'
-RSpec::Core::RakeTask.new do |spec|
-  spec.pattern = 'spec/**/*_spec.rb'
-end
+# desc 'Run RSpec'
+RSpec::Core::RakeTask.new(:spec)
 
 Cucumber::Rake::Task.new do |_|
   # Comment
@@ -17,5 +15,6 @@ end
 desc 'Run tests, with RSpec and Cucumber'
 task test: %i[spec cucumber]
 
+
 # Default rake task
 task default: :test

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

@@ -107,9 +107,7 @@ module Regex # This module is used as a namespace
       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

@@ -13,9 +13,6 @@ module Regex # This module is used as a namespace
     # @return [NilClass, Anchor]
     attr_accessor :end_anchor
 
-    # Constructor
-    def initialize(); end
-
     # Abstract method. Return true iff the expression is atomic
     # (= doesn't not have any child).
     # @return [Boolean]
@@ -29,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.
@@ -41,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
@@ -40,7 +40,7 @@ module Regex # This module is used as a namespace
         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

@@ -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.9'
+  VERSION = '0.4.12'
 end

data/lib/srl_ruby.rb

@@ -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/support/rule_file_ast_builder.rb

@@ -32,7 +32,7 @@ module Acceptance
       Terminal2NodeClass
     end
 
-    # rule('rule_file' => %w[srl_heading srl_tests]).as 'start_rule'
+    # rule('rule_file' => 'srl_heading tests').as 'start_rule'
     def reduce_start_rule(_production, _range, _tokens, theChildren)
       rule_file = RuleFileTests.new(theChildren[0])
       tests = theChildren.last.flatten
@@ -46,7 +46,7 @@ module Acceptance
         end
       end
 
-      return rule_file
+      rule_file
     end
 
     # rule('srl_heading' => %w[SRL: SRL_SOURCE]).as 'srl_source'
@@ -54,16 +54,6 @@ module Acceptance
       theChildren.last
     end
 
-    # rule('srl_tests' => %w[srl_tests single_test]).as 'test_list'
-    def reduce_test_list(_production, _range, _tokens, theChildren)
-      theChildren[0] << theChildren[1]
-    end
-
-    # rule('srl_tests' => 'single_test').as 'one_test'
-    def reduce_one_test(_production, _range, _tokens, theChildren)
-      [theChildren.last]
-    end
-
     # rule('match_test' => %w[MATCH: STRING_LIT]).as 'match_string'
     def reduce_match_string(_production, _range, _tokens, theChildren)
       MatchTest.new(theChildren.last)
@@ -85,17 +75,6 @@ module Acceptance
       theChildren[2]
     end
 
-    # rule('capture_expectations' => %w[capture_expectations
-    #   single_expectation]).as 'assertion_list'
-    def reduce_assertion_list(_production, _range, _tokens, theChildren)
-      theChildren[0] << theChildren[1]
-    end
-
-    # rule('capture_expectations' => 'single_expectation').as 'one_expectation'
-    def reduce_one_expectation(_production, _range, _tokens, theChildren)
-      [theChildren.last]
-    end
-
     # rule('single_expectation' => %w[DASH INTEGER COLON capture_variable
     #   COLON STRING_LIT]).as 'capture_expectation'
     def reduce_capture_expectation(_production, _range, _tokens, theChildren)

data/spec/acceptance/support/rule_file_grammar.rb

@@ -6,7 +6,6 @@ require 'rley' # Load the Rley gem
 # Grammar for Test-Rule files
 # [File format](https://github.com/SimpleRegex/Test-Rules/blob/master/README.md)
 ########################################
-# Define a grammar for basic arithmetical expressions
 builder = Rley::grammar_builder do
   # Punctuation
   add_terminals('COLON', 'DASH')
@@ -19,24 +18,20 @@ builder = Rley::grammar_builder do
   add_terminals('INTEGER', 'STRING_LIT')
   add_terminals('IDENTIFIER', 'SRL_SOURCE')
 
-  rule('rule_file' => 'srl_heading srl_tests').as 'start_rule'
-  rule('srl_heading' => 'SRL SRL_SOURCE').as 'srl_source'
-  rule('srl_tests' => 'srl_tests single_test').as 'test_list'
-  rule('srl_tests' => 'single_test').as 'one_test'
-  rule('single_test' => 'atomic_test').as 'single_atomic_test'
-  rule('single_test' => 'compound_test').as 'single_compound_test'
-  rule('atomic_test' => 'match_test').as 'atomic_match'
-  rule('atomic_test' => 'no_match_test').as 'atomic_no_match'
-  rule('compound_test' => 'capture_test').as 'compound_capture'
-  rule('match_test' => 'MATCH STRING_LIT').as 'match_string'
-  rule('no_match_test' => 'NO MATCH STRING_LIT').as 'no_match_string'
-  rule('capture_test' => 'capture_heading capture_expectations').as 'capture_test'
-  rule('capture_heading' => 'CAPTURE FOR STRING_LIT COLON').as 'capture_string'
-  rule('capture_expectations' => 'capture_expectations single_expectation').as 'assertion_list'
-  rule('capture_expectations' => 'single_expectation').as 'one_expectation'
-  rule('single_expectation' => 'DASH INTEGER COLON capture_variable COLON STRING_LIT').as 'capture_expectation'
-  rule('capture_variable' => 'INTEGER').as 'var_integer'
-  rule('capture_variable' => 'IDENTIFIER').as 'var_identifier'
+  rule('rule_file' => 'srl_heading srl_test+').tag 'start_rule'
+  rule('srl_heading' => 'SRL SRL_SOURCE').tag 'srl_source'
+  rule('srl_test' => 'atomic_test').tag 'single_atomic_test'
+  rule('srl_test' => 'compound_test').tag 'single_compound_test'
+  rule('atomic_test' => 'match_test').tag 'atomic_match'
+  rule('atomic_test' => 'no_match_test').tag 'atomic_no_match'
+  rule('compound_test' => 'capture_test').tag 'compound_capture'
+  rule('match_test' => 'MATCH STRING_LIT').tag 'match_string'
+  rule('no_match_test' => 'NO MATCH STRING_LIT').tag 'no_match_string'
+  rule('capture_test' => 'capture_heading capture_expectation+').tag 'capture_test'
+  rule('capture_heading' => 'CAPTURE FOR STRING_LIT COLON').tag 'capture_string'
+  rule('capture_expectation' => 'DASH INTEGER COLON capture_variable COLON STRING_LIT').tag 'capture_expectation'
+  rule('capture_variable' => 'INTEGER').tag 'var_integer'
+  rule('capture_variable' => 'IDENTIFIER').tag 'var_identifier'
 end
 
 # And now build the grammar...

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

@@ -58,7 +58,7 @@ module Acceptance
         tok_sequence << token unless token.nil?
       end
 
-      return tok_sequence
+      tok_sequence
     end
 
     private
@@ -68,13 +68,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 +101,7 @@ module Acceptance
         raise ScanError, "Unknown token #{erroneous}"
       end
 
-      return token
+      token
     end
 
     def expecting_srl
@@ -123,7 +121,7 @@ module Acceptance
         raise e
       end
 
-      return token
+      token
     end
 
     def skip_noise
@@ -152,7 +150,7 @@ module Acceptance
       end
 
       curr_pos = scanner.pos
-      return curr_pos != pre_pos
+      curr_pos != pre_pos
     end
 
     def skip_comment

data/spec/regex/character_spec.rb

@@ -53,6 +53,7 @@ module Regex # Open this namespace, to get rid of scope qualifiers
       end
     end # context
 
+    # rubocop: disable Style/DocumentDynamicEvalDefinition
     context 'Provided services' do
       it 'Should know its lexeme if created from a string' do
         # Lexeme is defined when the character was initialised from a text
@@ -89,7 +90,6 @@ module Regex # Open this namespace, to get rid of scope qualifiers
 
         # Try with our escape sequence samples
         (SampleDigrams + SampleNumEscs).each do |escape_seq|
-          
           # Build a string from escape sequence literal
           expectation = String.class_eval(%Q|"#{escape_seq}"|, __FILE__, __LINE__)
           new_ch = Character.new(escape_seq).to_str
@@ -115,7 +115,6 @@ module Regex # Open this namespace, to get rid of scope qualifiers
 
         # Try with our escape sequence samples
         (SampleDigrams + SampleNumEscs).each do |escape_seq|
-
           # Get ordinal value of given escape sequence
           expectation = String.class_eval(%Q|"#{escape_seq}".ord()|, __FILE__, __LINE__)
           expect(Character.new(escape_seq).codepoint).to eq(expectation)
@@ -151,7 +150,7 @@ module Regex # Open this namespace, to get rid of scope qualifiers
         # Case 5: test fails with multiple character strings
         expect(newOne).not_to eq('03a3')
 
-        # Case 6: equality testing with arbitray object
+        # Case 6: equality testing with arbitrary object
         expect(newOne).not_to eq(nil)
         expect(newOne).not_to eq(Object.new)
 
@@ -173,6 +172,7 @@ module Regex # Open this namespace, to get rid of scope qualifiers
         expect(ch2.explain).to eq("the character '\u03a3'")
       end
     end # context
+    # rubocop: enable Style/DocumentDynamicEvalDefinition
     # rubocop: enable Lint/ConstantDefinitionInBlock
   end # describe
 end # module

data/srl_ruby.gemspec

@@ -68,11 +68,11 @@ SUMMARY
   spec.required_ruby_version = '>= 2.5.0'
 
   # Runtime dependencies
-  spec.add_dependency 'rley', '~> 0.8.08'
+  spec.add_dependency 'rley', '~> 0.8.11'
 
   # Development dependencies
-  spec.add_development_dependency 'bundler', '~> 2.2.0'
-  spec.add_development_dependency 'cucumber', '>= 2.2.0'
-  spec.add_development_dependency 'rake', '~> 12.0'
+  spec.add_development_dependency 'bundler', '>= 2.2.0'
+  spec.add_development_dependency 'cucumber', '>= 3.1.2'
+  spec.add_development_dependency 'rake', '>= 12.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: srl_ruby
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.4.12
 platform: ruby
 authors:
 - Dimitri Geshef
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-01 00:00:00.000000000 Z
+date: 2022-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rley
@@ -16,26 +16,26 @@ 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
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.0
 - !ruby/object:Gem::Dependency
@@ -44,26 +44,26 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 3.1.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 3.1.2
 - !ruby/object:Gem::Dependency
   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
@@ -206,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: A parser for the [Simple Regex Language](https://simple-regex.com/). It translates