srl_ruby 0.4.3 → 0.4.7

data/spec/acceptance/support/rule_file_nodes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Classes that implement nodes of Abstract Syntax Trees (AST) representing
 # rule file contents.
 

data/spec/acceptance/support/rule_file_parser.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'rule_file_tokenizer'
 require_relative 'rule_file_grammar'
 require_relative 'rule_file_ast_builder'

data/spec/acceptance/support/rule_file_tokenizer.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 # File: rule_tokenizer.rb
 # Tokenizer for SimpleRegex Test-Rule files
 # [File format](https://github.com/SimpleRegex/Test-Rules/blob/master/README.md)
 require 'strscan'
 require 'pp'
-require_relative 'rule_file_token'
+require 'rley'
 
 module Acceptance
   # The tokenizer should recognize:
@@ -14,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
@@ -74,18 +81,17 @@ module Acceptance
       curr_ch = scanner.peek(1)
       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]+/))
         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]
-        token_type = keyw ? keyw : 'IDENTIFIER'
+        token_type = keyw || 'IDENTIFIER'
         token = build_token(token_type, lexeme)
       elsif (lexeme = scanner.scan(/"([^"]|\\")*"/)) # Double quotes literal?
         unquoted = lexeme.gsub(/(^")|("$)/, '')
@@ -110,11 +116,11 @@ module Acceptance
     def build_token(aSymbolName, aLexeme)
       begin
         col = scanner.pos - aLexeme.size - @line_start + 1
-        pos = Position.new(@lineno, col)
-        token = RuleFileToken.new(aLexeme, aSymbolName, pos)
-      rescue StandardError => exc
+        pos = Rley::Lexical::Position.new(@lineno, col)
+        token = Rley::Lexical::Token.new(aLexeme, aSymbolName, pos)
+      rescue StandardError => e
         puts "Failing with '#{aSymbolName}' and '#{aLexeme}'"
-        raise exc
+        raise e
       end
 
       return token

data/spec/regex/atomic_expression_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # File: atomic_expression_spec.rb
 require_relative '../spec_helper' # Use the RSpec test framework
 require_relative '../../lib/regex/atomic_expression'

data/spec/regex/character_spec.rb

@@ -1,9 +1,13 @@
+# frozen_string_literal: true
+
 # File: character_spec.rb
 require_relative '../spec_helper' # Use the RSpec test framework
 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
 
@@ -114,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)
 
@@ -145,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)
@@ -164,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/match_option_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # File: match_option_spec.rb
 
 require_relative '../spec_helper' # Use the RSpec test framework

data/spec/regex/monadic_expression_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # File: monadic_expression_spec.rb
 require_relative '../spec_helper' # Use the RSpec test framework
 require_relative '../../lib/regex/monadic_expression'

data/spec/regex/multiplicity_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # File: multiplicity_spec.rb
 
 require_relative '../spec_helper' # Use the RSpec test framework
@@ -21,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: '+' }
 
@@ -71,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/regex/repetition_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # File: repetition_spec.rb
 require_relative '../spec_helper' # Use the RSpec test framework
 require_relative '../../lib/regex/repetition'

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/setup'
 require 'rspec' # Use the RSpec framework
 require_relative '../lib/srl_ruby'

data/spec/srl_ruby/srl_ruby_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../spec_helper'
 
 RSpec.describe SrlRuby do

data/spec/srl_ruby/tokenizer_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../spec_helper' # Use the RSpec framework
 require_relative '../../lib/srl_ruby/tokenizer' # Load the class under test
 
@@ -14,7 +16,7 @@ module SrlRuby
     subject { Tokenizer.new('') }
 
     context 'Initialization:' do
-      it 'should be initialized with a text to tokenize and a grammar' do
+      it 'should be initialized with a text to tokenize' do
         expect { Tokenizer.new('anything') }.not_to raise_error
       end
 

data/spec/srl_ruby_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'spec_helper' # Use the RSpec framework
 require_relative '../lib/srl_ruby'
 
