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
@@ -11,12 +11,13 @@ public class FrontendPhaseContext {
public final FileTableReader fileTable;
public final BuildStack stack;
private final int stdlibVersion;
private final HostAdmissionContext hostAdmissionContext;
public FrontendPhaseContext(
final ProjectTableReader projectTable,
final FileTableReader fileTable,
final BuildStack stack) {
this(projectTable, fileTable, stack, 1);
this(projectTable, fileTable, stack, 1, HostAdmissionContext.permissiveDefault());
}
public FrontendPhaseContext(
@@ -24,10 +25,22 @@ public class FrontendPhaseContext {
final FileTableReader fileTable,
final BuildStack stack,
final int stdlibVersion) {
this(projectTable, fileTable, stack, stdlibVersion, HostAdmissionContext.permissiveDefault());
}
public FrontendPhaseContext(
final ProjectTableReader projectTable,
final FileTableReader fileTable,
final BuildStack stack,
final int stdlibVersion,
final HostAdmissionContext hostAdmissionContext) {
this.projectTable = projectTable;
this.fileTable = fileTable;
this.stack = stack;
this.stdlibVersion = stdlibVersion;
this.hostAdmissionContext = hostAdmissionContext == null
? HostAdmissionContext.permissiveDefault()
: hostAdmissionContext;
}
public SourceKind sourceKind(final ProjectId projectId) {
@@ -37,4 +50,8 @@ public class FrontendPhaseContext {
public int stdlibVersion() {
return stdlibVersion;
}
public HostAdmissionContext hostAdmissionContext() {
return hostAdmissionContext;
}
}
@@ -0,0 +1,53 @@
package p.studio.compiler.messages;
import p.studio.utilities.structures.ReadOnlyList;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Locale;
import java.util.Set;
public record HostAdmissionContext(
ReadOnlyList<String> knownCapabilities,
ReadOnlyList<String> declaredCapabilities,
boolean enforceDeclaredCapabilities) {
private static final ReadOnlyList<String> DEFAULT_KNOWN_CAPABILITIES = ReadOnlyList.wrap(List.of(
"system",
"gfx",
"input",
"audio",
"fs",
"log",
"asset",
"bank"));
public HostAdmissionContext {
knownCapabilities = knownCapabilities == null || knownCapabilities.isEmpty()
? DEFAULT_KNOWN_CAPABILITIES
: normalize(knownCapabilities);
declaredCapabilities = declaredCapabilities == null
? ReadOnlyList.empty()
: normalize(declaredCapabilities);
}
public static HostAdmissionContext permissiveDefault() {
return new HostAdmissionContext(DEFAULT_KNOWN_CAPABILITIES, ReadOnlyList.empty(), false);
}
public static HostAdmissionContext strictWithDeclaredCapabilities(
final ReadOnlyList<String> declaredCapabilities) {
return new HostAdmissionContext(DEFAULT_KNOWN_CAPABILITIES, declaredCapabilities, true);
}
private static ReadOnlyList<String> normalize(final ReadOnlyList<String> values) {
final Set<String> dedup = new LinkedHashSet<>();
for (final var value : values) {
if (value == null || value.isBlank()) {
continue;
}
dedup.add(value.trim().toLowerCase(Locale.ROOT));
}
return ReadOnlyList.wrap(dedup.stream().toList());
}
}
@@ -5,6 +5,7 @@ import lombok.Getter;
import p.studio.utilities.structures.ReadOnlyList;
import java.util.ArrayList;
import java.util.LinkedHashSet;
@Builder
@Getter
@@ -23,6 +24,7 @@ public class IRBackend {
private final ArrayList<IRReservedMetadata.HostMethodBinding> hostMethodBindings = new ArrayList<>();
private final ArrayList<IRReservedMetadata.BuiltinTypeSurface> builtinTypeSurfaces = new ArrayList<>();
private final ArrayList<IRReservedMetadata.BuiltinConstSurface> builtinConstSurfaces = new ArrayList<>();
private final LinkedHashSet<String> requiredCapabilities = new LinkedHashSet<>();
public void merge(final IRBackendFile backendFile) {
if (backendFile == null) {
@@ -33,6 +35,7 @@ public class IRBackend {
hostMethodBindings.addAll(metadata.hostMethodBindings().asList());
builtinTypeSurfaces.addAll(metadata.builtinTypeSurfaces().asList());
builtinConstSurfaces.addAll(metadata.builtinConstSurfaces().asList());
requiredCapabilities.addAll(metadata.requiredCapabilities().asList());
}
public IRBackend emit() {
@@ -42,7 +45,8 @@ public class IRBackend {
.reservedMetadata(new IRReservedMetadata(
ReadOnlyList.wrap(hostMethodBindings),
ReadOnlyList.wrap(builtinTypeSurfaces),
ReadOnlyList.wrap(builtinConstSurfaces)))
ReadOnlyList.wrap(builtinConstSurfaces),
ReadOnlyList.wrap(requiredCapabilities.stream().toList())))
.build();
}
}
@@ -54,6 +58,7 @@ public class IRBackend {
.append(", hostBindings=").append(reservedMetadata.hostMethodBindings().size())
.append(", builtinTypes=").append(reservedMetadata.builtinTypeSurfaces().size())
.append(", builtinConsts=").append(reservedMetadata.builtinConstSurfaces().size())
.append(", requiredCapabilities=").append(reservedMetadata.requiredCapabilities().size())
.append('}');
if (functions.isEmpty()) {
@@ -8,16 +8,22 @@ import java.util.Objects;
public record IRReservedMetadata(
ReadOnlyList<HostMethodBinding> hostMethodBindings,
ReadOnlyList<BuiltinTypeSurface> builtinTypeSurfaces,
ReadOnlyList<BuiltinConstSurface> builtinConstSurfaces) {
ReadOnlyList<BuiltinConstSurface> builtinConstSurfaces,
ReadOnlyList<String> requiredCapabilities) {
public IRReservedMetadata {
hostMethodBindings = hostMethodBindings == null ? ReadOnlyList.empty() : hostMethodBindings;
builtinTypeSurfaces = builtinTypeSurfaces == null ? ReadOnlyList.empty() : builtinTypeSurfaces;
builtinConstSurfaces = builtinConstSurfaces == null ? ReadOnlyList.empty() : builtinConstSurfaces;
requiredCapabilities = requiredCapabilities == null ? ReadOnlyList.empty() : requiredCapabilities;
}
public static IRReservedMetadata empty() {
return new IRReservedMetadata(ReadOnlyList.empty(), ReadOnlyList.empty(), ReadOnlyList.empty());
return new IRReservedMetadata(
ReadOnlyList.empty(),
ReadOnlyList.empty(),
ReadOnlyList.empty(),
ReadOnlyList.empty());
}
public record HostMethodBinding(
@@ -26,12 +32,15 @@ public record IRReservedMetadata(
String abiModule,
String abiMethod,
long abiVersion,
boolean capabilityDeclared,
String requiredCapability,
Span span) {
public HostMethodBinding {
ownerName = Objects.requireNonNull(ownerName, "ownerName");
sourceMethodName = Objects.requireNonNull(sourceMethodName, "sourceMethodName");
abiModule = Objects.requireNonNull(abiModule, "abiModule");
abiMethod = Objects.requireNonNull(abiMethod, "abiMethod");
requiredCapability = requiredCapability == null ? "" : requiredCapability;
span = Objects.requireNonNull(span, "span");
}
}