Fix #2512: Implicit keyword not allowed on return types #2523
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
odersky
requested changes
May 24, 2017
| @@ -771,6 +776,9 @@ object Parsers { | |||
| } | |||
| else infixType() | |||
|
|
|||
| if (isImplicit && !isImplicitFun && in.token != ARROW) | |||
| syntaxError("Types with implicit keyword can only be function types", start, nme.IMPLICITkw) | |||
|
|
|||
| in.token match { | |||
| case ARROW => functionRest(t :: Nil) | |||
| case FORSOME => syntaxError(ExistentialTypesNoLongerSupported()); t | |||
There was a problem hiding this comment.
I think you can avoid the isImplicitFun logic and simply change the next line to:
case _ =>
if (isImplicit) syntaxError("Types with implicit keyword can only be function types", start)
t
There was a problem hiding this comment.
Even if not, it will eliminate the in.token != ARROW
| @@ -116,9 +116,9 @@ object Parsers { | |||
| /** Issue an error at given offset if beyond last error offset | |||
| * and update lastErrorOffset. | |||
| */ | |||
| def syntaxError(msg: => Message, offset: Int = in.offset): Unit = | |||
| def syntaxError(msg: => Message, offset: Int = in.offset, name: Name = in.name): Unit = | |||
There was a problem hiding this comment.
I think it is a bit overkill to add another parameter here.
There was a problem hiding this comment.
Then use directly syntaxError(msg, Position(offset, offset + length))
There was a problem hiding this comment.
Restored it, where length = the length of implicit keyword, otherwise it is the length of the identifier (in this case 3, from Int).
| @@ -771,6 +776,9 @@ object Parsers { | |||
| } | |||
| else infixType() | |||
|
|
|||
| if (isImplicit && !isImplicitFun && in.token != ARROW) | |||
| syntaxError("Types with implicit keyword can only be function types", Position(start, start + nme.IMPLICITkw.asSimpleName.length)) | |||
There was a problem hiding this comment.
Just to get the length. Any alternative way?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Update Parser to accommodate the new checks
Thanks @nicolasstucki for pair programming!