Update charted to 0.4.8 and roll

packages/string_scanner/lib/src/line_scanner.dart

 // Copyright (c) 2014, 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 string_scanner.line_scanner;
-
 import 'package:charcode/ascii.dart';
 
 import 'string_scanner.dart';
 
 // Note that much of this code is duplicated in eager_span_scanner.dart.
 
 /// A regular expression matching newlines across platforms.
 final _newlineRegExp = new RegExp(r"\r\n?|\n");
 
 /// A subclass of [StringScanner] that tracks line and column information.
 class LineScanner extends StringScanner {
   /// The scanner's current (zero-based) line number.
   int get line => _line;
   int _line = 0;
 
   /// The scanner's current (zero-based) column number.
   int get column => _column;
   int _column = 0;
 
   /// The scanner's state, including line and column information.
   ///
   /// This can be used to efficiently save and restore the state of the scanner
   /// when backtracking. A given [LineScannerState] is only valid for the
   /// [LineScanner] that created it.
+  ///
+  /// This does not include the scanner's match information.
   LineScannerState get state =>
       new LineScannerState._(this, position, line, column);
 
   /// Whether the current position is between a CR character and an LF
   /// charactet.
   bool get _betweenCRLF => peekChar(-1) == $cr && peekChar() == $lf;
 
   set state(LineScannerState state) {
     if (!identical(state._scanner, this)) {
       throw new ArgumentError("The given LineScannerState was not returned by "
@@ skipping 27 matching lines @@
       } else {
         _column = newPosition -
             string.lastIndexOf(_newlineRegExp, newPosition) - 1;
       }
     }
   }
 
   LineScanner(String string, {sourceUrl, int position})
       : super(string, sourceUrl: sourceUrl, position: position);
 
+  bool scanChar(int character) {
+    if (!super.scanChar(character)) return false;
+    _adjustLineAndColumn(character);
+    return true;
+  }
+
   int readChar() {
-    var char = super.readChar();
-    if (char == $lf || (char == $cr && peekChar() != $lf)) {
+    var character = super.readChar();
+    _adjustLineAndColumn(character);
+    return character;
+  }
+
+  /// Adjusts [_line] and [_column] after having consumed [character].
+  void _adjustLineAndColumn(int character) {
+    if (character == $lf || (character == $cr && peekChar() != $lf)) {
       _line += 1;
       _column = 0;
     } else {
       _column += 1;
     }
-    return char;
   }
 
   bool scan(Pattern pattern) {
     if (!super.scan(pattern)) return false;
 
     var newlines = _newlinesIn(lastMatch[0]);
     _line += newlines.length;
     if (newlines.isEmpty) {
       _column += lastMatch[0].length;
     } else {
@@ skipping 21 matching lines @@
   final int position;
 
   /// The zero-based line number of the scanner in this state.
   final int line;
 
   /// The zero-based column number of the scanner in this state.
   final int column;
 
   LineScannerState._(this._scanner, this.position, this.line, this.column);
 }