Fix some minor static type issues in dart:io implementation.

runtime/bin/socket_impl.dart

 // Copyright (c) 2012, 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.
 
 
 class _SocketBase {
   // Bit flags used when communicating between the eventhandler and
   // dart code. The EVENT flags are used to indicate events of
   // interest when sending a message from dart code to the
   // eventhandler. When receiving a message from the eventhandler the
@@ skipping 73 matching lines @@
         _closedRead &&
         _handlerMask == 0 &&
         _handler != null) {
       _handler.close();
       _handler = null;
     } else {
       _activateHandlers();
     }
   }
 
-  void _getPort() native "Socket_GetPort";
+  int _getPort() native "Socket_GetPort";
 
   void set onError(void callback()) {
     _setHandler(_ERROR_EVENT, callback);
   }
 
   void _activateHandlers() {
     if (_canActivateHandlers && (_id >= 0)) {
       if (_handlerMask == 0) {
         if (_handler != null) {
           _handler.close();
@@ skipping 94 matching lines @@
 
   // Indicates if native interrupts can be activated.
   bool _canActivateHandlers;
 
   // Holds the port of the socket, null if not known.
   int _port;
 
   // Hash code for the socket. Currently this is just a counter.
   int _hashCode;
   static int _nextHashCode = 0;
+  bool _closedRead = false;
+  bool _closedWrite = false;

[Bill Hesse, 2012/03/14 13:24:57]

Various methods in _SocketBase use these fields, so they should be in
_SocketBase.

 }
 
 
 class _ServerSocket extends _SocketBase implements ServerSocket {
   // Constructor for server socket. First a socket object is allocated
   // in which the native socket is stored. After that _createBind
   // is called which creates a file descriptor and binds the given address
   // and port to the socket. Null is returned if file descriptor creation or
   // bind failed.
   factory _ServerSocket(String bindAddress, int port, int backlog) {
-    ServerSocket socket = new _ServerSocket._internal();
+    _ServerSocket socket = new _ServerSocket._internal();
     if (!socket._createBindListen(bindAddress, port, backlog)) {
       socket.close();
       return null;
     }
     if (port != 0) {
       socket._port = port;
     }
     return socket;
   }
 
@@ skipping 24 matching lines @@
 }
 
 
 class _Socket extends _SocketBase implements Socket {
   // Constructor for socket. First a socket object is allocated
   // in which the native socket is stored. After that _createConnect is
   // called which creates a file discriptor and connects to the given
   // host on the given port. Null is returned if file descriptor creation
   // or connect failed.
   factory _Socket(String host, int port) {
-    Socket socket = new _Socket._internal();
+    _Socket socket = new _Socket._internal();
     if (!socket._createConnect(host, port)) {
       socket.close();
       return null;
     }
     return socket;
   }
 
   _Socket._internal();
-  _Socket._internalReadOnly() : _closedWrite = true, _pipe = true;
-  _Socket._internalWriteOnly() : _closedRead = true, _pipe = true;
+  _Socket._internalReadOnly() : _pipe = true { super._closedWrite = true; }
+  _Socket._internalWriteOnly() : _pipe = true { super._closedRead = true; }
 
   int available() {
     if (_id >= 0) {
       return _available();
     }
     throw new
         SocketIOException("Error: available failed - invalid socket handle");
   }
 
   int _available() native "Socket_Available";
 
-  bool get closed() => _closed;
+  bool get closed() => _closedWrite && _closedRead;

[Mads Ager (google), 2012/03/14 13:34:08]

It looks to me like this should be deleted instead.

closed is not part of the Socket interface and i don't see uses of it, at least
not here?

[Bill Hesse, 2012/03/14 13:46:49]

Deleted.  Not surprising it didn't fail, since it was never called.

On 2012/03/14 13:34:08, Mads Ager wrote:

 
   int readList(List<int> buffer, int offset, int bytes) {
     if (_id >= 0) {
       if (bytes == 0) {
         return 0;
       }
       if (offset < 0) {
         throw new IndexOutOfRangeException(offset);
       }
       if (bytes < 0) {
@@ skipping 174 matching lines @@
     } else {
       if (_seenFirstOutEvent) {
         _onWrite = _clientWriteHandler;
       } else {
         _onWrite = firstWriteHandler;
       }
     }
   }
 
   bool _seenFirstOutEvent = false;
-  bool _closedRead = false;
-  bool _closedWrite = false;
   bool _pipe = false;
   Function _clientConnectHandler;
   Function _clientWriteHandler;
   SocketInputStream _inputStream;
   SocketOutputStream _outputStream;
 }