From 9e4c13732467bdf50de9e5b9d2d9cc5c76e22123 Mon Sep 17 00:00:00 2001 From: dos-reis Date: Tue, 1 May 2012 06:53:37 +0000 Subject: * interp/i-special.boot (interpREPEAT): Use CATCH directly. * interp/int-top.boot (intloopSpadProcess): Likewise. * interp/sys-macros.lisp (funcall): Remove. (Catch): Likewise. (Throw): Likewise. (UnwindProtect): Likewise. (SPADCATCH): Likewise. (SPADTHROW): Likewise. (YIELD): Likewise. --- src/interp/sys-macros.lisp | 33 --------------------------------- 1 file changed, 33 deletions(-) (limited to 'src/interp/sys-macros.lisp') diff --git a/src/interp/sys-macros.lisp b/src/interp/sys-macros.lisp index 39d0385e..307a5d7d 100644 --- a/src/interp/sys-macros.lisp +++ b/src/interp/sys-macros.lisp @@ -1050,23 +1050,6 @@ (defmacro SPADREDUCE (OP AXIS BOD) (REDUCE-1 OP AXIS BOD)) -;; -;; -*- Control -*- -;; - - -(defmacro |funcall| (&rest args) - (cons 'funcall args) ) - -(defmacro |Catch| (tag expr) - `(catch ,tag ,expr) ) - -(defmacro |Throw| (tag expr) - `(Throw ,tag ,expr) ) - -(defmacro |UnwindProtect| (a b) - `(unwind-protect ,a ,b) ) - ;; ;; -*- List Comprehension -*- ;; @@ -1075,22 +1058,6 @@ (let ((U (REPEAT-TRAN L NIL))) (CONS 'THETA (CONS '\, (|append!| (CAR U) (LIST (CDR U))))))) -;; -;; -*- Non-Local Gotos -*- -;; - -(defmacro SPADCATCH (&rest form) - (CONS 'CATCH form)) - -(defmacro SPADTHROW (&rest form) - (CONS 'THROW form)) - -(defmacro YIELD (L) - (let ((g (gensym))) - `(let ((,g (state))) - (if (STATEP ,g) - (throw 'YIELD (list 'pair ,L) ,g))))) - ;; ;; -*- Input/Output -*- ;; -- cgit v1.2.3