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

Unified Diff: dart/frog/world.dart

Issue 9361030: Fix for http://code.google.com/p/dart/issues/detail?id=1363: use the simplename for the key, not ... (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/
Patch Set: '' Created 8 years, 10 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 | « dart/frog/type.dart ('k') | dart/tests/language/language-leg.status » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: dart/frog/world.dart
===================================================================
--- dart/frog/world.dart (revision 4024)
+++ dart/frog/world.dart (working copy)
@@ -278,18 +278,20 @@
// New one takes priority over existing
_renameJavascriptTopName(existing);
} else {
- final msg = 'conflicting JS name "$name" of same '
- + 'priority $existingPri: (already defined in) '
- + '${existing.span.locationText} with priority $namedPri)';
if (named.isNative) {
+ final msg = 'conflicting JS name "$name" of same '
+ + 'priority $existingPri: (already defined in) '
+ + '${existing.span.locationText} with priority $namedPri)';
// We trust that conflicting native names in builtin libraries are
// harmless. Most cases there are no conflicts, currently isolates
// in coreimpl and dart:dom both define web workers to avoid adding a
// dependency from corelib to dart:dom.
world.info(msg, named.span, existing.span);
} else {
- // Conflicting name in corelib needs to be fixed.
- world.internalError(msg, named.span, existing.span);
+ // Conflicting js name in same library. This happens because
+ // of two different type arguments with the same name but in
+ // different libraries.
+ _renameJavascriptTopName(existing);
}
}
}
« no previous file with comments | « dart/frog/type.dart ('k') | dart/tests/language/language-leg.status » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698