Change the handling of closing sockets

tests/stub-generator/src/MintMakerFullyIsolatedTest-generatedTest.dart

 // Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 // IsolateStubs=MintMakerFullyIsolatedTest.dart:Mint,Purse,PowerfulPurse
 
 #import("../../isolate/src/TestFramework.dart");
 
 /* class = Purse (tests/stub-generator/src/MintMakerFullyIsolatedTest.dart/MintMakerFullyIsolatedTest.dart: 9) */
 
-interface Purse$Proxy extends Proxy {
+interface Purse$Proxy {
   Promise<int> queryBalance();
 
   Purse$Proxy sproutPurse();
 
   Promise<int> deposit(int amount, Purse$Proxy source);
 }
 
-class Purse$ProxyImpl extends ProxyImpl implements Purse$Proxy {
+class Purse$ProxyImpl extends Proxy implements Purse$Proxy {
   Purse$ProxyImpl(Promise<SendPort> port) : super.forReply(port) { }
   Purse$ProxyImpl.forIsolate(Proxy isolate) : super.forReply(isolate.call([null])) { }
   factory Purse$ProxyImpl.createIsolate() {
     Proxy isolate = new Proxy.forIsolate(new Purse$Dispatcher$Isolate());
     return new Purse$ProxyImpl.forIsolate(isolate);
   }
   factory Purse$ProxyImpl.localProxy(Purse obj) {
     return new Purse$ProxyImpl(new Promise<SendPort>.fromValue(Dispatcher.serve(new Purse$Dispatcher(obj))));
   }
 
   Promise<int> queryBalance() {
     return this.call(["queryBalance"]);
   }
 
   Purse$Proxy sproutPurse() {
-    return new Purse$ProxyImpl(new PromiseProxy<SendPort>(this.call(["sproutPurse"])));
+    return new Purse$ProxyImpl(this.call(["sproutPurse"]));
   }
 
   Promise<int> deposit(int amount, Purse$Proxy source) {
-    return new PromiseProxy<int>(this.call(["deposit", amount, source]));
+    return this.call(["deposit", amount, source]);
   }
 }
 
 class Purse$Dispatcher extends Dispatcher<Purse> {
   Purse$Dispatcher(Purse thing) : super(thing) { }
 
   void process(var message, void reply(var response)) {
     String command = message[0];
     if (command == "Purse") {
     } else if (command == "queryBalance") {
       int queryBalance = target.queryBalance();
       reply(queryBalance);
     } else if (command == "sproutPurse") {
       Purse$Proxy sproutPurse = target.sproutPurse();
       reply(sproutPurse);
     } else if (command == "deposit") {
       int amount = message[1];
-      List<Promise<SendPort>> promises = new List<Promise<SendPort>>();
-      promises.add(new PromiseProxy<SendPort>(new Promise<SendPort>.fromValue(message[2])));
-      Purse$Proxy source = new Purse$ProxyImpl(promises[0]);
+      Purse$Proxy source = new Purse$ProxyImpl(new Promise<SendPort>.fromValue(message[2]));
       Promise<int> deposit = target.deposit(amount, source);
       reply(deposit);
     } else {
       // TODO(kasperl,benl): Somehow throw an exception instead.
       reply("Exception: command '" + command + "' not understood by Purse.");
     }
   }
 }
 
 class Purse$Dispatcher$Isolate extends Isolate {
   Purse$Dispatcher$Isolate() : super() { }
 
   void main() {
     this.port.receive(void _(var message, SendPort replyTo) {
       Purse thing = new Purse();
       SendPort port = Dispatcher.serve(new Purse$Dispatcher(thing));
       Proxy proxy = new Proxy.forPort(replyTo);
       proxy.send([port]);
     });
   }
 }
 
 /* class = PowerfulPurse (tests/stub-generator/src/MintMakerFullyIsolatedTest.dart/MintMakerFullyIsolatedTest.dart: 18) */
 
-interface PowerfulPurse$Proxy extends Proxy {
+interface PowerfulPurse$Proxy {
   void init(Mint$Proxy mint, int balance);
 
   Promise<int> grab(int amount);
 
   Purse$Proxy weak();
 }
 
-class PowerfulPurse$ProxyImpl extends ProxyImpl implements PowerfulPurse$Proxy {
+class PowerfulPurse$ProxyImpl extends Proxy implements PowerfulPurse$Proxy {
   PowerfulPurse$ProxyImpl(Promise<SendPort> port) : super.forReply(port) { }
   PowerfulPurse$ProxyImpl.forIsolate(Proxy isolate) : super.forReply(isolate.call([null])) { }
   factory PowerfulPurse$ProxyImpl.createIsolate() {
     Proxy isolate = new Proxy.forIsolate(new PowerfulPurse$Dispatcher$Isolate());
     return new PowerfulPurse$ProxyImpl.forIsolate(isolate);
   }
   factory PowerfulPurse$ProxyImpl.localProxy(PowerfulPurse obj) {
     return new PowerfulPurse$ProxyImpl(new Promise<SendPort>.fromValue(Dispatcher.serve(new PowerfulPurse$Dispatcher(obj))));
   }
 
@@ skipping 10 matching lines @@
   }
 }
 
 class PowerfulPurse$Dispatcher extends Dispatcher<PowerfulPurse> {
   PowerfulPurse$Dispatcher(PowerfulPurse thing) : super(thing) { }
 
   void process(var message, void reply(var response)) {
     String command = message[0];
     if (command == "PowerfulPurse") {
     } else if (command == "init") {
-      List<Promise<SendPort>> promises = new List<Promise<SendPort>>();
-      promises.add(new PromiseProxy<SendPort>(new Promise<SendPort>.fromValue(message[1])));
+      Mint$Proxy mint = new Mint$ProxyImpl(new Promise<SendPort>.fromValue(message[1]));
       int balance = message[2];
-      Mint$Proxy mint = new Mint$ProxyImpl(promises[0]);
       target.init(mint, balance);
     } else if (command == "grab") {
       int amount = message[1];
       int grab = target.grab(amount);
       reply(grab);
     } else if (command == "weak") {
       Purse weak = target.weak();
       SendPort port = Dispatcher.serve(new Purse$Dispatcher(weak));
       reply(port);
     } else {
@@ skipping 11 matching lines @@
       PowerfulPurse thing = new PowerfulPurse();
       SendPort port = Dispatcher.serve(new PowerfulPurse$Dispatcher(thing));
       Proxy proxy = new Proxy.forPort(replyTo);
       proxy.send([port]);
     });
   }
 }
 
 /* class = Mint (tests/stub-generator/src/MintMakerFullyIsolatedTest.dart/MintMakerFullyIsolatedTest.dart: 28) */
 
-interface Mint$Proxy extends Proxy {
+interface Mint$Proxy {
   Purse$Proxy createPurse(int balance);
 
   Promise<PowerfulPurse$Proxy> promote(Purse$Proxy purse);
 }
 
-class Mint$ProxyImpl extends ProxyImpl implements Mint$Proxy {
+class Mint$ProxyImpl extends Proxy implements Mint$Proxy {
   Mint$ProxyImpl(Promise<SendPort> port) : super.forReply(port) { }
   Mint$ProxyImpl.forIsolate(Proxy isolate) : super.forReply(isolate.call([null])) { }
   factory Mint$ProxyImpl.createIsolate() {
     Proxy isolate = new Proxy.forIsolate(new Mint$Dispatcher$Isolate());
     return new Mint$ProxyImpl.forIsolate(isolate);
   }
   factory Mint$ProxyImpl.localProxy(Mint obj) {
     return new Mint$ProxyImpl(new Promise<SendPort>.fromValue(Dispatcher.serve(new Mint$Dispatcher(obj))));
   }
 
   Purse$Proxy createPurse(int balance) {
-    return new Purse$ProxyImpl(new PromiseProxy<SendPort>(this.call(["createPurse", balance])));
+    return new Purse$ProxyImpl(this.call(["createPurse", balance]));
   }
 
   Promise<PowerfulPurse$Proxy> promote(Purse$Proxy purse) {
-    return new Promise<PowerfulPurse$Proxy>.fromValue(new PowerfulPurse$ProxyImpl(new PromiseProxy<SendPort>(new PromiseProxy<SendPort>(this.call(["promote", purse])))));
+    return this.call(["promote", purse]);
   }
 }
 
 class Mint$Dispatcher extends Dispatcher<Mint> {
   Mint$Dispatcher(Mint thing) : super(thing) { }
 
   void process(var message, void reply(var response)) {
     String command = message[0];
     if (command == "Mint") {
     } else if (command == "createPurse") {
       int balance = message[1];
       Purse$Proxy createPurse = target.createPurse(balance);
       reply(createPurse);
     } else if (command == "promote") {
-      List<Promise<SendPort>> promises = new List<Promise<SendPort>>();
-      promises.add(new PromiseProxy<SendPort>(new Promise<SendPort>.fromValue(message[1])));
-      Purse$Proxy purse = new Purse$ProxyImpl(promises[0]);
+      Purse$Proxy purse = new Purse$ProxyImpl(new Promise<SendPort>.fromValue(message[1]));
       Promise<PowerfulPurse$Proxy> promote = target.promote(purse);
       reply(promote);
     } else {
       // TODO(kasperl,benl): Somehow throw an exception instead.
       reply("Exception: command '" + command + "' not understood by Mint.");
     }
   }
 }
 
 class Mint$Dispatcher$Isolate extends Isolate {
@@ skipping 291 matching lines @@
       expect.succeeded();
       print("##DONE##");
     });
   }
 
 }
 
 main() {
   runTests([MintMakerFullyIsolatedTest.testMain]);
 }