Skip to content

Commit ac04a4e

Browse files
kallentuCommit Queue
authored and
Commit Queue
committed
[analyzer] Remove generated constant evaluator and its tests.
The generated constant evaluator is not being used and is removed by this CL. All imports of the deleted evaluator will import the more direct dependency and tests are moved to `evaluation_test.dart`. Change-Id: Ie435d289bd85256419f67407b36af0375661f335 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/324342 Reviewed-by: Konstantin Shcheglov <[email protected]> Commit-Queue: Kallen Tu <[email protected]> Reviewed-by: Brian Wilkerson <[email protected]>
1 parent 1a0472f commit ac04a4e

14 files changed

+1261
-1290
lines changed

pkg/analyzer/lib/src/context/context.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
// for details. All rights reserved. Use of this source code is governed by a
33
// BSD-style license that can be found in the LICENSE file.
44

5+
import 'package:analyzer/dart/analysis/declared_variables.dart';
56
import 'package:analyzer/src/dart/element/type_provider.dart';
67
import 'package:analyzer/src/dart/element/type_system.dart';
7-
import 'package:analyzer/src/generated/constant.dart';
88
import 'package:analyzer/src/generated/engine.dart';
99
import 'package:analyzer/src/generated/source.dart';
1010

pkg/analyzer/lib/src/dart/constant/evaluation.dart

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@
44

55
import 'dart:collection';
66

7+
import 'package:analyzer/dart/analysis/declared_variables.dart';
78
import 'package:analyzer/dart/analysis/features.dart';
89
import 'package:analyzer/dart/ast/syntactic_entity.dart';
910
import 'package:analyzer/dart/ast/token.dart';
1011
import 'package:analyzer/dart/ast/visitor.dart';
12+
import 'package:analyzer/dart/constant/value.dart';
1113
import 'package:analyzer/dart/element/element.dart';
1214
import 'package:analyzer/dart/element/nullability_suffix.dart';
1315
import 'package:analyzer/dart/element/type.dart';
@@ -20,14 +22,15 @@ import 'package:analyzer/src/dart/ast/token.dart';
2022
import 'package:analyzer/src/dart/constant/from_environment_evaluator.dart';
2123
import 'package:analyzer/src/dart/constant/has_type_parameter_reference.dart';
2224
import 'package:analyzer/src/dart/constant/potentially_constant.dart';
25+
import 'package:analyzer/src/dart/constant/utilities.dart';
26+
import 'package:analyzer/src/dart/constant/value.dart';
2327
import 'package:analyzer/src/dart/element/element.dart';
2428
import 'package:analyzer/src/dart/element/member.dart';
2529
import 'package:analyzer/src/dart/element/type.dart';
2630
import 'package:analyzer/src/dart/element/type_algebra.dart';
2731
import 'package:analyzer/src/dart/element/type_system.dart' show TypeSystemImpl;
2832
import 'package:analyzer/src/diagnostic/diagnostic.dart';
2933
import 'package:analyzer/src/error/codes.dart';
30-
import 'package:analyzer/src/generated/constant.dart';
3134
import 'package:analyzer/src/generated/engine.dart';
3235
import 'package:analyzer/src/generated/java_core.dart';
3336
import 'package:analyzer/src/task/api/model.dart';

