implements PR027
This commit is contained in:
+13
-1
@@ -5,6 +5,7 @@ import p.studio.compiler.models.SourceKind;
|
||||
import p.studio.compiler.models.IRBackendFile;
|
||||
import p.studio.compiler.pbs.ast.PbsAst;
|
||||
import p.studio.compiler.pbs.lexer.PbsLexer;
|
||||
import p.studio.compiler.pbs.metadata.PbsReservedMetadataExtractor;
|
||||
import p.studio.compiler.pbs.parser.PbsParser;
|
||||
import p.studio.compiler.pbs.semantics.PbsDeclarationSemanticsValidator;
|
||||
import p.studio.compiler.pbs.semantics.PbsFlowSemanticsValidator;
|
||||
@@ -17,6 +18,7 @@ import java.util.ArrayList;
|
||||
public final class PbsFrontendCompiler {
|
||||
private final PbsDeclarationSemanticsValidator declarationSemanticsValidator = new PbsDeclarationSemanticsValidator();
|
||||
private final PbsFlowSemanticsValidator flowSemanticsValidator = new PbsFlowSemanticsValidator();
|
||||
private final PbsReservedMetadataExtractor reservedMetadataExtractor = new PbsReservedMetadataExtractor();
|
||||
|
||||
public IRBackendFile compileFile(
|
||||
final FileId fileId,
|
||||
@@ -61,7 +63,17 @@ public final class PbsFrontendCompiler {
|
||||
if (diagnostics.errorCount() > semanticsErrorBaseline) {
|
||||
return IRBackendFile.empty(fileId);
|
||||
}
|
||||
return new IRBackendFile(fileId, lowerFunctions(fileId, ast));
|
||||
|
||||
final var admissionErrorBaseline = diagnostics.errorCount();
|
||||
final var reservedMetadata = reservedMetadataExtractor.extract(ast, sourceKind, diagnostics);
|
||||
if (diagnostics.errorCount() > admissionErrorBaseline) {
|
||||
return IRBackendFile.empty(fileId);
|
||||
}
|
||||
|
||||
final ReadOnlyList<IRFunction> functions = sourceKind == SourceKind.SDK_INTERFACE
|
||||
? ReadOnlyList.empty()
|
||||
: lowerFunctions(fileId, ast);
|
||||
return new IRBackendFile(fileId, functions, reservedMetadata);
|
||||
}
|
||||
|
||||
private ReadOnlyList<IRFunction> lowerFunctions(final FileId fileId, final PbsAst.File ast) {
|
||||
|
||||
+6
@@ -0,0 +1,6 @@
|
||||
package p.studio.compiler.pbs;
|
||||
|
||||
public enum PbsLoadErrors {
|
||||
E_LOAD_UNSUPPORTED_RESERVED_METADATA_SURFACE,
|
||||
E_LOAD_DUPLICATE_BUILTIN_SLOT_INDEX,
|
||||
}
|
||||
+260
@@ -0,0 +1,260 @@
|
||||
package p.studio.compiler.pbs.metadata;
|
||||
|
||||
import p.studio.compiler.models.IRReservedMetadata;
|
||||
import p.studio.compiler.models.SourceKind;
|
||||
import p.studio.compiler.pbs.PbsLoadErrors;
|
||||
import p.studio.compiler.pbs.ast.PbsAst;
|
||||
import p.studio.compiler.source.Span;
|
||||
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.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
import java.util.OptionalLong;
|
||||
|
||||
public final class PbsReservedMetadataExtractor {
|
||||
private static final String ATTR_HOST = "Host";
|
||||
private static final String ATTR_BUILTIN_TYPE = "BuiltinType";
|
||||
private static final String ATTR_INTRINSIC_CALL = "IntrinsicCall";
|
||||
private static final String ATTR_BUILTIN_CONST = "BuiltinConst";
|
||||
private static final String ATTR_SLOT = "Slot";
|
||||
|
||||
public IRReservedMetadata extract(
|
||||
final PbsAst.File ast,
|
||||
final SourceKind sourceKind,
|
||||
final DiagnosticSink diagnostics) {
|
||||
if (sourceKind != SourceKind.SDK_INTERFACE) {
|
||||
return IRReservedMetadata.empty();
|
||||
}
|
||||
|
||||
final var hostMethodBindings = new ArrayList<IRReservedMetadata.HostMethodBinding>();
|
||||
final var builtinTypeSurfaces = new ArrayList<IRReservedMetadata.BuiltinTypeSurface>();
|
||||
final var builtinConstSurfaces = new ArrayList<IRReservedMetadata.BuiltinConstSurface>();
|
||||
|
||||
for (final var topDecl : ast.topDecls()) {
|
||||
if (topDecl instanceof PbsAst.HostDecl hostDecl) {
|
||||
extractHostBindings(hostDecl, hostMethodBindings);
|
||||
continue;
|
||||
}
|
||||
if (topDecl instanceof PbsAst.BuiltinTypeDecl builtinTypeDecl) {
|
||||
extractBuiltinTypeSurface(builtinTypeDecl, builtinTypeSurfaces, diagnostics);
|
||||
continue;
|
||||
}
|
||||
if (topDecl instanceof PbsAst.ConstDecl constDecl) {
|
||||
extractBuiltinConstSurface(constDecl, builtinConstSurfaces);
|
||||
}
|
||||
}
|
||||
|
||||
return new IRReservedMetadata(
|
||||
ReadOnlyList.wrap(hostMethodBindings),
|
||||
ReadOnlyList.wrap(builtinTypeSurfaces),
|
||||
ReadOnlyList.wrap(builtinConstSurfaces));
|
||||
}
|
||||
|
||||
private void extractHostBindings(
|
||||
final PbsAst.HostDecl hostDecl,
|
||||
final List<IRReservedMetadata.HostMethodBinding> hostMethodBindings) {
|
||||
for (final var signature : hostDecl.signatures()) {
|
||||
final var hostAttribute = firstAttributeNamed(signature.attributes(), ATTR_HOST);
|
||||
if (hostAttribute.isEmpty()) {
|
||||
continue;
|
||||
}
|
||||
final var hostMetadata = hostAttribute.get();
|
||||
final var abiModule = stringArgument(hostMetadata, "module").orElse("");
|
||||
final var abiMethod = stringArgument(hostMetadata, "name").orElse(signature.name());
|
||||
final var abiVersion = longArgument(hostMetadata, "version").orElse(0L);
|
||||
hostMethodBindings.add(new IRReservedMetadata.HostMethodBinding(
|
||||
hostDecl.name(),
|
||||
signature.name(),
|
||||
abiModule,
|
||||
abiMethod,
|
||||
abiVersion,
|
||||
signature.span()));
|
||||
}
|
||||
}
|
||||
|
||||
private void extractBuiltinTypeSurface(
|
||||
final PbsAst.BuiltinTypeDecl builtinTypeDecl,
|
||||
final List<IRReservedMetadata.BuiltinTypeSurface> builtinTypeSurfaces,
|
||||
final DiagnosticSink diagnostics) {
|
||||
final var builtinTypeAttribute = firstAttributeNamed(builtinTypeDecl.attributes(), ATTR_BUILTIN_TYPE);
|
||||
if (builtinTypeAttribute.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
|
||||
final var builtinTypeMetadata = builtinTypeAttribute.get();
|
||||
final var canonicalTypeName = stringArgument(builtinTypeMetadata, "name").orElse(builtinTypeDecl.name());
|
||||
final var canonicalVersion = longArgument(builtinTypeMetadata, "version").orElse(0L);
|
||||
|
||||
final var fields = new ArrayList<IRReservedMetadata.BuiltinFieldSurface>(builtinTypeDecl.fields().size());
|
||||
final var firstFieldBySlot = new HashMap<Long, Span>();
|
||||
for (final var field : builtinTypeDecl.fields()) {
|
||||
final var slotAttribute = firstAttributeNamed(field.attributes(), ATTR_SLOT);
|
||||
if (slotAttribute.isEmpty()) {
|
||||
reportUnsupportedSurface(
|
||||
diagnostics,
|
||||
field.span(),
|
||||
"Builtin field '%s' in '%s' requires Slot(index=...) for lowering admission"
|
||||
.formatted(field.name(), builtinTypeDecl.name()));
|
||||
continue;
|
||||
}
|
||||
|
||||
final var slotStart = longArgument(slotAttribute.get(), "index");
|
||||
if (slotStart.isEmpty()) {
|
||||
reportUnsupportedSurface(
|
||||
diagnostics,
|
||||
slotAttribute.get().span(),
|
||||
"Builtin field '%s' in '%s' requires numeric Slot(index=...) for lowering admission"
|
||||
.formatted(field.name(), builtinTypeDecl.name()));
|
||||
continue;
|
||||
}
|
||||
|
||||
final var firstField = firstFieldBySlot.putIfAbsent(slotStart.getAsLong(), field.span());
|
||||
if (firstField != null) {
|
||||
Diagnostics.error(
|
||||
diagnostics,
|
||||
PbsLoadErrors.E_LOAD_DUPLICATE_BUILTIN_SLOT_INDEX.name(),
|
||||
"Duplicate builtin slot index %d in '%s'".formatted(slotStart.getAsLong(), builtinTypeDecl.name()),
|
||||
field.span(),
|
||||
List.of(new RelatedSpan("First builtin field using this slot is here", firstField)));
|
||||
continue;
|
||||
}
|
||||
|
||||
fields.add(new IRReservedMetadata.BuiltinFieldSurface(
|
||||
field.name(),
|
||||
typeSurfaceKey(field.typeRef()),
|
||||
slotStart.getAsLong(),
|
||||
field.span()));
|
||||
}
|
||||
|
||||
final var intrinsics = new ArrayList<IRReservedMetadata.IntrinsicSurface>(builtinTypeDecl.signatures().size());
|
||||
for (final var signature : builtinTypeDecl.signatures()) {
|
||||
final var intrinsicAttribute = firstAttributeNamed(signature.attributes(), ATTR_INTRINSIC_CALL);
|
||||
if (intrinsicAttribute.isEmpty()) {
|
||||
continue;
|
||||
}
|
||||
final var intrinsicMetadata = intrinsicAttribute.get();
|
||||
intrinsics.add(new IRReservedMetadata.IntrinsicSurface(
|
||||
signature.name(),
|
||||
stringArgument(intrinsicMetadata, "name").orElse(signature.name()),
|
||||
longArgument(intrinsicMetadata, "version").orElse(canonicalVersion),
|
||||
signature.span()));
|
||||
}
|
||||
|
||||
builtinTypeSurfaces.add(new IRReservedMetadata.BuiltinTypeSurface(
|
||||
builtinTypeDecl.name(),
|
||||
canonicalTypeName,
|
||||
canonicalVersion,
|
||||
ReadOnlyList.wrap(fields),
|
||||
ReadOnlyList.wrap(intrinsics),
|
||||
builtinTypeDecl.span()));
|
||||
}
|
||||
|
||||
private void extractBuiltinConstSurface(
|
||||
final PbsAst.ConstDecl constDecl,
|
||||
final List<IRReservedMetadata.BuiltinConstSurface> builtinConstSurfaces) {
|
||||
final var builtinConstAttribute = firstAttributeNamed(constDecl.attributes(), ATTR_BUILTIN_CONST);
|
||||
if (builtinConstAttribute.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
|
||||
final var builtinConstMetadata = builtinConstAttribute.get();
|
||||
builtinConstSurfaces.add(new IRReservedMetadata.BuiltinConstSurface(
|
||||
constDecl.name(),
|
||||
stringArgument(builtinConstMetadata, "target").orElse(""),
|
||||
stringArgument(builtinConstMetadata, "name").orElse(constDecl.name()),
|
||||
longArgument(builtinConstMetadata, "version").orElse(0L),
|
||||
constDecl.span()));
|
||||
}
|
||||
|
||||
private void reportUnsupportedSurface(
|
||||
final DiagnosticSink diagnostics,
|
||||
final Span span,
|
||||
final String message) {
|
||||
Diagnostics.error(
|
||||
diagnostics,
|
||||
PbsLoadErrors.E_LOAD_UNSUPPORTED_RESERVED_METADATA_SURFACE.name(),
|
||||
message,
|
||||
span);
|
||||
}
|
||||
|
||||
private Optional<PbsAst.Attribute> firstAttributeNamed(
|
||||
final ReadOnlyList<PbsAst.Attribute> attributes,
|
||||
final String attributeName) {
|
||||
for (final var attribute : attributes) {
|
||||
if (attributeName.equals(attribute.name())) {
|
||||
return Optional.of(attribute);
|
||||
}
|
||||
}
|
||||
return Optional.empty();
|
||||
}
|
||||
|
||||
private Optional<String> stringArgument(
|
||||
final PbsAst.Attribute attribute,
|
||||
final String argumentName) {
|
||||
final var argument = findArgument(attribute, argumentName);
|
||||
if (argument.isEmpty()) {
|
||||
return Optional.empty();
|
||||
}
|
||||
if (argument.get().value() instanceof PbsAst.AttributeStringValue value) {
|
||||
return Optional.of(normalizeStringLiteralValue(value.value()));
|
||||
}
|
||||
return Optional.empty();
|
||||
}
|
||||
|
||||
private OptionalLong longArgument(
|
||||
final PbsAst.Attribute attribute,
|
||||
final String argumentName) {
|
||||
final var argument = findArgument(attribute, argumentName);
|
||||
if (argument.isEmpty()) {
|
||||
return OptionalLong.empty();
|
||||
}
|
||||
if (argument.get().value() instanceof PbsAst.AttributeIntValue value) {
|
||||
return OptionalLong.of(value.value());
|
||||
}
|
||||
return OptionalLong.empty();
|
||||
}
|
||||
|
||||
private Optional<PbsAst.AttributeArgument> findArgument(
|
||||
final PbsAst.Attribute attribute,
|
||||
final String argumentName) {
|
||||
for (final var argument : attribute.arguments()) {
|
||||
if (argumentName.equals(argument.name())) {
|
||||
return Optional.of(argument);
|
||||
}
|
||||
}
|
||||
return Optional.empty();
|
||||
}
|
||||
|
||||
private String normalizeStringLiteralValue(final String rawValue) {
|
||||
if (rawValue == null) {
|
||||
return "";
|
||||
}
|
||||
if (rawValue.length() >= 2 && rawValue.startsWith("\"") && rawValue.endsWith("\"")) {
|
||||
return rawValue.substring(1, rawValue.length() - 1);
|
||||
}
|
||||
return rawValue;
|
||||
}
|
||||
|
||||
private String typeSurfaceKey(final PbsAst.TypeRef typeRef) {
|
||||
if (typeRef == null) {
|
||||
return "unit";
|
||||
}
|
||||
return switch (typeRef.kind()) {
|
||||
case SIMPLE -> "simple:" + typeRef.name();
|
||||
case SELF -> "self";
|
||||
case OPTIONAL -> "optional(" + typeSurfaceKey(typeRef.inner()) + ")";
|
||||
case UNIT -> "unit";
|
||||
case GROUP -> "group(" + typeSurfaceKey(typeRef.inner()) + ")";
|
||||
case NAMED_TUPLE -> "tuple(" + typeRef.fields().stream()
|
||||
.map(field -> typeSurfaceKey(field.typeRef()))
|
||||
.reduce((left, right) -> left + "," + right)
|
||||
.orElse("") + ")";
|
||||
case ERROR -> "error";
|
||||
};
|
||||
}
|
||||
}
|
||||
+35
-3
@@ -116,7 +116,12 @@ public class PBSFrontendPhaseService implements FrontendPhaseService {
|
||||
}
|
||||
}
|
||||
|
||||
loadReservedStdlibModules(modulesByCoordinates, diagnostics, ctx.stdlibVersion());
|
||||
loadReservedStdlibModules(
|
||||
modulesByCoordinates,
|
||||
parsedSourceFiles,
|
||||
moduleKeyByFile,
|
||||
diagnostics,
|
||||
ctx.stdlibVersion());
|
||||
|
||||
final var modules = new ArrayList<PbsModuleVisibilityValidator.ModuleUnit>(modulesByCoordinates.size());
|
||||
for (final var entry : modulesByCoordinates.entrySet()) {
|
||||
@@ -130,19 +135,28 @@ public class PBSFrontendPhaseService implements FrontendPhaseService {
|
||||
moduleVisibilityValidator.validate(ReadOnlyList.wrap(modules), diagnostics);
|
||||
markModulesWithLinkingErrors(diagnostics, moduleKeyByFile, failedModuleKeys);
|
||||
|
||||
final var compiledSourceFiles = new ArrayList<CompiledSourceFile>(parsedSourceFiles.size());
|
||||
for (final var parsedSource : parsedSourceFiles) {
|
||||
if (failedModuleKeys.contains(parsedSource.moduleKey())) {
|
||||
continue;
|
||||
}
|
||||
final var compileErrorBaseline = diagnostics.errorCount();
|
||||
final var irBackendFile = frontendCompiler.compileParsedFile(
|
||||
parsedSource.fileId(),
|
||||
parsedSource.ast(),
|
||||
diagnostics,
|
||||
parsedSource.sourceKind());
|
||||
if (parsedSource.sourceKind() == SourceKind.SDK_INTERFACE) {
|
||||
if (diagnostics.errorCount() > compileErrorBaseline) {
|
||||
failedModuleKeys.add(parsedSource.moduleKey());
|
||||
}
|
||||
compiledSourceFiles.add(new CompiledSourceFile(parsedSource.moduleKey(), irBackendFile));
|
||||
}
|
||||
|
||||
for (final var compiledSource : compiledSourceFiles) {
|
||||
if (failedModuleKeys.contains(compiledSource.moduleKey())) {
|
||||
continue;
|
||||
}
|
||||
irBackendAggregator.merge(irBackendFile);
|
||||
irBackendAggregator.merge(compiledSource.irBackendFile());
|
||||
}
|
||||
|
||||
final var irBackend = irBackendAggregator.emit();
|
||||
@@ -152,6 +166,8 @@ public class PBSFrontendPhaseService implements FrontendPhaseService {
|
||||
|
||||
private void loadReservedStdlibModules(
|
||||
final Map<PbsModuleVisibilityValidator.ModuleCoordinates, MutableModuleUnit> modulesByCoordinates,
|
||||
final ArrayList<ParsedSourceFile> parsedSourceFiles,
|
||||
final Map<FileId, String> moduleKeyByFile,
|
||||
final DiagnosticSink diagnostics,
|
||||
final int stdlibVersion) {
|
||||
final var stdlibEnvironment = stdlibEnvironmentResolver.resolve(stdlibVersion);
|
||||
@@ -179,6 +195,17 @@ public class PBSFrontendPhaseService implements FrontendPhaseService {
|
||||
moduleData.sources.addAll(loadedModule.sourceFiles().asList());
|
||||
moduleData.barrels.addAll(loadedModule.barrelFiles().asList());
|
||||
modulesByCoordinates.put(loadedModule.coordinates(), moduleData);
|
||||
for (final var sourceFile : loadedModule.sourceFiles()) {
|
||||
moduleKeyByFile.put(sourceFile.fileId(), targetKey);
|
||||
parsedSourceFiles.add(new ParsedSourceFile(
|
||||
sourceFile.fileId(),
|
||||
sourceFile.ast(),
|
||||
targetKey,
|
||||
SourceKind.SDK_INTERFACE));
|
||||
}
|
||||
for (final var barrelFile : loadedModule.barrelFiles()) {
|
||||
moduleKeyByFile.put(barrelFile.fileId(), targetKey);
|
||||
}
|
||||
enqueueReservedImportsFromSourceFiles(loadedModule.sourceFiles().asList(), pending);
|
||||
}
|
||||
}
|
||||
@@ -293,4 +320,9 @@ public class PBSFrontendPhaseService implements FrontendPhaseService {
|
||||
String moduleKey,
|
||||
SourceKind sourceKind) {
|
||||
}
|
||||
|
||||
private record CompiledSourceFile(
|
||||
String moduleKey,
|
||||
p.studio.compiler.models.IRBackendFile irBackendFile) {
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user