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

Unified Diff: dart/sdk/lib/_internal/compiler/implementation/library_loader.dart

Issue 494623002: Implement diff algorithm for libraries. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge
Patch Set: Merged with r39546. Created 6 years, 4 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: dart/sdk/lib/_internal/compiler/implementation/library_loader.dart
diff --git a/dart/sdk/lib/_internal/compiler/implementation/library_loader.dart b/dart/sdk/lib/_internal/compiler/implementation/library_loader.dart
index b7ceefc04d95bfbfb9dd6f05e61bcd0f775b39f8..b2ff25cedc15fe5416b35fe7ed61077d5af29532 100644
--- a/dart/sdk/lib/_internal/compiler/implementation/library_loader.dart
+++ b/dart/sdk/lib/_internal/compiler/implementation/library_loader.dart
@@ -498,23 +498,34 @@ class _LibraryLoaderTask extends CompilerTask implements LibraryLoaderTask {
return new Future.value(library);
}
return compiler.withCurrentElement(importingLibrary, () {
- return compiler.readScript(node, readableUri)
- .then((Script script) {
- if (script == null) return null;
- LibraryElement element = new LibraryElementX(script, resolvedUri);
- compiler.withCurrentElement(element, () {
- handler.registerNewLibrary(element);
- native.maybeEnableNative(compiler, element);
- libraryCanonicalUriMap[resolvedUri] = element;
- compiler.scanner.scanLibrary(element);
- });
+ return compiler.readScript(node, readableUri).then((Script script) {
+ if (script == null) return null;
+ LibraryElement element =
+ createLibrarySync(handler, script, resolvedUri);
return processLibraryTags(handler, element).then((_) {
Johnni Winther 2014/08/26 12:31:03 This should be de-indented.
ahe 2014/08/26 13:01:33 Done.
compiler.withCurrentElement(element, () {
handler.registerLibraryExports(element);
});
return element;
});
- });
+
+ });
+ });
+ }
+
+ LibraryElement createLibrarySync(
+ LibraryDependencyHandler handler,
+ Script script,
+ Uri resolvedUri) {
+ LibraryElement element = new LibraryElementX(script, resolvedUri);
+ return compiler.withCurrentElement(element, () {
+ if (handler != null) {
+ handler.registerNewLibrary(element);
+ libraryCanonicalUriMap[resolvedUri] = element;
+ }
+ native.maybeEnableNative(compiler, element);
+ compiler.scanner.scanLibrary(element);
+ return element;
});
}
}
« no previous file with comments | « no previous file | dart/sdk/lib/_internal/compiler/implementation/scanner/listener.dart » ('j') | dart/tests/try/poi/diff_test.dart » ('J')

Powered by Google App Engine
This is Rietveld 408576698