implements PLN-0125
Intrepid/Prometeu/Studio/pipeline/head This commit looks good
JaCoCo Coverage #### Project Overview
No changes detected, that affect the code coverage.
* Line Coverage: 61.95% (17766/28676)
* Branch Coverage: 52.69% (6860/13019)
* Lines of Code: 28676
* Cyclomatic Complexity: 11490
#### Quality Gates Summary
Output truncated.
Test / Build skipped: 15, passed: 643
Intrepid/Prometeu/Studio/pipeline/pr-master This commit looks good
Intrepid/Prometeu/Studio/pipeline/head This commit looks good
JaCoCo Coverage #### Project Overview
No changes detected, that affect the code coverage.
* Line Coverage: 61.95% (17766/28676)
* Branch Coverage: 52.69% (6860/13019)
* Lines of Code: 28676
* Cyclomatic Complexity: 11490
#### Quality Gates Summary
Output truncated.
Test / Build skipped: 15, passed: 643
Intrepid/Prometeu/Studio/pipeline/pr-master This commit looks good
Move lifecycle assembly out of the PBS frontend into a common AssembleLifecyclePipelineStage. PBS emits a typed IRLifecycleDeclaration; the assembler owns wrappers, boot guard, and single project-init execution. Housekeep DSC-0059 with LSN-0062, and include the DSC-0062 PVM/PBX neutrality spec and lesson already present on this branch.
This commit is contained in:
+14
-5
@@ -8,6 +8,7 @@ import p.studio.compiler.models.IRBackendExecutableFunction;
|
||||
import p.studio.compiler.models.IRBackendFile;
|
||||
import p.studio.compiler.models.IRHiddenGlobalKind;
|
||||
import p.studio.compiler.models.IRGlobalVisibility;
|
||||
import p.studio.compiler.models.IRLifecycleCallableRole;
|
||||
import p.studio.compiler.models.IRSyntheticCallableKind;
|
||||
import p.studio.compiler.models.SourceKind;
|
||||
import p.studio.compiler.pbs.lexer.LexErrors;
|
||||
@@ -106,7 +107,7 @@ class PbsFrontendCompilerTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
void shouldExposeGlobalsAndSyntheticLifecycleArtifactsInBackendFile() {
|
||||
void shouldExposeGlobalsAndTypedLifecycleDeclarationInBackendFile() {
|
||||
final var source = """
|
||||
declare global SCORE: int = 0;
|
||||
|
||||
@@ -129,12 +130,20 @@ class PbsFrontendCompilerTest {
|
||||
assertFalse(fileBackend.globals().getFirst().isHidden());
|
||||
assertEquals(IRHiddenGlobalKind.NONE, fileBackend.globals().getFirst().hiddenKind());
|
||||
assertEquals("SCORE", fileBackend.globals().getFirst().origin().derivedFromUserSymbol());
|
||||
assertEquals(4, fileBackend.syntheticFunctions().size());
|
||||
assertEquals(1, fileBackend.syntheticFunctions().size());
|
||||
assertTrue(fileBackend.syntheticFunctions().stream().anyMatch(fn -> fn.kind() == IRSyntheticCallableKind.FILE_INIT_FRAGMENT));
|
||||
assertTrue(fileBackend.syntheticFunctions().stream().anyMatch(fn -> fn.kind() == IRSyntheticCallableKind.MODULE_INIT));
|
||||
assertTrue(fileBackend.syntheticFunctions().stream().anyMatch(fn -> fn.kind() == IRSyntheticCallableKind.PROJECT_INIT));
|
||||
assertTrue(fileBackend.syntheticFunctions().stream().anyMatch(fn -> fn.kind() == IRSyntheticCallableKind.PUBLISHED_FRAME_WRAPPER));
|
||||
assertTrue(fileBackend.syntheticFunctions().stream().allMatch(fn -> !fn.origin().anchorCallableName().isBlank()));
|
||||
assertEquals(IRLifecycleCallableRole.FILE_INIT_FRAGMENT,
|
||||
fileBackend.lifecycleDeclaration().fileInitFragment().role());
|
||||
assertEquals(IRLifecycleCallableRole.PROJECT_INIT,
|
||||
fileBackend.lifecycleDeclaration().projectInit().role());
|
||||
assertEquals(IRLifecycleCallableRole.FRAME_ROOT,
|
||||
fileBackend.lifecycleDeclaration().frameRoot().role());
|
||||
final var fileInit = fileBackend.executableFunctions().stream()
|
||||
.filter(fn -> fn.callableId().equals(fileBackend.lifecycleDeclaration().fileInitFragment().callableId()))
|
||||
.findFirst()
|
||||
.orElseThrow();
|
||||
assertTrue(fileInit.instructions().stream().noneMatch(instruction -> "boot".equals(instruction.calleeCallableName())));
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
+102
-33
@@ -386,8 +386,10 @@ class PBSFrontendPhaseServiceTest {
|
||||
assertTrue(diagnostics.isEmpty());
|
||||
assertEquals(2, irBackend.getFunctions().size());
|
||||
assertTrue(irBackend.getExecutableFunctions().stream().anyMatch(function -> "frame".equals(function.callableName())));
|
||||
assertTrue(irBackend.getExecutableFunctions().stream().anyMatch(function ->
|
||||
function.callableName().startsWith("__pbs.frame_wrapper$m")));
|
||||
assertNotNull(irBackend.getLifecycleDeclaration());
|
||||
assertEquals(IRLifecycleCallableRole.FRAME_ROOT, irBackend.getLifecycleDeclaration().frameRoot().role());
|
||||
assertTrue(irBackend.getSyntheticFunctions().stream().noneMatch(function ->
|
||||
function.kind() == IRSyntheticCallableKind.PUBLISHED_FRAME_WRAPPER));
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -483,36 +485,19 @@ class PBSFrontendPhaseServiceTest {
|
||||
BuildingIssueSink.empty());
|
||||
|
||||
assertTrue(diagnostics.isEmpty(), diagnostics.stream().map(d -> d.getCode() + ":" + d.getMessage()).toList().toString());
|
||||
assertTrue(irBackend.getEntryPointCallableName().startsWith("__pbs.frame_wrapper$m"));
|
||||
assertNotNull(irBackend.getLifecycleDeclaration());
|
||||
assertEquals(IRLifecycleCallableRole.PROJECT_INIT, irBackend.getLifecycleDeclaration().projectInit().role());
|
||||
assertEquals(IRLifecycleCallableRole.FRAME_ROOT, irBackend.getLifecycleDeclaration().frameRoot().role());
|
||||
final var scoreGlobal = irBackend.getGlobals().stream()
|
||||
.filter(global -> "SCORE".equals(global.name()))
|
||||
.findFirst()
|
||||
.orElseThrow();
|
||||
assertEquals(IRGlobalVisibility.PUBLIC, scoreGlobal.visibility());
|
||||
final var bootGuard = irBackend.getGlobals().stream()
|
||||
.filter(global -> global.hiddenKind() == IRHiddenGlobalKind.BOOT_GUARD)
|
||||
.findFirst()
|
||||
.orElseThrow();
|
||||
assertTrue(bootGuard.isHidden());
|
||||
assertEquals(IRGlobalVisibility.MODULE, bootGuard.visibility());
|
||||
assertTrue(bootGuard.name().startsWith("__pbs.boot_guard$m"));
|
||||
assertEquals(1, bootGuard.slot());
|
||||
final var wrapper = irBackend.getExecutableFunctions().stream()
|
||||
.filter(function -> irBackend.getEntryPointCallableName().equals(function.callableName()))
|
||||
.findFirst()
|
||||
.orElseThrow();
|
||||
assertEquals(11, wrapper.instructions().size());
|
||||
assertEquals(p.studio.compiler.models.IRBackendExecutableFunction.InstructionKind.GET_GLOBAL, wrapper.instructions().get(0).kind());
|
||||
assertEquals(p.studio.compiler.models.IRBackendExecutableFunction.InstructionKind.PUSH_BOOL, wrapper.instructions().get(1).kind());
|
||||
assertEquals(p.studio.compiler.models.IRBackendExecutableFunction.InstructionKind.EQ, wrapper.instructions().get(2).kind());
|
||||
assertEquals(p.studio.compiler.models.IRBackendExecutableFunction.InstructionKind.JMP_IF_TRUE, wrapper.instructions().get(3).kind());
|
||||
assertTrue(wrapper.instructions().get(4).calleeCallableName().startsWith("__pbs.module_init$m"));
|
||||
assertTrue(wrapper.instructions().get(5).calleeCallableName().startsWith("__pbs.project_init$m"));
|
||||
assertEquals(p.studio.compiler.models.IRBackendExecutableFunction.InstructionKind.PUSH_BOOL, wrapper.instructions().get(6).kind());
|
||||
assertEquals(p.studio.compiler.models.IRBackendExecutableFunction.InstructionKind.SET_GLOBAL, wrapper.instructions().get(7).kind());
|
||||
assertEquals(p.studio.compiler.models.IRBackendExecutableFunction.InstructionKind.LABEL, wrapper.instructions().get(8).kind());
|
||||
assertEquals("frame", wrapper.instructions().get(9).calleeCallableName());
|
||||
assertEquals(p.studio.compiler.models.IRBackendExecutableFunction.InstructionKind.RET, wrapper.instructions().get(10).kind());
|
||||
assertTrue(irBackend.getGlobals().stream().noneMatch(global -> global.hiddenKind() == IRHiddenGlobalKind.BOOT_GUARD));
|
||||
assertTrue(irBackend.getSyntheticFunctions().stream().noneMatch(function ->
|
||||
function.kind() == IRSyntheticCallableKind.MODULE_INIT
|
||||
|| function.kind() == IRSyntheticCallableKind.PROJECT_INIT
|
||||
|| function.kind() == IRSyntheticCallableKind.PUBLISHED_FRAME_WRAPPER));
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -572,16 +557,100 @@ class PBSFrontendPhaseServiceTest {
|
||||
BuildingIssueSink.empty());
|
||||
|
||||
assertTrue(diagnostics.isEmpty(), diagnostics.stream().map(d -> d.getCode() + ":" + d.getMessage()).toList().toString());
|
||||
assertTrue(irBackend.getEntryPointCallableName().startsWith("__pbs.frame_wrapper$m"));
|
||||
assertNotNull(irBackend.getLifecycleDeclaration());
|
||||
assertTrue(irBackend.getExecutableFunctions().stream().anyMatch(function ->
|
||||
function.callableName().startsWith("__pbs.file_init$f")));
|
||||
assertTrue(irBackend.getExecutableFunctions().stream().anyMatch(function ->
|
||||
function.callableName().startsWith("__pbs.module_init$m")));
|
||||
assertTrue(irBackend.getExecutableFunctions().stream().anyMatch(function ->
|
||||
function.callableName().startsWith("__pbs.project_init$m")));
|
||||
assertEquals(1, irBackend.getLifecycleDeclaration().modules().getFirst().fileInitFragments().size());
|
||||
assertEquals(IRLifecycleCallableRole.PROJECT_INIT, irBackend.getLifecycleDeclaration().projectInit().role());
|
||||
assertEquals(IRLifecycleCallableRole.FRAME_ROOT, irBackend.getLifecycleDeclaration().frameRoot().role());
|
||||
assertTrue(irBackend.getGlobals().stream().anyMatch(global ->
|
||||
"SCORE".equals(global.name()) && global.visibility() == IRGlobalVisibility.PUBLIC));
|
||||
assertTrue(irBackend.getGlobals().stream().anyMatch(global -> global.hiddenKind() == IRHiddenGlobalKind.BOOT_GUARD));
|
||||
assertTrue(irBackend.getGlobals().stream().noneMatch(global -> global.hiddenKind() == IRHiddenGlobalKind.BOOT_GUARD));
|
||||
}
|
||||
|
||||
@Test
|
||||
void shouldPublishDependencyOrderedLifecycleModulesInsteadOfNameOrFileIdOrder() throws IOException {
|
||||
final var projectRoot = tempDir.resolve("project-lifecycle-dep-order");
|
||||
final var sourceRoot = projectRoot.resolve("src");
|
||||
final var zzzPath = sourceRoot.resolve("zzz");
|
||||
final var aaaPath = sourceRoot.resolve("aaa");
|
||||
Files.createDirectories(zzzPath);
|
||||
Files.createDirectories(aaaPath);
|
||||
|
||||
final var zzzSource = zzzPath.resolve("source.pbs");
|
||||
final var zzzBarrel = zzzPath.resolve("mod.barrel");
|
||||
Files.writeString(zzzSource, """
|
||||
declare global WARM: int = 1;
|
||||
|
||||
[Init]
|
||||
fn warmup() -> void { return; }
|
||||
""");
|
||||
Files.writeString(zzzBarrel, """
|
||||
pub fn warmup() -> void;
|
||||
pub global WARM;
|
||||
""");
|
||||
|
||||
final var aaaSource = aaaPath.resolve("source.pbs");
|
||||
final var aaaBarrel = aaaPath.resolve("mod.barrel");
|
||||
Files.writeString(aaaSource, """
|
||||
import { warmup } from @app:zzz;
|
||||
|
||||
[Init]
|
||||
fn boot() -> void {
|
||||
warmup();
|
||||
return;
|
||||
}
|
||||
|
||||
[Frame]
|
||||
fn frame() -> void { return; }
|
||||
""");
|
||||
Files.writeString(aaaBarrel, """
|
||||
pub fn boot() -> void;
|
||||
pub fn frame() -> void;
|
||||
""");
|
||||
|
||||
final var projectTable = new ProjectTable();
|
||||
final var fileTable = new FileTable(1);
|
||||
final var projectId = projectTable.register(ProjectDescriptor.builder()
|
||||
.rootPath(projectRoot)
|
||||
.name("app")
|
||||
.version("1.0.0")
|
||||
.sourceRoots(ReadOnlyList.wrap(List.of(sourceRoot)))
|
||||
.build());
|
||||
|
||||
registerFile(projectId, projectRoot, aaaSource, fileTable);
|
||||
registerFile(projectId, projectRoot, aaaBarrel, fileTable);
|
||||
registerFile(projectId, projectRoot, zzzSource, fileTable);
|
||||
registerFile(projectId, projectRoot, zzzBarrel, fileTable);
|
||||
|
||||
final var ctx = new FrontendPhaseContext(
|
||||
projectTable,
|
||||
fileTable,
|
||||
new BuildStack(ReadOnlyList.wrap(List.of(projectId))),
|
||||
AppMode.Game);
|
||||
final var diagnostics = DiagnosticSink.empty();
|
||||
|
||||
final var irBackend = new PBSFrontendPhaseService().compile(
|
||||
ctx,
|
||||
diagnostics,
|
||||
LogAggregator.empty(),
|
||||
BuildingIssueSink.empty());
|
||||
|
||||
assertEquals(0, diagnostics.errorCount(), diagnostics.stream().map(d -> d.getCode() + ":" + d.getMessage()).toList().toString());
|
||||
final var declaration = irBackend.getLifecycleDeclaration();
|
||||
assertNotNull(declaration);
|
||||
assertEquals(2, declaration.modules().size());
|
||||
final var firstModule = irBackend.getModulePool().get(declaration.modules().get(0).moduleId().getIndex());
|
||||
final var secondModule = irBackend.getModulePool().get(declaration.modules().get(1).moduleId().getIndex());
|
||||
assertEquals("zzz", firstModule.pathSegments().getFirst());
|
||||
assertEquals("aaa", secondModule.pathSegments().getFirst());
|
||||
assertFalse(declaration.modules().get(0).fileInitFragments().isEmpty());
|
||||
assertEquals(IRLifecycleCallableRole.PROJECT_INIT, declaration.projectInit().role());
|
||||
assertEquals(IRLifecycleCallableRole.FRAME_ROOT, declaration.frameRoot().role());
|
||||
assertTrue(irBackend.getSyntheticFunctions().stream().noneMatch(function ->
|
||||
function.kind() == IRSyntheticCallableKind.MODULE_INIT
|
||||
|| function.kind() == IRSyntheticCallableKind.PROJECT_INIT
|
||||
|| function.kind() == IRSyntheticCallableKind.PUBLISHED_FRAME_WRAPPER));
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
Reference in New Issue
Block a user