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

Restore result variable just for issue #40 using same fix as J. Templ.

Browse source
This commit is contained in:
David Brown 2016-10-28 21:00:07 +01:00
parent 6a4748e2af
commit 03556336ce
22 changed files with 171 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
bootstrap/unix-44/OPC.c
View file

@ -69,6 +69,7 @@ export void OPC_IntLiteral (int64 n, int32 size);
export void OPC_Len (OPT_Object obj, OPT_Struct array, int64 dim); export void OPC_Len (OPT_Object obj, OPT_Struct array, int64 dim);
static void OPC_LenList (OPT_Object par, BOOLEAN ansiDefine, BOOLEAN showParamName); static void OPC_LenList (OPT_Object par, BOOLEAN ansiDefine, BOOLEAN showParamName);
static int16 OPC_Length (CHAR *s, LONGINT s__len); static int16 OPC_Length (CHAR *s, LONGINT s__len);
export BOOLEAN OPC_NeedsRetval (OPT_Object proc);
export int32 OPC_NofPtrs (OPT_Struct typ); export int32 OPC_NofPtrs (OPT_Struct typ);
static int16 OPC_PerfectHash (CHAR *s, LONGINT s__len); static int16 OPC_PerfectHash (CHAR *s, LONGINT s__len);
static BOOLEAN OPC_Prefixed (OPT_ConstExt x, CHAR *y, LONGINT y__len); static BOOLEAN OPC_Prefixed (OPT_ConstExt x, CHAR *y, LONGINT y__len);
@ -1428,6 +1429,11 @@ void OPC_DefineInter (OPT_Object proc)
OPM_WriteLn(); OPM_WriteLn();
} }
BOOLEAN OPC_NeedsRetval (OPT_Object proc)
{
return (proc->typ != OPT_notyp && !proc->scope->leaf);
}
void OPC_EnterProc (OPT_Object proc) void OPC_EnterProc (OPT_Object proc)
{ {
OPT_Object var = NIL, scope = NIL; OPT_Object var = NIL, scope = NIL;
@ -1448,6 +1454,12 @@ void OPC_EnterProc (OPT_Object proc)
OPM_WriteString((CHAR*)"_s", 3); OPM_WriteString((CHAR*)"_s", 3);
OPC_EndStat(); OPC_EndStat();
} }
if (OPC_NeedsRetval(proc)) {
OPC_BegStat();
OPC_Ident(proc->typ->strobj);
OPM_WriteString((CHAR*)" __retval", 10);
OPC_EndStat();
}
var = proc->link; var = proc->link;
while (var != NIL) { while (var != NIL) {
if ((var->typ->comp == 2 && var->mode == 1)) { if ((var->typ->comp == 2 && var->mode == 1)) {

1
bootstrap/unix-44/OPC.h
View file

@ -37,6 +37,7 @@ import void OPC_Init (void);
import void OPC_InitTDesc (OPT_Struct typ); import void OPC_InitTDesc (OPT_Struct typ);
import void OPC_IntLiteral (int64 n, int32 size); import void OPC_IntLiteral (int64 n, int32 size);
import void OPC_Len (OPT_Object obj, OPT_Struct array, int64 dim); import void OPC_Len (OPT_Object obj, OPT_Struct array, int64 dim);
import BOOLEAN OPC_NeedsRetval (OPT_Object proc);
import int32 OPC_NofPtrs (OPT_Struct typ); import int32 OPC_NofPtrs (OPT_Struct typ);
import void OPC_SetInclude (BOOLEAN exclude); import void OPC_SetInclude (BOOLEAN exclude);
import void OPC_TDescDecl (OPT_Struct typ); import void OPC_TDescDecl (OPT_Struct typ);

14
bootstrap/unix-44/OPV.c
View file

@ -1490,6 +1490,20 @@ static void OPV_stat (OPT_Node n, OPT_Object outerProc)
} else { } else {
OPM_WriteString((CHAR*)"__ENDMOD", 9); OPM_WriteString((CHAR*)"__ENDMOD", 9);
} }
} else if (OPC_NeedsRetval(outerProc)) {
OPM_WriteString((CHAR*)"__retval = ", 12);
if ((n->left->typ->form == 11 && n->obj->typ != n->left->typ)) {
OPM_WriteString((CHAR*)"(void*)", 8);
OPV_expr(n->left, 10);
} else {
OPV_expr(n->left, -1);
}
OPC_EndStat();
OPC_BegStat();
OPC_ExitProc(outerProc, 0, 0);
OPC_EndStat();
OPC_BegStat();
OPM_WriteString((CHAR*)"return __retval", 16);
} else { } else {
OPC_ExitProc(outerProc, 0, 0); OPC_ExitProc(outerProc, 0, 0);
OPM_WriteString((CHAR*)"return", 7); OPM_WriteString((CHAR*)"return", 7);

5
bootstrap/unix-44/Strings.c
View file

@ -223,14 +223,17 @@ static BOOLEAN M__8 (CHAR *name, LONGINT name__len, CHAR *mask, LONGINT mask__le
BOOLEAN Strings_Match (CHAR *string, LONGINT string__len, CHAR *pattern, LONGINT pattern__len) BOOLEAN Strings_Match (CHAR *string, LONGINT string__len, CHAR *pattern, LONGINT pattern__len)
{ {
struct Match__7 _s; struct Match__7 _s;
BOOLEAN __retval;
__DUP(string, string__len, CHAR); __DUP(string, string__len, CHAR);
__DUP(pattern, pattern__len, CHAR); __DUP(pattern, pattern__len, CHAR);
_s.lnk = Match__7_s; _s.lnk = Match__7_s;
Match__7_s = &_s; Match__7_s = &_s;
__retval = M__8((void*)string, string__len, (void*)pattern, pattern__len, Strings_Length(string, string__len) - 1, Strings_Length(pattern, pattern__len) - 1);
Match__7_s = _s.lnk; Match__7_s = _s.lnk;
__DEL(string); __DEL(string);
__DEL(pattern); __DEL(pattern);
return M__8((void*)string, string__len, (void*)pattern, pattern__len, Strings_Length(string, string__len) - 1, Strings_Length(pattern, pattern__len) - 1); ;
return __retval;
} }

12
bootstrap/unix-48/OPC.c
View file

@ -69,6 +69,7 @@ export void OPC_IntLiteral (int64 n, int32 size);
export void OPC_Len (OPT_Object obj, OPT_Struct array, int64 dim); export void OPC_Len (OPT_Object obj, OPT_Struct array, int64 dim);
static void OPC_LenList (OPT_Object par, BOOLEAN ansiDefine, BOOLEAN showParamName); static void OPC_LenList (OPT_Object par, BOOLEAN ansiDefine, BOOLEAN showParamName);
static int16 OPC_Length (CHAR *s, LONGINT s__len); static int16 OPC_Length (CHAR *s, LONGINT s__len);
export BOOLEAN OPC_NeedsRetval (OPT_Object proc);
export int32 OPC_NofPtrs (OPT_Struct typ); export int32 OPC_NofPtrs (OPT_Struct typ);
static int16 OPC_PerfectHash (CHAR *s, LONGINT s__len); static int16 OPC_PerfectHash (CHAR *s, LONGINT s__len);
static BOOLEAN OPC_Prefixed (OPT_ConstExt x, CHAR *y, LONGINT y__len); static BOOLEAN OPC_Prefixed (OPT_ConstExt x, CHAR *y, LONGINT y__len);
@ -1428,6 +1429,11 @@ void OPC_DefineInter (OPT_Object proc)
OPM_WriteLn(); OPM_WriteLn();
} }
BOOLEAN OPC_NeedsRetval (OPT_Object proc)
{
return (proc->typ != OPT_notyp && !proc->scope->leaf);
}
void OPC_EnterProc (OPT_Object proc) void OPC_EnterProc (OPT_Object proc)
{ {
OPT_Object var = NIL, scope = NIL; OPT_Object var = NIL, scope = NIL;
@ -1448,6 +1454,12 @@ void OPC_EnterProc (OPT_Object proc)
OPM_WriteString((CHAR*)"_s", 3); OPM_WriteString((CHAR*)"_s", 3);
OPC_EndStat(); OPC_EndStat();
} }
if (OPC_NeedsRetval(proc)) {
OPC_BegStat();
OPC_Ident(proc->typ->strobj);
OPM_WriteString((CHAR*)" __retval", 10);
OPC_EndStat();
}
var = proc->link; var = proc->link;
while (var != NIL) { while (var != NIL) {
if ((var->typ->comp == 2 && var->mode == 1)) { if ((var->typ->comp == 2 && var->mode == 1)) {

1
bootstrap/unix-48/OPC.h
View file

@ -37,6 +37,7 @@ import void OPC_Init (void);
import void OPC_InitTDesc (OPT_Struct typ); import void OPC_InitTDesc (OPT_Struct typ);
import void OPC_IntLiteral (int64 n, int32 size); import void OPC_IntLiteral (int64 n, int32 size);
import void OPC_Len (OPT_Object obj, OPT_Struct array, int64 dim); import void OPC_Len (OPT_Object obj, OPT_Struct array, int64 dim);
import BOOLEAN OPC_NeedsRetval (OPT_Object proc);
import int32 OPC_NofPtrs (OPT_Struct typ); import int32 OPC_NofPtrs (OPT_Struct typ);
import void OPC_SetInclude (BOOLEAN exclude); import void OPC_SetInclude (BOOLEAN exclude);
import void OPC_TDescDecl (OPT_Struct typ); import void OPC_TDescDecl (OPT_Struct typ);

14
bootstrap/unix-48/OPV.c
View file

@ -1490,6 +1490,20 @@ static void OPV_stat (OPT_Node n, OPT_Object outerProc)
} else { } else {
OPM_WriteString((CHAR*)"__ENDMOD", 9); OPM_WriteString((CHAR*)"__ENDMOD", 9);
} }
} else if (OPC_NeedsRetval(outerProc)) {
OPM_WriteString((CHAR*)"__retval = ", 12);
if ((n->left->typ->form == 11 && n->obj->typ != n->left->typ)) {
OPM_WriteString((CHAR*)"(void*)", 8);
OPV_expr(n->left, 10);
} else {
OPV_expr(n->left, -1);
}
OPC_EndStat();
OPC_BegStat();
OPC_ExitProc(outerProc, 0, 0);
OPC_EndStat();
OPC_BegStat();
OPM_WriteString((CHAR*)"return __retval", 16);
} else { } else {
OPC_ExitProc(outerProc, 0, 0); OPC_ExitProc(outerProc, 0, 0);
OPM_WriteString((CHAR*)"return", 7); OPM_WriteString((CHAR*)"return", 7);

5
bootstrap/unix-48/Strings.c
View file

@ -223,14 +223,17 @@ static BOOLEAN M__8 (CHAR *name, LONGINT name__len, CHAR *mask, LONGINT mask__le
BOOLEAN Strings_Match (CHAR *string, LONGINT string__len, CHAR *pattern, LONGINT pattern__len) BOOLEAN Strings_Match (CHAR *string, LONGINT string__len, CHAR *pattern, LONGINT pattern__len)
{ {
struct Match__7 _s; struct Match__7 _s;
BOOLEAN __retval;
__DUP(string, string__len, CHAR); __DUP(string, string__len, CHAR);
__DUP(pattern, pattern__len, CHAR); __DUP(pattern, pattern__len, CHAR);
_s.lnk = Match__7_s; _s.lnk = Match__7_s;
Match__7_s = &_s; Match__7_s = &_s;
__retval = M__8((void*)string, string__len, (void*)pattern, pattern__len, Strings_Length(string, string__len) - 1, Strings_Length(pattern, pattern__len) - 1);
Match__7_s = _s.lnk; Match__7_s = _s.lnk;
__DEL(string); __DEL(string);
__DEL(pattern); __DEL(pattern);
return M__8((void*)string, string__len, (void*)pattern, pattern__len, Strings_Length(string, string__len) - 1, Strings_Length(pattern, pattern__len) - 1); ;
return __retval;
} }

12
bootstrap/unix-88/OPC.c
View file

@ -69,6 +69,7 @@ export void OPC_IntLiteral (int64 n, int32 size);
export void OPC_Len (OPT_Object obj, OPT_Struct array, int64 dim); export void OPC_Len (OPT_Object obj, OPT_Struct array, int64 dim);
static void OPC_LenList (OPT_Object par, BOOLEAN ansiDefine, BOOLEAN showParamName); static void OPC_LenList (OPT_Object par, BOOLEAN ansiDefine, BOOLEAN showParamName);
static int16 OPC_Length (CHAR *s, LONGINT s__len); static int16 OPC_Length (CHAR *s, LONGINT s__len);
export BOOLEAN OPC_NeedsRetval (OPT_Object proc);
export int32 OPC_NofPtrs (OPT_Struct typ); export int32 OPC_NofPtrs (OPT_Struct typ);
static int16 OPC_PerfectHash (CHAR *s, LONGINT s__len); static int16 OPC_PerfectHash (CHAR *s, LONGINT s__len);
static BOOLEAN OPC_Prefixed (OPT_ConstExt x, CHAR *y, LONGINT y__len); static BOOLEAN OPC_Prefixed (OPT_ConstExt x, CHAR *y, LONGINT y__len);
@ -1428,6 +1429,11 @@ void OPC_DefineInter (OPT_Object proc)
OPM_WriteLn(); OPM_WriteLn();
} }
BOOLEAN OPC_NeedsRetval (OPT_Object proc)
{
return (proc->typ != OPT_notyp && !proc->scope->leaf);
}
void OPC_EnterProc (OPT_Object proc) void OPC_EnterProc (OPT_Object proc)
{ {
OPT_Object var = NIL, scope = NIL; OPT_Object var = NIL, scope = NIL;
@ -1448,6 +1454,12 @@ void OPC_EnterProc (OPT_Object proc)
OPM_WriteString((CHAR*)"_s", 3); OPM_WriteString((CHAR*)"_s", 3);
OPC_EndStat(); OPC_EndStat();
} }
if (OPC_NeedsRetval(proc)) {
OPC_BegStat();
OPC_Ident(proc->typ->strobj);
OPM_WriteString((CHAR*)" __retval", 10);
OPC_EndStat();
}
var = proc->link; var = proc->link;
while (var != NIL) { while (var != NIL) {
if ((var->typ->comp == 2 && var->mode == 1)) { if ((var->typ->comp == 2 && var->mode == 1)) {

1
bootstrap/unix-88/OPC.h
View file

@ -37,6 +37,7 @@ import void OPC_Init (void);
import void OPC_InitTDesc (OPT_Struct typ); import void OPC_InitTDesc (OPT_Struct typ);
import void OPC_IntLiteral (int64 n, int32 size); import void OPC_IntLiteral (int64 n, int32 size);
import void OPC_Len (OPT_Object obj, OPT_Struct array, int64 dim); import void OPC_Len (OPT_Object obj, OPT_Struct array, int64 dim);
import BOOLEAN OPC_NeedsRetval (OPT_Object proc);
import int32 OPC_NofPtrs (OPT_Struct typ); import int32 OPC_NofPtrs (OPT_Struct typ);
import void OPC_SetInclude (BOOLEAN exclude); import void OPC_SetInclude (BOOLEAN exclude);
import void OPC_TDescDecl (OPT_Struct typ); import void OPC_TDescDecl (OPT_Struct typ);

14
bootstrap/unix-88/OPV.c
View file

@ -1490,6 +1490,20 @@ static void OPV_stat (OPT_Node n, OPT_Object outerProc)
} else { } else {
OPM_WriteString((CHAR*)"__ENDMOD", 9); OPM_WriteString((CHAR*)"__ENDMOD", 9);
} }
} else if (OPC_NeedsRetval(outerProc)) {
OPM_WriteString((CHAR*)"__retval = ", 12);
if ((n->left->typ->form == 11 && n->obj->typ != n->left->typ)) {
OPM_WriteString((CHAR*)"(void*)", 8);
OPV_expr(n->left, 10);
} else {
OPV_expr(n->left, -1);
}
OPC_EndStat();
OPC_BegStat();
OPC_ExitProc(outerProc, 0, 0);
OPC_EndStat();
OPC_BegStat();
OPM_WriteString((CHAR*)"return __retval", 16);
} else { } else {
OPC_ExitProc(outerProc, 0, 0); OPC_ExitProc(outerProc, 0, 0);
OPM_WriteString((CHAR*)"return", 7); OPM_WriteString((CHAR*)"return", 7);

5
bootstrap/unix-88/Strings.c
View file

@ -223,14 +223,17 @@ static BOOLEAN M__8 (CHAR *name, LONGINT name__len, CHAR *mask, LONGINT mask__le
BOOLEAN Strings_Match (CHAR *string, LONGINT string__len, CHAR *pattern, LONGINT pattern__len) BOOLEAN Strings_Match (CHAR *string, LONGINT string__len, CHAR *pattern, LONGINT pattern__len)
{ {
struct Match__7 _s; struct Match__7 _s;
BOOLEAN __retval;
__DUP(string, string__len, CHAR); __DUP(string, string__len, CHAR);
__DUP(pattern, pattern__len, CHAR); __DUP(pattern, pattern__len, CHAR);
_s.lnk = Match__7_s; _s.lnk = Match__7_s;
Match__7_s = &_s; Match__7_s = &_s;
__retval = M__8((void*)string, string__len, (void*)pattern, pattern__len, Strings_Length(string, string__len) - 1, Strings_Length(pattern, pattern__len) - 1);
Match__7_s = _s.lnk; Match__7_s = _s.lnk;
__DEL(string); __DEL(string);
__DEL(pattern); __DEL(pattern);
return M__8((void*)string, string__len, (void*)pattern, pattern__len, Strings_Length(string, string__len) - 1, Strings_Length(pattern, pattern__len) - 1); ;
return __retval;
} }

12
bootstrap/windows-48/OPC.c
View file

@ -69,6 +69,7 @@ export void OPC_IntLiteral (int64 n, int32 size);
export void OPC_Len (OPT_Object obj, OPT_Struct array, int64 dim); export void OPC_Len (OPT_Object obj, OPT_Struct array, int64 dim);
static void OPC_LenList (OPT_Object par, BOOLEAN ansiDefine, BOOLEAN showParamName); static void OPC_LenList (OPT_Object par, BOOLEAN ansiDefine, BOOLEAN showParamName);
static int16 OPC_Length (CHAR *s, LONGINT s__len); static int16 OPC_Length (CHAR *s, LONGINT s__len);
export BOOLEAN OPC_NeedsRetval (OPT_Object proc);
export int32 OPC_NofPtrs (OPT_Struct typ); export int32 OPC_NofPtrs (OPT_Struct typ);
static int16 OPC_PerfectHash (CHAR *s, LONGINT s__len); static int16 OPC_PerfectHash (CHAR *s, LONGINT s__len);
static BOOLEAN OPC_Prefixed (OPT_ConstExt x, CHAR *y, LONGINT y__len); static BOOLEAN OPC_Prefixed (OPT_ConstExt x, CHAR *y, LONGINT y__len);
@ -1428,6 +1429,11 @@ void OPC_DefineInter (OPT_Object proc)
OPM_WriteLn(); OPM_WriteLn();
} }
BOOLEAN OPC_NeedsRetval (OPT_Object proc)
{
return (proc->typ != OPT_notyp && !proc->scope->leaf);
}
void OPC_EnterProc (OPT_Object proc) void OPC_EnterProc (OPT_Object proc)
{ {
OPT_Object var = NIL, scope = NIL; OPT_Object var = NIL, scope = NIL;
@ -1448,6 +1454,12 @@ void OPC_EnterProc (OPT_Object proc)
OPM_WriteString((CHAR*)"_s", 3); OPM_WriteString((CHAR*)"_s", 3);
OPC_EndStat(); OPC_EndStat();
} }
if (OPC_NeedsRetval(proc)) {
OPC_BegStat();
OPC_Ident(proc->typ->strobj);
OPM_WriteString((CHAR*)" __retval", 10);
OPC_EndStat();
}
var = proc->link; var = proc->link;
while (var != NIL) { while (var != NIL) {
if ((var->typ->comp == 2 && var->mode == 1)) { if ((var->typ->comp == 2 && var->mode == 1)) {

1
bootstrap/windows-48/OPC.h
View file

@ -37,6 +37,7 @@ import void OPC_Init (void);
import void OPC_InitTDesc (OPT_Struct typ); import void OPC_InitTDesc (OPT_Struct typ);
import void OPC_IntLiteral (int64 n, int32 size); import void OPC_IntLiteral (int64 n, int32 size);
import void OPC_Len (OPT_Object obj, OPT_Struct array, int64 dim); import void OPC_Len (OPT_Object obj, OPT_Struct array, int64 dim);
import BOOLEAN OPC_NeedsRetval (OPT_Object proc);
import int32 OPC_NofPtrs (OPT_Struct typ); import int32 OPC_NofPtrs (OPT_Struct typ);
import void OPC_SetInclude (BOOLEAN exclude); import void OPC_SetInclude (BOOLEAN exclude);
import void OPC_TDescDecl (OPT_Struct typ); import void OPC_TDescDecl (OPT_Struct typ);

14
bootstrap/windows-48/OPV.c
View file

@ -1490,6 +1490,20 @@ static void OPV_stat (OPT_Node n, OPT_Object outerProc)
} else { } else {
OPM_WriteString((CHAR*)"__ENDMOD", 9); OPM_WriteString((CHAR*)"__ENDMOD", 9);
} }
} else if (OPC_NeedsRetval(outerProc)) {
OPM_WriteString((CHAR*)"__retval = ", 12);
if ((n->left->typ->form == 11 && n->obj->typ != n->left->typ)) {
OPM_WriteString((CHAR*)"(void*)", 8);
OPV_expr(n->left, 10);
} else {
OPV_expr(n->left, -1);
}
OPC_EndStat();
OPC_BegStat();
OPC_ExitProc(outerProc, 0, 0);
OPC_EndStat();
OPC_BegStat();
OPM_WriteString((CHAR*)"return __retval", 16);
} else { } else {
OPC_ExitProc(outerProc, 0, 0); OPC_ExitProc(outerProc, 0, 0);
OPM_WriteString((CHAR*)"return", 7); OPM_WriteString((CHAR*)"return", 7);

5
bootstrap/windows-48/Strings.c
View file

@ -223,14 +223,17 @@ static BOOLEAN M__8 (CHAR *name, LONGINT name__len, CHAR *mask, LONGINT mask__le
BOOLEAN Strings_Match (CHAR *string, LONGINT string__len, CHAR *pattern, LONGINT pattern__len) BOOLEAN Strings_Match (CHAR *string, LONGINT string__len, CHAR *pattern, LONGINT pattern__len)
{ {
struct Match__7 _s; struct Match__7 _s;
BOOLEAN __retval;
__DUP(string, string__len, CHAR); __DUP(string, string__len, CHAR);
__DUP(pattern, pattern__len, CHAR); __DUP(pattern, pattern__len, CHAR);
_s.lnk = Match__7_s; _s.lnk = Match__7_s;
Match__7_s = &_s; Match__7_s = &_s;
__retval = M__8((void*)string, string__len, (void*)pattern, pattern__len, Strings_Length(string, string__len) - 1, Strings_Length(pattern, pattern__len) - 1);
Match__7_s = _s.lnk; Match__7_s = _s.lnk;
__DEL(string); __DEL(string);
__DEL(pattern); __DEL(pattern);
return M__8((void*)string, string__len, (void*)pattern, pattern__len, Strings_Length(string, string__len) - 1, Strings_Length(pattern, pattern__len) - 1); ;
return __retval;
} }

12
bootstrap/windows-88/OPC.c
View file

@ -69,6 +69,7 @@ export void OPC_IntLiteral (int64 n, int32 size);
export void OPC_Len (OPT_Object obj, OPT_Struct array, int64 dim); export void OPC_Len (OPT_Object obj, OPT_Struct array, int64 dim);
static void OPC_LenList (OPT_Object par, BOOLEAN ansiDefine, BOOLEAN showParamName); static void OPC_LenList (OPT_Object par, BOOLEAN ansiDefine, BOOLEAN showParamName);
static int16 OPC_Length (CHAR *s, LONGINT s__len); static int16 OPC_Length (CHAR *s, LONGINT s__len);
export BOOLEAN OPC_NeedsRetval (OPT_Object proc);
export int32 OPC_NofPtrs (OPT_Struct typ); export int32 OPC_NofPtrs (OPT_Struct typ);
static int16 OPC_PerfectHash (CHAR *s, LONGINT s__len); static int16 OPC_PerfectHash (CHAR *s, LONGINT s__len);
static BOOLEAN OPC_Prefixed (OPT_ConstExt x, CHAR *y, LONGINT y__len); static BOOLEAN OPC_Prefixed (OPT_ConstExt x, CHAR *y, LONGINT y__len);
@ -1428,6 +1429,11 @@ void OPC_DefineInter (OPT_Object proc)
OPM_WriteLn(); OPM_WriteLn();
} }
BOOLEAN OPC_NeedsRetval (OPT_Object proc)
{
return (proc->typ != OPT_notyp && !proc->scope->leaf);
}
void OPC_EnterProc (OPT_Object proc) void OPC_EnterProc (OPT_Object proc)
{ {
OPT_Object var = NIL, scope = NIL; OPT_Object var = NIL, scope = NIL;
@ -1448,6 +1454,12 @@ void OPC_EnterProc (OPT_Object proc)
OPM_WriteString((CHAR*)"_s", 3); OPM_WriteString((CHAR*)"_s", 3);
OPC_EndStat(); OPC_EndStat();
} }
if (OPC_NeedsRetval(proc)) {
OPC_BegStat();
OPC_Ident(proc->typ->strobj);
OPM_WriteString((CHAR*)" __retval", 10);
OPC_EndStat();
}
var = proc->link; var = proc->link;
while (var != NIL) { while (var != NIL) {
if ((var->typ->comp == 2 && var->mode == 1)) { if ((var->typ->comp == 2 && var->mode == 1)) {

1
bootstrap/windows-88/OPC.h
View file

@ -37,6 +37,7 @@ import void OPC_Init (void);
import void OPC_InitTDesc (OPT_Struct typ); import void OPC_InitTDesc (OPT_Struct typ);
import void OPC_IntLiteral (int64 n, int32 size); import void OPC_IntLiteral (int64 n, int32 size);
import void OPC_Len (OPT_Object obj, OPT_Struct array, int64 dim); import void OPC_Len (OPT_Object obj, OPT_Struct array, int64 dim);
import BOOLEAN OPC_NeedsRetval (OPT_Object proc);
import int32 OPC_NofPtrs (OPT_Struct typ); import int32 OPC_NofPtrs (OPT_Struct typ);
import void OPC_SetInclude (BOOLEAN exclude); import void OPC_SetInclude (BOOLEAN exclude);
import void OPC_TDescDecl (OPT_Struct typ); import void OPC_TDescDecl (OPT_Struct typ);

14
bootstrap/windows-88/OPV.c
View file

@ -1490,6 +1490,20 @@ static void OPV_stat (OPT_Node n, OPT_Object outerProc)
} else { } else {
OPM_WriteString((CHAR*)"__ENDMOD", 9); OPM_WriteString((CHAR*)"__ENDMOD", 9);
} }
} else if (OPC_NeedsRetval(outerProc)) {
OPM_WriteString((CHAR*)"__retval = ", 12);
if ((n->left->typ->form == 11 && n->obj->typ != n->left->typ)) {
OPM_WriteString((CHAR*)"(void*)", 8);
OPV_expr(n->left, 10);
} else {
OPV_expr(n->left, -1);
}
OPC_EndStat();
OPC_BegStat();
OPC_ExitProc(outerProc, 0, 0);
OPC_EndStat();
OPC_BegStat();
OPM_WriteString((CHAR*)"return __retval", 16);
} else { } else {
OPC_ExitProc(outerProc, 0, 0); OPC_ExitProc(outerProc, 0, 0);
OPM_WriteString((CHAR*)"return", 7); OPM_WriteString((CHAR*)"return", 7);

5
bootstrap/windows-88/Strings.c
View file

@ -223,14 +223,17 @@ static BOOLEAN M__8 (CHAR *name, LONGINT name__len, CHAR *mask, LONGINT mask__le
BOOLEAN Strings_Match (CHAR *string, LONGINT string__len, CHAR *pattern, LONGINT pattern__len) BOOLEAN Strings_Match (CHAR *string, LONGINT string__len, CHAR *pattern, LONGINT pattern__len)
{ {
struct Match__7 _s; struct Match__7 _s;
BOOLEAN __retval;
__DUP(string, string__len, CHAR); __DUP(string, string__len, CHAR);
__DUP(pattern, pattern__len, CHAR); __DUP(pattern, pattern__len, CHAR);
_s.lnk = Match__7_s; _s.lnk = Match__7_s;
Match__7_s = &_s; Match__7_s = &_s;
__retval = M__8((void*)string, string__len, (void*)pattern, pattern__len, Strings_Length(string, string__len) - 1, Strings_Length(pattern, pattern__len) - 1);
Match__7_s = _s.lnk; Match__7_s = _s.lnk;
__DEL(string); __DEL(string);
__DEL(pattern); __DEL(pattern);
return M__8((void*)string, string__len, (void*)pattern, pattern__len, Strings_Length(string, string__len) - 1, Strings_Length(pattern, pattern__len) - 1); ;
return __retval;
} }

6
src/compiler/OPC.Mod
View file

@ -950,6 +950,11 @@ MODULE OPC; (* copyright (c) J. Templ 12.7.95 / 3.7.96 *)
OPM.WriteLn; OPM.WriteLn;
END DefineInter; END DefineInter;
PROCEDURE NeedsRetval*(proc: OPT.Object): BOOLEAN; (* aux. variable __retval needed for return *)
BEGIN (* simple rule; ignores DUPlicated value arrays because they use alloca. *)
RETURN (proc^.typ # OPT.notyp) & ~proc^.scope^.leaf
END NeedsRetval;
PROCEDURE EnterProc* (proc: OPT.Object); PROCEDURE EnterProc* (proc: OPT.Object);
VAR var, scope: OPT.Object; typ: OPT.Struct; dim: INTEGER; VAR var, scope: OPT.Object; typ: OPT.Struct; dim: INTEGER;
BEGIN BEGIN
@ -962,6 +967,7 @@ MODULE OPC; (* copyright (c) J. Templ 12.7.95 / 3.7.96 *)
BegStat; OPM.WriteString('struct '); OPM.WriteStringVar (scope^.name); BegStat; OPM.WriteString('struct '); OPM.WriteStringVar (scope^.name);
OPM.Write(' '); OPM.WriteString(LocalScope); EndStat OPM.Write(' '); OPM.WriteString(LocalScope); EndStat
END ; END ;
IF NeedsRetval(proc) THEN BegStat; Ident(proc^.typ^.strobj); OPM.WriteString(" __retval"); EndStat END;
var := proc^.link; var := proc^.link;
WHILE var # NIL DO (* declare copy of fixed size value array parameters *) WHILE var # NIL DO (* declare copy of fixed size value array parameters *)
IF (var^.typ^.comp = OPT.Array) & (var^.mode = OPT.Var) THEN IF (var^.typ^.comp = OPT.Array) & (var^.mode = OPT.Var) THEN

10
src/compiler/OPV.Mod
View file

@ -875,6 +875,16 @@ MODULE OPV; (* J. Templ 16.2.95 / 3.7.96
END END
| OPT.Nreturn: IF OPM.level = 0 THEN | OPT.Nreturn: IF OPM.level = 0 THEN
IF OPM.mainprog IN OPM.Options THEN OPM.WriteString("__FINI") ELSE OPM.WriteString("__ENDMOD") END IF OPM.mainprog IN OPM.Options THEN OPM.WriteString("__FINI") ELSE OPM.WriteString("__ENDMOD") END
ELSIF OPC.NeedsRetval(outerProc) THEN
OPM.WriteString("__retval = ");
IF (n^.left^.typ^.form = OPT.Pointer) & (n^.obj^.typ # n^.left^.typ) THEN
OPM.WriteString("(void*)"); expr(n^.left, 10)
ELSE
expr(n^.left, MinPrec)
END ;
OPC.EndStat;
OPC.BegStat; OPC.ExitProc(outerProc, FALSE, FALSE); OPC.EndStat;
OPC.BegStat; OPM.WriteString("return __retval");
ELSE ELSE
OPC.ExitProc(outerProc, FALSE, FALSE); OPC.ExitProc(outerProc, FALSE, FALSE);
OPM.WriteString("return"); OPM.WriteString("return");