implements PR-09.1: remove moduleKey from FE/BE contracts
This commit is contained in:
-32
@@ -15,7 +15,6 @@ import p.studio.utilities.structures.ReadOnlyList;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.LinkedHashSet;
|
||||
import java.util.List;
|
||||
|
||||
@Builder
|
||||
@Getter
|
||||
@@ -108,12 +107,10 @@ public class IRBackend {
|
||||
final var signature = localCallableSignatures.get(i);
|
||||
final var remappedModuleId = remapModuleId(
|
||||
signature.moduleId(),
|
||||
signature.moduleKey(),
|
||||
moduleRemap,
|
||||
"callable signature");
|
||||
remap[i] = callableTable.register(
|
||||
remappedModuleId,
|
||||
signature.moduleKey(),
|
||||
signature.callableName(),
|
||||
signature.arity(),
|
||||
signature.typeShape());
|
||||
@@ -129,7 +126,6 @@ public class IRBackend {
|
||||
final var remappedInstructions = new ArrayList<IRBackendExecutableFunction.Instruction>(function.instructions().size());
|
||||
final var remappedFunctionModuleId = remapModuleId(
|
||||
function.moduleId(),
|
||||
function.moduleKey(),
|
||||
moduleRemap,
|
||||
"function");
|
||||
for (final var instruction : function.instructions()) {
|
||||
@@ -151,13 +147,11 @@ public class IRBackend {
|
||||
}
|
||||
final var remappedCalleeModuleId = remapModuleId(
|
||||
instruction.calleeModuleId(),
|
||||
instruction.calleeModuleKey(),
|
||||
moduleRemap,
|
||||
"callee");
|
||||
remappedInstructions.add(new IRBackendExecutableFunction.Instruction(
|
||||
instruction.kind(),
|
||||
remappedCalleeModuleId,
|
||||
instruction.calleeModuleKey(),
|
||||
instruction.calleeCallableName(),
|
||||
remappedCallee,
|
||||
instruction.hostCall(),
|
||||
@@ -171,7 +165,6 @@ public class IRBackend {
|
||||
return new IRBackendExecutableFunction(
|
||||
function.fileId(),
|
||||
remappedFunctionModuleId,
|
||||
function.moduleKey(),
|
||||
function.callableName(),
|
||||
remapCallableId(function.callableId(), callableRemap, "function"),
|
||||
function.sourceStart(),
|
||||
@@ -186,7 +179,6 @@ public class IRBackend {
|
||||
|
||||
private ModuleId remapModuleId(
|
||||
final ModuleId localModuleId,
|
||||
final String moduleKey,
|
||||
final ModuleId[] moduleRemap,
|
||||
final String label) {
|
||||
if (localModuleId != null && !localModuleId.isNone()) {
|
||||
@@ -196,33 +188,9 @@ public class IRBackend {
|
||||
}
|
||||
return moduleRemap[localIndex];
|
||||
}
|
||||
final var fallbackReference = moduleReferenceFromKey(moduleKey);
|
||||
if (fallbackReference != null) {
|
||||
return moduleTable.register(fallbackReference);
|
||||
}
|
||||
return ModuleId.none();
|
||||
}
|
||||
|
||||
private ModuleReference moduleReferenceFromKey(final String moduleKey) {
|
||||
if (moduleKey == null || moduleKey.isBlank()) {
|
||||
return null;
|
||||
}
|
||||
final var separator = moduleKey.indexOf(':');
|
||||
if (separator <= 0) {
|
||||
return null;
|
||||
}
|
||||
final var project = moduleKey.substring(0, separator).trim();
|
||||
final var rawPath = moduleKey.substring(separator + 1).trim();
|
||||
if (project.isBlank()) {
|
||||
return null;
|
||||
}
|
||||
if (rawPath.isBlank()) {
|
||||
return new ModuleReference(project, ReadOnlyList.empty());
|
||||
}
|
||||
final var segments = List.of(rawPath.split("/"));
|
||||
return new ModuleReference(project, ReadOnlyList.wrap(segments));
|
||||
}
|
||||
|
||||
private CallableId remapCallableId(
|
||||
final CallableId localCallableId,
|
||||
final CallableId[] callableRemap,
|
||||
|
||||
+9
-24
@@ -12,7 +12,6 @@ import java.util.Objects;
|
||||
public record IRBackendExecutableFunction(
|
||||
FileId fileId,
|
||||
ModuleId moduleId,
|
||||
String moduleKey,
|
||||
String callableName,
|
||||
CallableId callableId,
|
||||
int sourceStart,
|
||||
@@ -26,7 +25,6 @@ public record IRBackendExecutableFunction(
|
||||
|
||||
public IRBackendExecutableFunction(
|
||||
final FileId fileId,
|
||||
final String moduleKey,
|
||||
final String callableName,
|
||||
final CallableId callableId,
|
||||
final int sourceStart,
|
||||
@@ -40,7 +38,6 @@ public record IRBackendExecutableFunction(
|
||||
this(
|
||||
fileId,
|
||||
ModuleId.none(),
|
||||
moduleKey,
|
||||
callableName,
|
||||
callableId,
|
||||
sourceStart,
|
||||
@@ -59,7 +56,6 @@ public record IRBackendExecutableFunction(
|
||||
if (!moduleId.isNone()) {
|
||||
moduleId.getIndex();
|
||||
}
|
||||
moduleKey = moduleKey == null ? "" : moduleKey;
|
||||
callableName = Objects.requireNonNull(callableName, "callableName");
|
||||
if (callableName.isBlank()) {
|
||||
throw new IllegalArgumentException("callableName must not be blank");
|
||||
@@ -88,7 +84,6 @@ public record IRBackendExecutableFunction(
|
||||
public record Instruction(
|
||||
InstructionKind kind,
|
||||
ModuleId calleeModuleId,
|
||||
String calleeModuleKey,
|
||||
String calleeCallableName,
|
||||
CallableId calleeCallableId,
|
||||
HostCallMetadata hostCall,
|
||||
@@ -101,19 +96,17 @@ public record IRBackendExecutableFunction(
|
||||
public Instruction(
|
||||
final InstructionKind kind,
|
||||
final ModuleId calleeModuleId,
|
||||
final String calleeModuleKey,
|
||||
final String calleeCallableName,
|
||||
final CallableId calleeCallableId,
|
||||
final HostCallMetadata hostCall,
|
||||
final IntrinsicCallMetadata intrinsicCall,
|
||||
final Span span) {
|
||||
this(kind, calleeModuleId, calleeModuleKey, calleeCallableName, calleeCallableId, hostCall, intrinsicCall, null, null, null, null, span);
|
||||
this(kind, calleeModuleId, calleeCallableName, calleeCallableId, hostCall, intrinsicCall, null, null, null, null, span);
|
||||
}
|
||||
|
||||
public Instruction(
|
||||
final InstructionKind kind,
|
||||
final ModuleId calleeModuleId,
|
||||
final String calleeModuleKey,
|
||||
final String calleeCallableName,
|
||||
final CallableId calleeCallableId,
|
||||
final HostCallMetadata hostCall,
|
||||
@@ -121,36 +114,33 @@ public record IRBackendExecutableFunction(
|
||||
final Integer expectedArgSlots,
|
||||
final Integer expectedRetSlots,
|
||||
final Span span) {
|
||||
this(kind, calleeModuleId, calleeModuleKey, calleeCallableName, calleeCallableId, hostCall, intrinsicCall, null, null, expectedArgSlots, expectedRetSlots, span);
|
||||
this(kind, calleeModuleId, calleeCallableName, calleeCallableId, hostCall, intrinsicCall, null, null, expectedArgSlots, expectedRetSlots, span);
|
||||
}
|
||||
|
||||
public Instruction(
|
||||
final InstructionKind kind,
|
||||
final ModuleId calleeModuleId,
|
||||
final String calleeModuleKey,
|
||||
final String calleeCallableName,
|
||||
final HostCallMetadata hostCall,
|
||||
final IntrinsicCallMetadata intrinsicCall,
|
||||
final Span span) {
|
||||
this(kind, calleeModuleId, calleeModuleKey, calleeCallableName, null, hostCall, intrinsicCall, null, null, null, null, span);
|
||||
this(kind, calleeModuleId, calleeCallableName, null, hostCall, intrinsicCall, null, null, null, null, span);
|
||||
}
|
||||
|
||||
public Instruction(
|
||||
final InstructionKind kind,
|
||||
final ModuleId calleeModuleId,
|
||||
final String calleeModuleKey,
|
||||
final String calleeCallableName,
|
||||
final HostCallMetadata hostCall,
|
||||
final IntrinsicCallMetadata intrinsicCall,
|
||||
final Integer expectedArgSlots,
|
||||
final Integer expectedRetSlots,
|
||||
final Span span) {
|
||||
this(kind, calleeModuleId, calleeModuleKey, calleeCallableName, null, hostCall, intrinsicCall, null, null, expectedArgSlots, expectedRetSlots, span);
|
||||
this(kind, calleeModuleId, calleeCallableName, null, hostCall, intrinsicCall, null, null, expectedArgSlots, expectedRetSlots, span);
|
||||
}
|
||||
|
||||
public Instruction(
|
||||
final InstructionKind kind,
|
||||
final String calleeModuleKey,
|
||||
final String calleeCallableName,
|
||||
final CallableId calleeCallableId,
|
||||
final HostCallMetadata hostCall,
|
||||
@@ -160,23 +150,21 @@ public record IRBackendExecutableFunction(
|
||||
final Integer expectedArgSlots,
|
||||
final Integer expectedRetSlots,
|
||||
final Span span) {
|
||||
this(kind, ModuleId.none(), calleeModuleKey, calleeCallableName, calleeCallableId, hostCall, intrinsicCall, label, targetLabel, expectedArgSlots, expectedRetSlots, span);
|
||||
this(kind, ModuleId.none(), calleeCallableName, calleeCallableId, hostCall, intrinsicCall, label, targetLabel, expectedArgSlots, expectedRetSlots, span);
|
||||
}
|
||||
|
||||
public Instruction(
|
||||
final InstructionKind kind,
|
||||
final String calleeModuleKey,
|
||||
final String calleeCallableName,
|
||||
final CallableId calleeCallableId,
|
||||
final HostCallMetadata hostCall,
|
||||
final IntrinsicCallMetadata intrinsicCall,
|
||||
final Span span) {
|
||||
this(kind, ModuleId.none(), calleeModuleKey, calleeCallableName, calleeCallableId, hostCall, intrinsicCall, null, null, null, null, span);
|
||||
this(kind, ModuleId.none(), calleeCallableName, calleeCallableId, hostCall, intrinsicCall, null, null, null, null, span);
|
||||
}
|
||||
|
||||
public Instruction(
|
||||
final InstructionKind kind,
|
||||
final String calleeModuleKey,
|
||||
final String calleeCallableName,
|
||||
final CallableId calleeCallableId,
|
||||
final HostCallMetadata hostCall,
|
||||
@@ -184,29 +172,27 @@ public record IRBackendExecutableFunction(
|
||||
final Integer expectedArgSlots,
|
||||
final Integer expectedRetSlots,
|
||||
final Span span) {
|
||||
this(kind, ModuleId.none(), calleeModuleKey, calleeCallableName, calleeCallableId, hostCall, intrinsicCall, null, null, expectedArgSlots, expectedRetSlots, span);
|
||||
this(kind, ModuleId.none(), calleeCallableName, calleeCallableId, hostCall, intrinsicCall, null, null, expectedArgSlots, expectedRetSlots, span);
|
||||
}
|
||||
|
||||
public Instruction(
|
||||
final InstructionKind kind,
|
||||
final String calleeModuleKey,
|
||||
final String calleeCallableName,
|
||||
final HostCallMetadata hostCall,
|
||||
final IntrinsicCallMetadata intrinsicCall,
|
||||
final Span span) {
|
||||
this(kind, ModuleId.none(), calleeModuleKey, calleeCallableName, null, hostCall, intrinsicCall, null, null, null, null, span);
|
||||
this(kind, ModuleId.none(), calleeCallableName, null, hostCall, intrinsicCall, null, null, null, null, span);
|
||||
}
|
||||
|
||||
public Instruction(
|
||||
final InstructionKind kind,
|
||||
final String calleeModuleKey,
|
||||
final String calleeCallableName,
|
||||
final HostCallMetadata hostCall,
|
||||
final IntrinsicCallMetadata intrinsicCall,
|
||||
final Integer expectedArgSlots,
|
||||
final Integer expectedRetSlots,
|
||||
final Span span) {
|
||||
this(kind, ModuleId.none(), calleeModuleKey, calleeCallableName, null, hostCall, intrinsicCall, null, null, expectedArgSlots, expectedRetSlots, span);
|
||||
this(kind, ModuleId.none(), calleeCallableName, null, hostCall, intrinsicCall, null, null, expectedArgSlots, expectedRetSlots, span);
|
||||
}
|
||||
|
||||
public Instruction {
|
||||
@@ -216,7 +202,6 @@ public record IRBackendExecutableFunction(
|
||||
if (!calleeModuleId.isNone()) {
|
||||
calleeModuleId.getIndex();
|
||||
}
|
||||
calleeModuleKey = calleeModuleKey == null ? "" : calleeModuleKey;
|
||||
calleeCallableName = calleeCallableName == null ? "" : calleeCallableName;
|
||||
label = label == null ? "" : label;
|
||||
targetLabel = targetLabel == null ? "" : targetLabel;
|
||||
|
||||
Reference in New Issue
Block a user