LegacyConsoleArchive/jpexs-decompiler
1
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-09-26 04:10:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed: #2291 AS1/2 Incorrect var keyword placement causing registers to compile wrong

Browse Source
This commit is contained in:
Jindra Petřík
2024-09-23 21:52:25 +02:00
parent 2976829642
commit 236126dc84
10 changed files with 80 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/AbstractGraphTargetVisitor.java
+2 -1
View File
@@ -35,9 +35,10 @@ public abstract class AbstractGraphTargetVisitor implements GraphTargetVisitorIn
* Visits a graph target item.
*
* @param item Graph target item
* @return True if continue
*/
@Override
public abstract void visit(GraphTargetItem item);
public abstract boolean visit(GraphTargetItem item);
/**
* Visits all graph target items.
libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/GraphTargetItem.java
+15 -8
View File
@@ -41,6 +41,7 @@ import com.jpexs.decompiler.graph.model.FalseItem;
import com.jpexs.decompiler.graph.model.LocalData;
import com.jpexs.decompiler.graph.model.NotItem;
import com.jpexs.decompiler.graph.model.TrueItem;
import com.jpexs.helpers.LinkedIdentityHashSet;
import com.jpexs.helpers.Reference;
import java.io.Serializable;
import java.util.ArrayList;
@@ -624,10 +625,11 @@ public abstract class GraphTargetItem implements Serializable, Cloneable {
Reference<Boolean> ref = new Reference<>(false);
visitRecursively(new AbstractGraphTargetVisitor() {
@Override
public void visit(GraphTargetItem item) {
public boolean visit(GraphTargetItem item) {
if (item.hasSideEffect()) {
ref.setVal(Boolean.TRUE);
}
return true;
}
});
return ref.getVal();
@@ -923,10 +925,11 @@ public abstract class GraphTargetItem implements Serializable, Cloneable {
List<GraphTargetItem> ret = new ArrayList<>();
visit(new AbstractGraphTargetVisitor() {
@Override
public void visit(GraphTargetItem item) {
public boolean visit(GraphTargetItem item) {
if (item != null) {
ret.add(item);
}
return true;
}
});
return ret;
@@ -941,8 +944,9 @@ public abstract class GraphTargetItem implements Serializable, Cloneable {
Set<GraphTargetItem> ret = new HashSet<>();
visitRecursively(new AbstractGraphTargetVisitor() {
@Override
public void visit(GraphTargetItem item) {
public boolean visit(GraphTargetItem item) {
ret.add(item);
return true;
}
});
return ret;
@@ -954,15 +958,17 @@ public abstract class GraphTargetItem implements Serializable, Cloneable {
* @param visitor Visitor
*/
public final void visitRecursively(GraphTargetVisitorInterface visitor) {
Set<GraphTargetItem> visitedItems = new HashSet<>();
Set<GraphTargetItem> visitedItems = new LinkedIdentityHashSet<>();
visit(new AbstractGraphTargetVisitor() {
@Override
public void visit(GraphTargetItem item) {
public boolean visit(GraphTargetItem item) {
if (item != null && !visitedItems.contains(item)) {
visitedItems.add(item);
visitor.visit(item);
item.visit(this);
if (visitor.visit(item)) {
item.visit(this);
}
}
return true;
}
});
}
@@ -978,7 +984,7 @@ public abstract class GraphTargetItem implements Serializable, Cloneable {
parentStack.add(this);
visitNoBlock(new AbstractGraphTargetVisitor() {
@Override
public void visit(GraphTargetItem item) {
public boolean visit(GraphTargetItem item) {
if (item != null && !visitedItems.contains(item)) {
visitedItems.add(item);
visitor.visit(item, parentStack);
@@ -986,6 +992,7 @@ public abstract class GraphTargetItem implements Serializable, Cloneable {
item.visitNoBlock(this);
parentStack.pop();
}
return true;
}
});
}
libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/GraphTargetVisitorInterface.java
+2 -1
View File
@@ -29,8 +29,9 @@ public interface GraphTargetVisitorInterface {
* Visits a graph target item.
*
* @param item Graph target item
* @return True if continue
*/
public void visit(GraphTargetItem item);
public boolean visit(GraphTargetItem item);
/**
* Visits all graph target items.