parser 1.3.3 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1651bd7bc0d39e00057fd6f24dd4a6ef2239e108
-  data.tar.gz: 31d38b4035c2cb105075c204ff321b725653c7c9
+  metadata.gz: 6cd417cce73823b5c02700b31b2ddc3364453aaf
+  data.tar.gz: 143425da0cc95ae994b1068807561968afb43267
 SHA512:
-  metadata.gz: 6452eeb521655b074987d3d17daf6b5cfbbd979769c3a892db9ba970a2f774180ad81eeeb8d9f2e412c6c14d8bed95510061266144e24a9fada054ec3071aae4
-  data.tar.gz: 4454c5b7db370bc275a2deb63eca54c8c8d896db0726a5a9f688576d8219670ff49527cac3a636551a920e773b7bfd2104b6570cb448e6fe7182d75b4de80b1d
+  metadata.gz: 1f55f2a694de612a9f9c71c428a91fa210134523b2377c4d5b2fe1276f64ddee27f4a702df979128d1b93172654fd7f684e9cbe3e297ccfcec53f00a29d90c8b
+  data.tar.gz: 634c5ce4b572ee896d4eb82443b43c6f91af5542121f1525eff684259f24f8d59fc23920d8ec3e93b47d46014baabd18ff9b6563e5f5102a9f55d1f832971ae1

data/lib/parser/lexer.rl

@@ -1717,7 +1717,7 @@ class Parser::Lexer
 
       constant
       => { emit(:tCONSTANT)
-           fbreak; };
+           fnext expr_arg; fbreak; };
 
       constant ambiguous_const_suffix
       => { emit(:tCONSTANT, tok(@ts, tm), @ts, tm)

data/lib/parser/source/buffer.rb

@@ -8,12 +8,15 @@ module Parser
 
       def self.recognize_encoding(string)
         if string.empty?
-          return Encoding::UTF_8
+          return Encoding::BINARY
         end
 
         # TODO: Make this more efficient.
         first_line, second_line = string.lines.first(2)
-        first_line.force_encoding(Encoding::ASCII_8BIT)
+
+        [first_line, second_line].each do |line|
+          line.force_encoding(Encoding::ASCII_8BIT) if line
+        end
 
         if first_line =~ /\A\xef\xbb\xbf/ # BOM
           return Encoding::UTF_8
@@ -23,9 +26,7 @@ module Parser
           encoding_line = first_line
         end
 
-        encoding_line.force_encoding(Encoding::ASCII_8BIT)
-
-        if encoding_line =~ /coding[:=]?\s*([a-z0-9_-]+)/
+        if encoding_line =~ /^#.*coding[:=]\s*([a-z0-9_-]+)/
           Encoding.find($1)
         else
           string.encoding
@@ -105,7 +106,7 @@ module Parser
           end
         end
 
-        @lines[line - @first_line]
+        @lines[line - @first_line].dup
       end
 
       private

data/lib/parser/version.rb

@@ -1,3 +1,3 @@
 module Parser
-  VERSION = '1.3.3'
+  VERSION = '1.3.4'
 end

data/test/test_encoding.rb

@@ -25,7 +25,16 @@ class TestEncoding < MiniTest::Unit::TestCase
     end
 
     def test_empty
-      assert_equal Encoding::UTF_8, recognize("")
+      assert_equal Encoding::BINARY, recognize("")
+    end
+
+    def test_no_comment
+      assert_equal Encoding::BINARY, recognize(%{require 'cane/encoding_aware_iterator'})
+    end
+
+    def test_adjacent
+      assert_equal Encoding::BINARY, recognize("# codingkoi8-r")
+      assert_equal Encoding::BINARY, recognize("# coding koi8-r")
     end
   end
 end

data/test/test_lexer.rb

@@ -2117,6 +2117,13 @@ class TestLexer < MiniTest::Unit::TestCase
                    :kSELF,  "self")
   end
 
+  def test_bug_const_expr_end
+    util_lex_token("Option",
+                   :tCONSTANT, 'Option')
+
+    assert_equal :expr_arg, @lex.state
+  end
+
   def test_bug_expr_beg_div
     @lex.state = :expr_beg
     util_lex_token("/=/",

data/test/test_source_buffer.rb

@@ -71,6 +71,15 @@ class TestSourceBuffer < MiniTest::Unit::TestCase
     assert_equal "foo", @buffer.source_line(2)
   end
 
+  def test_line_mutate
+    @buffer.source = "1\nfoo\nbar"
+
+    assert_equal "1", @buffer.source_line(1)
+
+    @buffer.source_line(1)[0] = '2'
+    assert_equal "1", @buffer.source_line(1)
+  end
+
   def test_line_mapped
     @buffer = Parser::Source::Buffer.new('(string)', 5)
     @buffer.source = "1\nfoo\nbar"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parser
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.4
 platform: ruby
 authors:
 - Peter Zotov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-15 00:00:00.000000000 Z
+date: 2013-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast