Escape before EOL in double quote strings now removes newline

Fix to lexer to remove new line chactarers when prefixed with an escape
opal · Dec 3, 2013 · 8e163c5 · 8e163c5
1 parent ab4a9d7
commit 8e163c5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/lib/opal/parser/lexer.rb b/lib/opal/parser/lexer.rb
@@ -10,10 +10,11 @@ class Lexer
     STR_FUNC_QWORDS = 0x08
     STR_FUNC_SYMBOL = 0x10
     STR_FUNC_INDENT = 0x20
+    STR_FUNC_XQUOTE = 0x40
 
     STR_SQUOTE = 0x00
     STR_DQUOTE = STR_FUNC_EXPAND
-    STR_XQUOTE = STR_FUNC_EXPAND
+    STR_XQUOTE = STR_FUNC_EXPAND | STR_FUNC_XQUOTE
     STR_REGEXP = STR_FUNC_REGEXP | STR_FUNC_ESCAPE | STR_FUNC_EXPAND
     STR_SWORD  = STR_FUNC_QWORDS
     STR_DWORD  = STR_FUNC_QWORDS | STR_FUNC_EXPAND
@@ -398,8 +399,6 @@ def add_string_content(str_buffer, str_parse)
         elsif qwords and scan(/\s/)
           pushback(1)
           break
-        elsif scan(/\\\n/)
-          c = "\n"
         elsif scan(/\\/)
           if xquote # opal - treat xstrings as dquotes? forces us to double escape
             c = self.read_escape

diff --git a/spec/cli/lexer_spec.rb b/spec/cli/lexer_spec.rb
@@ -38,6 +38,10 @@
       expect_parsed_string("\"foo\\tbar\"").to eq("foo\tbar")
       expect_parsed_string("\"\\\"foo\"").to eq("\"foo")
     end
+
+    it "removes new line in string directly after backslash" do
+      expect_parsed_string("\"foo\\\nbar\"").to eq("foobar")
+    end
   end
 
   describe "single-quoted strings" do