these files were accidentally not commited in the last 2 commit, sorry

This commit is contained in:
Honfika
2013-09-09 18:07:42 +02:00
parent 92603f3406
commit 97385bd634
7 changed files with 7 additions and 8 deletions

View File

@@ -134,7 +134,6 @@ public class Traits implements Serializable {
} else {
traitConvertTasks = new ArrayList<>();
}
pcode = true;
for (int t = 0; t < traits.length; t++) {
TraitConvertTask task = new TraitConvertTask(traits[t], makePackages, path, abcTags, abc, isStatic, pcode, scriptIndex, classIndex, highlighting, fullyQualifiedNames, t, parallel);
if (parallel) {

View File

@@ -57,7 +57,7 @@ public class ActionScript2AssemblerTest {
DoActionTag doa = getFirstActionTag();
doa.setActionBytes(Action.actionsToBytes(actions, true, swf.version));
String actualResult = Action.actionsToSource(doa.getActions(swf.version), swf.version, "", false);
String decompiled = doa.getASMSource(swf.version, false, false);
String decompiled = doa.getASMSource(swf.version, false, false, null);
assertEquals(actualResult.trim(), "ok = false;");
assertTrue(decompiled.contains("Push \"ok\" false"));

View File

@@ -42,7 +42,7 @@ public class ActionScript3Test {
private void decompileMethod(String methodName, String expectedResult, boolean isStatic) {
int bodyIndex = abc.findMethodBodyByName(clsIndex, methodName);
assertTrue(bodyIndex > -1);
String actualResult = abc.bodies[bodyIndex].toString(methodName, false, isStatic, -1/*FIX?*/, clsIndex, abc, abc.constants, abc.method_info, new Stack<GraphTargetItem>(), false, false, new ArrayList<String>(), abc.instance_info[clsIndex].instance_traits);
String actualResult = abc.bodies[bodyIndex].toString(methodName, false, isStatic, -1/*FIX?*/, clsIndex, abc, abc.constants, abc.method_info, new Stack<GraphTargetItem>(), false, false, true, new ArrayList<String>(), abc.instance_info[clsIndex].instance_traits);
actualResult = actualResult.replaceAll("[ \r\n]", "");
expectedResult = expectedResult.replaceAll("[ \r\n]", "");
assertEquals(actualResult, expectedResult);

View File

@@ -64,7 +64,7 @@ public class ExportTest {
if (!dir.exists()) {
return new Object[0][0];
}
File files[] = dir.listFiles(new FilenameFilter() {
File[] files = dir.listFiles(new FilenameFilter() {
@Override
public boolean accept(File dir, String name) {
return name.toLowerCase().endsWith(".swf");

View File

@@ -31,7 +31,7 @@ public class RecompileTest {
if (!dir.exists()) {
return;
}
File files[] = dir.listFiles(new FilenameFilter() {
File[] files = dir.listFiles(new FilenameFilter() {
@Override
public boolean accept(File dir, String name) {
return name.toLowerCase().endsWith(".swf");

View File

@@ -42,7 +42,7 @@ public class AS2Generator {
}
String srcs[] = src.split("[\r\n]+");
String[] srcs = src.split("[\r\n]+");
String testName="frame"+frame+"_Test";
String pref="trace(\"";
for(String p:srcs){

View File

@@ -43,8 +43,8 @@ public class AS3Generator {
s.append("(){\r\ndecompileMethod(\"");
s.append(name);
s.append("\", ");
String src = abc.findBody(((TraitMethodGetterSetter) t).method_info).toString("", false, false, -1/*FIX?*/, classId, abc, abc.constants, abc.method_info, new Stack<GraphTargetItem>(), false, false, new ArrayList<String>(), abc.instance_info[classId].instance_traits);
String srcs[] = src.split("[\r\n]+");
String src = abc.findBody(((TraitMethodGetterSetter) t).method_info).toString("", false, false, -1/*FIX?*/, classId, abc, abc.constants, abc.method_info, new Stack<GraphTargetItem>(), false, false, true, new ArrayList<String>(), abc.instance_info[classId].instance_traits);
String[] srcs = src.split("[\r\n]+");
for (int i = 0; i < srcs.length; i++) {
String ss = srcs[i];
s.append("\"");