aboutsummaryrefslogtreecommitdiff
path: root/src/interp/br-search.boot
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2011-05-29 00:58:58 +0000
committerdos-reis <gdr@axiomatics.org>2011-05-29 00:58:58 +0000
commit05f1dbf1e8564c316a4e0ed7146b4991162f8875 (patch)
treec909542d73594a47898ed440a7e4f13c256d3f07 /src/interp/br-search.boot
parentf274326c2d4e1912fd99105ce72298684f5ee0ab (diff)
downloadopen-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-search.boot')
-rw-r--r--src/interp/br-search.boot6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/interp/br-search.boot b/src/interp/br-search.boot
index e4d2ba6b..45c22ee4 100644
--- a/src/interp/br-search.boot
+++ b/src/interp/br-search.boot
@@ -215,7 +215,7 @@ grepSplit(lines,doc?) ==
N:=readInteger dbPart(line,1,-1)
if integer? N then
FILE_-POSITION(instream2,N)
- line := READLINE instream2
+ line := readLine instream2
kind := dbKind line
not $includeUnexposed? and not dbExposed?(line,kind) => 'skip
(kind = char "a" or kind = char "o") and isDefaultOpAtt line => 'skip
@@ -929,7 +929,7 @@ dbWriteLines(s, :options) ==
dbReadLines target == --AIX only--called by grepFile
instream := inputTextFile target
- lines := [READLINE instream while not EOFP instream]
+ lines := [line := readLine instream while line ~= %nothing]
closeFile instream
lines
@@ -942,7 +942,7 @@ dbGetCommentOrigin line ==
address := subString(firstPart, 1) --address in libdb
instream := inputTextFile grepSource key --this always returns libdb now
FILE_-POSITION(instream,readInteger address)
- line := READLINE instream
+ line := readLine instream
closeFile instream
line