parser 2.2.0.pre.8 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e1367c0464f2e67570b3c86de8d9db82c6332c5
-  data.tar.gz: a785730ffd3137ec99807d490f1735cd22f9d58a
+  metadata.gz: e046c7cf9b591ec808e574b34fa7c85f10cd599b
+  data.tar.gz: 9e0b542f23cabecdee8c94ba746e4ab4e3a02da8
 SHA512:
-  metadata.gz: 2fba434ca69663b8e8f14dbc0ba4cc05c85054f2c6f901513635206bd164294694d4f433cf75282d14b0fa074f479bcc7b4c8de3e2396ae9e8ae648b22d818a0
-  data.tar.gz: fdb64d37967e2626d9bcdb8e234d711659413c8b07aa73d1b24a9814203e53cd5bb59d1a3f007f67be144da55838d0390534f7e9d150c2856c490683cca84370
+  metadata.gz: 7f3314d6d28f8ab85e19b4b8c88705e37f86be3d22c60788cf8d4c47ab0b0628a575bc30b9cf4a9218e733d2eaf717ac95d2f2f6ec84f60e62f0590168f40c98
+  data.tar.gz: 79106682d33a882de101643d8258fa327c13ca94b06bdceef7c7a89af42f21a7d6e589aa2bc9bc4785a2d0eefe228513fba33e1fbdfd842c7788ad71b2c9946d

data/CHANGELOG.md

@@ -1,13 +1,19 @@
 Changelog
 =========
 
+v2.2.0 (2014-12-05)
+-------------------
+
+Bugs fixed:
+ * lexer.rl: "{'x':1,'y':{}}": fix lex_state after tLABEL_END. (Peter Zotov)
+
 v2.2.0.pre.8 (2014-11-19)
 -------------------------
 
 API modifications:
  * parser/current: update 2.1 to 2.1.5 (fixes #174). (Peter Zotov)
 
-v2.2.0.pre.8 (2014-11-03)
+v2.2.0.pre.7 (2014-11-03)
 -------------------------
 
 Bugs fixed:

data/lib/parser/lexer.rl

@@ -837,8 +837,14 @@ class Parser::Lexer
     end
 
     if !literal.heredoc? && (token = literal.nest_and_try_closing(string, @ts, @te, lookahead))
-      p += 1 if token[0] == :tLABEL_END
-      fnext *pop_literal; fbreak;
+      if token[0] == :tLABEL_END
+        p += 1
+        pop_literal
+        fnext expr_labelarg;
+      else
+        fnext *pop_literal;
+      end
+       fbreak;
     else
       literal.extend_string(string, @ts, @te)
     end

data/lib/parser/version.rb

@@ -1,3 +1,3 @@
 module Parser
-  VERSION = '2.2.0.pre.8'
+  VERSION = '2.2.0'
 end

data/test/test_parser.rb

@@ -576,6 +576,14 @@ class TestParser < Minitest::Test
         |~~~~~~~~~~~~ expression},
       ALL_VERSIONS - %w(1.8 1.9 2.0 2.1))
 
+    assert_parses(
+      s(:hash,
+        s(:pair, s(:sym, :foo), s(:int, 2)),
+        s(:pair, s(:sym, :bar), s(:hash))),
+      %q[{ 'foo': 2, 'bar': {}}],
+      %q{},
+      ALL_VERSIONS - %w(1.8 1.9 2.0 2.1))
+
     assert_parses(
       s(:send, nil, :f,
         s(:if, s(:send, nil, :a),

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parser
 version: !ruby/object:Gem::Version
-  version: 2.2.0.pre.8
+  version: 2.2.0
 platform: ruby
 authors:
 - Peter Zotov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-19 00:00:00.000000000 Z
+date: 2014-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast
@@ -366,9 +366,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.1