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: e41f55edd52b
Choose a base ref
...
head repository: opal/opal
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7a36c3f35be5
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Nov 22, 2013

  1. Copy the full SHA
    7145ccd View commit details
  2. Copy the full SHA
    7a36c3f View commit details
Showing with 3 additions and 3 deletions.
  1. +3 −3 lib/opal/parser/lexer.rb
6 changes: 3 additions & 3 deletions lib/opal/parser/lexer.rb
Original file line number Diff line number Diff line change
@@ -99,7 +99,7 @@ def check(regexp)
end

def pushback(n)
@scanner.pos -= 1
@scanner.pos -= n
end

def matched
@@ -421,13 +421,13 @@ def add_string_content(str_buffer, str_parse)
end

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

# if ruby code at end of line after heredoc, we have to store it to
# parse after heredoc is finished parsing
end_of_line = @scanner.scan(/.*\n/)
end_of_line = scan(/.*\n/)
self.strterm[:scanner] = StringScanner.new(end_of_line) if end_of_line != "\n"

self.yylval = heredoc