Initial support for method and class export to Java #140

.github/workflows/install.yml

@@ -12,7 +12,7 @@ on:
 env:
   IDRIS2_TESTS_CG: jvm
   ACTIONS_ALLOW_UNSECURE_COMMANDS: true
-  PREVIOUS_VERSION: 0.6.0
+  PREVIOUS_VERSION: 0.6.0.4
 
 jobs:
   build:

.github/workflows/pre-release.yml

@@ -8,7 +8,7 @@ on:
 env:
   IDRIS2_TESTS_CG: jvm
   ACTIONS_ALLOW_UNSECURE_COMMANDS: true
-  PREVIOUS_VERSION: 0.6.0
+  PREVIOUS_VERSION: 0.6.0.4
 
 jobs:
   pre-release:

.github/workflows/release.yml

@@ -14,7 +14,7 @@ on:
 env:
   IDRIS2_TESTS_CG: jvm
   ACTIONS_ALLOW_UNSECURE_COMMANDS: true
-  PREVIOUS_VERSION: 0.6.0
+  PREVIOUS_VERSION: 0.6.0.4
 
 jobs:
   release:

idris-jvm-assembler/src/main/java/io/github/mmhelloworld/idrisjvm/assembler/AsmGlobalState.java

@@ -6,7 +6,6 @@
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -150,7 +149,7 @@ public void interpret(String mainClass, String outputDirectory) throws IOExcepti
     public void writeClass(String className, ClassWriter classWriter, String outputClassFileDir) {
         File outFile = new File(outputClassFileDir, className + ".class");
         new File(outFile.getParent()).mkdirs();
-        try (OutputStream out = new FileOutputStream(outFile)) {
+        try (OutputStream out = newOutputStream(outFile.toPath())) {
             out.write(classWriter.toByteArray());
         } catch (Exception exception) {
             exception.printStackTrace();

idris-jvm-assembler/src/main/java/io/github/mmhelloworld/idrisjvm/assembler/Assembler.java

@@ -1297,15 +1297,18 @@ private void handleCreateMethod(MethodVisitor targetMethodVisitor, List<Annotati
         for (int index = 0; index < parametersAnnotations.size(); index++) {
             int parameterIndex = index;
             List<Annotation> parameterAnnotations = parametersAnnotations.get(parameterIndex);
-            parameterAnnotations.forEach(paramAnnotation -> {
-                final AnnotationVisitor av =
-                    targetMethodVisitor.visitParameterAnnotation(parameterIndex, paramAnnotation.getName(), true);
-                paramAnnotation.getProperties().forEach(prop -> visitAnnotationProperty(av, prop.getName(),
-                    prop.getValue()));
-                av.visitEnd();
-            });
+            parameterAnnotations.forEach(paramAnnotation ->
+                addParameterAnnotation(targetMethodVisitor, parameterIndex, paramAnnotation));
         }
+    }
 
+    private void addParameterAnnotation(MethodVisitor targetMethodVisitor, int parameterIndex,
+                                        Annotation paramAnnotation) {
+        AnnotationVisitor av =
+            targetMethodVisitor.visitParameterAnnotation(parameterIndex, paramAnnotation.getName(), true);
+        paramAnnotation.getProperties().forEach(prop -> visitAnnotationProperty(av, prop.getName(),
+            prop.getValue()));
+        av.visitEnd();
     }
 
     private Object toOpcode(String s) {

idris-jvm-assembler/src/main/java/io/github/mmhelloworld/idrisjvm/assembler/IdrisName.java

@@ -96,6 +96,8 @@ private static Entry<String, String> getClassAndMemberName(String programName, S
     private static String getClassName(String programName, String idrisNamespace) {
         if (idrisNamespace.startsWith("io/github/mmhelloworld/idrisjvm")) {
             return idrisNamespace;
+        } else if (idrisNamespace.startsWith("nomangle:")) {
+            return idrisNamespace.substring("nomangle:".length());
         } else {
             LinkedList<String> moduleParts =
                 Stream.of(idrisNamespace.split("/")).collect(toCollection(LinkedList::new));

idris2.ipkg

@@ -1,6 +1,6 @@
 package idris2app
 
-depends = network
+depends = network, contrib
 
 sourcedir = "src"
 

idris2api.ipkg

@@ -48,6 +48,7 @@ modules =
     Compiler.Jvm.Math,
     Compiler.Jvm.Asm,
     Compiler.Jvm.Codegen,
+    Compiler.Jvm.Export,
     Compiler.Jvm.ExtPrim,
     Compiler.Jvm.FunctionTree,
     Compiler.Jvm.Optimizer,