diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/interp/io.boot | 6 | ||||
| -rw-r--r-- | src/interp/preparse.lisp | 6 | ||||
| -rw-r--r-- | src/interp/spad-parser.boot | 6 |
4 files changed, 14 insertions, 9 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index bd998da0..c955eb68 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2012-06-06 Gabriel Dos Reis <gdr@cse.tamu.edu> + + * interp/io.boot (readePendingLines): Rename from readerLines. + Adjust callers. + 2012-06-05 Gabriel Dos Reis <gdr@cs.tamu.edu> * interp/io.boot (readerDeferLine): New. diff --git a/src/interp/io.boot b/src/interp/io.boot index 7c85719f..13c26679 100644 --- a/src/interp/io.boot +++ b/src/interp/io.boot @@ -104,9 +104,9 @@ findString(s1,s2,k == 0) == --% Reader --% structure %Reader == - Record(ins: %InputStream, lines: %List %Line,sline: %Line) with + Record(ins: %InputStream, lines: %List %String,sline: %Line) with readerInput == (.ins) - readerLines == (.lines) + readerPendingLines == (.lines) readerSourceLine == (.sline) -- current input line makeReader ist == @@ -114,4 +114,4 @@ makeReader ist == ++ Add line `l' to the stack of pending lines. readerDeferLine(rd,l) == - readerLines(rd) := [l,:readerLines rd] + readerPendingLines(rd) := [l,:readerPendingLines rd] diff --git a/src/interp/preparse.lisp b/src/interp/preparse.lisp index 6cd27096..71786b00 100644 --- a/src/interp/preparse.lisp +++ b/src/interp/preparse.lisp @@ -84,7 +84,7 @@ (LINES ()) (LOCS ()) (NUMS ()) functor ) READLOOP (DCQ (NUM . A) (|preparseReadLine| rd)) (cond ((|atEndOfUnit?| A) - (|preparseEcho| (|readerLines| rd)) + (|preparseEcho| (|readerPendingLines| rd)) (COND ((NULL LINES) (RETURN NIL)) (NCOMBLOCK (|findCommentBlock| NIL NUMS LOCS NCOMBLOCK))) @@ -92,7 +92,7 @@ (|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 - (|preparseEcho| (|readerLines| rd)) + (|preparseEcho| (|readerPendingLines| rd)) (setq |$preparseLastLine| nil) ;don't reread this line (SETQ LINE a) (CATCH |$SpadReaderTag| (|doSystemCommand| (subseq LINE 1))) @@ -167,7 +167,7 @@ (|findCommentBlock| NUM NUMS LOCS NCOMBLOCK) (setq NCOMBLOCK ()))) (PUSH SLOC LOCS) - REREAD (|preparseEcho| (|readerLines| rd)) + REREAD (|preparseEcho| (|readerPendingLines| rd)) (PUSH A LINES) (PUSH NUM NUMS) (setq PARENLEV (+ PARENLEV PCOUNT)) diff --git a/src/interp/spad-parser.boot b/src/interp/spad-parser.boot index 2ee118e8..88d37080 100644 --- a/src/interp/spad-parser.boot +++ b/src/interp/spad-parser.boot @@ -129,9 +129,9 @@ preparseReadLine rs == z preparseReadLine1 rs == - if lines := readerLines rs then + if lines := readerPendingLines rs then line := first lines - readerLines(rs) := rest lines + readerPendingLines(rs) := rest lines else line := expandLeadingTabs readLine readerInput rs $preparseLastLine := line @@ -200,7 +200,7 @@ preparse rd == $SKIPME := false if $preparseLastLine ~= nil then readerDeferLine(rd,$preparseLastLine) - $INDEX := $INDEX - #readerLines rd + $INDEX := $INDEX - #readerPendingLines rd u := preparse1 rd $SKIPME => preparse rd parsePrint u |