From 66c8612e257defa8e42bb7b50b0c88a73422e660 Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Mon, 27 Dec 2010 07:01:11 +0000
Subject: 	* boot/includer.boot (char): Move to token.boot. 	*
 boot/tokens.boot (shoeStartsId): Move from initial-env.lisp 	(shoeIdChar):
 Likewise. 	* boot/initial-env.lisp (CHARMEM): Remove.

---
 src/boot/strap/tokens.clisp | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'src/boot/strap/tokens.clisp')

diff --git a/src/boot/strap/tokens.clisp b/src/boot/strap/tokens.clisp
index a918ca35..101f143d 100644
--- a/src/boot/strap/tokens.clisp
+++ b/src/boot/strap/tokens.clisp
@@ -5,6 +5,16 @@
 
 (PROVIDE "tokens")
 
+(DEFUN |char| (|x|) (CHAR (SYMBOL-NAME |x|) 0))
+
+(DEFUN |shoeStartsId| (|x|)
+  (OR (ALPHA-CHAR-P |x|)
+      (MEMBER |x| (LIST (|char| '$) (|char| '?) (|char| '%)))))
+
+(DEFUN |shoeIdChar| (|x|)
+  (OR (ALPHANUMERICP |x|)
+      (MEMBER |x| (LIST (|char| '|'|) (|char| '?) (|char| '%)))))
+
 (DEFCONSTANT |shoeKeyWords|
     (LIST (LIST "and" 'AND) (LIST "by" 'BY) (LIST "case" 'CASE)
           (LIST "catch" 'CATCH) (LIST "cross" 'CROSS)
@@ -203,7 +213,9 @@
 
 (EVAL-WHEN (:EXECUTE :LOAD-TOPLEVEL)
   (LET ((|bfVar#9|
-            (LIST (LIST '|alphabetic?| 'ALPHA-CHAR-P)
+            (LIST (LIST '|abs| 'ABS)
+                  (LIST '|alphabetic?| 'ALPHA-CHAR-P)
+                  (LIST '|alphanumeric?| 'ALPHANUMERICP)
                   (LIST '|and| 'AND) (LIST '|append| 'APPEND)
                   (LIST '|apply| 'APPLY) (LIST '|atom| 'ATOM)
                   (LIST '|canonicalFilename| 'PROBE-FILE)
-- 
cgit v1.2.3