languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-10-06 14:07:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

[cfe] Remove SourceLibraryBuilder.libraryTypeParameterScopeBuilderForTesting

Browse source 
This helps moving `currentTypeParameterScopeBuilder` and
`_libraryTypeParameterScopeBuilder` to SourceCompilationUnitImpl

Change-Id: I1374accef8e177a4572bf21ad839a105ced91395
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/372900
Reviewed-by: Jens Johansen <jensj@google.com>
Commit-Queue: Johnni Winther <johnniwinther@google.com>
This commit is contained in:
Johnni Winther 2024-06-24 10:01:28 +00:00 committed by Commit Queue
parent 40dad48ede
commit 43452cdd6c
2 changed files with 12 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkg/front_end/lib/src/fasta/source/source_library_builder.dart
View file

@ -2953,9 +2953,6 @@ class SourceLibraryBuilder extends LibraryBuilderImpl {
isAugmenting ? origin.mergedScope : new MergedLibraryScope(this);
}
TypeParameterScopeBuilder get libraryTypeParameterScopeBuilderForTesting =>
_libraryTypeParameterScopeBuilder;
LibraryFeatures? _libraryFeatures;
/// Returns the state of the experimental features within this library.

38
pkg/front_end/lib/src/testing/id_testing_utils.dart
View file

@ -9,7 +9,6 @@ import '../fasta/builder/library_builder.dart';
import '../fasta/builder/member_builder.dart';
import '../fasta/builder/type_builder.dart';
import '../fasta/messages.dart';
import '../fasta/source/source_library_builder.dart';
import '../fasta/source/source_loader.dart';
import '../kernel_generator_impl.dart';
@ -135,22 +134,14 @@ LibraryBuilder? lookupLibraryBuilder(
return builder;
}
TypeParameterScopeBuilder lookupLibraryDeclarationBuilder(
InternalCompilerResult compilerResult, Library library,
{bool required = true}) {
SourceLibraryBuilder builder =
lookupLibraryBuilder(compilerResult, library, required: required)
as SourceLibraryBuilder;
return builder.libraryTypeParameterScopeBuilderForTesting;
}
ClassBuilder? lookupClassBuilder(
InternalCompilerResult compilerResult, Class cls,
{bool required = true}) {
TypeParameterScopeBuilder libraryBuilder = lookupLibraryDeclarationBuilder(
LibraryBuilder libraryBuilder = lookupLibraryBuilder(
compilerResult, cls.enclosingLibrary,
required: required);
ClassBuilder? clsBuilder = libraryBuilder.members![cls.name] as ClassBuilder?;
required: required)!;
ClassBuilder? clsBuilder = libraryBuilder.scope
.lookupLocalMember(cls.name, setter: false) as ClassBuilder?;
if (clsBuilder == null && required) {
throw new ArgumentError("ClassBuilder for $cls not found.");
}
@ -160,16 +151,15 @@ ClassBuilder? lookupClassBuilder(
ExtensionBuilder? lookupExtensionBuilder(
InternalCompilerResult compilerResult, Extension extension,
{bool required = true}) {
TypeParameterScopeBuilder libraryBuilder = lookupLibraryDeclarationBuilder(
LibraryBuilder libraryBuilder = lookupLibraryBuilder(
compilerResult, extension.enclosingLibrary,
required: required);
required: required)!;
ExtensionBuilder? extensionBuilder;
for (ExtensionBuilder builder in libraryBuilder.extensions!) {
libraryBuilder.scope.forEachLocalExtension((ExtensionBuilder builder) {
if (builder.extension == extension) {
extensionBuilder = builder;
break;
}
}
});
if (extensionBuilder == null && required) {
throw new ArgumentError("ExtensionBuilder for $extension not found.");
}
@ -225,15 +215,11 @@ MemberBuilder? lookupMemberBuilder(
compilerResult, member.enclosingClass!, member, member.name.text,
required: required);
} else {
TypeParameterScopeBuilder libraryBuilder = lookupLibraryDeclarationBuilder(
LibraryBuilder libraryBuilder = lookupLibraryBuilder(
compilerResult, member.enclosingLibrary,
required: required);
if (member is Procedure && member.isSetter) {
memberBuilder = libraryBuilder.setters![member.name.text];
} else {
memberBuilder =
libraryBuilder.members![member.name.text] as MemberBuilder?;
}
required: required)!;
memberBuilder = libraryBuilder.scope.lookupLocalMember(member.name.text,
setter: member is Procedure && member.isSetter) as MemberBuilder?;
}
if (memberBuilder == null && required) {
throw new ArgumentError("MemberBuilder for $member not found.");