implements PR-05.0.3
This commit is contained in:
+10
-9
@@ -15,7 +15,9 @@ import p.studio.compiler.pbs.semantics.PbsFlowSemanticsValidator;
|
||||
import p.studio.compiler.pbs.semantics.PbsSemanticsErrors;
|
||||
import p.studio.compiler.source.diagnostics.DiagnosticSink;
|
||||
import p.studio.compiler.source.diagnostics.DiagnosticPhase;
|
||||
import p.studio.compiler.source.identifiers.CallableId;
|
||||
import p.studio.compiler.source.identifiers.FileId;
|
||||
import p.studio.compiler.source.identifiers.IntrinsicId;
|
||||
import p.studio.compiler.source.tables.CallableSignatureRef;
|
||||
import p.studio.compiler.source.tables.CallableTable;
|
||||
import p.studio.compiler.source.tables.IntrinsicReference;
|
||||
@@ -186,17 +188,16 @@ public final class PbsFrontendCompiler {
|
||||
}
|
||||
}
|
||||
final var callableIdTable = new CallableTable();
|
||||
final var callableIdsByNameAndArity = new HashMap<String, List<Integer>>();
|
||||
final var callableIdByDeclaration = new HashMap<PbsAst.FunctionDecl, Integer>();
|
||||
final var returnSlotsByCallableId = new HashMap<Integer, Integer>();
|
||||
final var callableIdsByNameAndArity = new HashMap<String, List<CallableId>>();
|
||||
final var callableIdByDeclaration = new HashMap<PbsAst.FunctionDecl, CallableId>();
|
||||
final var returnSlotsByCallableId = new HashMap<CallableId, Integer>();
|
||||
final var intrinsicIdTable = new IntrinsicTable();
|
||||
for (final var declaredFn : ast.functions()) {
|
||||
final var callableId = callableIdTable.register(
|
||||
normalizedModuleKey,
|
||||
declaredFn.name(),
|
||||
declaredFn.parameters().size(),
|
||||
callableShapeKey(declaredFn))
|
||||
.getId();
|
||||
normalizedModuleKey,
|
||||
declaredFn.name(),
|
||||
declaredFn.parameters().size(),
|
||||
callableShapeKey(declaredFn));
|
||||
callableIdByDeclaration.put(declaredFn, callableId);
|
||||
callableIdsByNameAndArity
|
||||
.computeIfAbsent(callableArityKey(declaredFn.name(), declaredFn.parameters().size()), ignored -> new ArrayList<>())
|
||||
@@ -255,7 +256,7 @@ public final class PbsFrontendCompiler {
|
||||
intrinsic.canonicalVersion(),
|
||||
intrinsicIdTable
|
||||
.register(intrinsic.canonicalName(), intrinsic.canonicalVersion())
|
||||
.getId()),
|
||||
),
|
||||
callExpr.span()));
|
||||
continue;
|
||||
}
|
||||
|
||||
+3
-3
@@ -65,15 +65,15 @@ class PbsGoldenArtifactsTest {
|
||||
.append("::")
|
||||
.append(fn.callableName())
|
||||
.append(" id=")
|
||||
.append(fn.callableId())
|
||||
.append(fn.callableId().getId())
|
||||
.append('\n');
|
||||
for (final var instruction : fn.instructions()) {
|
||||
out.append(" ")
|
||||
.append(instruction.kind())
|
||||
.append(" calleeId=")
|
||||
.append(instruction.calleeCallableId() == null ? "-" : instruction.calleeCallableId())
|
||||
.append(instruction.calleeCallableId() == null ? "-" : instruction.calleeCallableId().getId())
|
||||
.append(" intrinsicId=")
|
||||
.append(instruction.intrinsicCall() == null ? "-" : instruction.intrinsicCall().intrinsicId())
|
||||
.append(instruction.intrinsicCall() == null ? "-" : instruction.intrinsicCall().intrinsicId().getId())
|
||||
.append('\n');
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user