srl_ruby 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 996f3e835881b14fb61b339d58be1739333461a0
-  data.tar.gz: f3d79e1fa587c578a5456e2434e7075a621320b5
+  metadata.gz: 3fb6ab4f66212ea614cfbfab2f7b17049425844e
+  data.tar.gz: 634718cf4229710eed018512b44f29781acebc4a
 SHA512:
-  metadata.gz: 2833ec0d9d7449ce112f225daf31c224bf9cc7ab99d442d91e92052d71c397cda0732e543af2f622a2a117d823260459a4ac41c94953a2d55e73c8cebba1b3ee
-  data.tar.gz: e439c0cba8d16d8d61f3c5299976894a31088af189bd6501bc397da8adf1f9f6de4e14c4d3b7375c6200c78dc67843f1090ac319e348d3733b8a57ceeec2f33b
+  metadata.gz: 51ef6aead6683f95d965f2b9882f929af3d1b4f73cc8948982161d8f05843e196b39e21868c2620bab825f88697174b4b82378fc548e5f0f21b920717685378a
+  data.tar.gz: bb3c755844c7ad3e655d423de9956c3ccafde8c9efc2df5841b995546f0cf83b7b3880afa8ded4cd888944eaae53d7c889e96e7e09b743ece728aa7041734727

data/CHANGELOG.md

@@ -1,4 +1,16 @@
-## [0.4.2] - 2018-06-24
+## [0.4.4] - 2018-11-24
+### Changed
+- File `srl_ruby.gemspec` Updated Rley dependency.
+
+### Removed
+- Class `SrlRuby::SrlToken` since it became completely redundant with `Token` class from Rley.
+- Class `Acceptance::RuleFileToken` since it became completely redundant with `Token` class from Rley.
+
+### Fixed
+- Method `SrlRuby::Tokenizer#build_token` now instantiates a `Rley::Lexical::Token`
+- Method `Acceptance::RuleFileTokenizer#build_token` now instantiates a `Rley::Lexical::Token`
+
+## [0.4.3] - 2018-06-24
 ### Changed
 - File `srl_ruby.gemspec` Updated Rley dependency.
 

data/lib/srl_ruby/tokenizer.rb

@@ -1,7 +1,7 @@
 # File: srl_tokenizer.rb
 # Tokenizer for SRL (Simple Regex Language)
 require 'strscan'
-require_relative 'srl_token'
+require 'rley'
 
 
 module SrlRuby
@@ -149,8 +149,8 @@ module SrlRuby
     def build_token(aSymbolName, aLexeme)
       begin
         col = scanner.pos - aLexeme.size - @line_start + 1
-        pos = Position.new(@lineno, col)
-        token = SrlToken.new(aLexeme, aSymbolName, pos)
+        pos = Rley::Lexical::Position.new(@lineno, col)
+        token = Rley::Lexical::Token.new(aLexeme, aSymbolName, pos)
       rescue StandardError => exc
         puts "Failing with '#{aSymbolName}' and '#{aLexeme}'"
         raise exc

data/lib/srl_ruby/version.rb

@@ -1,3 +1,3 @@
 module SrlRuby
-  VERSION = '0.4.3'.freeze
+  VERSION = '0.4.4'.freeze
 end

data/spec/acceptance/support/rule_file_tokenizer.rb

@@ -3,7 +3,7 @@
 # [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:
@@ -74,7 +74,6 @@ 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)
@@ -110,8 +109,8 @@ 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)
+        pos = Rley::Lexical::Position.new(@lineno, col)
+        token = Rley::Lexical::Token.new(aLexeme, aSymbolName, pos)
       rescue StandardError => exc
         puts "Failing with '#{aSymbolName}' and '#{aLexeme}'"
         raise exc

data/spec/srl_ruby/tokenizer_spec.rb

@@ -14,7 +14,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/srl_ruby.gemspec

@@ -66,7 +66,7 @@ SUMMARY
   spec.required_ruby_version = '>= 2.1.0'
 
   # Runtime dependencies
-  spec.add_dependency 'rley', '~> 0.6'
+  spec.add_dependency 'rley', '~> 0.7'
 
   # Development dependencies
   spec.add_development_dependency 'bundler', '~> 1.16'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: srl_ruby
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Dimitri Geshef
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-24 00:00:00.000000000 Z
+date: 2018-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rley
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -146,7 +146,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 +153,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

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