Diamond interface

This commit is contained in:
honfika@gmail.com
2015-06-04 08:20:06 +02:00
parent 75ce6c72fa
commit da99aa3f39
28 changed files with 129 additions and 129 deletions

View File

@@ -74,9 +74,9 @@ public class ActionScript3Test extends ActionScriptTestBase {
assertTrue(bodyIndex > -1);
HighlightedTextWriter writer = null;
try {
abc.bodies.get(bodyIndex).convert(methodName, ScriptExportMode.AS, isStatic, -1/*FIX?*/, clsIndex, abc, null, abc.constants, abc.method_info, new ScopeStack(), false, new NulWriter(), new ArrayList<String>(), abc.instance_info.get(clsIndex).instance_traits, true);
abc.bodies.get(bodyIndex).convert(methodName, ScriptExportMode.AS, isStatic, -1/*FIX?*/, clsIndex, abc, null, abc.constants, abc.method_info, new ScopeStack(), false, new NulWriter(), new ArrayList<>(), abc.instance_info.get(clsIndex).instance_traits, true);
writer = new HighlightedTextWriter(new CodeFormatting(), false);
abc.bodies.get(bodyIndex).toString(methodName, ScriptExportMode.AS, abc, null, abc.constants, abc.method_info, writer, new ArrayList<String>());
abc.bodies.get(bodyIndex).toString(methodName, ScriptExportMode.AS, abc, null, abc.constants, abc.method_info, writer, new ArrayList<>());
} catch (InterruptedException ex) {
fail();
}
@@ -936,7 +936,7 @@ public class ActionScript3Test extends ActionScriptTestBase {
assertTrue(methodInfo > -1);
assertTrue(bodyIndex > -1);
HighlightedTextWriter writer = new HighlightedTextWriter(new CodeFormatting(), false);
abc.method_info.get(methodInfo).getParamStr(writer, abc.constants, abc.bodies.get(bodyIndex), abc, new ArrayList<String>());
abc.method_info.get(methodInfo).getParamStr(writer, abc.constants, abc.bodies.get(bodyIndex), abc, new ArrayList<>());
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\"";
expectedResult = expectedResult.replaceAll("[ \r\n]", "");

View File

@@ -57,7 +57,7 @@ public class AS3Generator {
StringBuilder s = new StringBuilder();
for (Trait t : abc.instance_info.get(classId).instance_traits.traits) {
if (t instanceof TraitMethodGetterSetter) {
String name = t.getName(abc).getName(abc.constants, new ArrayList<String>(), true);
String name = t.getName(abc).getName(abc.constants, new ArrayList<>(), true);
if (name.startsWith("test")) {
s.append("@Test\r\npublic void ");
s.append(name);
@@ -66,8 +66,8 @@ public class AS3Generator {
s.append("\", ");
HighlightedTextWriter src = new HighlightedTextWriter(new CodeFormatting(), false);
MethodBody b = abc.findBody(((TraitMethodGetterSetter) t).method_info);
b.convert("", ScriptExportMode.AS, false, -1/*FIX?*/, classId, abc, null, abc.constants, abc.method_info, new ScopeStack(), false, new NulWriter(), new ArrayList<String>(), abc.instance_info.get(classId).instance_traits, true);
b.toString("", ScriptExportMode.AS, abc, null, abc.constants, abc.method_info, src, new ArrayList<String>());
b.convert("", ScriptExportMode.AS, false, -1/*FIX?*/, classId, abc, null, abc.constants, abc.method_info, new ScopeStack(), false, new NulWriter(), new ArrayList<>(), abc.instance_info.get(classId).instance_traits, true);
b.toString("", ScriptExportMode.AS, abc, null, abc.constants, abc.method_info, src, new ArrayList<>());
String[] srcs = src.toString().split("[\r\n]+");
for (int i = 0; i < srcs.length; i++) {
String ss = srcs[i];