diff --git a/src/main/g8/build.sbt b/src/main/g8/build.sbt index d48f6c3..5ede339 100644 --- a/src/main/g8/build.sbt +++ b/src/main/g8/build.sbt @@ -1,4 +1,4 @@ -val scala3Version = "3.0.0-M3" +val scala3Version = "3.0.0-RC1" lazy val lib = project .in(file("lib")) diff --git a/src/main/g8/inspector/src/main/scala/inspector/Inspector.scala b/src/main/g8/inspector/src/main/scala/inspector/Inspector.scala index 8686427..ec1b447 100644 --- a/src/main/g8/inspector/src/main/scala/inspector/Inspector.scala +++ b/src/main/g8/inspector/src/main/scala/inspector/Inspector.scala @@ -3,21 +3,22 @@ package inspector import scala.quoted._ -import scala.tasty.inspector.TastyInspector +import scala.tasty.inspector._ object Inspector { def showCodeOf(tastyFile: String): String = { var tastyStr: String = null - val inspector = new TastyInspector { - protected def processCompilationUnit(using Quotes)(root: quotes.reflect.Tree): Unit = { + val inspector = new Inspector { + def inspect(using Quotes)(tastys: List[Tasty[quotes.type]]): Unit = { import quotes.reflect._ - val projectDir = new java.io.File( "." ).getCanonicalPath() + java.io.File.separator // To cleanup the paths in @SourceFile - tastyStr = root.show.replace(projectDir, "") + for tasty <- tastys do + val projectDir = new java.io.File( "." ).getCanonicalPath() + java.io.File.separator // To cleanup the paths in @SourceFile + tastyStr = tasty.ast.show.replace(projectDir, "") } } - inspector.inspectTastyFiles(List(tastyFile)) + TastyInspector.inspectTastyFiles(List(tastyFile))(inspector) tastyStr } - + } diff --git a/src/main/g8/inspector/src/main/scala/inspector/Main.scala b/src/main/g8/inspector/src/main/scala/inspector/Main.scala index b48b3b8..e7508f3 100644 --- a/src/main/g8/inspector/src/main/scala/inspector/Main.scala +++ b/src/main/g8/inspector/src/main/scala/inspector/Main.scala @@ -2,7 +2,7 @@ package inspector import scala.quoted._ -@main def run = - val tastyFile = "lib/target/scala-3.0.0-M3/classes/lib/Greetings.tasty" +@main def run = + val tastyFile = "lib/target/scala-3.0.0-RC1/classes/lib/Greetings.tasty" val tastyContents = Inspector.showCodeOf(tastyFile) println(tastyContents) diff --git a/src/main/g8/inspector/src/test/scala/inspector/Test.scala b/src/main/g8/inspector/src/test/scala/inspector/Test.scala index 95e668a..c2f009b 100644 --- a/src/main/g8/inspector/src/test/scala/inspector/Test.scala +++ b/src/main/g8/inspector/src/test/scala/inspector/Test.scala @@ -13,8 +13,8 @@ class InspectorTest { | @scala.annotation.internal.SourceFile("lib/src/main/scala/lib/Greetings.scala") object Greetings { | def hello(name: scala.Predef.String): scala.Predef.String = "Hello ".+(name) | } - |}""".stripMargin, - Inspector.showCodeOf("lib/target/scala-3.0.0-M3/classes/lib/Greetings.tasty") + |}""".stripMargin, + Inspector.showCodeOf("lib/target/scala-3.0.0-RC1/classes/lib/Greetings.tasty") ) }