diff options
| author | dos-reis <gdr@axiomatics.org> | 2011-04-30 18:55:21 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2011-04-30 18:55:21 +0000 |
| commit | 42cf0984b569e49060252e536c0c7e7aee469873 (patch) | |
| tree | c2cb31c68df04f75bfd9a490ae10b9c6cf795102 /src/interp/preparse.lisp | |
| parent | 5770442f576aa0c1e389344a636f1e4edca1b136 (diff) | |
| download | open-axiom-42cf0984b569e49060252e536c0c7e7aee469873.tar.gz | |
* More cleanup
Diffstat (limited to 'src/interp/preparse.lisp')
| -rw-r--r-- | src/interp/preparse.lisp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/interp/preparse.lisp b/src/interp/preparse.lisp index 059caf40..dcab95f1 100644 --- a/src/interp/preparse.lisp +++ b/src/interp/preparse.lisp @@ -98,7 +98,7 @@ (defun PREPARSE (Strm &aux (stack ())) (SETQ $COMBLOCKLIST NIL $skipme NIL) (when $preparse-last-line - (if (pairp $preparse-last-line) + (if (consp $preparse-last-line) (setq stack $preparse-last-line) (push $preparse-last-line stack)) (setq $INDEX (- $INDEX (length stack)))) @@ -123,8 +123,8 @@ (COND ((NULL LINES) (RETURN NIL)) (NCOMBLOCK (FINCOMBLOCK NIL NUMS LOCS NCOMBLOCK NIL))) - (RETURN (PAIR (|reverse!| NUMS) - (PARSEPILES (|reverse!| LOCS) (|reverse!| LINES)))))) + (RETURN (|pairList| (|reverse!| NUMS) + (PARSEPILES (|reverse!| LOCS) (|reverse!| LINES)))))) (cond ((and (NULL LINES) (> (LENGTH A) 0) (EQ (CHAR A 0) #\) )) ; this is a command line, don't parse it (PREPARSE-ECHO LineList) @@ -185,7 +185,7 @@ (IF (NOT (IS-CONSOLE in-stream)) (setq $preparse-last-line (|reverse!| $echolinestack))) - (RETURN (PAIR (|reverse!| NUMS) + (RETURN (|pairList| (|reverse!| NUMS) (PARSEPILES (|reverse!| LOCS) (|reverse!| LINES))))) (cond ((> PARENLEV 0) (PUSH NIL LOCS) (setq SLOC PSLOC) (GO REREAD))) (COND (NCOMBLOCK @@ -198,7 +198,7 @@ (setq PARENLEV (+ PARENLEV PCOUNT)) (when (and (is-console in-stream) (not continue)) (setq $preparse-last-line nil) - (RETURN (PAIR (|reverse!| NUMS) + (RETURN (|pairList| (|reverse!| NUMS) (PARSEPILES (|reverse!| LOCS) (|reverse!| LINES))))) (GO READLOOP))) |