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/topics.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/topics.boot')
| -rw-r--r-- | src/interp/topics.boot | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/interp/topics.boot b/src/interp/topics.boot index c3910973..ef7313aa 100644 --- a/src/interp/topics.boot +++ b/src/interp/topics.boot @@ -92,8 +92,8 @@ mkTopicHashTable() == --given $groupAssoc = ((extended . $conTopicHash := hashTable 'EQL --key is constructor name; value is instream := inputTextFile '"topics.data" while not EOFP instream repeat - line := READLINE instream - while blankLine? line repeat line := READLINE instream + line := readLine instream + while blankLine? line repeat line := readLine instream m := maxIndex line --file "topics.data" has form: m = -1 => 'skip --1 ConstructorName: stringChar(line,0) = char "-" => 'skip --2 constructorName or operation name @@ -101,8 +101,8 @@ mkTopicHashTable() == --given $groupAssoc = ((extended . m := maxIndex line -- (blank line) ... stringChar(line,m) ~= char ":" => systemError('"wrong heading") con := makeSymbol subString(line,0,m) - alist := [lst while not EOFP instream and - not (blankLine? (line := READLINE instream)) and + alist := [lst while (line := readLine instream) ~= %nothing and + not blankLine? line and stringChar(line,0) ~= char "-" for i in 1.. | lst := string2OpAlist line] alist => tableValue($conTopicHash,con) := alist |