diff options
| author | dos-reis <gdr@axiomatics.org> | 2012-05-08 10:10:34 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2012-05-08 10:10:34 +0000 |
| commit | 5852b522a6637ecde8dbc53204b3cd00c565fae9 (patch) | |
| tree | c8ec7d45df02f249ee88568a30145305879ff32b /src/boot | |
| parent | aaf651bcb0b8b0cef21cc4e5cceb1be231d5a2b7 (diff) | |
| download | open-axiom-5852b522a6637ecde8dbc53204b3cd00c565fae9.tar.gz | |
* 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.
Diffstat (limited to 'src/boot')
| -rw-r--r-- | src/boot/strap/tokens.clisp | 13 | ||||
| -rw-r--r-- | src/boot/tokens.boot | 6 |
2 files changed, 10 insertions, 9 deletions
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) diff --git a/src/boot/tokens.boot b/src/boot/tokens.boot index b9a2e2a8..bcfa8e52 100644 --- a/src/boot/tokens.boot +++ b/src/boot/tokens.boot @@ -1,6 +1,6 @@ -- Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd. -- All rights reserved. --- Copyright (C) 2007-2011, Gabriel Dos Reis. +-- Copyright (C) 2007-2012, Gabriel Dos Reis. -- All rights reserved. -- -- Redistribution and use in source and binary forms, with or without @@ -34,7 +34,8 @@ import utility namespace BOOTTRAN -module tokens ($InteractiveMode) +module tokens ($InteractiveMode, char) where + char: %Symbol -> %Char ++ If true, means the system is in interactive mode. $InteractiveMode := false @@ -279,7 +280,6 @@ for i in [ _ ["listEq?", "EQUAL"] , _ ["lowerCase?", "LOWER-CASE-P"], _ ["makeSymbol", "INTERN"] , _ - ["maxIndex", "MAXINDEX"] , _ ["mkpf", "MKPF"] , _ ["newVector", "MAKE-ARRAY"], _ ["nil" ,NIL ] , _ |