shithub: scc

Info  •  Files  •  Log  •  Branches

Force switch value to be integer

switch only accepts integer values, so this patch forces it.

--- a/cc1/stmt.c

+++ b/cc1/stmt.c

@@ -203,27 +203,33 @@

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

 {

 	Caselist lcase = {.nr = 0, .head = NULL, .deflabel = NULL};

-	struct scase *p;

+	struct scase *p, *next;

 	Node *cond;

 	Symbol *lcond;

+	void free(void *ptr);

-	lbreak = install("", NS_LABEL);

-	lcond = install("", NS_LABEL);

 	expect(SWITCH);

 	expect ('(');

-	cond = eval(expr());

+	if ((cond = expr()) == NULL)

+		error("expected expression before '%s'", yytext);

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

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

 	expect (')');

-	/* TODO: check integer type */

+

+	lbreak = install("", NS_LABEL);

+	lcond = install("", NS_LABEL);

 	emitjump(lcond, NULL);

 	stmt(lbreak, lcont, &lcase);

 	emitlabel(lcond);

 	emitswitch(lcase.nr, cond);

-	for (p = lcase.head; p; p = p->next)

+	for (p = lcase.head; p; p = next) {

 		emitcase(p->label, p->expr);

+		next = p->next;

+		free(p);

+	}

 	if (lcase.deflabel)

 		emitdefault(lcase.deflabel);

 	emitlabel(lbreak);

-	/* TODO: free memory */

 }

 static void