Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: opal/opal
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0dce848f1e22
Choose a base ref
...
head repository: opal/opal
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 158cd0a3e447
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Apr 4, 2014

  1. Distinguish between single- and double-quoted heredoc identifiers. 

    Single-quoted heredoc identifiers do not process the content for escape
sequences.

Added tests to ensure:
  * Escapes not processed in `<<'EOD'`
  * Escapes are processed in `<<"EOD"`
  * `<<EOD` is processed as `<<"EOD"`
    @mieko
    mieko committed Apr 4, 2014

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    GPG key ID: 091DBF4D1FC46B8E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    830e3e5 View commit details

Commits on Apr 7, 2014

  1. Merge pull request #526 from mieko/heredoc 

    Distinguish between single- and double-quoted heredoc identifiers.
    @adambeynon
    adambeynon committed Apr 7, 2014

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    158cd0a View commit details
Showing with 38 additions and 5 deletions.
  1. +9 −4 lib/opal/parser/lexer.rb
  2. +29 −1 spec/opal/core/language/string_spec.rb
13 changes: 9 additions & 4 deletions lib/opal/parser/lexer.rb
View file
Original file line number Diff line number Diff line change
@@ -241,6 +241,9 @@ def here_document(str_parse)
eos_regx = /[ \t]*#{Regexp.escape(str_parse[:term])}(\r*\n|$)/
expand = true

# Don't escape single-quoted heredoc identifiers
escape = str_parse[:func] != STR_SQUOTE

if check(eos_regx)
scan(/[ \t]*#{Regexp.escape(str_parse[:term])}/)

@@ -272,7 +275,7 @@ def here_document(str_parse)
elsif expand && check(/#(?=[\$\@\{])/)
break
elsif scan(/\\/)
str_buffer << self.read_escape
str_buffer << (escape ? self.read_escape : scanner.matched)
else
reg = Regexp.new("[^\#\0\\\\\n]+|.")

@@ -471,9 +474,11 @@ def add_string_content(str_buffer, str_parse)
end

def heredoc_identifier
if scan(/(-?)['"]?(\w+)['"]?/)
heredoc = @scanner[2]
self.strterm = new_strterm(STR_DQUOTE, heredoc, heredoc)
if scan(/(-?)(['"])?(\w+)\2?/)
escape_method = (@scanner[2] == "'") ? STR_SQUOTE : STR_DQUOTE
heredoc = @scanner[3]

self.strterm = new_strterm(escape_method, heredoc, heredoc)
self.strterm[:type] = :heredoc

# if ruby code at end of line after heredoc, we have to store it to
30 changes: 29 additions & 1 deletion spec/opal/core/language/string_spec.rb
View file
Original file line number Diff line number Diff line change
@@ -13,4 +13,32 @@
a = 1
%[#{a}23].should == "123"
end
end

it "should not process escape characters in single-quoted heredocs" do
s = <<'EOD'
hey\now\brown\cow
EOD
s.strip.should == 'hey\now\brown\cow'
end
it "should ignore single-quote escapes in single-quoted heredocs" do
s = <<'EOD'
they\'re greeeeaaat!
EOD
s.strip.should == 'they\\\'re greeeeaaat!'
end
it "should process escape characters in double quoted heredocs" do
s = <<"EOD"
hey\now\brown\cow
EOD
s.strip.should == "hey\now\brown\cow"
end
it "should treat bare-word heredoc identifiers as double-quoted" do
s = <<EOD
hey\now\brown\cow
EOD
s.strip.should == "hey\now\brown\cow"
end
end