Add step5/9 tests for impls that support it.

- Also remove broken make/tests/*.mk tests. Not used any more.

9 files changed, 30 insertions, 30 deletions

diff --git a/java/src/main/java/mal/step1_read_print.java b/java/src/main/java/mal/step1_read_print.java
index 2c029aa..e849052 100644
--- a/java/src/main/java/mal/step1_read_print.java
+++ b/java/src/main/java/mal/step1_read_print.java
@@ -49,11 +49,11 @@ public class step1_read_print {
                 System.out.println(PRINT(RE(null, line)));
             } catch (MalContinue e) {
                 continue;
-            } catch (MalError e) {
-                System.out.println("Error: " + e.getMessage());
+            } catch (MalThrowable t) {
+                System.out.println("Error: " + t.getMessage());
                 continue;
-            } catch (reader.ParseError e) {
-                System.out.println(e.getMessage());
+            } catch (Throwable t) {
+                System.out.println("Uncaught " + t + ": " + t.getMessage());
                 continue;
             }
         }
diff --git a/java/src/main/java/mal/step2_eval.java b/java/src/main/java/mal/step2_eval.java
index ee8ea26..6de69cd 100644
--- a/java/src/main/java/mal/step2_eval.java
+++ b/java/src/main/java/mal/step2_eval.java
@@ -126,11 +126,11 @@ public class step2_eval {
                 System.out.println(PRINT(RE(repl_env, line)));
             } catch (MalContinue e) {
                 continue;
-            } catch (reader.ParseError e) {
-                System.out.println(e.getMessage());
+            } catch (MalThrowable t) {
+                System.out.println("Error: " + t.getMessage());
                 continue;
-            } catch (MalError e) {
-                System.out.println("Error: " + e.getMessage());
+            } catch (Throwable t) {
+                System.out.println("Uncaught " + t + ": " + t.getMessage());
                 continue;
             }
         }
diff --git a/java/src/main/java/mal/step3_env.java b/java/src/main/java/mal/step3_env.java
index 0bf5c16..a88dc13 100644
--- a/java/src/main/java/mal/step3_env.java
+++ b/java/src/main/java/mal/step3_env.java
@@ -146,11 +146,11 @@ public class step3_env {
                 System.out.println(PRINT(RE(repl_env, line)));
             } catch (MalContinue e) {
                 continue;
-            } catch (reader.ParseError e) {
-                System.out.println(e.getMessage());
+            } catch (MalThrowable t) {
+                System.out.println("Error: " + t.getMessage());
                 continue;
-            } catch (MalError e) {
-                System.out.println("Error: " + e.getMessage());
+            } catch (Throwable t) {
+                System.out.println("Uncaught " + t + ": " + t.getMessage());
                 continue;
             }
         }
diff --git a/java/src/main/java/mal/step4_if_fn_do.java b/java/src/main/java/mal/step4_if_fn_do.java
index 9a66542..ce9043d 100644
--- a/java/src/main/java/mal/step4_if_fn_do.java
+++ b/java/src/main/java/mal/step4_if_fn_do.java
@@ -154,12 +154,12 @@ public class step4_if_fn_do {
                 System.out.println(PRINT(RE(repl_env, line)));
             } catch (MalContinue e) {
                 continue;
-            } catch (reader.ParseError e) {
-                System.out.println(e.getMessage());
-                continue;
             } catch (MalThrowable t) {
                 System.out.println("Error: " + t.getMessage());
                 continue;
+            } catch (Throwable t) {
+                System.out.println("Uncaught " + t + ": " + t.getMessage());
+                continue;
             }
         }
     }
diff --git a/java/src/main/java/mal/step5_tco.java b/java/src/main/java/mal/step5_tco.java
index aa3f7a7..ef56083 100644
--- a/java/src/main/java/mal/step5_tco.java
+++ b/java/src/main/java/mal/step5_tco.java
@@ -167,12 +167,12 @@ public class step5_tco {
                 System.out.println(PRINT(RE(repl_env, line)));
             } catch (MalContinue e) {
                 continue;
-            } catch (reader.ParseError e) {
-                System.out.println(e.getMessage());
-                continue;
             } catch (MalThrowable t) {
                 System.out.println("Error: " + t.getMessage());
                 continue;
+            } catch (Throwable t) {
+                System.out.println("Uncaught " + t + ": " + t.getMessage());
+                continue;
             }
         }
     }
diff --git a/java/src/main/java/mal/step6_file.java b/java/src/main/java/mal/step6_file.java
index d3f4914..56bcdf7 100644
--- a/java/src/main/java/mal/step6_file.java
+++ b/java/src/main/java/mal/step6_file.java
@@ -185,12 +185,12 @@ public class step6_file {
                 System.out.println(PRINT(RE(repl_env, line)));
             } catch (MalContinue e) {
                 continue;
-            } catch (reader.ParseError e) {
-                System.out.println(e.getMessage());
-                continue;
             } catch (MalThrowable t) {
                 System.out.println("Error: " + t.getMessage());
                 continue;
+            } catch (Throwable t) {
+                System.out.println("Uncaught " + t + ": " + t.getMessage());
+                continue;
             }
         }
     }
diff --git a/java/src/main/java/mal/step7_quote.java b/java/src/main/java/mal/step7_quote.java
index 639f8b9..8c3766a 100644
--- a/java/src/main/java/mal/step7_quote.java
+++ b/java/src/main/java/mal/step7_quote.java
@@ -217,12 +217,12 @@ public class step7_quote {
                 System.out.println(PRINT(RE(repl_env, line)));
             } catch (MalContinue e) {
                 continue;
-            } catch (reader.ParseError e) {
-                System.out.println(e.getMessage());
-                continue;
             } catch (MalThrowable t) {
                 System.out.println("Error: " + t.getMessage());
                 continue;
+            } catch (Throwable t) {
+                System.out.println("Uncaught " + t + ": " + t.getMessage());
+                continue;
             }
         }
     }
diff --git a/java/src/main/java/mal/step8_macros.java b/java/src/main/java/mal/step8_macros.java
index fb3ffdc..4c89356 100644
--- a/java/src/main/java/mal/step8_macros.java
+++ b/java/src/main/java/mal/step8_macros.java
@@ -257,12 +257,12 @@ public class step8_macros {
                 System.out.println(PRINT(RE(repl_env, line)));
             } catch (MalContinue e) {
                 continue;
-            } catch (reader.ParseError e) {
-                System.out.println(e.getMessage());
-                continue;
             } catch (MalThrowable t) {
                 System.out.println("Error: " + t.getMessage());
                 continue;
+            } catch (Throwable t) {
+                System.out.println("Uncaught " + t + ": " + t.getMessage());
+                continue;
             }
         }
     }
diff --git a/java/src/main/java/mal/stepA_more.java b/java/src/main/java/mal/stepA_more.java
index 75ec301..7e869e6 100644
--- a/java/src/main/java/mal/stepA_more.java
+++ b/java/src/main/java/mal/stepA_more.java
@@ -287,15 +287,15 @@ public class stepA_more {
                 System.out.println(PRINT(RE(repl_env, line)));
             } catch (MalContinue e) {
                 continue;
-            } catch (reader.ParseError e) {
-                System.out.println(e.getMessage());
-                continue;
             } catch (MalException e) {
                 System.out.println("Error: " + printer._pr_str(e.getValue(), false));
                 continue;
             } catch (MalThrowable t) {
                 System.out.println("Error: " + t.getMessage());
                 continue;
+            } catch (Throwable t) {
+                System.out.println("Uncaught " + t + ": " + t.getMessage());
+                continue;
             }
         }
     }