Merge pull request #4617 from unalos/master

Fixing error message on partial pattern matching failure.
idris-lang · Dec 20, 2018 · ecf297a · ecf297a
2 parents 7855f86 + 097b686
commit ecf297a
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 5 deletions.
diff --git a/jsrts/Runtime-javascript.js b/jsrts/Runtime-javascript.js
@@ -7,5 +7,9 @@ $JSRTS.prim_systemInfo = function (index) {
     }
     return "";
 };
-$JSRTS.prim_writeStr = function (x) { return console.log(x) }
-$JSRTS.prim_readStr = function () { return prompt('Prelude.getLine') };
+
+$JSRTS.prim_writeStr = function (x) { return console.log(x) };
+
+$JSRTS.prim_readStr = function () { return prompt('Prelude.getLine') };
+
+$JSRTS.die = function (message) { throw new Error(message) };
diff --git a/jsrts/Runtime-node.js b/jsrts/Runtime-node.js
@@ -1,5 +1,7 @@
 $JSRTS.os = require('os');
+
 $JSRTS.fs = require('fs');
+
 $JSRTS.prim_systemInfo = function (index) {
     switch (index) {
         case 0:
@@ -9,7 +11,9 @@ $JSRTS.prim_systemInfo = function (index) {
     }
     return "";
 };
-$JSRTS.prim_writeStr = function (x) { return process.stdout.write(x) }
+
+$JSRTS.prim_writeStr = function (x) { return process.stdout.write(x) };
+
 $JSRTS.prim_readStr = function () {
     var ret = '';
     var b = new Buffer(1024);
@@ -28,4 +32,9 @@ $JSRTS.prim_readStr = function () {
         }
     }
     return ret;
+};
+
+$JSRTS.die = function (message) {
+    console.error(message);
+    process.exit(-1);
 };
diff --git a/src/IRTS/Compiler.hs b/src/IRTS/Compiler.hs
@@ -533,7 +533,7 @@ irTree top args tree = do
 
 irSC :: Name -> Vars -> SC -> Idris LExp
 irSC top vs (STerm t) = irTerm top vs [] t
-irSC top vs (UnmatchedCase str) = return $ LLazyExp $ LError str
+irSC top vs (UnmatchedCase str) = return $ LError str
 
 irSC top vs (ProjCase tm alts) = do
     tm'   <- irTerm top vs [] tm

diff --git a/src/IRTS/JavaScript/AST.hs b/src/IRTS/JavaScript/AST.hs
@@ -202,7 +202,7 @@ jsStmt2Text (JsSwitchCase exp l d) =
     default2Text Nothing = ""
     default2Text (Just z) =
       T.concat ["default:\n", indent $ T.concat [jsStmt2Text z, ";\nbreak;\n"]]
-jsStmt2Text (JsError t) = T.concat ["throw new Error(  ", jsAst2Text t, ");"]
+jsStmt2Text (JsError t) = T.concat ["$JSRTS.die(", jsAst2Text t, ");\n"]
 jsStmt2Text (JsForever x) =
   T.concat ["for(;;) {\n", indent $ jsStmt2Text x, "}\n"]
 jsStmt2Text JsContinue = "continue;"