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

russian translation, test fix

Browse Source
This commit is contained in:
Honfika
2014-02-25 19:17:09 +01:00
parent ad05cc4fc9
commit 4859d3b2d2
7 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
trunk/test/com/jpexs/decompiler/flash/ActionScript2AssemblerTest.java
+3 -2
View File
@@ -20,6 +20,7 @@ import com.jpexs.decompiler.flash.action.Action;
import com.jpexs.decompiler.flash.action.parser.ParseException;
import com.jpexs.decompiler.flash.action.parser.pcode.ASMParser;
import com.jpexs.decompiler.flash.configuration.Configuration;
import com.jpexs.decompiler.flash.helpers.CodeFormatting;
import com.jpexs.decompiler.flash.helpers.HilightedTextWriter;
import com.jpexs.decompiler.flash.tags.DoActionTag;
import com.jpexs.decompiler.graph.ExportMode;
@@ -60,10 +61,10 @@ public class ActionScript2AssemblerTest extends ActionStript2TestBase {
DoActionTag doa = getFirstActionTag();
doa.setActionBytes(Action.actionsToBytes(actions, true, swf.version));
HilightedTextWriter writer = new HilightedTextWriter(false);
HilightedTextWriter writer = new HilightedTextWriter(new CodeFormatting(), false);
Action.actionsToSource(doa, doa.getActions(swf.version), swf.version, "", writer);
String actualResult = writer.toString();
writer = new HilightedTextWriter(false);
writer = new HilightedTextWriter(new CodeFormatting(), false);
doa.getASMSource(swf.version, ExportMode.PCODE, writer, null);
String decompiled = writer.toString();
trunk/test/com/jpexs/decompiler/flash/ActionScript2DeobfuscatorTest.java
+2 -1
View File
@@ -20,6 +20,7 @@ import com.jpexs.decompiler.flash.action.Action;
import com.jpexs.decompiler.flash.action.parser.ParseException;
import com.jpexs.decompiler.flash.action.parser.pcode.ASMParser;
import com.jpexs.decompiler.flash.configuration.Configuration;
import com.jpexs.decompiler.flash.helpers.CodeFormatting;
import com.jpexs.decompiler.flash.helpers.HilightedTextWriter;
import com.jpexs.decompiler.flash.tags.DoActionTag;
import java.io.BufferedInputStream;
@@ -77,7 +78,7 @@ public class ActionScript2DeobfuscatorTest extends ActionStript2TestBase {
DoActionTag doa = getFirstActionTag();
doa.setActionBytes(Action.actionsToBytes(actions, true, swf.version));
HilightedTextWriter writer = new HilightedTextWriter(false);
HilightedTextWriter writer = new HilightedTextWriter(new CodeFormatting(), false);
Action.actionsToSource(doa, doa.getActions(swf.version), swf.version, "", writer);
String actualResult = writer.toString();
trunk/test/com/jpexs/decompiler/flash/ActionScript2Test.java
+2 -1
View File
@@ -18,6 +18,7 @@ package com.jpexs.decompiler.flash;
import com.jpexs.decompiler.flash.action.Action;
import com.jpexs.decompiler.flash.configuration.Configuration;
import com.jpexs.decompiler.flash.helpers.CodeFormatting;
import com.jpexs.decompiler.flash.helpers.HilightedTextWriter;
import com.jpexs.decompiler.flash.tags.DoActionTag;
import com.jpexs.decompiler.flash.tags.ShowFrameTag;
@@ -48,7 +49,7 @@ public class ActionScript2Test extends ActionStript2TestBase {
private void compareSrc(int frame, String expectedResult) {
DoActionTag doa = getFrameSource(frame);
assertNotNull(doa);
HilightedTextWriter writer = new HilightedTextWriter(false);
HilightedTextWriter writer = new HilightedTextWriter(new CodeFormatting(), false);
try {
Action.actionsToSource(doa, doa.getActions(swf.version), swf.version, "", writer);
} catch (InterruptedException ex) {
trunk/test/com/jpexs/decompiler/flash/ActionScript3Test.java
+3 -2
View File
@@ -18,6 +18,7 @@ package com.jpexs.decompiler.flash;
import com.jpexs.decompiler.flash.abc.ABC;
import com.jpexs.decompiler.flash.configuration.Configuration;
import com.jpexs.decompiler.flash.helpers.CodeFormatting;
import com.jpexs.decompiler.flash.helpers.HilightedTextWriter;
import com.jpexs.decompiler.flash.helpers.NulWriter;
import com.jpexs.decompiler.flash.tags.DoABCDefineTag;
@@ -71,7 +72,7 @@ public class ActionScript3Test {
HilightedTextWriter writer = null;
try {
abc.bodies[bodyIndex].convert(methodName, ExportMode.SOURCE, isStatic, -1/*FIX?*/, clsIndex, abc, null, abc.constants, abc.method_info, new Stack<GraphTargetItem>(), false, new NulWriter(), new ArrayList<String>(), abc.instance_info[clsIndex].instance_traits, true);
writer = new HilightedTextWriter(false);
writer = new HilightedTextWriter(new CodeFormatting(), false);
abc.bodies[bodyIndex].toString(methodName, ExportMode.SOURCE, isStatic, -1/*FIX?*/, clsIndex, abc, null, abc.constants, abc.method_info, new Stack<GraphTargetItem>(), false, writer, new ArrayList<String>(), abc.instance_info[clsIndex].instance_traits);
} catch (InterruptedException ex) {
fail();
@@ -892,7 +893,7 @@ public class ActionScript3Test {
int bodyIndex = abc.findMethodBodyByName(clsIndex, methodName);
assertTrue(methodInfo > -1);
assertTrue(bodyIndex > -1);
HilightedTextWriter writer = new HilightedTextWriter(false);
HilightedTextWriter writer = new HilightedTextWriter(new CodeFormatting(), false);
abc.method_info[methodInfo].getParamStr(writer, abc.constants, abc.bodies[bodyIndex], abc, new ArrayList<String>());
String actualResult = writer.toString().replaceAll("[ \r\n]", "");
String expectedResult = "p1:Event=null,p2:Number=1,p3:Number=-1,p4:Number=-1.1,p5:Number=-1.1,p6:String=\"a\"";
trunk/test/com/jpexs/decompiler/flash/generators/AS2Generator.java
+2 -1
View File
@@ -19,6 +19,7 @@ package com.jpexs.decompiler.flash.generators;
import com.jpexs.decompiler.flash.SWF;
import com.jpexs.decompiler.flash.action.Action;
import com.jpexs.decompiler.flash.configuration.Configuration;
import com.jpexs.decompiler.flash.helpers.CodeFormatting;
import com.jpexs.decompiler.flash.helpers.HilightedTextWriter;
import com.jpexs.decompiler.flash.tags.DoABCDefineTag;
import com.jpexs.decompiler.flash.tags.DoActionTag;
@@ -53,7 +54,7 @@ public class AS2Generator {
if (doa == null) {
continue;
}
HilightedTextWriter writer = new HilightedTextWriter(false);
HilightedTextWriter writer = new HilightedTextWriter(new CodeFormatting(), false);
Action.actionsToSource(doa, doa.getActions(swf.version), swf.version, "", writer);
String src = writer.toString();
if (src.trim().isEmpty()) {
trunk/test/com/jpexs/decompiler/flash/generators/AS3Generator.java
+2 -1
View File
@@ -21,6 +21,7 @@ import com.jpexs.decompiler.flash.abc.ABC;
import com.jpexs.decompiler.flash.abc.types.traits.Trait;
import com.jpexs.decompiler.flash.abc.types.traits.TraitMethodGetterSetter;
import com.jpexs.decompiler.flash.configuration.Configuration;
import com.jpexs.decompiler.flash.helpers.CodeFormatting;
import com.jpexs.decompiler.flash.helpers.HilightedTextWriter;
import com.jpexs.decompiler.flash.tags.DoABCDefineTag;
import com.jpexs.decompiler.flash.tags.Tag;
@@ -62,7 +63,7 @@ public class AS3Generator {
s.append("(){\r\ndecompileMethod(\"");
s.append(name);
s.append("\", ");
HilightedTextWriter src = new HilightedTextWriter(false);
HilightedTextWriter src = new HilightedTextWriter(new CodeFormatting(), false);
abc.findBody(((TraitMethodGetterSetter) t).method_info).toString("", ExportMode.SOURCE, false, -1/*FIX?*/, classId, abc, null, abc.constants, abc.method_info, new Stack<GraphTargetItem>(), false, src, new ArrayList<String>(), abc.instance_info[classId].instance_traits);
String[] srcs = src.toString().split("[\r\n]+");
for (int i = 0; i < srcs.length; i++) {