Skip to content
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.

Sign up for GitHub

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

Fix #13141 remove spurious coercion of * to a _type_ identifier (was already a valid identifier) #13237

Merged
merged 1 commit into from
Aug 2, 2021
Merged

Fix #13141 remove spurious coercion of * to a _type_ identifier (was already a valid identifier) #13237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions compiler/src/dotty/tools/dotc/parsing/Parsers.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1609,8 +1609,6 @@ object Parsers {
else if isIdent(nme.?) then
val start = in.skipToken()
typeBounds().withSpan(Span(start, in.lastOffset, start))
else if isIdent(nme.*) && !ctx.settings.YkindProjector.isDefault then
typeIdent()
else
def singletonArgs(t: Tree): Tree =
if in.token == LPAREN && in.featureEnabled(Feature.dependent)
Expand Down
4 changes: 4 additions & 0 deletions tests/neg-custom-args/kind-projector-underscores.check
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ longer explanation available when compiling with `-explain`
| =, >:, or <: expected, but '_' found

longer explanation available when compiling with `-explain`
-- Error: tests/neg-custom-args/kind-projector-underscores.scala:14:51 -------------------------------------------------
14 |class BacktickUnderscoreIsNotFine extends Foo[List[`_`]] // error wildcard invalid as backquoted identifier
| ^
| wildcard invalid as backquoted identifier
-- Error: tests/neg-custom-args/kind-projector-underscores.scala:5:23 --------------------------------------------------
5 |class Bar1 extends Foo[Either[_, _]] // error
| ^^^^^^^^^^^^
Expand Down
2 changes: 2 additions & 0 deletions tests/neg-custom-args/kind-projector-underscores.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,5 @@ object Test {
type -_ = Int // error -_ not allowed as a type def name without backticks
type +_ = Int // error +_ not allowed as a type def name without backticks
}

class BacktickUnderscoreIsNotFine extends Foo[List[`_`]] // error wildcard invalid as backquoted identifier
17 changes: 17 additions & 0 deletions tests/pos-special/kind-projector.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,20 @@ class VarianceAnnotationIsActuallyIgnored6 extends FooPlus[λ[`-x` => Either[Int
class VarianceAnnotationIsActuallyIgnored7 extends QuxPlus[λ[(`-x`, `-y`) => Either[y, x]]]
class VarianceAnnotationIsActuallyIgnored8 extends FooPlus[BazPlus[Int => -*, -*, Int]]
class VarianceAnnotationIsActuallyIgnored9 extends Foo[λ[`-x` => BazPlus[x => -*, Int, x]]]

class BackticksAreFine1 extends FooPlus[Either[Int, `-*`]]
class BackticksAreFine2 extends FooPlus[Either[`-*`, Int]]
class BackticksAreFine3 extends FooMinus[`+*` => Int]
class BackticksAreFine4 extends FooPlus[Int => `-*`]
class BackticksAreFine5 extends FooPlus[(Int, `-*`, Int)]
class BackticksAreFine6 extends FooPlus[BazPlus[Int => `-*`, `-*`, Int]]
class BackticksAreFine7 extends Foo[λ[`-x` => BazPlus[x => `-*`, Int, x]]]
class BackticksAreFine8 extends Foo[λ[`x` => BazPlus[x => `*`, Int, x]]]

// https://github.com/lampepfl/dotty/issues/13141
// i13141
object A {
class X { type Blah = Int }
val * = new X
val a: *.Blah = 2
}