srl_ruby 0.4.6 → 0.4.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb518e00a96315122ae3bcc125af089a37d9631dbb5c3af8ba10f244382acb8f
-  data.tar.gz: 4f9eb678fb49a30cd60a9d6b49f703de06e7d9fb993a9605b5c36c89cff92953
+  metadata.gz: 32a18d724b0eaeff828ffc7fa2413834ea9e16dd1c46a06af7d5438c56fec159
+  data.tar.gz: 628b07343fdd3da4a2903b48b392ce6b52880e68ad0f229efd0d702abe3a90df
 SHA512:
-  metadata.gz: ac09784a223162a0b2f5b1d4ec5a20a8b95efaa916ea1e7279a6dcdefd79f7b36488161abbba44fc2c619fa722096f5c705467236c66c39335b45e4415084dfb
-  data.tar.gz: daa15a338b751afc3ce2b9b0c5cd018eaae1e720d7d921da60be89264d01239c4f8504c44ebc37fa0cf32755cd7d2316e077bd487b6d9703ddde5acceb2039e8
+  metadata.gz: 376fa359b54c5f5434c70ca9d855d718bfb933e30c5cdf29409f23ee3113659577b5680c073e091ca42c7e3ed0c68836ed9120fb93aa3d2be1a78cdcae08d8fb
+  data.tar.gz: 256f800715bc35d61cf134cddb91f199455357712e5f197d271e7efaebb6e745c66970d4a02935dd6f6779f22eb9309af744f0de47e78226bed924ae22885847

data/.rubocop.yml

@@ -1,10 +1,21 @@
 AllCops:
   Exclude:
     - 'exp/**/*'
+    - 'demo/**/*'
+
+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 +27,7 @@ Layout/ElseAlignment:
 
 Layout/EmptyLines:
   Enabled: false
-  
+
 Layout/EndAlignment:
   Enabled: false
 
@@ -24,39 +35,127 @@ 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/AmbiguousOperatorPrecedence: # new in 1.21
+  Enabled: true
+
+Lint/AmbiguousRange:
+  Enabled: true
+
+Lint/DeprecatedConstants:
+  Enabled: true
+
+Lint/DuplicateBranch:
+  Enabled: true
+
+Lint/DuplicateRegexpCharacterClassElement:
+  Enabled: true
+
+Lint/EmptyBlock:
+  Enabled: true
+
+Lint/EmptyClass:
+  Enabled: false
+
+Lint/EmptyInPattern:
+  Enabled: true
+
+Lint/IncompatibleIoSelectWithFiberScheduler: # new in 1.21
+  Enabled: true
+
+Lint/LambdaWithoutLiteralBlock:
+  Enabled: true
+
 Lint/Loop:
   Enabled: true
 
+Lint/NoReturnInBeginEndBlocks:
+  Enabled: true
+
+Lint/NumberedParameterAssignment:
+  Enabled: true
+
+Lint/OrAssignmentToConstant:
+  Enabled: true
+
+Lint/RaiseException:
+  Enabled: true
+
+Lint/RedundantDirGlobSort:
+  Enabled: true
+
+Lint/RequireRelativeSelfPath: # new in 1.22
+  Enabled: true
+
 Lint/RescueException:
   Enabled: true
 
+Lint/StructNewOverride:
+  Enabled: true
+
+Lint/SymbolConversion:
+  Enabled: true
+
+Lint/ToEnumArguments:
+  Enabled: true
+
+Lint/TripleQuotes:
+  Enabled: true
+
+Lint/UnexpectedBlockArity:
+  Enabled: true
+
+Lint/UnmodifiedReduceAccumulator:
+  Enabled: true
+
 Lint/UnusedMethodArgument:
   Enabled: true
 
@@ -76,20 +175,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,21 +206,30 @@ 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:
   Enabled: false
 
+Security/IoMethods: # new in 1.22
+  Enabled: true
+
 Style/Alias:
   Enabled: true
 
-Layout/AlignHash:
-  Enabled: false
+Style/ArgumentsForwarding:
+  Enabled: true
 
 Style/AsciiComments:
   Enabled: false
@@ -137,6 +249,9 @@ Style/ClassCheck:
 Style/ClassVars:
   Enabled: false
 
+Style/CollectionCompact:
+  Enabled: true
+
 Style/ColonMethodCall:
   Enabled: false
 
@@ -155,44 +270,204 @@ Style/DefWithParentheses:
 Style/Documentation:
   Enabled: false
 
+Style/DocumentDynamicEvalDefinition:
+  Enabled: true
+
 Style/ExpandPathArguments:
   Enabled: false
 
+Style/ExponentialNotation:
+  Enabled: true
+
 Style/GuardClause:
   Enabled: false
 
+Style/HashEachMethods:
+  Enabled: true
+
+Style/HashExcept:
+  Enabled: true
+
+Style/HashTransformKeys:
+  Enabled: true
+
+Style/HashTransformValues:
+  Enabled: true
+
 Style/IfUnlessModifier:
   Enabled: false
 
+Style/InPatternThen:
+  Enabled: true
+
 Style/InverseMethods:
+  Enabled: false
+
+Style/MissingRespondToMissing:
+  Enabled: false
+
+Style/MultilineInPatternThen:
+  Enabled: true
+
+Style/NegatedIfElseCondition:
   Enabled: true
 
 Style/Next:
   Enabled: false
 
+Style/NilLambda:
+  Enabled: true
+
+Style/NumberedParameters: # new in 1.22
+  Enabled: true
+
+Style/NumberedParametersLimit: # new in 1.22
+  Enabled: true
+
+Style/NumericLiterals:
+  Enabled: false
+
+Style/QuotedSymbols:
+  Enabled: true
+
 Style/RaiseArgs:
   Enabled: true
 
+Style/RedundantArgument:
+  Enabled: true
+
 Style/RedundantReturn:
   Enabled: false
-  
+
 Style/RedundantSelf:
   Enabled: true
 
+Style/RedundantSelfAssignmentBranch:
+  Enabled: true
+
 Style/RegexpLiteral:
   Enabled: false
 
 Style/PercentLiteralDelimiters:
   Enabled: false
-  
+
+Style/SelectByRegexp: # new in 1.22
+  Enabled: true
+
 Style/StderrPuts:
-  Enabled: false  
+  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,33 @@
+## [0.4.9] - 2021-11-01
+- Code update to align with `Rley` v. 0.8.08
+
+### Changed
+- File `ast_builder.rb` Updated some `reduce_...` methods to cope with ? quantifier change
+- File `srl_ruby.gemspec` Updated the dependency towards Rley
+- File `.rubocop.yml` Added newest cops from 1.21 and 1.22
+
+### Fixed
+- File `grammar.rb` is now calling `Rley::grammar_builder` factory method.
+- File `rule_file_grammar.rb` is now calling `Rley::grammar_builder` factory method.
+
+## [0.4.8] - 2021-08-27
+- Updated dependencies (Bundler >~ 2.2), (Rley >~ 0.8.03)
+- Grammar refactoring to take profit of new Rley rule syntax.
+
+### Changed
+- File `srl_ruby.gemspec` Updated the dependencies
+- File `grammar.rb` Grammar refactored (use  ? * + modifiers in production rules)
+- class `ASTBuilder` updated `reduce_` to reflect new refactored production rules.
+
+## [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/LICENSE.txt

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