Fix #1708: duplicate symbols in package #1722
Merged
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
|
Fixed failing test, this error was not caught previously: |
odersky
requested changes
Nov 17, 2016
| else { | ||
| /** If there's already an existing type, then the package is a dup of this type */ | ||
| val existingTpe = pkgOwner.info.decls.lookup(pid.name.toTypeName) | ||
| if (existingTpe != NoSymbol) { |
There was a problem hiding this comment.
More idiomatic: if (existingType.exists)
| val existingTpe = pkgOwner.info.decls.lookup(pid.name.toTypeName) | ||
| if (existingTpe != NoSymbol) { | ||
| ctx.error(PkgDuplicateSymbol(existingTpe), pid.pos) | ||
| ctx.newCompletePackageSymbol(pkgOwner, (pid.name ++ "$termDup").toTermName).entered |
There was a problem hiding this comment.
I propose we use the naming scheme pid.name ++ "$_error_ here.
| @@ -261,10 +262,10 @@ class Namer { typer: Typer => | |||
| ctx.error(msg, tree.pos) | |||
| name.freshened | |||
| } | |||
| def preExisting = ctx.effectiveScope.lookup(name) | |||
| lazy val preExisting = ctx.effectiveScope.lookup(name) | |||
There was a problem hiding this comment.
I don't think we need a lazy val here. preExisting is only used once on each path. Note that defs are more compact (in terms of byte code length) and efficient than lazy vals.
Here we unlink the existing type that clashes with the package to be entered into the symbol table, issue an error and the proceed to enter the rest of the symbols. My concern with this approach is what happens during typechecking if other things reference the unlinked type.
Unlinking proved to cause other problems in the typer, specifically if typechecking members of non-existing package or things referring to the unlinked package
felixmulder
force-pushed
the
topic/fix#1708
branch
from
be0adfd to
040379e
Compare
|
Done with suggested changes 👍 |
|
LGTM, thanks! |
odersky
approved these changes
Nov 17, 2016
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.
review: @odersky