#35 support int annotation values, annotation on static methods

Author: mmhelloworld

idris-jvm-core/src/main/idris/IdrisJvm/Core/Function.idr

@@ -548,6 +548,13 @@ mutual
           paramAnns = parseParamAnnotations paramAnnDescs
       in exportFun types cname mname sourceCname sourceMname ExportCallInstance parent returns args anns paramAnns
 
+  cgExport types cname parent
+        (ExportFun n (FApp "ExportStaticWithAnn" [FStr mname, FApp "::" annDescs, paramAnnDescs]) returns args)
+    = let MkJMethodName sourceCname sourceMname = jname n
+          anns = join $ parseAnnotations <$> annDescs
+          paramAnns = parseParamAnnotations paramAnnDescs
+      in exportFun types cname mname sourceCname sourceMname ExportCallStatic parent returns args anns paramAnns
+
   cgExport _ _ _ exportDef = jerror $ "Unsupported export definition: " ++ show exportDef
 
   parseClassAnnotations : List Export -> (List Annotation, List Export)
@@ -843,6 +850,7 @@ mutual
 
   parseAnnotationValue : FDesc -> AnnotationValue
   parseAnnotationValue (FApp "AnnString" [FStr value]) = AnnString value
+  parseAnnotationValue (FApp "AnnInt" [FStr value]) = AnnInt $ cast value
   parseAnnotationValue (FApp "AnnEnum" [FStr enum, FStr value]) = AnnEnum (asmRefTyDesc (ClassDesc enum)) value
   parseAnnotationValue (FApp "AnnArray" values) = AnnArray (parseAnnArrayElements values)
   parseAnnotationValue desc = jerror $ "Invalid or unsupported annotation value: " ++ show desc

idris-jvm-core/src/main/java/IdrisJvm/Core/AnnotationProperty.java

@@ -1,6 +1,6 @@
 package IdrisJvm.Core;
 
-class AnnotationProperty {
+public class AnnotationProperty {
     private final String name;
     private final AnnotationValue value;
 
@@ -17,4 +17,4 @@ public AnnotationValue getValue() {
     public String getName() {
         return name;
     }
-}
+}

idris-jvm-core/src/main/java/IdrisJvm/Core/AnnotationValue.java

@@ -4,7 +4,7 @@
 
 import java.util.List;
 
-abstract class AnnotationValue {
+public abstract class AnnotationValue {
     private final AnnotationValueType type;
 
     private AnnotationValue(final AnnotationValueType type) {
@@ -83,4 +83,4 @@ public List<AnnotationValue> getValues() {
             return values;
         }
     }
-}
+}

idris-jvm-ffi/src/main/idris/IdrisJvm/FFI.idr

@@ -8,7 +8,7 @@ data IORef a = MkIORef a
 AnnotationTypeName : Type
 AnnotationTypeName = String
 
-data AnnotationValue = AnnInt Int
+data AnnotationValue = AnnInt String -- FFI Descriptor can only take String
                      | AnnString String
                      | AnnEnum String String
                      | AnnArray (List AnnotationValue)
@@ -57,7 +57,11 @@ mutual
                  | ExportInstance String
                  | ExportDefault -- Export an instance method with idris function name
                  | Anns (List Annotation)
+
+                 -- Export a static method with method annotations and parameter annotations
                  | ExportStaticWithAnn String (List Annotation) (List (List Annotation))
+
+                 -- Export an instance method with method annotations and parameter annotations
                  | ExportInstanceWithAnn String (List Annotation) (List (List Annotation))
 
   data JVM_IntTypes : Type -> Type where
@@ -353,5 +357,6 @@ term syntax "<@@>" [anns] = Fun classWith (Anns anns)
 term syntax "<@>" [name] [attrs] = Ann name attrs
 term syntax "<@..>" [values] = AnnArray values
 term syntax "<@s>" [value] = AnnString value
+term syntax "<@i>" [value] = AnnInt value -- Descriptor can only take string
 term syntax "<@enum>" [ty] [value] = AnnEnum ty value
 term syntax [name] "<@:>" [value] = (name, value)

idris-jvm-server/src/main/java/io/github/mmhelloworld/idrisjvm/model/SAltDeserializer.java

@@ -1,15 +1,14 @@
 package io.github.mmhelloworld.idrisjvm.model;
 
+import IdrisJvm.Core.export.Codegen;
+import IdrisJvm.IR.export.Const;
+import IdrisJvm.IR.export.SAlt;
+import IdrisJvm.IR.export.SExp;
 import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
-import IdrisJvm.IR.export.Const;
-import IdrisJvm.Core.export.Codegen;
-import IdrisJvm.IR.export.SAlt;
-import IdrisJvm.IR.export.SExp;
 
 import java.io.IOException;
 import java.util.List;
@@ -31,7 +30,7 @@ public SAltDeserializer(final Class<?> vc) {
 
     @Override
     public SAlt deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext)
-        throws IOException, JsonProcessingException {
+        throws IOException {
         final JsonNode node = jsonParser.getCodec().readTree(jsonParser);
         final ObjectMapper mapper = Context.getMapper();