AndItem,OrItem fix back

This commit is contained in:
Jindra Petk
2013-05-03 21:23:28 +02:00
parent 71d8f1cace
commit 4dd7769c4a

View File

@@ -558,20 +558,9 @@ public class Graph {
if ((ti = checkLoop(next, stopPart, loops)) != null) {
ret.add(ti);
} else {
printGraph(localData, stack, allParts, parent, next, reversed ? sp1 : sp0, loops, forFinalCommands);
GraphTargetItem second = stack.pop();
GraphTargetItem first = stack.pop();
GraphTargetItem second = null;
if (first.isCompileTime() && (reversed == first.toBoolean())) {
second = new TrueItem(null);
} else {
printGraph(localData, stack, allParts, parent, next, reversed ? sp1 : sp0, loops, forFinalCommands);
try {
second = stack.pop();
} catch (EmptyStackException ese) {
ese.printStackTrace();
System.err.println(part.toString());
System.out.println("" + first.isCompileTime() + first.toBoolean());
}
}
if (!reversed) {
AndItem a = new AndItem(null, first, second);
stack.push(a);
@@ -617,15 +606,10 @@ public class Graph {
if ((ti = checkLoop(next, stopPart, loops)) != null) {
ret.add(ti);
} else {
GraphTargetItem first = stack.pop();
GraphTargetItem second = null;
if (first.isCompileTime() && (reversed == !first.toBoolean())) {
second = new TrueItem(null);
} else {
printGraph(localData, stack, allParts, parent, next, reversed ? sp1 : sp0, loops, forFinalCommands);
second = stack.pop();
}
printGraph(localData, stack, allParts, parent, next, reversed ? sp1 : sp0, loops, forFinalCommands);
GraphTargetItem second = stack.pop();
GraphTargetItem first = stack.pop();
if (reversed) {
AndItem a = new AndItem(null, first, second);