shithub: scc

Info  •  Files  •  Log  •  Branches

Add function iszero()

This check is going to be done in a lot of different places, so
it is a good idea to have this function.

--- a/expr.c

+++ b/expr.c

@@ -286,13 +286,18 @@

 }

 static Node *

-eval(Node *np)

+iszero(Node *np)

 {

-	Node *ifyes, *ifno;

+	if (ISNODELOG(np))

+		return np;

+	return compare(ONE, np, constcode(zero));

+}

+static Node *

+eval(Node *np)

+{

 	if (!ISNODELOG(np))

 		return np;

-

 	return ternarycode(np, constcode(one), constcode(zero));

 }

@@ -691,10 +696,10 @@

 static Node *

 ternary(void)

 {

-	Node *cond, *ifyes, *ifno;

+	Node *np, *ifyes, *ifno;

 	Type *tp1, *tp2;

-	cond = or();

+	np = or();

 	while (accept('?')) {

 		ifyes = promote(expr());

 		expect(':');

@@ -703,10 +708,9 @@

 		tp2 = UNQUAL(ifno->type);

 		if (tp1 != tp2)

 			typeconv(&ifyes, &ifno);

-		cond = ternarycode(compare(ONE, cond, constcode(zero)),

-	                           ifyes, ifno);

+		np = ternarycode(iszero(np), ifyes, ifno);

 	}

-	return cond;

+	return np;

 }

 static Node *