aboutsummaryrefslogtreecommitdiff
path: root/src/boot/strap/ast.clisp
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2008-08-02 10:21:14 +0000
committerdos-reis <gdr@axiomatics.org>2008-08-02 10:21:14 +0000
commitc129ad817cd16aef92f5b433a509e15254b9ccd3 (patch)
tree006c41bd43cfeea3a3a85e007f2e2efbb6b9a410 /src/boot/strap/ast.clisp
parented7ceb86d0c98c28c2dc545c3fc20594d6c325df (diff)
downloadopen-axiom-c129ad817cd16aef92f5b433a509e15254b9ccd3.tar.gz
* boot/parser.boot (bpTerm): Term forms depend on the kind of
variable. (bpTypeItem): New. (bpTypeItemList): Use it. (bpTypeAliasDefition): Tidy. (bpCaseItem): Accept wildchars in pattern terms. * boot/ast.boot (bfCompDef): Don't name unused pattern variables. (bfSmintable): A character compares EQL. (bfCI): Ignore wildcard pattern variables. * boot/strap: Update cached Lisp translation.
Diffstat (limited to 'src/boot/strap/ast.clisp')
-rw-r--r--src/boot/strap/ast.clisp23
1 files changed, 13 insertions, 10 deletions
diff --git a/src/boot/strap/ast.clisp b/src/boot/strap/ast.clisp
index fdfc2f47..8f1b5b77 100644
--- a/src/boot/strap/ast.clisp
+++ b/src/boot/strap/ast.clisp
@@ -96,8 +96,8 @@
(DEFUN |SuchThat| #0=(|bfVar#51|) (CONS '|SuchThat| (LIST . #0#)))
-(DEFUN |Assignment| #0=(|bfVar#52| |bfVar#53|)
- (CONS '|Assignment| (LIST . #0#)))
+(DEFUN |%Assignment| #0=(|bfVar#52| |bfVar#53|)
+ (CONS '|%Assignment| (LIST . #0#)))
(DEFUN |While| #0=(|bfVar#54|) (CONS '|While| (LIST . #0#)))
@@ -229,9 +229,7 @@
(SETQ |bfVar#78| |x|)
(SETQ |bfVar#79| (CDR |bfVar#78|))
(CASE (CAR |bfVar#78|)
- (|ConstantDefinition|
- (LET ((|n| (CAR |bfVar#79|)) (|e| (CADR |bfVar#79|)))
- |x|))
+ (|ConstantDefinition| |x|)
(T (COND
((AND (CONSP |x|)
(PROGN
@@ -1252,7 +1250,8 @@
(AND (EQCAR |x| 'QUOTE) (IDENTP (CADR |x|))))
(DEFUN |bfSmintable| (|x|)
- (OR (INTEGERP |x|) (AND (CONSP |x|) (MEMQ (CAR |x|) '(SIZE LENGTH)))))
+ (OR (INTEGERP |x|)
+ (AND (CONSP |x|) (MEMBER (CAR |x|) '(SIZE LENGTH |char|)))))
(DEFUN |bfQ| (|l| |r|)
(COND
@@ -2119,12 +2118,16 @@
(PROGN (SETQ |i| (CAR |bfVar#126|)) NIL))
(RETURN (NREVERSE |bfVar#127|)))
('T
- (SETQ |bfVar#127|
- (CONS (LIST |i| (|bfCARCDR| |j| |g|))
- |bfVar#127|))))
+ (AND (NOT (EQ |i| 'DOT))
+ (SETQ |bfVar#127|
+ (CONS
+ (LIST |i| (|bfCARCDR| |j| |g|))
+ |bfVar#127|)))))
(SETQ |bfVar#126| (CDR |bfVar#126|))
(SETQ |j| (+ |j| 1)))))
- (LIST (CAR |x|) (LIST 'LET |b| |y|))))))))
+ (COND
+ ((NULL |b|) (LIST (CAR |x|) |y|))
+ ('T (LIST (CAR |x|) (LIST 'LET |b| |y|))))))))))
(DECLAIM (FTYPE (FUNCTION (|%Short| |%Thing|) |%List|) |bfCARCDR|))