shithub: scc

Info  •  Files  •  Log  •  Branches

Simplify Switch()

It is better call directly to convert() instead of check the type
in Switch(). This patch also adds code to recover the error in
case of non integer expression.

--- a/cc1/stmt.c

+++ b/cc1/stmt.c

@@ -195,16 +195,10 @@

 	expect(SWITCH);

 	expect ('(');

-	cond = eval(expr());

-	/* TODO: why can I not call directly to convert here? */

-	switch (BTYPE(cond)) {

-	case INT:

-	case ENUM:

-		cond = convert(cond, inttype, 0);

-		break;

-	default:

-		error("incorrect type in switch statement");

+	if ((cond = convert(expr(), inttype, 0)) == NULL) {

+		errorp("incorrect type in switch statement");

+		cond = constnode(zero);

 	}

 	expect (')');