srl_ruby 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb518e00a96315122ae3bcc125af089a37d9631dbb5c3af8ba10f244382acb8f
-  data.tar.gz: 4f9eb678fb49a30cd60a9d6b49f703de06e7d9fb993a9605b5c36c89cff92953
+  metadata.gz: c0ad4df7433bb3c5e88e03e5670c306d1a70b6ec43f831c3d6d376e1776856e5
+  data.tar.gz: 57d9791c96e46524e08d21606d17d4757bea2d9d9cd4e1322276733e5cf1642c
 SHA512:
-  metadata.gz: ac09784a223162a0b2f5b1d4ec5a20a8b95efaa916ea1e7279a6dcdefd79f7b36488161abbba44fc2c619fa722096f5c705467236c66c39335b45e4415084dfb
-  data.tar.gz: daa15a338b751afc3ce2b9b0c5cd018eaae1e720d7d921da60be89264d01239c4f8504c44ebc37fa0cf32755cd7d2316e077bd487b6d9703ddde5acceb2039e8
+  metadata.gz: 151d3cdfd98bc907c2c4c3b63e317852fec743dc12b27f509b32285a8bd100242cc745c422a3c81641f4152453d3acc713246d8b907b532f635db5f99e83d2f2
+  data.tar.gz: 00b946261c11af9e9b64b460664a33498d1cd57685f3a6fc884c238c67c163b1c7a26efce508c3a9bd6e830bae82c1420697923e8889783b432c00333fffb2c7

data/.rubocop.yml

@@ -2,9 +2,19 @@ AllCops:
   Exclude:
     - 'exp/**/*'
 
+Gemspec/DateAssignment:
+  Enabled: true
+
+Layout/ArgumentAlignment:
+  Enabled: false
+
+Layout/ArrayAlignment:
+  Enabled: true
+  EnforcedStyle: with_fixed_indentation
+
 Layout/CaseIndentation:
   Enabled: false
-  
+
 Layout/ClosingHeredocIndentation:
   Enabled: false
 
@@ -16,7 +26,7 @@ Layout/ElseAlignment:
 
 Layout/EmptyLines:
   Enabled: false
-  
+
 Layout/EndAlignment:
   Enabled: false
 
@@ -24,39 +34,118 @@ Layout/EndOfLine:
   Enabled: true
   EnforcedStyle: lf
 
+Layout/FirstArgumentIndentation:
+  Enabled: false
+
+Layout/HashAlignment:
+  Enabled: false
+
 Layout/IndentationWidth:
   Enabled: false
 
 Layout/IndentationConsistency:
   Enabled: true
-  
-Layout/IndentHeredoc:
+
+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/Tab:
+
+Layout/IndentationStyle:
+  Enabled: true
+
+Layout/SpaceAroundMethodCallOperator:
   Enabled: true
-  
-Layout/TrailingBlankLines:
+
+Layout/TrailingEmptyLines:
   Enabled: true
 
 Layout/TrailingWhitespace:
   Enabled: true
 
+Lint/AmbiguousAssignment:
+  Enabled: true
+
+Lint/AmbiguousRange:
+  Enabled: true
+
+Lint/DeprecatedConstants:
+  Enabled: true
+
+Lint/DuplicateBranch:
+  Enabled: true
+
+Lint/DuplicateRegexpCharacterClassElement:
+  Enabled: true
+
+Lint/EmptyBlock:
+  Enabled: true
+
+Lint/EmptyClass:
+  Enabled: false
+
+Lint/EmptyInPattern:
+  Enabled: true
+
+Lint/LambdaWithoutLiteralBlock:
+  Enabled: true
+
 Lint/Loop:
   Enabled: true
 
+Lint/NoReturnInBeginEndBlocks:
+  Enabled: true
+
+Lint/NumberedParameterAssignment:
+  Enabled: true
+
+Lint/OrAssignmentToConstant:
+  Enabled: true
+
+Lint/RaiseException:
+  Enabled: true
+
+Lint/RedundantDirGlobSort:
+  Enabled: true
+
 Lint/RescueException:
   Enabled: true
 
+Lint/StructNewOverride:
+  Enabled: true
+
+Lint/SymbolConversion:
+  Enabled: true
+
+Lint/ToEnumArguments:
+  Enabled: true
+
+Lint/TripleQuotes:
+  Enabled: true
+
+Lint/UnexpectedBlockArity:
+  Enabled: true
+
+Lint/UnmodifiedReduceAccumulator:
+  Enabled: true
+
 Lint/UnusedMethodArgument:
   Enabled: true
 
