| Index: pkg/compiler/lib/src/parser/element_listener.dart
|
| diff --git a/pkg/compiler/lib/src/parser/element_listener.dart b/pkg/compiler/lib/src/parser/element_listener.dart
|
| index 95af9a4bcd3f74726fb1ca5e49a9f7a7e4985a5b..4b9799926a681b8fb70932ab52a50e033ad1e06c 100644
|
| --- a/pkg/compiler/lib/src/parser/element_listener.dart
|
| +++ b/pkg/compiler/lib/src/parser/element_listener.dart
|
| @@ -63,7 +63,7 @@ typedef int IdGenerator();
|
| */
|
| class ElementListener extends Listener {
|
| final IdGenerator idGenerator;
|
| - final DiagnosticListener listener;
|
| + final DiagnosticReporter reporter;
|
| final CompilationUnitElementX compilationUnitElement;
|
| final StringValidator stringValidator;
|
| Link<StringQuoting> interpolationScope;
|
| @@ -85,11 +85,11 @@ class ElementListener extends Listener {
|
| bool suppressParseErrors = false;
|
|
|
| ElementListener(
|
| - DiagnosticListener listener,
|
| + DiagnosticReporter reporter,
|
| this.compilationUnitElement,
|
| this.idGenerator)
|
| - : this.listener = listener,
|
| - stringValidator = new StringValidator(listener),
|
| + : this.reporter = reporter,
|
| + stringValidator = new StringValidator(reporter),
|
| interpolationScope = const Link<StringQuoting>();
|
|
|
| bool get currentMemberHasParseError {
|
| @@ -110,7 +110,7 @@ class ElementListener extends Listener {
|
| StringNode node = popNode();
|
| // TODO(lrn): Handle interpolations in script tags.
|
| if (node.isInterpolation) {
|
| - listener.internalError(node,
|
| + reporter.internalError(node,
|
| "String interpolation not supported in library tags.");
|
| return null;
|
| }
|
| @@ -201,7 +201,7 @@ class ElementListener extends Listener {
|
| }
|
|
|
| void addPartOfTag(PartOf tag) {
|
| - compilationUnitElement.setPartOf(tag, listener);
|
| + compilationUnitElement.setPartOf(tag, reporter);
|
| }
|
|
|
| void endMetadata(Token beginToken, Token periodBeforeName, Token endToken) {
|
| @@ -594,7 +594,7 @@ class ElementListener extends Listener {
|
|
|
| void pushElement(Element element) {
|
| popMetadata(element);
|
| - compilationUnitElement.addMember(element, listener);
|
| + compilationUnitElement.addMember(element, reporter);
|
| }
|
|
|
| List<MetadataAnnotation> popMetadata(ElementX element) {
|
| @@ -614,7 +614,7 @@ class ElementListener extends Listener {
|
| }
|
| LibraryElementX implementationLibrary =
|
| compilationUnitElement.implementationLibrary;
|
| - implementationLibrary.addTag(tag, listener);
|
| + implementationLibrary.addTag(tag, reporter);
|
| }
|
|
|
| void pushNode(Node node) {
|
| @@ -748,6 +748,6 @@ class ElementListener extends Listener {
|
| if (!memberErrors.isEmpty) {
|
| memberErrors = memberErrors.tail.prepend(true);
|
| }
|
| - listener.reportErrorMessage(spannable, errorCode, arguments);
|
| + reporter.reportErrorMessage(spannable, errorCode, arguments);
|
| }
|
| }
|
|
|