Merge pull request #103 from xuwei-k/scala-3

Scala 3
onion-lang · Jan 11, 2025 · 8141f7a · 8141f7a
2 parents 220a775 + 04c6bae
commit 8141f7a
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 18 deletions.
diff --git a/build.sbt b/build.sbt
@@ -71,18 +71,14 @@ def javacc(classpath: Classpath, output: File, log: Logger): Seq[File] = {
 
 lazy val onionSettings = Seq(
   version := "0.2.0-SNAPSHOT",
-  scalaVersion := "2.13.15",
+  scalaVersion := "3.6.2",
   name := "onion",
   organization := "org.onion_lang",
   Compile / unmanagedSourceDirectories  := {
     (Seq((Compile / javaSource).value) ++ Seq((Compile / scalaSource).value) ++ Seq((Compile / sourceManaged).value))
   },
   scalacOptions ++= Seq("-encoding", "utf8", "-unchecked", "-deprecation", "-feature", "-language:implicitConversions", "-language:existentials"),
   javacOptions ++= Seq("-sourcepath", "src.lib", "-Xlint:unchecked", "-source", "21"),
-  libraryDependencies += {
-    val version = scalaVersion.value
-    "org.scala-lang" % "scala-compiler" % version
-  },
   libraryDependencies ++= Seq(
     "org.apache.bcel" % "bcel" % "6.0",
     "org.ow2.asm" % "asm" % "5.0.2",

diff --git a/src/main/scala/onion/compiler/CodeGeneration.scala b/src/main/scala/onion/compiler/CodeGeneration.scala
@@ -35,13 +35,13 @@ object CodeGeneration {
 
   private def toJavaModifier(src: Int): Int = {
     var modifier: Int = 0
-    modifier |= (if (Modifier.isPrivate(src)) Constants.ACC_PRIVATE else modifier)
-    modifier |= (if (Modifier.isProtected(src)) Constants.ACC_PROTECTED else modifier)
-    modifier |= (if (Modifier.isPublic(src)) Constants.ACC_PUBLIC else modifier)
-    modifier |= (if (Modifier.isStatic(src)) Constants.ACC_STATIC else modifier)
-    modifier |= (if (Modifier.isSynchronized(src)) Constants.ACC_SYNCHRONIZED else modifier)
-    modifier |= (if (Modifier.isAbstract(src)) Constants.ACC_ABSTRACT else modifier)
-    modifier |= (if (Modifier.isFinal(src)) Constants.ACC_FINAL else modifier)
+    modifier |= (if (Modifier.isPrivate(src)) (Constants.ACC_PRIVATE: Int) else modifier)
+    modifier |= (if (Modifier.isProtected(src)) (Constants.ACC_PROTECTED: Int) else modifier)
+    modifier |= (if (Modifier.isPublic(src)) (Constants.ACC_PUBLIC: Int) else modifier)
+    modifier |= (if (Modifier.isStatic(src)) (Constants.ACC_STATIC: Int) else modifier)
+    modifier |= (if (Modifier.isSynchronized(src)) (Constants.ACC_SYNCHRONIZED: Int) else modifier)
+    modifier |= (if (Modifier.isAbstract(src)) (Constants.ACC_ABSTRACT: Int) else modifier)
+    modifier |= (if (Modifier.isFinal(src)) (Constants.ACC_FINAL: Int) else modifier)
     modifier
   }
 
@@ -335,8 +335,8 @@ class CodeGeneration(config: CompilerConfig) {
 
   private def classModifier(node: IRT.ClassDefinition): Int = {
     var modifier: Int = toJavaModifier(node.modifier)
-    modifier |= (if (node.isInterface) Constants.ACC_INTERFACE else modifier)
-    modifier |= (if ((!Modifier.isInternal(modifier))) Constants.ACC_PUBLIC else modifier)
+    modifier |= (if (node.isInterface) (Constants.ACC_INTERFACE: Int) else modifier)
+    modifier |= (if ((!Modifier.isInternal(modifier))) (Constants.ACC_PUBLIC: Int) else modifier)
     modifier
   }
 

diff --git a/src/main/scala/onion/compiler/OnionTypeConversion.scala b/src/main/scala/onion/compiler/OnionTypeConversion.scala
@@ -61,10 +61,11 @@ class OnionTypeConversion(table: ClassTable) {
     if (klass.isArray) {
       var dimension: Int = 0
       var component: Class[_] = null
-      do {
+      while({
         dimension += 1
         component = component.getComponentType
-      } while (component.getComponentType != null)
+        (component.getComponentType != null)
+      })()
       val componentType: IRT.Type = toOnionType(component)
       return table.loadArray(componentType, dimension)
     }

diff --git a/src/main/scala/onion/compiler/toolbox/Boxing.scala b/src/main/scala/onion/compiler/toolbox/Boxing.scala
@@ -15,7 +15,16 @@ import onion.compiler.ClassTable
  *
  */
 object Boxing {
-  private final val TABLE: Array[Array[AnyRef]] = Array(Array(IRT.BasicType.BOOLEAN, "java.lang.Boolean"), Array(IRT.BasicType.BYTE, "java.lang.Byte"), Array(IRT.BasicType.SHORT, "java.lang.Short"), Array(IRT.BasicType.CHAR, "java.lang.Character"), Array(IRT.BasicType.INT, "java.lang.Integer"), Array(IRT.BasicType.LONG, "java.lang.Long"), Array(IRT.BasicType.FLOAT, "java.lang.Float"), Array(IRT.BasicType.DOUBLE, "java.lang.Double"))
+  private final val TABLE: Array[Array[AnyRef]] = Array(
+    Array[AnyRef](IRT.BasicType.BOOLEAN, "java.lang.Boolean"),
+    Array[AnyRef](IRT.BasicType.BYTE, "java.lang.Byte"),
+    Array[AnyRef](IRT.BasicType.SHORT, "java.lang.Short"),
+    Array[AnyRef](IRT.BasicType.CHAR, "java.lang.Character"),
+    Array[AnyRef](IRT.BasicType.INT, "java.lang.Integer"),
+    Array[AnyRef](IRT.BasicType.LONG, "java.lang.Long"),
+    Array[AnyRef](IRT.BasicType.FLOAT, "java.lang.Float"),
+    Array[AnyRef](IRT.BasicType.DOUBLE, "java.lang.Double")
+  )
 
   private def boxedType(table: ClassTable, `type`: IRT.BasicType): IRT.ClassType = {
     for (row <- TABLE) {

diff --git a/src/main/scala/onion/tools/Shell.scala b/src/main/scala/onion/tools/Shell.scala
@@ -41,7 +41,7 @@ class Shell (val classLoader: ClassLoader, val classpath: Seq[String]) {
 
   private def findFirstMainMethod(loader: OnionClassLoader, classes: Seq[CompiledClass]): Option[Method] = {
     for (i <- 0 until classes.length) {
-      val className = classes(i).getClassName()
+      val className = classes(i).className
       val clazz = Class.forName(className, true, loader)
       try {
         val main = clazz.getMethod("main", classOf[Array[String]])