diff options
| author | dos-reis <gdr@axiomatics.org> | 2012-05-28 14:09:02 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2012-05-28 14:09:02 +0000 |
| commit | 62a125276f6dc3acedaf11af209b7e4c02306128 (patch) | |
| tree | 81cf15675a49410d21e6277b7e5230b86232fd26 /src/boot/strap/scanner.clisp | |
| parent | 7be5c459a3b8d02d87e3a21edabfbf7227df613c (diff) | |
| download | open-axiom-62a125276f6dc3acedaf11af209b7e4c02306128.tar.gz | |
* interp/io.boot (findChar): Do not define here.
* interp/match.boot (charPosition): Likewise.
* boot/utility.boot (charPosition): Now return argument string
length if no match.
(findChar): New.
* boot/scanner.boot (lexerCharPosition): Adjust.
(shoeAccumulateLines): Use findChar.
Diffstat (limited to 'src/boot/strap/scanner.clisp')
| -rw-r--r-- | src/boot/strap/scanner.clisp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/boot/strap/scanner.clisp b/src/boot/strap/scanner.clisp index e1b8418a..744d4e28 100644 --- a/src/boot/strap/scanner.clisp +++ b/src/boot/strap/scanner.clisp @@ -69,10 +69,7 @@ (LIST 'SCHAR (LIST '|lexerLineString| |lex|) |k|)) (DEFUN |lexerCharPosition| (|lex| |c|) - (OR - (|charPosition| |c| (|lexerLineString| |lex|) - (|lexerCurrentPosition| |lex|)) - (|lexerLineLength| |lex|))) + (|charPosition| |c| (|lexerLineString| |lex|) (|lexerCurrentPosition| |lex|))) (DEFUN |lexerEol?| (|lex|) (NOT (< (|lexerCurrentPosition| |lex|) (|lexerLineLength| |lex|)))) @@ -164,7 +161,7 @@ (COND ((CHAR= (SCHAR |command| 0) (|char| '|;|)) (|shoeAccumulateLines| |lex| |$r| |string|)) - ((SETQ |a| (|charPosition| (|char| '|;|) |command| 0)) + ((SETQ |a| (|findChar| (|char| '|;|) |command|)) (|shoeAccumulateLines| |lex| |$r| (CONCAT |string| (|subString| |command| 0 |