Merge pull request #26 from edin-dal/emilien/scala3

Bump to Scala 3
edin-dal · Oct 28, 2024 · e4ae1d2 · e4ae1d2
2 parents 8843c37 + 7cfa00b
commit e4ae1d2
Show file tree

Hide file tree

Showing 6 changed files with 113 additions and 113 deletions.
diff --git a/build.sbt b/build.sbt
@@ -1,10 +1,10 @@
-scalaVersion := "2.13.14"
+scalaVersion := "3.3.3"
 
 name := "struct-tensor"
 organization := "uk.ac.ed.dal"
 version := "0.1"
 
-libraryDependencies += "org.scala-lang.modules" %% "scala-parser-combinators" % "1.1.2"
+libraryDependencies += "org.scala-lang.modules" %% "scala-parser-combinators" % "2.0.0"
 libraryDependencies += "com.lihaoyi" %% "fastparse" % "3.0.2"
 libraryDependencies += "com.github.scopt" %% "scopt" % "4.1.0"
 libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.11" % Test

diff --git a/src/main/scala/uk/ac/ed/dal/structtensor/Main.scala b/src/main/scala/uk/ac/ed/dal/structtensor/Main.scala
@@ -10,7 +10,8 @@ import codegen._
 import java.io.File
 import scopt.OParser
 
-object Main extends App {
+object Main {
+  def main(args: Array[String]) = {
   import Optimizer._
   import Utils._
 
@@ -201,7 +202,7 @@ object Main extends App {
             val rcRule = Rule(
               ccRule.head,
               SoPTimesSoP(
-                SoP(Seq(Prod(Seq(ccRule.head.vars2RedundancyVars)))),
+                SoP(Seq(Prod(Seq(ccRule.head.vars2RedundancyVars())))),
                 rmRule.body
               )
             )
@@ -331,3 +332,4 @@ object Main extends App {
     }
   }
 }
+}
diff --git a/src/main/scala/uk/ac/ed/dal/structtensor/codegen/Codegen.scala b/src/main/scala/uk/ac/ed/dal/structtensor/codegen/Codegen.scala
@@ -25,7 +25,6 @@ object Codegen {
           case c: ConstantDouble => c.value.toString
           case a @ Arithmetic(op, i1, i2) =>
             s"(${CPPFormat(i1)} ${op} ${CPPFormat(i2)})"
-          case _ => ""
         }
       case a: Access =>
         if (a.vars.isEmpty) CPPFormat(a.name)
@@ -81,7 +80,6 @@ object Codegen {
           }
           case _ => None
         }
-      case _ => None
     }
     val (begin, end, equals, usedIndices) = (
       begin_end_equals_usedIndices.map(_._1),