Add Scala3 support

4 files changed, 45 insertions, 44 deletions

diff --git a/src/main/scala/firrtl/passes/memlib/CreateMemoryAnnotations.scala b/src/main/scala/firrtl/passes/memlib/CreateMemoryAnnotations.scala
index 240c2c9a..c2d7a6f1 100644
--- a/src/main/scala/firrtl/passes/memlib/CreateMemoryAnnotations.scala
+++ b/src/main/scala/firrtl/passes/memlib/CreateMemoryAnnotations.scala
@@ -22,8 +22,9 @@ class CreateMemoryAnnotations extends Transform with DependencyAPIMigration {
         Seq(MemLibOutConfigFileAnnotation(outputConfig, Nil)) ++ {
           if (inputFileName.isEmpty) None
           else if (new File(inputFileName).exists) {
-            import CustomYAMLProtocol._
-            Some(PinAnnotation(new YamlFileReader(inputFileName).parse[Config].map(_.pin.name)))
+            error("custom yaml protocol not supported in scala 3")
+            // import CustomYAMLProtocol._
+            // Some(PinAnnotation(new YamlFileReader(inputFileName).parse[Config].map(_.pin.name)))
           } else error("Input configuration file does not exist!")
         }
       case a => Seq(a)
diff --git a/src/main/scala/firrtl/passes/memlib/MemLibOptions.scala b/src/main/scala/firrtl/passes/memlib/MemLibOptions.scala
index 186ca78c..f19db4e5 100644
--- a/src/main/scala/firrtl/passes/memlib/MemLibOptions.scala
+++ b/src/main/scala/firrtl/passes/memlib/MemLibOptions.scala
@@ -7,7 +7,7 @@ import firrtl.options.{RegisteredLibrary, ShellOption}
 class MemLibOptions extends RegisteredLibrary {
   val name: String = "MemLib Options"
 
-  val options: Seq[ShellOption[_]] = Seq(new InferReadWrite, new ReplSeqMem)
+  val options: Seq[ShellOption[?]] = Seq(new InferReadWrite, new ReplSeqMem)
     .flatMap(_.options)
 
 }
diff --git a/src/main/scala/firrtl/passes/memlib/ResolveMaskGranularity.scala b/src/main/scala/firrtl/passes/memlib/ResolveMaskGranularity.scala
index 7a1a57fb..add05fe2 100644
--- a/src/main/scala/firrtl/passes/memlib/ResolveMaskGranularity.scala
+++ b/src/main/scala/firrtl/passes/memlib/ResolveMaskGranularity.scala
@@ -90,7 +90,7 @@ object ResolveMaskGranularity extends Pass {
     */
   def getMaskBits(connects: Connects, wen: Expression, wmask: Expression): Option[Int] = {
     val wenOrigin = getOrigin(connects)(wen)
-    val wmaskOrigin = connects.keys.filter(_.startsWith(wmask.serialize)).map { s: String => getOrigin(connects, s) }
+    val wmaskOrigin = connects.keys.filter(_.startsWith(wmask.serialize)).map { (s: String) => getOrigin(connects, s) }
     // all wmask bits are equal to wmode/wen or all wmask bits = 1(for redundancy checking)
     val redundantMask = wmaskOrigin.forall(x => weq(x, wenOrigin) || weq(x, one))
     if (redundantMask) None else Some(wmaskOrigin.size)
diff --git a/src/main/scala/firrtl/passes/memlib/YamlUtils.scala b/src/main/scala/firrtl/passes/memlib/YamlUtils.scala
index 99344973..fbb25656 100644
--- a/src/main/scala/firrtl/passes/memlib/YamlUtils.scala
+++ b/src/main/scala/firrtl/passes/memlib/YamlUtils.scala
@@ -1,45 +1,45 @@
-// SPDX-License-Identifier: Apache-2.0
+// // SPDX-License-Identifier: Apache-2.0
 
-package firrtl.passes
-package memlib
-import net.jcazevedo.moultingyaml._
-import java.io.{CharArrayWriter, File, PrintWriter}
-import firrtl.FileUtils
+// package firrtl.passes
+// package memlib
+// import net.jcazevedo.moultingyaml._
+// import java.io.{CharArrayWriter, File, PrintWriter}
+// import firrtl.FileUtils
 
-object CustomYAMLProtocol extends DefaultYamlProtocol {
-  // bottom depends on top
-  implicit val _pin = yamlFormat1(Pin)
-  implicit val _source = yamlFormat2(Source)
-  implicit val _top = yamlFormat1(Top)
-  implicit val _configs = yamlFormat3(Config)
-}
+// object CustomYAMLProtocol extends DefaultYamlProtocol {
+//   // bottom depends on top
+//   implicit val _pin = yamlFormat1(Pin)
+//   implicit val _source = yamlFormat2(Source)
+//   implicit val _top = yamlFormat1(Top)
+//   implicit val _configs = yamlFormat3(Config)
+// }
 
-case class Pin(name: String)
-case class Source(name: String, module: String)
-case class Top(name: String)
-case class Config(pin: Pin, source: Source, top: Top)
+// case class Pin(name: String)
+// case class Source(name: String, module: String)
+// case class Top(name: String)
+// case class Config(pin: Pin, source: Source, top: Top)
 
-class YamlFileReader(file: String) {
-  def parse[A](implicit reader: YamlReader[A]): Seq[A] = {
-    if (new File(file).exists) {
-      val yamlString = FileUtils.getText(file)
-      yamlString.parseYamls.flatMap(x =>
-        try Some(reader.read(x))
-        catch { case e: Exception => None }
-      )
-    } else sys.error("Yaml file doesn't exist!")
-  }
-}
+// class YamlFileReader(file: String) {
+//   def parse[A](implicit reader: YamlReader[A]): Seq[A] = {
+//     if (new File(file).exists) {
+//       val yamlString = FileUtils.getText(file)
+//       yamlString.parseYamls.flatMap(x =>
+//         try Some(reader.read(x))
+//         catch { case e: Exception => None }
+//       )
+//     } else sys.error("Yaml file doesn't exist!")
+//   }
+// }
 
-class YamlFileWriter(file: String) {
-  val outputBuffer = new CharArrayWriter
-  val separator = "--- \n"
-  def append(in: YamlValue): Unit = {
-    outputBuffer.append(s"$separator${in.prettyPrint}")
-  }
-  def dump(): Unit = {
-    val outputFile = new PrintWriter(file)
-    outputFile.write(outputBuffer.toString)
-    outputFile.close()
-  }
-}
+// class YamlFileWriter(file: String) {
+//   val outputBuffer = new CharArrayWriter
+//   val separator = "--- \n"
+//   def append(in: YamlValue): Unit = {
+//     outputBuffer.append(s"$separator${in.prettyPrint}")
+//   }
+//   def dump(): Unit = {
+//     val outputFile = new PrintWriter(file)
+//     outputFile.write(outputBuffer.toString)
+//     outputFile.close()
+//   }
+// }