better duplicate handling

This commit is contained in:
Jindra Petk
2013-05-25 19:53:04 +02:00
parent 0836232014
commit acbaa19dac
13 changed files with 129 additions and 41 deletions

View File

@@ -594,9 +594,10 @@ public class Graph {
if ((ti = checkLoop(next, stopPart, loops)) != null) {
ret.add(ti);
} else {
GraphTargetItem first = stack.pop();
printGraph(visited, 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);
stack.push(a);
@@ -642,10 +643,10 @@ public class Graph {
if ((ti = checkLoop(next, stopPart, loops)) != null) {
ret.add(ti);
} else {
printGraph(visited, localData, stack, allParts, parent, next, reversed ? sp1 : sp0, loops, forFinalCommands);
GraphTargetItem second = stack.pop();
GraphTargetItem first = stack.pop();
printGraph(visited, localData, stack, allParts, parent, next, reversed ? sp1 : sp0, loops, forFinalCommands);
GraphTargetItem second = stack.pop();
if (reversed) {
AndItem a = new AndItem(null, first, second);