Clean up readAsLines*.

sdk/lib/io/file_impl.dart

 // Copyright (c) 2013, 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.
 
 part of dart.io;
 
 // Read the file in blocks of size 64k.
 const int _BLOCK_SIZE = 64 * 1024;
 
 
@@ skipping 476 matching lines @@
       return encoding.decode(bytes);
     } catch (_) {
       throw new FileSystemException(
           "Failed to decode data using encoding '${encoding.name}'", path);
     }
   }
 
   Future<String> readAsString({Encoding encoding: UTF8}) =>
     readAsBytes().then((bytes) => _tryDecode(bytes, encoding));
 
-  String readAsStringSync({Encoding encoding: UTF8}) {
-    List<int> bytes = readAsBytesSync();
-    return _tryDecode(bytes, encoding);
-  }
+  String readAsStringSync({Encoding encoding: UTF8}) =>
+    _tryDecode(readAsBytesSync(), encoding);
 
-  List<String> _decodeLines(List<int> bytes, Encoding encoding) {
-    if (bytes.length == 0) return [];
-    var list = [];
-    var controller = new StreamController(sync: true);
-    var error = null;
-    controller.stream
-        .transform(encoding.decoder)
-        .transform(new LineSplitter())
-        .listen((line) => list.add(line), onError: (e) => error = e);
-    controller.add(bytes);
-    controller.close();
-    if (error != null) {
-      throw new FileSystemException(
-          "Failed to decode data using encoding '${encoding.name}'", path);
-    }
-    return list;
-  }
-
-  Future<List<String>> readAsLines({Encoding encoding: UTF8}) {
-    return readAsBytes().then((bytes) {
-      return _decodeLines(bytes, encoding);
-    });
-  }
+  Future<List<String>> readAsLines({Encoding encoding: UTF8}) =>
+    readAsString(encoding: encoding).then(const LineSplitter().convert);
 
   List<String> readAsLinesSync({Encoding encoding: UTF8}) =>
-      _decodeLines(readAsBytesSync(), encoding);
+    const LineSplitter().convert(readAsStringSync(encoding: encoding));
 
   Future<File> writeAsBytes(List<int> bytes,
                             {FileMode mode: FileMode.WRITE,
                              bool flush: false}) {
     return open(mode: mode).then((file) {
       return file.writeFrom(bytes, 0, bytes.length)
           .then((_) {
             if (flush) return file.flush().then((_) => this);
             return this;
           })
@@ skipping 384 matching lines @@
   void _checkAvailable() {
     if (_asyncDispatched) {
       throw new FileSystemException("An async operation is currently pending",
                                     path);
     }
     if (closed) {
       throw new FileSystemException("File closed", path);
     }
   }
 }