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

Unified Diff: dart/frog/leg/resolver.dart

Issue 9808006: Resolve initializers in their proper scope. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge
Patch Set: Address review comments Created 8 years, 9 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/leg/compile_time_constants.dart ('k') | dart/frog/leg/tree/nodes.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: dart/frog/leg/resolver.dart
diff --git a/dart/frog/leg/resolver.dart b/dart/frog/leg/resolver.dart
index 245f6b28c97fa37df4affe246e36c2dde476dfeb..e9e99b64c4ca4e6ccc544cf3efbc5b1f36fde001 100644
--- a/dart/frog/leg/resolver.dart
+++ b/dart/frog/leg/resolver.dart
@@ -48,9 +48,11 @@ class ResolverTask extends CompilerTask {
return resolveMethodElement(element);
case ElementKind.FIELD:
+ return resolveField(element);
+
case ElementKind.PARAMETER:
case ElementKind.FIELD_PARAMETER:
- return resolveVariableElement(element);
+ return resolveParameter(element);
default:
compiler.unimplemented(
@@ -186,13 +188,18 @@ class ResolverTask extends CompilerTask {
}
}
- TreeElements resolveVariableElement(Element element) {
+ TreeElements resolveField(Element element) {
Node tree = element.parseNode(compiler);
ResolverVisitor visitor = new ResolverVisitor(compiler, element);
- if (tree is SendSet) {
- SendSet send = tree;
- visitor.visit(send.arguments.head);
- }
+ initializerDo(tree, visitor.visit);
+ return visitor.mapping;
+ }
+
+ TreeElements resolveParameter(Element element) {
+ Node tree = element.parseNode(compiler);
+ ResolverVisitor visitor =
+ new ResolverVisitor(compiler, element.enclosingElement);
+ initializerDo(tree, visitor.visit);
return visitor.mapping;
}
@@ -651,6 +658,7 @@ class ResolverVisitor extends CommonResolverVisitor<Element> {
}
VariableDefinitions variableDefinitions = parameterNodes.head;
Node parameterNode = variableDefinitions.definitions.nodes.head;
+ initializerDo(parameterNode, (n) => n.accept(this));
// Field parameters (this.x) are not visible inside the constructor. The
// fields they reference are visible, but must be resolved independently.
if (element.kind == ElementKind.FIELD_PARAMETER) {
« no previous file with comments | « dart/frog/leg/compile_time_constants.dart ('k') | dart/frog/leg/tree/nodes.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698