parser 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e0c9d9727b2d7da39af4c37f2fa324be928ece6
-  data.tar.gz: 5a9dc8e99c54aad863aeae920641064af6aa57ee
+  metadata.gz: 3192a05f45765370bae5e845962967a28d64d6fe
+  data.tar.gz: 38543a4c5abe950bb1bf984702e0823efa164af5
 SHA512:
-  metadata.gz: 4086430fbdc0d756d3d5c6b54501126793b03080a3657f64cd7889637ce73f6f38a36256c0dbee200a8204fe57743703c0407933e11993b875fa3742c01e440a
-  data.tar.gz: 1fc63b05dd53df335802bc7cd393685303f0eb5e73e895f391c6a6c26306832a22fd1a7b61d2abf9b6b94731e876655fd1fdde1dafac0e97a544ae128ab0a63e
+  metadata.gz: f4da4fa68c1ed37af9eb16442c6816da2943c6914e04f80cdd16d76c3cc7360eaba18861c6dc39984a08720ea7befa84b3fa9c8b311c69ab61ca8f9c89cc2e0c
+  data.tar.gz: cbdd62c1a300719540385b0965d014da25c31853a7ddc73eef375568ee91fad4344de3465d30e631f41e92013ccf549d909eb31d2a8e40031ed90f81878fde32

data/lib/parser/builders/default.rb

@@ -40,7 +40,7 @@ module Parser
     end
 
     def string_compose(begin_t, parts, end_t)
-      if parts.one?
+      if collapse_string_parts?(parts)
         parts.first
       else
         s(:dstr, *parts)
@@ -92,7 +92,7 @@ module Parser
     end
 
     def word(parts)
-      if parts.one?
+      if collapse_string_parts?(parts)
         parts.first
       else
         s(:dstr, *parts)
@@ -667,6 +667,11 @@ module Parser
       cond
     end
 
+    def collapse_string_parts?(parts)
+      parts.one? &&
+          [:str, :dstr].include?(parts.first.type)
+    end
+
     def t(token, type, *args)
       s(type, *(args << { :source_map => Source::Map.new(location(token)) }))
     end

data/parser.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = 'parser'
-  spec.version       = '1.0.0'
+  spec.version       = '1.0.1'
   spec.authors       = ['Peter Zotov']
   spec.email         = ['whitequark@whitequark.org']
   spec.description   = %q{A Ruby parser written in pure Ruby.}

data/test/test_parser.rb

@@ -316,12 +316,14 @@ class TestParser < MiniTest::Unit::TestCase
 
   def test_array_words_interp
     assert_parses(
-      s(:array, s(:str, "foo"), s(:lvar, :bar)),
+      s(:array,
+        s(:str, "foo"),
+        s(:dstr, s(:lvar, :bar))),
       %q{%W[foo #{bar}]},
       %q{^^^ begin
         |             ^ end
         |   ~~~ expression (str)
-        |         ~~~ expression (lvar)
+        |         ~~~ expression (dstr.lvar)
         |~~~~~~~~~~~~~~ expression})
 
     assert_parses(
@@ -357,12 +359,14 @@ class TestParser < MiniTest::Unit::TestCase
 
   def test_array_symbols_interp
     assert_parses(
-      s(:array, s(:sym, :foo), s(:lvar, :bar)),
+      s(:array,
+        s(:sym, :foo),
+        s(:dsym, s(:lvar, :bar))),
       %q{%I[foo #{bar}]},
       %q{^^^ begin
         |             ^ end
         |   ~~~ expression (sym)
-        |         ~~~ expression (lvar)
+        |         ~~~ expression (dsym.lvar)
         |~~~~~~~~~~~~~~ expression},
       ALL_VERSIONS - %w(1.8 1.9))
 
@@ -3948,4 +3952,14 @@ class TestParser < MiniTest::Unit::TestCase
         s(:args), s(:nil)),
       %q{desc "foo" do end})
   end
+
+  def test_bug_interp_single
+    assert_parses(
+      s(:dstr, s(:int, 1)),
+      %q{"#{1}"})
+
+    assert_parses(
+      s(:array, s(:dstr, s(:int, 1))),
+      %q{%W"#{1}"})
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parser
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Peter Zotov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-17 00:00:00.000000000 Z
+date: 2013-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast