diff options
| author | dos-reis <gdr@axiomatics.org> | 2010-12-11 23:15:24 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2010-12-11 23:15:24 +0000 |
| commit | dd14d434d1d7d06cd90a5a8a0fd1bef6cfffda8f (patch) | |
| tree | 8ace9889673d5e3c8fceaf306b124dd388f216a6 /src/boot | |
| parent | a07faca18a3f5f7435cfc21f0a66a183d2c0cd05 (diff) | |
| download | open-axiom-dd14d434d1d7d06cd90a5a8a0fd1bef6cfffda8f.tar.gz | |
* interp/i-syscmd.boot: Use try-finally expression instead of Lisp
primitive UNWIND-PROJECT.
* interp/int-top.boot: Likewise.
* interp/lisplib.boot: Likewise.
* interp/server.boot: Likewise.
* boot/parser.boot (bpHandler): Allow semicolon separation.
Diffstat (limited to 'src/boot')
| -rw-r--r-- | src/boot/parser.boot | 2 | ||||
| -rw-r--r-- | src/boot/strap/parser.clisp | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/boot/parser.boot b/src/boot/parser.boot index 8212b965..4d475238 100644 --- a/src/boot/parser.boot +++ b/src/boot/parser.boot @@ -728,7 +728,7 @@ bpFinally() == bpHandler key == s := bpState() - bpEqKey "BACKSET" and bpEqKey key => true + (bpEqKey "BACKSET" or bpEqKey "SEMICOLON") and bpEqKey key => true bpRestore s false diff --git a/src/boot/strap/parser.clisp b/src/boot/strap/parser.clisp index 9cdd72cb..77744484 100644 --- a/src/boot/strap/parser.clisp +++ b/src/boot/strap/parser.clisp @@ -803,7 +803,9 @@ (PROGN (SETQ |s| (|bpState|)) (COND - ((AND (|bpEqKey| 'BACKSET) (|bpEqKey| |key|)) T) + ((AND (OR (|bpEqKey| 'BACKSET) (|bpEqKey| 'SEMICOLON)) + (|bpEqKey| |key|)) + T) (T (|bpRestore| |s|) NIL)))))) (DEFUN |bpLeave| () |