Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(409)

Unified Diff: pkg/dartdoc/lib/src/mirrors/dart2js_mirror.dart

Issue 10990060: Added support for exports and re-exports. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Status updated. Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: pkg/dartdoc/lib/src/mirrors/dart2js_mirror.dart
diff --git a/pkg/dartdoc/lib/src/mirrors/dart2js_mirror.dart b/pkg/dartdoc/lib/src/mirrors/dart2js_mirror.dart
index 5e26ead6c79a58fc6235091b1f31bfeba42528a8..af3f858c2d542396dedafbae2ab2eb94f0c7a5a9 100644
--- a/pkg/dartdoc/lib/src/mirrors/dart2js_mirror.dart
+++ b/pkg/dartdoc/lib/src/mirrors/dart2js_mirror.dart
@@ -233,7 +233,7 @@ class LibraryCompiler extends api.Compiler {
scanBuiltinLibraries();
var elementList = <LibraryElement>[];
for (var uri in uriList) {
- elementList.add(scanner.loadLibrary(uri, null, uri));
+ elementList.add(libraryLoader.loadLibrary(uri, null, uri));
}
libraries.forEach((_, library) {
maybeEnableJSHelper(library);
@@ -367,11 +367,6 @@ class Dart2JsCompilation implements Compilation {
_compiler.runList(librariesUri);
}
- void addLibrary(String path) {
- var uri = cwd.resolve(nativeToUriPath(path));
- _compiler.scanner.loadLibrary(uri, null);
- }
-
MirrorSystem get mirrors => new Dart2JsMirrorSystem(_compiler);
Future<String> compileToJavaScript() =>
@@ -518,12 +513,16 @@ class Dart2JsLibraryMirror extends Dart2JsObjectMirror
if (e.isClass()) {
e.ensureResolved(system.compiler);
var type = new Dart2JsInterfaceMirror.fromLibrary(this, e);
- assert(!_types.containsKey(type.simpleName));
+ assert(invariant(_library, !_types.containsKey(type.simpleName),
+ message: "Type name '${type.simpleName}' "
+ "is not unique in $_library."));
_types[type.simpleName] = type;
} else if (e.isTypedef()) {
var type = new Dart2JsTypedefMirror.fromLibrary(this,
e.computeType(system.compiler));
- assert(!_types.containsKey(type.simpleName));
+ assert(invariant(_library, !_types.containsKey(type.simpleName),
+ message: "Type name '${type.simpleName}' "
+ "is not unique in $_library."));
_types[type.simpleName] = type;
}
}

Powered by Google App Engine
This is Rietveld 408576698