sam/libqbe
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

parse parameter lists of functions

Browse source
This commit is contained in:
Quentin Carbonneaux 2015-09-17 19:50:39 -04:00
parent 4a2c4d63f9
commit 43912f18fc
1 changed files with 26 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
lisc/parse.c
View file

@ -39,6 +39,8 @@ OpDesc opdesc[NOp] = {
[OXCmp] = { "xcmp", 1 }, [OXCmp] = { "xcmp", 1 },
[OXTest] = { "xtest", 1 }, [OXTest] = { "xtest", 1 },
[OAddr] = { "addr", 0 }, [OAddr] = { "addr", 0 },
[OPar] = { "par", 0 },
[OParc] = { "parc", 0 },
[OArg] = { "arg", 0 }, [OArg] = { "arg", 0 },
[OArgc] = { "argc", 0 }, [OArgc] = { "argc", 0 },
[OCall] = { "call", 0 }, [OCall] = { "call", 0 },
@ -291,11 +293,15 @@ nextnl()
static void static void
expect(int t) expect(int t)
{ {
static char *names[] = { static char *ttoa[] = {
[TLbl] = "label", [TLbl] = "label",
[TComma] = ",", [TComma] = ",",
[TEq] = "=", [TEq] = "=",
[TNL] = "newline", [TNL] = "newline",
[TLParen] = "(",
[TRParen] = ")",
[TLBrace] = "{",
[TRBrace] = "}",
[TEOF] = 0, [TEOF] = 0,
}; };
char buf[128], *s1, *s2; char buf[128], *s1, *s2;
@ -304,8 +310,8 @@ expect(int t)
t1 = next(); t1 = next();
if (t == t1) if (t == t1)
return; return;
s1 = names[t] ? names[t] : "??"; s1 = ttoa[t] ? ttoa[t] : "??";
s2 = names[t1] ? names[t1] : "??"; s2 = ttoa[t1] ? ttoa[t1] : "??";
snprintf(buf, sizeof buf, snprintf(buf, sizeof buf,
"%s expected (got %s instead)", s1, s2); "%s expected (got %s instead)", s1, s2);
err(buf); err(buf);
@ -394,7 +400,7 @@ parsecls(int *tyn)
} }
static void static void
parseargl() parserefl(int arg)
{ {
int w, t, ty; int w, t, ty;
Ref r; Ref r;
@ -411,10 +417,18 @@ parseargl()
r = parseref(); r = parseref();
if (req(r, R)) if (req(r, R))
err("invalid reference argument"); err("invalid reference argument");
if (!arg && rtype(r) != RTmp)
err("invalid function parameter");
if (w == 2) if (w == 2)
*curi = (Ins){OArgc, 0, R, {TYP(ty), r}}; if (arg)
*curi = (Ins){OArgc, 0, R, {TYP(ty), r}};
else
*curi = (Ins){OParc, 0, r, {TYP(ty)}};
else else
*curi = (Ins){OArg, w, R, {r, R}}; if (arg)
*curi = (Ins){OArg, w, R, {r}};
else
*curi = (Ins){OPar, w, r, {R}};
curi++; curi++;
t = next(); t = next();
if (t == TRParen) if (t == TRParen)
@ -531,7 +545,7 @@ DoOp:
} }
if (op == TCall) { if (op == TCall) {
arg[0] = parseref(); arg[0] = parseref();
parseargl(); parserefl(1);
expect(TNL); expect(TNL);
op = OCall; op = OCall;
if (w == 2) { if (w == 2) {
@ -599,20 +613,21 @@ parsefn()
if (next() != TGlo) if (next() != TGlo)
err("function name expected"); err("function name expected");
if (nextnl() != TLBrace)
err("function must start with {");
for (i=0; i<NBlk; i++) for (i=0; i<NBlk; i++)
bmap[i] = 0; bmap[i] = 0;
for (i=Tmp0; i<NTmp; i++) for (i=Tmp0; i<NTmp; i++)
tmp[i] = (Tmp){.name = ""}; tmp[i] = (Tmp){.name = ""};
ntmp = Tmp0; ntmp = Tmp0;
ncon = 1; /* first constant must be 0 */ ncon = 1; /* first constant must be 0 */
curi = insb;
curb = 0; curb = 0;
nblk = 0; nblk = 0;
curi = insb;
fn = alloc(sizeof *fn); fn = alloc(sizeof *fn);
strcpy(fn->name, tokval.str); strcpy(fn->name, tokval.str);
blink = &fn->start; blink = &fn->start;
parserefl(0);
if (nextnl() != TLBrace)
err("function body must start with {");
ps = PLbl; ps = PLbl;
do do
ps = parseline(ps); ps = parseline(ps);
@ -798,6 +813,7 @@ printfn(Fn *fn, FILE *f)
#undef X #undef X
}; };
static char prcls[NOp] = { static char prcls[NOp] = {
[OArg] = 1,
[OXCmp] = 1, [OXCmp] = 1,
[OXTest] = 1, [OXTest] = 1,
[OXPush] = 1, [OXPush] = 1,