d0p1/ack
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Of course: fixes to previous mods

Browse source
This commit is contained in:
ceriel 1988-02-19 16:36:45 +00:00
parent 31ddd5ca12
commit dead814781
4 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lang/m2/libm2/InOut.mod
View file

@ -132,7 +132,7 @@ IMPLEMENTATION MODULE InOut ;
j : CARDINAL; j : CARDINAL;
BEGIN BEGIN
Done := TRUE; Done := TRUE;
IF isatty(Streams.InputStream) THEN IF Streams.isatty(Streams.InputStream) THEN
XWriteString(prompt); XWriteString(prompt);
END; END;
XReadString(buf); XReadString(buf);

18
lang/m2/libm2/PascalIO.mod
View file

@ -22,7 +22,7 @@ IMPLEMENTATION MODULE PascalIO;
FROM SYSTEM IMPORT ADR; FROM SYSTEM IMPORT ADR;
TYPE charset = SET OF CHAR; TYPE charset = SET OF CHAR;
btype = (reading, writing, free); btype = (Preading, Pwriting, free);
CONST spaces = charset{11C, 12C, 13C, 14C, 15C, ' '}; CONST spaces = charset{11C, 12C, 13C, 14C, 15C, ' '};
@ -50,7 +50,7 @@ IMPLEMENTATION MODULE PascalIO;
Traps.Message("could not open input file"); Traps.Message("could not open input file");
HALT; HALT;
END; END;
type := reading; type := Preading;
done := FALSE; done := FALSE;
eof := FALSE; eof := FALSE;
END; END;
@ -66,7 +66,7 @@ IMPLEMENTATION MODULE PascalIO;
Traps.Message("could not open output file"); Traps.Message("could not open output file");
HALT; HALT;
END; END;
type := writing; type := Pwriting;
END; END;
END Rewrite; END Rewrite;
@ -107,7 +107,7 @@ IMPLEMENTATION MODULE PascalIO;
PROCEDURE Error(tp: btype); PROCEDURE Error(tp: btype);
BEGIN BEGIN
IF tp = reading THEN IF tp = Preading THEN
Traps.Message("input text expected"); Traps.Message("input text expected");
ELSE ELSE
Traps.Message("output text expected"); Traps.Message("output text expected");
@ -124,7 +124,7 @@ IMPLEMENTATION MODULE PascalIO;
PROCEDURE NextChar(InputText: Text): CHAR; PROCEDURE NextChar(InputText: Text): CHAR;
BEGIN BEGIN
WITH InputText^ DO WITH InputText^ DO
IF type # reading THEN Error(reading); END; IF type # Preading THEN Error(Preading); END;
IF NOT done THEN IF NOT done THEN
Get(InputText); Get(InputText);
END; END;
@ -135,7 +135,7 @@ IMPLEMENTATION MODULE PascalIO;
PROCEDURE Get(InputText: Text); PROCEDURE Get(InputText: Text);
BEGIN BEGIN
WITH InputText^ DO WITH InputText^ DO
IF type # reading THEN Error(reading); END; IF type # Preading THEN Error(Preading); END;
IF eof THEN IF eof THEN
Traps.Message("unexpected EOF"); Traps.Message("unexpected EOF");
HALT; HALT;
@ -171,7 +171,7 @@ IMPLEMENTATION MODULE PascalIO;
PROCEDURE WriteChar(OutputText: Text; char: CHAR); PROCEDURE WriteChar(OutputText: Text; char: CHAR);
BEGIN BEGIN
WITH OutputText^ DO WITH OutputText^ DO
IF type # writing THEN Error(writing); END; IF type # Pwriting THEN Error(Pwriting); END;
Write(stream, char, result); Write(stream, char, result);
END; END;
END WriteChar; END WriteChar;
@ -409,13 +409,13 @@ BEGIN (* PascalIO initialization *)
WITH ibuf DO WITH ibuf DO
stream := InputStream; stream := InputStream;
eof := FALSE; eof := FALSE;
type := reading; type := Preading;
done := FALSE; done := FALSE;
END; END;
WITH obuf DO WITH obuf DO
stream := OutputStream; stream := OutputStream;
eof := FALSE; eof := FALSE;
type := writing; type := Pwriting;
END; END;
Notext := NIL; Notext := NIL;
Input := ADR(ibuf); Input := ADR(ibuf);

2
lang/m2/libm2/Streams.mod
View file

@ -373,7 +373,7 @@ IMPLEMENTATION MODULE Streams;
result := succeeded; result := succeeded;
END SetPosition; END SetPosition;
PROCEDURE isatty(stream: Stream): BOOLEAN; PROCEDURE isatty(stream: Stream; VAR result: StreamResult): BOOLEAN;
VAR buf: ARRAY[1..100] OF CHAR; VAR buf: ARRAY[1..100] OF CHAR;
BEGIN BEGIN
IF (stream = NIL) OR (s^.kind = none) THEN IF (stream = NIL) OR (s^.kind = none) THEN

2
lang/m2/libm2/random.mod
View file

@ -42,6 +42,6 @@ BEGIN
END StartSeed; END StartSeed;
BEGIN BEGIN
X0 := time(NIL); X[0] := time(NIL);
StartSeed(CARDINAL(getpid()) * X[0]); StartSeed(CARDINAL(getpid()) * X[0]);
END random. END random.