parser 2.2.0.pre.8 → 2.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 7e1367c0464f2e67570b3c86de8d9db82c6332c5
4
- data.tar.gz: a785730ffd3137ec99807d490f1735cd22f9d58a
3
+ metadata.gz: e046c7cf9b591ec808e574b34fa7c85f10cd599b
4
+ data.tar.gz: 9e0b542f23cabecdee8c94ba746e4ab4e3a02da8
5
5
  SHA512:
6
- metadata.gz: 2fba434ca69663b8e8f14dbc0ba4cc05c85054f2c6f901513635206bd164294694d4f433cf75282d14b0fa074f479bcc7b4c8de3e2396ae9e8ae648b22d818a0
7
- data.tar.gz: fdb64d37967e2626d9bcdb8e234d711659413c8b07aa73d1b24a9814203e53cd5bb59d1a3f007f67be144da55838d0390534f7e9d150c2856c490683cca84370
6
+ metadata.gz: 7f3314d6d28f8ab85e19b4b8c88705e37f86be3d22c60788cf8d4c47ab0b0628a575bc30b9cf4a9218e733d2eaf717ac95d2f2f6ec84f60e62f0590168f40c98
7
+ data.tar.gz: 79106682d33a882de101643d8258fa327c13ca94b06bdceef7c7a89af42f21a7d6e589aa2bc9bc4785a2d0eefe228513fba33e1fbdfd842c7788ad71b2c9946d
data/CHANGELOG.md CHANGED
@@ -1,13 +1,19 @@
1
1
  Changelog
2
2
  =========
3
3
 
4
+ v2.2.0 (2014-12-05)
5
+ -------------------
6
+
7
+ Bugs fixed:
8
+ * lexer.rl: "{'x':1,'y':{}}": fix lex_state after tLABEL_END. (Peter Zotov)
9
+
4
10
  v2.2.0.pre.8 (2014-11-19)
5
11
  -------------------------
6
12
 
7
13
  API modifications:
8
14
  * parser/current: update 2.1 to 2.1.5 (fixes #174). (Peter Zotov)
9
15
 
10
- v2.2.0.pre.8 (2014-11-03)
16
+ v2.2.0.pre.7 (2014-11-03)
11
17
  -------------------------
12
18
 
13
19
  Bugs fixed:
data/lib/parser/lexer.rl CHANGED
@@ -837,8 +837,14 @@ class Parser::Lexer
837
837
  end
838
838
 
839
839
  if !literal.heredoc? && (token = literal.nest_and_try_closing(string, @ts, @te, lookahead))
840
- p += 1 if token[0] == :tLABEL_END
841
- fnext *pop_literal; fbreak;
840
+ if token[0] == :tLABEL_END
841
+ p += 1
842
+ pop_literal
843
+ fnext expr_labelarg;
844
+ else
845
+ fnext *pop_literal;
846
+ end
847
+ fbreak;
842
848
  else
843
849
  literal.extend_string(string, @ts, @te)
844
850
  end
@@ -1,3 +1,3 @@
1
1
  module Parser
2
- VERSION = '2.2.0.pre.8'
2
+ VERSION = '2.2.0'
3
3
  end
data/test/test_parser.rb CHANGED
@@ -576,6 +576,14 @@ class TestParser < Minitest::Test
576
576
  |~~~~~~~~~~~~ expression},
577
577
  ALL_VERSIONS - %w(1.8 1.9 2.0 2.1))
578
578
 
579
+ assert_parses(
580
+ s(:hash,
581
+ s(:pair, s(:sym, :foo), s(:int, 2)),
582
+ s(:pair, s(:sym, :bar), s(:hash))),
583
+ %q[{ 'foo': 2, 'bar': {}}],
584
+ %q{},
585
+ ALL_VERSIONS - %w(1.8 1.9 2.0 2.1))
586
+
579
587
  assert_parses(
580
588
  s(:send, nil, :f,
581
589
  s(:if, s(:send, nil, :a),
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: parser
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.2.0.pre.8
4
+ version: 2.2.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Peter Zotov
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-11-19 00:00:00.000000000 Z
11
+ date: 2014-12-25 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: ast
@@ -366,9 +366,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
366
366
  version: '0'
367
367
  required_rubygems_version: !ruby/object:Gem::Requirement
368
368
  requirements:
369
- - - ">"
369
+ - - ">="
370
370
  - !ruby/object:Gem::Version
371
- version: 1.3.1
371
+ version: '0'
372
372
  requirements: []
373
373
  rubyforge_project:
374
374
  rubygems_version: 2.4.1