diff options
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/boot/strap/translator.clisp | 2 | ||||
| -rw-r--r-- | src/boot/translator.boot | 32 |
3 files changed, 23 insertions, 17 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 07e81b09..2cbddc90 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,11 @@ 2010-12-18 Gabriel Dos Reis <gdr@cs.tamu.edu> + * boot/translator.boot (BOOTTOCL): Replace Lisp-level contruct + with try/finally. + (BOOTTOCLC): Likewise. + +2010-12-18 Gabriel Dos Reis <gdr@cs.tamu.edu> + * boot/initial-env.lisp (SIZE): Remove. (MAKE-VEC): Likewise. (MAKE-CVEC): Likewise. 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 |