| Index: sdk/lib/_internal/compiler/implementation/resolution/members.dart
|
| diff --git a/sdk/lib/_internal/compiler/implementation/resolution/members.dart b/sdk/lib/_internal/compiler/implementation/resolution/members.dart
|
| index 832b2cd475a0f64419230ea91275c582b61a41ee..063967ebd6bcc8fd41b961219ec2f555542dca08 100644
|
| --- a/sdk/lib/_internal/compiler/implementation/resolution/members.dart
|
| +++ b/sdk/lib/_internal/compiler/implementation/resolution/members.dart
|
| @@ -283,8 +283,7 @@ class ResolverTask extends CompilerTask {
|
| return null;
|
| }
|
|
|
| - compiler.unimplemented("resolve($element)",
|
| - node: element.parseNode(compiler));
|
| + compiler.unimplemented(element, "resolve($element)");
|
| });
|
| }
|
|
|
| @@ -986,11 +985,11 @@ class ResolverTask extends CompilerTask {
|
| ClassElement classElement = member.getEnclosingClass();
|
| Element lookupElement = classElement.lookupLocalMember(member.name);
|
| if (lookupElement == null) {
|
| - compiler.internalErrorOnElement(member,
|
| - "No abstract field for accessor");
|
| + compiler.internalError(member,
|
| + "No abstract field for accessor");
|
| } else if (!identical(lookupElement.kind, ElementKind.ABSTRACT_FIELD)) {
|
| - compiler.internalErrorOnElement(
|
| - member, "Inaccessible abstract field for accessor");
|
| + compiler.internalError(member,
|
| + "Inaccessible abstract field for accessor");
|
| }
|
| AbstractFieldElement field = lookupElement;
|
|
|
| @@ -1041,7 +1040,7 @@ class ResolverTask extends CompilerTask {
|
| messageKind = MessageKind.TERNARY_OPERATOR_BAD_ARITY;
|
| requiredParameterCount = 2;
|
| } else {
|
| - compiler.internalErrorOnElement(function,
|
| + compiler.internalError(function,
|
| 'Unexpected user defined operator $value');
|
| }
|
| checkArity(function, requiredParameterCount, messageKind, isMinus);
|
| @@ -1533,8 +1532,8 @@ class CommonResolverVisitor<R> extends Visitor<R> {
|
| CommonResolverVisitor(Compiler this.compiler);
|
|
|
| R visitNode(Node node) {
|
| - cancel(node,
|
| - 'internal error: Unhandled node: ${node.getObjectDescription()}');
|
| + internalError(node,
|
| + 'internal error: Unhandled node: ${node.getObjectDescription()}');
|
| return null;
|
| }
|
|
|
| @@ -1551,12 +1550,8 @@ class CommonResolverVisitor<R> extends Visitor<R> {
|
| compiler.reportWarning(node, kind, arguments);
|
| }
|
|
|
| - void cancel(Node node, String message) {
|
| - compiler.cancel(message, node: node);
|
| - }
|
| -
|
| - void internalError(Node node, String message) {
|
| - compiler.internalError(message, node: node);
|
| + void internalError(Spannable node, message) {
|
| + compiler.internalError(node, message);
|
| }
|
|
|
| void addDeferredAction(Element element, DeferredAction action) {
|
| @@ -1839,8 +1834,8 @@ class TypeResolver {
|
| }
|
| type = checkNoTypeArguments(type);
|
| } else {
|
| - compiler.cancel("unexpected element kind ${element.kind}",
|
| - node: node);
|
| + compiler.internalError(node,
|
| + "Unexpected element kind ${element.kind}.");
|
| }
|
| // TODO(johnniwinther): We should not resolve type annotations after the
|
| // resolution queue has been closed. Currently the dart backend does so.
|
| @@ -2265,7 +2260,7 @@ class ResolverVisitor extends MappingVisitor<Element> {
|
| }
|
|
|
| visitClassNode(ClassNode node) {
|
| - cancel(node, "shouldn't be called");
|
| + internalError(node, "shouldn't be called");
|
| }
|
|
|
| visitIn(Node node, Scope nestedScope) {
|
| @@ -2880,7 +2875,7 @@ class ResolverVisitor extends MappingVisitor<Element> {
|
| world.registerStaticUse(compiler.symbolConstructor.declaration);
|
| world.registerConstSymbol(node.slowNameString, mapping);
|
| if (!validateSymbol(node, node.slowNameString, reportError: false)) {
|
| - compiler.reportInternalError(node,
|
| + compiler.reportError(node,
|
| MessageKind.UNSUPPORTED_LITERAL_SYMBOL,
|
| {'value': node.slowNameString});
|
| }
|
| @@ -3990,9 +3985,8 @@ class ClassResolverVisitor extends TypeDefinitionVisitor {
|
| // Avoid making the superclass (usually Object) extend itself.
|
| if (element != superElement) {
|
| if (superElement == null) {
|
| - compiler.internalError(
|
| - "Cannot resolve default superclass for $element",
|
| - node: node);
|
| + compiler.internalError(node,
|
| + "Cannot resolve default superclass for $element.");
|
| } else {
|
| superElement.ensureResolved(compiler);
|
| }
|
|
|