From 5852b522a6637ecde8dbc53204b3cd00c565fae9 Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Tue, 8 May 2012 10:10:34 +0000
Subject: * boot/tokens.boot: Export char. Do not rename maxIndex.
* lisp/core.lisp.in (maxIndex): Define and export. * interp/bootlex.lisp:
Adjust. * interp/parsing.lisp: Likewise. * interp/macros.lisp:
Likewise. (DROPTRAILINGBLANKS): Remove. (BLANKP): Likewise.
(NONBLANKLOC): Likewise. * interp/io.boot (trimTrailingBlank): New.
(firstNonblankCharPosition): Likewise. * interp/preparse.lisp: Use
them. Adjust. * interp/sys-macros.lisp (char): Remove. *
interp/vmlisp.lisp (MAXINDEX): Likewise. * interp/br-search.boot
(pmTransFilter): Fix bogus uses of char. * interp/debug.lisp: Likewise.
* interp/g-util.boot: Likewise. * interp/ht-root.boot:
Likewise. * interp/i-output.boot: Likewise. *
interp/i-syscmd.boot: Likewise.
---
src/boot/strap/tokens.clisp | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
(limited to 'src/boot/strap')
diff --git a/src/boot/strap/tokens.clisp b/src/boot/strap/tokens.clisp
index 7b16a885..8dd98d44 100644
--- a/src/boot/strap/tokens.clisp
+++ b/src/boot/strap/tokens.clisp
@@ -6,7 +6,9 @@
(PROVIDE "tokens")
(EVAL-WHEN (:COMPILE-TOPLEVEL :LOAD-TOPLEVEL :EXECUTE)
- (EXPORT '|$InteractiveMode|))
+ (EXPORT '(|$InteractiveMode| |char|)))
+
+(DECLAIM (FTYPE (FUNCTION (|%Symbol|) |%Char|) |char|))
(DEFPARAMETER |$InteractiveMode| NIL)
@@ -211,11 +213,10 @@
(LIST '|genvar| 'GENVAR) (LIST '|integer?| 'INTEGERP)
(LIST 'LAST '|last|) (LIST '|list| 'LIST) (LIST '|listEq?| 'EQUAL)
(LIST '|lowerCase?| 'LOWER-CASE-P) (LIST '|makeSymbol| 'INTERN)
- (LIST '|maxIndex| 'MAXINDEX) (LIST '|mkpf| 'MKPF)
- (LIST '|newVector| 'MAKE-ARRAY) (LIST '|nil| NIL)
- (LIST '|not| 'NOT) (LIST '|null| 'NULL) (LIST '|odd?| 'ODDP)
- (LIST '|or| 'OR) (LIST '|otherwise| 'T) (LIST '|property| 'GET)
- (LIST '|readInteger| 'PARSE-INTEGER)
+ (LIST '|mkpf| 'MKPF) (LIST '|newVector| 'MAKE-ARRAY)
+ (LIST '|nil| NIL) (LIST '|not| 'NOT) (LIST '|null| 'NULL)
+ (LIST '|odd?| 'ODDP) (LIST '|or| 'OR) (LIST '|otherwise| 'T)
+ (LIST '|property| 'GET) (LIST '|readInteger| 'PARSE-INTEGER)
(LIST '|readLispFromString| 'READ-FROM-STRING)
(LIST '|readOnly?| 'CONSTANTP) (LIST '|removeDuplicates| 'REMDUP)
(LIST '|rest| 'CDR) (LIST '|sameObject?| 'EQ)
--
cgit v1.2.3