Drop extension keyword

odersky · odersky · commit c259790aa5ca · 2019-09-13T09:39:59.000+02:00
diff --git a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala
@@ -3322,6 +3322,22 @@ object Parsers {
       Template(constr, parents, Nil, EmptyValDef, Nil)
     }
 
+    /** Are the next tokens a prefix of a DefParam? */
+    def isDefParam() =
+      val lookahead = in.LookaheadScanner()
+      if lookahead.token == LPAREN then
+        lookahead.nextToken()
+        if lookahead.token == AT then true
+        else if lookahead.token == IDENTIFIER then
+          if lookahead.name == nme.inline then
+            lookahead.nextToken()
+          if lookahead.token == IDENTIFIER then
+            lookahead.nextToken()
+            lookahead.token == COLON
+          else false
+        else false
+      else false
+
     /** OLD:
      *  GivenDef       ::=  [id] [DefTypeParamClause] GivenBody
      *  GivenBody      ::=  [‘as ConstrApp {‘,’ ConstrApp }] {GivenParamClause} [TemplateBody]
@@ -3338,11 +3354,7 @@ object Parsers {
       var mods1 = addMod(mods, instanceMod)
       var isExtension = false
       val name =
-        if isIdent(nme.extension) then
-          in.nextToken()
-          isExtension = true
-          EmptyTermName
-        else if newStyle && allowOldGiven && isIdent(nme.as) then EmptyTermName
+        if newStyle && allowOldGiven && isIdent(nme.as) then EmptyTermName
         else if isIdent then ident()
         else EmptyTermName
       indentRegion(name) {
@@ -3359,12 +3371,13 @@ object Parsers {
             tokenSeparated(COMMA, constrApp)
           else if in.token == COLON then
             in.nextToken()
-            if isIdent(nme.extension) then
+            if in.token == LBRACE
+               || in.token == LBRACKET
+               || in.token == LPAREN && isDefParam() then
               if tparams.nonEmpty then
-                syntaxError(i"no type parameters allowed before `extension`", tparams.head.span)
+                syntaxError(i"no type parameters allowed for extension", tparams.head.span)
               if leadingParamss.nonEmpty then
-                syntaxError(i"no parameters allowed before `extension`", leadingParamss.head.head.span)
-              in.nextToken()
+                syntaxError(i"no parameters allowed for extension", leadingParamss.head.head.span)
               parseParams()
               Nil
             else tokenSeparated(COMMA, constrApp)
diff --git a/docs/docs/internals/syntax.md b/docs/docs/internals/syntax.md
@@ -389,7 +389,7 @@ ObjectDef         ::=  id [Template]
 EnumDef           ::=  id ClassConstr InheritClauses EnumBody                   EnumDef(mods, name, tparams, template)
 GivenDef          ::=  [GivenSig (‘:’ | <:)] Type ‘=’ Expr
                     |  [GivenSig ‘:’] [ConstrApp {‘,’ ConstrApp }] [TemplateBody]
-                    |  ‘extension’ [id ‘:’] [ExtParamClause] TemplateBody
+                    |  [id ‘:’] [ExtParamClause] TemplateBody
 GivenSig          ::=  [id] [DefTypeParamClause] {GivenParamClause}
 ExtParamClause    ::=  [DefTypeParamClause] ‘(’ DefParam ‘)’ {GivenParamClause}
 Template          ::=  InheritClauses [TemplateBody]                            Template(constr, parents, self, stats)
diff --git a/docs/docs/reference/contextual/extension-methods.md b/docs/docs/reference/contextual/extension-methods.md
@@ -80,39 +80,36 @@ So `circle.circumference` translates to `CircleOps.circumference(circle)`, provi
 
 ### Given Instances Defining Only Extension Methods
 
-Given instances that define extension methods can also be defined without a parent clause. In this case the `given` is followed  by the special identifier
-`extension`. E.g.,
+Given instances that define extension methods can also be defined without a parent clause. E.g.,
 
 ```scala
-given stringOps: extension {
+given stringOps: {
   def (xs: Seq[String]) longestStrings: Seq[String] = {
     val maxLength = xs.map(_.length).max
     xs.filter(_.length == maxLength)
   }
 }
 
-given extension {
+given {
   def (xs: List[T]) second[T] = xs.tail.head
 }
 ```
-If given extensions are anonymous (as in the second clause), their name is synthesized from the name of the first defined extension method.
-
-Note: `extension` is a soft keyword, it can be used elsewhere as a normal identifier.
+If an extensions is anonymous (as in the second clause), its name is synthesized from the name of the first defined extension method.
 
 ### Given Extensions with Collective Parameters
 
 If a given extension defines several extension methods one can pull out the left parameter section
 as well as any type parameters of these extension methods into the given instance itself.
 For instance, here is a given instance with two extension methods.
 ```scala
-given listOps: extension {
+given listOps: {
   def (xs: List[T]) second[T]: T = xs.tail.head
   def (xs: List[T]) third[T]: T = xs.tail.tail.head
 }
 ```
 The repetition in the parameters can be avoided by moving the parameters in front of the opening brace. The following version is a shorthand for the code above.
 ```scala
-given listOps: extension[T](xs: List[T]) {
+given listOps: [T](xs: List[T]) {
   def second: T = xs.tail.head
   def third: T = xs.tail.tail.head
 }
@@ -172,6 +169,6 @@ Here are the required syntax extensions compared to the
 DefSig            ::=  ...
                     |  ‘(’ DefParam ‘)’ [nl] id [DefTypeParamClause] DefParamClauses
 GivenDef          ::=  ...
-                    |  [id ‘:’] ‘extension’ ExtParamClause TemplateBody
+                    |  [id ‘:’] [ExtParamClause] TemplateBody
 ExtParamClause    ::=  [DefTypeParamClause] ‘(’ DefParam ‘)’ {GivenParamClause}
 ```
diff --git a/docs/docs/reference/contextual/relationship-implicits.md b/docs/docs/reference/contextual/relationship-implicits.md
@@ -63,7 +63,7 @@ Anonymous given instances that define extension methods without also implementin
 get their name from the name of the first extension method and the toplevel type
 constructor of its first parameter. For example, the given extension
 ```scala
-  given extension {
+  given {
     def (xs: List[T]) second[T] = ...
   }
 ```
diff --git a/docs/docs/reference/metaprogramming/macros.md b/docs/docs/reference/metaprogramming/macros.md
@@ -251,7 +251,7 @@ The `toExpr` extension method is defined in package `quoted`:
 ```scala
     package quoted
 
-    given extension {
+    given {
       def (x: T) toExpr[T: Liftable] given QuoteContext: Expr[T] = summon[Liftable[T]].toExpr(x)
       ...
     }
diff --git a/docs/docs/reference/other-new-features/opaques.md b/docs/docs/reference/other-new-features/opaques.md
@@ -20,7 +20,7 @@ object Logarithms {
   }
 
   // Extension methods define opaque types' public APIs
-  given logarithmOps: extension {
+  given logarithmOps: {
     def (x: Logarithm) toDouble: Double = math.exp(x)
     def (x: Logarithm) + (y: Logarithm): Logarithm = Logarithm(math.exp(x) + math.exp(y))
     def (x: Logarithm) * (y: Logarithm): Logarithm = Logarithm(x + y)
diff --git a/library/src-bootstrapped/scala/IArray.scala b/library/src-bootstrapped/scala/IArray.scala
@@ -8,7 +8,7 @@ object opaques {
   opaque type IArray[+T] = Array[_ <: T]
 
   /** Defines extension methods for immutable arrays */
