qbe

commit 0cedf8e6cf8735b0de49b2bcbdbe43a65b88ab11
parent 42ecd05b7fe8512f1624873010b988e48d6431b5
Author: Ori Bernstein <ori@eigenstate.org>
Date:   Sat, 16 Apr 2016 00:01:32 -0700

support trailing , in types/args/params

Diffstat:
M
parse.c
 | 
19
+++++++------------

1 file changed, 7 insertions(+), 12 deletions(-)
diff --git a/parse.c b/parse.c
@@ -439,15 +439,11 @@ parsecls(int *tyn)
 static void
 parserefl(int arg)
 {
-	int k, t, ty;
+	int k, ty;
 	Ref r;
 
 	expect(TLParen);
-	if (peek() == TRParen) {
-		next();
-		return;
-	}
-	for (;;) {
+	while (peek() != TRParen) {
 		if (curi - insb >= NIns)
 			err("too many instructions (1)");
 		k = parsecls(&ty);
@@ -467,12 +463,11 @@ parserefl(int arg)
 			else
 				*curi = (Ins){OPar, r, {R}, k};
 		curi++;
-		t = next();
-		if (t == TRParen)
+		if (peek() == TRParen)
 			break;
-		if (t != TComma)
-			err(", or ) expected");
+		expect(TComma);
 	}
+	next();
 }
 
 static Blk *
@@ -831,7 +826,7 @@ parsetyp()
 		n = -1;
 		sz = 0;
 		al = 0;
-		for (;;) {
+		while (t != TRBrace) {
 			flt = 0;
 			switch (t) {
 			default: err("invalid size specifier %c", tokval.chr);
@@ -882,7 +877,7 @@ parsetyp()
 		ty->size = (sz + a) & ~a;
 	}
 	if (t != TRBrace)
-		err("expected closing }");
+		err(", or } expected");
 }
 
 static void