Merge pull request #1969 from dotty-staging/fix/annot-fun

smarter · web-flow · commit 5bcbad29a368 · 2017-02-13T13:14:23.000+01:00
Fix parsing annotation on function type
diff --git a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala
@@ -713,7 +713,11 @@ object Parsers {
                 if (t.isInstanceOf[ByNameTypeTree])
                   syntaxError(ByNameParameterNotSupported())
               val tuple = atPos(start) { makeTupleOrParens(ts) }
-              infixTypeRest(refinedTypeRest(withTypeRest(simpleTypeRest(tuple))))
+              infixTypeRest(
+                refinedTypeRest(
+                  withTypeRest(
+                    annotTypeRest(
+                      simpleTypeRest(tuple)))))
             }
           }
         }
diff --git a/tests/pos/annot.scala b/tests/pos/annot.scala
@@ -24,5 +24,6 @@ class Test {
 
   class C extends A @uncheckedVariance () with B @uncheckedVariance { val x = 10 }
 
+  val f: (Int => Int) @uncheckedVariance = ???
 }
 

Original file line number	Diff line number	Diff line change
`@@ -713,7 +713,11 @@ object Parsers {`
`713`	`713`	`if (t.isInstanceOf[ByNameTypeTree])`
`714`	`714`	`syntaxError(ByNameParameterNotSupported())`
`715`	`715`	`val tuple = atPos(start) { makeTupleOrParens(ts) }`
`716`		`- infixTypeRest(refinedTypeRest(withTypeRest(simpleTypeRest(tuple))))`
	`716`	`+ infixTypeRest(`
	`717`	`+ refinedTypeRest(`
	`718`	`+ withTypeRest(`
	`719`	`+ annotTypeRest(`
	`720`	`+ simpleTypeRest(tuple)))))`
`717`	`721`	`}`
`718`	`722`	`}`
`719`	`723`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,5 +24,6 @@ class Test {`
`24`	`24`
`25`	`25`	`class C extends A @uncheckedVariance () with B @uncheckedVariance { val x = 10 }`
`26`	`26`
	`27`	`+ val f: (Int => Int) @uncheckedVariance = ???`
`27`	`28`	`}`
`28`	`29`