JVM backend

make.sh

@@ -142,6 +142,32 @@ run_js_web_test() {
   ./test/js/web/make.sh run-test-quiet $1
 }
 
+compile_and_run_jvm_test() {
+  set +e
+  binary=$(mktemp -d)
+  compile="./build/mi compile --to-jvm --test --output $binary"
+  output="$($compile $1 2>&1)"
+  exit_code=$?
+  if [ $exit_code -ne 0 ]
+  then
+    echo "ERROR: Java backend could not compile $1 \n" 
+    rm -r $binary
+  else
+    runscript=$(basename $1 | cut -d . -f1)
+    output="$output\n$(cd $binary && java -jar $runscript.jar)"
+    exit_code=$?
+    rm -r $binary
+    if [ $exit_code -ne 0 ]
+    then
+      echo "[JVM BACKEND] $1: $output FAIL\n"
+      echo $output
+    else 
+      echo "[JVM BACKEND] $1: $output OK"
+    fi 
+  fi
+  set -e
+}
+
 case $1 in
     boot)
         build_boot
@@ -167,6 +193,9 @@ case $1 in
     run-js-web-test)
         run_js_web_test "$2"
         ;;
+    compile-and-run-jvm-test)
+        compile_and_run_jvm_test "$2"
+        ;;
     lint)
         lint
         ;;

src/main/compile.mc

@@ -92,7 +92,7 @@ let compileWithUtests = lam options : Options. lam sourcePath. lam ast.
       printLn (expr2str ast) else ());
 
     let res =
-      if options.toJVM then compileMCoreToJVM ast else
+      if options.toJVM then compileMCoreToJVM ast sourcePath options else
       if options.toJavaScript then compileMCoreToJS
         { compileJSOptionsEmpty with
           targetPlatform = parseJSTarget options.jsTarget

stdlib/jvm/ast.mc

@@ -30,9 +30,11 @@ lang JVMAst
     | BInt {instr: String, nr: Int}
     | BFloat {instr: String, nr: Float}
     | BLong {instr: String, nr: Int}
+    | TryCatch {instr: String, try: [Bytecode], catch: [Bytecode]}
 
     syn Field =
     | Field {name: String, t: String}
+    | ConstantFieldInt {name: String, t: String, constant: Int}
 
     syn Function = 
     | Function {name: String, descriptor: String, bytecode: [Bytecode]}
@@ -97,6 +99,14 @@ lang JVMAst
     sem createField name =
     | t -> Field {name = name, t = t} 
 
+    sem createConstantFieldInt : String -> String -> Int -> Field
+    sem createConstantFieldInt name t = 
+    | const -> ConstantFieldInt {name = name, t = t, constant = const}
+
+    sem createTryCatch : [Bytecode] -> [Bytecode] -> Bytecode
+    sem createTryCatch try = 
+    | catch -> TryCatch {instr = "trycatch", try = try, catch = catch}
+
     -- toString JSON
 
     sem toStringProg : JVMProgram -> String 
@@ -117,7 +127,9 @@ lang JVMAst
     sem toStringField : Field -> String
     sem toStringField =
     | Field {name = name,  t = t} ->
-        (join ["{", "\"name\":", (stringify name), ",\"type\":", (stringify t), "}"])
+        (join ["{", "\"kind\":\"none\"", ",\"name\":", (stringify name), ",\"type\":", (stringify t), "}"])
+    | ConstantFieldInt {name = name, t = t, constant = constant} ->
+        (join ["{", "\"kind\":\"int\"", ",\"name\":", (stringify name), ",\"type\":", (stringify t), ",\"constant\":", int2string constant, "}"])
 
     sem toStringFunction : Function -> String
     sem toStringFunction =
@@ -138,5 +150,7 @@ lang JVMAst
         (join ["{", "\"type\":", "\"arg_long\"", ",\"instr\":", (stringify i), ",\"nr\":", (int2string nr), "}"])
     | BEmpty {instr = i} ->
         (join ["{", "\"type\":", "\"empty\"", ",\"instr\":", (stringify i), "}"])
+    | TryCatch {instr = i, try = t, catch = c} ->
+        (join ["{", "\"type\":", "\"trycatch\"", ",\"instr\":", (stringify i), ",\"try\":[", (commaSeparate (map toStringBytecode t)), "],\"catch\":[", (commaSeparate (map toStringBytecode c)), "]}"])
 
 end

stdlib/jvm/codegen/ClassWriterF.java

@@ -0,0 +1,26 @@
+package codegen;
+
+import org.objectweb.asm.ClassWriter;
+
+public class ClassWriterF extends ClassWriter {
+
+    public ClassWriterF(int flags) {
+        super(flags);
+    }
+
+    @Override
+    protected String getCommonSuperClass(final String type1, final String type2) {
+        try {
+            return super.getCommonSuperClass(type1, type2);
+        } catch (TypeNotPresentException e) {
+            if (type1 == type2) {
+                return type1;
+            } else if (type1.startsWith("pkg/") || type2.startsWith("pkg/")) {
+                return "java/lang/Object";
+            } else if (type1.startsWith("scala") || type2.startsWith("scala")) {
+                return "java/lang/Object";
+            }
+            throw new RuntimeException("Unknown superclass: " + type1 + " " + type2);
+        }
+    }
+}