From 795de083b083e3c05d1a95757d6c29097f05d35a Mon Sep 17 00:00:00 2001 From: Rene Saarsoo Date: Thu, 25 Aug 2011 14:44:45 -0700 Subject: [PATCH] Support for multiline strings in lexer. Stuff like: "Some string\ continues here". It's rarely used, but I encountered it in some Jasmine tests. --- lib/jsduck/lexer.rb | 4 ++-- spec/lexer_spec.rb | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/lib/jsduck/lexer.rb b/lib/jsduck/lexer.rb index 7d9bd091..73827d09 100644 --- a/lib/jsduck/lexer.rb +++ b/lib/jsduck/lexer.rb @@ -127,12 +127,12 @@ module JsDuck elsif @input.check(/'/) return { :type => :string, - :value => @input.scan(/'([^'\\]|\\.)*'/).sub(/^'(.*)'$/, "\\1") + :value => @input.scan(/'([^'\\]|\\.)*'/m).sub(/^'(.*)'$/m, "\\1") } elsif @input.check(/"/) return { :type => :string, - :value => @input.scan(/"([^"\\]|\\.)*"/).sub(/^"(.*)"$/, "\\1") + :value => @input.scan(/"([^"\\]|\\.)*"/m).sub(/^"(.*)"$/m, "\\1") } elsif @input.check(/\//) # Several things begin with dash: diff --git a/spec/lexer_spec.rb b/spec/lexer_spec.rb index d125dc0a..5434a0fb 100644 --- a/spec/lexer_spec.rb +++ b/spec/lexer_spec.rb @@ -89,6 +89,14 @@ describe JsDuck::Lexer do it "when escaped single-quote inside single-quoted string" do lex(@s+@b+@s+@s + ' "blah"').should == [[:string, @b+@s], [:string, "blah"]] end + + it "when newlines escaped inside double-quoted string" do + lex(@d+"A\\\nB"+@d).should == [[:string, "A\\\nB"]] + end + + it "when newlines escaped inside single-quoted string" do + lex(@s+"A\\\nB"+@s).should == [[:string, "A\\\nB"]] + end end it "identifies $ as beginning of identifier" do -- GitLab