diff options
author | dos-reis <gdr@axiomatics.org> | 2012-06-09 22:51:57 +0000 |
---|---|---|
committer | dos-reis <gdr@axiomatics.org> | 2012-06-09 22:51:57 +0000 |
commit | 85a46b94c83297511b221180f7391cd777f252a0 (patch) | |
tree | e5716ab54f400992bac0eec0bd5e7f5e5a92b530 /src/interp/spad-parser.boot | |
parent | c71819100f933bffb4a6bacdb5416db45b47a1c0 (diff) | |
download | open-axiom-85a46b94c83297511b221180f7391cd777f252a0.tar.gz |
* interp/io.boot (%Reader): Add idx field.
* interp/preparse.lisp ($INDEX): Remove. Adjust users.
Diffstat (limited to 'src/interp/spad-parser.boot')
-rw-r--r-- | src/interp/spad-parser.boot | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/interp/spad-parser.boot b/src/interp/spad-parser.boot index 42cee897..2d49ad59 100644 --- a/src/interp/spad-parser.boot +++ b/src/interp/spad-parser.boot @@ -135,10 +135,10 @@ preparseReadLine1 rs == else line := expandLeadingTabs readLine readerInput rs $preparseLastLine := line - not string? line => [$INDEX] - $INDEX := $INDEX + 1 + not string? line => [readerLineNumber rs] + readerLineNumber(rs) := readerLineNumber rs + 1 line := trimTrailingBlank line - n := $INDEX + n := readerLineNumber rs if #line > 0 and line.maxIndex(line) = char "__" then line := strconc(subString(line,0,maxIndex line),rest preparseReadLine1 rs) $preparseLastLine := line @@ -200,7 +200,7 @@ preparse rd == $SKIPME := false if $preparseLastLine ~= nil then readerDeferLine(rd,$preparseLastLine) - $INDEX := $INDEX - #readerPendingLines rd + readerLineNumber(rd) := readerLineNumber rd - #readerPendingLines rd u := preparse1 rd $SKIPME => preparse rd parsePrint u |