Split dynamic x-strings to give each line a real source-line reference

opal · Nov 23, 2013 · 95c97e3 · 95c97e3
1 parent dcf801c
commit 95c97e3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/lib/opal/nodes/literal.rb b/lib/opal/nodes/literal.rb
@@ -140,6 +140,8 @@ def compile
     end
 
     class DynamicXStringNode < Base
+      include XStringLineSplitter
+
       handle :dxstr
 
       def requires_semicolon(code)
@@ -151,12 +153,13 @@ def compile
 
         children.each do |part|
           if String === part
-            push part.to_s
+            compile_split_lines(part.to_s, @sexp)
+
             needs_semicolon = true if requires_semicolon(part.to_s)
           elsif part.type == :evstr
             push expr(part[1])
           elsif part.type == :str
-            push part.last.to_s
+            compile_split_lines(part.last.to_s, part)
             needs_semicolon = true if requires_semicolon(part.last.to_s)
           else
             raise "Bad dxstr part"

diff --git a/lib/opal/parser/lexer.rb b/lib/opal/parser/lexer.rb
@@ -15,6 +15,7 @@ def initialize(source, file)
       @cond       = 0
       @cmdarg     = 0
       @line       = 1
+      @tok_line   = 1
       @column     = 0
       @tok_column = 0
       @file       = file
@@ -115,16 +116,17 @@ def matched
 
     def line=(line)
       @column = @tok_column = 0
-      @line = line
+      @line = @tok_line = line
     end
 
     def next_token
       token     = self.yylex
       value     = self.yylval
-      location  = [@line, @tok_column]
+      location  = [@tok_line, @tok_column]
 
       # once location is stored, ensure next token starts in correct place
       @tok_column = @column
+      @tok_line = @line
 
       [token, [value, location]]
     end