Fix string interpolation bug

teliosdev · Mar 24, 2014 · 821027b · 821027b
1 parent 5394c91
commit 821027b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/lib/liquidscript/compiler/icr/literals.rb b/lib/liquidscript/compiler/icr/literals.rb
@@ -112,8 +112,12 @@ def compile_istring_begin
 
           loop do
             contents << compile_vexpression
-            contents << shift(:istring)
-            peek?(:istring_begin)
+            if peek?(:istring_begin)
+              contents << shift(:istring_begin)
+            else
+              contents << shift(:istring)
+              false
+            end
           end
 
 

diff --git a/lib/liquidscript/version.rb b/lib/liquidscript/version.rb
@@ -1,5 +1,5 @@
 module Liquidscript
 
   # The current version of liquidscript.
-  VERSION = "0.7.8".freeze
+  VERSION = "0.7.9".freeze
 end
diff --git a/spec/fixtures/string.generate.yml b/spec/fixtures/string.generate.yml
@@ -3,11 +3,11 @@ data: |
   foo  = 'world
   thing = "hello \" test
   world"
-  interop = "hello #{foo}"
+  interop = "hello #{foo} #{test}"
 
 compiled: |
   var test, foo, thing, interop;
   test = "hello";
   foo = 'world';
   thing = "hello \" test \n world";
-  interop = "hello" + (foo) + "";
+  interop = "hello" + (foo) + " " + (test) + "";