diff options
| author | dos-reis <gdr@axiomatics.org> | 2011-05-29 00:58:58 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2011-05-29 00:58:58 +0000 |
| commit | 05f1dbf1e8564c316a4e0ed7146b4991162f8875 (patch) | |
| tree | c909542d73594a47898ed440a7e4f13c256d3f07 /src/interp/br-data.boot | |
| parent | f274326c2d4e1912fd99105ce72298684f5ee0ab (diff) | |
| download | open-axiom-05f1dbf1e8564c316a4e0ed7146b4991162f8875.tar.gz | |
* lisp/core.lisp.in (readExpr): New.
* interp/as.boot: Replace READLINE with readLine.
* interp/br-data.boot: Likewise.
* interp/br-saturn.boot: Likewise.
* interp/br-search.boot: Likewise.
* interp/c-doc.boot: Likewise.
* interp/cstream.boot: Likewise.
* interp/g-error.boot: Likewise.
* interp/ht-root.boot: Likewise.
* interp/htcheck.boot: Likewise.
* interp/i-syscmd.boot: Likewise.
* interp/msgdb.boot: Likewise.
* interp/server.boot: Likewise.
* interp/topics.boot: Likewise.
* interp/compat.boot (READLINE): Remove.
* interp/sys-macros.lisp (shoeConsole): Remove.
(shoeInputFile): Likewise.
(shoeread-line): Likewise.
* boot/ast.boot (bfQ): %nothing only needs EQ.
* algebra/files.spad.pamphlet (File) [read!, readIfCan!]: Use
readExpr instead of VMREAD. Avoid PLACEP
(TextFile) [readLine!, readLineIfCan!]: Likewise.
Diffstat (limited to 'src/interp/br-data.boot')
| -rw-r--r-- | src/interp/br-data.boot | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/interp/br-data.boot b/src/interp/br-data.boot index 96ff9ff7..aeb183ce 100644 --- a/src/interp/br-data.boot +++ b/src/interp/br-data.boot @@ -226,7 +226,7 @@ dbAugmentConstructorDataTable() == instream := MAKE_-INSTREAM '"libdb.text" while not EOFP instream repeat fp := FILE_-POSITION instream - line := READLINE instream + line := readLine instream cname := makeSymbol dbName line entry := getCDTEntry(cname,true) => --skip over Mapping, Union, Record [name,abb,:.] := entry @@ -249,18 +249,19 @@ dbHasExamplePage conname == dbRead(n) == instream := MAKE_-INSTREAM strconc(systemRootDirectory(), '"/algebra/libdb.text") FILE_-POSITION(instream,n) - line := READLINE instream + line := readLine instream SHUT instream - line + line ~= %nothing => line + nil dbReadComments(n) == n = 0 => '"" instream := MAKE_-INSTREAM strconc(systemRootDirectory(),'"/algebra/comdb.text") FILE_-POSITION(instream,n) - line := READLINE instream + line := readLine instream k := dbTickIndex(line,1,1) line := subString(line,k + 1) - while not EOFP instream and (x := READLINE instream) and + while (x := readLine instream) ~= %nothing and (k := maxIndex x) and (j := dbTickIndex(x,1,1)) and (j < k) and x.(j := j + 1) = char "-" and x.(j := j + 1) = char "-" repeat xtralines := [subString(x,j + 1),:xtralines] @@ -275,8 +276,7 @@ dbSplitLibdb() == PRINTEXP($tick,comstream) PRINTEXP('"", comstream) TERPRI(comstream) - while not EOFP instream repeat - line := READLINE instream + while (line := readLine instream) ~= %nothing repeat outP := FILE_-POSITION outstream comP := FILE_-POSITION comstream [prefix,:comments] := dbSplit(line,6,1) @@ -390,8 +390,7 @@ getGlossLines instream == keys := nil text := nil lastLineHadTick := false - while not EOFP instream repeat - line := READLINE instream + while (line := readLine instream) ~= %nothing repeat #line = 0 => 'skip n := charPosition($tick,line,0) last := IFCAR text |