LegacyConsoleArchive/jpexs-decompiler
1
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-09-27 06:40:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed: #2355 AS1/2 Simplify expressions feature colliding with some other features like hex values

Browse Source 
- introducing GraphTarget dialect
This commit is contained in:
Jindra Petřík
2025-05-01 20:14:36 +02:00
parent 598294de9c
commit 33bc40be14
117 changed files with 626 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/GraphTargetItem.java
+14 -65
View File
@@ -136,6 +136,11 @@ public abstract class GraphTargetItem implements Serializable, Cloneable {
* ASM Position
*/
protected int pos = 0;
/**
* Dialect
*/
public GraphTargetDialect dialect;
/**
* Gets the line start item
@@ -145,64 +150,7 @@ public abstract class GraphTargetItem implements Serializable, Cloneable {
public GraphSourceItem getLineStartItem() {
return lineStartItem;
}
/**
* Converts a value to an item
*
* FIXME!!! This should only convert to values relatable to current Graph type,
* e.g. ActionItems for AS1/2, AVM2Items for AS3
*
* @param r Value
* @return Graph target item
*/
protected static GraphTargetItem valToItem(Object r) {
if (r == null) {
return null;
}
if (r instanceof Boolean) {
if ((Boolean) r) {
return new TrueItem(null, null);
} else {
return new FalseItem(null, null);
}
}
if (r instanceof String) {
return new StringAVM2Item(null, null, (String) r);
}
if (r instanceof Long) {
return new DoubleValueAVM2Item(null, null, (double) (Long) r);
}
if (r instanceof Integer) {
return new IntegerValueAVM2Item(null, null, (Integer) r);
}
if (r instanceof Double) {
return new DoubleValueAVM2Item(null, null, (Double) r);
}
if (r instanceof Null) {
return new NullAVM2Item(null, null);
}
if (r instanceof Undefined) {
return new UndefinedAVM2Item(null, null);
}
if (r instanceof ArrayType) {
List<GraphTargetItem> vals = new ArrayList<>();
ArrayType at = (ArrayType) r;
for (Object v : at.values) {
vals.add(valToItem(v));
}
return new NewArrayAVM2Item(null, null, vals);
}
if (r instanceof ObjectType) {
List<NameValuePair> props = new ArrayList<>();
ObjectType ot = (ObjectType) r;
for (String k : ot.getAttributeNames()) {
props.add(new NameValuePair(valToItem(k), valToItem(ot.getAttribute(k))));
}
return new NewObjectAVM2Item(null, null, props);
}
return null;
}
/**
* Simplifies something
@@ -237,7 +185,7 @@ public abstract class GraphTargetItem implements Serializable, Cloneable {
break;
}
GraphTargetItem it2 = valToItem(r);
GraphTargetItem it2 = it.dialect == null ? null : it.dialect.valToItem(r);
if (it2 == null) {
return it;
}
@@ -297,8 +245,8 @@ public abstract class GraphTargetItem implements Serializable, Cloneable {
/**
* Constructs GraphTargetItem
*/
public GraphTargetItem() {
this(null, null, NOPRECEDENCE);
public GraphTargetItem(GraphTargetDialect dialect) {
this(dialect, null, null, NOPRECEDENCE);
}
/**
@@ -308,8 +256,8 @@ public abstract class GraphTargetItem implements Serializable, Cloneable {
* @param lineStartItem Line start item
* @param precedence Precedence
*/
public GraphTargetItem(GraphSourceItem src, GraphSourceItem lineStartItem, int precedence) {
this(src, lineStartItem, precedence, null);
public GraphTargetItem(GraphTargetDialect dialect, GraphSourceItem src, GraphSourceItem lineStartItem, int precedence) {
this(dialect, src, lineStartItem, precedence, null);
}
/**
@@ -320,7 +268,8 @@ public abstract class GraphTargetItem implements Serializable, Cloneable {
* @param precedence Precedence
* @param value Value
*/
public GraphTargetItem(GraphSourceItem src, GraphSourceItem lineStartItem, int precedence, GraphTargetItem value) {
public GraphTargetItem(GraphTargetDialect dialect, GraphSourceItem src, GraphSourceItem lineStartItem, int precedence, GraphTargetItem value) {
this.dialect = dialect;
this.src = src;
this.lineStartItem = lineStartItem;
this.precedence = precedence;
@@ -1064,7 +1013,7 @@ public abstract class GraphTargetItem implements Serializable, Cloneable {
* @return Inverted item
*/
public GraphTargetItem invert(GraphSourceItem src) {
return new NotItem(src, getLineStartItem(), this);
return new NotItem(dialect, src, getLineStartItem(), this);
}
/**