-  given arrayOps: extension {
+  given arrayOps: {
 
     /** The selection operation on an immutable array.
       *
diff --git a/tests/neg/extmethod-overload.scala b/tests/neg/extmethod-overload.scala
@@ -1,8 +1,8 @@
 object Test {
-  given A: extension {
+  given A: {
     def (x: Int) |+| (y: Int) = x + y
   }
-  given B: extension {
+  given B: {
     def (x: Int) |+| (y: String) = x + y.length
   }
   assert((1 |+| 2) == 3)  // error ambiguous
diff --git a/tests/neg/i5455.scala b/tests/neg/i5455.scala
@@ -11,7 +11,7 @@ object Library {
     def toInt(n: Nat): Int = n
 
   }
-  given extension {
+  given {
     def (x: Nat) * (y: Nat): Nat = x * y
     def (x: Nat) toInt: Int = x
   }
diff --git a/tests/pos/i7084.scala b/tests/pos/i7084.scala
@@ -2,7 +2,7 @@ object Test {
 
   type Foo
 
-  given extension {
+  given {
     def (y: Any) g given Foo: Any = ???
   }
 
diff --git a/tests/pos/i7087.scala b/tests/pos/i7087.scala
@@ -6,7 +6,7 @@ type F[T] = T match {
   case G[a] => String
 }
 
-given extension {
+given {
   def (tup: T) g[T] given (Foo: F[T]) = ???
 }
 
diff --git a/tests/pos/implicit-scope.scala b/tests/pos/implicit-scope.scala
@@ -9,7 +9,7 @@ object A {
   type FlagSet = opaques.FlagSet
   def FlagSet(bits: Long): FlagSet = opaques.FlagSet(bits)
 
-  given extension {
+  given {
     def (xs: FlagSet) bits: Long = opaques.toBits(xs)
     def (xs: FlagSet) | (ys: FlagSet): FlagSet = FlagSet(xs.bits | ys.bits)
   }
diff --git a/tests/pos/mirror-implicit-scope.scala b/tests/pos/mirror-implicit-scope.scala
@@ -3,14 +3,14 @@ import scala.deriving._
 object Test {
   object K0 {
     type Generic[T] = Mirror { type Scope = K0.type ; type MirroredType = T ; type MirroredElemTypes }
-    given extension {
+    given {
       inline def (gen: Generic[T]) toRepr[T <: Product](t: T): gen.MirroredElemTypes = Tuple.fromProduct(t).asInstanceOf
     }
   }
 
   object K1 {
     type Generic[F[_]] = Mirror { type Scope = K1.type ; type MirroredType = F ; type MirroredElemTypes[_] }
-    given extension {
+    given {
       inline def (gen: Generic[F]) toRepr[F[_] <: Product, T](t: F[T]): gen.MirroredElemTypes[T] = Tuple.fromProduct(t).asInstanceOf
     }
   }
diff --git a/tests/pos/reference/delegates.scala b/tests/pos/reference/delegates.scala
@@ -48,14 +48,14 @@ object Instances extends Common {
     }
   }
 
-  given stringOps: extension {
+  given stringOps: {
     def (xs: Seq[String]) longestStrings: Seq[String] = {
       val maxLength = xs.map(_.length).max
       xs.filter(_.length == maxLength)
     }
   }
 
-  given extension {
+  given {
     def (xs: List[T]) second[T] = xs.tail.head
   }
 
@@ -152,14 +152,14 @@ object Instances extends Common {
 object PostConditions {
   opaque type WrappedResult[T] = T
 
-  private given WrappedResult: extension {
+  private given WrappedResult: {
     def apply[T](x: T): WrappedResult[T] = x
     def (x: WrappedResult[T]) unwrap[T]: T = x
   }
 
   def result[T] given (wrapped: WrappedResult[T]): T = wrapped.unwrap
 
-  given extension {
+  given {
     def (x: T) ensuring[T] (condition: given WrappedResult[T] => Boolean): T = {
       assert(condition given WrappedResult(x))
       x
@@ -184,14 +184,14 @@ object AnonymousInstances extends Common {
     }
   }
 
-  given extension {
+  given {
     def (xs: Seq[String]) longestStrings: Seq[String] = {
       val maxLength = xs.map(_.length).max
       xs.filter(_.length == maxLength)
     }
   }
 
-  given extension {
+  given {
     def (xs: List[T]) second[T] = xs.tail.head
   }
 
diff --git a/tests/pos/reference/opaque.scala b/tests/pos/reference/opaque.scala
@@ -12,7 +12,7 @@ object Logarithms {
   }
 
   // Extension methods define opaque types' public APIs
-  given extension {
+  given {
     def (x: Logarithm) toDouble: Double = math.exp(x)
     def (x: Logarithm) + (y: Logarithm): Logarithm = Logarithm(math.exp(x) + math.exp(y))
     def (x: Logarithm) * (y: Logarithm): Logarithm = Logarithm(x + y)
diff --git a/tests/run/extmethod-overload.scala b/tests/run/extmethod-overload.scala
@@ -22,7 +22,7 @@ object Test extends App {
   // Test with extension methods in given object
   object test1 {
 
-    given Foo: extension {
+    given Foo: {
       def (x: Int) |+| (y: Int) = x + y
       def (x: Int) |+| (y: String) = x + y.length
 
@@ -97,7 +97,7 @@ object Test extends App {
     def (x: Int) yy (y: Int) = x + y
   }
 
-  given extension {
+  given {
     def (x: Int) yy (y: Int) = x - y
   }
 
diff --git a/tests/run/i6902.scala b/tests/run/i6902.scala
@@ -1,6 +1,6 @@
 object Test {
   given [A] { def (a: A) <<< : A = a }
-  given extension { def (b: Int) <<<< : Int = b }
+  given { def (b: Int) <<<< : Int = b }
 
   def main(args: Array[String]): Unit = {
     1.<<<
diff --git a/tests/run/instances-anonymous.scala b/tests/run/instances-anonymous.scala
@@ -8,15 +8,15 @@ object Test extends App {
 
   case class Circle(x: Double, y: Double, radius: Double)
 
-  given extension {
+  given {
     def (c: Circle) circumference: Double = c.radius * math.Pi * 2
   }
 
   val circle = new Circle(1, 1, 2.0)
 
   println(circle.circumference)
 
-  given extension {
+  given {
     def (xs: Seq[String]) longestStrings: Seq[String] = {
       val maxLength = xs.map(_.length).max
       xs.filter(_.length == maxLength)
@@ -25,13 +25,13 @@ object Test extends App {
   val names = List("hi", "hello", "world")
   assert(names.longestStrings == List("hello", "world"))
 
-  given extension {
+  given {
     def (xs: Seq[T]) second[T] = xs.tail.head
   }
 
   assert(names.longestStrings.second == "world")
 
-  given extension {
+  given {
     def (xs: List[List[T]]) flattened[T] = xs.foldLeft[List[T]](Nil)(_ ++ _)
   }
 
diff --git a/tests/run/instances.scala b/tests/run/instances.scala
@@ -8,15 +8,15 @@ object Test extends App {
 
   case class Circle(x: Double, y: Double, radius: Double)
 
-  given circleOps: extension {
+  given circleOps: {
     def (c: Circle) circumference: Double = c.radius * math.Pi * 2
   }
 
   val circle = new Circle(1, 1, 2.0)
 
   assert(circle.circumference == circleOps.circumference(circle))
 
-  given stringOps: extension {
+  given stringOps: {
     def (xs: Seq[String]) longestStrings: Seq[String] = {
       val maxLength = xs.map(_.length).max
       xs.filter(_.length == maxLength)
@@ -25,18 +25,18 @@ object Test extends App {
   val names = List("hi", "hello", "world")
   assert(names.longestStrings == List("hello", "world"))
 
-  given seqOps: extension {
+  given seqOps: {
     def (xs: Seq[T]) second[T] = xs.tail.head
   }
 
   assert(names.longestStrings.second == "world")
 
-  given listListOps: extension {
+  given listListOps: {
     def (xs: List[List[T]]) flattened[T] = xs.foldLeft[List[T]](Nil)(_ ++ _)
   }
 
   // A right associative op
-  given prepend: extension {
+  given prepend: {
     def (x: T) ::[T] (xs: Seq[T]) = x +: xs
   }
   val ss: Seq[Int] = List(1, 2, 3)

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ Anonymous given instances that define extension methods without also implementin`
`63`	`63`	`get their name from the name of the first extension method and the toplevel type`
`64`	`64`	`constructor of its first parameter. For example, the given extension`
`65`	`65`	```scala
`66`		`- given extension {`
	`66`	`+ given {`
`67`	`67`	`def (xs: List[T]) second[T] = ...`
`68`	`68`	`}`
`69`	`69`	```
Original file line number	Diff line number	Diff line change
@@ -251,7 +251,7 @@ The `toExpr` extension method is defined in package `quoted`:
`251`	`251`	```scala
`252`	`252`	`package quoted`
`253`	`253`
`254`		`- given extension {`
	`254`	`+ given {`
`255`	`255`	`def (x: T) toExpr[T: Liftable] given QuoteContext: Expr[T] = summon[Liftable[T]].toExpr(x)`
`256`	`256`	`...`
`257`	`257`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ object Logarithms {`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`// Extension methods define opaque types' public APIs`
`23`		`- given logarithmOps: extension {`
	`23`	`+ given logarithmOps: {`
`24`	`24`	`def (x: Logarithm) toDouble: Double = math.exp(x)`
`25`	`25`	`def (x: Logarithm) + (y: Logarithm): Logarithm = Logarithm(math.exp(x) + math.exp(y))`
`26`	`26`	`def (x: Logarithm) * (y: Logarithm): Logarithm = Logarithm(x + y)`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ object opaques {`
`8`	`8`	`opaque type IArray[+T] = Array[_ <: T]`
`9`	`9`
`10`	`10`	`/** Defines extension methods for immutable arrays */`
`11`		`- given arrayOps: extension {`
	`11`	`+ given arrayOps: {`
`12`	`12`
`13`	`13`	`/** The selection operation on an immutable array.`
`14`	`14`	`*`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`object Test {`
`2`		`- given A: extension {`
	`2`	`+ given A: {`
`3`	`3`	`def (x: Int) \|+\| (y: Int) = x + y`
`4`	`4`	`}`
`5`		`- given B: extension {`
	`5`	`+ given B: {`
`6`	`6`	`def (x: Int) \|+\| (y: String) = x + y.length`
`7`	`7`	`}`
`8`	`8`	`assert((1 \|+\| 2) == 3) // error ambiguous`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ object Library {`
`11`	`11`	`def toInt(n: Nat): Int = n`
`12`	`12`
`13`	`13`	`}`
`14`		`- given extension {`
	`14`	`+ given {`
`15`	`15`	`def (x: Nat) * (y: Nat): Nat = x * y`
`16`	`16`	`def (x: Nat) toInt: Int = x`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ object Test {`
`2`	`2`
`3`	`3`	`type Foo`
`4`	`4`
`5`		`- given extension {`
	`5`	`+ given {`
`6`	`6`	`def (y: Any) g given Foo: Any = ???`
`7`	`7`	`}`
`8`	`8`