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

Commits on Jul 11, 2015

  1. Copy the full SHA
    6d879e7 View commit details

Commits on Jul 16, 2015

  1. Merge pull request #994 from vais/lexer

    Fix lexer bug whereby `<<self` in `class <<self` is seen as a heredoc
    vais committed Jul 16, 2015

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    d18909f View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 lib/opal/parser/lexer.rb
2 changes: 1 addition & 1 deletion lib/opal/parser/lexer.rb
Original file line number Diff line number Diff line change
@@ -1050,7 +1050,7 @@ def yylex
if after_operator?
@lex_state = :expr_arg
return :tLSHFT
elsif !after_operator? && !end? && (!arg? || @space_seen)
elsif !after_operator? && !end? && (!arg? || @space_seen) && @lex_state != :expr_class
if token = heredoc_identifier
return token
end