objpascal, r: Support catchless try*.

diff --git a/objpascal/step9_try.pas b/objpascal/step9_try.pas
index 7df833d..d8c5960 100644 (file)
--- a/objpascal/step9_try.pas
+++ b/objpascal/step9_try.pas
@@ -215,6 +215,8 @@ begin
         except
             On E : Exception do
             begin
+                if Length(Arr) < 3 then
+                    raise;
                 SetLength(Err, 1);
                 if E.ClassType = TMalException then
                     Err[0] := (E as TMalException).Val

diff --git a/objpascal/stepA_mal.pas b/objpascal/stepA_mal.pas
index bf5afdf..1e8762e 100644 (file)
--- a/objpascal/stepA_mal.pas
+++ b/objpascal/stepA_mal.pas
@@ -215,6 +215,8 @@ begin
         except
             On E : Exception do
             begin
+                if Length(Arr) < 3 then
+                    raise;
                 SetLength(Err, 1);
                 if E.ClassType = TMalException then
                     Err[0] := (E as TMalException).Val

diff --git a/r/step8_macros.r b/r/step8_macros.r
index 012aa7c..d8d3ba1 100644 (file)
--- a/r/step8_macros.r
+++ b/r/step8_macros.r
@@ -75,9 +75,8 @@ EVAL <- function(ast, env) {
     repeat {
 
     #cat("EVAL: ", .pr_str(ast,TRUE), "\n", sep="")
-    if (!.list_q(ast)) {
-        return(eval_ast(ast, env))
-    }
+    if (!.list_q(ast)) { return(eval_ast(ast, env)) }
+    if (length(ast) == 0) { return(ast) }
 
     # apply list
     ast <- macroexpand(ast, env)

diff --git a/r/step9_try.r b/r/step9_try.r
index 2575baa..049d660 100644 (file)
--- a/r/step9_try.r
+++ b/r/step9_try.r
@@ -75,9 +75,8 @@ EVAL <- function(ast, env) {
     repeat {
 
     #cat("EVAL: ", .pr_str(ast,TRUE), "\n", sep="")
-    if (!.list_q(ast)) {
-        return(eval_ast(ast, env))
-    }
+    if (!.list_q(ast)) { return(eval_ast(ast, env)) }
+    if (length(ast) == 0) { return(ast) }
 
     # apply list
     ast <- macroexpand(ast, env)
@@ -122,7 +121,7 @@ EVAL <- function(ast, env) {
                                          new.list(a2[[2]]),
                                          new.list(edata$exc))))
         } else {
-            throw(err)
+            throw(edata$exc)
         }
     } else if (a0sym == "do") {
         eval_ast(slice(ast,2,length(ast)-1), env)

diff --git a/r/stepA_mal.r b/r/stepA_mal.r
index ecdb89c..edf41de 100644 (file)
--- a/r/stepA_mal.r
+++ b/r/stepA_mal.r
@@ -75,9 +75,8 @@ EVAL <- function(ast, env) {
     repeat {
 
     #cat("EVAL: ", .pr_str(ast,TRUE), "\n", sep="")
-    if (!.list_q(ast)) {
-        return(eval_ast(ast, env))
-    }
+    if (!.list_q(ast)) { return(eval_ast(ast, env)) }
+    if (length(ast) == 0) { return(ast) }
 
     # apply list
     ast <- macroexpand(ast, env)
@@ -122,7 +121,7 @@ EVAL <- function(ast, env) {
                                          new.list(a2[[2]]),
                                          new.list(edata$exc))))
         } else {
-            throw(err)
+            throw(edata$exc)
         }
     } else if (a0sym == "do") {
         eval_ast(slice(ast,2,length(ast)-1), env)