cleanup from r3556

frog/lib/node/fs.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.
 
 #library('fs');
 
 #import('node.dart');
 #import('nodeimpl.dart');
 
 
 typedef ReadStreamOpenListener(int fd);
 
 class ReadStream implements ReadableStream, FsStream native "*ReadStream" {
   // EventEmitter
   void removeAllListeners(String event) native;
   void setMaxListeners(num n) native;
   _listeners(String key)
     native "return this.listeners(key);";
-  
+
   // CommonStream
-  
+
   // Error event
   void emitError(Error error)
     native "this.emit('error', error);";
   void addListenerError(StreamErrorListener listener)
     native "this.addListener('error', listener);";
   void onError(StreamErrorListener listener)
     native "this.on('error', listener);";
   void onceError(StreamErrorListener listener)
     native "this.once('error', listener);";
   void removeListenerError(StreamErrorListener listener)
     native "this.removeListener('error', listener);";
   List<StreamErrorListener> listenersError()
     => _listeners('error');
 
   // Close event
   void emitClose()
     native "this.emit('close');";
   void addListenerClose(StreamCloseListener listener)
     native "this.addListener('close', listener);";
   void onClose(StreamCloseListener listener)
     native "this.on('close', listener);";
   void onceClose(StreamCloseListener listener)
     native "this.once('close', listener);";
   void removeListenerClose(StreamCloseListener listener)
     native "this.removeListener('close', listener);";
   List<StreamCloseListener> listenersClose()
     => _listeners('close');
 
   // ReadableStream
-  
+
   // Data event
   void emitData(var data)
     native "this.emit('data', data);";
   void addListenerData(ReadableStreamDataListener listener)
     native "this.addListener('data', listener);";
   void onData(ReadableStreamDataListener listener)
     native "this.on('data', listener);";
   void onceData(ReadableStreamDataListener listener)
     native "this.once('data', listener);";
   void removeListenerData(ReadableStreamDataListener listener)
     native "this.removeListener('data', listener);";
   List<ReadableStreamDataListener> listenerData()
     => _listeners('data');
-    
+
   // End event
   void emitEnd()
     native "this.emit('end');";
   void addListenerEnd(ReadableStreamEndListener listener)
     native "this.addListener('end', listener);";
   void onEnd(ReadableStreamEndListener listener)
     native "this.on('end', listener);";
   void onceEnd(ReadableStreamEndListener listener)
     native "this.once('end', listener);";
   void removeListenerEnd(ReadableStreamEndListener listener)
     native "this.removeListener('end', listener);";
   List<ReadableStreamEndListener> listenersEnd()
     => _listeners('end');
 
   // FsStream
-  
+
   // Open event
   void emitOpen(int fd)
     native "this.emit('open', fd);";
   void addListenerOpen(FsStreamOpenListener listener)
     native "this.addListener('open', listener);";
   void onOpen(FsStreamOpenListener listener)
     native "this.on('open', listener);";
   void onceOpen(FsStreamOpenListener listener)
     native "this.once('open', listener);";
   void removeListenerOpen(FsStreamOpenListener listener)
     native "this.removeListener('open', listener);";
   List<FsStreamOpenListener> listenersOpen()
     => _listeners('open');
-    
+
   bool readable;
   void setEncoding(String encoding) native;
   void pause() native;
   void resume() native;
   void destroy() native;
   void destroySoon() native;
   WritableStream pipe(WritableStream destination, [Map options]) native;
 }
 
 class WriteStream implements WritableStream, FsStream native "*WriteStream" {
   // EventEmitter
   void removeAllListeners(String event) native;
   void setMaxListeners(num n) native;
   _listeners(String key)
     native "return this.listeners(key);";
 
   // CommonStream
-  
+
   // Error event
   void emitError(Error error)
     native "this.emit('error', error);";
   void addListenerError(StreamErrorListener listener)
     native "this.addListener('error', listener);";
   void onError(StreamErrorListener listener)
     native "this.on('error', listener);";
   void onceError(StreamErrorListener listener)
     native "this.once('error', listener);";
   void removeListenerError(StreamErrorListener listener)
     native "this.removeListener('error', listener);";
   List<StreamErrorListener> listenersError()
     => _listeners('error');
 
   // Close event
   void emitClose()
     native "this.emit('close');";
   void addListenerClose(StreamCloseListener listener)
     native "this.addListener('close', listener);";
   void onClose(StreamCloseListener listener)
     native "this.on('close', listener);";
   void onceClose(StreamCloseListener listener)
     native "this.once('close', listener);";
   void removeListenerClose(StreamCloseListener listener)
     native "this.removeListener('close', listener);";
   List<StreamCloseListener> listenersClose()
     => _listeners('close');
 
   // WritableStream
-  
+
   // Drain event
   void emitDrain()
     native "this.emit('drain');";
   void addListenerDrain(WritableStreamDrainListener listener)
     native "this.addListener('drain', listener);";
   void onDrain(WritableStreamDrainListener listener)
     native "this.on('drain', listener);";
   void onceDrain(WritableStreamDrainListener listener)
     native "this.once('drain', listener);";
   void removeListenerDrain(WritableStreamDrainListener listener)
     native "this.removeListener('drain', listener);";
   List<WritableStreamDrainListener> listenersDrain()
     => _listeners('drain');
-    
+
   // Pipe event
   void emitPipe(ReadableStream src)
     native "this.emit('pipe', src);";
   void addListenerPipe(WritableStreamPipeListener listener)
     native "this.addListener('pipe', listener);";
   void onPipe(WritableStreamPipeListener listener)
     native "this.on('pipe', listener);";
   void oncePipe(WritableStreamPipeListener listener)
     native "this.once('pipe', listener);";
   void removeListenerPipe(WritableStreamPipeListener listener)
     native "this.removeListener('pipe', listener);";
   List<WritableStreamPipeListener> listenersPipe()
     => _listeners('pipe');
 
   // FsStream
 
   // Open event
   void emitOpen(int fd)
     native "this.emit('open', fd);";
   void addListenerOpen(FsStreamOpenListener listener)
     native "this.addListener('open', listener);";
   void onOpen(FsStreamOpenListener listener)
     native "this.on('open', listener);";
   void onceOpen(FsStreamOpenListener listener)
     native "this.once('open', listener);";
   void removeListenerOpen(FsStreamOpenListener listener)
     native "this.removeListener('open', listener);";
   List<FsStreamOpenListener> listenersOpen()
     => _listeners('open');
-      
+
   bool writable;
   bool write(String string, [String encoding='utf8', int fd]) native;
   bool writeBuffer(Buffer buffer) native;
   void end([String string, String encoding]) native;
   void endBuffer(Buffer buffer) native "this.end(buffer);";
   void destroy() native;
   void destroySoon() native;
-  
+
   List<int> getWindowSize() native;
-  
+
   int bytesWritten;
 }
 
 typedef void FsRenameCallback(Error err);
 typedef void FsTruncateCallback(Error err);
 typedef void FsChownCallback(Error err);
 typedef void FsFchownCallback(Error err);
 typedef void FsLchownCallback(Error err);
 typedef void FsChmodCallback(Error err);
 typedef void FsFchmodCallback(Error err);
