diff options
| author | dos-reis <gdr@axiomatics.org> | 2011-06-22 09:45:52 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2011-06-22 09:45:52 +0000 |
| commit | 013c2620f9aaffd31a10fed19ac48bad9074f707 (patch) | |
| tree | 9202e22de33ac20eb57cf31512c0edd61e48007e /src | |
| parent | 0ce3502a3677bfb4fb58c664b7ae00d530e5bacf (diff) | |
| download | open-axiom-013c2620f9aaffd31a10fed19ac48bad9074f707.tar.gz | |
* interp/br-search.boot (dbReadLines): Don't include end-of-stream
marker.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/interp/br-data.boot | 2 | ||||
| -rw-r--r-- | src/interp/br-search.boot | 8 |
3 files changed, 11 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 297b9991..770b3cec 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,10 @@ 2011-06-22 Gabriel Dos Reis <gdr@cs.tamu.edu> + * interp/br-search.boot (dbReadLines): Don't include end-of-stream + marker. + +2011-06-22 Gabriel Dos Reis <gdr@cs.tamu.edu> + * interp/g-opt.boot (optCond): Remove unreachable code. (opt2bit): Tidy. (opt2bool): Likewise. diff --git a/src/interp/br-data.boot b/src/interp/br-data.boot index aeb183ce..d3f06250 100644 --- a/src/interp/br-data.boot +++ b/src/interp/br-data.boot @@ -767,7 +767,7 @@ $defaultPackageNamesHT := buildDefaultPackageNamesHT() --======================================================================= -- $createLocalLibDb := false -extendLocalLibdb conlist == -- called by astran +extendLocalLibdb conlist == -- called by compileSpad2Cmd not $createLocalLibDb => nil null conlist => nil buildLibdb conlist --> puts datafile into temp.text diff --git a/src/interp/br-search.boot b/src/interp/br-search.boot index ed3c9a19..7dec7f86 100644 --- a/src/interp/br-search.boot +++ b/src/interp/br-search.boot @@ -927,11 +927,13 @@ dbWriteLines(s, :options) == SHUT $outStream pathname -dbReadLines target == --AIX only--called by grepFile +dbReadLines target == instream := inputTextFile target - lines := [line := readLine instream while line ~= %nothing] + lines := [] + while (line := readLine instream) ~= %nothing repeat + lines := [line,:lines] closeStream instream - lines + reverse! lines dbGetCommentOrigin line == --Given a comment line in comdb, returns line in libdb pointing to it |