Test uncaught throw, catchless try* . Fix 46 impls.

[jackhill/mal.git] / dart / step8_macros.dart

diff --git a/dart/step8_macros.dart b/dart/step8_macros.dart
index 558b0fd..de9fbbf 100644 (file)
--- a/dart/step8_macros.dart
+++ b/dart/step8_macros.dart
@@ -217,22 +217,7 @@ MalType EVAL(MalType ast, Env env) {
 String PRINT(MalType x) => printer.pr_str(x);
 
 String rep(String x) {
-  var parsed;
-  try {
-    parsed = READ(x);
-  } on reader.ParseException catch (e) {
-    return e.message;
-  }
-
-  var evaledAst;
-  try {
-    evaledAst = EVAL(parsed, replEnv);
-  } on NotFoundException catch (e) {
-    return "'${e.value}' not found";
-  } on MalNativeException catch (e) {
-    return "${e.error}";
-  }
-  return PRINT(evaledAst);
+  return PRINT(EVAL(READ(x), replEnv));
 }
 
 const prompt = 'user> ';
@@ -249,6 +234,15 @@ main(List<String> args) {
     var output;
     try {
       output = rep(input);
+    } on reader.ParseException catch (e) {
+      stdout.writeln("Error: '${e.message}'");
+      continue;
+    } on NotFoundException catch (e) {
+      stdout.writeln("Error: '${e.value}' not found");
+      continue;
+    } on MalException catch (e) {
+      stdout.writeln("Error: ${printer.pr_str(e.value)}");
+      continue;
     } on reader.NoInputException {
       continue;
     }