Merge pull request #10089 from dotty-staging/fix-#10074

odersky · web-flow · commit a5f8e2bea4fc · 2020-10-27T08:36:57.000+01:00
Fix #10074: Disallow `given as` syntax
diff --git a/community-build/community-projects/scodec b/community-build/community-projects/scodec
@@ -1 +1 @@
-Subproject commit ca8a034b3acc14ad0db93fad87c191a22de0ffbf
+Subproject commit 17858b32a28a7a0a226e30e2ce688d84ec9fed00
diff --git a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala
@@ -3543,7 +3543,7 @@ object Parsers {
           then paramClauses(givenOnly = true)
           else Nil
         newLinesOpt()
-        if isIdent(nme.as) || !name.isEmpty || !tparams.isEmpty || !vparamss.isEmpty then
+        if !name.isEmpty || !tparams.isEmpty || !vparamss.isEmpty then
           accept(nme.as)
         val parents = constrApps(commaOK = true, templateCanFollow = true)
         if in.token == EQUALS && parents.length == 1 && parents.head.isType then
diff --git a/docs/docs/internals/syntax.md b/docs/docs/internals/syntax.md
@@ -401,7 +401,7 @@ ObjectDef         ::=  id [Template]
 EnumDef           ::=  id ClassConstr InheritClauses EnumBody                   EnumDef(mods, name, tparams, template)
 GivenDef          ::=  [GivenSig] Type ‘=’ Expr
                     |  [GivenSig] ConstrApps [TemplateBody]
-GivenSig          ::=  [id] [DefTypeParamClause] {UsingParamClause} ‘as’
+GivenSig          ::=  [id] [DefTypeParamClause] {UsingParamClause} ‘as’       -- one of `id`, `DefParamClause`, `UsingParamClause` must appear
 Extension         ::=  ‘extension’ [DefTypeParamClause] ‘(’ DefParam ‘)’
                        {UsingParamClause}] ExtMethods
 ExtMethods        ::=  ExtMethod | [nl] ‘{’ ExtMethod {semi ExtMethod ‘}’
diff --git a/tests/neg-macros/i9014/Macros_1.scala b/tests/neg-macros/i9014/Macros_1.scala
@@ -1,4 +1,4 @@
 import scala.quoted._
 trait Bar
-inline given as Bar = ${ impl }
+inline given Bar = ${ impl }
 def impl(using qctx: QuoteContext): Expr[Bar] = report.throwError("Failed to expand!")
diff --git a/tests/neg/gadt-approximation-interaction.scala b/tests/neg/gadt-approximation-interaction.scala
@@ -63,7 +63,7 @@ object GivenConversion {
   class Pow(self: Int):
     def **(other: Int): Int = math.pow(self, other).toInt
 
-  given as Conversion[Int, Pow] = (i: Int) => Pow(i)
+  given Conversion[Int, Pow] = (i: Int) => Pow(i)
 
   def foo[T](t: T, ev: T SUB Int) =
     ev match { case SUB.Refl() =>
diff --git a/tests/neg/i10074.scala b/tests/neg/i10074.scala
@@ -0,0 +1,3 @@
+class Context
+given Context = ???  // ok
+given as Context = ???     // error // error // error
diff --git a/tests/neg/i8896-a.scala b/tests/neg/i8896-a.scala
@@ -4,7 +4,7 @@ trait Foo[A]
 
 object Example {
 
-  given as Foo[Int] {
+  given Foo[Int] {
   }
 
   def foo0[A: Foo]: A => A = identity
diff --git a/tests/neg/i8896-b.scala b/tests/neg/i8896-b.scala
@@ -4,7 +4,7 @@ trait Foo[A]
 
 object Example {
 
-  given as Foo[Int] {
+  given Foo[Int] {
   }
 
   def foo0[A: Foo]: A => A = identity
diff --git a/tests/neg/i9014.scala b/tests/neg/i9014.scala
@@ -1,4 +1,4 @@
 trait Bar
 object Bar:
-  inline given as Bar = compiletime.error("Failed to expand!")
+  inline given Bar = compiletime.error("Failed to expand!")
   val tests = summon[Bar] // error
diff --git a/tests/pos/i9103.scala b/tests/pos/i9103.scala
@@ -1,6 +1,6 @@
 object a:
   type Foo[T]
-  given as Foo[Unit] = ???
+  given Foo[Unit] = ???
 
 val b = a
 
diff --git a/tests/run/instances-anonymous.scala b/tests/run/instances-anonymous.scala
@@ -63,7 +63,7 @@ object Test extends App {
     val minimum: T
   }
 
-  given as Ord[Int] {
+  given Ord[Int] {
     extension (x: Int) def compareTo(y: Int) =
       if (x < y) -1 else if (x > y) +1 else 0
     val minimum = Int.MinValue
diff --git a/tests/run/summonAll.scala b/tests/run/summonAll.scala
@@ -1,7 +1,7 @@
 import compiletime.summonAll
 
 @main def Test =
-  given as Int = 10
-  given as String = "foo"
-  given as Double = 1.2
+  given Int = 10
+  given String = "foo"
+  given Double = 1.2
   println(summonAll[Int *: String *: Double *: EmptyTuple])

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+class Context`
	`2`	`+given Context = ??? // ok`
	`3`	`+given as Context = ??? // error // error // error`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ trait Foo[A]`
`4`	`4`
`5`	`5`	`object Example {`
`6`	`6`
`7`		`- given as Foo[Int] {`
	`7`	`+ given Foo[Int] {`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`def foo0[A: Foo]: A => A = identity`