@@ -76,20 +165,24 @@ Metrics/BlockLength:
   Enabled: true
   Max: 350
 
+Metrics/BlockNesting:
+  Enabled: true
+  Max: 5
+
 Metrics/ClassLength:
   Enabled: true
-  Max: 350
+  Max: 450
 
 Metrics/CyclomaticComplexity:
   Enabled: false
 
-Metrics/LineLength:
+Layout/LineLength:
   Enabled: false
   Max: 90
 
 Metrics/MethodLength:
   Enabled: true
-  Max: 40
+  Max: 60
 
 Metrics/ModuleLength:
   Enabled: true
@@ -103,11 +196,17 @@ Naming/ConstantName:
 
 Naming/ClassAndModuleCamelCase:
   Enabled: false
-  
-Naming/UncommunicativeBlockParamName:
+
+Naming/BlockParameterName:
   Enabled: true
-  
-Naming/UncommunicativeMethodParamName:
+
+Naming/InclusiveLanguage:
+  Enabled: true
+
+Naming/MethodParameterName:
+  Enabled: false
+
+Naming/MethodName:
   Enabled: false
 
 Naming/VariableName:
@@ -116,8 +215,8 @@ Naming/VariableName:
 Style/Alias:
   Enabled: true
 
-Layout/AlignHash:
-  Enabled: false
+Style/ArgumentsForwarding:
+  Enabled: true
 
 Style/AsciiComments:
   Enabled: false
@@ -137,6 +236,9 @@ Style/ClassCheck:
 Style/ClassVars:
   Enabled: false
 
+Style/CollectionCompact:
+  Enabled: true
+
 Style/ColonMethodCall:
   Enabled: false
 
@@ -155,44 +257,195 @@ Style/DefWithParentheses:
 Style/Documentation:
   Enabled: false
 
+Style/DocumentDynamicEvalDefinition:
+  Enabled: false
+
 Style/ExpandPathArguments:
   Enabled: false
 
+Style/ExponentialNotation:
+  Enabled: true
+
 Style/GuardClause:
   Enabled: false
 
+Style/HashEachMethods:
+  Enabled: true
+
+Style/HashExcept:
+  Enabled: true
+
+Style/HashTransformKeys:
+  Enabled: true
+
+Style/HashTransformValues:
+  Enabled: true
+
 Style/IfUnlessModifier:
   Enabled: false
 
+Style/InPatternThen:
+  Enabled: true
+
 Style/InverseMethods:
+  Enabled: false
+
+Style/MissingRespondToMissing:
+  Enabled: false
+
+Style/MultilineInPatternThen:
+  Enabled: true
+
+Style/NegatedIfElseCondition:
   Enabled: true
 
 Style/Next:
   Enabled: false
 
+Style/NilLambda:
+  Enabled: true
+
+Style/NumericLiterals:
+  Enabled: false
+
+Style/QuotedSymbols:
+  Enabled: true
+
 Style/RaiseArgs:
   Enabled: true
 
+Style/RedundantArgument:
+  Enabled: true
+
 Style/RedundantReturn:
   Enabled: false
-  
+
 Style/RedundantSelf:
   Enabled: true
 
+Style/RedundantSelfAssignmentBranch:
+  Enabled: true
+
 Style/RegexpLiteral:
   Enabled: false
 
 Style/PercentLiteralDelimiters:
   Enabled: false
-  
+
 Style/StderrPuts:
-  Enabled: false  
+  Enabled: false
 
 Style/StringLiterals:
   Enabled: true
 
+Style/SwapValues:
+  Enabled: true
+
 Style/TernaryParentheses:
   Enabled: false
-  
+
 Style/UnlessElse:
-  Enabled: false
+  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,5 +1,12 @@
+## [0.4.7] - 2021-08-24
+- Updated dependencies (Ruby >= 2.5), (Rley >= 0.8.02)
+- Code restyling to please rubocop 1.19.1. 
+### Changed
+- File `srl_ruby.gemspec` Updated the dependencies
+- File `.rubocop.yml` Added configuration for newest cops
+
 ## [0.4.6] - 2019-08-17
