* boot/tokens.boot: Automatically translate alphabetic?, digit?,

	lowerCase?, upperCase?, readByte, readInteger, readLine,
	writeByte, writeLine.
	* interp/as.boot: Use them.
	* interp/bc-matrix.boot: Likewise.
	* interp/bc-solve.boot: Likewise.
	* interp/br-con.boot: Likewise.
	* interp/br-search.boot: Likewise.
	* interp/br-util.boot: Likewise.
	* interp/c-doc.boot: Likewise.
	* interp/c-util.boot: Likewise.
	* interp/database.boot: Likewise.
	* interp/format.boot: Likewise.
	* interp/fortcall.boot: Likewise.
	* interp/functor.boot: Likewise.
	* interp/g-util.boot: Likewise.
	* interp/guess.boot: Likewise.
	* interp/ht-root.boot: Likewise.
	* interp/htcheck.boot: Likewise.
	* interp/htsetvar.boot: Likewise.
	* interp/i-map.boot: Likewise.
	* interp/i-output.boot: Likewise.
	* interp/i-syscmd.boot: Likewise.
	* interp/i-util.boot: Likewise.
	* interp/int-top.boot: Likewise.
	* interp/intfile.boot: Likewise.
	* interp/mark.boot: Likewise.
	* interp/msgdb.boot: Likewise.
	* interp/pf2sex.boot: Likewise.
	* interp/pspad1.boot: Likewise.
	* interp/pspad2.boot: Likewise.
	* interp/scan.boot: Likewise.
	* interp/slam.boot: Likewise.
	* interp/sys-utility.boot: Likewise.
	* interp/topics.boot: Likewise.
	* interp/trace.boot: Likewise.
	* interp/word.boot: Likewise.

2 files changed, 46 insertions, 35 deletions

