Commit 65fcaf3

johnniwintherCommit Queue

authored and

Commit Queue

committed

[cfe] Remove inConstructorName

This removes the inConstructorName property from the outline builder. This relies on the inConstructor property which cannot be accurately computed. This prepares for removal of the inConstructor property. Change-Id: Ibc31f4c590717165fb5d86478ba1949cfed100c8 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/461020 Reviewed-by: Jens Johansen <jensj@google.com> Commit-Queue: Johnni Winther <johnniwinther@google.com> Reviewed-by: Erik Ernst <eernst@google.com>

1 parent f02fd0c commit 65fcaf3Copy full SHA for 65fcaf3

File tree

13 files changed

+372

-295

lines changed

pkg
- _fe_analyzer_shared/lib/src/parser
  - stack_listener.dart
- front_end
  - lib/src/source
    - outline_builder.dart
    - value_kinds.dart
  - testcases
    - general
    - triple_shift
tests/language/operator
- invalid_operators_test.dart
- operator_triple_shift_error_test.dart

13 files changed

+372

-295

lines changed

`‎pkg/_fe_analyzer_shared/lib/src/parser/stack_listener.dart‎`

Lines changed: 24 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -181,7 +181,7 @@ abstract class StackListener extends Listener with StackChecker {`
`181`	`181`	`if (tokenOrNull == null) stack.push(nullValue);`
`182`	`182`	`}`
`183`	`183`
`184`		`- Object? peek() => stack.isNotEmpty ? stack.last :null;`
	`184`	`+ Object? peek([NullValue? nullValue]) => stack.peek(nullValue);`
`185`	`185`
`186`	`186`	`Object? pop([NullValue? nullValue]) {`
`187`	`187`	`return stack.pop(nullValue);`
`@@ -488,6 +488,8 @@ abstract class Stack {`
`488`	`488`
`489`	`489`	`List<Object?> get values;`
`490`	`490`
	`491`	`+ Object? peek(NullValue? nullValue);`
	`492`	`+`
`491`	`493`	`Object? pop(NullValue? nullValue);`
`492`	`494`
`493`	`495`	`int get length;`
`@@ -528,6 +530,22 @@ class StackImpl implements Stack {`
`528`	`530`	`}`
`529`	`531`	`}`
`530`	`532`
	`533`	`+ @override`
	`534`	`+ Object? peek(NullValue? nullValue) {`
	`535`	`+ if (isNotEmpty) {`
	`536`	`+ Object? value = last;`
	`537`	`+ if (value is! NullValue) {`
	`538`	`+ return value;`
	`539`	`+ } else if (nullValue == null \|\| value == nullValue) {`
	`540`	`+ return null;`
	`541`	`+ } else {`
	`542`	`+ return value;`
	`543`	`+ }`
	`544`	`+ } else {`
	`545`	`+ return null;`
	`546`	`+ }`
	`547`	`+ }`
	`548`	`+`
`531`	`549`	`@override`
`532`	`550`	`Object? pop(NullValue? nullValue) {`
`533`	`551`	`assert(arrayLength > 0);`
`@@ -638,6 +656,11 @@ class DebugStack implements Stack {`
`638`	`656`	`@override`
`639`	`657`	`int get length => realStack.length;`
`640`	`658`
	`659`	`+ @override`
	`660`	`+ Object? peek(NullValue? nullValue) {`
	`661`	`+ return realStack.peek(nullValue);`
	`662`	`+ }`
	`663`	`+`
`641`	`664`	`@override`
`642`	`665`	`Object? pop(NullValue? nullValue) {`
`643`	`666`	`Object? result = realStack.pop(nullValue);`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 65fcaf3

File tree

13 files changed

13 files changed

`‎pkg/_fe_analyzer_shared/lib/src/parser/stack_listener.dart‎`

0 commit comments