-- Code refactoring to use string frozen magic comments (as a consequence, srl_ruby runs only on Rubies 2.3 or newer).  
+- Code refactoring to use string frozen magic comments (as a consequence, skeem runs only on Rubies 2.3 or newer).  
 - Code restyling to please rubocop 0.7.40. 
 ### Changed
 - File `README.md` updated note on compatibility with Rubies

data/Rakefile

@@ -10,6 +10,7 @@ RSpec::Core::RakeTask.new do |spec|
 end
 
 Cucumber::Rake::Task.new do |_|
+  # Comment
 end
 
 # Combine RSpec and Cucumber tests

data/bin/srl2ruby

@@ -12,7 +12,11 @@ class Srl2RubyProg
   DefaultSRLExtension = 'srl'
   DefDirname = '/templates'
   DefTemplate = 'base.erb'
+
+  # @return [Hash]
   attr_reader(:cli_options)
+
+  # @return [ERB]
   attr_reader(:template)
 
   def initialize(prog_name, args)
@@ -49,18 +53,16 @@ class Srl2RubyProg
       fname = cli_options[:template]
       exists = File.exist?(fname)
       if exists
-        t_filepath = Dir.getwd + '/' + fname
+        t_filepath = "#{Dir.getwd}/#{fname}"
       else
-        t_filepath = def_template_dir + '/' + fname
+        t_filepath = "#{def_template_dir}/#{fname}"
         exit(1) unless file_exist?(t_filepath)
       end
     else
-      t_filepath = def_template_dir + '/' + DefTemplate
+      t_filepath = "#{def_template_dir}/#{DefTemplate}"
     end
     path = Pathname.new(t_filepath)
-    erb_template = ERB.new(path.read, nil, '<>')
-
-    erb_template
+    ERB.new(path.read, nil, '<>')
   end
 
   def validate_filename(raw_fname)

data/bin/srl2ruby_cli_parser.rb

@@ -37,7 +37,7 @@ class Srl2RubyCLIParser < OptionParser
   end
 
   def description
-    descr = <<-DESCR
+    <<-DESCR
 Description:
   Parses a SRL file and compiles it into a Ruby Regexp literal.
   Simple Regex Language (SRL) website: https://simple-regex.com
@@ -47,8 +47,6 @@ Examples:
   #{program_name} -p 'begin with literally "Hello world!"'
   #{program_name} example.srl -o example_re.rb -t srl_and_ruby.erb
 DESCR
-
-    descr
   end
 
   def heading

data/lib/regex/alternation.rb

@@ -19,9 +19,7 @@ module Regex # This module is used as a namespace
     # Purpose: Return the String representation of the concatented expressions.
     def text_repr
       result_children = children.map(&:to_str)
-      result = '(?:' + result_children.join('|') + ')'
-
-      return result
+      "(?:#{result_children.join('|')})"
     end
   end # class
 end # module

data/lib/regex/anchor.rb

@@ -26,6 +26,7 @@ module Regex # This module is used as a namespace
     # Constructor
     # @param aKind [String] Lexeme representation of the anchor
     def initialize(aKind)
+      super()
       @kind = valid_kind(aKind)
     end
 

data/lib/regex/capturing_group.rb

@@ -8,6 +8,8 @@ module Regex # This module is used as a namespace
   # An association between a capture variable and an expression
   # the subject text in the same serial arrangement
   class CapturingGroup < MonadicExpression
+    # rubocop: disable Style/OptionalBooleanParameter
+
     # The capture variable id. It is a Fixnum when the capture group gets
     # a sequence number,
     # a String when it is an user-defined name
@@ -42,12 +44,13 @@ module Regex # This module is used as a namespace
       atomic = no_backtrack ? '?>' : ''
       if child.is_a?(Regex::NonCapturingGroup)
         # Minor optimization
-        result = '(' + atomic + prefix + child.child.to_str + ')'
+        suffix = child.child.to_str
       else
-        result = '(' + atomic + prefix + child.to_str + ')'
+        suffix = child.to_str
       end
-      return result
+      "(#{atomic}#{prefix}#{suffix})"
     end
+    # rubocop: enable Style/OptionalBooleanParameter
   end # class
 end # module
 

data/lib/regex/char_class.rb

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

data/lib/regex/char_range.rb

@@ -34,9 +34,7 @@ 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
-      result = lower.to_str + '-' + upper.to_str
-
-      return result
+      "#{lower.to_str}-#{upper.to_str}"
     end
 
     private

data/lib/regex/char_shorthand.rb

@@ -26,6 +26,7 @@ module Regex # This module is used as a namespace
 
     # Constructor
     def initialize(aShortname)
