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/ht-root.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/ht-root.boot')
-rw-r--r-- | src/interp/ht-root.boot | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/interp/ht-root.boot b/src/interp/ht-root.boot index 290cf622..1976952c 100644 --- a/src/interp/ht-root.boot +++ b/src/interp/ht-root.boot @@ -166,17 +166,16 @@ htGlossPage(htPage,pattern,tryAgain?) == gatherGlossLines(results,defstream) == acc := nil for keyline in results repeat - --keyline := READLINE instream n := charPosition($tick,keyline,0) keyAndTick := subString(keyline,0,n + 1) byteAddress := string2Integer subString(keyline,n + 1) FILE_-POSITION(defstream,byteAddress) - line := READLINE defstream + line := readLine defstream k := charPosition($tick,line,1) pointer := subString(line,0,k) def := subString(line,k + 1) xtralines := nil - while not EOFP defstream and (x := READLINE defstream) and + while (x := readLine defstream) ~= %nothing and (j := charPosition($tick,x,1)) and (nextPointer := subString(x,0,j)) and (nextPointer = pointer) repeat xtralines := [subString(x,j + 1),:xtralines] |