Moved from stack to inline execution.

git-svn-id: svn://10.0.0.236/trunk@33132 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
rogerl%netscape.com
1999-05-28 19:00:48 +00:00
parent 734272ce20
commit 7448fc1fe9
23 changed files with 279 additions and 396 deletions

View File

@@ -5,36 +5,35 @@ class LogicalNode extends BinaryNode {
super(aOp, aLeft, aRight);
}
void eval(Environment theEnv)
JSValue eval(Environment theEnv)
{
left.eval(theEnv);
JSBoolean b = theEnv.theStack.pop().toJSBoolean(theEnv);
JSBoolean b = left.eval(theEnv).toJSBoolean(theEnv);
if (op == "&&") {
if (b.isFalse())
theEnv.theStack.push(b);
return b;
else {
right.eval(theEnv);
b = theEnv.theStack.pop().toJSBoolean(theEnv);
b = right.eval(theEnv).toJSBoolean(theEnv);
if (b.isFalse())
theEnv.theStack.push(b);
return b;
else
theEnv.theStack.push(JSBoolean.JSTrue);
return JSBoolean.JSTrue;
}
}
if (op == "||") {
if (b.isTrue())
theEnv.theStack.push(b);
return b;
else {
right.eval(theEnv);
b = theEnv.theStack.pop().toJSBoolean(theEnv);
b = right.eval(theEnv).toJSBoolean(theEnv);
if (b.isTrue())
theEnv.theStack.push(b);
return b;
else
theEnv.theStack.push(JSBoolean.JSFalse);
return JSBoolean.JSFalse;
}
}
else
else {
System.out.println("missing logical op " + op);
return null;
}
}
}