parser 2.2.0 → 2.2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e046c7cf9b591ec808e574b34fa7c85f10cd599b
-  data.tar.gz: 9e0b542f23cabecdee8c94ba746e4ab4e3a02da8
+  metadata.gz: f269b1e2401ffe3b9b35319fec5accc3378dfe5e
+  data.tar.gz: 66bff4c72a39532d0a008dc2c45bf597ec9a397a
 SHA512:
-  metadata.gz: 7f3314d6d28f8ab85e19b4b8c88705e37f86be3d22c60788cf8d4c47ab0b0628a575bc30b9cf4a9218e733d2eaf717ac95d2f2f6ec84f60e62f0590168f40c98
-  data.tar.gz: 79106682d33a882de101643d8258fa327c13ca94b06bdceef7c7a89af42f21a7d6e589aa2bc9bc4785a2d0eefe228513fba33e1fbdfd842c7788ad71b2c9946d
+  metadata.gz: c05ff7923a950a07a0b202a2a393e4bdc7bf4b8235d5e5517599fbc634b544b82fd24b1ce74e34ae0131d68c982fb7044af6428acd3f62aa580d1a038bb03b63
+  data.tar.gz: 19e74008c7cc99b59811266fd590db6870f6e52ce44077f0430d8a065efc44f0c5bab8b64b77ca3dc52cf431f8e59db7329be2f70dbf191a375e189be06bec11

data/.travis.yml

@@ -5,13 +5,13 @@ rvm:
  - 1.9.3
  - 2.0.0
  - 2.1
+ - 2.2
  - ruby-head
  - jruby-18mode
  - jruby-19mode
  - rbx-2
 matrix:
  allow_failures:
-  - rvm: ruby-head
   - rvm: rbx-2
 before_install:
  - gem update bundler

data/CHANGELOG.md

@@ -1,7 +1,14 @@
 Changelog
 =========
 
-v2.2.0 (2014-12-05)
+v2.2.0.1 (2014-12-27)
+---------------------
+
+Bugs fixed:
+ * lexer.rl, lexer/literal: "{'a'::": don't parse as quoted label. (Peter Zotov)
+ * Update syntax deviation warning to reflect 2.2 release. (Peter Zotov)
+
+v2.2.0 (2014-12-25)
 -------------------
 
 Bugs fixed:

data/lib/parser/current.rb

@@ -42,8 +42,8 @@ module Parser
 
   else # :nocov:
     # Keep this in sync with released Ruby.
-    warn_syntax_deviation 'parser/ruby21', '2.1'
-    require 'parser/ruby21'
-    CurrentRuby = Ruby21
+    warn_syntax_deviation 'parser/ruby22', '2.2'
+    require 'parser/ruby22'
+    CurrentRuby = Ruby22
   end
 end

data/lib/parser/lexer.rl

@@ -832,7 +832,7 @@ class Parser::Lexer
 
     # tLABEL_END is only possible in non-cond context on >= 2.2
     if @version >= 22 && !@cond.active?
-      lookahead = @source[@te...@te+1]
+      lookahead = @source[@te...@te+2]
       lookahead = lookahead.encode(@encoding) if lookahead.respond_to?(:encode)
     end
 

data/lib/parser/lexer/literal.rb

@@ -129,11 +129,13 @@ module Parser
           extend_space(ts, ts)
         end
 
-        # Emit the string as a single token if it's applicable.
-        if lookahead == ':' && %w(' ").include?(delimiter) && @start_tok == :tSTRING_BEG
+        if lookahead && lookahead[0] == ?: && lookahead[1] != ?: &&
+           %w(' ").include?(delimiter) && @start_tok == :tSTRING_BEG
+          # This is a quoted label.
           flush_string
           emit(:tLABEL_END, @end_delim, ts, te + 1)
         elsif @monolithic
+          # Emit the string as a single token.
           emit(MONOLITHIC[@start_tok], @buffer, @str_s, te)
         else
           # If this is a heredoc, @buffer contains the sentinel now.

data/lib/parser/ruby22.y

@@ -2329,9 +2329,6 @@ end
 
 require 'parser'
 
-warn "warning: you are loading parser/ruby22 from #{caller[0]}."
-warn "warning: Ruby 2.2 is not released yet and parser support may be incomplete."
-
 Parser.check_for_encoding_support
 
 ---- inner

data/lib/parser/version.rb

@@ -1,3 +1,3 @@
 module Parser
-  VERSION = '2.2.0'
+  VERSION = '2.2.0.1'
 end

data/test/test_lexer.rb

@@ -293,6 +293,15 @@ class TestLexer < Minitest::Test
                    :tLABEL_END,       "'")
   end
 
+  def test_label_colon2__22
+    setup_lexer 22
+
+    assert_scanned("{'a'::",
+                   :tLBRACE, '{',
+                   :tSTRING, "a",
+                   :tCOLON2, '::')
+  end
+
   def test_command_start__19
     setup_lexer 19
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parser
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.0.1
 platform: ruby
 authors:
 - Peter Zotov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-25 00:00:00.000000000 Z
+date: 2014-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast
@@ -371,7 +371,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: A Ruby parser written in pure Ruby.