diff options
author | dos-reis <gdr@axiomatics.org> | 2009-09-02 06:13:00 +0000 |
---|---|---|
committer | dos-reis <gdr@axiomatics.org> | 2009-09-02 06:13:00 +0000 |
commit | 327b4fb2c149c02dd72f3d8f6070b6e0144828ee (patch) | |
tree | 4a54053499886efc418c2ba5ac54c686780c9823 /src/boot/strap/includer.clisp | |
parent | d7aca7e90f3579181f67804f7ac7ba0da4eb44d9 (diff) | |
download | open-axiom-327b4fb2c149c02dd72f3d8f6070b6e0144828ee.tar.gz |
* boot/ast.boot: More cleanup.
* boot/includer.boot: Likewise.
* boot/parser.boot: Likewise.
* boot/scanner.boot: Likewise.
Diffstat (limited to 'src/boot/strap/includer.clisp')
-rw-r--r-- | src/boot/strap/includer.clisp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/boot/strap/includer.clisp b/src/boot/strap/includer.clisp index 6146ddc7..94aee881 100644 --- a/src/boot/strap/includer.clisp +++ b/src/boot/strap/includer.clisp @@ -13,8 +13,6 @@ (DEFUN |char| (|x|) (CHAR (PNAME |x|) 0)) -(DEFUN EQCAR (|x| |y|) (AND (CONSP |x|) (EQ (CAR |x|) |y|))) - (DEFUN STRINGIMAGE (|x|) (WRITE-TO-STRING |x|)) (DEFUN |shoeCLOSE| (|stream|) (CLOSE |stream|)) @@ -134,17 +132,19 @@ (PROG (|st|) (RETURN (COND - ((OR (NULL |x|) (EQCAR |x| '|nullstream|)) T) + ((OR (NULL |x|) (AND (CONSP |x|) (EQ (CAR |x|) '|nullstream|))) + T) ('T (LOOP (COND - ((NOT (EQCAR |x| '|nonnullstream|)) (RETURN NIL)) + ((NOT (AND (CONSP |x|) (EQ (CAR |x|) '|nonnullstream|))) + (RETURN NIL)) ('T (PROGN (SETQ |st| (APPLY (CADR |x|) (CDDR |x|))) (RPLACA |x| (CAR |st|)) (RPLACD |x| (CDR |st|)))))) - (EQCAR |x| '|nullstream|)))))) + (AND (CONSP |x|) (EQ (CAR |x|) '|nullstream|))))))) (DEFUN |bMap| (|f| |x|) (|bDelay| #'|bMap1| (LIST |f| |x|))) |