parser 2.3.0.5 → 2.3.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f5323dd1c3baff2484da66bc48e788fddb6dd8e
-  data.tar.gz: 7c604fd2f64eeeedc37b4154b3eab307093a108d
+  metadata.gz: ff5a785602415af9bb4752bc39eb9315b502f4bf
+  data.tar.gz: 611593226a424ad609a42b72e5cc79a2a3010043
 SHA512:
-  metadata.gz: 92bd32ec6046d060f0310b7a33a103061d9c21b1b3b74e831de19314abfdca2cedae541a056cbad3f972f38dfdf0d118e096ef906d83b54c3e4faefdb2ad8be9
-  data.tar.gz: 989e665aa9cdd33251358b2b0e8008b1a600018ede1ac73abde23151ebac6e95c4649148abfb35fb8d2b495f67a2e66f313a97d0f30e3f9ff7071a6974ce5873
+  metadata.gz: 051c85691ec47584262edb2477862918713d31e87f36c0ce3235a0f1eb7f14bf78c40cba6a8d5993281024231d666e77774becd71874c8c55fc6166d4d39ac20
+  data.tar.gz: af772a8dd0be6622896d24443fc2999e117645f8a67bee0d2d7179c601b4938d2a4055a70450b2771f23a770130aec36c7be339d4fcd740eba5971025567ec51

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 Changelog
 =========
 
+v2.3.0.6 (2016-02-14)
+---------------------
+
+Bugs fixed:
+ * lexer.rl: fix EOF location (closes #273). (whitequark)
+
 v2.3.0.5 (2016-02-12)
 ---------------------
 
@@ -23,7 +29,7 @@ Bugs fixed:
  * Add :csend to Parser::Meta::NODE_TYPES (Markus Schirp)
  * lexer/dedenter: "\<\<x\n  y\\n  z\nx": don't dedent after escaped newline. (whitequark)
 
-v2.3.0.5 (2016-01-16)
+v2.3.0.6 (2016-01-16)
 ---------------------
 
 v2.3.0.1 (2016-01-14)

data/lib/parser/lexer.rl

@@ -288,7 +288,7 @@ class Parser::Lexer
     elsif @cs == klass.lex_error
       [ false, [ '$error'.freeze, range(p - 1, p) ] ]
     else
-      eof = @source_pts.size + 1
+      eof = @source_pts.size
       [ false, [ '$eof'.freeze,   range(eof, eof) ] ]
     end
   end

data/lib/parser/version.rb

@@ -1,3 +1,3 @@
 module Parser
-  VERSION = '2.3.0.5'
+  VERSION = '2.3.0.6'
 end

data/test/test_lexer.rb

@@ -2426,6 +2426,13 @@ class TestLexer < Minitest::Test
     end
   end
 
+  def test_eof
+    assert_scanned("self",
+                   :kSELF, "self", [0, 4])
+    assert_equal([false, ["$eof", Parser::Source::Range.new(@lex.source_buffer, 4, 4)]],
+                 @lex.advance)
+  end
+
   #
   # Test for 'fluent interface'
   #
@@ -3167,19 +3174,19 @@ class TestLexer < Minitest::Test
                    :tSTRING, "\xE2\x80\x99", [0, 14])
 
     if defined?(Encoding)
-      assert_scanned(%q{"\xE2\x80\x99"}.force_encoding(Encoding::UTF_8),
-                     :tSTRING, '’'.force_encoding(Encoding::UTF_8), [0, 14])
-      assert_scanned(%q{"\342\200\231"}.force_encoding(Encoding::UTF_8),
-                     :tSTRING, '’'.force_encoding(Encoding::UTF_8), [0, 14])
-      assert_scanned(%q{"\M-b\C-\M-@\C-\M-Y"}.force_encoding(Encoding::UTF_8),
-                     :tSTRING, '’'.force_encoding(Encoding::UTF_8), [0, 20])
+      assert_scanned(utf(%q{"\xE2\x80\x99"}),
+                     :tSTRING, utf('’'), [0, 14])
+      assert_scanned(utf(%q{"\342\200\231"}),
+                     :tSTRING, utf('’'), [0, 14])
+      assert_scanned(utf(%q{"\M-b\C-\M-@\C-\M-Y"}),
+                     :tSTRING, utf('’'), [0, 20])
     end
   end
 
   def test_bug_string_utf_escape_noop
     if defined?(Encoding)
-      assert_scanned(%q{"\あ"}.force_encoding(Encoding::UTF_8),
-                     :tSTRING, "あ".force_encoding(Encoding::UTF_8), [0, 4])
+      assert_scanned(utf(%q{"\あ"}),
+                     :tSTRING, utf("あ"), [0, 4])
     end
   end
 
@@ -3190,8 +3197,8 @@ class TestLexer < Minitest::Test
                    :tSTRING, "caf\xC3\xA9", [0, 7])
 
     if defined?(Encoding)
-      assert_scanned(%q{"café"}.force_encoding(Encoding::UTF_8),
-                     :tSTRING, "café".force_encoding(Encoding::UTF_8), [0, 6])
+      assert_scanned(utf(%q{"café"}),
+                     :tSTRING, utf("café"), [0, 6])
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parser
 version: !ruby/object:Gem::Version
-  version: 2.3.0.5
+  version: 2.3.0.6
 platform: ruby
 authors:
 - whitequark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-12 00:00:00.000000000 Z
+date: 2016-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast