diff options
| author | dos-reis <gdr@axiomatics.org> | 2012-05-08 10:10:34 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2012-05-08 10:10:34 +0000 |
| commit | 5852b522a6637ecde8dbc53204b3cd00c565fae9 (patch) | |
| tree | c8ec7d45df02f249ee88568a30145305879ff32b /src/interp/preparse.lisp | |
| parent | aaf651bcb0b8b0cef21cc4e5cceb1be231d5a2b7 (diff) | |
| download | open-axiom-5852b522a6637ecde8dbc53204b3cd00c565fae9.tar.gz | |
* boot/tokens.boot: Export char. Do not rename maxIndex.
* lisp/core.lisp.in (maxIndex): Define and export.
* interp/bootlex.lisp: Adjust.
* interp/parsing.lisp: Likewise.
* interp/macros.lisp: Likewise.
(DROPTRAILINGBLANKS): Remove.
(BLANKP): Likewise.
(NONBLANKLOC): Likewise.
* interp/io.boot (trimTrailingBlank): New.
(firstNonblankCharPosition): Likewise.
* interp/preparse.lisp: Use them. Adjust.
* interp/sys-macros.lisp (char): Remove.
* interp/vmlisp.lisp (MAXINDEX): Likewise.
* interp/br-search.boot (pmTransFilter): Fix bogus uses of char.
* interp/debug.lisp: Likewise.
* interp/g-util.boot: Likewise.
* interp/ht-root.boot: Likewise.
* interp/i-output.boot: Likewise.
* interp/i-syscmd.boot: Likewise.
Diffstat (limited to 'src/interp/preparse.lisp')
| -rw-r--r-- | src/interp/preparse.lisp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/interp/preparse.lisp b/src/interp/preparse.lisp index bab9621c..7eeb3cbd 100644 --- a/src/interp/preparse.lisp +++ b/src/interp/preparse.lisp @@ -151,10 +151,10 @@ (setq I (1+ N)) (GO STRLOOP) NOCOMS (setq SLOC (|indentationLocation| A)) - (setq A (DROPTRAILINGBLANKS A)) + (setq A (|trimTrailingBlank| A)) (cond ((NULL SLOC) (setq SLOC PSLOC) (GO READLOOP))) - (cond ((EQ (ELT A (MAXINDEX A)) #\_) - (setq CONTINUE T a (subseq A (MAXINDEX A)))) + (cond ((EQ (ELT A (|maxIndex| A)) #\_) + (setq CONTINUE T a (subseq A (|maxIndex| A)))) ((setq CONTINUE NIL))) (if (and (null LINES) (= SLOC 0)) ;;test for skipping constructors (if (and |$byConstructors| @@ -229,14 +229,14 @@ (COND ( (NOT (STRINGP LINE)) (RETURN (LIST $INDEX)) ) ) - (SETQ LINE (DROPTRAILINGBLANKS LINE)) + (SETQ LINE (|trimTrailingBlank| LINE)) (PUSH (COPY-SEQ LINE) $EchoLineStack) ;; next line must evaluate $INDEX before recursive call (RETURN (CONS $INDEX (COND - ( (AND (> (SETQ IND (MAXINDEX LINE)) -1) (char= (ELT LINE IND) #\_)) + ( (AND (> (SETQ IND (|maxIndex| LINE)) -1) (char= (ELT LINE IND) #\_)) (setq $preparse-last-line (STRCONC (SUBSTRING LINE 0 IND) (CDR (|preparseReadLine1| X))) )) ( 'T @@ -293,7 +293,7 @@ (cdr slines) (cdr slocs))) (if (> count 0) (progn - (setf (char (car slines) (1- (nonblankloc (car slines)))) + (setf (char (car slines) (1- (|firstNonblankCharPosition| (car slines)))) #\( ) (setq slines (|drop| (1- i) slines)) (rplaca slines (|addClose| (car slines) #\) )))))))) |