Handle non-exhaustive patterns

Author: mmhelloworld

.travis.yml

@@ -12,7 +12,7 @@ env:
 before_install:
 - docker pull mmhelloworld/idris:1.3.1
 - mkdir -p $HOME/bin/idris-packages $IDRIS_JVM_HOME
-- wget https://github.com/mmhelloworld/idris-jvm/releases/download/v1.0-SNAPSHOT-20181103/idris-jvm.zip
+- wget https://github.com/mmhelloworld/idris-jvm/releases/download/v1.0-SNAPSHOT-20181129/idris-jvm.zip
 - unzip -o idris-jvm.zip -d $HOME/bin
 - export PATH=`pwd`/bin/travis:$IDRIS_JVM_HOME/codegen/bin:$HOME/.local/bin:$PATH
 - export PROJECT_ROOT=`pwd`

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

@@ -37,8 +37,8 @@ group n xs =
     let (ys, zs) = splitAt n xs
     in  ys :: group n zs
 
-splitApplyFunction : SDecl -> List SDecl
-splitApplyFunction (SFun fname args n (SChkCase var cases)) =
+splitApplyFunction : String -> List String -> Int -> LVar -> List SAlt -> List SDecl
+splitApplyFunction fname args n var cases =
   let cs = group 100 cases
       len = List.length cs
   in map (callNextFn fname args n var len) . List.zip [0 .. pred len] $ cs where
@@ -56,7 +56,7 @@ splitApplyFunction (SFun fname args n (SChkCase var cases)) =
 splitLargeFunctions : List SDecl -> List SDecl
 splitLargeFunctions decls = decls >>= f where
   f : SDecl -> List SDecl
-  f decl@(SFun "{APPLY_0}" _ _ _) = splitApplyFunction decl
+  f decl@(SFun "{APPLY_0}" args n (SChkCase var cases)) = splitApplyFunction "{APPLY_0}" args n var cases
   f decl = [decl]
 
 inferFuns : SortedMap JMethodName (InferredType, InferredTypeStore)
@@ -72,13 +72,29 @@ inferFuns initial decls = go SortedMap.empty decls where
             newAcc = SortedMap.insert fname (retTy, argTys) acc
         in go newAcc rest
 
+createMainMethod : String -> JMethodName -> Asm ()
+createMainMethod signature (MkJMethodName className methodName) = do
+    CreateMethod [Public, Static] className "main" "([Ljava/lang/String;)V" Nothing Nothing [] []
+    MethodCodeStart
+    Aload 0
+    InvokeMethod InvokeStatic (rtClass "Runtime") "setProgramArgs" "([Ljava/lang/String;)V" False
+    InvokeMethod InvokeStatic className methodName signature False
+    Pop
+    Return
+    MaxStackAndLocal (-1) (-1)
+    MethodCodeEnd
+
 generateMethods' : Assembler -> List SDecl -> List ExportIFace -> JVM_IO ()
 generateMethods' assembler decls exports = do
     let smallDecls = splitLargeFunctions decls
     let functionTypesByNameStage1 = inferFuns SortedMap.empty smallDecls
     let functionTypesByName = inferFuns functionTypesByNameStage1 smallDecls
     types <- generateMethodsWithTypes functionTypesByName smallDecls
     generateExportsWithTypes types exports
+    let asmState = MkAsmState [] types SortedMap.empty IUnknown
+    (_, _) <- runAsm asmState assembler
+        (createMainMethod "()Lio/github/mmhelloworld/idrisjvm/runtime/Thunk;" (jname "{runMain_0}"))
+    pure ()
   where
     generateMethodsWithTypes : SortedMap JMethodName (InferredType, InferredTypeStore) -> List SDecl
                             -> JVM_IO (SortedMap JMethodName (InferredType, InferredTypeStore))

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

@@ -166,10 +166,15 @@ mutual
   cgBody ret (SApp False f args) = cgSApp ret False f args
 
   cgBody ret (SLet i v sc) = do
-    locTys <- GetFunctionLocTypes
-    let iTy = getLocTy locTys i
-    cgBody (\vTy => storeVar vTy iTy i) v
-    cgBody ret sc
+      locTys <- GetFunctionLocTypes
+      let iTy = getLocTy locTys i
+      assign iTy
+      cgBody ret sc
+    where
+      assign : InferredType -> Asm ()
+      assign iTy = case v of
+                     SNothing => do Aconstnull; storeVar inferredObjectType iTy i
+                     _ => cgBody (\vTy => storeVar vTy iTy i) v
 
   cgBody ret (SUpdate _ e) = cgBody ret e
 
@@ -240,7 +245,9 @@ mutual
 
   cgBody ret (SOp op args) = cgOp ret op args
 
-  cgBody ret SNothing = do Aconstnull; ret inferredObjectType
+  cgBody ret SNothing = do
+    invokeError "Unexpected case encountered. This could be due to non-exhaustive patterns."
+    ret inferredObjectType
 
   cgBody ret (SError x) = do invokeError (show x); ret IUnknown
 

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

