| Index: pkg/analyzer/test/generated/parser_fasta_test.dart
|
| diff --git a/pkg/analyzer/test/generated/parser_fasta_test.dart b/pkg/analyzer/test/generated/parser_fasta_test.dart
|
| index 61508ae31f3c5ab29507acfa8ad3fc4a503a045a..cad63a8743681f6b70ae91b9870042fe97c869ab 100644
|
| --- a/pkg/analyzer/test/generated/parser_fasta_test.dart
|
| +++ b/pkg/analyzer/test/generated/parser_fasta_test.dart
|
| @@ -467,12 +467,14 @@ class FastaParserTestCase extends Object
|
|
|
| @override
|
| CompilationUnitMember parseFullCompilationUnitMember() {
|
| - return _parserProxy._run((parser) => parser.parseTopLevelDeclaration);
|
| + return _parserProxy._run(
|
| + (parser) => parser.parseTopLevelDeclaration, 'CompilationUnit');
|
| }
|
|
|
| @override
|
| Directive parseFullDirective() {
|
| - return _parserProxy._run((parser) => parser.parseTopLevelDeclaration);
|
| + return _parserProxy._run(
|
| + (parser) => parser.parseTopLevelDeclaration, 'CompilationUnit');
|
| }
|
|
|
| @override
|
| @@ -644,7 +646,7 @@ class FastaParserTestCase extends Object
|
| throw new UnimplementedError();
|
| }
|
| createParser(source);
|
| - return _parserProxy._run(getParseFunction);
|
| + return _parserProxy._run(getParseFunction, null);
|
| }
|
| }
|
|
|
| @@ -792,6 +794,8 @@ class ParserProxy implements analyzer.Parser {
|
| */
|
| final GatheringErrorListener _errorListener;
|
|
|
| + final ForwardingTestListener _eventListener;
|
| +
|
| /**
|
| * Creates a [ParserProxy] which is prepared to begin parsing at the given
|
| * Fasta token.
|
| @@ -807,34 +811,38 @@ class ParserProxy implements analyzer.Parser {
|
| var astBuilder =
|
| new AstBuilder(errorReporter, library, member, scope, true);
|
| astBuilder.parseGenericMethodComments = enableGenericMethodComments;
|
| - var fastaParser = new fasta.Parser(new ForwardingTestListener(astBuilder));
|
| + var eventListener = new ForwardingTestListener(astBuilder);
|
| + var fastaParser = new fasta.Parser(eventListener);
|
| astBuilder.parser = fastaParser;
|
| return new ParserProxy._(
|
| - startingToken, fastaParser, astBuilder, errorListener);
|
| + startingToken, fastaParser, astBuilder, errorListener, eventListener);
|
| }
|
|
|
| ParserProxy._(this._currentFastaToken, this._fastaParser, this._astBuilder,
|
| - this._errorListener);
|
| + this._errorListener, this._eventListener);
|
|
|
| noSuchMethod(Invocation invocation) => super.noSuchMethod(invocation);
|
|
|
| @override
|
| ClassMember parseClassMember(String className) {
|
| _astBuilder.className = className;
|
| - var result = _run((parser) => parser.parseMember) as ClassMember;
|
| + var result =
|
| + _run((parser) => parser.parseMember, 'CompilationUnit') as ClassMember;
|
| _astBuilder.className = null;
|
| return result;
|
| }
|
|
|
| @override
|
| CompilationUnit parseCompilationUnit2() {
|
| - return _run((parser) => parser.parseUnit) as CompilationUnit;
|
| + return _run((parser) => parser.parseUnit, null) as CompilationUnit;
|
| }
|
|
|
| /**
|
| * Runs a single parser function, and returns the result as an analyzer AST.
|
| */
|
| - Object _run(ParseFunction getParseFunction(fasta.Parser parser)) {
|
| + Object _run(ParseFunction getParseFunction(fasta.Parser parser),
|
| + String enclosingEvent) {
|
| + _eventListener.enclosingEvent = enclosingEvent;
|
| var parseFunction = getParseFunction(_fastaParser);
|
| _currentFastaToken = parseFunction(_currentFastaToken);
|
| expect(_currentFastaToken.isEof, isTrue);
|
|
|