dart-lang/sdk
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

[cfe] Remove ModifierBuilder

Browse Source 
Change-Id: Ic65ccdeaaa69ba9bd8119cc2a7c1339fc8facf43
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/368781
Commit-Queue: Johnni Winther <johnniwinther@google.com>
Reviewed-by: Chloe Stefantsova <cstefantsova@google.com>
This commit is contained in:
Johnni Winther
2024-05-31 08:29:11 +00:00
committed by Commit Queue
parent 30c6e81cfe
commit 3c85d3443a
12 changed files with 22 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/front_end/lib/src/fasta/builder/constructor_reference_builder.dart
+1 -2
View File
@@ -29,8 +29,7 @@ class ConstructorReferenceBuilder {
Builder? target;
ConstructorReferenceBuilder(this.typeName, this.typeArguments, this.suffix,
Builder parent, this.charOffset)
: fileUri = parent.fileUri!;
this.fileUri, this.charOffset);
String get fullNameForErrors {
return "${typeName.fullName}"
pkg/front_end/lib/src/fasta/builder/library_builder.dart
+1 -1
View File
@@ -36,7 +36,7 @@ import 'nullability_builder.dart';
import 'prefix_builder.dart';
import 'type_builder.dart';
abstract class LibraryBuilder implements ModifierBuilder {
abstract class LibraryBuilder implements Builder {
Scope get scope;
Scope get exportScope;
pkg/front_end/lib/src/fasta/builder/member_builder.dart
+1 -5
View File
@@ -14,8 +14,7 @@ import 'declaration_builders.dart';
import 'library_builder.dart';
import 'modifier_builder.dart';
abstract class MemberBuilder implements ModifierBuilder {
@override
abstract class MemberBuilder implements Builder {
String get name;
bool get isAssignable;
@@ -165,9 +164,6 @@ abstract class MemberBuilderImpl extends ModifierBuilderImpl
@override
bool get isTopLevel => !isDeclarationMember;
@override
bool get isNative => false;
@override
bool get isExternal => (modifiers & externalMask) != 0;
pkg/front_end/lib/src/fasta/builder/modifier_builder.dart
+3 -11
View File
@@ -8,16 +8,11 @@ import '../modifier.dart';
import 'builder.dart';
abstract class ModifierBuilder implements Builder {
String? get name;
bool get isNative;
}
abstract class ModifierBuilderImpl extends BuilderImpl
implements ModifierBuilder {
abstract class ModifierBuilderImpl extends BuilderImpl {
int get modifiers;
String? get name;
String get debugName;
@override
@@ -40,9 +35,6 @@ abstract class ModifierBuilderImpl extends BuilderImpl
@override
bool get isAugment => (modifiers & augmentMask) != 0;
@override
bool get isNative => false;
StringBuffer printOn(StringBuffer buffer) {
return buffer..write(name);
}
pkg/front_end/lib/src/fasta/builder/type_declaration_builder.dart
+1 -2
View File
@@ -4,8 +4,7 @@
part of 'declaration_builders.dart';
abstract class ITypeDeclarationBuilder implements ModifierBuilder {
@override
abstract class ITypeDeclarationBuilder implements Builder {
String get name;
bool get isNamedMixinApplication;
pkg/front_end/lib/src/fasta/dill/dill_library_builder.dart
+4 -3
View File
@@ -13,7 +13,6 @@ import '../builder/declaration_builders.dart';
import '../builder/dynamic_type_declaration_builder.dart';
import '../builder/library_builder.dart';
import '../builder/member_builder.dart';
import '../builder/modifier_builder.dart';
import '../builder/name_iterator.dart';
import '../builder/never_type_declaration_builder.dart';
import '../codes/fasta_codes.dart'
@@ -340,8 +339,10 @@ class DillLibraryBuilder extends LibraryBuilderImpl {
String name;
if (sourceBuildersMap?.containsKey(reference) == true) {
declaration = sourceBuildersMap![reference]!;
if (declaration is ModifierBuilder) {
name = declaration.name!;
if (declaration is TypeDeclarationBuilder) {
name = declaration.name;
} else if (declaration is MemberBuilder) {
name = declaration.name;
} else {
throw new StateError(
"Unexpected: $declaration (${declaration.runtimeType}");
pkg/front_end/lib/src/fasta/scope.dart
-3
View File
@@ -967,9 +967,6 @@ mixin ErroneousMemberBuilderMixin implements SourceMemberBuilder {
@override
Iterable<Member> get exportedMembers => const [];
@override
bool get isNative => false;
@override
bool get isAssignable => false;
pkg/front_end/lib/src/fasta/source/diet_listener.dart
+9 -14
View File
@@ -23,7 +23,6 @@ import 'package:kernel/core_types.dart' show CoreTypes;
import '../builder/builder.dart';
import '../builder/declaration_builders.dart';
import '../builder/modifier_builder.dart';
import '../codes/fasta_codes.dart'
show Code, LocatedMessage, Message, messageExpectedBlockToSkip;
import '../constant_context.dart' show ConstantContext;
@@ -552,8 +551,7 @@ class DietListener extends StackListenerImpl {
LibraryDependency? dependency =
_offsetMap.lookupImport(importKeyword).libraryDependency;
parseMetadata(libraryBuilder.bodyBuilderContext, libraryBuilder, metadata,
dependency);
parseMetadata(libraryBuilder.bodyBuilderContext, metadata, dependency);
}
@override
@@ -568,8 +566,7 @@ class DietListener extends StackListenerImpl {
Token? metadata = pop() as Token?;
LibraryDependency dependency =
_offsetMap.lookupExport(exportKeyword).libraryDependency;
parseMetadata(libraryBuilder.bodyBuilderContext, libraryBuilder, metadata,
dependency);
parseMetadata(libraryBuilder.bodyBuilderContext, metadata, dependency);
}
@override
@@ -578,8 +575,7 @@ class DietListener extends StackListenerImpl {
Token? metadata = pop() as Token?;
LibraryPart part = _offsetMap.lookupPart(partKeyword);
parseMetadata(
libraryBuilder.bodyBuilderContext, libraryBuilder, metadata, part);
parseMetadata(libraryBuilder.bodyBuilderContext, metadata, part);
}
@override
@@ -769,8 +765,8 @@ class DietListener extends StackListenerImpl {
}
}
BodyBuilder createListener(BodyBuilderContext bodyBuilderContext,
ModifierBuilder builder, Scope memberScope,
BodyBuilder createListener(
BodyBuilderContext bodyBuilderContext, Scope memberScope,
{VariableDeclaration? thisVariable,
List<TypeParameter>? thisTypeParameters,
Scope? formalParameterScope,
@@ -825,8 +821,7 @@ class DietListener extends StackListenerImpl {
builder.computeTypeParameterScope(memberScope);
final Scope formalParameterScope =
builder.computeFormalParameterScope(typeParameterScope);
return createListener(
builder.bodyBuilderContext, builder, typeParameterScope,
return createListener(builder.bodyBuilderContext, typeParameterScope,
thisVariable: builder.thisVariable,
thisTypeParameters: builder.thisTypeParameters,
formalParameterScope: formalParameterScope,
@@ -876,7 +871,7 @@ class DietListener extends StackListenerImpl {
// TODO(paulberry): don't re-parse the field if we've already parsed it
// for type inference.
_parseFields(
createListener(declaration.bodyBuilderContext, declaration, memberScope,
createListener(declaration.bodyBuilderContext, memberScope,
inferenceDataForTesting: declaration.dataForTesting?.inferenceData),
token,
metadata,
@@ -1303,10 +1298,10 @@ class DietListener extends StackListenerImpl {
/// If the [metadata] is not `null`, return the parsed metadata [Expression]s.
/// Otherwise, return `null`.
List<Expression>? parseMetadata(BodyBuilderContext bodyBuilderContext,
ModifierBuilder builder, Token? metadata, Annotatable? parent) {
Token? metadata, Annotatable? parent) {
if (metadata != null) {
StackListenerImpl listener =
createListener(bodyBuilderContext, builder, memberScope);
createListener(bodyBuilderContext, memberScope);
Parser parser = new Parser(listener,
useImplicitCreationExpression: useImplicitCreationExpressionInCfe,
allowPatterns: libraryFeatures.patterns.isEnabled);
pkg/front_end/lib/src/fasta/source/source_function_builder.dart
-1
View File
@@ -93,7 +93,6 @@ abstract class SourceFunctionBuilder
void set body(Statement? newBody);
@override
bool get isNative;
/// Returns the [index]th parameter of this function.
pkg/front_end/lib/src/fasta/source/source_library_builder.dart
+1 -1
View File
@@ -650,7 +650,7 @@ class SourceLibraryBuilder extends LibraryBuilderImpl {
ConstructorReferenceBuilder addConstructorReference(TypeName name,
List<TypeBuilder>? typeArguments, String? suffix, int charOffset) {
ConstructorReferenceBuilder ref = new ConstructorReferenceBuilder(
name, typeArguments, suffix, this, charOffset);
name, typeArguments, suffix, fileUri, charOffset);
constructorReferences.add(ref);
return ref;
}
pkg/front_end/lib/src/fasta/source/source_loader.dart
-1
View File
@@ -1263,7 +1263,6 @@ severity: $severity
BodyBuilder listener = dietListener.createListener(
new ExpressionCompilerProcedureBodyBuildContext(dietListener, builder,
isDeclarationInstanceMember: isClassInstanceMember),
builder,
dietListener.memberScope,
thisVariable: extensionThis);
builder.procedure.function = parameters..parent = builder.procedure;
pkg/front_end/test/coverage_suite.dart
+1 -1
View File
@@ -116,7 +116,7 @@ const Map<String, double> _expect = {
95.42483660130719,
"package:front_end/src/fasta/dill/dill_extension_type_member_builder.dart":
83.76623376623377,
"package:front_end/src/fasta/dill/dill_library_builder.dart": 78.134110787172,
"package:front_end/src/fasta/dill/dill_library_builder.dart": 77.0,
"package:front_end/src/fasta/dill/dill_loader.dart": 76.58536585365854,
"package:front_end/src/fasta/dill/dill_member_builder.dart":
86.52173913043478,