diff options
| author | dos-reis <gdr@axiomatics.org> | 2010-05-07 01:09:19 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2010-05-07 01:09:19 +0000 |
| commit | 57cc9e7ab4606e72a6a12fd73fc4cc3cf0e10a83 (patch) | |
| tree | d5b9110e0ec3749173ab6b6ec07f42c160f5ccdb /src/boot/strap | |
| parent | e869c4e050f29dffb51d26f53489422020f49e4f (diff) | |
| download | open-axiom-57cc9e7ab4606e72a6a12fd73fc4cc3cf0e10a83.tar.gz | |
* boot/ast.boot: Miscellaneous cleanup.
* boot/includer.boot: Likewise.
* boot/parser.boot: Likewise.
* boot/pile.boot: Likewise.
* boot/scanner.boot: Likewise.
* boot/tokens.boot: Likewise.
* boot/translator.boot: Likewise.
Diffstat (limited to 'src/boot/strap')
| -rw-r--r-- | src/boot/strap/ast.clisp | 8 | ||||
| -rw-r--r-- | src/boot/strap/scanner.clisp | 3 | ||||
| -rw-r--r-- | src/boot/strap/tokens.clisp | 4 | ||||
| -rw-r--r-- | src/boot/strap/translator.clisp | 2 |
4 files changed, 7 insertions, 10 deletions
diff --git a/src/boot/strap/ast.clisp b/src/boot/strap/ast.clisp index f9a2ecec..485babb7 100644 --- a/src/boot/strap/ast.clisp +++ b/src/boot/strap/ast.clisp @@ -879,7 +879,7 @@ (PROG (|funsR| |funsA| |p| |funs|) (RETURN (COND - ((NULL (CONSP |expr|)) (LIST |acc| |expr|)) + ((ATOM |expr|) (LIST |acc| |expr|)) ((AND (EQ |acc| 'CAR) (CONSP |expr|) (EQ (CAR |expr|) 'REVERSE)) (LIST 'CAR (CONS 'LAST (CDR |expr|)))) @@ -1158,7 +1158,7 @@ (DEFUN |bfAND| (|l|) (COND - ((NULL |l|) 'T) + ((NULL |l|) T) ((NULL (CDR |l|)) (CAR |l|)) (T (CONS 'AND (LET ((|bfVar#92| NIL) (|bfVar#91| |l|) (|c| NIL)) @@ -2984,9 +2984,7 @@ (NULL (CDR |ISTMP#2|)) (PROGN (SETQ |s| (CAR |ISTMP#2|)) T))))))) (|coreError| "invalid function type")) - (T (COND - ((AND (NOT (NULL |s|)) (SYMBOLP |s|)) - (SETQ |s| (LIST |s|)))) + (T (COND ((AND |s| (SYMBOLP |s|)) (SETQ |s| (LIST |s|)))) (COND ((|%hasFeature| :GCL) (|genGCLnativeTranslation| |op| |s| |t| |op'|)) diff --git a/src/boot/strap/scanner.clisp b/src/boot/strap/scanner.clisp index b0d7dbf3..d0fb9800 100644 --- a/src/boot/strap/scanner.clisp +++ b/src/boot/strap/scanner.clisp @@ -534,8 +534,7 @@ (DEFUN |shoeKeyWord| (|st|) (GETHASH |st| |shoeKeyTable|)) -(DEFUN |shoeKeyWordP| (|st|) - (NOT (NULL (GETHASH |st| |shoeKeyTable|)))) +(DEFUN |shoeKeyWordP| (|st|) (GETHASH |st| |shoeKeyTable|)) (DEFUN |shoeMatch| (|l| |i|) (|shoeSubStringMatch| |l| |shoeDict| |i|)) diff --git a/src/boot/strap/tokens.clisp b/src/boot/strap/tokens.clisp index 21e9f7a0..f2853636 100644 --- a/src/boot/strap/tokens.clisp +++ b/src/boot/strap/tokens.clisp @@ -188,8 +188,8 @@ (LIST 'CONS NIL) (LIST 'APPEND NIL) (LIST '|append| NIL) (LIST 'UNION NIL) (LIST 'UNIONQ NIL) (LIST '|union| NIL) - (LIST 'NCONC NIL) (LIST '|and| 'T) (LIST '|or| NIL) - (LIST 'AND 'T) (LIST 'OR NIL))) + (LIST 'NCONC NIL) (LIST '|and| T) (LIST '|or| NIL) + (LIST 'AND T) (LIST 'OR NIL))) (|i| NIL)) (LOOP (COND diff --git a/src/boot/strap/translator.clisp b/src/boot/strap/translator.clisp index 59251588..9a23effe 100644 --- a/src/boot/strap/translator.clisp +++ b/src/boot/strap/translator.clisp @@ -532,7 +532,7 @@ (COND ((|bfTupleP| |argTypes|) (SETQ |argTypes| (CDR |argTypes|)))) (COND - ((AND (NOT (NULL |argTypes|)) (SYMBOLP |argTypes|)) + ((AND |argTypes| (SYMBOLP |argTypes|)) (SETQ |argTypes| (LIST |argTypes|)))) (LIST 'DECLAIM (LIST 'FTYPE (LIST 'FUNCTION |argTypes| |valType|) |n|))) |