shithub: scc

Info  •  Files  •  Log  •  Branches

[cpp] add support for C99 for-loop declaration

--- a/cc1/stmt.c

+++ b/cc1/stmt.c

@@ -96,7 +96,7 @@

 For(Symbol *lbreak, Symbol *lcont, Switch *lswitch)

 {

 	Symbol *begin, *cond;

-	Node *econd, *einc, *einit;

+	Node *econd, *einc, *einit = NULL;

 	begin = newlabel();

 	lcont = newlabel();

@@ -103,10 +103,23 @@

 	cond = newlabel();

 	lbreak = newlabel();

+	pushctx();

+

 	expect(FOR);

 	expect('(');

-	einit = (yytoken != ';') ? expr() : NULL;

-	expect(';');

+	switch (yytoken) {

+	case TYPE:

+	case TYPEIDEN:

+	case TQUALIFIER:

+	case SCLASS:

+		decl();

+		break;

+	default:

+		einit = expr();

+	case ';':

+		expect(';');

+		break;

+	}

 	econd = (yytoken != ';') ? condexpr() : NULL;

 	expect(';');

 	einc = (yytoken != ')') ? expr() : NULL;

@@ -126,6 +139,8 @@

 	emit(OELOOP, NULL);

 	emit(OLABEL, lbreak);

+

+	popctx();

 }

 static void