aboutsummaryrefslogtreecommitdiff
path: root/src/boot/strap
diff options
context:
space:
mode:
Diffstat (limited to 'src/boot/strap')
-rw-r--r--src/boot/strap/includer.clisp2
-rw-r--r--src/boot/strap/tokens.clisp14
2 files changed, 13 insertions, 3 deletions
diff --git a/src/boot/strap/includer.clisp b/src/boot/strap/includer.clisp
index 154e1cd4..99c6a5fb 100644
--- a/src/boot/strap/includer.clisp
+++ b/src/boot/strap/includer.clisp
@@ -11,8 +11,6 @@
((CHARACTERP |x|) (STRING |x|))
(T NIL)))
-(DEFUN |char| (|x|) (CHAR (PNAME |x|) 0))
-
(DEFUN |shoeCLOSE| (|stream|) (CLOSE |stream|))
(DEFUN |shoeNotFound| (|fn|)
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)