diff options
| author | Martin Odersky <odersky@gmail.com> | 2014-03-14 09:44:17 +0100 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2014-03-14 09:44:17 +0100 |
| commit | 722661c0bada3a8e64512bda2ac7501b1c02ec10 (patch) | |
| tree | a94c071b6eeea5092f3c01c48dd1e7ce421c48e2 /src | |
| parent | db950e5e168f6fd71a367da343e352139e8d653e (diff) | |
| download | dotty-722661c0bada3a8e64512bda2ac7501b1c02ec10.tar.gz dotty-722661c0bada3a8e64512bda2ac7501b1c02ec10.tar.bz2 dotty-722661c0bada3a8e64512bda2ac7501b1c02ec10.zip | |
Fixed two problems with annotated types in patterns
Problem 1: The parser did not accept them. It has to accept a "RefinedType" as an ascription,
not a "WithType" (as it did before), or even a "SimpleType" (as speced in the SyntaxSummary).
Problem 2: Annotations are always typed as expressions. The annotations in question were typed
as patterns before.
Tests in Patterns.scala and in the Dotty compiler itself.
Diffstat (limited to 'src')
| -rw-r--r-- | src/dotty/tools/dotc/parsing/Parsers.scala | 2 | ||||
| -rw-r--r-- | src/dotty/tools/dotc/printing/PlainPrinter.scala | 3 | ||||
| -rw-r--r-- | src/dotty/tools/dotc/typer/Typer.scala | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/src/dotty/tools/dotc/parsing/Parsers.scala b/src/dotty/tools/dotc/parsing/Parsers.scala index 37a0a3ce1..7e0910e1b 100644 --- a/src/dotty/tools/dotc/parsing/Parsers.scala +++ b/src/dotty/tools/dotc/parsing/Parsers.scala @@ -810,7 +810,7 @@ object Parsers { def typeDependingOn(location: Location.Value): Tree = if (location == Location.InParens) typ() - else if (location == Location.InPattern) withType() + else if (location == Location.InPattern) refinedType() else infixType() /* ----------- EXPRESSIONS ------------------------------------------------ */ diff --git a/src/dotty/tools/dotc/printing/PlainPrinter.scala b/src/dotty/tools/dotc/printing/PlainPrinter.scala index e5f85d11b..332b7bd21 100644 --- a/src/dotty/tools/dotc/printing/PlainPrinter.scala +++ b/src/dotty/tools/dotc/printing/PlainPrinter.scala @@ -103,8 +103,7 @@ class PlainPrinter(_ctx: Context) extends Printer { case tp: TypeRef => toTextPrefix(tp.prefix) ~ selectionString(tp) case tp: RefinedType => - // return tp.toString // !!! DEBUG - val parent :: (refined: List[RefinedType]) = + val parent :: (refined: List[RefinedType @unchecked]) = refinementChain(tp).reverse toTextLocal(parent) ~ "{" ~ Text(refined map toTextRefinement, "; ").close ~ "}" case AndType(tp1, tp2) => diff --git a/src/dotty/tools/dotc/typer/Typer.scala b/src/dotty/tools/dotc/typer/Typer.scala index c17c9d6d7..17c77be89 100644 --- a/src/dotty/tools/dotc/typer/Typer.scala +++ b/src/dotty/tools/dotc/typer/Typer.scala @@ -826,7 +826,7 @@ class Typer extends Namer with TypeAssigner with Applications with Implicits wit } def typedAnnotated(tree: untpd.Annotated, pt: Type)(implicit ctx: Context): Tree = track("typedAnnotated") { - val annot1 = typed(tree.annot, defn.AnnotationClass.typeRef) + val annot1 = typedExpr(tree.annot, defn.AnnotationClass.typeRef) val arg1 = typed(tree.arg, pt) if (ctx.mode is Mode.Type) assignType(cpy.Annotated(tree, annot1, arg1), annot1, arg1) |