shithub: scc

Info  •  Files  •  Log  •  Branches

Eval expressions in arithmetic

arithmetic cannot deals with comparisions, so they must be
evaluated before of doing anything.

--- a/expr.c

+++ b/expr.c

@@ -59,6 +59,14 @@

 }

 static Node *

+eval(Node *np)

+{

+	if (!ISNODECMP(np))

+		return np;

+	return ternarycode(np, symcode(one), symcode(zero));

+}

+

+static Node *

 integerop(char op, Node *np1, Node *np2)

 {

 	if (np1->typeop != INT || np2->typeop != INT)

@@ -172,6 +180,8 @@

 static Node *

 arithmetic(char op, Node *np1, Node *np2)

 {

+	np1 = eval(np1);

+	np2 = eval(np2);

 	switch (np1->typeop) {

 	case INT: case FLOAT:

 		switch (np2->typeop) {

@@ -293,14 +303,6 @@

 	if (ISNODECMP(np))

 		return np;

 	return compare(ONE, np, symcode(zero));

-}

-

-static Node *

-eval(Node *np)

-{

-	if (!ISNODECMP(np))

-		return np;

-	return ternarycode(np, symcode(one), symcode(zero));

 }

 static Node *