+      super()
       @shortname = valid_shortname(aShortname)
     end
 

data/lib/regex/character.rb

@@ -59,6 +59,7 @@ module Regex # This module is used as a namespace
     # RegAn::Character.new('\n')    # Represents a newline
     # RegAn::Character.new('\u03a3')  # Represents a Σ
     def initialize(aValue)
+      super()
       case aValue
         when String
           if aValue.size == 1

data/lib/regex/expression.rb

@@ -7,7 +7,10 @@ require_relative 'abstract_method'
 module Regex # This module is used as a namespace
   # Abstract class. The generalization of any valid regular (sub)expression.
   class Expression
+    # @return [NilClass, Anchor]
     attr_accessor :begin_anchor
+
+    # @return [NilClass, Anchor]
     attr_accessor :end_anchor
 
     # Constructor

data/lib/regex/lookaround.rb

@@ -42,7 +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 + ')'
+      result = "(?#{dir_syntax}#{kind_syntax}#{child.to_str})"
       return result
     end
   end # class

data/lib/regex/multiplicity.rb

@@ -50,16 +50,13 @@ module Regex # This module is used as a namespace
           end
       end
 
-      suffix = case policy
-        when :greedy
-          ''
-        when :lazy
-          '?'
-        when :possessive
-          '+'
-      end
+      policy2suffix = {
+        greedy: '',
+        lazy: '?',
+        possessive: '+'
+      }
 
-      return subresult + suffix
+      return subresult + policy2suffix[policy]
     end
 
     private

data/lib/regex/non_capturing_group.rb

@@ -22,7 +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 + ')'
+      result = "(?:#{all_child_text})"
       return result
     end
   end # class

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? ? false : true
+      return !@quantifier.nil?
     end
 
     def quantifier

data/lib/regex/wildcard.rb

@@ -7,11 +7,6 @@ require_relative 'atomic_expression' # Access the superclass
 module Regex # This module is used as a namespace
   # A wildcard matches any character (except for the newline).
   class Wildcard < AtomicExpression
-    # Constructor
-    def initialize
-      super
-    end
-
     protected
 
     # Conversion method re-definition.

data/lib/srl_ruby/ast_builder.rb

@@ -68,6 +68,8 @@ module SrlRuby
       return Regex::Multiplicity.new(lowerBound, upperBound, :greedy)
     end
 
+    # rubocop: disable Style/OptionalBooleanParameter
+
     def string_literal(aString, to_escape = true)
       if aString.size > 1
         chars = []
@@ -88,6 +90,7 @@ module SrlRuby
 
       return result
     end
+    # rubocop: enable Style/OptionalBooleanParameter
 
     def char_range(lowerBound, upperBound)
       lower = Regex::Character.new(lowerBound)

data/lib/srl_ruby/grammar.rb

@@ -5,7 +5,7 @@ require 'rley' # Load the gem
 module SrlRuby
   ########################################
   # SRL grammar
-  builder = Rley::Syntax::GrammarBuilder.new do
+  builder = Rley::Notation::GrammarBuilder.new do
     # Separators...
     add_terminals('LPAREN', 'RPAREN', 'COMMA')
 
@@ -32,33 +32,33 @@ module SrlRuby
 
     # Grammar rules...
     rule('srl' => 'expression').as 'start_rule'
-    rule('expression' => %w[pattern flags]).as 'flagged_expr'
+    rule('expression' => 'pattern flags').as 'flagged_expr'
     rule('expression' => 'pattern').as 'simple_expr'
-    rule('pattern' => %w[pattern separator sub_pattern]).as 'pattern_sequence'
+    rule('pattern' => 'pattern separator sub_pattern').as 'pattern_sequence'
     rule('pattern' => 'sub_pattern').as 'basic_pattern'
     rule('sub_pattern' => 'quantifiable').as 'quantifiable_sub_pattern'
     rule('sub_pattern' => 'assertion').as 'assertion_sub_pattern'
     rule('separator' => 'COMMA').as 'comma_separator'
     rule('separator' => []).as 'void_separator'
