| 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 27b135e16e4f84b722adedcccc94363f326c7589..9852c12668f16c7b9e53bc0ad5e42a994be3dd5a 100644
|
| --- a/compiler/java/com/google/dart/compiler/resolver/MemberBuilder.java
|
| +++ b/compiler/java/com/google/dart/compiler/resolver/MemberBuilder.java
|
| @@ -89,7 +89,7 @@ public class MemberBuilder {
|
| boolean isFactoryContext() {
|
| return isFactory;
|
| }
|
| -
|
| +
|
| @Override
|
| protected EnclosingElement getEnclosingElement() {
|
| return enclosingElement;
|
| @@ -219,7 +219,7 @@ public class MemberBuilder {
|
| }
|
| return null;
|
| }
|
| -
|
| +
|
| @Override
|
| protected void resolveFunctionWithParameters(DartFunction node, MethodElement element) {
|
| super.resolveFunctionWithParameters(node, element);
|
| @@ -579,7 +579,7 @@ public class MemberBuilder {
|
| if (modifiers.isConstant()) {
|
| // Allow const factory ... native ... ; type of constructors, used in core libraries
|
| DartBlock dartBlock = method.getFunction().getBody();
|
| - if (dartBlock == null || !(dartBlock instanceof DartNativeBlock)) {
|
| + if (dartBlock == null || !(dartBlock instanceof DartNativeBlock)) {
|
| resolutionError(method.getName(), ResolverErrorCode.FACTORY_CANNOT_BE_CONST);
|
| }
|
| }
|
| @@ -591,7 +591,8 @@ public class MemberBuilder {
|
| private void checkConstructor(MethodElement element, DartMethodDefinition method) {
|
| if (Elements.isNonFactoryConstructor(element) && method.getFunction() != null
|
| && method.getFunction().getReturnTypeNode() != null) {
|
| - resolutionError(method, ResolverErrorCode.CONSTRUCTOR_CANNOT_HAVE_RETURN_TYPE);
|
| + resolutionError(method.getFunction().getReturnTypeNode(),
|
| + ResolverErrorCode.CONSTRUCTOR_CANNOT_HAVE_RETURN_TYPE);
|
| }
|
| }
|
|
|
|
|