oedipus_lex 2.3.1 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c56dcc885b6ee098fa6e988db8ffd9a423134640
-  data.tar.gz: 03ee3915b080e450e7ff564842b5c7298dde0672
+  metadata.gz: 2d1d4969de9074724f4c4491ba4ed4e11c49625d
+  data.tar.gz: db2fff4a5947473754ff79c4b0ea7bce982496d6
 SHA512:
-  metadata.gz: a2843b5841203dbc901caded1175e7cdb392e392429f0cdb8723054cd5bb04de9e4351a83e56ba75a5fa43a0144ee50e70a430d4cbbd04d7598370788ae76c64
-  data.tar.gz: 369ae18943123aca8e0b5d331932747d98c5eb7dee8ff100fab4bfba3e81078e776871237c52fc74055f6b4ccb45e8989b32af31a8dae009abbbae3e10d06eb4
+  metadata.gz: 03883e37fc06e56850ded37019c6b500e54d30ee0d455f529d4f5b9fbfe4f31baf053305bd503fa7bbf69ac4bacb11fe0c832128fe1d024d6e7d4c2d7d374f8f
+  data.tar.gz: ff54b5cb64e1ca96a20c3a6f094ed925dfb845dba5a6e66de5e73925e24a6c5655fa4cb78d283e46f9bb2649ae2b9361377d891b657ee99c2d2dbc27fec977d1

data/History.rdoc

@@ -1,3 +1,9 @@
+=== 2.3.2 / 2014-08-06
+
+* 1 bug fix:
+
+  * Increase lineno on nil token. (hashmal)
+
 === 2.3.1 / 2014-06-09
 
 * 1 minor enhancement:

data/lib/oedipus_lex.rb

@@ -4,7 +4,7 @@ require "erb"
 require "oedipus_lex.rex"
 
 class OedipusLex
-  VERSION = "2.3.1"
+  VERSION = "2.3.2"
 
   attr_accessor :class_name
   attr_accessor :header
@@ -316,13 +316,13 @@ class OedipusLex
 % starts.each do |s|
           <%= s %>
 % end
-% if option[:lineno] then
-          self.lineno += 1 if ss.peek(1) == "\n"
-% end
 
           token = nil
 
           until ss.eos? or token do
+% if option[:lineno] then
+            self.lineno += 1 if ss.peek(1) == "\n"
+% end
             token =
               case state
 % all_states.each do |the_states|

data/test/test_oedipus_lex.rb

@@ -741,4 +741,21 @@ class TestOedipusLex < Minitest::Test
 
     assert_lexer_error src, txt, "can not match (:B): 'a'"
   end
+
+  def test_incrementing_lineno_on_nil_token
+    src = <<-'REX'
+      class Calculator
+      option
+             lineno
+      rule
+             /\n/
+             /a/       { [:A, lineno] }
+      end
+    REX
+
+    txt = "\n\na"
+    exp = [[:A, 3]]
+
+    assert_lexer src, txt, exp
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oedipus_lex
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.2
 platform: ruby
 authors:
 - Ryan Davis
@@ -29,7 +29,7 @@ cert_chain:
   Y4evBVezr3SjXz08vPqRO5YRdO3zfeMT8gBjRqZjWJGMZ2lD4XNfrs7eky74CyZw
   xx3n58i0lQkBE1EpKE0lFu/y
   -----END CERTIFICATE-----
-date: 2014-06-10 00:00:00.000000000 Z
+date: 2014-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -37,14 +37,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '5.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '5.4'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement