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

Unified Diff: compiler/java/com/google/dart/compiler/resolver/MemberBuilder.java

Issue 9695025: Fixes for previous CL review comments (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: 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
Index: compiler/java/com/google/dart/compiler/resolver/MemberBuilder.java
diff --git a/compiler/java/com/google/dart/compiler/resolver/MemberBuilder.java b/compiler/java/com/google/dart/compiler/resolver/MemberBuilder.java
index 44c96c67e9489550c420df7754ca5c284bce8916..200552eddf771393e1a18b50428c460f0e74ad9e 100644
--- a/compiler/java/com/google/dart/compiler/resolver/MemberBuilder.java
+++ b/compiler/java/com/google/dart/compiler/resolver/MemberBuilder.java
@@ -59,7 +59,7 @@ public class MemberBuilder {
*/
private class MemberElementBuilder extends ResolveVisitor {
EnclosingElement currentHolder;
- private Element enclosingElement;
+ private EnclosingElement enclosingElement;
private ResolutionContext context;
private boolean isStatic;
private boolean isFactory;
@@ -86,7 +86,7 @@ public class MemberBuilder {
}
@Override
- protected Element getEnclosingElement() {
+ protected EnclosingElement getEnclosingElement() {
return enclosingElement;
}
@@ -94,7 +94,7 @@ public class MemberBuilder {
public Element visitClass(DartClass node) {
assert !ElementKind.of(currentHolder).equals(ElementKind.CLASS) : "nested class?";
beginClassContext(node);
- Element previousEnclosingElement = enclosingElement;
+ EnclosingElement previousEnclosingElement = enclosingElement;
enclosingElement = node.getElement();
this.visit(node.getMembers());
enclosingElement = previousEnclosingElement;
@@ -154,7 +154,7 @@ public class MemberBuilder {
recordElement(method, element);
ResolutionContext previous = context;
context = context.extend(element.getName());
- Element previousEnclosingElement = enclosingElement;
+ EnclosingElement previousEnclosingElement = enclosingElement;
enclosingElement = element;
resolveFunction(method.getFunction(), element);
enclosingElement = previousEnclosingElement;
@@ -325,7 +325,7 @@ public class MemberBuilder {
boolean topLevelDefinition = fieldNode.getParent().getParent() instanceof DartUnit;
DartMethodDefinition accessorNode = fieldNode.getAccessor();
MethodElement accessorElement = Elements.methodFromMethodNode(accessorNode, currentHolder);
- Element previousEnclosingElement = enclosingElement;
+ EnclosingElement previousEnclosingElement = enclosingElement;
enclosingElement = accessorElement;
recordElement(accessorNode, accessorElement);
resolveFunction(accessorNode.getFunction(), accessorElement);
@@ -556,7 +556,7 @@ public class MemberBuilder {
element instanceof MethodElement
? Elements.getRawMethodName((MethodElement) element)
: element.getName();
- resolutionError(Elements.getNameLocation(element), errorCode, name);
+ resolutionError(element.getNameLocation(), errorCode, name);
}
}
}

Powered by Google App Engine
This is Rietveld 408576698