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

Unified Diff: lib/compiler/implementation/compiler.dart

Issue 10273026: Revert "Move all the builtin$ interceptors to a new interceptors library and shorten the names of t… (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 8 years, 8 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
« no previous file with comments | « no previous file | lib/compiler/implementation/elements/elements.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: lib/compiler/implementation/compiler.dart
diff --git a/lib/compiler/implementation/compiler.dart b/lib/compiler/implementation/compiler.dart
index 476b5e42b065b62d84e88a98db306d42a9ad653e..e8c55bafab093c6c84321e88cb77228c4a5997be 100644
--- a/lib/compiler/implementation/compiler.dart
+++ b/lib/compiler/implementation/compiler.dart
@@ -45,9 +45,7 @@ class Compiler implements DiagnosticListener {
LibraryElement coreImplLibrary;
LibraryElement isolateLibrary;
LibraryElement jsHelperLibrary;
- LibraryElement interceptorsLibrary;
LibraryElement mainApp;
-
ClassElement objectClass;
ClassElement closureClass;
ClassElement dynamicClass;
@@ -243,20 +241,17 @@ class Compiler implements DiagnosticListener {
void scanBuiltinLibraries() {
coreImplLibrary = scanBuiltinLibrary('coreimpl');
jsHelperLibrary = scanBuiltinLibrary('_js_helper');
- interceptorsLibrary = scanBuiltinLibrary('_interceptors');
coreLibrary = scanBuiltinLibrary('core');
- // Since coreLibrary import the libraries "coreimpl", "js_helper",
- // and "interceptors", coreLibrary is null when they are being
- // built. So we add the implicit import of coreLibrary now. This
- // can be cleaned up when we have proper support for "dart:core"
- // and don't need to access it through the field "coreLibrary".
+ // Since coreLibrary import the libraries "coreimpl", and
+ // "js_helper", coreLibrary is null when they are being built. So
+ // we add the implicit import of coreLibrary now. This can be
+ // cleaned up when we have proper support for "dart:core" and
+ // don't need to access it through the field "coreLibrary".
// TODO(ahe): Clean this up as described above.
scanner.importLibrary(coreImplLibrary, coreLibrary, null);
scanner.importLibrary(jsHelperLibrary, coreLibrary, null);
- scanner.importLibrary(interceptorsLibrary, coreLibrary, null);
addForeignFunctions(jsHelperLibrary);
- addForeignFunctions(interceptorsLibrary);
universe.libraries['dart:core'] = coreLibrary;
universe.libraries['dart:coreimpl'] = coreImplLibrary;
@@ -502,10 +497,7 @@ class Compiler implements DiagnosticListener {
unimplemented('Compiler.legDirectory');
}
- Element findHelper(SourceString name)
- => jsHelperLibrary.findLocal(name);
- Element findInterceptor(SourceString name)
- => interceptorsLibrary.findLocal(name);
+ Element findHelper(SourceString name) => jsHelperLibrary.find(name);
bool get isMockCompilation() => false;
}
« no previous file with comments | « no previous file | lib/compiler/implementation/elements/elements.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698