@@ -261,7 +261,7 @@ public void classCodeEnd(String outputClassFileDir) {
         cws.entrySet().parallelStream().forEach(e -> {
             String className = e.getKey();
             ClassWriter classWriter = e.getValue();
-            LOGGER.info(" writing class file {} in directory {}", className, outputClassFileDir);
+            LOGGER.info("Writing class file {} in directory {}", className, outputClassFileDir);
             File outFile = new File(outputClassFileDir, className + ".class");
             new File(outFile.getParent()).mkdirs();
             try (OutputStream out = new FileOutputStream(outFile)) {

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

@@ -42,7 +42,6 @@ public class IdrisToJavaNameConverter {
         replacements.put('|', "pipe");
         replacements.put('}', "rbrace");
         replacements.put('~', "tilde");
-
     }
 
     private static final String DEFAULT_PACKAGE_NAME = "main";
@@ -95,7 +94,7 @@ private static String createClassName(final String className) {
             return DEFAULT_CLASS_NAME;
         } else if (className.contains(".")) {
             return className.replaceAll("\\.", "/")
-                    .replaceAll("([^/]+)/", "I\\$$1/");
+                    .replaceAll("([^/]+)/", "I\\_$1/");
         } else {
             return DEFAULT_PACKAGE_NAME + "/" + className;
         }

idris-jvm-integration-test/src/test/resources/idris-test-sources/issue83/expected

@@ -0,0 +1 @@
+world!

idris-jvm-integration-test/src/test/resources/idris-test-sources/issue83/issue83.idr

@@ -0,0 +1,5 @@
+module Main
+
+main : IO ()
+main = do
+    putStrLn "world!"

idris-jvm-runtime/src/main/java/io/github/mmhelloworld/idrisjvm/runtime/Runtime.java

@@ -190,9 +190,7 @@ public static Object unwrap(Object value) {
 
     public static int constructorIndex(Object obj) {
         final int constructor;
-        if (obj == null) {
-            constructor = -1;
-        } else if (obj instanceof IdrisObject) {
+        if (obj instanceof IdrisObject) {
             constructor = ((IdrisObject) obj).constructorId;
         } else if (obj instanceof Integer) {
             constructor = (int) obj;

idris-jvm-runtime/src/main/java/io/github/mmhelloworld/idrisjvm/runtime/Util.java

@@ -68,14 +68,18 @@ public static int asInt(Object m) {
     }
 
     public static boolean equals(Object a, Object b) {
-        if (a.getClass().isAssignableFrom(b.getClass())) {
-            return Objects.equals(a, b);
-        } else if (a instanceof BigInteger && b instanceof Integer) {
-            return a.equals(BigInteger.valueOf((Integer) b));
-        } else if (a instanceof Integer && b instanceof BigInteger) {
-            return b.equals(BigInteger.valueOf((Integer) a));
+        boolean isEqual = Objects.equals(a, b);
+
+        if (isEqual) {
+            return true;
         } else {
-            return Objects.equals(a, b);
+            if (a instanceof BigInteger && b instanceof Integer) {
+                return Objects.equals(a, BigInteger.valueOf((Integer) b));
+            } else if (a instanceof Integer && b instanceof BigInteger) {
+                return Objects.equals(b, BigInteger.valueOf((Integer) a));
+            } else {
+                return false;
+            }
         }
     }
 

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

@@ -1,7 +1,6 @@
 package io.github.mmhelloworld.idrisjvm;
 
 import IdrisJvm.Core.Assembler;
-import IdrisJvm.Core.IdrisToJavaNameConverter;
 import IdrisJvm.Core.export.Codegen;
 import IdrisJvm.IR.export.ExportIFace;
 import IdrisJvm.IR.export.SDecl;
@@ -32,10 +31,6 @@
 import static com.fasterxml.jackson.core.JsonToken.END_ARRAY;
 import static com.fasterxml.jackson.core.JsonToken.END_OBJECT;
 import static java.util.Arrays.asList;
-import static java.util.Collections.emptyList;
-import static org.objectweb.asm.Opcodes.ACC_PUBLIC;
-import static org.objectweb.asm.Opcodes.ACC_STATIC;
-import static org.objectweb.asm.Opcodes.INVOKESTATIC;
 import static org.springframework.web.bind.annotation.RequestMethod.POST;
 
 @RestController
@@ -63,7 +58,6 @@ public void compile(@RequestBody String[] args) {
             JsonParser parser = jsonfactory.createParser(source);
             Assembler assembler = new Assembler();
             codegen(parser, assembler);
-            addMainMethod(assembler);
             assembler.classCodeEnd(getOutputFile(argsList).getPath());
             parser.close();
         } catch (Exception e) {
@@ -147,20 +141,6 @@ private List<SDecl> parseSimpleDecls(final JsonParser parser) throws IOException
         return decls;
     }
 
-    private void addMainMethod(final Assembler assembler) {
-        final String[] classAndMethodName = IdrisToJavaNameConverter.idrisClassMethodName("{runMain_0}").split(",");
-        assembler.createMethod(ACC_PUBLIC + ACC_STATIC, "main/Main", "main", "([Ljava/lang/String;)V", null, null,
-            emptyList(), emptyList());
-        assembler.methodCodeStart();
-        assembler.aload(0);
-        assembler.invokeMethod(INVOKESTATIC, "io/github/mmhelloworld/idrisjvm/runtime/Runtime", "setProgramArgs", "([Ljava/lang/String;)V", false);
-        assembler.invokeMethod(INVOKESTATIC, classAndMethodName[0], classAndMethodName[1], "()Lio/github/mmhelloworld/idrisjvm/runtime/Thunk;", false);
-        assembler.pop();
-        assembler.asmReturn();
-        assembler.maxStackAndLocal(-1, -1);
-        assembler.methodCodeEnd();
-    }
-
     private File getSourceFile(final List<String> args) {
         String sourceFileName = args.get(0);
         return getAbsoluteFile(sourceFileName, getCurrentWorkingDirectory(args));