Address comments

Author: biboudis

compiler/src/dotty/tools/dotc/parsing/Parsers.scala

@@ -1279,7 +1279,12 @@ object Parsers {
 
     def expr(location: Location.Value): Tree = {
       val start = in.offset
-      if(in.token == IMPLIED) {
+      // if (closureMods.contains(in.token)) {
+      //   val imods = modifiers(closureMods)
+      //   if (in.token == MATCH) implicitMatch(start, imods)
+      //   else implicitClosure(start, location, imods)
+      // }
+      if(in.token == IMPLIED || in.token == IMPLICIT) {
         val span = in.offset
         in.nextToken()
         if (in.token == MATCH)
@@ -1292,7 +1297,8 @@ object Parsers {
       else if (closureMods.contains(in.token)) {
         val imods = modifiers(closureMods)
         implicitClosure(start, location, imods)
-      } else {
+      }
+      else {
         val saved = placeholderParams
         placeholderParams = Nil
 
@@ -1472,7 +1478,7 @@ object Parsers {
         case _ =>
       }
       imods.mods match {
-        case Mod.Implied() :: mods => markFirstIllegal(mods)
+        case (Mod.Implicit() | Mod.Implied()) :: mods => markFirstIllegal(mods)
         case mods => markFirstIllegal(mods)
       }
       val result @ Match(t, cases) =
@@ -2008,7 +2014,6 @@ object Parsers {
       case ABSTRACT    => Mod.Abstract()
       case FINAL       => Mod.Final()
       case IMPLICIT    => Mod.Implicit()
-      case IMPLIED     => Mod.Implied()
       case GIVEN       => Mod.Given()
       case ERASED      => Mod.Erased()
       case LAZY        => Mod.Lazy()
@@ -3094,7 +3099,7 @@ object Parsers {
         else if (isDefIntro(localModifierTokens))
           if (closureMods.contains(in.token)) {
             val start = in.offset
-            var imods = modifiers(closureMods + IMPLIED)
+            var imods = modifiers(closureMods)
             if (isBindingIntro)
               stats += implicitClosure(start, Location.InBlock, imods)
             else if (in.token == MATCH)

library/src-non-bootstrapped/dotty/DottyPredef.scala renamed to library/src-3.x/dotty/DottyPredef.scala

@@ -2,12 +2,12 @@ object Test extends App {
   import collection.immutable.TreeSet
   import collection.immutable.HashSet
 
-  inline def f1[T]() = implied match {
+  inline def f1[T]() = implicit match {
     case ord: Ordering[T] => new TreeSet[T]
     case _ => new HashSet[T]
   }
 
-  inline def f2[T]() = implied match {
+  inline def f2[T]() = implicit match {
     case _: Ordering[T] => new TreeSet[T]
     case _ => new HashSet[T]
   }
@@ -16,7 +16,7 @@ object Test extends App {
   class B
   implicit val b: B = new B
 
-  inline def g = implied match {
+  inline def g = implicit match {
     case _: A => println("A")
     case _: B => println("B")
   }

library/src-bootstrapped/dotty/DottyPredef.scala

@@ -0,0 +1,33 @@
+object Test extends App {
+  import collection.immutable.TreeSet
+  import collection.immutable.HashSet
+
+  inline def f1[T]() = implied match {
+    case ord: Ordering[T] => new TreeSet[T]
+    case _ => new HashSet[T]
+  }
+
+  inline def f2[T]() = implied match {
+    case _: Ordering[T] => new TreeSet[T]
+    case _ => new HashSet[T]
+  }
+
+  class A
+  class B
+  implicit val b: B = new B
+
+  inline def g = implied match {
+    case _: A => println("A")
+    case _: B => println("B")
+  }
+
+  implicitly[Ordering[String]]
+
+  println(f1[String]().getClass)
+  println(f1[AnyRef]().getClass)
+  println(f2[String]().getClass)
+  println(f2[AnyRef]().getClass)
+  implicitly[B]
+  g
+
+}