-    rule('flags' => %w[flags separator single_flag]).as 'flag_sequence'
-    rule('flags' => %w[separator single_flag]).as 'flag_simple'
-    rule('single_flag' => %w[CASE INSENSITIVE]).as 'case_insensitive'
-    rule('single_flag' => %w[MULTI LINE]).as 'multi_line'
-    rule('single_flag' => %w[ALL LAZY]).as 'all_lazy'
-    rule('quantifiable' => %w[begin_anchor anchorable end_anchor]).as 'pinned_quantifiable'
-    rule('quantifiable' => %w[begin_anchor anchorable]).as 'begin_anchor_quantifiable'
-    rule('quantifiable' => %w[anchorable end_anchor]).as 'end_anchor_quantifiable'
+    rule('flags' => 'flags separator single_flag').as 'flag_sequence'
+    rule('flags' => 'separator single_flag').as 'flag_simple'
+    rule('single_flag' => 'CASE INSENSITIVE').as 'case_insensitive'
+    rule('single_flag' => 'MULTI LINE').as 'multi_line'
+    rule('single_flag' => 'ALL LAZY').as 'all_lazy'
+    rule('quantifiable' => 'begin_anchor anchorable end_anchor').as 'pinned_quantifiable'
+    rule('quantifiable' => 'begin_anchor anchorable').as 'begin_anchor_quantifiable'
+    rule('quantifiable' => 'anchorable end_anchor').as 'end_anchor_quantifiable'
     rule('quantifiable' => 'anchorable').as 'simple_quantifiable'
-    rule('begin_anchor' => %w[STARTS WITH]).as 'starts_with'
-    rule('begin_anchor' => %w[BEGIN WITH]).as 'begin_with'
-    rule('end_anchor' => %w[separator MUST END]).as 'end_anchor'
+    rule('begin_anchor' => 'STARTS WITH').as 'starts_with'
+    rule('begin_anchor' => 'BEGIN WITH').as 'begin_with'
+    rule('end_anchor' => 'separator MUST END').as 'end_anchor'
     rule('anchorable' => 'assertable').as 'simple_anchorable'
-    rule('assertion' => %w[IF FOLLOWED BY assertable]).as 'if_followed'
-    rule('assertion' => %w[IF NOT FOLLOWED BY assertable]).as 'if_not_followed'
-    rule('assertion' => %w[IF ALREADY HAD assertable]).as 'if_had'
-    rule('assertion' => %w[IF NOT ALREADY HAD assertable]).as 'if_not_had'
+    rule('assertion' => 'IF FOLLOWED BY assertable').as 'if_followed'
+    rule('assertion' => 'IF NOT FOLLOWED BY assertable').as 'if_not_followed'
+    rule('assertion' => 'IF ALREADY HAD assertable').as 'if_had'
+    rule('assertion' => 'IF NOT ALREADY HAD assertable').as 'if_not_had'
     rule('assertable' => 'term').as 'simple_assertable'
-    rule('assertable' => %w[term quantifier]).as 'quantified_assertable'
+    rule('assertable' => 'term quantifier').as 'quantified_assertable'
     rule('term' => 'atom').as 'atom_term'
     rule('term' => 'alternation').as 'alternation_term'
     rule('term' => 'grouping').as 'grouping_term'
@@ -69,20 +69,20 @@ module SrlRuby
     rule('atom' => 'special_char').as 'special_char_atom'
     rule('atom' => 'literal').as 'literal_atom'
     rule('atom' => 'raw').as 'raw_atom'
-    rule('letter_range' => %w[LETTER FROM LETTER_LIT TO LETTER_LIT]).as 'lowercase_from_to'
-    rule('letter_range' => %w[UPPERCASE LETTER FROM LETTER_LIT TO LETTER_LIT]).as 'uppercase_from_to'
+    rule('letter_range' => 'LETTER FROM LETTER_LIT TO LETTER_LIT').as 'lowercase_from_to'
+    rule('letter_range' => 'UPPERCASE LETTER FROM LETTER_LIT TO LETTER_LIT').as 'uppercase_from_to'
     rule('letter_range' => 'LETTER').as 'any_lowercase'
-    rule('letter_range' => %w[UPPERCASE LETTER]).as 'any_uppercase'
-    rule('digit_range' => %w[digit_or_number FROM DIGIT_LIT TO DIGIT_LIT]).as 'digits_from_to'
-    rule('character_class' => %w[ANY CHARACTER]).as 'any_character'
-    rule('character_class' => %w[NO CHARACTER]).as 'no_character'
+    rule('letter_range' => 'UPPERCASE LETTER').as 'any_uppercase'
+    rule('digit_range' => 'digit_or_number FROM DIGIT_LIT TO DIGIT_LIT').as 'digits_from_to'
+    rule('character_class' => 'ANY CHARACTER').as 'any_character'
+    rule('character_class' => 'NO CHARACTER').as 'no_character'
     rule('character_class' => 'digit_or_number').as 'digit'
