srl_ruby 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aec2fc57a4a6eadb94d63cbb5b3edaaab988ceff
-  data.tar.gz: fb2a6b4007134fd657c749e9979610e562b13ff3
+  metadata.gz: c6ca8e70f473d53992bd449ed2945cc55ebedcff
+  data.tar.gz: 065406740aded7b357712fa67daa4f622627a79c
 SHA512:
-  metadata.gz: 2319c820f448ffffc89ed753f39c724fa7c438ebaa5930b5ee2aa9c303f7dedd3f23523a865ddf1a13838ec70e2f10a717cce1c562b4f98f61050a99d77d1437
-  data.tar.gz: d975c484f19792cae40c23fbfc6294f606ffe49cff29ecf07519447585cf80e332e10e7ec1422846f501ae14dec2f8773c1fe0e04905ea9177214b60193a24ab
+  metadata.gz: 174e237267f85e4d0e4d9e714ded189c9a1d46635b8668af469d23c0b5a3709f53e48087486cd5fb8f60861e02de19d44c694224581a9d1071718272574898c6
+  data.tar.gz: 92118db7249a6f66dc88ae66e2ca229a6800b91ba7ac53e692bc452ef87f311a3bb4bbc8fe401f0b2c015d960ecd29015465d9908d633b1425ef08aa1575a77b

data/.rspec

@@ -1,4 +1,3 @@
 --backtrace
---format documentation
 --color
 --require spec_helper

data/CHANGELOG.md

@@ -6,6 +6,11 @@
 ### Fixed
 ### Security
 
+## [0.1.1] - 2018-03-10
+### Changed
+- Parse error location is now given in line number, column number position.
+- Updated dependencies upon Rley parser.
+
 ## [0.1.0] - 2018-03-08
 ### Added
 - Version bump. Added new API methods `SrlRuby#load_file` and `SrlRuby#parse`

data/README.md

@@ -23,6 +23,12 @@ literally " ",
 one of "AP", literally "M"
 ```
 
+### Learn more about Simple Regex Language
+Here are a couple of hyperlinks of interest:  
+[Main SRL website](https://simple-regex.com)  
+[SRL libraries](https://github.com/SimpleRegex)
+
+
 ## Why SRL?
 Even without knowing SRL, a reader can easily grasp the details of the above SRL expression.
 This is where SRL shines over the traditional regular expressions: high readability.
@@ -57,12 +63,9 @@ one of "AP", literally "M"
 ```
 
 And there is the equivalent regex found by `srl_ruby`:  
+```
 /(?:(?:0?\d)|(?:1[01])):[0-5]\d [AP]M/
-
-### More about Simple Regex Language syntax and examples
-    Here are a couple of hyperlinks of interest:  
-    [Main SRL website](https://simple-regex.com)  
-    [SRL libraries](https://github.com/SimpleRegex)
+```
 
 
 ## Usage

data/lib/srl_ruby/ast_builder.rb

@@ -23,9 +23,10 @@ module SrlRuby
     # Overriding method.
     # Factory method for creating a node object for the given
     # input token.
-    # @param aTerminal [Terminal] Terminal symbol associated with the token
+    # @param _production [Rley::Syntax::Production]
+    # @param _terminal [Rley::Syntax::Terminal] Terminal symbol associated with the token
     # @param aTokenPosition [Integer] Position of token in the input stream
-    # @param aToken [Token] The input token
+    # @param aToken [Rley::Lexical::Token] The input token
     def new_leaf_node(_production, _terminal, aTokenPosition, aToken)
       node = Rley::PTree::TerminalNode.new(aToken, aTokenPosition)
 

data/lib/srl_ruby/srl_token.rb

@@ -0,0 +1,23 @@
+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/lib/srl_ruby/tokenizer.rb

@@ -1,7 +1,8 @@
 # File: srl_tokenizer.rb
 # Tokenizer for SRL (Simple Regex Language)
 require 'strscan'
-require 'rley' # Load the Rley gem
+require_relative 'srl_token'
+
 
 module SrlRuby
   # The tokenizer should recognize:
@@ -15,6 +16,7 @@ module SrlRuby
     attr_reader(:scanner)
     attr_reader(:lineno)
     attr_reader(:line_start)
+    attr_reader(:column)
 
     @@lexeme2name = {
       '(' => 'LPAREN',
@@ -80,6 +82,7 @@ module SrlRuby
     def initialize(source)
       @scanner = StringScanner.new(source)
       @lineno = 1
+      @line_start = 0
     end
 
     def tokens()
@@ -131,7 +134,9 @@ module SrlRuby
 
     def build_token(aSymbolName, aLexeme)
       begin
-        token = Rley::Lexical::Token.new(aLexeme, aSymbolName)
+        col = scanner.pos - aLexeme.size - @line_start + 1
+        pos = Position.new(@lineno, col)
+        token = SrlToken.new(aLexeme, aSymbolName, pos)
       rescue StandardError
         puts "Failing with '#{aSymbolName}' and '#{aLexeme}'"
         raise ex
@@ -141,7 +146,34 @@ module SrlRuby
     end
 
     def skip_whitespaces()
-      scanner.scan(/[ \t\f\n\r]+/)
+      pre_pos = scanner.pos
+
+      begin
+        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
+      end while ws_found
+
+      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    
     end
+
+    def tab_size()
+      2
+    end
+
   end # class
 end # module

data/lib/srl_ruby/version.rb

@@ -1,3 +1,3 @@
 module SrlRuby
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.1.1'.freeze
 end

data/lib/srl_ruby.rb

@@ -30,7 +30,7 @@ module SrlRuby # This module is used as a namespace
 
     unless result.success?
       # Stop if the parse failed...
-      line1 = "Parsing of '#{source}' failed\n"
+      line1 = "Parsing failed\n"
       line2 = "Reason: #{result.failure_reason.message}"
       raise StandardError, line1 + line2
     end

data/srl_ruby.gemspec

@@ -54,7 +54,7 @@ END_DESCR
   spec.required_ruby_version = '>= 2.1.0'
   
   # Runtime dependencies
-  spec.add_dependency 'rley', '~> 0.6.00'
+  spec.add_dependency 'rley', '~> 0.6.03'
 
   # 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.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Dimitri Geshef
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-08 00:00:00.000000000 Z
+date: 2018-03-10 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.00
+        version: 0.6.03
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.00
+        version: 0.6.03
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -110,6 +110,7 @@ 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/integration_spec.rb