runtime/vm/parser.cc - Issue 12211045: Allow ambiguous Expect and ExpectException imports.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: runtime/vm/parser.cc

Issue 12211045: Allow ambiguous Expect and ExpectException imports. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart

Patch Set: Created 7 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 | « compiler/java/com/google/dart/compiler/resolver/TopLevelElementBuilder.java ('k') | sdk/lib/_internal/compiler/implementation/elements/modelx.dart » ('j') | sdk/lib/_internal/compiler/implementation/elements/modelx.dart » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: runtime/vm/parser.cc

diff --git a/runtime/vm/parser.cc b/runtime/vm/parser.cc

index 2234924df99584d4c4dc35139ccf605afdecbe6f..d6431cfcfbc6061cf90b8a02487594276acde338 100644

--- a/runtime/vm/parser.cc

+++ b/runtime/vm/parser.cc

@@ -8201,7 +8201,9 @@ RawObject* Parser::ResolveNameInCurrentLibraryScope(intptr_t ident_pos,

imported_obj = LookupNameInImport(import, name);

if (!imported_obj.IsNull()) {

const Library& lib = Library::Handle(import.library());

- if (!first_lib_url.IsNull()) {

+ if (!first_lib_url.IsNull()

regis 2013/02/06 19:40:48 I would add a TODO here to remove this temporary c

floitsch 2013/02/11 17:59:32 Yes. I will add a TODO(issue-number) once I have f

+ && (strcmp(name.ToCString(), "Expect") != 0)

+ && (strcmp(name.ToCString(), "ExpectException") != 0)) {

// Found duplicate definition.

Error& ambiguous_ref_error = Error::Handle();

if (first_lib_url.raw() == lib.url()) {