- Fix the return type of File.openSync.

runtime/bin/file_impl.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.
 
 class _FileInputStream extends _BaseDataInputStream implements InputStream {
   _FileInputStream(File file) {
     _file = file.openSync();
     _length = _file.lengthSync();
     _streamMarkedClosed = true;
     _checkScheduleCallbacks();
@@ skipping 203 matching lines @@
       _replyPort.send(0, port.toSendPort());
       return;
     }
     int index =
         _FileUtils.checkReadWriteListArguments(_buffer.length, _offset, _bytes);
     if (index != 0) {
       _replyPort.send("index out of range in writeList: $index",
                       port.toSendPort());
       return;
     }
-    var result = _FileUtils.writeList(_id, _buffer, _offset, _bytes);
+    var result = _FileUtils._writeList(_id, _buffer, _offset, _bytes);
     _replyPort.send(result, port.toSendPort());
   }
 
   bool isWrite() => true;
 
   int _id;
   List _buffer;
   int _offset;
   int _bytes;
 }
@@ skipping 178 matching lines @@
   static bool exists(String name) native "File_Exists";
   static int open(String name, int mode) native "File_Open";
   static bool create(String name) native "File_Create";
   static bool delete(String name) native "File_Delete";
   static String fullPath(String name) native "File_FullPath";
   static int close(int id) native "File_Close";
   static int readByte(int id) native "File_ReadByte";
   static int readList(int id, List<int> buffer, int offset, int bytes)
       native "File_ReadList";
   static int writeByte(int id, int value) native "File_WriteByte";
-  static int writeList(int id, List<int> buffer, int offset, int bytes)
+  static int _writeList(int id, List<int> buffer, int offset, int bytes) {

[Mads Ager (google), 2012/01/19 07:13:27]

You can't get to this member in any case from the outside because it is a static
member in a private class. You should not be able to get to _FileUtils and
therefore you should not be able to call this.

I used to have underscores on all of these but I'm not sure it adds much? If we
want underscores could we please add them to all the members here?

[Ivan Posva, 2012/01/20 21:55:06]

The thing is that if somebody decides to make FileUtils a public class you need
to change all currently exported names to private. But we can fix this in
another cleanup round. Changing this example back to the way it was.

+    ObjectArray out_buffer;
+    int out_offset = offset;
+    if (buffer is ObjectArray) {
+      out_buffer = buffer;
+    } else {
+      out_buffer = new ObjectArray(bytes);
+      out_offset = 0;
+      int j = offset;
+      for (int i = 0; i < bytes; i++) {
+        out_buffer[i] = buffer[j];
+        j++;
+      }
+    }
+    return __writeList(id, out_buffer, out_offset, bytes);
+  }
+  static int __writeList(int id, List<int> buffer, int offset, int bytes)
       native "File_WriteList";
   static int writeString(int id, String string) native "File_WriteString";
   static int position(int id) native "File_Position";
   static bool setPosition(int id, int position) native "File_SetPosition";
   static bool truncate(int id, int length) native "File_Truncate";
   static int length(int id) native "File_Length";
   static int flush(int id) native "File_Flush";
 
   static int checkedOpen(String name, int mode) {
     if (name is !String || mode is !int) return 0;
@@ skipping 133 matching lines @@
         var randomAccessFile = new _RandomAccessFile(id, _name);
         handler(randomAccessFile);
       } else if (_errorHandler != null) {
         _errorHandler("Cannot open file: $_name");
       }
     };
     var operation = new _OpenOperation(_name, mode.mode);
     _scheduler.enqueue(operation, handleOpenResult);
   }
 
-  void openSync([FileMode mode = FileMode.READ]) {
+  RandomAccessFile openSync([FileMode mode = FileMode.READ]) {
     if (_asyncUsed) {
       throw new FileIOException(
           "Mixed use of synchronous and asynchronous API");
     }
     if (mode != FileMode.READ &&
         mode != FileMode.WRITE &&
         mode != FileMode.APPEND) {
       throw new FileIOException("Unknown file mode. Use FileMode.READ, " +
                                 "FileMode.WRITE or FileMode.APPEND.");
     }
@@ skipping 252 matching lines @@
     }
     if (buffer is !List || offset is !int || bytes is !int) {
       throw new FileIOException("Invalid arguments to writeList");
     }
     if (bytes == 0) return 0;
     int index =
         _FileUtils.checkReadWriteListArguments(buffer.length, offset, bytes);
     if (index != 0) {
       throw new IndexOutOfRangeException(index);
     }
-    int result = _FileUtils.writeList(_id, buffer, offset, bytes);
+    int result = _FileUtils._writeList(_id, buffer, offset, bytes);
     if (result == -1) {
       throw new FileIOException("writeList failed");
     }
     return result;
   }
 
   void writeString(String string) {
     _asyncUsed = true;
     var handleWriteStringResult = (result, ignored) {
       if (result == -1 &&_errorHandler != null) {
@@ skipping 202 matching lines @@
   var _readByteHandler;
   var _readListHandler;
   var _noPendingWriteHandler;
   var _positionHandler;
   var _setPositionHandler;
   var _truncateHandler;
   var _lengthHandler;
   var _flushHandler;
   var _errorHandler;
 }