Merge pull request #8270 from dotty-staging/change-given-using-2

Drop given parameter syntax

Author: nicolasstucki

community-build/community-projects/effpi

@@ -47,7 +47,7 @@ sealed trait CommunityProject:
   /** Is this project running in the test or update mode in the
    *  context of the given suite? @see `run` for more details.
    */
-  final def isUpdateMode(given suite: CommunityBuildTest) =
+  final def isUpdateMode(using suite: CommunityBuildTest) =
     suite.isInstanceOf[CommunityBuildUpdate]
 
   /** Depending on the mode of operation, either
@@ -60,7 +60,7 @@ sealed trait CommunityProject:
    *  and avoid network overhead. See https://github.com/lampepfl/dotty-drone
    *  for more infrastructural details.
    */
-  final def run()(given suite: CommunityBuildTest) =
+  final def run()(using suite: CommunityBuildTest) =
     val runCmd = if isUpdateMode then updateCommand else testCommand
     if !isUpdateMode then dependencies.foreach(_.publish())
     suite.test(project, binaryName, runCommandsArgs :+ runCmd)

community-build/community-projects/intent

@@ -22,7 +22,7 @@ object Flags {
 
   type Flag = opaques.Flag
 
-  given extension (x: FlagSet) with
+  extension on (x: FlagSet) {
 
     def bits: Long = opaques.toBits(x)
 
@@ -150,7 +150,7 @@ object Flags {
 
     /** The string representation of the given flag set */
     def flagsString: String = x.flagStrings("").mkString(" ")
-  end given
+  }
 
   def termFlagSet(x: Long) = FlagSet(TERMS | x)
 

community-build/community-projects/shapeless

@@ -917,7 +917,7 @@ object Parsers {
     def followingIsParamOrGivenType() =
       val lookahead = in.LookaheadScanner()
       lookahead.nextToken()
-      if startParamOrGivenTypeTokens.contains(lookahead.token)
+      if startParamTokens.contains(lookahead.token)
          || lookahead.isIdent(nme.using)
       then true
       else if lookahead.token == IDENTIFIER then
@@ -1450,8 +1450,6 @@ object Parsers {
         case MATCH => matchType(t)
         case FORSOME => syntaxError(ExistentialTypesNoLongerSupported()); t
         case _ =>
-          if (imods.isOneOf(GivenOrImplicit) && !t.isInstanceOf[FunctionWithMods])
-            syntaxError(ImplicitTypesCanOnlyBeFunctionTypes(), implicitKwPos(start))
           if (imods.is(Erased) && !t.isInstanceOf[FunctionWithMods])
             syntaxError(ErasedTypesCanOnlyBeFunctionTypes(), implicitKwPos(start))
           t
@@ -2299,7 +2297,7 @@ object Parsers {
     def parArgumentExprs(): (List[Tree], Boolean) = inParens {
       if in.token == RPAREN then
         (Nil, false)
-      else if in.token == GIVEN || isIdent(nme.using) then
+      else if isIdent(nme.using) then
         in.nextToken()
         (commaSeparated(argumentExpr), true)
       else
@@ -2786,7 +2784,7 @@ object Parsers {
       normalize(loop(start))
     }
 
-    val funTypeArgMods: BitSet = BitSet(GIVEN, ERASED)
+    val funTypeArgMods: BitSet = BitSet(ERASED)
 
     /** Wrap annotation or constructor in New(...).<init> */
     def wrapNew(tpt: Tree): Select = Select(New(tpt), nme.CONSTRUCTOR)
@@ -2912,7 +2910,7 @@ object Parsers {
       def paramMods() =
         if in.token == IMPLICIT then addParamMod(() => Mod.Implicit())
         else
-          if in.token == GIVEN || isIdent(nme.using) then addParamMod(() => Mod.Given())
+          if isIdent(nme.using) then addParamMod(() => Mod.Given())
           if in.token == ERASED then addParamMod(() => Mod.Erased())
 
       def param(): ValDef = {
@@ -3508,70 +3506,54 @@ object Parsers {
       var mods1 = addMod(mods, instanceMod)
       val hasGivenSig = followingIsGivenSig()
       val nameStart = in.offset
-      val (name, isOldExtension) =
-        if isIdent && hasGivenSig then
-          (ident(), in.token == COLON && in.lookaheadIn(nme.extension))
-        else
-          (EmptyTermName, isIdent(nme.extension))
+      val name = if isIdent && hasGivenSig then ident() else EmptyTermName
 
       val gdef = in.endMarkerScope(if name.isEmpty then GIVEN else name) {
-        if isOldExtension then
-          if (in.token == COLON) in.nextToken()
-          assert(ident() == nme.extension)
-          val tparams = typeParamClauseOpt(ParamOwner.Def)
-          val extParams = paramClause(0, prefix = true)
-          val givenParamss = paramClauses(givenOnly = true)
-          possibleTemplateStart()
-          val templ = templateBodyOpt(
-            makeConstructor(tparams, extParams :: givenParamss), Nil, Nil)
-          templ.body.foreach(checkExtensionMethod(tparams, _))
-          ModuleDef(name, templ)
-        else
-          val hasLabel = !name.isEmpty && in.token == COLON || isIdent(nme.as)
-          if hasLabel then in.nextToken()
-          val tparams = typeParamClauseOpt(ParamOwner.Def)
-          val paramsStart = in.offset
-          val vparamss =
-            if in.token == LPAREN && followingIsParamOrGivenType()
-            then paramClauses()
-            else Nil
-          def checkAllGivens(vparamss: List[List[ValDef]], what: String) =
-            vparamss.foreach(_.foreach(vparam =>
-              if !vparam.mods.is(Given) then syntaxError(em"$what must be preceded by `using`", vparam.span)))
-          checkAllGivens(vparamss, "parameter of given instance")
-          val parents =
-            if in.token == SUBTYPE && !hasLabel then
-              if !mods.is(Inline) then
-                syntaxError("`<:` is only allowed for given with `inline` modifier")
+        val hasLabel = !name.isEmpty && in.token == COLON || isIdent(nme.as)
+        if hasLabel then in.nextToken()
+        val tparams = typeParamClauseOpt(ParamOwner.Def)
+        val paramsStart = in.offset
+        val vparamss =
+          if in.token == LPAREN && followingIsParamOrGivenType()
+          then paramClauses()
+          else Nil
+        def checkAllGivens(vparamss: List[List[ValDef]], what: String) =
+          vparamss.foreach(_.foreach(vparam =>
+            if !vparam.mods.is(Given) then syntaxError(em"$what must be preceded by `using`", vparam.span)))
+        checkAllGivens(vparamss, "parameter of given instance")
+        val parents =
+          if in.token == SUBTYPE && !hasLabel then
+            if !mods.is(Inline) then
+              syntaxError("`<:` is only allowed for given with `inline` modifier")
+            in.nextToken()
+            TypeBoundsTree(EmptyTree, toplevelTyp()) :: Nil
+          else
+            if !hasLabel && !(name.isEmpty && tparams.isEmpty && vparamss.isEmpty) then
+              if in.token == COLON then in.nextToken()
+              else accept(nme.as)
+            if in.token == USCORE then
               in.nextToken()
+              accept(SUBTYPE)
               TypeBoundsTree(EmptyTree, toplevelTyp()) :: Nil
             else
-              if !hasLabel && !(name.isEmpty && tparams.isEmpty && vparamss.isEmpty) then
-                if in.token == COLON then in.nextToken()
-                else accept(nme.as)
-              if in.token == USCORE then
-                in.nextToken()
-                accept(SUBTYPE)
-                TypeBoundsTree(EmptyTree, toplevelTyp()) :: Nil
-              else
-                constrApps(commaOK = true, templateCanFollow = true)
+              constrApps(commaOK = true, templateCanFollow = true)
 
-          if in.token == EQUALS && parents.length == 1 && parents.head.isType then
-            in.nextToken()
-            mods1 |= Final
-            DefDef(name, tparams, vparamss, parents.head, subExpr())
-          else
-            parents match
-              case (_: TypeBoundsTree) :: _ => syntaxError("`=` expected")
-              case _ =>
-            possibleTemplateStart()
-            val tparams1 = tparams.map(tparam => tparam.withMods(tparam.mods | PrivateLocal))
-            val vparamss1 = vparamss.map(_.map(vparam =>
-              vparam.withMods(vparam.mods &~ Param | ParamAccessor | PrivateLocal)))
-            val templ = templateBodyOpt(makeConstructor(tparams1, vparamss1), parents, Nil)
-            if tparams.isEmpty && vparamss.isEmpty then ModuleDef(name, templ)
-            else TypeDef(name.toTypeName, templ)
-        }
+        if in.token == EQUALS && parents.length == 1 && parents.head.isType then
+          in.nextToken()
+          mods1 |= Final
+          DefDef(name, tparams, vparamss, parents.head, subExpr())
+        else
+          parents match
+            case (_: TypeBoundsTree) :: _ => syntaxError("`=` expected")
+            case _ =>
+          possibleTemplateStart()
+          val tparams1 = tparams.map(tparam => tparam.withMods(tparam.mods | PrivateLocal))
+          val vparamss1 = vparamss.map(_.map(vparam =>
+            vparam.withMods(vparam.mods &~ Param | ParamAccessor | PrivateLocal)))
+          val templ = templateBodyOpt(makeConstructor(tparams1, vparamss1), parents, Nil)
+          if tparams.isEmpty && vparamss.isEmpty then ModuleDef(name, templ)
+          else TypeDef(name.toTypeName, templ)
+      }
       finalizeDef(gdef, mods1, start)
     }
 

community-build/community-projects/sourcecode

@@ -257,7 +257,7 @@ object Tokens extends TokensCommon {
     AT, CASE)
 
   final val canEndStatTokens: TokenSet = atomicExprTokens | BitSet(
-    TYPE, GIVEN, RPAREN, RBRACE, RBRACKET, OUTDENT)
+    TYPE, GIVEN, RPAREN, RBRACE, RBRACKET, OUTDENT) // TODO: remove GIVEN once old import syntax is dropped
 
   /** Tokens that stop a lookahead scan search for a `<-`, `then`, or `do`.
    *  Used for disambiguating between old and new syntax.
@@ -280,12 +280,6 @@ object Tokens extends TokensCommon {
    */
   final val startParamTokens: BitSet = modifierTokens | BitSet(VAL, VAR, AT)
 
-  /** Faced with the choice of a type `(...)` or a parameter or given type list
-   *  in `(...)`, the following tokens after the opening `(` determine it's
-   *  a parameter or given type list.
-   */
-  final val startParamOrGivenTypeTokens: BitSet = startParamTokens | BitSet(GIVEN, ERASED)
-
   final val scala3keywords = BitSet(ENUM, ERASED, GIVEN)
 
   final val softModifierNames = Set(nme.inline, nme.opaque, nme.open)