diff options
| author | dos-reis <gdr@axiomatics.org> | 2010-12-18 19:02:56 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2010-12-18 19:02:56 +0000 |
| commit | 0b00c2ae8f58ce6d812f6ce3fbfecc19db7ffd3f (patch) | |
| tree | dff999d6fe7258432408bb1663fcc714cfdbfe5a /src/boot/strap | |
| parent | 751f5dd0f97c1c6e53dcb0ca118f1a8b5cb7fc59 (diff) | |
| download | open-axiom-0b00c2ae8f58ce6d812f6ce3fbfecc19db7ffd3f.tar.gz | |
* boot/initial-env.lisp (SIZE): Remove.
(MAKE-VEC): Likewise.
(MAKE-CVEC): Likewise.
Diffstat (limited to 'src/boot/strap')
| -rw-r--r-- | src/boot/strap/scanner.clisp | 6 | ||||
| -rw-r--r-- | src/boot/strap/tokens.clisp | 20 |
2 files changed, 14 insertions, 12 deletions
diff --git a/src/boot/strap/scanner.clisp b/src/boot/strap/scanner.clisp index 42cb92e3..0fe763ad 100644 --- a/src/boot/strap/scanner.clisp +++ b/src/boot/strap/scanner.clisp @@ -545,16 +545,16 @@ (PROGN (SETQ |h| (QENUM |l| |i|)) (SETQ |u| (ELT |d| |h|)) - (SETQ |ll| (SIZE |l|)) + (SETQ |ll| (LENGTH |l|)) (SETQ |done| NIL) (SETQ |s1| "") - (LET ((|bfVar#2| (- (SIZE |u|) 1)) (|j| 0)) + (LET ((|bfVar#2| (- (LENGTH |u|) 1)) (|j| 0)) (LOOP (COND ((OR (> |j| |bfVar#2|) |done|) (RETURN NIL)) (T (PROGN (SETQ |s| (ELT |u| |j|)) - (SETQ |ls| (SIZE |s|)) + (SETQ |ls| (LENGTH |s|)) (SETQ |done| (COND ((< |ll| (+ |ls| |i|)) NIL) diff --git a/src/boot/strap/tokens.clisp b/src/boot/strap/tokens.clisp index 04f5b124..a918ca35 100644 --- a/src/boot/strap/tokens.clisp +++ b/src/boot/strap/tokens.clisp @@ -84,7 +84,7 @@ (COND ((< (LENGTH (ELT |u| |k|)) |l|) (RETURN NIL)) (T (SETQ |k| (+ |k| 1))))) - (SETQ |v| (MAKE-VEC (+ |n| 1))) + (SETQ |v| (MAKE-ARRAY (+ |n| 1))) (LET ((|bfVar#2| (- |k| 1)) (|i| 0)) (LOOP (COND @@ -108,9 +108,9 @@ (SETQ |l| (HKEYS |shoeKeyTable|)) (SETQ |d| (PROGN - (SETQ |a| (MAKE-VEC 256)) - (SETQ |b| (MAKE-VEC 1)) - (SETF (ELT |b| 0) (MAKE-CVEC 0)) + (SETQ |a| (MAKE-ARRAY 256)) + (SETQ |b| (MAKE-ARRAY 1)) + (SETF (ELT |b| 0) (MAKE-STRING 0)) (LET ((|i| 0)) (LOOP (COND @@ -209,7 +209,7 @@ (LIST '|canonicalFilename| 'PROBE-FILE) (LIST '|char?| 'CHARACTERP) (LIST '|cons?| 'CONSP) (LIST '|copy| 'COPY) (LIST '|croak| 'CROAK) - (LIST '|digit?| 'DIGITP) (LIST '|drop| 'DROP) + (LIST '|digit?| 'DIGIT-CHAR-P) (LIST '|drop| 'DROP) (LIST '|exit| 'EXIT) (LIST '|false| 'NIL) (LIST '|first| 'CAR) (LIST '|fourth| 'CADDDR) (LIST '|function| 'FUNCTION) (LIST '|gensym| 'GENSYM) @@ -218,10 +218,12 @@ (LIST '|list| 'LIST) (LIST '|lowerCase?| 'LOWER-CASE-P) (LIST '|mkpf| 'MKPF) (LIST '|nconc| 'NCONC) - (LIST '|nil| NIL) (LIST '|not| 'NOT) - (LIST '|nreverse| 'NREVERSE) (LIST '|null| 'NULL) - (LIST '|or| 'OR) (LIST '|otherwise| 'T) - (LIST '|property| 'GET) (LIST '|readByte| 'READ-BYTE) + (LIST '|newString| 'MAKE-STRING) + (LIST '|newVector| 'MAKE-ARRAY) (LIST '|nil| NIL) + (LIST '|not| 'NOT) (LIST '|nreverse| 'NREVERSE) + (LIST '|null| 'NULL) (LIST '|or| 'OR) + (LIST '|otherwise| 'T) (LIST '|property| 'GET) + (LIST '|readByte| 'READ-BYTE) (LIST '|readInteger| 'PARSE-INTEGER) (LIST '|readLine| 'READ-LINE) (LIST '|readOnly?| 'CONSTANTP) |