From 2b2ae9894f66dba65af62fb08b9d79b2aee2a2a8 Mon Sep 17 00:00:00 2001 From: dos-reis Date: Sun, 2 Jan 2011 10:09:37 +0000 Subject: * interp/nrunfast.boot (evalSlotDomain): Expand to VM forms before value argument evaluation. (lazyMatch): Check for %llength too. * interp/g-opt.boot ($VMsideEffectFreeOperators): Include %2bit and %2bool. * interp/g-util.boot: Expand them. * interp/define.boot (compJoin): Check for %llenght too. * algebra/boolean.spad.pamphlet: Tidy. * algebra/domain.spad.pamphlet: Likewise. * algebra/draw.spad.pamphlet: Likewise. * algebra/files.spad.pamphlet: Likewise. * algebra/list.spad.pamphlet: Likewise. * algebra/outform.spad.pamphlet: Likewise. * algebra/sex.spad.pamphlet: Likewise. * algebra/sf.spad.pamphlet: Likewise. --- src/algebra/strap/SYMBOL.lsp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'src/algebra/strap/SYMBOL.lsp') diff --git a/src/algebra/strap/SYMBOL.lsp b/src/algebra/strap/SYMBOL.lsp index 1ab934bc..583b62d2 100644 --- a/src/algebra/strap/SYMBOL.lsp +++ b/src/algebra/strap/SYMBOL.lsp @@ -195,12 +195,14 @@ (SPADCALL |x| (|getShellEntry| $ 79))) (DEFUN |SYMBOL;syprefix| (|sc| $) - (LET ((|ns| (LIST (LENGTH (QVELT |sc| 3)) (LENGTH (QVELT |sc| 2)) - (LENGTH (QVELT |sc| 1)) (LENGTH (QVELT |sc| 0))))) + (LET ((|ns| (LIST (LIST-LENGTH (QVELT |sc| 3)) + (LIST-LENGTH (QVELT |sc| 2)) + (LIST-LENGTH (QVELT |sc| 1)) + (LIST-LENGTH (QVELT |sc| 0))))) (SEQ (LOOP (COND ((NOT (COND - ((NOT (< (LENGTH |ns|) 2)) + ((NOT (< (LIST-LENGTH |ns|) 2)) (ZEROP (|SPADfirst| |ns|))) (T NIL))) (RETURN NIL)) @@ -208,7 +210,7 @@ (EXIT (SPADCALL (CONS (STRCONC (|getShellEntry| $ 38) (|SYMBOL;istring| - (LENGTH (QVELT |sc| 4)) $)) + (LIST-LENGTH (QVELT |sc| 4)) $)) (LET ((#0=#:G1524 (NREVERSE |ns|)) (#1=#:G1523 NIL)) (LOOP @@ -569,7 +571,7 @@ ((ATOM #1#) (RETURN NIL)) (T (LET ((|n| (CAR #1#))) (COND - ((< (LENGTH |allscripts|) |n|) + ((< (LIST-LENGTH |allscripts|) |n|) (|error| "Improper script count in symbol")) (T (SEQ -- cgit v1.2.3