shithub: scc

Info  •  Files  •  Log  •  Branches

Fix defined() parsing

primary() was calling after notdefined(), which consumed all the
tokens for 'defined(macro)'.

--- a/cc1/expr.c

+++ b/cc1/expr.c

@@ -534,7 +534,6 @@

 	sym = yylval.sym;

 	switch (yytoken) {

 	case CONSTANT:

-	constant:

 		np = constnode(sym);

 		next();

 		break;

@@ -541,8 +540,10 @@

 	case IDEN:

 		if ((sym->flags & ISDECLARED) == 0)

 			sym = notdefined(sym);

-		if (sym->flags & ISCONSTANT)

-			goto constant;

+		if (sym->flags & ISCONSTANT) {

+			np = constnode(sym);

+			break;

+		}

 		sym->flags |= ISUSED;

 		np = varnode(sym);

 		next();