fsharp: added some top level exception catching so that the repl woul…

…dn't quit to CLI on errors.
kanaka · Dec 26, 2016 · df8c925 · df8c925
1 parent 3c823be
commit df8c925
Show file tree

Hide file tree

Showing 9 changed files with 81 additions and 23 deletions.
diff --git a/fsharp/step2_eval.fs b/fsharp/step2_eval.fs
@@ -31,9 +31,15 @@ module REPL
         try
             Some(eval env ast)
         with
-        | Error.EvalError(msg) 
-        | Error.ReaderError(msg) ->
-            printfn "%s" msg
+        | Error.EvalError(str)
+        | Error.ReaderError(str) ->
+            printfn "%s" str
+            None
+        | Error.MalError(node) ->
+            printfn "%s" (Printer.pr_str [node])
+            None
+        | ex ->
+            printfn "%s" (ex.Message)
             None
 
     let PRINT v =

diff --git a/fsharp/step3_env.fs b/fsharp/step3_env.fs
@@ -67,9 +67,15 @@ module REPL
         try
             Some(eval env ast)
         with
-        | Error.EvalError(msg) 
-        | Error.ReaderError(msg) ->
-            printfn "%s" msg
+        | Error.EvalError(str)
+        | Error.ReaderError(str) ->
+            printfn "%s" str
+            None
+        | Error.MalError(node) ->
+            printfn "%s" (Printer.pr_str [node])
+            None
+        | ex ->
+            printfn "%s" (ex.Message)
             None
 
     let PRINT v =

diff --git a/fsharp/step4_if_fn_do.fs b/fsharp/step4_if_fn_do.fs
@@ -103,9 +103,15 @@ module REPL
         try
             Some(eval env ast)
         with
-        | Error.EvalError(msg) 
-        | Error.ReaderError(msg) ->
-            printfn "%s" msg
+        | Error.EvalError(str)
+        | Error.ReaderError(str) ->
+            printfn "%s" str
+            None
+        | Error.MalError(node) ->
+            printfn "%s" (Printer.pr_str [node])
+            None
+        | ex ->
+            printfn "%s" (ex.Message)
             None
 
     let PRINT v =

diff --git a/fsharp/step5_tco.fs b/fsharp/step5_tco.fs
@@ -105,9 +105,15 @@ module REPL
         try
             Some(eval env ast)
         with
-        | Error.EvalError(msg)
-        | Error.ReaderError(msg) ->
-            printfn "%s" msg
+        | Error.EvalError(str)
+        | Error.ReaderError(str) ->
+            printfn "%s" str
+            None
+        | Error.MalError(node) ->
+            printfn "%s" (Printer.pr_str [node])
+            None
+        | ex ->
+            printfn "%s" (ex.Message)
             None
 
     let PRINT v =

diff --git a/fsharp/step6_file.fs b/fsharp/step6_file.fs
@@ -105,9 +105,15 @@ module REPL
         try
             Some(eval env ast)
         with
-        | Error.EvalError(msg)
-        | Error.ReaderError(msg) ->
-            printfn "%s" msg
+        | Error.EvalError(str)
+        | Error.ReaderError(str) ->
+            printfn "%s" str
+            None
+        | Error.MalError(node) ->
+            printfn "%s" (Printer.pr_str [node])
+            None
+        | ex ->
+            printfn "%s" (ex.Message)
             None
 
     let PRINT v =

diff --git a/fsharp/step7_quote.fs b/fsharp/step7_quote.fs
@@ -125,8 +125,15 @@ module REPL
         try
             Some(eval env ast)
         with
-        | Error.EvalError(msg) ->
-            printfn "%s" msg
+        | Error.EvalError(str)
+        | Error.ReaderError(str) ->
+            printfn "%s" str
+            None
+        | Error.MalError(node) ->
+            printfn "%s" (Printer.pr_str [node])
+            None
+        | ex ->
+            printfn "%s" (ex.Message)
             None
 
     let PRINT v =

diff --git a/fsharp/step8_macros.fs b/fsharp/step8_macros.fs
@@ -153,8 +153,15 @@ module REPL
         try
             Some(eval env ast)
         with
-        | Error.EvalError(msg) ->
-            printfn "%s" msg
+        | Error.EvalError(str)
+        | Error.ReaderError(str) ->
+            printfn "%s" str
+            None
+        | Error.MalError(node) ->
+            printfn "%s" (Printer.pr_str [node])
+            None
+        | ex ->
+            printfn "%s" (ex.Message)
             None
 
     let PRINT v =

diff --git a/fsharp/step9_try.fs b/fsharp/step9_try.fs
@@ -170,8 +170,15 @@ module REPL
         try
             Some(eval env ast)
         with
-        | Error.EvalError(msg) ->
-            printfn "%s" msg
+        | Error.EvalError(str)
+        | Error.ReaderError(str) ->
+            printfn "%s" str
+            None
+        | Error.MalError(node) ->
+            printfn "%s" (Printer.pr_str [node])
+            None
+        | ex ->
+            printfn "%s" (ex.Message)
             None
 
     let PRINT v =

diff --git a/fsharp/stepA_mal.fs b/fsharp/stepA_mal.fs
@@ -171,8 +171,15 @@ module REPL
         try
             Some(eval env ast)
         with
-        | Error.EvalError(msg) ->
-            printfn "%s" msg
+        | Error.EvalError(str)
+        | Error.ReaderError(str) ->
+            printfn "%s" str
+            None
+        | Error.MalError(node) ->
+            printfn "%s" (Printer.pr_str [node])
+            None
+        | ex ->
+            printfn "%s" (ex.Message)
             None
 
     let PRINT v =