fixed && or || in loop condition

This commit is contained in:
Jindra Petk
2013-02-25 19:43:19 +01:00
parent 8baa5691e9
commit 7d10e8d13e
4 changed files with 27 additions and 4 deletions

View File

@@ -70,4 +70,11 @@ public class FunctionTreeItem extends TreeItem {
}
return ret;
}
@Override
public boolean needsSemicolon() {
return false;
}
}

View File

@@ -89,4 +89,11 @@ public class ClassTreeItem extends TreeItem implements Block {
List<ContinueItem> ret = new ArrayList<ContinueItem>();
return ret;
}
@Override
public boolean needsSemicolon() {
return false;
}
}

View File

@@ -55,4 +55,9 @@ public class InterfaceTreeItem extends TreeItem {
ret += "\r\n{\r\n}\r\n";
return ret;
}
@Override
public boolean needsSemicolon() {
return false;
}
}

View File

@@ -842,11 +842,15 @@ public class Graph {
}
}
if (loop) {
if (expr instanceof AndItem) {
currentLoop.loopContinue = ((AndItem) expr).firstPart;
GraphTargetItem expr2=expr;
if(expr2 instanceof NotItem){
expr2=((NotItem)expr2).getOriginal();
}
if (expr instanceof OrItem) {
currentLoop.loopContinue = ((OrItem) expr).firstPart;
if (expr2 instanceof AndItem) {
currentLoop.loopContinue = ((AndItem) expr2).firstPart;
}
if (expr2 instanceof OrItem) {
currentLoop.loopContinue = ((OrItem) expr2).firstPart;
}
}