-    rule('character_class' => %w[NO DIGIT]).as 'non_digit'
+    rule('character_class' => 'NO DIGIT').as 'non_digit'
     rule('character_class' => 'WHITESPACE').as 'whitespace'
-    rule('character_class' => %w[NO WHITESPACE]).as 'no_whitespace'
+    rule('character_class' => 'NO WHITESPACE').as 'no_whitespace'
     rule('character_class' => 'ANYTHING').as 'anything'
-    rule('character_class' => %w[ONE OF cclass]).as 'one_of'
-    rule('character_class' => %w[NONE OF cclass]).as 'none_of'
+    rule('character_class' => 'ONE OF cclass').as 'one_of'
+    rule('character_class' => 'NONE OF cclass').as 'none_of'
     rule('cclass' => 'STRING_LIT').as 'quoted_cclass' # Preferred syntax
     rule('cclass' => 'INTEGER').as 'digits_cclass'
     rule('cclass' => 'IDENTIFIER').as 'identifier_cclass'
@@ -90,32 +90,32 @@ module SrlRuby
     rule('special_char' => 'TAB').as 'tab'
     rule('special_char' => 'VERTICAL TAB').as 'vtab'
     rule('special_char' => 'BACKSLASH').as 'backslash'
-    rule('special_char' => %w[NEW LINE]).as 'new_line'
-    rule('special_char' => %w[CARRIAGE RETURN]).as 'carriage_return'
-    rule('special_char' => %w[WORD]).as 'word'
-    rule('special_char' => %w[NO WORD]).as 'no_word'
-    rule('literal' => %w[LITERALLY STRING_LIT]).as 'literally'
+    rule('special_char' => 'NEW LINE').as 'new_line'
+    rule('special_char' => 'CARRIAGE RETURN').as 'carriage_return'
+    rule('special_char' => 'WORD').as 'word'
+    rule('special_char' => 'NO WORD').as 'no_word'
+    rule('literal' => 'LITERALLY STRING_LIT').as 'literally'
     rule('raw' => 'RAW STRING_LIT').as 'raw_literal'
-    rule('alternation' => %w[any_or_either OF LPAREN alternatives RPAREN]).as 'any_of'
-    rule('alternatives' => %w[alternatives separator quantifiable]).as 'alternative_list'
+    rule('alternation' => 'any_or_either OF LPAREN alternatives RPAREN').as 'any_of'
+    rule('alternatives' => 'alternatives separator quantifiable').as 'alternative_list'
     rule('alternatives' => 'quantifiable').as 'simple_alternative'
     rule('any_or_either' => 'ANY').as 'any_keyword'
     rule('any_or_either' => 'EITHER').as 'either_keyword'
-    rule('grouping' => %w[LPAREN pattern RPAREN]).as 'grouping_parenthenses'
-    rule('capturing_group' => %w[CAPTURE assertable]).as 'capture'
-    rule('capturing_group' => %w[CAPTURE assertable UNTIL assertable]).as 'capture_until'
-    rule('capturing_group' => %w[CAPTURE assertable AS var_name]).as 'named_capture'
-    rule('capturing_group' => %w[CAPTURE assertable AS var_name UNTIL assertable]).as 'named_capture_until'
+    rule('grouping' => 'LPAREN pattern RPAREN').as 'grouping_parenthenses'
+    rule('capturing_group' => 'CAPTURE assertable').as 'capture'
+    rule('capturing_group' => 'CAPTURE assertable UNTIL assertable').as 'capture_until'
+    rule('capturing_group' => 'CAPTURE assertable AS var_name').as 'named_capture'
+    rule('capturing_group' => 'CAPTURE assertable AS var_name UNTIL assertable').as 'named_capture_until'
     rule('var_name' => 'STRING_LIT').as 'var_name'
     rule('var_name' => 'IDENTIFIER').as 'var_ident' # capture name not enclosed between quotes
     rule('quantifier' => 'ONCE').as 'once'
     rule('quantifier' => 'TWICE').as 'twice'
