Skip to content

Fix #2494: avoid infinite loop in parser #2509

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 23, 2017

Conversation

odersky
Copy link
Contributor

@odersky odersky commented May 23, 2017

No description provided.

Copy link
Contributor

@felixmulder felixmulder left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like the proper fix to what I hotfixed a while back. LGTM!

@smarter
Copy link
Member

smarter commented May 23, 2017

Two error markers are needed, I'll take care of updating the PR and merging:

-- [E039] Syntax Error: ../tests/neg/i2494.scala:2:0 -------------------------------------------------------------------
2 |object // error
  |^^^^^^
  |an identifier expected, but 'object' found
longer explanation available when compiling with `-explain`
-- [E039] Syntax Error: ../tests/neg/i2494.scala:2:15 ------------------------------------------------------------------
2 |object // error
  |               ^
  |               an identifier expected, but eof found
two errors found
[error] Test dotc.tests.neg_all failed: java.lang.AssertionError: assertion failed: Wrong # of errors. Expected: 1, found: 2

@smarter smarter merged commit 79d4e3e into scala:master May 23, 2017
@allanrenucci allanrenucci deleted the fix-#2494 branch December 14, 2017 19:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants