Check and report errors during predef (#217)

almond-sh · Sep 5, 2018 · f340cda · f340cda
1 parent 8aaa1d7
commit f340cda
Showing 1 changed file with 18 additions and 2 deletions.
diff --git a/modules/scala/scala-interpreter/src/main/scala/almond/ScalaInterpreter.scala b/modules/scala/scala-interpreter/src/main/scala/almond/ScalaInterpreter.scala
@@ -288,8 +288,24 @@ final class ScalaInterpreter(
         else
           predef
 
-      val stmts = Parsers.split(code).get.get.value
-      ammInterp0.processLine(code, stmts, -1, silent = true, () => ())
+      def handlePredef(): Unit = {
+        val stmts = Parsers.split(code).get.get.value
+        val predefRes = ammInterp0.processLine(code, stmts, 9999999, silent = false, () => ())
+        Repl.handleOutput(ammInterp0, predefRes)
+        predefRes match {
+          case Res.Success(_) =>
+          case Res.Failure(msg) =>
+            log.error(s"Error while running predef: $msg")
+            sys.exit(1)
+          case Res.Exception(t, msg) =>
+            log.error(s"Caught exception while running predef ($msg)", t)
+          case Res.Skip =>
+          case Res.Exit(v) =>
+            log.warn(s"Ignoring exit request from predef (exit value: $v)")
+        }
+      }
+
+      handlePredef()
 
       log.info("Ammonite interpreter ok")