fasta listener assert enclosing event

fasta listener assert enclosing event

The fasta parser generates begin/end event pairs such as
[beginCompilationUnit] and [endCompilationUnit].
Each event should be generated "within" a "higher level" begin/end event pair,
except for [beginCompilationUnit] and [endCompilationUnit],
which should not be generated within any begin/end event pair.

This CL updates the fasta test listener and associated test code to assert that
[endTopLevelDeclaration] is generated within or is enclosed by
a begin/end "CompilationUnit" event pair, and that the [beginCompilationUnit]
and [endCompilationUnit] events are not enclosed by any begin/end event pairs.

R=paulberry@google.com

Committed: https://github.com/dart-lang/sdk/commit/6e4f00a27c2880dcac12c3e4cab1005eede6caed

[danrubel, 2017-08-07 14:57:30]

danrubel@google.com changed reviewers:
+ paulberry@google.com

[Paul Berry, 2017-08-07 15:34:51]

https://codereview.chromium.org/2993833002/diff/20001/pkg/analyzer/test/gener...
File pkg/analyzer/test/generated/parser_fasta_listener.dart (right):

https://codereview.chromium.org/2993833002/diff/20001/pkg/analyzer/test/gener...
pkg/analyzer/test/generated/parser_fasta_listener.dart:32: String
enclosingEvent;
I think there's a simpler way to do this without needing to add a field.  Make
`_begin` and `_end` public.  Then, in tests, instead of setting
`_eventListener.enclosingEvent = enclosingEvent` right before parsing, just call
`_eventListener.begin(enclosingEvent)` before parsing, and
`_eventListener.end(enclosingEvent)` after parsing.

Then the test replicates the stack state that happens in normal execution, so we
don't need any special logic, and _in() just becomes:

void _in(String event) {
  if (_stack.last != event) {
    fail(...);
  }
}

[danrubel, 2017-08-07 16:01:51]

https://codereview.chromium.org/2993833002/diff/20001/pkg/analyzer/test/gener...
File pkg/analyzer/test/generated/parser_fasta_listener.dart (right):

https://codereview.chromium.org/2993833002/diff/20001/pkg/analyzer/test/gener...
pkg/analyzer/test/generated/parser_fasta_listener.dart:32: String
enclosingEvent;
On 2017/08/07 15:34:51, Paul Berry wrote:
> I think there's a simpler way to do this without needing to add a field.  Make
> `_begin` and `_end` public.  Then, in tests, instead of setting
> `_eventListener.enclosingEvent = enclosingEvent` right before parsing, just
call
> `_eventListener.begin(enclosingEvent)` before parsing, and
> `_eventListener.end(enclosingEvent)` after parsing.
> 
> Then the test replicates the stack state that happens in normal execution, so
we
> don't need any special logic, and _in() just becomes:
> 
> void _in(String event) {
>   if (_stack.last != event) {
>     fail(...);
>   }
> }

Good suggestion. Done.

[Paul Berry, 2017-08-07 16:05:07]

lgtm assuming comment is updated

https://codereview.chromium.org/2993833002/diff/40001/pkg/analyzer/test/gener...
File pkg/analyzer/test/generated/parser_fasta_listener.dart (right):

https://codereview.chromium.org/2993833002/diff/40001/pkg/analyzer/test/gener...
pkg/analyzer/test/generated/parser_fasta_listener.dart:22: * construct a new
listener and set the [enclosingEvent] to be the begin/end
This comment needs to be updated to reflect the new approach

[danrubel, 2017-08-07 16:37:11]

https://codereview.chromium.org/2993833002/diff/40001/pkg/analyzer/test/gener...
File pkg/analyzer/test/generated/parser_fasta_listener.dart (right):

https://codereview.chromium.org/2993833002/diff/40001/pkg/analyzer/test/gener...
pkg/analyzer/test/generated/parser_fasta_listener.dart:22: * construct a new
listener and set the [enclosingEvent] to be the begin/end
On 2017/08/07 16:05:06, Paul Berry wrote:
> This comment needs to be updated to reflect the new approach

Done.

[danrubel, 2017-08-07 18:22:23]

Description was changed from

==========
fasta listener assert enclosing event

The fasta parser generates begin/end event pairs such as
[beginCompilationUnit] and [endCompilationUnit].
Each event should be generated "within" a "higher level" begin/end event pair,
except for [beginCompilationUnit] and [endCompilationUnit],
which should not be generated within any begin/end event pair.

This CL updates the fasta test listener and associated test code to assert that
[endTopLevelDeclaration] is generated within or is enclosed by
a begin/end "CompilationUnit" event pair, and that the [beginCompilationUnit]
and [endCompilationUnit] events are not enclosed by any begin/end event pairs.
==========

to

==========
fasta listener assert enclosing event

The fasta parser generates begin/end event pairs such as
[beginCompilationUnit] and [endCompilationUnit].
Each event should be generated "within" a "higher level" begin/end event pair,
except for [beginCompilationUnit] and [endCompilationUnit],
which should not be generated within any begin/end event pair.

This CL updates the fasta test listener and associated test code to assert that
[endTopLevelDeclaration] is generated within or is enclosed by
a begin/end "CompilationUnit" event pair, and that the [beginCompilationUnit]
and [endCompilationUnit] events are not enclosed by any begin/end event pairs.

R=paulberry@google.com

Committed:
https://github.com/dart-lang/sdk/commit/6e4f00a27c2880dcac12c3e4cab1005eede6caed
==========

[danrubel, 2017-08-07 18:22:25]

Committed patchset #4 (id:60001) manually as
6e4f00a27c2880dcac12c3e4cab1005eede6caed (presubmit successful).