addopted to dotty 3.1.0, dotty-cps-async 0.9.4

Author: rssh

build.sbt

@@ -1,5 +1,5 @@
 //val dottyVersion = "3.0.0-RC2-bin-SNAPSHOT"
-val dottyVersion = "3.1.0-RC2"
+val dottyVersion = "3.1.0"
 //val dottyVersion = dottyLatestNightlyBuild.get
 
 ThisBuild/version := "2.1.1-SNAPSHOT"
@@ -10,7 +10,7 @@ val sharedSettings = Seq(
     scalaVersion := dottyVersion,
     name := "scala-gopher",
     resolvers += "Local Ivy Repository" at "file://"+Path.userHome.absolutePath+"/.ivy2/local",
-    libraryDependencies += "com.github.rssh" %%% "dotty-cps-async" % "0.9.3",
+    libraryDependencies += "com.github.rssh" %%% "dotty-cps-async" % "0.9.4",
     libraryDependencies += "org.scalameta" %%% "munit" % "0.7.27" % Test,
 )
 

jvm/src/main/scala/gopher/impl/GuardedSPSCBufferedChannel.scala

@@ -1,7 +1,7 @@
 package gopher.impl
 
-import cps._
-import gopher._
+import cps.*
+import gopher.*
 import java.util.concurrent.ExecutorService
 import java.util.concurrent.atomic.AtomicReferenceArray
 import java.util.concurrent.atomic.AtomicInteger

project/plugins.sbt

@@ -2,5 +2,5 @@ addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.2")
 addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.4.1")
 addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.3")
 addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject"      % "1.0.0")
-addSbtPlugin("org.scala-js" % "sbt-scalajs"      % "1.7.0")
-addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.0.0")
+addSbtPlugin("org.scala-js" % "sbt-scalajs"      % "1.7.1")
+addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.0.1")

shared/src/main/scala/gopher/SelectMacro.scala

@@ -6,6 +6,7 @@ import cps._
 import scala.quoted._
 import scala.compiletime._
 import scala.concurrent.duration._
+import scala.util.control.NonFatal
 
 
 
@@ -194,7 +195,13 @@ object SelectMacro:
       else
         reportError("Incorrect select pattern, expected or x:channel.{read,write} or Channel.{Read,Write}",chObj.asExpr)
 
-
+    def safeShow(t:Tree): String =
+      try 
+        t.show
+      catch
+        case NonFatal(ex) => 
+          ex.printStackTrace()
+          s"(exception durign show:${ex.getMessage()})"
 
     caseDef.pattern match 
       case Inlined(_,List(),body) => 
@@ -232,7 +239,7 @@ object SelectMacro:
                               "unapply"),targs),
                             impl,List(b@Bind(e,ePat),Bind(ch,chPat))) =>
             handleUnapply(chObj, nameReadOrWrite, b, e, ePat, ch)
-      case pat@Typed(Unapply(TypeApply(quotes.reflect.Select(
+      case pat@TypedOrTest(Unapply(TypeApply(quotes.reflect.Select(
                 quotes.reflect.Select(chobj,nameReadOrWrite),
                 "unapply"),targs),
               impl,List(b@Bind(e,ePat),Bind(ch,chPat))),a) =>
@@ -245,7 +252,7 @@ object SelectMacro:
                      v: channel.write if v == expr
                      v: Time.after if v == expr
               we have
-                    ${caseDef.pattern.show}
+                    ${safeShow(caseDef.pattern)}
                     (tree:  ${caseDef.pattern})
           """, caseDef.pattern.asExpr)
         reportError(s"unparsed caseDef pattern: ${caseDef.pattern}", caseDef.pattern.asExpr)