Merge pull request #107 from onion-lang/codex/bcel依存を完全に取り除く

Remove BCEL and migrate to ASM backend

Author: kmizu

README.md

@@ -10,7 +10,7 @@ using JavaCC.
 The compiler parses source code into an untyped AST and then performs type
 checking to produce a **typed AST**.  The old intermediate representation (IRT)
 has been folded into this typed tree.  Code generation now runs on the typed
-AST via a thin compatibility layer that still reuses the existing BCEL backend.
+AST using a new ASM-based backend.
 
 ## Tools
 

bin/onion

@@ -18,4 +18,5 @@ then
   exit
 fi
 
-$JAVA_HOME/bin/java -classpath $CLASSPATH:$ONION_HOME/onion.jar:$ONION_HOME/onion-library.jar:$ONION_HOME/lib/bcel.jar onion.tools.ScriptRunner $@
+$JAVA_HOME/bin/java -classpath $CLASSPATH:$ONION_HOME/onion.jar:$ONION_HOME/onion-library.jar onion.tools.ScriptRunner "$@"
+

bin/onion.bat

@@ -21,6 +21,6 @@ echo Please set the environment variable ONION_HOME
 goto END
 
 :START
-%JAVA_HOME%\bin\java -classpath %CLASSPATH%;%ONION_HOME%\onion.jar;%ONION_HOME%\lib\bcel.jar;%ONION_HOME%\onion-library.jar onion.tools.ScriptRunner %*
+%JAVA_HOME%\bin\java -classpath %CLASSPATH%;%ONION_HOME%\onion.jar;%ONION_HOME%\onion-library.jar onion.tools.ScriptRunner %*
 
-:END
+:END

build.sbt

@@ -80,7 +80,6 @@ lazy val onionSettings = Seq(
   scalacOptions ++= Seq("-encoding", "utf8", "-unchecked", "-deprecation", "-feature", "-language:implicitConversions", "-language:existentials"),
   javacOptions ++= Seq("-sourcepath", "src.lib", "-Xlint:unchecked", "-source", "21"),
   libraryDependencies ++= Seq(
-    "org.apache.bcel" % "bcel" % "6.0",
     "org.ow2.asm" % "asm" % "9.8",
     "org.ow2.asm" % "asm-tree" % "9.8",
     "org.ow2.asm" % "asm-commons" % "9.8",

src/main/resources/META-INF/Manifest.mf

@@ -1,2 +1,2 @@
 Main-Class: onion.tools.CompilerFrontend
-Class-Path: lib/bcel.jar lib/scala-compiler.jar lib/scala-library.jar lib/onion-library.jar
+Class-Path: lib/scala-compiler.jar lib/scala-library.jar lib/onion-library.jar

src/main/scala/onion/compiler/ClassTable.scala

@@ -1,70 +1,43 @@
-/* ************************************************************** *
- *                                                                *
- * Copyright (c) 2016-, Kota Mizushima, All rights reserved.  *
- *                                                                *
- *                                                                *
- * This software is distributed under the modified BSD License.   *
- * ************************************************************** */
 package onion.compiler
 
 import java.util.{HashMap => JHashMap}
-import onion.compiler.environment.BcelRefs.BcelClassType
 import onion.compiler.environment.AsmRefs.AsmClassType
 import onion.compiler.environment.ClassFileTable
 import onion.compiler.environment.ReflectionRefs.ReflectClassType
 
-/**
- * @author Kota Mizushima
- *
- */
-class ClassTable(classPath: String) {
+class ClassTable(classPath: String):
   val classes = new OrderedTable[IRT.ClassDefinition]
   private val classFiles = new JHashMap[String, IRT.ClassType]
   private val arrayClasses = new JHashMap[String, IRT.ArrayType]
   private val table = new ClassFileTable(classPath)
 
-  def loadArray(component: IRT.Type, dimension: Int): IRT.ArrayType = {
+  def loadArray(component: IRT.Type, dimension: Int): IRT.ArrayType =
     val arrayName = "[" * dimension + component.name
-    var array: IRT.ArrayType = arrayClasses.get(arrayName)
-    if (array != null) return array
-    array = new IRT.ArrayType(component, dimension, this)
+    var array = arrayClasses.get(arrayName)
+    if array != null then return array
+    array = IRT.ArrayType(component, dimension, this)
     arrayClasses.put(arrayName, array)
     array
-  }
 
-  def load(className: String): IRT.ClassType = {
-    var clazz: IRT.ClassType = lookup(className)
-    if (clazz == null) {
-      val javaClass = table.load(className)
-      if (javaClass != null) {
-        clazz = new BcelClassType(javaClass, this)
+  def load(className: String): IRT.ClassType =
+    var clazz = lookup(className)
+    if clazz == null then
+      val bytes = table.loadBytes(className)
+      if bytes != null then
+        clazz = new AsmClassType(bytes, this)
         classFiles.put(clazz.name, clazz)
-      } else {
-        val bytes = table.loadBytes(className)
-        if (bytes != null) {
-          clazz = new AsmClassType(bytes, this)
+      else
+        try
+          clazz = new ReflectClassType(Class.forName(className, true, Thread.currentThread.getContextClassLoader), this)
           classFiles.put(clazz.name, clazz)
-        } else {
-          try {
-            clazz = new ReflectClassType(Class.forName(className, true, Thread.currentThread.getContextClassLoader), this)
-            classFiles.put(clazz.name, clazz)
-          }
-          catch {
-            case e: ClassNotFoundException => {}
-          }
-        }
-      }
-    }
+        catch
+          case _: ClassNotFoundException => ()
     clazz
-  }
 
   def rootClass: IRT.ClassType = load("java.lang.Object")
 
-  def lookup(className: String): IRT.ClassType = {
-    classes.get(className) match {
+  def lookup(className: String): IRT.ClassType =
+    classes.get(className) match
       case Some(ref) => ref
       case None => classFiles.get(className)
-    }
-  }
 
-}