LegacyConsole/jpexs-decompiler
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-05-31 11:44:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Namespace suffix handling on all Levels.

Browse Source 
Classes with same name handling.
Test data
This commit is contained in:
Jindra Petřík
2016-09-17 14:44:59 +02:00
parent 523e59db80
commit 8a0223a02a
73 changed files with 496 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/IdentifiersDeobfuscation.java
View File

@@ -209,7 +209,7 @@ public class IdentifiersDeobfuscation {
}
public String deobfuscateNameWithPackage(boolean as3, String n, HashMap<DottedChain, DottedChain> namesMap, RenameType renameType, Map<DottedChain, DottedChain> selected) {
DottedChain nChain = DottedChain.parse(n);
DottedChain nChain = DottedChain.parseWithSuffix(n);
DottedChain pkg = nChain.getWithoutLast();
String name = nChain.getLast();
@@ -288,7 +288,7 @@ public class IdentifiersDeobfuscation {
usageType = "name";
}
DottedChain sChain = DottedChain.parse(s);
DottedChain sChain = DottedChain.parseWithSuffix(s);
if (selected != null) {
if (selected.containsKey(sChain)) {
return selected.get(sChain).toRawString();
@@ -314,14 +314,14 @@ public class IdentifiersDeobfuscation {
ret = fooString(firstUppercase, rndSize);
if (allVariableNamesStr.contains(ret)
|| isReservedWord(ret, as3)
|| namesMap.containsValue(DottedChain.parse(ret))) {
|| namesMap.containsValue(DottedChain.parseWithSuffix(ret))) {
found = true;
rndSize++;
}
}
} while (found);
namesMap.put(DottedChain.parse(s), DottedChain.parse(ret));
namesMap.put(DottedChain.parseWithSuffix(s), DottedChain.parseWithSuffix(ret));
return ret;
}
}