implements PR030

This commit is contained in:
2026-03-24 13:42:23 +00:00
parent 01c5b6649a
commit 495104db6d
23 changed files with 461 additions and 11 deletions
@@ -3,6 +3,8 @@ package p.studio.compiler.pbs;
import p.studio.compiler.models.IRFunction;
import p.studio.compiler.models.SourceKind;
import p.studio.compiler.models.IRBackendFile;
import p.studio.compiler.messages.HostAdmissionContext;
import p.studio.compiler.models.IRReservedMetadata;
import p.studio.compiler.pbs.ast.PbsAst;
import p.studio.compiler.pbs.lexer.PbsLexer;
import p.studio.compiler.pbs.metadata.PbsReservedMetadataExtractor;
@@ -19,6 +21,7 @@ public final class PbsFrontendCompiler {
private final PbsDeclarationSemanticsValidator declarationSemanticsValidator = new PbsDeclarationSemanticsValidator();
private final PbsFlowSemanticsValidator flowSemanticsValidator = new PbsFlowSemanticsValidator();
private final PbsReservedMetadataExtractor reservedMetadataExtractor = new PbsReservedMetadataExtractor();
private final PbsHostAdmissionValidator hostAdmissionValidator = new PbsHostAdmissionValidator();
public IRBackendFile compileFile(
final FileId fileId,
@@ -32,13 +35,22 @@ public final class PbsFrontendCompiler {
final String source,
final DiagnosticSink diagnostics,
final SourceKind sourceKind) {
return compileFile(fileId, source, diagnostics, sourceKind, HostAdmissionContext.permissiveDefault());
}
public IRBackendFile compileFile(
final FileId fileId,
final String source,
final DiagnosticSink diagnostics,
final SourceKind sourceKind,
final HostAdmissionContext hostAdmissionContext) {
final var admissionBaseline = diagnostics.errorCount();
final var tokens = PbsLexer.lex(source, fileId, diagnostics);
final var parseMode = sourceKind == SourceKind.SDK_INTERFACE
? PbsParser.ParseMode.INTERFACE_MODULE
: PbsParser.ParseMode.ORDINARY;
final var ast = PbsParser.parse(tokens, fileId, diagnostics, parseMode);
final var irBackendFile = compileParsedFile(fileId, ast, diagnostics, sourceKind);
final var irBackendFile = compileParsedFile(fileId, ast, diagnostics, sourceKind, hostAdmissionContext);
if (diagnostics.errorCount() > admissionBaseline) {
return IRBackendFile.empty(fileId);
}
@@ -57,6 +69,15 @@ public final class PbsFrontendCompiler {
final PbsAst.File ast,
final DiagnosticSink diagnostics,
final SourceKind sourceKind) {
return compileParsedFile(fileId, ast, diagnostics, sourceKind, HostAdmissionContext.permissiveDefault());
}
public IRBackendFile compileParsedFile(
final FileId fileId,
final PbsAst.File ast,
final DiagnosticSink diagnostics,
final SourceKind sourceKind,
final HostAdmissionContext hostAdmissionContext) {
final var semanticsErrorBaseline = diagnostics.errorCount();
declarationSemanticsValidator.validate(ast, sourceKind, diagnostics);
flowSemanticsValidator.validate(ast, diagnostics);
@@ -64,7 +85,20 @@ public final class PbsFrontendCompiler {
return IRBackendFile.empty(fileId);
}
final var reservedMetadata = reservedMetadataExtractor.extract(ast, sourceKind);
final var extractedReservedMetadata = reservedMetadataExtractor.extract(ast, sourceKind);
final var hostAdmissionErrorBaseline = diagnostics.errorCount();
final var requiredCapabilities = hostAdmissionValidator.validate(
extractedReservedMetadata,
hostAdmissionContext,
diagnostics);
if (diagnostics.errorCount() > hostAdmissionErrorBaseline) {
return IRBackendFile.empty(fileId);
}
final var reservedMetadata = new IRReservedMetadata(
extractedReservedMetadata.hostMethodBindings(),
extractedReservedMetadata.builtinTypeSurfaces(),
extractedReservedMetadata.builtinConstSurfaces(),
requiredCapabilities);
final ReadOnlyList<IRFunction> functions = sourceKind == SourceKind.SDK_INTERFACE
? ReadOnlyList.empty()
@@ -0,0 +1,9 @@
package p.studio.compiler.pbs;
public enum PbsHostAdmissionErrors {
E_HOST_MISSING_REQUIRED_CAPABILITY,
E_HOST_MALFORMED_CAPABILITY_METADATA,
E_HOST_UNKNOWN_CAPABILITY,
E_HOST_CAPABILITY_NOT_DECLARED,
E_HOST_INCONSISTENT_BINDING_CAPABILITY,
}
@@ -0,0 +1,129 @@
package p.studio.compiler.pbs;
import p.studio.compiler.messages.HostAdmissionContext;
import p.studio.compiler.models.IRReservedMetadata;
import p.studio.compiler.source.diagnostics.DiagnosticSink;
import p.studio.compiler.source.diagnostics.Diagnostics;
import p.studio.compiler.source.diagnostics.RelatedSpan;
import p.studio.utilities.structures.ReadOnlyList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Locale;
import java.util.Set;
import java.util.regex.Pattern;
public final class PbsHostAdmissionValidator {
private static final Pattern CAPABILITY_NAME = Pattern.compile("^[a-z][a-z0-9_]*$");
public ReadOnlyList<String> validate(
final IRReservedMetadata metadata,
final HostAdmissionContext context,
final DiagnosticSink diagnostics) {
final var knownCapabilities = normalizedSet(context.knownCapabilities());
final var declaredCapabilities = normalizedSet(context.declaredCapabilities());
final var requiredCapabilities = new LinkedHashSet<String>();
final var firstCapabilityByHostBinding = new HashMap<String, FirstBindingCapability>();
for (final var hostBinding : metadata.hostMethodBindings()) {
final var normalizedCapability = normalize(hostBinding.requiredCapability());
if (!hostBinding.capabilityDeclared()) {
Diagnostics.error(
diagnostics,
PbsHostAdmissionErrors.E_HOST_MISSING_REQUIRED_CAPABILITY.name(),
"Host binding '%s.%s' requires Capability(name=...) metadata"
.formatted(hostBinding.ownerName(), hostBinding.sourceMethodName()),
hostBinding.span());
continue;
}
if (normalizedCapability.isBlank()) {
Diagnostics.error(
diagnostics,
PbsHostAdmissionErrors.E_HOST_MALFORMED_CAPABILITY_METADATA.name(),
"Host binding '%s.%s' has malformed Capability(name=...) metadata"
.formatted(hostBinding.ownerName(), hostBinding.sourceMethodName()),
hostBinding.span());
continue;
}
if (!CAPABILITY_NAME.matcher(normalizedCapability).matches()) {
Diagnostics.error(
diagnostics,
PbsHostAdmissionErrors.E_HOST_MALFORMED_CAPABILITY_METADATA.name(),
"Host binding '%s.%s' has malformed capability name '%s'"
.formatted(hostBinding.ownerName(), hostBinding.sourceMethodName(), normalizedCapability),
hostBinding.span());
continue;
}
if (!knownCapabilities.contains(normalizedCapability)) {
Diagnostics.error(
diagnostics,
PbsHostAdmissionErrors.E_HOST_UNKNOWN_CAPABILITY.name(),
"Host binding '%s.%s' references unknown capability '%s'"
.formatted(hostBinding.ownerName(), hostBinding.sourceMethodName(), normalizedCapability),
hostBinding.span());
continue;
}
final var bindingKey = "%s|%s|%d".formatted(
hostBinding.abiModule(),
hostBinding.abiMethod(),
hostBinding.abiVersion());
final var firstBindingCapability = firstCapabilityByHostBinding.putIfAbsent(
bindingKey,
new FirstBindingCapability(normalizedCapability, hostBinding.span()));
if (firstBindingCapability != null && !firstBindingCapability.capability().equals(normalizedCapability)) {
Diagnostics.error(
diagnostics,
PbsHostAdmissionErrors.E_HOST_INCONSISTENT_BINDING_CAPABILITY.name(),
"Canonical host binding (%s, %s, %d) has inconsistent capability metadata ('%s' vs '%s')"
.formatted(
hostBinding.abiModule(),
hostBinding.abiMethod(),
hostBinding.abiVersion(),
firstBindingCapability.capability(),
normalizedCapability),
hostBinding.span(),
List.of(new RelatedSpan("First capability declaration for this binding is here", firstBindingCapability.span())));
continue;
}
if (context.enforceDeclaredCapabilities() && !declaredCapabilities.contains(normalizedCapability)) {
Diagnostics.error(
diagnostics,
PbsHostAdmissionErrors.E_HOST_CAPABILITY_NOT_DECLARED.name(),
"Capability '%s' required by host binding '%s.%s' is not declared in host admission context"
.formatted(normalizedCapability, hostBinding.ownerName(), hostBinding.sourceMethodName()),
hostBinding.span());
continue;
}
requiredCapabilities.add(normalizedCapability);
}
return ReadOnlyList.wrap(requiredCapabilities.stream().toList());
}
private Set<String> normalizedSet(final ReadOnlyList<String> values) {
final var normalized = new HashSet<String>();
for (final var value : values) {
final var capability = normalize(value);
if (!capability.isBlank()) {
normalized.add(capability);
}
}
return normalized;
}
private String normalize(final String capability) {
return capability == null ? "" : capability.trim().toLowerCase(Locale.ROOT);
}
private record FirstBindingCapability(
String capability,
p.studio.compiler.source.Span span) {
}
}
@@ -7,6 +7,7 @@ import p.studio.compiler.pbs.semantics.PbsBuiltinLayoutResolver;
import p.studio.utilities.structures.ReadOnlyList;
import java.util.ArrayList;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Optional;
@@ -15,6 +16,7 @@ import java.util.stream.Collectors;
public final class PbsReservedMetadataExtractor {
private static final String ATTR_HOST = "Host";
private static final String ATTR_CAPABILITY = "Capability";
private static final String ATTR_BUILTIN_TYPE = "BuiltinType";
private static final String ATTR_INTRINSIC_CALL = "IntrinsicCall";
private static final String ATTR_BUILTIN_CONST = "BuiltinConst";
@@ -51,7 +53,8 @@ public final class PbsReservedMetadataExtractor {
return new IRReservedMetadata(
ReadOnlyList.wrap(hostMethodBindings),
ReadOnlyList.wrap(builtinTypeSurfaces),
ReadOnlyList.wrap(builtinConstSurfaces));
ReadOnlyList.wrap(builtinConstSurfaces),
requiredCapabilities(hostMethodBindings));
}
private void extractHostBindings(
@@ -66,12 +69,18 @@ public final class PbsReservedMetadataExtractor {
final var abiModule = stringArgument(hostMetadata, "module").orElse("");
final var abiMethod = stringArgument(hostMetadata, "name").orElse(signature.name());
final var abiVersion = longArgument(hostMetadata, "version").orElse(0L);
final var capabilityAttribute = firstAttributeNamed(signature.attributes(), ATTR_CAPABILITY);
final var capability = capabilityAttribute
.flatMap(attr -> stringArgument(attr, "name"))
.orElse("");
hostMethodBindings.add(new IRReservedMetadata.HostMethodBinding(
hostDecl.name(),
signature.name(),
abiModule,
abiMethod,
abiVersion,
capabilityAttribute.isPresent(),
capability,
signature.span()));
}
}
@@ -218,4 +227,16 @@ public final class PbsReservedMetadataExtractor {
case ERROR -> "error";
};
}
private ReadOnlyList<String> requiredCapabilities(
final List<IRReservedMetadata.HostMethodBinding> hostMethodBindings) {
final var required = new LinkedHashSet<String>();
for (final var hostBinding : hostMethodBindings) {
if (hostBinding.requiredCapability() == null || hostBinding.requiredCapability().isBlank()) {
continue;
}
required.add(hostBinding.requiredCapability().trim().toLowerCase());
}
return ReadOnlyList.wrap(required.stream().toList());
}
}
@@ -16,12 +16,14 @@ import java.util.Set;
public final class PbsDeclarationSemanticsValidator {
private static final String ATTR_HOST = "Host";
private static final String ATTR_CAPABILITY = "Capability";
private static final String ATTR_BUILTIN_TYPE = "BuiltinType";
private static final String ATTR_BUILTIN_CONST = "BuiltinConst";
private static final String ATTR_INTRINSIC_CALL = "IntrinsicCall";
private static final Set<String> RESERVED_ATTRIBUTES = Set.of(
ATTR_HOST,
ATTR_CAPABILITY,
ATTR_BUILTIN_TYPE,
ATTR_BUILTIN_CONST,
ATTR_INTRINSIC_CALL);
@@ -386,7 +388,7 @@ public final class PbsDeclarationSemanticsValidator {
if (!isReservedAttribute(attribute.name())) {
continue;
}
if (ATTR_HOST.equals(attribute.name())) {
if (ATTR_HOST.equals(attribute.name()) || ATTR_CAPABILITY.equals(attribute.name())) {
continue;
}
reportInvalidReservedAttributeTarget(
@@ -145,7 +145,8 @@ public class PBSFrontendPhaseService implements FrontendPhaseService {
parsedSource.fileId(),
parsedSource.ast(),
diagnostics,
parsedSource.sourceKind());
parsedSource.sourceKind(),
ctx.hostAdmissionContext());
if (diagnostics.errorCount() > compileErrorBaseline) {
failedModuleKeys.add(parsedSource.moduleKey());
}