@@ -224,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
 
@@ -244,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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'srl_ruby/version'
@@ -46,7 +48,7 @@ Gem::Specification.new do |spec|
   spec.email         = ['famished.tiger@yahoo.com']
 
   spec.description   = <<-DESCR
-  A compiler and library that transforms highly readable Simple Regex Language 
+  A compiler and library that transforms highly readable Simple Regex Language
   patterns into regular expressions.
 DESCR
   spec.summary = <<-SUMMARY
@@ -63,14 +65,14 @@ SUMMARY
   spec.require_paths = ['lib']
   PkgExtending.pkg_files(spec)
   PkgExtending.pkg_documentation(spec)
-  spec.required_ruby_version = '>= 2.1.0'
+  spec.required_ruby_version = '>= 2.5.0'
 
   # Runtime dependencies
-  spec.add_dependency 'rley', '~> 0.6'
+  spec.add_dependency 'rley', '~> 0.8.02'
 
   # Development dependencies
-  spec.add_development_dependency 'bundler', '~> 1.16'
+  spec.add_development_dependency 'bundler', '~> 2.1.0'
   spec.add_development_dependency 'cucumber', '>= 2.2.0'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  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.3
+  version: 0.4.7
 platform: ruby
 authors:
 - Dimitri Geshef
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-06-24 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.6'
+        version: 0.8.02
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 0.8.02
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 2.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -80,8 +80,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-description: "  A compiler and library that transforms highly readable Simple Regex
-  Language \n  patterns into regular expressions.\n"
+description: |2
+    A compiler and library that transforms highly readable Simple Regex Language
+    patterns into regular expressions.
 email:
 - famished.tiger@yahoo.com
 executables:
@@ -146,7 +147,6 @@ files:
 - lib/srl_ruby/ast_builder.rb
 - lib/srl_ruby/grammar.rb
 - lib/srl_ruby/regex_repr.rb
-- lib/srl_ruby/srl_token.rb
 - lib/srl_ruby/tokenizer.rb
 - lib/srl_ruby/version.rb
 - spec/acceptance/srl_test_suite_spec.rb
@@ -154,7 +154,6 @@ files:
 - spec/acceptance/support/rule_file_grammar.rb
 - spec/acceptance/support/rule_file_nodes.rb
 - spec/acceptance/support/rule_file_parser.rb
-- spec/acceptance/support/rule_file_token.rb
 - spec/acceptance/support/rule_file_tokenizer.rb
 - spec/regex/atomic_expression_spec.rb
 - spec/regex/character_spec.rb
@@ -191,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:
@@ -200,16 +199,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
-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

data/lib/srl_ruby/srl_token.rb

@@ -1,23 +0,0 @@
-require 'rley' # Load the Rley gem
-
-
-module SrlRuby
-  Position = Struct.new(:line, :column) do
-    def to_s
-      "line #{line}, column #{column}"
-    end
-  end
-
-  # Specialization of Token class.
-  # It stores the position in (line, row) of the token
-  class SrlToken < Rley::Lexical::Token
-    attr_reader(:position)
-
-    def initialize(theLexeme, aTerminal, aPosition)
-      super(theLexeme, aTerminal)
-      @position = aPosition
-    end
-  end # class
-end # module
-
-# End of file

data/spec/acceptance/support/rule_file_token.rb

@@ -1,22 +0,0 @@
-require 'rley' # Load the Rley gem
-
-module Acceptance
-  Position = Struct.new(:line, :column) do
-    def to_s
-      "line #{line}, column #{column}"
-    end
-  end
-
-  # Specialization of Token class.
-  # It stores the position in (line, row) of the token
-  class RuleFileToken < Rley::Lexical::Token
-    attr_reader(:position)
-
-    def initialize(theLexeme, aTerminal, aPosition)
-      super(theLexeme, aTerminal)
-      @position = aPosition
-    end
-  end # class
-end # module
-
-# End of file