-    rule('quantifier' => %w[EXACTLY count TIMES]).as 'exactly'
-    rule('quantifier' => %w[BETWEEN count AND count times_suffix]).as 'between_and'
+    rule('quantifier' => 'EXACTLY count TIMES').as 'exactly'
+    rule('quantifier' => 'BETWEEN count AND count times_suffix').as 'between_and'
     rule('quantifier' => 'OPTIONAL').as 'optional'
-    rule('quantifier' => %w[ONCE OR MORE]).as 'once_or_more'
-    rule('quantifier' => %w[NEVER OR MORE]).as 'never_or_more'
-    rule('quantifier' => %w[AT LEAST count TIMES]).as 'at_least'
+    rule('quantifier' => 'ONCE OR MORE').as 'once_or_more'
+    rule('quantifier' => 'NEVER OR MORE').as 'never_or_more'
+    rule('quantifier' => 'AT LEAST count TIMES').as 'at_least'
     rule('digit_or_number' => 'DIGIT').as 'digit_keyword'
     rule('digit_or_number' => 'NUMBER').as 'number_keyword'
     rule('count' => 'DIGIT_LIT').as 'single_digit'

data/lib/srl_ruby/tokenizer.rb

@@ -17,10 +17,14 @@ module SrlRuby
   # Delimiters: parentheses '(' and ')'
   # Separators: comma (optional)
   class Tokenizer
+    # @return [StringScanner]
     attr_reader(:scanner)
+
+    # @return [Integer] current line number
     attr_reader(:lineno)
+
+    # @return [Integer] offset of start of current line within input
     attr_reader(:line_start)
-    # attr_reader(:column)
 
     @@lexeme2name = {
       '(' => 'LPAREN',
@@ -86,7 +90,7 @@ module SrlRuby
       WHITESPACE
       WITH
       WORD
-    ].map { |x| [x, x] } .to_h
+    ].map { |x| [x, x] }.to_h
 
     class ScanError < StandardError; end
 

data/lib/srl_ruby/version.rb

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

data/spec/acceptance/support/rule_file_grammar.rb

@@ -7,20 +7,20 @@ require 'rley' # Load the Rley gem
 # [File format](https://github.com/SimpleRegex/Test-Rules/blob/master/README.md)
 ########################################
 # Define a grammar for basic arithmetical expressions
-builder = Rley::Syntax::GrammarBuilder.new do
+builder = Rley::Notation::GrammarBuilder.new do
   # Punctuation
   add_terminals('COLON', 'DASH')
 
   # Keywords
   add_terminals('CAPTURE', 'FOR')
-  add_terminals('MATCH:', 'NO', 'SRL:')
+  add_terminals('MATCH', 'NO', 'SRL')
 
   # Literals
   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_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'
