oedipus_lex 2.3.2 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d1d4969de9074724f4c4491ba4ed4e11c49625d
-  data.tar.gz: db2fff4a5947473754ff79c4b0ea7bce982496d6
+  metadata.gz: 61adb0e46462bf1c5bc415fdc1654e216ab490b4
+  data.tar.gz: 04be5ee4d10e6b8829af5af8ddb01f8fd2592bcd
 SHA512:
-  metadata.gz: 03883e37fc06e56850ded37019c6b500e54d30ee0d455f529d4f5b9fbfe4f31baf053305bd503fa7bbf69ac4bacb11fe0c832128fe1d024d6e7d4c2d7d374f8f
-  data.tar.gz: ff54b5cb64e1ca96a20c3a6f094ed925dfb845dba5a6e66de5e73925e24a6c5655fa4cb78d283e46f9bb2649ae2b9361377d891b657ee99c2d2dbc27fec977d1
+  metadata.gz: 6a622ea8f3751c1408c5775c47dea719e43da6a5d296cd65ce39ef6b4a0fbf80135de1a290d862eb9d689c93748bb84fb8fc42b5881a67bbf0f065734282e173
+  data.tar.gz: e81ff0a38cb4fbf6e3cac5d6babb3d8652bdc2be385e7995cb2426670aa6f65a52aa5cfb900757045d77c476ce7012cfe01e2f20f247cdb700a557cb30536ee6

data/History.rdoc

@@ -1,3 +1,13 @@
+=== 2.4.0 / 2014-08-29
+
+* 1 minor enhancement:
+
+  * Added column option & accessor.
+
+* 1 bug fix:
+
+  * lineno shouldn't be visible at all if the option isn't on.
+
 === 2.3.2 / 2014-08-06
 
 * 1 bug fix:

data/lib/oedipus_lex.rb

@@ -4,7 +4,7 @@ require "erb"
 require "oedipus_lex.rex"
 
 class OedipusLex
-  VERSION = "2.3.2"
+  VERSION = "2.4.0"
 
   attr_accessor :class_name
   attr_accessor :header
@@ -20,6 +20,7 @@ class OedipusLex
     :debug    => false,
     :do_parse => false,
     :lineno   => false,
+    :column   => false,
     :stub     => false,
   }
 
@@ -266,7 +267,9 @@ class OedipusLex
 % end
         class ScanError < StandardError ; end
 
+% if option[:lineno] then
         attr_accessor :lineno
+% end
         attr_accessor :filename
         attr_accessor :ss
         attr_accessor :state
@@ -283,6 +286,15 @@ class OedipusLex
           yield
         end
 
+% if option[:column] then
+        attr_accessor :old_pos
+
+        def column
+          idx = ss.string.rindex("\n", old_pos) || -1
+          old_pos - idx - 1
+        end
+% end
+
 % if option[:do_parse] then
         def do_parse
           while token = next_token do
@@ -299,7 +311,9 @@ class OedipusLex
 
         def parse str
           self.ss     = scanner_class.new str
+% if option[:lineno] then
           self.lineno = 1
+% end
           self.state  ||= nil
 
           do_parse
@@ -322,6 +336,9 @@ class OedipusLex
           until ss.eos? or token do
 % if option[:lineno] then
             self.lineno += 1 if ss.peek(1) == "\n"
+% end
+% if option[:column] then
+            self.old_pos = ss.pos
 % end
             token =
               case state
@@ -382,7 +399,8 @@ class OedipusLex
           begin
             rex.parse_file path
           rescue
-            $stderr.printf "%s:%d:%s\n", rex.filename, rex.lineno, $!.message
+            lineno = rex.respond_to?(:lineno) ? rex.lineno : -1
+            $stderr.printf "%s:%d:%s\n", rex.filename, lineno, $!.message
             exit 1
           end
         end

data/test/test_oedipus_lex.rb

@@ -260,6 +260,30 @@ class TestOedipusLex < Minitest::Test
     assert_match "[:op, \"+\"]", out
   end
 
+  def test_column
+    src = <<-'REX'
+      class Calculator
+      rule
+              /\d+/       { [:number, text.to_i, lineno, column] }
+              /\s+/
+              /[+-]/      { [:op, text, lineno, column] }
+      end
+    REX
+
+    txt = "1 + 2\n+ 30"
+
+    exp = [[:number, 1,   1, 0],
+           [:op,     "+", 1, 2],
+           [:number, 2,   1, 4],
+           [:op,     "+", 2, 0],
+           [:number, 30,  2, 2]]
+
+    option[:column] = true
+    option[:lineno] = true
+
+    assert_lexer src, txt, exp
+  end
+
   def test_simple_scanner_debug_src
     src = <<-'REX'
       class Calculator

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oedipus_lex
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.4.0
 platform: ruby
 authors:
 - Ryan Davis
@@ -29,7 +29,7 @@ cert_chain:
   Y4evBVezr3SjXz08vPqRO5YRdO3zfeMT8gBjRqZjWJGMZ2lD4XNfrs7eky74CyZw
   xx3n58i0lQkBE1EpKE0lFu/y
   -----END CERTIFICATE-----
-date: 2014-08-07 00:00:00.000000000 Z
+date: 2014-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest