shithub: scc

Info  •  Files  •  Log  •  Branches

Interchange integeruop() and numericaluop()

This change puts integeruop() after integerop(),  which
simplifies reading the code, because it puts together
related functions.

--- a/cc1/expr.c

+++ b/cc1/expr.c

@@ -211,26 +211,26 @@

 }

 static Node *

-numericaluop(char op, Node *np)

+integeruop(char op, Node *np)

 {

-	if (!np->type->arith)

-		error("unary operator requires numerical operand");

+	if (!np->type->integer)

+		error("unary operator requires integer operand");

 	np = promote(np);

-	if (op == ONEG && np->op == ONEG)

+	if (op == OCPL && np->op == OCPL)

 		return np->left;

-	if (op == OADD)

-		return np;

 	return simplify(op, np->type, np, NULL);

 }

 static Node *

-integeruop(char op, Node *np)

+numericaluop(char op, Node *np)

 {

-	if (!np->type->integer)

-		error("unary operator requires integer operand");

+	if (!np->type->arith)

+		error("unary operator requires numerical operand");

 	np = promote(np);

-	if (op == OCPL && np->op == OCPL)

+	if (op == ONEG && np->op == ONEG)

 		return np->left;

+	if (op == OADD)

+		return np;

 	return simplify(op, np->type, np, NULL);

 }