parser 2.0.0.beta4 → 2.0.0.beta5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b376a16dbd765d49118c18432b8134011d732f09
-  data.tar.gz: 12cad6ee3c5f47b267b4b93d442e3e5ae80be478
+  metadata.gz: ef56ab825b77544fdfbc486ccb592cede5bd7da3
+  data.tar.gz: 30dcf6e9bd3566babf73ba48b026cd7521f32f07
 SHA512:
-  metadata.gz: 5be76612d68a0692c0c3d2691bb83816b35aeda66d496cfebbb04c65a5dd0cacf8be7c6d739fbc0cbefff05f5f20b270fd3bd426c602f1ad32bcbf216102e6be
-  data.tar.gz: b1fa6025f4b3311870f5403a7fab57cd9da3e851f89ebff271a5853e783e7c4790a153440c753f681054edf0f94ca2821e5f793427cbc2ed7ed1bef0d4a2dbc9
+  metadata.gz: 4274e893bce829d8736cb57659eae865c76b520903c3175d2b24475e90a2219596572972c179591677d37801b978fd855189df7e4405a30020e6cfa1d74e6193
+  data.tar.gz: c79fdcbe3ab0b0927773111ee0b5699bf337eb53fd4aad3911bcd1ca2801cd6f8d7d2cbdcc846031dd115bd24c910b383a92ca21c5395d85f8354f6d4c8109a6

data/CHANGELOG.md

@@ -1,6 +1,14 @@
 Changelog
 =========
 
+v2.0.0.beta5 (2013-06-08)
+-------------------------
+
+Bugs fixed:
+ * Source::Buffer: better magic encoding comment recognition (fixes #65). (Peter Zotov)
+ * lexer.rl: "{success?: true}" (fixes #66). (Peter Zotov)
+ * Source::Buffer: if in doubt, treat data as UTF-8 (closes #60). (Peter Zotov)
+
 v2.0.0.beta4 (2013-06-05)
 -------------------------
 

data/lib/parser/lexer.rl

@@ -1488,7 +1488,7 @@ class Parser::Lexer
       # RUBY 1.9 HASH LABELS
       #
 
-      bareword ':' ( c_any - ':' )
+      bareword [?!]? ':' ( c_any - ':' )
       => {
         fhold;
 

data/lib/parser/source/buffer.rb

@@ -7,7 +7,7 @@ module Parser
       attr_reader :name, :first_line
 
       def self.recognize_encoding(string)
-        return Encoding::BINARY if string.empty?
+        return Encoding::UTF_8 if string.empty?
 
         # extract the first two lines in an efficient way
         string =~ /(.*)\n?(.*\n)?/
@@ -25,10 +25,10 @@ module Parser
           encoding_line = first_line
         end
 
-        if encoding_line =~ /^#.*coding[:=]\s*([a-z0-9_-]+)/
+        if encoding_line =~ /^#.*coding\s*[:=]\s*([A-Za-z0-9_-]+)/
           Encoding.find($1)
         else
-          string.encoding
+          Encoding::UTF_8
         end
       end
 

data/lib/parser/version.rb

@@ -1,3 +1,3 @@
 module Parser
-  VERSION = '2.0.0.beta4'
+  VERSION = '2.0.0.beta5'
 end

data/test/test_encoding.rb

@@ -9,11 +9,12 @@ class TestEncoding < Minitest::Test
 
   if defined?(Encoding)
     def test_default
-      assert_equal Encoding::BINARY, recognize("foobar")
+      assert_equal Encoding::UTF_8, recognize("foobar")
     end
 
     def test_bom
-      assert_equal Encoding::UTF_8, recognize("\xef\xbb\xbffoobar")
+      assert_equal Encoding::UTF_8, recognize("\xef\xbb\xbf\nfoobar")
+      assert_equal Encoding::UTF_8, recognize("\xef\xbb\xbf# coding:koi8-r\nfoobar")
     end
 
     def test_magic_comment
@@ -24,17 +25,25 @@ class TestEncoding < Minitest::Test
       assert_equal Encoding::KOI8_R, recognize("#!/bin/foo\n# coding:koi8-r\nfoobar")
     end
 
+    def test_case
+      assert_equal Encoding::KOI8_R, recognize("#!/bin/foo\n# coding:KoI8-r\nfoobar")
+    end
+
+    def test_space
+      assert_equal Encoding::KOI8_R, recognize("#!/bin/foo\n# coding : koi8-r\nfoobar")
+    end
+
     def test_empty
-      assert_equal Encoding::BINARY, recognize("")
+      assert_equal Encoding::UTF_8, recognize("")
     end
 
     def test_no_comment
-      assert_equal Encoding::BINARY, recognize(%{require 'cane/encoding_aware_iterator'})
+      assert_equal Encoding::UTF_8, 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")
+      assert_equal Encoding::UTF_8, recognize("# codingkoi8-r")
+      assert_equal Encoding::UTF_8, recognize("# coding koi8-r")
     end
   end
 end

data/test/test_lexer.rb

@@ -239,6 +239,15 @@ class TestLexer < Minitest::Test
                    :tIDENTIFIER, "b")
   end
 
+  def test_label_fid__19
+    setup_lexer 19
+
+    util_lex_token("{a?:true",
+                   :tLBRACE,     '{',
+                   :tLABEL,      'a?',
+                   :kTRUE,       'true')
+  end
+
   def test_command_start__19
     setup_lexer 19
 
@@ -2513,7 +2522,7 @@ class TestLexer < Minitest::Test
     util_lex_token("<<FIN\r\nfoo\r\nFIN\r\n",
                    :tSTRING_BEG,     "\"",
                    :tSTRING_CONTENT, "foo\r\n",
-                   :tSTRING_END,     "EOS",
+                   :tSTRING_END,     "FIN",
                    :tNL,             nil)
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parser
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta4
+  version: 2.0.0.beta5
 platform: ruby
 authors:
 - Peter Zotov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-05 00:00:00.000000000 Z
+date: 2013-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast