oedipus_lex 2.5.1 → 2.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8cb423b537f9675d2c16f2dea13fe319f1a9201164e8eeefa9a4275640220607
-  data.tar.gz: b92269a7b11988954a9457a36df57c7199f1f95f74d862fbc20e7d6aec770ad6
+  metadata.gz: 9822a393543024bafcbb4c490751008d5ae468d3348d3397df454b622e5f8fb1
+  data.tar.gz: 5910e4bf0720dc2724bf01dde8629f02616958a1d8eab65005bdfd2d5da35690
 SHA512:
-  metadata.gz: 9bd0f74cb429fd8f92b202a1dbaa38f4a69eab05da150801f59f36c2e7476b2d494304d17e8993ecbd563692dce0e7c15f20dfee5f4b0d6c92c5abc72d96b4b8
-  data.tar.gz: ba7831924e35607b5db556c42e7d0469c8f71d8c87feb67322b05599cfe83d8884f4559e5f068570dc7e36a1b8dcc92c17b2e148685742a45a199b04caf50bdc
+  metadata.gz: b1c26b081d86155d0bade889a37a80e98acd35dc5dfc8bec0009fe38f18064e7d7a0c61e11a6ba037dd024fedda76597bab9787b21fed1a87d80ceaf666fb22f
+  data.tar.gz: e9ad55f6f9d155af3a64af6edd81ffa41c33c70f9e55148a9a002b3dfa3ac7441c819c9bfa6c885903425549926f2a2f3e823791557facb49ded71f16a2bf1df

data/History.rdoc

@@ -1,3 +1,9 @@
+=== 2.5.2 / 2020-06-14
+
+* 1 minor enhancement:
+
+  * Speedup of column position computation. It went from roughly 10s to 2s for a big file! (vdbijl)
+
 === 2.5.1 / 2019-06-03
 
 * 1 minor enhancement:

data/lib/oedipus_lex.rb

@@ -30,7 +30,7 @@ require "oedipus_lex.rex"
 # books.
 
 class OedipusLex
-  VERSION = "2.5.1" # :nodoc:
+  VERSION = "2.5.2" # :nodoc:
 
   ##
   # The class name to generate.
@@ -147,7 +147,7 @@ class OedipusLex
 
       cond = if exclusive or not start_state then
                check
-             elsif start_state =~ /^:/ then
+             elsif /^:/.match?(start_state) then
                "(state == #{start_state}) && (#{check})"
              else # predicate method
                "#{start_state} && (#{check})"
@@ -359,7 +359,7 @@ class OedipusLex
   ##
   # Process a +state+ lexeme.
 
-  def lex_state new_state
+  def lex_state _new_state
     end_group if group
     # do nothing -- lexer switches state for us
   end
@@ -379,7 +379,7 @@ class OedipusLex
       all_states = [[nil, *inclusives],          # nil+incls # eg [[nil, :a],
                     *exclusives.map { |s| [s] }] # [excls]   #     [:A], [:B]]
 
-    encoding = header.shift if header.first =~ /encoding:/
+    encoding = header.shift if /encoding:/.match?(header.first)
     encoding ||= "# encoding: UTF-8"
 
     erb = if RUBY_VERSION >= "2.6.0" then
@@ -475,11 +475,16 @@ class OedipusLex
         attr_accessor :old_pos
 
         ##
-        # The current column. Only available if the :column option is on.
+        # The position of the start of the current line. Only available if the
+        # :column option is on.
 
+        attr_accessor :start_of_current_line_pos
+
+        ##
+        # The current column, starting at 0. Only available if the
+        # :column option is on.
         def column
-          idx = ss.string.rindex("\n", old_pos) || -1
-          old_pos - idx - 1
+          old_pos - start_of_current_line_pos
         end
 
 % end
@@ -511,6 +516,9 @@ class OedipusLex
           self.ss     = scanner_class.new str
 % if option[:lineno] then
           self.lineno = 1
+% end
+% if option[:column] then
+          self.start_of_current_line_pos = 0
 % end
           self.state  ||= nil
 
@@ -556,7 +564,13 @@ class OedipusLex
 
           until ss.eos? or token do
 % if option[:lineno] then
-            self.lineno += 1 if ss.peek(1) == "\n"
+            if ss.peek(1) == "\n"
+              self.lineno += 1
+% if option[:column] then
+              # line starts 1 position after the newline
+              self.start_of_current_line_pos = ss.pos + 1
+% end
+            end
 % end
 % if option[:column] then
             self.old_pos = ss.pos

data/lib/oedipus_lex.rex.rb

@@ -1,7 +1,7 @@
 # encoding: UTF-8
 #--
 # This file is automatically generated. Do not modify it.
-# Generated by: oedipus_lex version 2.5.0.
+# Generated by: oedipus_lex version 2.5.2.
 # Source: lib/oedipus_lex.rex
 #++
 
@@ -65,11 +65,16 @@ class OedipusLex
   attr_accessor :old_pos
 
   ##
-  # The current column. Only available if the :column option is on.
+  # The position of the start of the current line. Only available if the
+  # :column option is on.
 
+  attr_accessor :start_of_current_line_pos
+
+  ##
+  # The current column, starting at 0. Only available if the
+  # :column option is on.
   def column
-    idx = ss.string.rindex("\n", old_pos) || -1
-    old_pos - idx - 1
+    old_pos - start_of_current_line_pos
   end
 
   ##
@@ -97,6 +102,7 @@ class OedipusLex
   def parse str
     self.ss     = scanner_class.new str
     self.lineno = 1
+    self.start_of_current_line_pos = 0
     self.state  ||= nil
 
     do_parse
@@ -131,7 +137,11 @@ class OedipusLex
     token = nil
 
     until ss.eos? or token do
-      self.lineno += 1 if ss.peek(1) == "\n"
+      if ss.peek(1) == "\n"
+        self.lineno += 1
+        # line starts 1 position after the newline
+        self.start_of_current_line_pos = ss.pos + 1
+      end
       self.old_pos = ss.pos
       token =
         case state

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oedipus_lex
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.5.2
 platform: ruby
 authors:
 - Ryan Davis
@@ -10,9 +10,9 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDPjCCAiagAwIBAgIBAzANBgkqhkiG9w0BAQsFADBFMRMwEQYDVQQDDApyeWFu
+  MIIDPjCCAiagAwIBAgIBBDANBgkqhkiG9w0BAQsFADBFMRMwEQYDVQQDDApyeWFu
   ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
-  GRYDY29tMB4XDTE4MTIwNDIxMzAxNFoXDTE5MTIwNDIxMzAxNFowRTETMBEGA1UE
+  GRYDY29tMB4XDTE5MTIxMzAwMDIwNFoXDTIwMTIxMjAwMDIwNFowRTETMBEGA1UE
   AwwKcnlhbmQtcnVieTEZMBcGCgmSJomT8ixkARkWCXplbnNwaWRlcjETMBEGCgmS
   JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALda
   b9DCgK+627gPJkB6XfjZ1itoOQvpqH1EXScSaba9/S2VF22VYQbXU1xQXL/WzCkx
@@ -22,14 +22,14 @@ cert_chain:
   qhtV7HJxNKuPj/JFH0D2cswvzznE/a5FOYO68g+YCuFi5L8wZuuM8zzdwjrWHqSV
   gBEfoTEGr7Zii72cx+sCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
   HQYDVR0OBBYEFEfFe9md/r/tj/Wmwpy+MI8d9k/hMA0GCSqGSIb3DQEBCwUAA4IB
-  AQCbJwLmpJR2PomLU+Zzw3KRzH/hbyUWc/ftru71AopZ1fy4iY9J/BW5QYKVYwbP
-  V0FSBWtvfI/RdwfKGtuGhPKECZgmLieGuZ3XCc09qPu1bdg7i/tu1p0t0c6163ku
-  nDMDIC/t/DAFK0TY9I3HswuyZGbLW7rgF0DmiuZdN/RPhHq2pOLMLXJmFclCb/im
-  9yToml/06TJdUJ5p64mkBs0TzaK66DIB1Smd3PdtfZqoRV+EwaXMdx0Hb3zdR1JR
-  Em82dBUFsipwMLCYj39kcyHWAxyl6Ae1Cn9r/ItVBCxoeFdrHjfavnrIEoXUt4bU
-  UfBugfLD19bu3nvL+zTAGx/U
+  AQCkkcHqAa6IKLYGl93rn78J3L+LnqyxaA059n4IGMHWN5bv9KBQnIjOrpLadtYZ
+  vhWkunWDKdfVapBEq5+T4HzqnsEXC3aCv6JEKJY6Zw7iSzl0M8hozuzRr+w46wvT
+  fV2yTN6QTVxqbMsJJyjosks4ZdQYov2zdvQpt1HsLi+Qmckmg8SPZsd+T8uiiBCf
+  b+1ORSM5eEfBQenPXy83LZcoQz8i6zVB4aAfTGGdhxjoMGUEmSZ6xpkOzmnGa9QK
+  m5x9IDiApM+vCELNwDXXGNFEnQBBK+wAe4Pek8o1V1TTOxL1kGPewVOitX1p3xoN
+  h7iEjga8iM1LbZUfiISZ+WrB
   -----END CERTIFICATE-----
-date: 2019-06-04 00:00:00.000000000 Z
+date: 2020-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -57,14 +57,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.17'
+        version: '3.22'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.17'
+        version: '3.22'
 description: |-
   Oedipus Lex is a lexer generator in the same family as Rexical and
   Rex. Oedipus Lex is my independent lexer fork of Rexical. Rexical was
@@ -128,7 +128,8 @@ files:
 homepage: http://github.com/seattlerb/oedipus_lex
 licenses:
 - MIT
-metadata: {}
+metadata:
+  homepage_uri: http://github.com/seattlerb/oedipus_lex
 post_install_message: 
 rdoc_options:
 - "--main"
@@ -146,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Oedipus Lex is a lexer generator in the same family as Rexical and Rex