diff options
| author | dos-reis <gdr@axiomatics.org> | 2010-12-30 12:10:11 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2010-12-30 12:10:11 +0000 |
| commit | b1fb4cb58a886484e213bd1235f6de75713950c9 (patch) | |
| tree | 9081e1cd5af4cc6af281259faed5352035a26dec /src/boot | |
| parent | e46eacc852aacf74de6d98ed5aad9249f41eabb0 (diff) | |
| download | open-axiom-b1fb4cb58a886484e213bd1235f6de75713950c9.tar.gz | |
more string cleanups
Diffstat (limited to 'src/boot')
| -rw-r--r-- | src/boot/ast.boot | 4 | ||||
| -rw-r--r-- | src/boot/strap/ast.clisp | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/boot/ast.boot b/src/boot/ast.boot index f1ad60cd..8d3f8c5c 100644 --- a/src/boot/ast.boot +++ b/src/boot/ast.boot @@ -748,11 +748,11 @@ bfChar? x == char? x or cons? x and first x in '(char CODE_-CHAR SCHAR) bfSmintable x== - integer? x or cons? x and first x in '(SIZE LENGTH) + integer? x or cons? x and first x in '(SIZE LENGTH CHAR_-CODE) bfString? x == string? x - or cons? x and first x in '(charString symbolName toString subString) + or cons? x and first x in '(STRING SYMBOL_-NAME subString) bfQ(l,r)== bfChar? l or bfChar? r => ["CHAR=",l,r] diff --git a/src/boot/strap/ast.clisp b/src/boot/strap/ast.clisp index 6a947261..9468fb13 100644 --- a/src/boot/strap/ast.clisp +++ b/src/boot/strap/ast.clisp @@ -1211,13 +1211,12 @@ (DEFUN |bfSmintable| (|x|) (OR (INTEGERP |x|) - (AND (CONSP |x|) (MEMQ (CAR |x|) '(SIZE LENGTH QENUM))))) + (AND (CONSP |x|) (MEMQ (CAR |x|) '(SIZE LENGTH CHAR-CODE))))) (DEFUN |bfString?| (|x|) (OR (STRINGP |x|) (AND (CONSP |x|) - (MEMQ (CAR |x|) - '(|charString| |symbolName| |toString| |subString|))))) + (MEMQ (CAR |x|) '(STRING SYMBOL-NAME |subString|))))) (DEFUN |bfQ| (|l| |r|) (COND |