vishapoberon/compiler
1
0
Fork 0
mirror of https://github.com/vishapoberon/compiler.git synced 2026-04-06 00:32:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "now test server can listen on any ipv4 address."

Browse source 
This reverts commit afe5a2d824.
This commit is contained in:
Norayr Chilingarian 2025-02-21 04:52:20 +04:00
parent afe5a2d824
commit e36e862c8c
3 changed files with 96 additions and 141 deletions
Download patch file Download diff file Expand all files Collapse all files

107
src/compiler/OPV.Mod
View file

@ -6,7 +6,7 @@ MODULE OPV; (* J. Templ 16.2.95 / 3.7.96
various promotion rules changed (long) => (LONGINT), xxxL avoided various promotion rules changed (long) => (LONGINT), xxxL avoided
*) *)
IMPORT OPT, OPC, OPM, OPS, VT100, Strings, SYSTEM; IMPORT OPT, OPC, OPM, OPS, SYSTEM;
CONST CONST
UndefinedType = 0; (* named type not yet defined *) UndefinedType = 0; (* named type not yet defined *)
@ -28,7 +28,6 @@ MODULE OPV; (* J. Templ 16.2.95 / 3.7.96
GuardPtrFunc = "__GUARDP("; GuardPtrFunc = "__GUARDP(";
GuardRecFunc = "__GUARDR("; GuardRecFunc = "__GUARDR(";
TypeFunc = "__TYPEOF("; TypeFunc = "__TYPEOF(";
SetOfFunc = "__SETOF(";
CopyFunc = "__COPY("; CopyFunc = "__COPY(";
MoveFunc = "__MOVE("; MoveFunc = "__MOVE(";
GetFunc = "__GET("; GetFunc = "__GET(";
@ -45,7 +44,7 @@ MODULE OPV; (* J. Templ 16.2.95 / 3.7.96
TYPE TYPE
ExitInfo = RECORD level, label: INTEGER END ; ExitInfo = RECORD level, label: INTEGER END ;
tmpName = POINTER TO ARRAY 32 OF CHAR;
VAR VAR
stamp: INTEGER; (* unique number for nested objects *) stamp: INTEGER; (* unique number for nested objects *)
@ -53,20 +52,6 @@ MODULE OPV; (* J. Templ 16.2.95 / 3.7.96
exit: ExitInfo; (* to check if EXIT is simply a break *) exit: ExitInfo; (* to check if EXIT is simply a break *)
nofExitLabels: INTEGER; nofExitLabels: INTEGER;
tempCounter: INTEGER; (* to generate unique temp names *)
PROCEDURE uniqueTempName(): tmpName;
VAR
num: ARRAY 8 OF CHAR;
tempName: tmpName;
BEGIN
INC(tempCounter);
NEW(tempName);
COPY("_voc_tmp_", tempName^);
VT100.IntToStr(tempCounter, num);
Strings.Append(num, tempName^);
RETURN tempName;
END uniqueTempName;
PROCEDURE Init*; PROCEDURE Init*;
BEGIN BEGIN
@ -211,7 +196,7 @@ MODULE OPV; (* J. Templ 16.2.95 / 3.7.96
OPT.bit, OPT.bit,
OPT.lsh, OPT.lsh,
OPT.rot: RETURN 10 OPT.rot: RETURN 10
ELSE OPM.LogWStr("unhandled case in OPV.Precedence OPT.Ndop, subclass = "); OPM.LogWNum(subclass, 0); OPM.LogWLn; ELSE OPM.LogWStr("unhandled case in OPV.Precedence OPT.Ndop, subclass = "); OPM.LogWNum(subclass, 0); OPM.LogWLn;
END; END;
| OPT.Nupto: RETURN 10 | OPT.Nupto: RETURN 10
| OPT.Ntype, | OPT.Ntype,
@ -229,13 +214,13 @@ MODULE OPV; (* J. Templ 16.2.95 / 3.7.96
BEGIN BEGIN
WHILE (n^.class = OPT.Nindex) & (n^.typ^.comp = OPT.DynArr(*26.7.2002*)) DO INC(dim); n := n^.left END ; WHILE (n^.class = OPT.Nindex) & (n^.typ^.comp = OPT.DynArr(*26.7.2002*)) DO INC(dim); n := n^.left END ;
IF (n^.class = OPT.Nderef) & (n^.typ^.comp = OPT.DynArr) THEN IF (n^.class = OPT.Nderef) & (n^.typ^.comp = OPT.DynArr) THEN
d := dim; array := n^.typ; d := dim; array := n^.typ;
WHILE d > 0 DO array := array^.BaseTyp; DEC(d) END; WHILE d > 0 DO array := array^.BaseTyp; DEC(d) END;
IF array^.comp = OPT.DynArr THEN IF array^.comp = OPT.DynArr THEN
design(n^.left, 10); OPM.WriteString("->len["); OPM.WriteInt(dim); OPM.Write("]") design(n^.left, 10); OPM.WriteString("->len["); OPM.WriteInt(dim); OPM.Write("]")
ELSE ELSE
OPM.WriteInt(array^.n) OPM.WriteInt(array^.n)
END END
ELSE ELSE
OPC.Len(n^.obj, n^.typ, dim) OPC.Len(n^.obj, n^.typ, dim)
END END
@ -270,39 +255,27 @@ MODULE OPV; (* J. Templ 16.2.95 / 3.7.96
END END
END SizeCast; END SizeCast;
PROCEDURE Convert(n: OPT.Node; newtype: OPT.Struct; prec: INTEGER); PROCEDURE Convert(n: OPT.Node; newtype: OPT.Struct; prec: INTEGER);
VAR VAR from, to: INTEGER;
from, to: INTEGER; BEGIN from := n^.typ^.form; to := newtype.form;
tempName: tmpName; IF to = OPT.Set THEN
tempIndex: INTEGER; (* New variable to manage temporary indexes *) IF from = OPT.Set THEN (* Sets of different size *)
BEGIN SizeCast(n, newtype.size);
from := n^.typ^.form; ELSE (* Set from integer *)
to := newtype.form; OPM.WriteString("__SETOF("); Entier(n, MinPrec);
OPM.WriteString(","); OPM.WriteInt(newtype.size*8); OPM.Write(CloseParen)
IF to = OPT.Set THEN END
tempName := uniqueTempName(); ELSIF to = OPT.Int THEN (* integers of different size *)
tempIndex := 0; (* Initialize temp index *)
OPM.WriteString("UINT32 "); OPM.WriteString(tempName^); OPM.WriteString(" = 0;"); (* Correctly initialize variable *)
OPM.WriteLn;
IF from = OPT.Set THEN
SizeCast(n, newtype.size); SizeCast(n, newtype.size);
ELSE ELSIF to = OPT.Char THEN
OPM.WriteString(tempName^); OPM.WriteString(" = __SETOF("); IF OPM.ranchk IN OPM.Options THEN OPM.WriteString("__CHR");
Entier(n, MinPrec); IF SideEffects(n) THEN OPM.Write("F") END ;
OPM.WriteString(","); OPM.Write(OpenParen); Entier(n, MinPrec); OPM.Write(CloseParen)
OPM.WriteInt(newtype.size * 8); ELSE OPM.WriteString("(CHAR)"); Entier(n, 9)
OPM.WriteString(");"); END
OPM.WriteLn; ELSE expr(n, prec)
OPM.WriteString("i |= "); OPM.WriteString(tempName^); OPM.WriteString(";"); (* Ensure 'i' is declared *)
END END
ELSIF to = OPT.Int THEN END Convert;
SizeCast(n, newtype.size);
ELSE
expr(n, prec);
END
END Convert;
PROCEDURE TypeOf(n: OPT.Node); PROCEDURE TypeOf(n: OPT.Node);
BEGIN BEGIN
@ -603,7 +576,7 @@ END Convert;
IF SideEffects(n) THEN OPM.WriteString("__MODF(") IF SideEffects(n) THEN OPM.WriteString("__MODF(")
ELSE OPM.WriteString("__MOD(") ELSE OPM.WriteString("__MOD(")
END; END;
ELSE OPM.LogWStr("unhandled case in OPV.expr, subclass = "); OPM.LogWNum(subclass, 0); OPM.LogWLn; ELSE OPM.LogWStr("unhandled case in OPV.expr, subclass = "); OPM.LogWNum(subclass, 0); OPM.LogWLn;
END ; END ;
expr(l, MinPrec); expr(l, MinPrec);
OPM.WriteString(Comma); OPM.WriteString(Comma);
@ -649,10 +622,10 @@ END Convert;
ELSE OPM.WriteString(" - ") ELSE OPM.WriteString(" - ")
END; END;
| OPS.or: OPM.WriteString(" || "); | OPS.or: OPM.WriteString(" || ");
ELSE OPM.LogWStr("unhandled case in OPV.expr, subclass = "); OPM.LogWNum(subclass, 0); OPM.LogWLn; ELSE OPM.LogWStr("unhandled case in OPV.expr, subclass = "); OPM.LogWNum(subclass, 0); OPM.LogWLn;
END; END;
expr(r, exprPrec); expr(r, exprPrec);
IF (subclass = OPS.and) OR ((form = OPT.Set) & ((subclass = OPS.times) OR (subclass = OPS.minus))) THEN OPM.Write(CloseParen) END; (* to silence clang warnings, -- noch*) IF (subclass = OPS.and) OR ((form = OPT.Set) & ((subclass = OPS.times) OR (subclass = OPS.minus))) THEN OPM.Write(CloseParen) END; (* to silence clang warnings, -- noch*)
END END
| OPT.Ncall: IF (l^.obj # NIL) & (l^.obj^.mode = OPT.TProc) THEN | OPT.Ncall: IF (l^.obj # NIL) & (l^.obj^.mode = OPT.TProc) THEN
IF l^.subcl = OPT.super THEN proc := SuperProc(n) IF l^.subcl = OPT.super THEN proc := SuperProc(n)
@ -796,7 +769,6 @@ END Convert;
PROCEDURE stat(n: OPT.Node; outerProc: OPT.Object); PROCEDURE stat(n: OPT.Node; outerProc: OPT.Object);
VAR proc: OPT.Object; saved: ExitInfo; l, r: OPT.Node; VAR proc: OPT.Object; saved: ExitInfo; l, r: OPT.Node;
tempName, tempVar: tmpName;
BEGIN BEGIN
WHILE (n # NIL) & OPM.noerr DO WHILE (n # NIL) & OPM.noerr DO
OPM.errpos := OPM.Longint(n^.conval^.intval); OPM.errpos := OPM.Longint(n^.conval^.intval);
@ -861,17 +833,9 @@ END Convert;
| OPT.incfn, | OPT.incfn,
OPT.decfn: expr(n^.left, MinPrec); OPC.Increment(n^.subcl = OPT.decfn); expr(n^.right, MinPrec) OPT.decfn: expr(n^.left, MinPrec); OPC.Increment(n^.subcl = OPT.decfn); expr(n^.right, MinPrec)
| OPT.inclfn, | OPT.inclfn,
OPT.exclfn: OPT.exclfn: expr(n^.left, MinPrec); OPC.SetInclude(n^.subcl = OPT.exclfn);
tempName := uniqueTempName(); OPM.WriteString("__SETOF("); expr(n^.right, MinPrec);
OPM.WriteString("UINT32 "); OPM.WriteString(tempName^); OPM.WriteString(";"); OPM.WriteString(","); OPM.WriteInt(n.left.typ.size*8); OPM.Write(CloseParen)
OPM.WriteLn;
OPM.WriteString(tempName^); OPM.WriteString(" = __SETOF(");
expr(n^.right, MinPrec);
OPM.WriteString(","); OPM.WriteInt(n.left.typ.size * 8);
OPM.WriteString(");");
OPM.WriteLn;
OPM.WriteString("i |= "); OPM.WriteString(tempName^); OPM.WriteString(";");
| OPT.copyfn: OPM.WriteString(CopyFunc); | OPT.copyfn: OPM.WriteString(CopyFunc);
expr(n^.right, MinPrec); OPM.WriteString(Comma); expr(n^.left, MinPrec); OPM.WriteString(Comma); expr(n^.right, MinPrec); OPM.WriteString(Comma); expr(n^.left, MinPrec); OPM.WriteString(Comma);
Len(n^.left, 0); OPM.Write(CloseParen) Len(n^.left, 0); OPM.Write(CloseParen)
@ -893,7 +857,7 @@ END Convert;
design(n^.left, MinPrec); OPM.WriteString(", "); design(n^.left, MinPrec); OPM.WriteString(", ");
expr(n^.right, MinPrec); expr(n^.right, MinPrec);
OPM.Write(")") OPM.Write(")")
ELSE OPM.LogWStr("unhandled case in OPV.expr, n^.subcl = "); OPM.LogWNum(n^.subcl, 0); OPM.LogWLn; ELSE OPM.LogWStr("unhandled case in OPV.expr, n^.subcl = "); OPM.LogWNum(n^.subcl, 0); OPM.LogWLn;
END END
| OPT.Ncall: IF (n^.left^.obj # NIL) & (n^.left^.obj^.mode = OPT.TProc) THEN | OPT.Ncall: IF (n^.left^.obj # NIL) & (n^.left^.obj^.mode = OPT.TProc) THEN
IF n^.left^.subcl = OPT.super THEN proc := SuperProc(n) IF n^.left^.subcl = OPT.super THEN proc := SuperProc(n)
@ -967,7 +931,4 @@ END Convert;
OPC.GenBdy(prog^.right); stat(prog, NIL) OPC.GenBdy(prog^.right); stat(prog, NIL)
END Module; END Module;
BEGIN
tempCounter := 0
END OPV. END OPV.

5
src/test/server/s.Mod
View file

@ -39,7 +39,6 @@ VAR
pid: LONGINT; pid: LONGINT;
res: Platform.ErrorCode; res: Platform.ErrorCode;
sockaddrlen: LONGINT; sockaddrlen: LONGINT;
ipAddr: LONGINT; ip: ARRAY 16 OF CHAR;
BEGIN BEGIN
sockfd := sockets.Socket(sockets.AfInet, sockets.SockStream, 0); sockfd := sockets.Socket(sockets.AfInet, sockets.SockStream, 0);
IF sockfd < 0 THEN IF sockfd < 0 THEN
@ -48,10 +47,8 @@ BEGIN
Out.String("socket created.") Out.String("socket created.")
END; END;
Out.Ln; Out.Ln;
COPY("127.0.0.1", ip);
ipAddr := sockets.inetaddr(ip);
sockets.SetSockAddrIn(sockets.AfInet, Port, ipAddr, ServAddr); sockets.SetSockAddrIn(sockets.AfInet, Port, 0, ServAddr);
IF sockets.Bind(sockfd, SYSTEM.VAL(sockets.SockAddr, ServAddr), SIZE(sockets.SockAddr)) < 0 THEN IF sockets.Bind(sockfd, SYSTEM.VAL(sockets.SockAddr, ServAddr), SIZE(sockets.SockAddr)) < 0 THEN
Out.String("error on binding") Out.String("error on binding")
ELSE ELSE

5
src/test/server/sockets.Mod
View file

@ -77,9 +77,6 @@ TYPE
END; END;
PROCEDURE -includesocket "#include <sys/socket.h>"; PROCEDURE -includesocket "#include <sys/socket.h>";
PROCEDURE -includeInet "#include <arpa/inet.h>";
PROCEDURE -inetaddr*(s: ARRAY OF CHAR): LONGINT "(LONGINT)inet_addr((char*)s)";
PROCEDURE -SetCShort(i: INTEGER; VAR si: oocC.shortint) PROCEDURE -SetCShort(i: INTEGER; VAR si: oocC.shortint)
"*(short*)si = i"; "*(short*)si = i";
@ -87,7 +84,7 @@ TYPE
PROCEDURE -SetCShortSwapped(i: INTEGER; VAR si: oocC.shortint) PROCEDURE -SetCShortSwapped(i: INTEGER; VAR si: oocC.shortint)
"*(short*)si = ((i >> 8) & 0x00ff) | ((i << 8) & 0xff00)"; "*(short*)si = ((i >> 8) & 0x00ff) | ((i << 8) & 0xff00)";
PROCEDURE SetSockAddrIn*(family, port: INTEGER; inaddr: LONGINT; VAR sai: SockAddrIn); PROCEDURE SetSockAddrIn*(family, port, inaddr: INTEGER; VAR sai: SockAddrIn);
VAR i: INTEGER; VAR i: INTEGER;
BEGIN BEGIN
SetCShort(family, sai.SinFamily); SetCShort(family, sai.SinFamily);