Index: compiler/java/com/google/dart/compiler/backend/isolate/DartIsolateStubGenerator.java |
=================================================================== |
--- compiler/java/com/google/dart/compiler/backend/isolate/DartIsolateStubGenerator.java (revision 734) |
+++ compiler/java/com/google/dart/compiler/backend/isolate/DartIsolateStubGenerator.java (working copy) |
@@ -271,7 +271,7 @@ |
*/ |
private void generateProxyClass(DartClass clazz) { |
String name = clazz.getClassName(); |
- p("interface " + name + "$Proxy {"); |
+ p("interface " + name + "$Proxy extends Proxy {"); |
printProxyInterfaceFunctions(clazz); |
p("}"); |
nl(); |
@@ -411,22 +411,12 @@ |
p("\") {"); |
nl(); |
int proxies = unpackParams(member); |
- String extra = ""; |
if (proxies != 0) { |
- p(" Promise done = new Promise();"); |
- nl(); |
- p(" done.waitFor(promises, " + proxies + ");"); |
- nl(); |
- p(" done.addCompleteHandler((_) {"); |
- nl(); |
+ // FIXME(benl): we don't need to gather them anymore, could just pass them directly. Too |
+ // lazy right now. |
gatherProxies(member); |
- extra = " "; |
} |
- callTarget((DartMethodDefinition)member, extra); |
- if (proxies != 0) { |
- p(" });"); |
- nl(); |
- } |
+ callTarget((DartMethodDefinition)member, ""); |
p(" }"); |
first = false; |
} |
@@ -648,7 +638,7 @@ |
boolean isSimpleType = isSimpleType(x.getTypeNode()); |
if (!isSimpleType) { |
- p(" "); |
+ p(" "); |
accept(x.getTypeNode()); |
p(" "); |
accept(x.getName()); |