pkg/analyzer/lib/src/dart/constant/value.dart

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -904,7 +904,7 @@ class DartObjectImpl implements DartObject, Constant {
904904
Map<DartObjectImpl, DartObjectImpl>? toMapValue() {
905905
final state = this.state;
906906
if (state is MapState) {
907-
return state._entries;
907+
return state.entries;
908908
}
909909
return null;
910910
}
@@ -913,7 +913,7 @@ class DartObjectImpl implements DartObject, Constant {
913913
Set<DartObjectImpl>? toSetValue() {
914914
final state = this.state;
915915
if (state is SetState) {
916-
return state._elements;
916+
return state.elements;
917917
}
918918
return null;
919919
}
@@ -2491,16 +2491,16 @@ class ListState extends InstanceState {
24912491
/// The state of an object representing a map.
24922492
class MapState extends InstanceState {
24932493
/// The entries in the map.
2494-
final Map<DartObjectImpl, DartObjectImpl> _entries;
2494+
final Map<DartObjectImpl, DartObjectImpl> entries;
24952495

24962496
/// Initialize a newly created state to represent a map with the given
24972497
/// [entries].
2498-
MapState(this._entries);
2498+
MapState(this.entries);
24992499

25002500
@override
25012501
int get hashCode {
25022502
int value = 0;
2503-
for (DartObjectImpl key in _entries.keys.toSet()) {
2503+
for (DartObjectImpl key in entries.keys.toSet()) {
25042504
value = (value << 3) ^ key.hashCode;
25052505
}
25062506
return value;
@@ -2512,15 +2512,15 @@ class MapState extends InstanceState {
25122512
@override
25132513
bool operator ==(Object other) {
25142514
if (other is MapState) {
2515-
Map<DartObjectImpl, DartObjectImpl> otherElements = other._entries;
2516-
int count = _entries.length;
2515+
Map<DartObjectImpl, DartObjectImpl> otherElements = other.entries;
2516+
int count = entries.length;
25172517
if (otherElements.length != count) {
25182518
return false;
25192519
} else if (count == 0) {
25202520
return true;
25212521
}
2522-
for (DartObjectImpl key in _entries.keys) {
2523-
var value = _entries[key];
2522+
for (DartObjectImpl key in entries.keys) {
2523+
var value = entries[key];
25242524
var otherValue = otherElements[key];
25252525
if (value != otherValue) {
25262526
return false;
@@ -2552,7 +2552,7 @@ class MapState extends InstanceState {
25522552
StringBuffer buffer = StringBuffer();
25532553
buffer.write('{');
25542554
bool first = true;
2555-
_entries.forEach((DartObjectImpl key, DartObjectImpl value) {
2555+
entries.forEach((DartObjectImpl key, DartObjectImpl value) {
25562556
if (first) {
25572557
first = false;
25582558
} else {
@@ -2763,16 +2763,16 @@ class RecordState extends InstanceState {
27632763
/// The state of an object representing a set.
27642764
class SetState extends InstanceState {
27652765
/// The elements of the set.
2766-
final Set<DartObjectImpl> _elements;
2766+
final Set<DartObjectImpl> elements;
27672767

27682768
/// Initialize a newly created state to represent a set with the given
27692769
/// [elements].
2770-
SetState(this._elements);
2770+
SetState(this.elements);
27712771

27722772
@override
27732773
int get hashCode {
27742774
int value = 0;
2775-
for (DartObjectImpl element in _elements) {
2775+
for (DartObjectImpl element in elements) {
27762776
value = (value << 3) ^ element.hashCode;
27772777
}
27782778
return value;
@@ -2784,16 +2784,16 @@ class SetState extends InstanceState {
27842784
@override
27852785
bool operator ==(Object other) {
27862786
if (other is SetState) {
2787-
List<DartObjectImpl> elements = _elements.toList();
2788-
List<DartObjectImpl> otherElements = other._elements.toList();
2789-
int count = elements.length;
2787+
List<DartObjectImpl> currentElements = elements.toList();
2788+
List<DartObjectImpl> otherElements = other.elements.toList();
2789+
int count = currentElements.length;
27902790
if (otherElements.length != count) {
27912791
return false;
27922792
} else if (count == 0) {
27932793
return true;
27942794
}
27952795
for (int i = 0; i < count; i++) {
2796-
if (elements[i] != otherElements[i]) {
2796+
if (currentElements[i] != otherElements[i]) {
27972797
return false;
27982798
}
27992799
}
@@ -2823,7 +2823,7 @@ class SetState extends InstanceState {
28232823
StringBuffer buffer = StringBuffer();
28242824
buffer.write('{');
28252825
bool first = true;
2826-
for (var element in _elements) {
2826+
for (var element in elements) {
28272827
if (first) {
28282828
first = false;
28292829
} else {

pkg/analyzer/lib/src/error/best_practices_verifier.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@
44

55
import 'dart:collection';
66

7+
import 'package:analyzer/dart/analysis/declared_variables.dart';
78
import 'package:analyzer/dart/analysis/features.dart';
89
import 'package:analyzer/dart/ast/syntactic_entity.dart';
910
import 'package:analyzer/dart/ast/token.dart';
1011
import 'package:analyzer/dart/ast/visitor.dart';
12+
import 'package:analyzer/dart/constant/value.dart';
1113
import 'package:analyzer/dart/element/element.dart';
1214
import 'package:analyzer/dart/element/nullability_suffix.dart';
1315
import 'package:analyzer/dart/element/type.dart';
@@ -32,7 +34,6 @@ import 'package:analyzer/src/error/doc_comment_verifier.dart';
3234
import 'package:analyzer/src/error/error_handler_verifier.dart';
3335
import 'package:analyzer/src/error/must_call_super_verifier.dart';
3436
import 'package:analyzer/src/error/null_safe_api_verifier.dart';
35-
import 'package:analyzer/src/generated/constant.dart';
3637
import 'package:analyzer/src/generated/engine.dart';
3738
import 'package:analyzer/src/lint/linter.dart';
3839
import 'package:analyzer/src/workspace/workspace.dart';

pkg/analyzer/lib/src/error/dead_code_verifier.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,13 @@ import 'package:analyzer/dart/element/type.dart';
1111
import 'package:analyzer/error/error.dart';
1212
import 'package:analyzer/error/listener.dart';
1313
import 'package:analyzer/source/source_range.dart';
14+
import 'package:analyzer/src/dart/constant/evaluation.dart';
15+
import 'package:analyzer/src/dart/constant/value.dart';
1416
import 'package:analyzer/src/dart/element/type_system.dart';
1517
import 'package:analyzer/src/dart/resolver/exit_detector.dart';
1618
import 'package:analyzer/src/dart/resolver/flow_analysis_visitor.dart';
1719
import 'package:analyzer/src/dart/resolver/scope.dart';
1820
import 'package:analyzer/src/error/codes.dart';
19-
import 'package:analyzer/src/generated/constant.dart';
2021
import 'package:collection/collection.dart';
2122

2223
typedef _CatchClausesVerifierReporter = void Function(

pkg/analyzer/lib/src/generated/constant.dart

Lines changed: 0 additions & 132 deletions
This file was deleted.

pkg/analyzer/lib/src/generated/engine.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ import 'dart:typed_data';
77
import 'package:_fe_analyzer_shared/src/scanner/string_canonicalizer.dart';
88
import 'package:analyzer/dart/analysis/analysis_options.dart';
99
import 'package:analyzer/dart/analysis/code_style_options.dart';
10+
import 'package:analyzer/dart/analysis/declared_variables.dart';
1011
import 'package:analyzer/dart/analysis/features.dart';
1112
import 'package:analyzer/error/error.dart';
1213
import 'package:analyzer/instrumentation/instrumentation.dart';
1314
import 'package:analyzer/source/error_processor.dart';
1415
import 'package:analyzer/src/analysis_options/code_style_options.dart';
1516
import 'package:analyzer/src/dart/analysis/experiments.dart';
1617
import 'package:analyzer/src/dart/sdk/sdk.dart';
17-
import 'package:analyzer/src/generated/constant.dart';
1818
import 'package:analyzer/src/generated/source.dart';
1919
import 'package:analyzer/src/services/lint.dart';
2020
import 'package:analyzer/src/summary/api_signature.dart';

pkg/analyzer/lib/src/generated/exhaustiveness.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,18 @@ import 'package:_fe_analyzer_shared/src/exhaustiveness/space.dart';
1111
import 'package:_fe_analyzer_shared/src/exhaustiveness/static_type.dart';
1212
import 'package:_fe_analyzer_shared/src/exhaustiveness/types.dart';
1313
import 'package:analyzer/dart/analysis/features.dart';
14+
import 'package:analyzer/dart/constant/value.dart';
1415
import 'package:analyzer/dart/element/element.dart';
1516
import 'package:analyzer/dart/element/nullability_suffix.dart';
1617
import 'package:analyzer/dart/element/type.dart';
1718
import 'package:analyzer/src/dart/ast/ast.dart';
1819
import 'package:analyzer/src/dart/ast/extensions.dart';
20+
import 'package:analyzer/src/dart/constant/value.dart';
1921
import 'package:analyzer/src/dart/element/element.dart';
2022
import 'package:analyzer/src/dart/element/replacement_visitor.dart';
2123
import 'package:analyzer/src/dart/element/type_algebra.dart';
2224
import 'package:analyzer/src/dart/element/type_system.dart';
2325
import 'package:analyzer/src/dart/resolver/variance.dart';
24-
import 'package:analyzer/src/generated/constant.dart';
2526

2627
/// The buffer that accumulates types and elements as is, so that they
2728
/// can be written latter into Dart code that considers imports. It also

pkg/analyzer/test/dart/analysis/from_environment_evaluator_test.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22
// for details. All rights reserved. Use of this source code is governed by a
33
// BSD-style license that can be found in the LICENSE file.
44

5+
import 'package:analyzer/dart/analysis/declared_variables.dart';
56
import 'package:analyzer/dart/element/type_provider.dart';
67
import 'package:analyzer/src/dart/constant/from_environment_evaluator.dart';
8+
import 'package:analyzer/src/dart/constant/value.dart';
79
import 'package:analyzer/src/dart/element/type_system.dart';
8-
import 'package:analyzer/src/generated/constant.dart';
910
import 'package:test/test.dart';
1011
import 'package:test_reflective_loader/test_reflective_loader.dart';
1112

0 commit comments

Comments
 (0)