New analyzer_experimental snapshot.

pkg/analyzer_experimental/lib/analyzer.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.
 
 library analyzer;
 
 import 'dart:io';
 
 import 'package:path/path.dart' as pathos;
 
+import 'src/generated/java_core.dart' show CharSequence;
 import 'src/error.dart';
 import 'src/generated/ast.dart';
 import 'src/generated/error.dart';
 import 'src/generated/parser.dart';
 import 'src/generated/scanner.dart';
 import 'src/generated/source_io.dart';
 import 'src/string_source.dart';
 
 export 'src/error.dart';
 export 'src/generated/ast.dart';
 export 'src/generated/error.dart';
 export 'src/generated/utilities_dart.dart';
 
 /// Parses a Dart file into an AST.
 CompilationUnit parseDartFile(String path) {
-  var contents = new File(path).readAsStringSync();
+  String contents = new File(path).readAsStringSync();
   var errorCollector = new _ErrorCollector();
   var sourceFactory = new SourceFactory.con2([new FileUriResolver()]);
 
   var absolutePath = pathos.absolute(path);
   var source = sourceFactory.forUri(pathos.toUri(absolutePath).toString());
   if (source == null) {
     throw new ArgumentError("Can't get source for path $path");
   }
   if (!source.exists()) {
     throw new ArgumentError("Source $source doesn't exist");
   }
 
-  var scanner = new StringScanner(source, contents, errorCollector);
+  var reader = new CharSequenceReader(new CharSequence(contents));
+  var scanner = new Scanner(source, reader, errorCollector);
   var token = scanner.tokenize();
   var parser = new Parser(source, errorCollector);
   var unit = parser.parseCompilationUnit(token);
   unit.lineInfo = new LineInfo(scanner.lineStarts);
 
   if (errorCollector.hasErrors) throw errorCollector.group;
 
   return unit;
 }
 
 /// Parses a string of Dart code into an AST.
 ///
 /// If [name] is passed, it's used in error messages as the name of the code
 /// being parsed.
 CompilationUnit parseCompilationUnit(String contents, {String name}) {
   if (name == null) name = '<unknown source>';
   var source = new StringSource(contents, name);
   var errorCollector = new _ErrorCollector();
-  var scanner = new StringScanner(source, contents, errorCollector);
+  var reader = new CharSequenceReader(new CharSequence(contents));
+  var scanner = new Scanner(source, reader, errorCollector);
   var token = scanner.tokenize();
   var parser = new Parser(source, errorCollector);
   var unit = parser.parseCompilationUnit(token);
   unit.lineInfo = new LineInfo(scanner.lineStarts);
 
   if (errorCollector.hasErrors) throw errorCollector.group;
 
   return unit;
 }
 
@@ skipping 10 matching lines @@
   bool get hasErrors => !_errors.isEmpty;
 
   /// The group of errors collected.
   AnalyzerErrorGroup get group =>
     new AnalyzerErrorGroup.fromAnalysisErrors(_errors);
 
   _ErrorCollector();
 
   void onError(AnalysisError error) => _errors.add(error);
 }