parser 2.3.0.4 → 2.3.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1cb171255b96bf71809258731c221082841d8af1
-  data.tar.gz: 2ef132309fc78e96f665e60bdbfecb389f4bda6d
+  metadata.gz: 5f5323dd1c3baff2484da66bc48e788fddb6dd8e
+  data.tar.gz: 7c604fd2f64eeeedc37b4154b3eab307093a108d
 SHA512:
-  metadata.gz: 9f374c086ac8fff2fb0dfc2d0cfb9badc4e6da09b9612992c51e3207bdeff35491ccd7edb13e07b0f7dfe31bd9129df31bf4a4d550f58d9534bc9fdf55c6b064
-  data.tar.gz: f1821293d14bf5716f5c9e3d8f9af4d6eb7f84f05f3fed3552521770b33add9fd639502c6949c9c04a61775b275d208a199e3261b01c5b1082cf624c37968532
+  metadata.gz: 92bd32ec6046d060f0310b7a33a103061d9c21b1b3b74e831de19314abfdca2cedae541a056cbad3f972f38dfdf0d118e096ef906d83b54c3e4faefdb2ad8be9
+  data.tar.gz: 989e665aa9cdd33251358b2b0e8008b1a600018ede1ac73abde23151ebac6e95c4649148abfb35fb8d2b495f67a2e66f313a97d0f30e3f9ff7071a6974ce5873

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 Changelog
 =========
 
+v2.3.0.5 (2016-02-12)
+---------------------
+
+Bugs fixed:
+ * lexer.rl: "%Q{\あ}": fix encoding of UTF-8 noop escapes. (whitequark)
+
 v2.3.0.4 (2016-02-09)
 ---------------------
 
@@ -17,7 +23,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.4 (2016-01-16)
+v2.3.0.5 (2016-01-16)
 ---------------------
 
 v2.3.0.1 (2016-01-14)

data/lib/parser/lexer.rl

@@ -92,7 +92,6 @@ class Parser::Lexer
   RBRACE_OR_RBRACK = %w"} ]".freeze
 
   attr_reader   :source_buffer
-  attr_reader   :encoding
 
   attr_accessor :diagnostics
   attr_accessor :static_env
@@ -183,7 +182,7 @@ class Parser::Lexer
     if @source_buffer
       source = @source_buffer.source
 
-      if source.respond_to?(:encode) && source.encoding == Encoding::UTF_8
+      if defined?(Encoding) && source.encoding == Encoding::UTF_8
         @source_pts = source.unpack('U*')
       else
         @source_pts = source.unpack('C*')
@@ -198,6 +197,10 @@ class Parser::Lexer
     end
   end
 
+  def encoding
+    @source_buffer.source.encoding
+  end
+
   LEX_STATES = {
     :line_begin    => lex_en_line_begin,
     :expr_dot      => lex_en_expr_dot,
@@ -305,11 +308,10 @@ class Parser::Lexer
     @stack[@top]
   end
 
-  if "".respond_to?(:encode)
+  if defined?(Encoding)
     def encode_escape(ord)
-      ord.chr.force_encoding(source_buffer.source.encoding)
+      ord.chr.force_encoding(@source_buffer.source.encoding)
     end
-
   else
     def encode_escape(ord)
       ord.chr
@@ -663,7 +665,9 @@ class Parser::Lexer
 
   action unescape_char {
     codepoint = @source_pts[p - 1]
-    @escape = ESCAPES[codepoint] || encode_escape(codepoint)
+    if (@escape = ESCAPES[codepoint]).nil?
+      @escape = encode_escape(@source_buffer.slice(p - 1))
+    end
   }
 
   action invalid_complex_escape {

data/lib/parser/version.rb

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

data/test/test_lexer.rb

@@ -3176,6 +3176,13 @@ class TestLexer < Minitest::Test
     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])
+    end
+  end
+
   def test_bug_string_non_utf
     assert_scanned(%Q{"caf\xE9"},
                    :tSTRING, "caf\xE9", [0, 6])

metadata

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