diff options
| author | dos-reis <gdr@axiomatics.org> | 2011-05-28 07:00:13 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2011-05-28 07:00:13 +0000 |
| commit | d4b55b57874770ebaf0bd0f79b91ff40a6d94b94 (patch) | |
| tree | 1353d1fa1ca5adc163fa61ad8ce94018396a17be /src/interp | |
| parent | 414db62082f6e113d0898240887f53fc43d21ae7 (diff) | |
| download | open-axiom-d4b55b57874770ebaf0bd0f79b91ff40a6d94b94.tar.gz | |
* lisp/core.lisp.in: Define and export readLine and readbyte.
* interp/sys-utility.boot (readByteFromFile): Remove.
* boot/tokens.boot: Don't rename readLine and readByte.
* boot/includer.boot (shoeReadLine): Remove.
(bRgen1): Adjust. Use resdLine.
* algebra/net.spad.pamphlet (InputBinaryFile): Use readByte from
the runtime system.
Diffstat (limited to 'src/interp')
| -rw-r--r-- | src/interp/database.boot | 2 | ||||
| -rw-r--r-- | src/interp/sys-utility.boot | 9 | ||||
| -rw-r--r-- | src/interp/word.boot | 2 |
3 files changed, 2 insertions, 11 deletions
diff --git a/src/interp/database.boot b/src/interp/database.boot index c7c068b0..8211fd04 100644 --- a/src/interp/database.boot +++ b/src/interp/database.boot @@ -706,7 +706,7 @@ dropPrefix(fn) == --++ $globalExposureGroupAlist := nil --++ egName := nil --++ egFiles := nil ---++ while (not PLACEP (x:= readLine stream)) repeat +--++ while (x:= readLine stream) ~= %nothing repeat --++ x := DROPTRAILINGBLANKS x --++ # x = 0 => 'iterate -- blank line --++ (x.0 = char "#") or (x.0 = char "*") => 'iterate -- comment diff --git a/src/interp/sys-utility.boot b/src/interp/sys-utility.boot index 84dff4b9..2fa38afa 100644 --- a/src/interp/sys-utility.boot +++ b/src/interp/sys-utility.boot @@ -45,10 +45,6 @@ module sys_-utility where --% $COMBLOCKLIST := nil -++ No value marker for the Maybe domain. -%nothing == KEYWORD::%OpenAxiomNoValue - - ++ Constants describing byte order %littleEndian == KEYWORD::%littleEndian %bigEndian == KEYWORD::%bigEndian @@ -310,11 +306,6 @@ openBinaryFile(file,mode) == KEYWORD::IF_-EXISTS,KEYWORD::SUPERSEDE, KEYWORD::ELEMENT_-TYPE,"%Byte") -++ Attemp to read a byte from input file `ifile'. If not end of -++ file, return the read byte; %nothing. -readByteFromFile ifile == - readByte(ifile,false,%nothing) - ++ Write byte `b' to output binary file `ofile'. writeByteToFile(ofile,b) == writeByte(b,ofile) diff --git a/src/interp/word.boot b/src/interp/word.boot index 40d01114..be576794 100644 --- a/src/interp/word.boot +++ b/src/interp/word.boot @@ -97,7 +97,7 @@ getListOfFunctionNames(fnames) == for fn in fnames repeat null IOSTATE(fn,'DIRECT,'_*) => 'iterate stream:= DEFIOSTREAM(['(MODE . INPUT),['FILE,fn,'DIRECT,'_*]],80,0) - while (not PLACEP (x:= readLine stream)) repeat + while (x:= readLine stream) ~= %nothing repeat (s := # x) < 26 => 'iterate res:= [subString(x,26),:res] SHUT stream |