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

Unified Diff: pkg/dart2js_incremental/lib/library_updater.dart

Issue 779593002: Move elementAccess() from namer to emitter. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 6 years 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/dart2js_incremental/lib/library_updater.dart
diff --git a/pkg/dart2js_incremental/lib/library_updater.dart b/pkg/dart2js_incremental/lib/library_updater.dart
index aef7a06e88aa52f45b2b69d08653ab1e79b7546b..435491abe1510e1894603e150d3db65cc58fec67 100644
--- a/pkg/dart2js_incremental/lib/library_updater.dart
+++ b/pkg/dart2js_incremental/lib/library_updater.dart
@@ -576,7 +576,7 @@ class LibraryUpdater extends JsFeatures {
List<jsAst.Statement> inherits = <jsAst.Statement>[];
for (ClassElementX cls in newClasses) {
- jsAst.Node classAccess = namer.elementAccess(cls);
+ jsAst.Node classAccess = emitter.globalPropertyAccess(cls);
floitsch 2014/12/03 17:02:26 classAccess
zarah 2014/12/05 08:22:52 Done.
String name = namer.getNameOfClass(cls);
updates.add(
@@ -585,7 +585,7 @@ class LibraryUpdater extends JsFeatures {
ClassElement superclass = cls.superclass;
if (superclass != null) {
- jsAst.Node superAccess = namer.elementAccess(superclass);
+ jsAst.Node superAccess = emitter.globalPropertyAccess(superclass);
floitsch 2014/12/03 17:02:27 classAccess
zarah 2014/12/05 08:22:52 Done.
inherits.add(
js.statement(
r'self.$dart_unsafe_eval.inheritFrom(#, #)',
@@ -601,8 +601,9 @@ class LibraryUpdater extends JsFeatures {
for (ClassElementX cls in changedClasses) {
ClassElement superclass = cls.superclass;
jsAst.Node superAccess =
- superclass == null ? js('null') : namer.elementAccess(superclass);
- jsAst.Node classAccess = namer.elementAccess(cls);
+ superclass == null ? js('null')
+ : emitter.globalPropertyAccess(superclass);
floitsch 2014/12/03 17:02:27 classAccess
zarah 2014/12/05 08:22:52 Done.
+ jsAst.Node classAccess = emitter.globalPropertyAccess(cls);
floitsch 2014/12/03 17:02:27 classAccess
zarah 2014/12/05 08:22:52 Done.
updates.add(
js.statement(
r'# = self.$dart_unsafe_eval.schemaChange(#, #, #)',
@@ -657,7 +658,8 @@ class LibraryUpdater extends JsFeatures {
jsAst.Node holder;
if (element.isInstanceMember) {
- holder = js('#.prototype', namer.elementAccess(element.enclosingClass));
+ holder = js('#.prototype',
+ emitter.globalPropertyAccess(element.enclosingClass));
floitsch 2014/12/03 17:02:27 classAccess, jsConstructorAccess, or prototypeAcce
zarah 2014/12/05 08:22:52 Done.
} else {
holder = js('#', namer.globalObjectFor(element));
}
@@ -806,10 +808,10 @@ class RemovedFunctionUpdate extends RemovalUpdate
wasStateCaptured = true;
if (element.isInstanceMember) {
- elementAccess = namer.elementAccess(element.enclosingClass);
+ elementAccess = emitter.globalPropertyAccess(element.enclosingClass);
floitsch 2014/12/03 17:02:26 classAccess
zarah 2014/12/05 08:22:52 Done.
name = namer.getNameOfMember(element);
} else {
- elementAccess = namer.elementAccess(element);
+ elementAccess = emitter.globalPropertyAccess(element);
floitsch 2014/12/03 17:02:26 I believe staticFunctionAccess
zarah 2014/12/05 08:22:52 Done.
}
}
@@ -855,11 +857,11 @@ class RemovedClassUpdate extends RemovalUpdate with JsFeatures {
if (wasStateCaptured) throw "captureState was called twice.";
wasStateCaptured = true;
- accessToStatics.add(namer.elementAccess(element));
+ accessToStatics.add(emitter.globalPropertyAccess(element));
floitsch 2014/12/03 17:02:26 not sure. probably classAccess
zarah 2014/12/05 08:22:52 Done.
element.forEachLocalMember((ElementX member) {
if (!member.isInstanceMember) {
- accessToStatics.add(namer.elementAccess(member));
+ accessToStatics.add(emitter.globalPropertyAccess(member));
floitsch 2014/12/03 17:02:26 staticFunctionAccess
zarah 2014/12/05 08:22:52 Done.
}
});
}
@@ -916,7 +918,7 @@ class RemovedFieldUpdate extends RemovalUpdate with JsFeatures {
if (wasStateCaptured) throw "captureState was called twice.";
wasStateCaptured = true;
- elementAccess = namer.elementAccess(element.enclosingClass);
+ elementAccess = emitter.globalPropertyAccess(element.enclosingClass);
floitsch 2014/12/03 17:02:27 classAccess
zarah 2014/12/05 08:22:52 Done.
getterName = namer.getterName(element);
setterName = namer.setterName(element);
}
« pkg/compiler/lib/src/ssa/codegen.dart ('K') | « pkg/compiler/lib/src/ssa/codegen.dart ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698