diff --git a/src/boot/strap/tokens.clisp b/src/boot/strap/tokens.clisp
index 88d2552a..43f54797 100644
--- a/src/boot/strap/tokens.clisp
+++ b/src/boot/strap/tokens.clisp
@@ -199,41 +199,43 @@
       (SETQ |bfVar#8| (CDR |bfVar#8|)))))
 
 (EVAL-WHEN (:EXECUTE :LOAD-TOPLEVEL)
-  (LET ((|bfVar#9| (LIST (LIST '|and| 'AND) (LIST '|append| 'APPEND)
-                         (LIST '|apply| 'APPLY) (LIST '|atom| 'ATOM)
-                         (LIST '|cons?| 'CONSP) (LIST '|copy| 'COPY)
-                         (LIST '|croak| 'CROAK) (LIST '|drop| 'DROP)
-                         (LIST '|exit| 'EXIT) (LIST '|false| 'NIL)
-                         (LIST '|first| 'CAR) (LIST '|fourth| 'CADDDR)
-                         (LIST '|function| 'FUNCTION)
-                         (LIST '|gensym| 'GENSYM)
-                         (LIST '|genvar| 'GENVAR)
-                         (LIST '|integer?| 'INTEGERP)
-                         (LIST '|lastNode| 'LAST) (LIST 'LAST '|last|)
-                         (LIST '|list| 'LIST) (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 '|removeDuplicates| 'REMDUP)
-                         (LIST '|rest| 'CDR) (LIST '|reverse| 'REVERSE)
-                         (LIST '|second| 'CADR)
-                         (LIST '|setDifference| 'SETDIFFERENCE)
-                         (LIST '|setIntersection| 'INTERSECTION)
-                         (LIST '|setPart| 'SETELT)
-                         (LIST '|setUnion| 'UNION)
-                         (LIST '|strconc| 'CONCAT)
-                         (LIST '|string?| 'STRINGP)
-                         (LIST '|substitute| 'SUBST)
-                         (LIST '|symbol?| 'SYMBOLP)
-                         (LIST '|take| 'TAKE) (LIST '|third| 'CADDR)
-                         (LIST '|true| 'T) (LIST 'PLUS '+)
-                         (LIST 'MINUS '-) (LIST 'TIMES '*)
-                         (LIST 'POWER 'EXPT) (LIST 'SLASH '/)
-                         (LIST 'LT '<) (LIST 'GT '>) (LIST 'LE '<=)
-                         (LIST 'GE '>=) (LIST 'SHOEEQ 'EQUAL)
-                         (LIST 'SHOENE '/=) (LIST 'T 'T$)))
+  (LET ((|bfVar#9|
+            (LIST (LIST '|alphabetic?| 'ALPHA-CHAR-P)
+                  (LIST '|and| 'AND) (LIST '|append| 'APPEND)
+                  (LIST '|apply| 'APPLY) (LIST '|atom| 'ATOM)
+                  (LIST '|cons?| 'CONSP) (LIST '|copy| 'COPY)
+                  (LIST '|croak| 'CROAK) (LIST '|digit?| 'DIGITP)
+                  (LIST '|drop| 'DROP) (LIST '|exit| 'EXIT)
+                  (LIST '|false| 'NIL) (LIST '|first| 'CAR)
+                  (LIST '|fourth| 'CADDDR) (LIST '|function| 'FUNCTION)
+                  (LIST '|gensym| 'GENSYM) (LIST '|genvar| 'GENVAR)
+                  (LIST '|integer?| 'INTEGERP) (LIST '|lastNode| 'LAST)
+                  (LIST 'LAST '|last|) (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 '|readByte| 'READ-BYTE)
+                  (LIST '|readInteger| 'PARSE-INTEGER)
+                  (LIST '|readLine| 'READ-LINE)
+                  (LIST '|removeDuplicates| 'REMDUP)
+                  (LIST '|rest| 'CDR) (LIST '|reverse| 'REVERSE)
+                  (LIST '|second| 'CADR)
+                  (LIST '|setDifference| 'SETDIFFERENCE)
+                  (LIST '|setIntersection| 'INTERSECTION)
+                  (LIST '|setPart| 'SETELT) (LIST '|setUnion| 'UNION)
+                  (LIST '|strconc| 'CONCAT) (LIST '|string?| 'STRINGP)
+                  (LIST '|substitute| 'SUBST)
+                  (LIST '|symbol?| 'SYMBOLP) (LIST '|take| 'TAKE)
+                  (LIST '|third| 'CADDR) (LIST '|true| 'T)
+                  (LIST '|upperCase?| 'UPPER-CASE-P)
+                  (LIST '|writeByte| 'WRITE-BYTE)
+                  (LIST '|writeLine| 'WRITE-LINE) (LIST 'PLUS '+)
+                  (LIST 'MINUS '-) (LIST 'TIMES '*) (LIST 'POWER 'EXPT)
+                  (LIST 'SLASH '/) (LIST 'LT '<) (LIST 'GT '>)
+                  (LIST 'LE '<=) (LIST 'GE '>=) (LIST 'SHOEEQ 'EQUAL)
+                  (LIST 'SHOENE '/=) (LIST 'T 'T$)))
         (|i| NIL))
     (LOOP
       (COND
diff --git a/src/boot/tokens.boot b/src/boot/tokens.boot
index 74c5e437..0c6e8818 100644
--- a/src/boot/tokens.boot
+++ b/src/boot/tokens.boot
@@ -234,6 +234,7 @@ for i in [ _
        repeat SETF (GET(first i,'SHOETHETA),CDR i)
 
 for i in [ _
+  ["alphabetic?", "ALPHA-CHAR-P"], _
   ["and",          "AND"]  , _
   ["append",    "APPEND"]  , _
   ["apply",      "APPLY"]  , _
@@ -241,6 +242,7 @@ for i in [ _
   ["cons?",      "CONSP"]  , _
   ["copy",        "COPY"]  , _
   ["croak",      "CROAK"]  , _
+  ["digit?",    "DIGITP"]  , _
   ["drop",        "DROP"]  , _
   ["exit",        "EXIT"]  , _
   ["false",        'NIL]   , _
@@ -253,6 +255,7 @@ for i in [ _
   ["lastNode",    "LAST"]  , _
   ["LAST",        "last"] , _
   ["list",        "LIST"]  , _
+  ["lowerCase?", "LOWER-CASE-P"], _
   ["mkpf",        "MKPF"]  , _
   ["nconc",      "NCONC"]  , _
   ["nil"           ,NIL ]  , _
@@ -261,6 +264,9 @@ for i in [ _
   ["null",        "NULL"]  , _
   ["or",            "OR"]  , _
   ["otherwise",      "T"]  , _
+  ["readByte", "READ-BYTE"], _
+  ["readInteger", "PARSE-INTEGER"], _
+  ["readLine", "READ-LINE"], _
   ["removeDuplicates", "REMDUP"]  , _
   ["rest",         "CDR"]  , _
   ["reverse",  "REVERSE"]  , _
@@ -276,6 +282,9 @@ for i in [ _
   ["take",        "TAKE"]  , 
   ["third",      "CADDR"] , _
   ["true",           "T"]  , _
+  ["upperCase?", "UPPER-CASE-P"], _
+  ["writeByte", "WRITE-BYTE"], _
+  ["writeLine", "WRITE-LINE"], _
   ["PLUS",           "+"]  , _
   ["MINUS",     "-"]  , _
   ["TIMES",          "*"]  , _