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

Unified Diff: runtime/vm/parser.cc

Issue 10982012: Address Siva's comments (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 8 years, 3 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 | « runtime/vm/object.cc ('k') | runtime/vm/symbols.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/parser.cc
===================================================================
--- runtime/vm/parser.cc (revision 12809)
+++ runtime/vm/parser.cc (working copy)
@@ -8197,12 +8197,20 @@
if (first_lib_url.IsNull()) {
first_lib_url = lib.url();
} else {
- ErrorMsg(ident_pos,
- "ambiguous reference: '%s.%s' is defined in '%s' and '%s'",
- String::Handle(prefix.name()).ToCString(),
- name.ToCString(),
- first_lib_url.ToCString(),
- String::Handle(lib.url()).ToCString());
+ // Found duplicate definition.
+ if (first_lib_url.raw() == lib.url()) {
+ ErrorMsg(ident_pos,
+ "ambiguous reference: '%s.%s' is imported multiple times",
+ String::Handle(prefix.name()).ToCString(),
+ name.ToCString());
+ } else {
+ ErrorMsg(ident_pos,
+ "ambiguous reference: '%s.%s' is defined in '%s' and '%s'",
+ String::Handle(prefix.name()).ToCString(),
+ name.ToCString(),
+ first_lib_url.ToCString(),
+ String::Handle(lib.url()).ToCString());
+ }
}
}
}
« no previous file with comments | « runtime/vm/object.cc ('k') | runtime/vm/symbols.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698