Issue #275 removing returnvoid as last method statement

This commit is contained in:
Jindra Pet��k
2013-07-30 19:40:19 +02:00
parent 48c2fe78c2
commit f6f25e2370
@@ -74,6 +74,7 @@ import com.jpexs.decompiler.graph.Graph;
import com.jpexs.decompiler.graph.GraphPart;
import com.jpexs.decompiler.graph.GraphSourceItem;
import com.jpexs.decompiler.graph.GraphTargetItem;
import com.jpexs.decompiler.graph.model.ScriptEndItem;
import java.io.*;
import java.util.*;
import java.util.logging.Level;
@@ -1345,6 +1346,20 @@ public class AVM2Code implements Serializable {
}
}
int lastPos = list.size() - 1;
if (lastPos < 0) {
lastPos = 0;
}
if ((list.size() > lastPos) && (list.get(lastPos) instanceof ScriptEndItem)) {
lastPos--;
}
if (lastPos < 0) {
lastPos = 0;
}
if ((list.size() > lastPos) && (list.get(lastPos) instanceof ReturnVoidAVM2Item)) {
list.remove(lastPos);
}
s = Graph.graphToString(list, constants, localRegNames, fullyQualifiedNames);
if (!hilighted) {
return Highlighting.stripHilights(s);