@@ -28,8 +28,8 @@ builder = Rley::Syntax::GrammarBuilder.new do
   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('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'

data/spec/acceptance/support/rule_file_tokenizer.rb

@@ -16,8 +16,13 @@ module Acceptance
   # Delimiters: parentheses '(' and ')'
   # Separators: comma (optional)
   class RuleFileTokenizer
+    # @return [StringScanner]
     attr_reader(:scanner)
+
+    # @return [Integer] current line number
     attr_reader(:lineno)
+
+    # @return [Integer] offset of start of current line within input
     attr_reader(:line_start)
 
     # Can be :default, :expecting_srl
@@ -82,7 +87,7 @@ module Acceptance
       elsif (lexeme = scanner.scan(/[0-9]+/))
         token = build_token('INTEGER', lexeme)
       elsif (lexeme = scanner.scan(/srl:|match:/))
-        token = build_token(@@keywords[lexeme], lexeme)
+        token = build_token(@@keywords[lexeme].chop, lexeme.chop)
         @state = :expecting_srl if lexeme == 'srl:'
       elsif (lexeme = scanner.scan(/[a-zA-Z_][a-zA-Z0-9_]*/))
         keyw = @@keywords[lexeme]

data/spec/regex/character_spec.rb

@@ -6,6 +6,8 @@ require_relative '../../lib/regex/character'
 
 module Regex # Open this namespace, to get rid of scope qualifiers
   describe Character do
+  # rubocop: disable Lint/ConstantDefinitionInBlock
+
     # This constant holds an arbitrary selection of characters
     SampleChars = [?a, ?\0, ?\u0107].freeze
 
@@ -116,6 +118,13 @@ module Regex # Open this namespace, to get rid of scope qualifiers
         end
       end
 
+      # Create a module that re-defines the existing to_s method
+      module Tweak_to_s
+        def to_s # Overwrite the existing to_s method
+          ?\u03a3
+        end
+      end # module
+
       it 'should known whether it is equal to another Object' do
         newOne = Character.new(?\u03a3)
 
@@ -147,12 +156,6 @@ module Regex # Open this namespace, to get rid of scope qualifiers
         expect(simulator).to receive(:to_s).and_return(?\u03a3)
         expect(newOne).to eq(simulator)
 
-        # Create a module that re-defines the existing to_s method
-        module Tweak_to_s
-          def to_s # Overwrite the existing to_s method
-            ?\u03a3
-          end
-        end # module
         weird = Object.new
         weird.extend(Tweak_to_s)
         expect(newOne).to eq(weird)
@@ -166,6 +169,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 Lint/ConstantDefinitionInBlock
   end # describe
 end # module
 

data/spec/regex/multiplicity_spec.rb

@@ -23,6 +23,7 @@ module Regex # This module is used as a namespace
     end
 
     context 'Provided services' do
+      # rubocop: disable Style/CombinableLoops
       it 'should know its text representation' do
         policy2text = { greedy: '', lazy: '?', possessive: '+' }
 
@@ -73,6 +74,7 @@ module Regex # This module is used as a namespace
           end
         end
       end
+      # rubocop: enable Style/CombinableLoops
     end
   end
 end # module

data/spec/srl_ruby_spec.rb

@@ -226,7 +226,7 @@ SRL
     let(:prefix) { 'letter from p to t ' }
 
     it "should parse 'once' syntax" do
-      regexp = SrlRuby.parse(prefix + 'once')
+      regexp = SrlRuby.parse("#{prefix}once")
       expect(regexp.source).to eq('[p-t]{1}')
     end
 
@@ -246,26 +246,26 @@ SRL
     end
 
     it "should parse 'between ... and ... times' syntax" do
-      regexp = SrlRuby.parse(prefix + 'between 2 and 4 times')
+      regexp = SrlRuby.parse("#{prefix}between 2 and 4 times")
       expect(regexp.source).to eq('[p-t]{2,4}')
 
       # Dropping 'times' keyword is a shorter alternative syntax
-      regexp = SrlRuby.parse(prefix + 'between 2 and 4')
+      regexp = SrlRuby.parse("#{prefix}between 2 and 4")
       expect(regexp.source).to eq('[p-t]{2,4}')
     end
 
     it "should parse 'once or more' syntax" do
-      regexp = SrlRuby.parse(prefix + 'once or more')
+      regexp = SrlRuby.parse("#{prefix}once or more")
       expect(regexp.source).to eq('[p-t]+')
     end
 
     it "should parse 'never or more' syntax" do
-      regexp = SrlRuby.parse(prefix + 'never or more')
+      regexp = SrlRuby.parse("#{prefix}never or more")
       expect(regexp.source).to eq('[p-t]*')
     end
 
     it "should parse 'at least  ... times' syntax" do
-      regexp = SrlRuby.parse(prefix + 'at least 10 times')
+      regexp = SrlRuby.parse("#{prefix}at least 10 times")
       expect(regexp.source).to eq('[p-t]{10,}')
     end
   end # context

data/srl_ruby.gemspec

@@ -65,13 +65,13 @@ SUMMARY
   spec.require_paths = ['lib']
   PkgExtending.pkg_files(spec)
   PkgExtending.pkg_documentation(spec)
-  spec.required_ruby_version = '>= 2.3.0'
+  spec.required_ruby_version = '>= 2.5.0'
 
   # Runtime dependencies
-  spec.add_dependency 'rley', '~> 0.7.00'
+  spec.add_dependency 'rley', '~> 0.8.02'
 
   # Development dependencies
-  spec.add_development_dependency 'bundler', '~> 2.0.0'
+  spec.add_development_dependency 'bundler', '~> 2.1.0'
   spec.add_development_dependency 'cucumber', '>= 2.2.0'
   spec.add_development_dependency 'rake', '~> 12.0'
   spec.add_development_dependency 'rspec', '~> 3.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: srl_ruby
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - Dimitri Geshef
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-08-17 00:00:00.000000000 Z
+date: 2021-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rley
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.00
+        version: 0.8.02
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.00
+        version: 0.8.02
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -190,7 +190,7 @@ homepage: https://github.com/famished-tiger/SRL-Ruby
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - --charset=UTF-8 --exclude="examples|spec"
 require_paths:
@@ -199,15 +199,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 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