diff options
| author | dos-reis <gdr@axiomatics.org> | 2010-12-27 07:01:11 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2010-12-27 07:01:11 +0000 |
| commit | 66c8612e257defa8e42bb7b50b0c88a73422e660 (patch) | |
| tree | 6da0dcbef2c96b7ff01dc39ff73c737eaf435290 /src/boot/strap | |
| parent | 7ade11e95e821f312618b60b76ff94f94e7edfdd (diff) | |
| download | open-axiom-66c8612e257defa8e42bb7b50b0c88a73422e660.tar.gz | |
* 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.
Diffstat (limited to 'src/boot/strap')
| -rw-r--r-- | src/boot/strap/includer.clisp | 2 | ||||
| -rw-r--r-- | src/boot/strap/tokens.clisp | 14 |
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) |