Skip to content

Error on TypedefOrDcl #3325

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
Show file tree
Hide file tree
Changes from 4 commits
Commits
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: 1 addition & 1 deletion compiler/src/dotty/tools/dotc/parsing/Parsers.scala
Original file line number Diff line number Diff line change
Expand Up @@ -2156,7 +2156,7 @@ object Parsers {
case SUPERTYPE | SUBTYPE | SEMI | NEWLINE | NEWLINES | COMMA | RBRACE | EOF =>
TypeDef(name, lambdaAbstract(tparams, typeBounds())).withMods(mods).setComment(in.getDocComment(start))
case _ =>
syntaxErrorOrIncomplete("`=', `>:', or `<:' expected")
syntaxErrorOrIncomplete(ExpectedTypeBoundOrEquals(in.token))
EmptyTree
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ public enum ErrorMessageID {
UncheckedTypePatternID,
ExtendFinalClassID,
EnumCaseDefinitionInNonEnumOwnerID,
ExpectedTypeBoundOrEqualsID,
;

public int errorNumber() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1770,7 +1770,7 @@ object messages {
|"""
}

case class ExtendFinalClass(clazz:Symbol, finalClazz: Symbol)(implicit ctx: Context)
case class ExtendFinalClass(clazz:Symbol, finalClazz: Symbol)(implicit ctx: Context)
extends Message(ExtendFinalClassID) {
val kind = "Syntax"
val msg = hl"$clazz cannot extend ${"final"} $finalClazz"
Expand All @@ -1786,4 +1786,22 @@ object messages {
|If you want to create an ${"enum"} case, make sure the corresponding ${"enum class"} exists
|and has the ${"enum"} keyword."""
}

case class ExpectedTypeBoundOrEquals(found: Token)(implicit ctx: Context)
extends Message(ExpectedTypeBoundOrEqualsID) {
val kind = "Syntax"
val msg = hl"${"="}, ${">:"}, or ${"<:"} expected, but ${Tokens.showToken(found)} found"

val explanation =
hl"""Type parameters and abstract types may be constrained by a type bound.
|Such type bounds limit the concrete values of the type variables and possibly
|reveal more information about the members of such types.
|
|A lower type bound ${"B >: A"} expresses that the type variable ${"B"}
|refers to a supertype of type ${"A"}.
|
|An upper type bound ${"T <: A"} declares that type variable ${"T"}
|refers to a subtype of type ${"A"}.
|"""
}
}
15 changes: 15 additions & 0 deletions compiler/test/dotty/tools/dotc/reporting/ErrorMessagesTests.scala
Original file line number Diff line number Diff line change
Expand Up @@ -1024,4 +1024,19 @@ class ErrorMessagesTests extends ErrorMessagesTest {
val EnumCaseDefinitionInNonEnumOwner(owner) :: Nil = messages
assertEquals("object Qux", owner.show)
}

@Test def expectedTypeBoundOrEquals =
checkMessagesAfter("frontend") {
"""object typedef {
| type asd > Seq
|}
""".stripMargin
}.expect { (ictx, messages) =>
implicit val ctx: Context = ictx
val defn = ictx.definitions
Copy link
Contributor

Choose a reason for hiding this comment

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

You don't need defn here.


assertMessageCount(1, messages)
val ExpectedTypeBoundOrEquals(found) :: Nil = messages
assertEquals(Tokens.IDENTIFIER, found)
}
}