compiler/java/com/google/dart/compiler/resolver/Resolver.java - Issue 10910142: Issue 4988. Fixe for 'assert' statement vs function resolving

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: compiler/java/com/google/dart/compiler/resolver/Resolver.java

Issue 10910142: Issue 4988. Fixe for 'assert' statement vs function resolving (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart

Patch Set: Tweak for artificial 'assert' function name 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 | « compiler/java/com/google/dart/compiler/resolver/Elements.java ('k') | compiler/java/com/google/dart/compiler/resolver/TypeErrorCode.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: compiler/java/com/google/dart/compiler/resolver/Resolver.java

diff --git a/compiler/java/com/google/dart/compiler/resolver/Resolver.java b/compiler/java/com/google/dart/compiler/resolver/Resolver.java

index c5c0a4a33fb177e0a1fbaf96c70f4744cf2a32ba..d11f50f53a34523c3cddf576209641d3db5d0a60 100644

--- a/compiler/java/com/google/dart/compiler/resolver/Resolver.java

+++ b/compiler/java/com/google/dart/compiler/resolver/Resolver.java

@@ -1467,6 +1467,10 @@ public class Resolver {

public Element visitUnqualifiedInvocation(DartUnqualifiedInvocation x) {

Scope scope = getContext().getScope();

Element element = scope.findElement(scope.getLibrary(), x.getTarget().getName());

+ if (element == null && x.getTarget().getName().equals("assert")

+ && x.getArguments().size() == 1) {

+ element = scope.findElement(scope.getLibrary(), Elements.ASSERT_FUNCTION_NAME);

+ }

ElementKind kind = ElementKind.of(element);

if (!INVOKABLE_ELEMENTS.contains(kind)) {

diagnoseErrorInUnqualifiedInvocation(x);