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

Unified Diff: frog/member.dart

Issue 10354005: Fix for Issue 2878 (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 | « frog/gen.dart ('k') | frog/member_set.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: frog/member.dart
diff --git a/frog/member.dart b/frog/member.dart
index 1f6e556aec220b23a8c6e18b8af92d8d8e5be180..dd768b030d8968508c242d760a968c10d7bba26a 100644
--- a/frog/member.dart
+++ b/frog/member.dart
@@ -87,6 +87,12 @@ class Member extends Element {
Member genericMember;
+ // A root string for getter and setter names. This is used e.g. to ensure
+ // that fields with the same Dart name but different jsnames (due to native
+ // name directives) still have a common getter name. Is null when there is no
+ // renaming.
+ String _jsnameRoot;
+
Member(String name, Type declaringType)
: this.declaringType = declaringType,
super(name, declaringType);
@@ -140,6 +146,10 @@ class Member extends Element {
void provideGetter() {}
void provideSetter() {}
+ String get jsnameOfGetter() => 'get\$$jsnameRoot';
+ String get jsnameOfSetter() => 'set\$$jsnameRoot';
+ String get jsnameRoot() => _jsnameRoot != null ? _jsnameRoot : _jsname;
+
Member get initDelegate() {
world.internalError('cannot have initializers', span);
}
@@ -880,7 +890,7 @@ class MethodMember extends Member {
return new Value(functionType, '$type$jsname', node.span);
}
_provideGetter = true;
- return new Value(functionType, '${target.code}.get\$$jsname()', node.span);
+ return new Value(functionType, '${target.code}.$jsnameOfGetter()', node.span);
}
/**
« no previous file with comments | « frog/gen.dart ('k') | frog/member_set.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698