| Index: compiler/java/com/google/dart/compiler/resolver/Elements.java
|
| diff --git a/compiler/java/com/google/dart/compiler/resolver/Elements.java b/compiler/java/com/google/dart/compiler/resolver/Elements.java
|
| index 68be0355b2b7379685130d46553d345b52df76ea..06bed1cdb1d03ad247359e28badb7ca643a4a608 100644
|
| --- a/compiler/java/com/google/dart/compiler/resolver/Elements.java
|
| +++ b/compiler/java/com/google/dart/compiler/resolver/Elements.java
|
| @@ -233,7 +233,7 @@ static FieldElementImplementation fieldFromNode(DartField node,
|
| if (parentNode instanceof DartFunction
|
| && parentNode.getParent() instanceof DartMethodDefinition) {
|
| DartMethodDefinition parentMethod = (DartMethodDefinition) parentNode.getParent();
|
| - if (parentMethod.getSymbol().isConstructor()) {
|
| + if (parentMethod.getElement().isConstructor()) {
|
| return true;
|
| }
|
| }
|
| @@ -251,7 +251,7 @@ static FieldElementImplementation fieldFromNode(DartField node,
|
| if (parentNode instanceof DartFunction
|
| && parentNode.getParent() instanceof DartMethodDefinition) {
|
| DartMethodDefinition parentMethod = (DartMethodDefinition) parentNode.getParent();
|
| - if (parentMethod.getSymbol().getName().equals(element.getName())) {
|
| + if (parentMethod.getElement().getName().equals(element.getName())) {
|
| return true;
|
| }
|
| }
|
| @@ -380,7 +380,7 @@ static FieldElementImplementation fieldFromNode(DartField node,
|
| TypeVariable typeVariable =
|
| Elements.typeVariableFromNode(parameterNode, element).getTypeVariable();
|
| typeVariables[i++] = typeVariable;
|
| - parameterNode.getName().setSymbol(typeVariable.getElement());
|
| + parameterNode.getName().setElement(typeVariable.getElement());
|
| }
|
| return Arrays.asList(typeVariables);
|
| }
|
| @@ -429,7 +429,7 @@ static FieldElementImplementation fieldFromNode(DartField node,
|
|
|
| private static String getRawName(DartNode name) {
|
| if (name instanceof DartIdentifier) {
|
| - return ((DartIdentifier) name).getTargetName();
|
| + return ((DartIdentifier) name).getName();
|
| } else if (name instanceof DartParameterizedTypeNode) {
|
| return getRawName(((DartParameterizedTypeNode) name).getExpression());
|
| } else {
|
| @@ -565,7 +565,7 @@ static FieldElementImplementation fieldFromNode(DartField node,
|
| node = node.getParent();
|
| while (node != null) {
|
| if (node instanceof DartClass) {
|
| - return ((DartClass) node).getSymbol();
|
| + return ((DartClass) node).getElement();
|
| }
|
| node = node.getParent();
|
| }
|
| @@ -623,7 +623,7 @@ static FieldElementImplementation fieldFromNode(DartField node,
|
| */
|
| private static String getIdentifierName(DartNode identifier) {
|
| if (identifier != null && identifier instanceof DartIdentifier) {
|
| - return ((DartIdentifier) identifier).getTargetName();
|
| + return ((DartIdentifier) identifier).getName();
|
| }
|
| return null;
|
| }
|
|
|