From abd2b49e66adf06d16d6664526f693e67bdaf719 Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Sun, 19 Dec 2010 00:42:27 +0000
Subject: 	* boot/translator.boot (BOOTTOCL): Replace Lisp-level contruct
 	with try/finally. 	(BOOTTOCLC): Likewise.

---
 src/boot/strap/translator.clisp |  2 +-
 src/boot/translator.boot        | 32 ++++++++++++++++----------------
 2 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'src/boot')

diff --git a/src/boot/strap/translator.clisp b/src/boot/strap/translator.clisp
index c9b972c4..e96bf98a 100644
--- a/src/boot/strap/translator.clisp
+++ b/src/boot/strap/translator.clisp
@@ -507,7 +507,7 @@
         (SETQ |$bpParenCount| 0)
         (|bpFirstTok|)
         (SETQ |found|
-              (LET ((#0=#:G1354
+              (LET ((#0=#:G1356
                         (CATCH :OPEN-AXIOM-CATCH-POINT (|bpOutItem|))))
                 (COND
                   ((AND (CONSP #0#)
diff --git a/src/boot/translator.boot b/src/boot/translator.boot
index dd20eb89..84f3c9ec 100644
--- a/src/boot/translator.boot
+++ b/src/boot/translator.boot
@@ -86,14 +86,14 @@ shoeCOMPILE_-FILE lspFileName ==
 
  
 BOOTTOCL(fn, out) ==
-  UNWIND_-PROTECT(
-    PROGN(startCompileDuration(),
-      callingPackage := _*PACKAGE_*,
-      IN_-PACKAGE '"BOOTTRAN",
-      result := BOOTTOCLLINES(nil,fn, out),
-      setCurrentPackage callingPackage,
-      result),
-    endCompileDuration())
+  try
+    startCompileDuration()
+    callingPackage := _*PACKAGE_*
+    IN_-PACKAGE '"BOOTTRAN"
+    result := BOOTTOCLLINES(nil,fn, out)
+    setCurrentPackage callingPackage
+    result
+  finally endCompileDuration()
  
 ++ (bootclam "filename") translates the file "filename.boot" to
 ++ the common lisp file "filename.clisp" , producing, for each function
@@ -124,14 +124,14 @@ shoeClLines(a,fn,lines,outfn)==
 ++ the common lisp file "filename.clisp" with the original boot
 ++ code as comments
 BOOTTOCLC(fn, out)==
-  UNWIND_-PROTECT(
-    PROGN(startCompileDuration(),
-      callingPackage := _*PACKAGE_*,
-      IN_-PACKAGE '"BOOTTRAN",
-      result := BOOTTOCLCLINES(nil, fn, out),
-      setCurrentPackage callingPackage,
-      result),
-    endCompileDuration())
+  try
+    startCompileDuration()
+    callingPackage := _*PACKAGE_*
+    IN_-PACKAGE '"BOOTTRAN"
+    result := BOOTTOCLCLINES(nil, fn, out)
+    setCurrentPackage callingPackage
+    result
+  finally endCompileDuration()
  
 BOOTTOCLCLINES(lines, fn, outfn)==
   infn:=shoeAddbootIfNec fn
-- 
cgit v1.2.3