opal · Jun 2, 2014 · Jun 2, 2014 · Jun 2, 2014
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,8 @@
 *   Fix Range.new to raise `ArgumentError` on contructor values that cannot
     be compared
 
+*   Fix compiler bug where Contiguous strings were not getting concatenated.
+
 ## 0.6.2 2014-04-25
 
 *   Added Range#size

diff --git a/lib/opal/nodes/literal.rb b/lib/opal/nodes/literal.rb
@@ -112,8 +112,12 @@ def compile
             push ")"
           elsif part.type == :str
             push part[1].inspect
+          elsif part.type == :dstr
+            push "("
+            push expr(part)
+            push ")"
           else
-            raise "Bad dstr part"
+            raise "Bad dstr part #{part.inspect}"
           end
 
           wrap '(', ')' if recv?

diff --git a/lib/opal/parser/grammar.rb b/lib/opal/parser/grammar.rb
diff --git a/lib/opal/parser/grammar.y b/lib/opal/parser/grammar.y
@@ -1188,6 +1188,9 @@ opt_block_args_tail: tCOMMA block_args_tail
 
           string: string1
                 | string string1
+                  {
+                    result = str_append val[0], val[1]
+                  }
 
          string1: tSTRING_BEG string_contents tSTRING_END
                     {

diff --git a/opal/opal.rb b/opal/opal.rb
@@ -1,4 +1,4 @@
-require 'corelib/runtime.js'
+require 'corelib/runtime'
 require 'corelib/helpers'
 require 'corelib/module'
 require 'corelib/class'

diff --git a/spec/cli/parser/string_spec.rb b/spec/cli/parser/string_spec.rb
@@ -237,6 +237,13 @@
       }.should raise_error(Exception)
     end
   end
+
+  describe "contiguous strings" do
+    it "concatenates parts" do
+      parsed('"a" "b"').should == [:dstr, "a", [:str, "b"]]
+    end
+  end
+
 end
 
 describe "Heredocs" do

diff --git a/spec/opal/core/string_spec.rb b/spec/opal/core/string_spec.rb
@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe "String" do
+  it "handles contiguous parts correctly" do
+    str = "a" "b"
+    str.should == "ab"
+
+    str2 = "d" "#{str}"
+    str2.should == "dab"
+  end
+end
diff --git a/spec/opal/stdlib/erb/erb_spec.rb b/spec/opal/stdlib/erb/erb_spec.rb
@@ -1,7 +1,7 @@
 require 'erb'
-require File.expand_path('../simple.opalerb', __FILE__)
-require File.expand_path('../quoted.opalerb', __FILE__)
-require File.expand_path('../inline_block.opalerb', __FILE__)
+require File.expand_path('../simple', __FILE__)
+require File.expand_path('../quoted', __FILE__)
+require File.expand_path('../inline_block', __FILE__)
 
 describe "ERB files" do
   before :each do