compiler/java/com/google/dart/compiler/resolver/Resolver.java - Issue 10696006: Issue 3793. Fix for function expressions with a parameter of the same name

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 10696006: Issue 3793. Fix for function expressions with a parameter of the same name (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart

Patch Set: Created 8 years, 6 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/MethodElementImplementation.java ('k') | compiler/javatests/com/google/dart/compiler/resolver/ResolverCompilerTest.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 349f7b7b4437e684d32c9aa7f2ef914314e02b6a..84d698d5b952ccdddac0e5dea93beb4f36e45158 100644

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

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

@@ -781,9 +781,19 @@ public class Resolver {

}

MethodElement previousFunction = innermostFunction;

innermostFunction = element;

- DartFunction functionNode = x.getFunction();

- resolveFunction(functionNode, element);

- resolve(functionNode.getBody());

+ {

+ DartFunction functionNode = x.getFunction();

+ EnclosingElement previousEnclosingElement = enclosingElement;

+ enclosingElement = element;

+ getContext().pushFunctionScope(x);

+ try {

+ resolveFunction(functionNode, element);

+ resolve(functionNode.getBody());

+ } finally {

+ getContext().popScope();

+ enclosingElement = previousEnclosingElement;

+ }

innermostFunction = previousFunction;

getContext().popScope();

if (x.getName() != null) {