Update test files to v2.

This commit is contained in:
David Brown 2016-06-16 16:25:36 +01:00
parent a9b273e30a
commit ce855c93c8
6 changed files with 212 additions and 241 deletions

View file

@ -20,8 +20,9 @@ IF F # NIL THEN
Texts.Read (R, ch); Texts.Read (R, ch);
WHILE ~R.eot DO WHILE ~R.eot DO
Texts.Read (R, ch);
Console.Char(ch); Console.Char(ch);
IF ch = 0DX THEN Console.Char(0AX) END;
Texts.Read (R, ch);
END; END;
ELSE ELSE

View file

@ -1,50 +1,46 @@
MODULE s; MODULE s;
IMPORT sockets, types, Out := Console, Unix, S := SYSTEM; IMPORT sockets, types, Out := Console, SYSTEM, Platform, Strings;
TYPE Int32 = types.Int32;
Int16 = types.Int16;
String = types.String;
PROCEDURE DoSmth(sock : Int32); PROCEDURE DoSmth(sock: Platform.FileHandle);
VAR str, aff : String; VAR
n, s : LONGINT; str, aff: ARRAY 256 OF CHAR;
n: LONGINT;
BEGIN BEGIN
s := SIZE(String);
aff := "Affirmative, Dave"; aff := "Affirmative, Dave";
n := Unix.Read(sock, S.ADR(str), s); (* IF Platform.Read(sock, SYSTEM.ADR(str), 256, n) # 0 THEN *)
IF Platform.ReadBuf(sock, str, n) # 0 THEN
IF n < 0 THEN
Out.String("error reading from socket"); Out.Ln; Out.String("error reading from socket"); Out.Ln;
END; ELSE
str[n] := 0X; (* Make sure that received message is zero terminated *)
Out.String("received message is "); Out.String(str); Out.Ln; Out.String("received message is "); Out.String(str); Out.Ln;
s := 17;
n := Unix.Write(sock, S.ADR(aff), s); IF Platform.Write(sock, SYSTEM.ADR(aff), Strings.Length(aff)) # 0 THEN
IF n < 2 THEN
Out.String("error writing to socket"); Out.Ln Out.String("error writing to socket"); Out.Ln
END; END;
END;
END DoSmth; END DoSmth;
PROCEDURE ZeroByteArr(VAR a : ARRAY OF S.BYTE);
VAR i : LONGINT;
BEGIN PROCEDURE -includeunistd "#include <unistd.h>";
FOR i := 0 TO LEN(a)-1 DO PROCEDURE -fork(): LONGINT "(LONGINT)fork()";
a[i] := 0
END;
END ZeroByteArr;
PROCEDURE serve; PROCEDURE serve;
VAR sockfd, newsockfd, portno, clilen, pid: sockets.Int32; CONST
ServAddr, CliAddr: sockets.SockAddrIn; Port = 2055;
Null : Int32; MaxQueue = 5;
Port, maxQueue, res : Int32; VAR
afinet, port, port0: Int16; sockfd: LONGINT;
newsockfd: LONGINT;
ServAddr: sockets.SockAddrIn;
pid: LONGINT;
res: Platform.ErrorCode;
sockaddrlen: LONGINT;
BEGIN BEGIN
Port := 2055; sockfd := sockets.Socket(sockets.AfInet, sockets.SockStream, 0);
maxQueue := 5;
Null := 0;
sockfd := sockets.Socket(S.VAL(Int32, sockets.AfInet), S.VAL(Int32, sockets.SockStream), Null);
IF sockfd < 0 THEN IF sockfd < 0 THEN
Out.String("error opening socket") Out.String("error opening socket")
ELSE ELSE
@ -52,34 +48,24 @@ BEGIN
END; END;
Out.Ln; Out.Ln;
types.IntegerToInt16(sockets.AfInet, afinet); sockets.SetSockAddrIn(sockets.AfInet, Port, 0, ServAddr);
types.IntegerToInt16(Port, port); IF sockets.Bind(sockfd, SYSTEM.VAL(sockets.SockAddr, ServAddr), SIZE(sockets.SockAddr)) < 0 THEN
types.htons(port, port0); (* only necessary on little endian computers *)
ServAddr.SinFamily := afinet;
ServAddr.SinPort := port0;
ZeroByteArr(ServAddr.SinZero);
(*Out.String("listening on port ");Out.Int(S.VAL(INTEGER, ServAddr.SinPort), 0); Out.Ln;*)
ServAddr.SinAddr.SAddr := 0(*sockets.InAddrAny*);
res := sockets.Bind(sockfd, S.VAL(sockets.SockAddr, ServAddr), (SIZE(sockets.SockAddr)));
IF res < 0 THEN
Out.String("error on binding") Out.String("error on binding")
ELSE ELSE
Out.String("binding completed.") Out.String("binding completed.")
END; END;
Out.Ln; Out.Ln;
res := sockets.Listen(sockfd, maxQueue); IF sockets.Listen(sockfd, MaxQueue) # 0 THEN
IF res # 0 THEN
Out.String("listen() failed"); Out.String("listen() failed");
ELSE ELSE
Out.String("listen okay"); Out.String("listen okay");
END; END;
Out.Ln; Out.Ln;
clilen := SIZE(sockets.SockAddrIn);
LOOP LOOP
newsockfd := sockets.Accept(sockfd, S.VAL(sockets.SockAddr, ServAddr), clilen); sockaddrlen := SIZE(sockets.SockAddrIn);
newsockfd := sockets.Accept(sockfd, SYSTEM.VAL(sockets.SockAddr, ServAddr), sockaddrlen);
IF newsockfd < 0 THEN IF newsockfd < 0 THEN
Out.String("error on accept") Out.String("error on accept")
ELSE ELSE
@ -87,20 +73,18 @@ BEGIN
END; END;
Out.Ln; Out.Ln;
pid := Unix.Fork(); pid := fork();
IF pid < 0 THEN IF pid < 0 THEN
Out.String("error on fork") Out.String("error on fork")
ELSIF pid = 0 THEN ELSIF pid = 0 THEN
Out.String("forked okay"); Out.Ln; Out.String("forked okay"); Out.Ln;
res := Unix.Close(sockfd); res := Platform.Close(sockfd);
DoSmth(newsockfd); DoSmth(newsockfd);
EXIT EXIT
ELSE ELSE
res := Unix.Close(newsockfd); res := Platform.Close(newsockfd)
END; END
END; END
END serve; END serve;

View file

@ -1,10 +1,6 @@
MODULE sockets; MODULE sockets;
IMPORT types, SYS := SYSTEM;
TYPE IMPORT SYSTEM, oocC;
Int16* = types.Int16; (* INTEGER on 32 bit platform *)
Int32* = types.Int32;
Int64* = types.Int64;
CONST CONST
SockStream* = 1; SockStream* = 1;
@ -30,10 +26,10 @@ CONST
AfInet6* = 10; (* IP version 6. *) AfInet6* = 10; (* IP version 6. *)
AfRose* = 11; (* Amateur Radio X.25 PLP. *) AfRose* = 11; (* Amateur Radio X.25 PLP. *)
AfDecnet* = 12; (* Reserved for DECnet project. *) AfDecnet* = 12; (* Reserved for DECnet project. *)
AfNetbeui*= 13; (* Reserved for 802.2LLC project. *) AfNetbeui* = 13; (* Reserved for 802.2LLC project. *)
AfSecurity*=14; (* Security callback pseudo AF. *) AfSecurity* = 14; (* Security callback pseudo AF. *)
AfKey* = 15; (* PF_KEY key management API. *) AfKey* = 15; (* PF_KEY key management API. *)
AfNetlink*= 16; AfNetlink* = 16;
AfRoute* = 16; (* Alias to emulate 4.4BSD. *) AfRoute* = 16; (* Alias to emulate 4.4BSD. *)
AfPacket = 17; (* Packet family. *) AfPacket = 17; (* Packet family. *)
AfAsh = 18; (* Ash. *) AfAsh = 18; (* Ash. *)
@ -43,7 +39,7 @@ CONST
AfSna = 22; (* Linux SNA Project *) AfSna = 22; (* Linux SNA Project *)
AfIrda* = 23; (* IRDA sockets. *) AfIrda* = 23; (* IRDA sockets. *)
AfPppox = 24; (* PPPoX sockets. *) AfPppox = 24; (* PPPoX sockets. *)
AfWanpipe*= 25; (* Wanpipe API sockets. *) AfWanpipe* = 25; (* Wanpipe API sockets. *)
AfLlc* = 26; (* Linux LLC. *) AfLlc* = 26; (* Linux LLC. *)
AfCan* = 29; (* Controller Area Network. *) AfCan* = 29; (* Controller Area Network. *)
AfTipc* = 30; (* TIPC sockets. *) AfTipc* = 30; (* TIPC sockets. *)
@ -62,58 +58,69 @@ CONST
InAddrAny* = 0; InAddrAny* = 0;
TYPE TYPE
(* /usr/include/netinet/in.h *) (* /usr/include/netinet/in.h *)
InAddr* = RECORD InAddr* = RECORD
SAddr* : Int32; SAddr*: oocC.int;
END; END;
SockAddrIn* = RECORD SockAddrIn* = RECORD
SinFamily* : Int16; SinFamily*: oocC.shortint;
SinPort* : Int16; SinPort*: oocC.shortint;
SinAddr* : InAddr; SinAddr*: InAddr;
SinZero* : ARRAY 8 OF CHAR; SinZero*: ARRAY 8 OF CHAR;
END; END;
(* /usr/include/sys/socket.h *) (* /usr/include/sys/socket.h *)
SockAddr* = RECORD SockAddr* = RECORD
SaFamily* : Int16; SaFamily*: oocC.shortint;
SaData* : ARRAY 14 OF CHAR SaData*: ARRAY 14 OF CHAR
END; END;
PROCEDURE -socket(domain, type, protocol: Int32): Int32 PROCEDURE -includesocket "#include <sys/socket.h>";
"(int)socket(domain, type, protocol)";
PROCEDURE Socket*(domain, type, protocol: Int32): Int32; PROCEDURE -SetCShort(i: INTEGER; VAR si: oocC.shortint)
"*(short*)si = i";
PROCEDURE -SetCShortSwapped(i: INTEGER; VAR si: oocC.shortint)
"*(short*)si = ((i >> 8) & 0x00ff) | ((i << 8) & 0xff00)";
PROCEDURE SetSockAddrIn*(family, port, inaddr: INTEGER; VAR sai: SockAddrIn);
VAR i: INTEGER;
BEGIN BEGIN
RETURN socket(domain, type, protocol) SetCShort(family, sai.SinFamily);
SetCShortSwapped(port, sai.SinPort);
sai.SinAddr.SAddr := inaddr;
i := 0; WHILE i < 8 DO sai.SinZero[i] := 0X; INC(i) END
END SetSockAddrIn;
PROCEDURE -socket(domain, type, protocol: LONGINT): INTEGER
"(INTEGER)socket((int)domain, (int)type, (int)protocol)";
PROCEDURE Socket*(domain, type, protocol: LONGINT): INTEGER;
BEGIN RETURN socket(domain, type, protocol)
END Socket; END Socket;
PROCEDURE -bind(sockfd: Int32; VAR addr: SockAddr; addrlen: Int32): Int32 PROCEDURE -bind(sockfd: LONGINT; VAR addr: SockAddr; addrlen: LONGINT): INTEGER
"(int)bind(sockfd, addr, addrlen)"; "(INTEGER)bind((int)sockfd, (const struct sockaddr*)addr, (int)addrlen)";
PROCEDURE Bind*(sockfd: Int32; VAR addr: SockAddr; addrlen: Int32): Int32; PROCEDURE Bind*(sockfd: LONGINT; VAR addr: SockAddr; addrlen: LONGINT): INTEGER;
BEGIN BEGIN RETURN bind(sockfd, addr, addrlen)
RETURN bind(sockfd, addr, addrlen)
END Bind; END Bind;
PROCEDURE -listen(sockfd, backlog: Int32): Int32 PROCEDURE -listen(sockfd, backlog: LONGINT): INTEGER
"(int)listen(sockfd, backlog)"; "(INTEGER)listen((int)sockfd, (int)backlog)";
PROCEDURE Listen*(sockfd, backlog: Int32): Int32; PROCEDURE Listen*(sockfd, backlog: LONGINT): INTEGER;
BEGIN BEGIN RETURN listen(sockfd, backlog)
RETURN listen(sockfd, backlog)
END Listen; END Listen;
PROCEDURE -accept(sockfd: Int32; VAR addr: SockAddr; VAR addrlen: Int32): Int32 PROCEDURE -accept(sockfd: LONGINT; VAR addr: SockAddr; VAR addrlen: LONGINT; VAR result: INTEGER)
"(int)accept(sockfd, addr, addrlen)"; "int _o_al = (int)addrlen; *result = (INTEGER)accept((int)sockfd, (struct sockaddr*)addr, &_o_al); *addrlen = _o_al";
PROCEDURE Accept*(sockfd: Int32; VAR addr: SockAddr; VAR addrlen: Int32): Int32; PROCEDURE Accept*(sockfd: LONGINT; VAR addr: SockAddr; VAR addrlen: LONGINT): INTEGER;
BEGIN VAR result: INTEGER;
RETURN accept(sockfd, addr, addrlen) BEGIN accept(sockfd, addr, addrlen, result); RETURN result
END Accept; END Accept;
BEGIN
END sockets. END sockets.

View file

@ -1,32 +1,19 @@
MODULE types; MODULE types;
IMPORT SYS := SYSTEM;
IMPORT SYSTEM;
TYPE TYPE
intarr64 = ARRAY 8 OF SYS.BYTE; (* to emulate int16 on x86_64; -- noch *) (* Int32* = ARRAY 4 OF SYSTEM.BYTE; *)
intarr32 = ARRAY 4 OF SYS.BYTE; Int16* = ARRAY 2 OF SYSTEM.BYTE;
intarr16 = ARRAY 2 OF SYS.BYTE;
Int16* = intarr16; (* INTEGER on 32 bit platform *)
Int32* = INTEGER;
Int64* = LONGINT;
String* = ARRAY 256 OF CHAR;
PROCEDURE LongintToInt16*(int: LONGINT; VAR int16: Int16);
VAR longintarr : intarr64;
BEGIN
(*RETURN SYS.VAL(Int16, int)*)
longintarr := SYS.VAL(intarr64, int);
int16[0] := longintarr[0];
int16[1] := longintarr[1]; (* this will work for little endian -- noch *)
END LongintToInt16;
PROCEDURE IntegerToInt16*(int: INTEGER; VAR int16: Int16); PROCEDURE IntegerToInt16*(int: INTEGER; VAR int16: Int16);
VAR intarr : intarr32; TYPE PInt16 = POINTER TO Int16;
VAR p: PInt16;
BEGIN BEGIN
int16 := SYS.VAL(Int16, int) (* Note: We take the least significant 16 bits of int, which
(*intarr := SYS.VAL(intarr32, int); is correct on supported (i.e. little-endian) architectures. *)
int16[0] := intarr[0]; p := SYSTEM.VAL(PInt16, SYSTEM.ADR(int));
int16[1] := intarr[1];*) (* this will work for little endian -- noch *) int16 := p^;
END IntegerToInt16; END IntegerToInt16;
PROCEDURE htons*(in: Int16; VAR out : Int16); PROCEDURE htons*(in: Int16; VAR out : Int16);

View file

@ -1,6 +1,6 @@
MODULE crt; MODULE crt;
IMPORT vt100, Unix, Console, IMPORT vt100, Platform, Console,
Strings; (* strings to remove later ? *) Strings; (* strings to remove later ? *)
CONST CONST
@ -28,8 +28,6 @@ CONST
(* Add-in for blinking *) (* Add-in for blinking *)
Blink* = 128; Blink* = 128;
TYPE
PFdSet = POINTER TO Unix.FdSet;
VAR tmpstr : ARRAY 23 OF CHAR; VAR tmpstr : ARRAY 23 OF CHAR;
@ -58,16 +56,8 @@ VAR tmpstr : ARRAY 23 OF CHAR;
vt100.DECTCEMh; vt100.DECTCEMh;
END cursoron; END cursoron;
PROCEDURE Delay*( ms : INTEGER); PROCEDURE Delay*(ms: INTEGER);
VAR i : LONGINT; BEGIN Platform.Delay(ms) END Delay;
tv : Unix.Timeval;
pfd : PFdSet;
BEGIN
tv.sec := 0;
tv.usec := ms * 1000;
pfd := NIL;
i := Unix.Select(0, pfd^, pfd^, pfd^, tv);
END Delay;
PROCEDURE GotoXY* (x, y: INTEGER); PROCEDURE GotoXY* (x, y: INTEGER);
BEGIN BEGIN

View file

@ -1,29 +1,31 @@
MODULE test; MODULE test;
IMPORT p := oocXYplane, Out := Console; IMPORT p := oocXYplane, Out := Console;
VAR ch : CHAR;
i : INTEGER; VAR
ch : CHAR;
i : INTEGER;
BEGIN BEGIN
p.Open;
p.Open; (*p.Clear;*)
FOR i := 1 TO 555 DO
p.Dot(i,300 ,p.draw)
END;
(*p.Clear;*) (*
FOR i := 1 TO 555 DO FOR i := 100 TO 500 DO
p.Dot(i,300 ,p.draw) p.Dot(i,300 ,p.erase)
END; END;
(* *)
FOR i := 100 TO 500 DO
p.Dot(i,300 ,p.erase)
END;
*)
IF p.IsDot (5, 300) THEN Out.String("Yes") ELSE Out.String("No") END; Out.Ln; IF p.IsDot (5, 300) THEN Out.String("Yes") ELSE Out.String("No") END; Out.Ln;
IF p.IsDot (5, 500) THEN Out.String("Yes") ELSE Out.String("No") END; Out.Ln; IF p.IsDot (5, 500) THEN Out.String("Yes") ELSE Out.String("No") END; Out.Ln;
REPEAT REPEAT
ch := p.Key(); ch := p.Key();
UNTIL ch # 0X; UNTIL ch # 0X;
p.Close;
p.Close;
END test. END test.