@@ skipping 18 matching lines @@
 typedef void FsReadCallback(Error err, int bytesRead, Buffer buffer);
 typedef void FsReadFileCallback(Error err, String data);
 typedef void FsReadFileBufferCallback(Error err, Buffer data);
 typedef void FsWriteFileCallback(Error err);
 typedef void FsWriteFileBufferCallback(Error err);
 typedef void FsWatchFileListener(Stats curr, Stats prev);
 
 class Fs {
   var _fs;
   Fs.from(this._fs);
-  
+
   void rename(String path1, String path2, [FsRenameCallback callback])
       native "this._fs.rename(path1, path2, callback);";
   void renameSync(String path1, String path2)
       native "this._fs.renameSync(path1, path2);";
 
   void truncate(int fd, int len, [FsTruncateCallback callback])
       native "this._fs.truncate(fd, len, callback);";
   void truncateSync(int fd, int len)
       native "this._fs.truncateSync(fd, len);";
 
@@ skipping 157 matching lines @@
   FSWatcher watch(String filename, FSWatcherChangeListener listener, [Map
       options])
       native "return this._fs.watch(filename, options, listener);";
 
   ReadStream createReadStream(String path, [Map options])
       native "return this._fs.createReadStream(path, options);";
   WriteStream createWriteStream(String path, [Map options])
       native "return this._fs.createWriteStream(path, options);";
 }
 
-Fs get fs() => require('fs');
-  
+Fs get fs() => new Fs.from(require('fs'));
+
 class Stats native "fs.Stats" {
   bool isFile() native;
   bool isDirectory() native;
   bool isBlockDevice() native;
   bool isCharacterDevice() native;
   bool isSymbolicLink() native;
   bool isFIFO() native;
   bool isSocket() native;
 
   int dev;
@@ skipping 29 matching lines @@
   void addListenerError(FSWatcherErrorListener listener)
     native "this.addListener('error', listener);";
   void onError(FSWatcherErrorListener listener)
     native "this.on('error', listener);";
   void onceError(FSWatcherErrorListener listener)
     native "this.once('error', listener);";
   void removeListenerError(FSWatcherErrorListener listener)
     native "this.removeListener('error', listener);";
   List<FSWatcherErrorListener> listenersError()
     => _listeners('error');
-    
+
   // Change event
   void emitChange(String event, String filename)
     native "this.emit('change', event, filename);";
   void addListenerChange(FSWatcherChangeListener listener)
     native "this.addListener('change', listener);";
   void onChange(FSWatcherChangeListener listener)
     native "this.on('change', listener);";
   void onceChange(FSWatcherChangeListener listener)
     native "this.once('change', listener);";
   void removeListenerChange(FSWatcherChangeListener listener)
     native "this.removeListener('change', listener);";
   List<FSWatcherChangeListener> listenersChange()
     => _listeners('change');
 }