Compare commits
32
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ae891262e1
|
||
|
|
6f45f4f205 | ||
|
|
65d2d40310
|
||
|
|
fa21a029ae | ||
|
|
12e2a4edcc
|
||
|
|
78d10cf03c | ||
|
|
5d3d48e802
|
||
|
|
331ad752d1 | ||
|
|
9458312d73
|
||
|
|
4b72b2a0dd | ||
|
|
c2112f6ee1
|
||
|
|
9896e7c657 | ||
|
|
4574aa17c3
|
||
|
|
bb010d565e | ||
|
|
e809ce63d3
|
||
|
|
59c0d0c3b4 | ||
|
|
79a682b8ec
|
||
|
|
d0b91f8526 | ||
|
|
2b881f5a76
|
||
|
|
4d8dcf28bb | ||
|
|
d7c2ec880f
|
||
|
|
c248b91147 | ||
|
|
46bd0c42d3
|
||
|
|
c6ef56114f | ||
|
|
701f5b0339
|
||
|
|
cc4cb23b76
|
||
|
|
f42c83bdca
|
||
|
|
cf14039077
|
||
|
|
1f1a92d43f
|
||
|
|
38790c0b45
|
||
|
|
5f6bd408a4
|
||
|
|
a77dce1c56 |
+15
-15
@@ -1,12 +1,12 @@
|
||||
{"type":"meta","next_id":{"DSC":66,"AGD":69,"DEC":44,"PLN":119,"LSN":60,"CLSN":1}}
|
||||
{"type":"discussion","id":"DSC-0065","status":"open","ticket":"multi-frontend-avoid-premature-abstractions","title":"Evitar abstracoes prematuras na preparacao multi-frontend","created_at":"2026-07-15","updated_at":"2026-07-15","tags":["compiler","compiler-general","studio","frontend","architecture","multi-frontend","simplicity"],"agendas":[{"id":"AGD-0068","file":"AGD-0068-multi-frontend-avoid-premature-abstractions.md","status":"open","created_at":"2026-07-15","updated_at":"2026-07-15"}],"decisions":[],"plans":[],"lessons":[]}
|
||||
{"type":"discussion","id":"DSC-0064","status":"open","ticket":"multi-frontend-architectural-tests","title":"Testes arquiteturais para fronteiras multi-frontend","created_at":"2026-07-15","updated_at":"2026-07-15","tags":["compiler","compiler-general","studio","frontend","architecture","tests","multi-frontend"],"agendas":[{"id":"AGD-0067","file":"AGD-0067-multi-frontend-architectural-tests.md","status":"open","created_at":"2026-07-15","updated_at":"2026-07-15"}],"decisions":[],"plans":[],"lessons":[]}
|
||||
{"type":"discussion","id":"DSC-0063","status":"open","ticket":"multi-frontend-synthetic-test-frontend","title":"Frontend sintetico de teste para provar neutralidade do pipeline","created_at":"2026-07-15","updated_at":"2026-07-15","tags":["compiler","compiler-general","frontend","tests","backend","multi-frontend"],"agendas":[{"id":"AGD-0066","file":"AGD-0066-multi-frontend-synthetic-test-frontend.md","status":"open","created_at":"2026-07-15","updated_at":"2026-07-15"}],"decisions":[],"plans":[],"lessons":[]}
|
||||
{"type":"discussion","id":"DSC-0062","status":"open","ticket":"multi-frontend-pvm-neutrality","title":"Neutralidade da PVM e identificacao PBX independente de PBS","created_at":"2026-07-15","updated_at":"2026-07-15","tags":["vm-arch","runtime","pvm","pbx","compiler","multi-frontend"],"agendas":[{"id":"AGD-0065","file":"AGD-0065-multi-frontend-pvm-neutrality.md","status":"open","created_at":"2026-07-15","updated_at":"2026-07-15"}],"decisions":[],"plans":[],"lessons":[]}
|
||||
{"type":"discussion","id":"DSC-0061","status":"open","ticket":"multi-frontend-sdk-canonical-definition","title":"Auditoria e centralizacao gradual da definicao canonica do SDK","created_at":"2026-07-15","updated_at":"2026-07-15","tags":["compiler","compiler-general","sdk","stdlib","hostcalls","intrinsics","multi-frontend"],"agendas":[{"id":"AGD-0064","file":"AGD-0064-multi-frontend-sdk-canonical-definition.md","status":"open","created_at":"2026-07-15","updated_at":"2026-07-15"}],"decisions":[],"plans":[],"lessons":[]}
|
||||
{"type":"discussion","id":"DSC-0060","status":"open","ticket":"multi-frontend-validation-boundaries","title":"Separar validacoes de linguagem e validacoes de plataforma","created_at":"2026-07-15","updated_at":"2026-07-15","tags":["compiler","compiler-general","compiler-pbs","backend","validation","multi-frontend"],"agendas":[{"id":"AGD-0063","file":"AGD-0063-multi-frontend-validation-boundaries.md","status":"open","created_at":"2026-07-15","updated_at":"2026-07-15"}],"decisions":[],"plans":[],"lessons":[]}
|
||||
{"type":"discussion","id":"DSC-0059","status":"open","ticket":"multi-frontend-common-lifecycle","title":"Extrair lifecycle comum das responsabilidades do frontend PBS","created_at":"2026-07-15","updated_at":"2026-07-15","tags":["compiler","compiler-general","compiler-pbs","lifecycle","backend","multi-frontend"],"agendas":[{"id":"AGD-0062","file":"AGD-0062-multi-frontend-common-lifecycle.md","status":"open","created_at":"2026-07-15","updated_at":"2026-07-15"}],"decisions":[],"plans":[],"lessons":[]}
|
||||
{"type":"discussion","id":"DSC-0058","status":"open","ticket":"multi-frontend-serializable-ir","title":"Manter a IR comum serializavel por design","created_at":"2026-07-15","updated_at":"2026-07-15","tags":["compiler","compiler-general","ir","backend","serialization","multi-frontend"],"agendas":[{"id":"AGD-0061","file":"AGD-0061-multi-frontend-serializable-ir.md","status":"open","created_at":"2026-07-15","updated_at":"2026-07-15"}],"decisions":[],"plans":[],"lessons":[]}
|
||||
{"type":"meta","next_id":{"DSC":66,"AGD":69,"DEC":58,"PLN":137,"LSN":74,"CLSN":1}}
|
||||
{"type":"discussion","id":"DSC-0065","status":"done","ticket":"multi-frontend-avoid-premature-abstractions","title":"Evitar abstracoes prematuras na preparacao multi-frontend","created_at":"2026-07-15","updated_at":"2026-09-19","tags":["compiler","compiler-general","studio","frontend","architecture","multi-frontend","simplicity"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0067","file":"discussion/lessons/DSC-0065-multi-frontend-avoid-premature-abstractions/LSN-0067-multi-frontend-phase-rejects-premature-infrastructure.md","status":"done","created_at":"2026-09-19","updated_at":"2026-09-19"}]}
|
||||
{"type":"discussion","id":"DSC-0064","status":"done","ticket":"multi-frontend-architectural-tests","title":"Testes arquiteturais para fronteiras multi-frontend","created_at":"2026-07-15","updated_at":"2026-09-19","tags":["compiler","compiler-general","studio","frontend","architecture","tests","multi-frontend"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0066","file":"discussion/lessons/DSC-0064-multi-frontend-architectural-tests/LSN-0066-archunit-guards-java-multi-frontend-boundaries.md","status":"done","created_at":"2026-09-19","updated_at":"2026-09-19"}]}
|
||||
{"type":"discussion","id":"DSC-0063","status":"done","ticket":"multi-frontend-synthetic-test-frontend","title":"Frontend sintetico de teste para provar neutralidade do pipeline","created_at":"2026-07-15","updated_at":"2026-09-19","tags":["compiler","compiler-general","frontend","tests","backend","multi-frontend"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0065","file":"discussion/lessons/DSC-0063-multi-frontend-synthetic-test-frontend/LSN-0065-synthetic-test-frontend-proves-pipeline-neutrality.md","status":"done","created_at":"2026-09-19","updated_at":"2026-09-19"}]}
|
||||
{"type":"discussion","id":"DSC-0062","status":"done","ticket":"multi-frontend-pvm-neutrality","title":"Neutralidade da PVM e identificacao PBX independente de PBS","created_at":"2026-07-15","updated_at":"2026-09-18","tags":["vm-arch","runtime","pvm","pbx","compiler","multi-frontend"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0061","file":"discussion/lessons/DSC-0062-multi-frontend-pvm-neutrality/LSN-0061-pbx-runtime-boundary.md","status":"done","created_at":"2026-09-18","updated_at":"2026-09-18"}]}
|
||||
{"type":"discussion","id":"DSC-0061","status":"done","ticket":"multi-frontend-sdk-canonical-definition","title":"Auditoria e centralizacao gradual da definicao canonica do SDK","created_at":"2026-07-15","updated_at":"2026-09-19","tags":["compiler","compiler-general","sdk","stdlib","hostcalls","intrinsics","multi-frontend"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0064","file":"discussion/lessons/DSC-0061-multi-frontend-sdk-canonical-definition/LSN-0064-runtime-owns-console-abi-pbs-is-delivery.md","status":"done","created_at":"2026-09-19","updated_at":"2026-09-19"}]}
|
||||
{"type":"discussion","id":"DSC-0060","status":"done","ticket":"multi-frontend-validation-boundaries","title":"Separar validacoes de linguagem e validacoes de plataforma","created_at":"2026-07-15","updated_at":"2026-09-19","tags":["compiler","compiler-general","compiler-pbs","backend","validation","multi-frontend"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0063","file":"discussion/lessons/DSC-0060-multi-frontend-validation-boundaries/LSN-0063-language-vs-platform-validation-ownership.md","status":"done","created_at":"2026-09-19","updated_at":"2026-09-19"}]}
|
||||
{"type":"discussion","id":"DSC-0059","status":"done","ticket":"multi-frontend-common-lifecycle","title":"Extrair lifecycle comum das responsabilidades do frontend PBS","created_at":"2026-07-15","updated_at":"2026-09-19","tags":["compiler","compiler-general","compiler-pbs","lifecycle","backend","multi-frontend"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0062","file":"discussion/lessons/DSC-0059-multi-frontend-common-lifecycle/LSN-0062-common-lifecycle-assembly-stage.md","status":"done","created_at":"2026-09-19","updated_at":"2026-09-19"}]}
|
||||
{"type":"discussion","id":"DSC-0058","status":"done","ticket":"multi-frontend-serializable-ir","title":"Manter a IR comum serializavel por design","created_at":"2026-07-15","updated_at":"2026-07-15","tags":["compiler","compiler-general","ir","backend","serialization","multi-frontend"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0060","file":"discussion/lessons/DSC-0058-multi-frontend-serializable-ir/LSN-0060-data-contract-first-for-serializable-irbackend.md","status":"done","created_at":"2026-07-15","updated_at":"2026-07-15"}]}
|
||||
{"type":"discussion","id":"DSC-0057","status":"done","ticket":"multi-frontend-frontend-backend-contract","title":"Estabilizar contrato entre frontend e backend comum","created_at":"2026-07-15","updated_at":"2026-07-15","tags":["compiler","compiler-general","compiler-pbs","ir","backend","multi-frontend"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0059","file":"discussion/lessons/DSC-0057-multi-frontend-frontend-backend-contract/LSN-0059-common-irbackend-handoff-and-backend-guardrails.md","status":"done","created_at":"2026-07-15","updated_at":"2026-07-15"}]}
|
||||
{"type":"discussion","id":"DSC-0056","status":"done","ticket":"multi-frontend-remove-pbs-branches","title":"Generalizar o contrato LSP/editorial para frontends","created_at":"2026-07-15","updated_at":"2026-07-15","tags":["compiler","compiler-general","compiler-pbs","studio","frontend","coupling","multi-frontend"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0058","file":"discussion/lessons/DSC-0056-multi-frontend-remove-pbs-branches/LSN-0058-generic-frontend-editorial-contract-for-lsp.md","status":"done","created_at":"2026-07-15","updated_at":"2026-07-15"}]}
|
||||
{"type":"discussion","id":"DSC-0055","status":"done","ticket":"multi-frontend-compiler-vs-language-services","title":"Separar compilacao de servicos editoriais de frontend","created_at":"2026-07-15","updated_at":"2026-07-15","tags":["compiler","compiler-general","studio","lsp","editor","frontend","multi-frontend"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0056","file":"discussion/lessons/DSC-0055-multi-frontend-compiler-vs-language-services/LSN-0056-compile-first-frontends-with-optional-editorial-capabilities.md","status":"done","created_at":"2026-07-15","updated_at":"2026-07-15"}]}
|
||||
@@ -20,12 +20,12 @@
|
||||
{"type":"discussion","id":"DSC-0047","status":"open","ticket":"pbs-lsp-semantic-tokens-semantic-classification","title":"PBS LSP Semantic Token Classification","created_at":"2026-07-15","updated_at":"2026-07-15","tags":["studio","lsp","vscode","compiler-pbs","editor","semantic-tokens"],"agendas":[{"id":"AGD-0050","file":"AGD-0050-pbs-lsp-semantic-token-classification.md","status":"open","created_at":"2026-07-15","updated_at":"2026-07-15"}],"decisions":[],"plans":[],"lessons":[]}
|
||||
{"type":"discussion","id":"DSC-0046","status":"open","ticket":"pbs-lsp-import-assistance","title":"PBS LSP Import Assistance","created_at":"2026-07-15","updated_at":"2026-07-15","tags":["studio","lsp","vscode","compiler-pbs","editor","imports","completion"],"agendas":[{"id":"AGD-0049","file":"AGD-0049-pbs-lsp-import-assistance.md","status":"open","created_at":"2026-07-15","updated_at":"2026-07-15"}],"decisions":[],"plans":[],"lessons":[]}
|
||||
{"type":"discussion","id":"DSC-0045","status":"open","ticket":"pbs-lsp-formatting","title":"PBS LSP Formatting","created_at":"2026-07-15","updated_at":"2026-07-15","tags":["studio","lsp","vscode","compiler-pbs","editor","formatting"],"agendas":[{"id":"AGD-0048","file":"AGD-0048-pbs-lsp-formatting.md","status":"open","created_at":"2026-07-15","updated_at":"2026-07-15"}],"decisions":[],"plans":[],"lessons":[]}
|
||||
{"type":"discussion","id":"DSC-0044","status":"open","ticket":"pbs-lsp-code-actions","title":"PBS LSP Code Actions and Quick Fixes","created_at":"2026-07-15","updated_at":"2026-07-15","tags":["studio","lsp","vscode","compiler-pbs","editor","code-actions","quick-fix"],"agendas":[{"id":"AGD-0047","file":"AGD-0047-pbs-lsp-code-actions-and-quick-fixes.md","status":"open","created_at":"2026-07-15","updated_at":"2026-07-15"}],"decisions":[],"plans":[],"lessons":[]}
|
||||
{"type":"discussion","id":"DSC-0043","status":"open","ticket":"pbs-lsp-rename-symbol","title":"PBS LSP Rename Symbol","created_at":"2026-07-15","updated_at":"2026-07-15","tags":["studio","lsp","vscode","compiler-pbs","editor","rename"],"agendas":[{"id":"AGD-0046","file":"AGD-0046-pbs-lsp-rename-symbol.md","status":"open","created_at":"2026-07-15","updated_at":"2026-07-15"}],"decisions":[],"plans":[],"lessons":[]}
|
||||
{"type":"discussion","id":"DSC-0042","status":"open","ticket":"pbs-lsp-workspace-symbols","title":"PBS LSP Workspace Symbols","created_at":"2026-07-15","updated_at":"2026-07-15","tags":["studio","lsp","vscode","compiler-pbs","editor","workspace-symbols"],"agendas":[{"id":"AGD-0045","file":"AGD-0045-pbs-lsp-workspace-symbols.md","status":"open","created_at":"2026-07-15","updated_at":"2026-07-15"}],"decisions":[],"plans":[],"lessons":[]}
|
||||
{"type":"discussion","id":"DSC-0041","status":"open","ticket":"pbs-lsp-document-symbols-outline","title":"PBS LSP Document Symbols and Outline","created_at":"2026-07-15","updated_at":"2026-07-15","tags":["studio","lsp","vscode","compiler-pbs","editor","outline","document-symbols"],"agendas":[{"id":"AGD-0044","file":"AGD-0044-pbs-lsp-document-symbols-and-outline.md","status":"open","created_at":"2026-07-15","updated_at":"2026-07-15"}],"decisions":[],"plans":[],"lessons":[]}
|
||||
{"type":"discussion","id":"DSC-0040","status":"open","ticket":"pbs-lsp-find-references","title":"PBS LSP Find References","created_at":"2026-07-15","updated_at":"2026-07-15","tags":["studio","lsp","vscode","compiler-pbs","editor","references"],"agendas":[{"id":"AGD-0043","file":"AGD-0043-pbs-lsp-find-references.md","status":"open","created_at":"2026-07-15","updated_at":"2026-07-15"}],"decisions":[],"plans":[],"lessons":[]}
|
||||
{"type":"discussion","id":"DSC-0039","status":"open","ticket":"pbs-lsp-go-to-definition","title":"PBS LSP Go to Definition","created_at":"2026-07-15","updated_at":"2026-07-15","tags":["studio","lsp","vscode","compiler-pbs","editor","definition"],"agendas":[{"id":"AGD-0042","file":"AGD-0042-pbs-lsp-go-to-definition.md","status":"open","created_at":"2026-07-15","updated_at":"2026-07-15"}],"decisions":[],"plans":[],"lessons":[]}
|
||||
{"type":"discussion","id":"DSC-0044","status":"done","ticket":"pbs-lsp-code-actions","title":"PBS LSP Code Actions and Quick Fixes","created_at":"2026-07-15","updated_at":"2026-09-22","tags":["studio","lsp","vscode","compiler-pbs","editor","code-actions","quick-fix"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0073","file":"discussion/lessons/DSC-0044-pbs-lsp-code-actions/LSN-0073-pbs-quick-fixes-are-frontend-repairs-transported-by-the-lsp.md","status":"done","created_at":"2026-09-22","updated_at":"2026-09-22"}]}
|
||||
{"type":"discussion","id":"DSC-0043","status":"done","ticket":"pbs-lsp-rename-symbol","title":"PBS LSP Rename Symbol","created_at":"2026-07-15","updated_at":"2026-09-22","tags":["studio","lsp","vscode","compiler-pbs","editor","rename"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0072","file":"discussion/lessons/DSC-0043-pbs-lsp-rename-symbol/LSN-0072-pbs-rename-is-a-validated-physical-workspace-edit.md","status":"done","created_at":"2026-09-22","updated_at":"2026-09-22"}]}
|
||||
{"type":"discussion","id":"DSC-0042","status":"done","ticket":"pbs-lsp-workspace-symbols","title":"PBS LSP Workspace Symbols","created_at":"2026-07-15","updated_at":"2026-09-21","tags":["studio","lsp","vscode","compiler-pbs","editor","workspace-symbols"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0071","file":"discussion/lessons/DSC-0042-pbs-lsp-workspace-symbols/LSN-0071-pbs-workspace-symbols-are-a-physical-named-declaration-search.md","status":"done","created_at":"2026-09-21","updated_at":"2026-09-21"}]}
|
||||
{"type":"discussion","id":"DSC-0041","status":"done","ticket":"pbs-lsp-document-symbols-outline","title":"PBS LSP Document Symbols and Outline","created_at":"2026-07-15","updated_at":"2026-09-21","tags":["studio","lsp","vscode","compiler-pbs","editor","outline","document-symbols"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0070","file":"discussion/lessons/DSC-0041-pbs-lsp-document-symbols-outline/LSN-0070-pbs-outline-is-an-ast-backed-document-symbol-tree.md","status":"done","created_at":"2026-09-21","updated_at":"2026-09-21"}]}
|
||||
{"type":"discussion","id":"DSC-0040","status":"done","ticket":"pbs-lsp-find-references","title":"PBS LSP Find References","created_at":"2026-07-15","updated_at":"2026-09-21","tags":["studio","lsp","vscode","compiler-pbs","editor","references"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0069","file":"discussion/lessons/DSC-0040-pbs-lsp-find-references/LSN-0069-pbs-find-references-is-the-physical-inverse-of-definition.md","status":"done","created_at":"2026-09-21","updated_at":"2026-09-21"}]}
|
||||
{"type":"discussion","id":"DSC-0039","status":"done","ticket":"pbs-lsp-go-to-definition","title":"PBS LSP Go to Definition","created_at":"2026-07-15","updated_at":"2026-09-21","tags":["studio","lsp","vscode","compiler-pbs","editor","definition"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0068","file":"discussion/lessons/DSC-0039-pbs-lsp-go-to-definition/LSN-0068-pbs-go-to-definition-uses-editorial-lookup-and-physical-files.md","status":"done","created_at":"2026-09-21","updated_at":"2026-09-21"}]}
|
||||
{"type":"discussion","id":"DSC-0038","status":"done","ticket":"studio-packer-rgba8888-asset-pipeline","title":"Studio and Packer RGBA8888 Asset Pipeline Alignment","created_at":"2026-05-23","updated_at":"2026-07-14","tags":["studio","packer","assets","glyph-bank","palette","rgba8888","runtime-alignment"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0053","file":"discussion/lessons/DSC-0038-studio-packer-rgba8888-asset-pipeline/LSN-0053-rgba8888-is-the-canonical-studio-packer-palette-contract.md","status":"done","created_at":"2026-07-14","updated_at":"2026-07-14"}]}
|
||||
{"type":"discussion","id":"DSC-0037","status":"done","ticket":"pbs-autocomplete-parameter-names","title":"PBS autocomplete parameter names for stdlib and method calls","created_at":"2026-05-08","updated_at":"2026-05-14","tags":["compiler-pbs","studio","lsp","autocomplete","signature-help","stdlib"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0052","file":"discussion/lessons/DSC-0037-pbs-autocomplete-parameter-names/LSN-0052-canonical-callable-parameter-names-through-pbs-editor-assistance.md","status":"done","created_at":"2026-05-14","updated_at":"2026-05-14"}]}
|
||||
{"type":"discussion","id":"DSC-0036","status":"done","ticket":"pbs-symbol-documentation-and-hover-markdown","title":"Modelo de documentacao de simbolos em PBS e consumo markdown no hover","created_at":"2026-05-08","updated_at":"2026-07-15","tags":["compiler","compiler-pbs","studio","lsp","vscode","editor","hover","documentation","markdown"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0057","file":"discussion/lessons/DSC-0036-pbs-symbol-documentation-and-hover-markdown/LSN-0057-compiler-owned-pbs-doc-markdown-for-editor-assistance.md","status":"done","created_at":"2026-07-15","updated_at":"2026-07-15"}]}
|
||||
|
||||
+98
@@ -0,0 +1,98 @@
|
||||
---
|
||||
id: LSN-0068
|
||||
ticket: pbs-lsp-go-to-definition
|
||||
title: PBS go-to-definition uses editorial lookup and physical files
|
||||
created: 2026-09-21
|
||||
tags: [studio, lsp, vscode, compiler-pbs, editor, definition]
|
||||
---
|
||||
|
||||
# PBS go-to-definition uses editorial lookup and physical files
|
||||
|
||||
## Original Problem
|
||||
|
||||
PBS editor assistance already had compiler-backed completion, hover, and signature help (`LSN-0051`). Users still could not jump from a use to a declaration. Wave 1 explicitly deferred `go to definition`.
|
||||
|
||||
The remaining LSP navigation family (references, rename, workspace symbols, document links, hierarchy) needed a destination policy before those features could be honest. The risk was shipping a text search, a new `SymbolId` index, or virtual documents for stdlib before a real physical target existed.
|
||||
|
||||
## Consolidated Decision
|
||||
|
||||
PBS Go to Definition is the LSP projection of **physical declaration locations** on top of the **same editorial lookup hover already uses**.
|
||||
|
||||
Durable locks from `DEC-0052`:
|
||||
|
||||
1. Resolve the identifier under the cursor through the hover path (locals, parameters, members, imports/supplementals, current-module top-level). Do not use text search or a new usage index.
|
||||
2. Keep the capability on the existing aggregated `FrontendLanguageService`. Add a default-empty `definition` method and a generic location DTO. Do not add a Definition SPI.
|
||||
3. Map PBS editorial spans inside `prometeu-frontend-pbs`. Common LSP must not import `p.studio.compiler.pbs.*`.
|
||||
4. Jump only when `Span.fileId` maps to a **regular filesystem file**. Otherwise return an empty list. Do not create virtual documents, `untitled:` buffers, or synthetic URIs.
|
||||
5. The destination is the canonical declaration, not the import-alias line. Overloads return every matching location.
|
||||
6. Advertise `definitionProvider`. Partial coverage is valid. Keywords, source-less builtins, unresolved names, and virtual stdlib paths stay empty; hover is unchanged.
|
||||
7. Analysis stays request-local, like hover. This discussion does not build references, rename, or snapshot cache.
|
||||
|
||||
Spec 23 §8.3 already listed definition as an optional editor capability. It now also states: a definition location must identify a compiler-known physical source file, or the response must be empty.
|
||||
|
||||
## Final Implementation
|
||||
|
||||
| Layer | What landed |
|
||||
|---|---|
|
||||
| PBS editorial | `PbsEditorialSupportService.definition` reuses hover dispatch and attaches declaration `Span`s (`PbsEditorialLocation`). |
|
||||
| Generic contract | `FrontendDefinitionLocation` (absolute path + offsets) and `FrontendLanguageService.definition` defaulting to `List.of()`. |
|
||||
| PBS mapping | `PBSFrontendLanguageService` maps `FileId` through `fileTable` and keeps the location only if `Files.isRegularFile(path)`. |
|
||||
| LSP | `LanguageServiceBridge.definition`, `definitionProvider`, `textDocument/definition`. Compile-only frontends return empty. |
|
||||
| VS Code | Unchanged thin client. |
|
||||
|
||||
Stdlib and SDK modules are still registered under virtual paths such as `/virtual/stdlib/...`. Those handles are not regular files, so F12 on `Gfx.clear` is empty even though hover works. That is the physical-file rule, not a missing lookup.
|
||||
|
||||
The location payload (path + span of an already resolved symbol) is reusable later by references (`AGD-0043`) and rename (`AGD-0046`). Those indexes were not built here. Snapshots (`AGD-0051`) remain a later performance discussion, not a prerequisite for this request-local feature.
|
||||
|
||||
## Examples
|
||||
|
||||
Same-file jump:
|
||||
|
||||
```pbs
|
||||
fn helper() -> int { return 42; }
|
||||
|
||||
fn frame() -> void {
|
||||
helper(); // definition -> helper's declaration in this file
|
||||
}
|
||||
```
|
||||
|
||||
Aliased import jumps to the original declaration span, not the `import` line:
|
||||
|
||||
```pbs
|
||||
import { Log as Logger } from @sdk:log;
|
||||
Logger.info("hello");
|
||||
```
|
||||
|
||||
If `@sdk:log` is only a virtual stdlib handle, definition is empty. If a project file owns the declaration and that file exists on disk, definition uses that path.
|
||||
|
||||
Builtins stay hover-only:
|
||||
|
||||
```pbs
|
||||
let n: int = 1; // hover describes the builtin; definition is empty
|
||||
```
|
||||
|
||||
## Pitfalls
|
||||
|
||||
Do not implement definition as a second name search in `lsp-v1` or in the VS Code extension. It will break on imports, overloads, and members, then be thrown away when references arrive.
|
||||
|
||||
Do not open `/virtual/stdlib/...` or invent an `untitled:` document so stdlib F12 “does something”. Empty is the honest result until those sources are real files.
|
||||
|
||||
Do not pick the first overload location in the server. Return the full `Location[]`.
|
||||
|
||||
Do not wait for snapshot cache before definition. Hover is already request-local; definition follows that shape.
|
||||
|
||||
Do not split a new top-level definition service “for future languages”. PBS is a real consumer of the existing language-service surface (`LSN-0067`).
|
||||
|
||||
Do not treat this lesson as closing references, rename, outline, workspace symbols, or document links. Those agendas stay open. This lesson only locks the destination policy they can reuse.
|
||||
|
||||
## References
|
||||
|
||||
- Agenda: `AGD-0042` (Q1–Q6 = A)
|
||||
- Decision: `DEC-0052`
|
||||
- Plan: `PLN-0131`
|
||||
- Spec 23 §8.3 — optional definition capability; physical-file-or-empty
|
||||
- `LSN-0051` — wave 1 deferred go-to-definition
|
||||
- `LSN-0058` — generic `FrontendLanguageService` for LSP
|
||||
- `LSN-0047` — protocol stays in `lsp-v1`; compiler owns semantics
|
||||
- `LSN-0067` — no SPI or virtual-document host without a real consumer
|
||||
- Still open: `AGD-0043` references, `AGD-0045` workspace symbols, `AGD-0046` rename, `AGD-0051` snapshots, `AGD-0055` document links, `AGD-0056` hierarchy
|
||||
+111
@@ -0,0 +1,111 @@
|
||||
---
|
||||
id: LSN-0069
|
||||
ticket: pbs-lsp-find-references
|
||||
title: PBS find-references is the physical inverse of definition
|
||||
created: 2026-09-21
|
||||
tags: [studio, lsp, vscode, compiler-pbs, editor, references]
|
||||
---
|
||||
|
||||
# PBS find-references is the physical inverse of definition
|
||||
|
||||
## Original Problem
|
||||
|
||||
PBS already had compiler-backed completion, hover, signature help, and go-to-definition (`LSN-0051`, `LSN-0068`). Users still could not ask where a resolved symbol is used. Text search confuses overloads, shadowing, members, comments, and coincidental names. Rename (`AGD-0046`) and hierarchy (`AGD-0056`) need an honest usage list before they exist.
|
||||
|
||||
The risk was inventing a `SymbolId` / `RefIndex`, waiting for snapshot cache (`AGD-0051`), or listing uses of stdlib APIs whose declarations are still virtual paths.
|
||||
|
||||
## Consolidated Decision
|
||||
|
||||
PBS Find References is the LSP projection of **physical usage sites** of the **same identity definition already returns**.
|
||||
|
||||
Durable locks from `DEC-0053` (AGD-0043 Q1–Q6 = A):
|
||||
|
||||
1. Resolve the cursor through the definition path (locals, parameters, members, imports/supplementals, current-module top-level). Identity is that physical declaration-location set. Do not text-search. Do not add `SymbolId` or a persistent `RefIndex`.
|
||||
2. A site is a usage when its definition locations intersect the cursor identity. Overloads follow that intersection.
|
||||
3. If definition at the same offset is empty, references is empty.
|
||||
4. Walk regular `fileTable` files from the current `analyze()` surface. Do not scan `/virtual/stdlib` or other non-regular handles.
|
||||
5. Keep the capability on the existing aggregated `FrontendLanguageService`. Reuse `FrontendDefinitionLocation`. Map PBS spans in `prometeu-frontend-pbs`. Common LSP must not import `p.studio.compiler.pbs.*`. No References SPI.
|
||||
6. Honor LSP `includeDeclaration` in the server: union usage sites with definition locations when the host asks and the declaration is a regular file. No read/write classification.
|
||||
7. Advertise `referencesProvider`. Partial coverage is valid. Analysis stays request-local. This discussion does not build rename, hierarchy, workspace symbols, virtual documents, or snapshot cache.
|
||||
|
||||
Spec 23 §8.3 now also states: a references location must identify a compiler-known physical source file; empty definition implies empty references; `includeDeclaration` must not invent a virtual location.
|
||||
|
||||
## Final Implementation
|
||||
|
||||
| Layer | What landed |
|
||||
|---|---|
|
||||
| PBS editorial | `PbsEditorialSupportService.references` walks `IDENTIFIER` tokens and keeps sites whose `definition` locations intersect the cursor identity (`FileId` + start + end). |
|
||||
| Generic contract | `FrontendLanguageService.references` defaults to `List.of()`. `FrontendEditorialContext.projectSurface` carries the PBS semantic read surface so the walk can see `astByFile`. |
|
||||
| PBS mapping | `PBSFrontendLanguageService` requires a non-empty physical definition set, skips non-regular files, and maps surviving spans through the same `Files.isRegularFile` helper as definition. |
|
||||
| LSP | `referencesProvider`, `textDocument/references`. The bridge applies `includeDeclaration` by unioning `references` with `definition`. Compile-only frontends stay empty. |
|
||||
| VS Code | Unchanged thin client. |
|
||||
|
||||
Stdlib and SDK modules remain virtual (`/virtual/stdlib/...`). Shift+F12 on `Gfx.clear` is empty, matching F12. Hover is unchanged.
|
||||
|
||||
Local binding names are not usage sites: definition at `let total` is empty because the name is not yet in scope. The use `return total` matches. `includeDeclaration` adds the declaration span from definition, not a second name search.
|
||||
|
||||
## Examples
|
||||
|
||||
Same-file function uses, including the declaring identifier (top-level names resolve to themselves):
|
||||
|
||||
```pbs
|
||||
fn helper() -> int { return 42; }
|
||||
|
||||
fn frame() -> void {
|
||||
helper();
|
||||
helper();
|
||||
// helper // not a reference
|
||||
let text = "helper"; // not a reference
|
||||
}
|
||||
```
|
||||
|
||||
Imported project (or otherwise physical) symbols collect uses in the importing file. Identity is the foreign declaration span.
|
||||
|
||||
```pbs
|
||||
import { Log as Logger } from @sdk:log;
|
||||
Logger.info("a");
|
||||
Logger.info("b");
|
||||
```
|
||||
|
||||
If `@sdk:log` is only a virtual handle, definition is empty, so references is empty.
|
||||
|
||||
Builtins stay hover-only:
|
||||
|
||||
```pbs
|
||||
let n: int = 1; // hover works; references is empty
|
||||
```
|
||||
|
||||
`includeDeclaration=true` adds the canonical declaration location on top of identifier usage sites. `false` returns usages only.
|
||||
|
||||
## Pitfalls
|
||||
|
||||
Do not implement find-references as workspace text search in `lsp-v1` or in the VS Code extension. It will lie about overloads, members, and imports, then poison rename.
|
||||
|
||||
Do not add a `SymbolId` index “for rename later”. Definition already gave the key: physical declaration locations. Rename can consume this list once it has its own decision.
|
||||
|
||||
Do not wait for snapshot cache. The LSP already reanalyzes on each editorial request. Snapshots (`AGD-0051`) can make the walk cheaper without changing the contract.
|
||||
|
||||
Do not treat empty stdlib references as a missing feature. Virtual paths are not regular files. Empty is the honest result until those sources live on disk.
|
||||
|
||||
Do not expect `let total` to appear as a usage of `total`. Inverse-of-definition only keeps identifier sites that themselves resolve. The declaration span arrives through `includeDeclaration`.
|
||||
|
||||
Do not put `includeDeclaration` into PBS types. It is a host flag applied in the LSP bridge.
|
||||
|
||||
Do not scan `/virtual/stdlib` to “find more uses”. That reopens virtual documents.
|
||||
|
||||
Do not split a References SPI “for future languages”. PBS is a real consumer of `FrontendLanguageService` (`LSN-0067`).
|
||||
|
||||
Do not treat this lesson as closing rename, snapshots, workspace symbols, document links, or hierarchy.
|
||||
|
||||
## References
|
||||
|
||||
- Agenda: `AGD-0043` (Q1–Q6 = A)
|
||||
- Decision: `DEC-0053`
|
||||
- Plan: `PLN-0132`
|
||||
- Spec 23 §8.3 — optional navigation; physical-file-or-empty; empty definition implies empty references
|
||||
- `LSN-0068` — definition identity this feature inverts
|
||||
- `LSN-0051` — wave 1 deferred navigation
|
||||
- `LSN-0058` — generic `FrontendLanguageService` for LSP
|
||||
- `LSN-0047` — protocol stays in `lsp-v1`; compiler owns semantics
|
||||
- `LSN-0067` — no SPI without a real in-repo consumer
|
||||
- Still open: `AGD-0046` rename, `AGD-0045` workspace symbols, `AGD-0051` snapshots, `AGD-0055` document links, `AGD-0056` hierarchy
|
||||
+141
@@ -0,0 +1,141 @@
|
||||
---
|
||||
id: LSN-0070
|
||||
ticket: pbs-lsp-document-symbols-outline
|
||||
title: PBS outline is an AST-backed document-symbol tree
|
||||
created: 2026-09-21
|
||||
tags: [studio, lsp, vscode, compiler-pbs, editor, outline, document-symbols]
|
||||
---
|
||||
|
||||
# PBS outline is an AST-backed document-symbol tree
|
||||
|
||||
## Original Problem
|
||||
|
||||
PBS already had compiler-backed completion, hover, signature help, go-to-definition (`LSN-0068`), and find-references (`LSN-0069`). VS Code Outline stayed empty. Long `.pbs` files had to be scanned by hand.
|
||||
|
||||
The risk was building outline from semantic success (so the tree vanishes while typing), flattening to `SymbolInformation`, inventing a Document Symbol SPI, or stuffing workspace search and folding into the same payload.
|
||||
|
||||
## Consolidated Decision
|
||||
|
||||
PBS Document Symbols is the LSP projection of the **named declaration tree of the open `.pbs` file**, with the **recovered AST as backbone**.
|
||||
|
||||
Durable locks from `DEC-0054` (AGD-0044 Q1 A, Q2 AST tree, Q3 A, Q4 A, Q5 A, Q6 `.pbs`-only, Q7 existing kinds):
|
||||
|
||||
1. Presence, hierarchy, and ranges come from the document AST. Kind and `detail` may use cheap semantic enrichment. Semantics must not drop a named declaration still in the syntax tree, and must not require full analysis.
|
||||
2. Named `TopDecl` plus syntactic members:
|
||||
- `fn` → Function, no children;
|
||||
- `declare struct` → Struct, children: fields, `ctor`s, methods;
|
||||
- `declare service` → Service, children: methods;
|
||||
- `declare contract` → Contract, children: signatures as methods;
|
||||
- `declare host` → Host, children: signatures;
|
||||
- `declare builtin type` → Builtin type, children: projection fields and signatures;
|
||||
- `declare enum` → Enum, children: cases;
|
||||
- `declare error` → Error, children: labels;
|
||||
- `declare callback` → Callback, no children;
|
||||
- `declare global` / `const` → Global / Const, no children;
|
||||
- `implements Contract for Owner` → top-level Contract named `contractName`, `detail` = owner name, children: methods.
|
||||
Locals, parameters, `this`, imports, and comments stay out. Private fields stay in. Overloads stay siblings. Host and builtin type appear only if the open file declares them.
|
||||
3. Recovered AST is enough. Unnamed `InvalidDecl` is omitted. Named decls survive later semantic errors. No `PbsAst.File` → empty list. Do not invent nodes from text or token pairs.
|
||||
4. Keep the capability on aggregated `FrontendLanguageService.documentSymbols` (default empty) plus a hierarchical DTO (`name`, `kind`, optional `detail`, range offsets, selection offsets, `children`). No file path on the DTO. PBS builds the tree in `prometeu-frontend-pbs`. Common LSP must not import `p.studio.compiler.pbs.*`. No Document Symbol SPI.
|
||||
5. Advertise `documentSymbolProvider`. Payload is hierarchical `DocumentSymbol`, not flat `SymbolInformation`. `range` is the declaration span. `selectionRange` is the name span only if the AST already has one; this wave reuses the declaration span. Do not scan tokens for identifier spans. VS Code stays a thin client.
|
||||
6. First wave is the current `.pbs` only. Out: imported supplementals, `mod.barrel`, locals, parameters, imports, comments, virtual documents, workspace symbols, folding, rename, snapshot cache. Server order is AST declaration order, not alphabetical.
|
||||
7. Reuse `FrontendSymbolKind` / `PbsEditorialSymbolKind`. LSP projects to the closest host `SymbolKind`. Name is the identifier. `detail` may carry the AST signature (`(a: int) -> int`). Attributes such as `[Init]` do not enter the name.
|
||||
|
||||
Outline does not jump to another file. The physical-file destination policy of definition/references is not the outline policy.
|
||||
|
||||
Spec 23 §8.3 now also states: document symbols are the named declaration tree of the requested document; recovered syntax is enough; a missing syntax tree is empty; this is not a workspace index, folding ranges, or a foreign-file navigation list.
|
||||
|
||||
## Final Implementation
|
||||
|
||||
| Layer | What landed |
|
||||
|---|---|
|
||||
| PBS editorial | `PbsAstDocumentSymbols` walks `PbsAst.File.topDecls` in source order. `PbsEditorialSupportService.documentSymbols` delegates to that walk. |
|
||||
| Generic contract | `FrontendLanguageService.documentSymbols` defaults to `List.of()`. `FrontendDocumentSymbol` is hierarchical and pathless. |
|
||||
| PBS mapping | `PBSFrontendLanguageService` requires `editorialContext.syntaxTree()` to be `PbsAst.File`. Barrels and unknown trees stay empty. Kinds map with `valueOf(kind.name())`. |
|
||||
| LSP | `documentSymbolProvider`, `textDocument/documentSymbol`, hierarchical `DocumentSymbol`. Nested enum/error children project to `EnumMember`. Compile-only frontends stay empty. |
|
||||
| VS Code | Unchanged thin client. |
|
||||
|
||||
`mod.barrel` is assembled as `BarrelFile`, not `PbsAst.File`, so `astByFile` has no barrel outline. Empty is the honest first-wave result.
|
||||
|
||||
Error case labels have no per-label span in the AST. Children reuse the parent `ErrorDecl` span rather than scanning tokens.
|
||||
|
||||
## Examples
|
||||
|
||||
Outline of a file is the declarations in that file, not imports or locals:
|
||||
|
||||
```pbs
|
||||
import { Log } from @sdk:log;
|
||||
|
||||
fn helper() -> int { return 42; }
|
||||
|
||||
fn frame() -> void {
|
||||
let local = 1;
|
||||
helper(local);
|
||||
}
|
||||
```
|
||||
|
||||
Outline: `helper`, `frame`. Not `Log`, not `local`.
|
||||
|
||||
Struct members and overloads as siblings:
|
||||
|
||||
```pbs
|
||||
declare struct Vec(x: int) {
|
||||
ctor make(x: int) { return; }
|
||||
fn blend(dx: int, dy: int) -> int { return dx; }
|
||||
}
|
||||
|
||||
fn helper() -> int { return 42; }
|
||||
fn helper(value: int) -> int { return value; }
|
||||
```
|
||||
|
||||
Outline: `Vec` (`x`, `make`, `blend`), then two `helper` siblings. Private field `x` is present. `detail` on `blend` is `(dx: int, dy: int) -> int`.
|
||||
|
||||
Recovered parse keeps the named decl:
|
||||
|
||||
```pbs
|
||||
declare ;
|
||||
fn ok() -> int { return 1; }
|
||||
```
|
||||
|
||||
Outline: `ok`. The unnamed `InvalidDecl` is omitted.
|
||||
|
||||
`[Init] fn init()` still names the symbol `init`.
|
||||
|
||||
`implements TickLike for Point` is a top-level node named `TickLike` with detail `Point`.
|
||||
|
||||
## Pitfalls
|
||||
|
||||
Do not wait for semantic analysis to succeed before showing outline. The tree must survive broken intermediate edits.
|
||||
|
||||
Do not omit private fields because they are not in `mod.barrel`. Outline is for the author of this file.
|
||||
|
||||
Do not collapse overloads. AST identity forbids merging declaration sets.
|
||||
|
||||
Do not walk `File.imports` or supplemental imported `TopDecl`s. Those symbols are not declared in this document.
|
||||
|
||||
Do not implement outline for `mod.barrel` in this contract. Barrel AST is a different root. Empty is correct until a later decision.
|
||||
|
||||
Do not scan tokens to invent a tighter `selectionRange`. This wave uses the declaration span.
|
||||
|
||||
Do not put a file path on `FrontendDocumentSymbol`. The host already has the document URI. Outline is not go-to-definition.
|
||||
|
||||
Do not reuse the physical-file jump rule of `LSN-0068` as an outline destination policy. Clicking outline stays inside the buffer.
|
||||
|
||||
Do not overload document symbols with folding or scope guides (`LSN-0034`, `AGD-0053`).
|
||||
|
||||
Do not split a Document Symbol SPI “for future languages”. PBS is a real consumer of `FrontendLanguageService` (`LSN-0067`).
|
||||
|
||||
Do not treat this lesson as closing workspace symbols, folding, rename, document links, or hierarchy.
|
||||
|
||||
## References
|
||||
|
||||
- Agenda: `AGD-0044` (Q1 A, Q2 AST tree, Q3 A, Q4 A, Q5 A, Q6 `.pbs`-only, Q7 existing kinds)
|
||||
- Decision: `DEC-0054`
|
||||
- Plan: `PLN-0133`
|
||||
- Spec 23 §8.3 — optional document symbols; recovered AST tree of the requested document
|
||||
- `LSN-0068` — definition is a jump; outline is not
|
||||
- `LSN-0069` — references invert definition identity
|
||||
- `LSN-0034` — do not overload document symbols with structural anchors
|
||||
- `LSN-0058` — generic `FrontendLanguageService` for LSP
|
||||
- `LSN-0047` — protocol stays in `lsp-v1`; compiler owns semantics
|
||||
- `LSN-0067` — no SPI without a real in-repo consumer
|
||||
- Still open: `AGD-0045` workspace symbols, `AGD-0046` rename, `AGD-0051` snapshots, `AGD-0053` folding, `AGD-0055` document links, `AGD-0056` hierarchy
|
||||
+149
@@ -0,0 +1,149 @@
|
||||
---
|
||||
id: LSN-0071
|
||||
ticket: pbs-lsp-workspace-symbols
|
||||
title: PBS workspace symbols are a physical named-declaration search
|
||||
created: 2026-09-21
|
||||
tags: [studio, lsp, vscode, compiler-pbs, editor, workspace-symbols]
|
||||
---
|
||||
|
||||
# PBS workspace symbols are a physical named-declaration search
|
||||
|
||||
## Original Problem
|
||||
|
||||
PBS already had compiler-backed completion, hover, signature help, go-to-definition (`LSN-0068`), find-references (`LSN-0069`), and an AST-backed outline of the open `.pbs` file (`LSN-0070`). VS Code workspace search (`Ctrl+T` / `workspace/symbol`) stayed empty.
|
||||
|
||||
The risk was treating workspace symbols as a second outline, inventing a `SymbolId` index, waiting for snapshot cache (`AGD-0051`), or returning stdlib/SDK hits whose declarations are still virtual paths (`/virtual/stdlib`). Workspace symbols is a jump. Outline is not.
|
||||
|
||||
## Consolidated Decision
|
||||
|
||||
PBS Workspace Symbols is the LSP projection of a **flat named-declaration search** over **regular filesystem files** of the current analysis, flattening the **same outline set** and using the **same physical-file destination policy** as definition.
|
||||
|
||||
Durable locks from `DEC-0055` (AGD-0045 Q1 A, Q2 A, Q3 A, Q4 A, Q5 A, Q6 first-wave exclusions):
|
||||
|
||||
1. Emit only declarations whose `fileTable` handle is a regular filesystem file. Virtual stdlib/SDK, including `/virtual/stdlib`, is omitted. Do not invent virtual documents, `untitled:` buffers, or synthetic URIs.
|
||||
2. `workspace/symbol` does not require an open text document. The server obtains the project analysis surface (`astByFile` / `projectSurface`) from `analyze()`. Missing surface → empty list.
|
||||
3. The set is the flatten, file by file, of the named-declaration tree locked by outline (`LSN-0070`):
|
||||
- `fn` → Function;
|
||||
- `declare struct` → Struct plus fields, `ctor`s, methods;
|
||||
- `declare service` → Service plus methods;
|
||||
- `declare contract` → Contract plus signatures;
|
||||
- `declare host` → Host plus signatures;
|
||||
- `declare builtin type` → Builtin type plus projection fields and signatures;
|
||||
- `declare enum` → Enum plus cases;
|
||||
- `declare error` → Error plus labels;
|
||||
- `declare callback` → Callback;
|
||||
- `declare global` / `const` → Global / Const;
|
||||
- `implements Contract for Owner` → `contractName`, kind CONTRACT, `detail` = owner, plus methods.
|
||||
Locals, parameters, `this`, imports, and comments stay out. Private fields stay in. Overloads stay sibling hits. Unnamed `InvalidDecl` is omitted. Named decls survive later semantic errors.
|
||||
4. First wave is `.pbs` whose recovered root is `PbsAst.File`. `mod.barrel` (`BarrelFile`) stays empty. Presence, name, kind, `detail`, and spans come from recovered AST. Do not invent nodes from text search.
|
||||
5. Query is a case-insensitive substring of `name` only. Blank query returns the full first-wave corpus. Do not match `detail`, path, `containerName`, or qualified `Vec.blend`. No fuzzy ranking, no `top N`. After the filter, order is stable by name, then path, then start offset.
|
||||
6. `containerName` is the parent name for members and empty for top-level declarations. `detail` may repeat the outline AST signature. Attributes such as `[Init]` do not enter the name.
|
||||
7. Keep the capability on aggregated `FrontendLanguageService`. Add `workspaceSymbols` (default empty) plus a flat DTO with `name`, `kind`, optional `detail`, `containerName`, absolute path, and offsets. Do not reuse pathless `FrontendDocumentSymbol`. PBS flattens in `prometeu-frontend-pbs`. Common LSP must not import `p.studio.compiler.pbs.*`. No Workspace Symbol SPI, `SymbolId`, `RefIndex`, or snapshot cache.
|
||||
8. Advertise `workspaceSymbolProvider` when the frontend exposes a language service. Payload is flat `SymbolInformation`. Do not emit hierarchical `DocumentSymbol` on this request. Compile-only frontends stay empty. VS Code stays a thin client.
|
||||
|
||||
Spec 23 §8.3 now also states: workspace symbols are a flat search of named declarations in compiler-known physical source files of the current analysis; recovered syntax is enough; a missing analysis surface is empty; the request must not require an open document; a declaration without a physical file is omitted; this is not outline, folding, a persistent index, or navigation to virtual locations.
|
||||
|
||||
## Final Implementation
|
||||
|
||||
| Layer | What landed |
|
||||
|---|---|
|
||||
| PBS editorial | `PbsAstWorkspaceSymbols` flattens `PbsAstDocumentSymbols` and filters by name. `PbsEditorialSupportService.workspaceSymbols(ast, query)` delegates to that flatten. |
|
||||
| Generic contract | `FrontendWorkspaceRequest` (`projectRoot`, `query`). `FrontendWorkspaceSymbol` carries path. `FrontendLanguageService.workspaceSymbols` defaults to `List.of()`. `prepareEditorialContext(FrontendPhaseContext)` defaults to empty so a workspace request can obtain project surface without a `FileId`. |
|
||||
| PBS mapping | Project-level `prepareEditorialContext` attaches `fileTable` + `astByFile`. Regular `PbsAst.File` entries are flattened; non-regular handles are skipped. Results sort by name, path, offset. |
|
||||
| LSP | `workspaceSymbolProvider`, `workspace/symbol` on `PrometeuWorkspaceService` (no document URI). `CompilerLanguageServiceBridge` analyzes the project with an empty overlay map. Mapper emits flat `SymbolInformation`. Nested enum/error hits with a container project to `EnumMember`. Compile-only frontends stay empty. |
|
||||
| VS Code | Unchanged thin client. |
|
||||
|
||||
`workspace/symbol` in this wave reads the project on disk. Unsaved editor overlays are not shared into the search. Empty is honest until a later overlay/snapshot decision.
|
||||
|
||||
`mod.barrel` is still `BarrelFile`, not `PbsAst.File`. Empty barrel hits are the honest first-wave result.
|
||||
|
||||
Error case labels still have no per-label span. Flattened children reuse the parent `ErrorDecl` span, same as outline.
|
||||
|
||||
## Examples
|
||||
|
||||
Workspace search of a project file is the flatten of that file's outline, not imports or locals:
|
||||
|
||||
```pbs
|
||||
import { Log } from @sdk:log;
|
||||
|
||||
fn helper() -> int { return 42; }
|
||||
|
||||
fn frame() -> void {
|
||||
let local = 1;
|
||||
helper(local);
|
||||
}
|
||||
```
|
||||
|
||||
Query `frame` → `frame`. Query `helper` → `helper`. Query empty → `helper`, `frame` (plus other physical decls), sorted. Not `Log`, not `local`.
|
||||
|
||||
Members keep a container; overloads stay siblings:
|
||||
|
||||
```pbs
|
||||
declare struct Vec(x: int) {
|
||||
ctor make(x: int) { return; }
|
||||
fn blend(dx: int, dy: int) -> int { return dx; }
|
||||
}
|
||||
|
||||
fn helper() -> int { return 42; }
|
||||
fn helper(value: int) -> int { return value; }
|
||||
```
|
||||
|
||||
Query `blend` → method `blend` with `containerName` `Vec`. Query `helper` → two hits. Query `Vec.blend` → empty (this wave matches `name` only).
|
||||
|
||||
Stdlib remains hover-only while the handle is virtual:
|
||||
|
||||
```pbs
|
||||
import { Gfx } from @sdk:gfx;
|
||||
Gfx.clear(0);
|
||||
```
|
||||
|
||||
Query `Gfx` is empty. F12 on `Gfx.clear` is already empty (`LSN-0068`). Workspace search does not reopen that jump.
|
||||
|
||||
Recovered parse keeps the named decl:
|
||||
|
||||
```pbs
|
||||
declare ;
|
||||
fn ok() -> int { return 1; }
|
||||
```
|
||||
|
||||
Query empty → `ok`. The unnamed `InvalidDecl` is omitted.
|
||||
|
||||
`[Init] fn init()` still names the symbol `init`.
|
||||
|
||||
## Pitfalls
|
||||
|
||||
Do not implement workspace symbols as workspace text search in `lsp-v1` or in the VS Code extension. It will lie about overloads, members, and imports.
|
||||
|
||||
Do not reuse `FrontendDocumentSymbol`. Outline is pathless because the host already has the document URI. Workspace symbols is a jump and must carry a path.
|
||||
|
||||
Do not require an open editor buffer to answer `workspace/symbol`. Analyze the project and walk `astByFile`.
|
||||
|
||||
Do not include `/virtual/stdlib` so Ctrl+T on `Gfx` “does something”. Empty is the honest result until those sources are regular files.
|
||||
|
||||
Do not wait for snapshot cache. References already walks the current analysis request-locally. Snapshots (`AGD-0051`) can make the walk cheaper without changing this contract.
|
||||
|
||||
Do not add a `SymbolId` index “for rename later”. Outline already named the declarations; definition already named the destination.
|
||||
|
||||
Do not match `containerName`, path, or `Vec.blend` in this wave. The query is a substring of `name`.
|
||||
|
||||
Do not emit hierarchical `DocumentSymbol` on `workspace/symbol`. That payload is outline.
|
||||
|
||||
Do not treat unsaved overlay absence as a missing feature of this contract. First-wave analysis is the project on disk.
|
||||
|
||||
Do not split a Workspace Symbol SPI “for future languages”. PBS is a real consumer of `FrontendLanguageService` (`LSN-0067`).
|
||||
|
||||
Do not treat this lesson as closing rename, snapshots, folding, document links, or hierarchy.
|
||||
|
||||
## References
|
||||
|
||||
- Agenda: `AGD-0045` (Q1 A, Q2 A, Q3 A, Q4 A, Q5 A, Q6 first-wave exclusions)
|
||||
- Decision: `DEC-0055`
|
||||
- Plan: `PLN-0134`
|
||||
- Spec 23 §8.3 — optional workspace symbols; physical-file-or-omit; no open document required
|
||||
- `LSN-0070` — outline set this feature flattens
|
||||
- `LSN-0068` — physical-file destination this feature reuses
|
||||
- `LSN-0069` — project `astByFile` walk already exists for references
|
||||
- `LSN-0058` — generic `FrontendLanguageService` for LSP
|
||||
- `LSN-0047` — protocol stays in `lsp-v1`; compiler owns semantics
|
||||
- `LSN-0067` — no SPI without a real in-repo consumer
|
||||
- Still open: `AGD-0046` rename, `AGD-0051` snapshots, `AGD-0053` folding, `AGD-0055` document links, `AGD-0056` hierarchy
|
||||
+128
@@ -0,0 +1,128 @@
|
||||
---
|
||||
id: LSN-0072
|
||||
ticket: pbs-lsp-rename-symbol
|
||||
title: PBS rename is a validated physical workspace edit
|
||||
created: 2026-09-22
|
||||
tags: [studio, lsp, vscode, compiler-pbs, editor, rename]
|
||||
---
|
||||
|
||||
# PBS rename is a validated physical workspace edit
|
||||
|
||||
## Original Problem
|
||||
|
||||
PBS already had compiler-backed completion, hover, signature help, go-to-definition (`LSN-0068`), find-references (`LSN-0069`), outline (`LSN-0070`), and workspace symbols (`LSN-0071`). Users still could not rename a symbol through the editor. Manual text edits miss uses or rewrite unrelated overloads, comments, strings, and same-name declarations.
|
||||
|
||||
The risk was a file-local rename, a lexeme replace, a new `SymbolId` / `RefIndex`, snapshot cache (`AGD-0051`) as a prerequisite, virtual stdlib documents, or a successful empty `WorkspaceEdit` that pretends the symbol changed.
|
||||
|
||||
## Consolidated Decision
|
||||
|
||||
PBS Rename Symbol is the LSP projection of a **validated `WorkspaceEdit`** over **physical identifier spans** of the **same identity definition already returns**.
|
||||
|
||||
Durable locks from `DEC-0056` (AGD-0046 Q1–Q6 = A):
|
||||
|
||||
1. Identity is the physical declaration-location set from definition. Do not text-search. Do not add `SymbolId` or a persistent `RefIndex`.
|
||||
2. Sites are identifier tokens whose definition intersects that identity, plus identifier-sized declaration name spans. Overloads of the same name in the same owner rewrite together. Members rewrite only that member. Comments, strings, and homonyms of another identity stay.
|
||||
3. Walk regular `fileTable` files of the current `analyze()` surface. Omit `/virtual/stdlib` and other non-regular handles. Every edit location must be a compiler-known physical source file.
|
||||
4. Refuse when physical identity is empty: builtins, virtual stdlib/SDK, unresolved names, keywords, comments, strings, `this`, `Self`. Refuse `mod.barrel`. Refuse `declare error` case labels that have no per-label span.
|
||||
5. Exception: a local or parameter name span is renameable even when definition at that offset is empty. Identity becomes that name span; uses are identifiers whose definition intersects it.
|
||||
6. Refuse when the cursor lexeme is an import alias (`item.alias()` distinct from `item.name()`), including uses of that alias. Do not follow alias definition and rewrite the export. Export rename happens only when the cursor writes the original name. Export rewrite must not change `as Alias` tokens or uses that spell a differing alias.
|
||||
7. `prepareRename` validates the cursor and returns the identifier range, or null. `rename` also validates the new name: PBS identifier, not a keyword, no collision in the same binding space (top-level `fn`/`service`/`global`/`const`, local/param in the same scope, field in the same struct, method in the same owner, case in the same enum), ignoring rewritten sites and the overload set. Failure is an LSP error. Never return a successful empty `WorkspaceEdit`. The server does not write files and does not rename paths.
|
||||
8. Keep the capability on aggregated `FrontendLanguageService`. `prepareRename` defaults empty; `rename` defaults unsupported. PBS maps in `prometeu-frontend-pbs`. Common LSP must not import `p.studio.compiler.pbs.*`. No Rename SPI. Advertise `renameProvider` with `prepareProvider`. Compile-only stays unsupported. VS Code stays a thin client.
|
||||
|
||||
Spec 23 §8.3 now also states: rename is a validated workspace edit of identifier spans in compiler-known physical source files; identity is definition; local/param name spans remain renameable; alias, virtual, and error-label cursors refuse; invalid names and collisions are protocol errors, not empty success; the server does not write files; `prepareProvider` is advertised when rename is exposed.
|
||||
|
||||
## Final Implementation
|
||||
|
||||
| Layer | What landed |
|
||||
|---|---|
|
||||
| PBS editorial | `PbsEditorialSupportService.planRename` builds identity from definition or local/param name span, refuses aliases and error labels, walks `IDENTIFIER` tokens whose definition intersects identity and whose lexeme is the original name, then validates identifier/keyword/collision. |
|
||||
| Generic contract | `FrontendLanguageService.prepareRename` defaults empty. `rename` defaults `FrontendRenameResult.unsupported()`. `FrontendRenameEdit` is path + offsets + `newText`. Applied results reject an empty edit list. |
|
||||
| PBS mapping | `PBSFrontendLanguageService` reuses `projectDocuments` and `toFrontendLocation`. Empty physical identity is refuse, even if editorial sites exist on virtual handles. |
|
||||
| LSP | `renameSupported`, `prepareRename`, `rename`. Mapper advertises `RenameOptions.prepareProvider`. Refused rename is `ResponseErrorException`, not an empty `WorkspaceEdit`. Compile-only does not advertise. |
|
||||
| VS Code | Unchanged thin client. |
|
||||
|
||||
Stdlib and SDK modules remain virtual (`/virtual/stdlib/...`). F2 on `Gfx.clear` is refused, matching empty F12 / Shift+F12. Hover is unchanged.
|
||||
|
||||
`let total` at the binding itself still has empty definition. Rename uses the name span as identity so F2 on the binding works.
|
||||
|
||||
## Examples
|
||||
|
||||
Same-file function, including overloads and the declaring identifier. Comment and string stay:
|
||||
|
||||
```pbs
|
||||
fn helper() -> int { return 1; }
|
||||
fn helper(value: int) -> int { return value; }
|
||||
|
||||
fn frame() -> void {
|
||||
helper();
|
||||
helper(2);
|
||||
// helper
|
||||
let text = "helper";
|
||||
}
|
||||
```
|
||||
|
||||
F2 on `helper` → `aid` rewrites both declarations and both calls.
|
||||
|
||||
Local name span:
|
||||
|
||||
```pbs
|
||||
fn frame() -> void {
|
||||
let total = 1;
|
||||
return total;
|
||||
}
|
||||
```
|
||||
|
||||
F2 on `let total` or on the use rewrites both identifier sites.
|
||||
|
||||
Alias is refused. Export rename keeps the local alias:
|
||||
|
||||
```pbs
|
||||
import { Log as Logger } from @sdk:log;
|
||||
Logger.info("a");
|
||||
```
|
||||
|
||||
F2 on `Logger` or `Logger.info` is refused. F2 on a physical `Log` declaration rewrites the original name and `import { Log as Logger }`, and leaves `Logger` / `Logger.info`.
|
||||
|
||||
Builtins and virtual stdlib stay hover-only:
|
||||
|
||||
```pbs
|
||||
let n: int = 1;
|
||||
Gfx.clear(5);
|
||||
```
|
||||
|
||||
Invalid new names (`fn`, `1ab`) and collisions (`helper` → existing `frame`) fail with an LSP error.
|
||||
|
||||
## Pitfalls
|
||||
|
||||
Do not implement rename as workspace text search in `lsp-v1` or in the VS Code extension. It will rewrite comments, strings, overloads of another identity, and import aliases.
|
||||
|
||||
Do not follow definition through an import alias. `Logger` currently resolves to `Log`'s span; a blind inverse-of-definition rename would rewrite the export.
|
||||
|
||||
Do not return a successful empty `WorkspaceEdit` for a refused cursor. The editor will treat that as “renamed”.
|
||||
|
||||
Do not skip the local/param name-span exception. F2 on `let total` is the common case, and definition there is empty.
|
||||
|
||||
Do not rewrite `declare error` case labels by using the parent `ErrorDecl` span. Those labels have no per-label span.
|
||||
|
||||
Do not wait for snapshot cache. Rename reuses the request-local walk already used by references.
|
||||
|
||||
Do not treat empty/refused stdlib rename as a missing feature. Virtual paths are not regular files.
|
||||
|
||||
Do not split a Rename SPI “for future languages”. PBS is a real consumer of `FrontendLanguageService` (`LSN-0067`).
|
||||
|
||||
Do not treat this lesson as closing snapshots, folding, document links, hierarchy, code actions, formatting, file rename, or local-alias rename.
|
||||
|
||||
## References
|
||||
|
||||
- Agenda: `AGD-0046` (Q1–Q6 = A)
|
||||
- Decision: `DEC-0056`
|
||||
- Plan: `PLN-0135`
|
||||
- Spec 23 §8.3 — optional rename; physical-file-or-empty; alias refuse; error instead of empty success; `prepareProvider`
|
||||
- Spec: `docs/specs/compiler-languages/pbs/3. Core Syntax Specification.md` §4.3–4.4
|
||||
- `LSN-0068` — definition identity this feature writes
|
||||
- `LSN-0069` — physical inverse that supplies usage sites
|
||||
- `LSN-0051` — wave 1 deferred rename
|
||||
- `LSN-0058` — generic `FrontendLanguageService` for LSP
|
||||
- `LSN-0047` — protocol stays in `lsp-v1`; compiler owns semantics
|
||||
- `LSN-0067` — no SPI without a real in-repo consumer
|
||||
- Still open: `AGD-0051` snapshots, `AGD-0053` folding, `AGD-0055` document links, `AGD-0056` hierarchy
|
||||
+130
@@ -0,0 +1,130 @@
|
||||
---
|
||||
id: LSN-0073
|
||||
ticket: pbs-lsp-code-actions
|
||||
title: PBS quick fixes are frontend repairs transported by the LSP
|
||||
created: 2026-09-22
|
||||
tags: [studio, lsp, vscode, compiler-pbs, editor, code-actions, quick-fix]
|
||||
---
|
||||
|
||||
# PBS quick fixes are frontend repairs transported by the LSP
|
||||
|
||||
## Original Problem
|
||||
|
||||
PBS diagnostics already reach the editor, but the server did not advertise `codeActionProvider`. A user could see a duplicate attribute or a bad `InitAllowed` and still had to repair it by hand.
|
||||
|
||||
The tempting shortcut was a code-to-edit table in the LSP. That shortcut does not work. Compiler `Diagnostic` values carry a stable code, phase, template, placeholders, span, and related locations, but the reserved-attribute reports use the short constructor: empty placeholders, and the English sentence is the only fine discriminator. `E_SEM_MALFORMED_RESERVED_ATTRIBUTE` covers Doc without `markdown`, a wrong payload, empty markdown, an unknown argument, `InitAllowed` with arguments, an out-of-range `AssetLowering`, and a bad `Host` shape. A switch on the code cannot pick a safe edit without reading the message. Diagnostic wording is rendering, not identity. Code actions are an optional editorial capability: the frontend owns the meaning, and the LSP transports it.
|
||||
|
||||
## Consolidated Decision
|
||||
|
||||
PBS quick fix is one `WorkspaceEdit` tied to one diagnostic of the requested physical document. The frontend produces the repair from the syntax tree. The LSP does not invent it.
|
||||
|
||||
Durable locks from `DEC-0057` (AGD-0047: scope A, producer B, residence B, first wave C):
|
||||
|
||||
1. This wave is quick fix only. No organize-imports, source action, refactor, function or struct stub, code lens, or server command.
|
||||
2. The server does not write files. The client applies the edit.
|
||||
3. Each repair names the stable diagnostic code, the primary span of that diagnostic, and exactly one local text edit. The LSP must not keep a code-to-edit table and must not read the diagnostic message to build the edit.
|
||||
4. The repair is computed on `textDocument/codeAction` from the current document analysis. It is not a required field of compiler `Diagnostic`, and it is not published inside `publishDiagnostics`, including `data`.
|
||||
5. `publishDiagnostics` carries the stable compiler code on `Diagnostic.code` so the client can echo it. Source, severity, message, and related information stay as they were. Those presentation questions remain with `AGD-0054`.
|
||||
6. A repair is returned only when the request context contains a diagnostic with the same code and the same primary range. An empty diagnostic list returns an empty action list. An `only` filter that does not include quick fix returns an empty action list.
|
||||
7. Each item is a QuickFix `CodeAction`, not a `Command`. The edit touches one file, the requested physical document, and contains one `TextEdit`. There is no lazy resolve.
|
||||
8. A path that is not a compiler-known regular file, including `/virtual/stdlib`, gets no edit.
|
||||
9. If the frontend does not expose the capability, the server does not advertise `codeActionProvider`. A request that arrives anyway returns an empty list, not a protocol error. Absence of a fix is not a refused cursor.
|
||||
10. PBS exposes the capability. Another frontend does not gain it merely by having a language service.
|
||||
11. The first wave is two shapes, not three diagnostic codes.
|
||||
- For every extra reserved attribute the declaration validator already reports as `E_SEM_DUPLICATE_RESERVED_ATTRIBUTE`, delete exactly that occurrence's span. Do not delete the first occurrence, the declaration, or neighboring whitespace.
|
||||
- For an `InitAllowed` attribute with a non-empty argument list on a host signature, the shape the validator reports as `E_SEM_MALFORMED_RESERVED_ATTRIBUTE` when the file is an interface module, replace that attribute span with `[InitAllowed]`. Do not emit that repair for any other attribute that shares the code. `[InitAllowed()]` is not diagnosed today and gets no repair.
|
||||
12. Nothing else gets a quick fix in this wave. In particular: inserting `[Doc(markdown = """""")]` or any other Doc rewrite, inserting an empty or incomplete `[Host]` or `[BuiltinType]`, `W_SEM_IGNORED_VALUE`, unresolved imports, an invalid reserved-attribute target, parse errors, unresolved overloads, and method stubs.
|
||||
|
||||
`AGD-0048` still owns formatting. `AGD-0049` still owns import assistance and organize-imports. `AGD-0054` still owns range, related locations, and diagnostic presentation. The PBS diagnostics spec does not gain a mandatory remediation field.
|
||||
|
||||
Spec 23 §8.3 now states the shared contract: code actions are quick fixes only; the frontend produces each repair from the document syntax; tooling transports it and does not parse the message or switch on codes; the published diagnostic carries the stable code; a repair is returned only for a matching context diagnostic; the edit is one physical file; the server does not write files, return a command, or require resolve; a missing capability is an empty list, not an error; virtual documents get no edit.
|
||||
|
||||
## Final Implementation
|
||||
|
||||
| Layer | What landed |
|
||||
|---|---|
|
||||
| PBS repairs | `PbsQuickFixCollector` walks the same attribute surfaces as `PbsDeclarationSemanticsValidator`, including the interface-module gate. Duplicate reserved attributes become an empty replacement of the extra span. The first `InitAllowed` with arguments on an interface host signature becomes `[InitAllowed]`. |
|
||||
| Source kind | `PbsSemanticReadSurface.sourceKindByFile` records the kind used to parse each file. A missing kind means project rules, so a project `declare host` does not pretend the validator emitted the interface-only `InitAllowed` diagnostic. |
|
||||
| Generic contract | `FrontendLanguageService.codeActionsSupported` defaults false. `codeActions` defaults empty. `FrontendCodeAction` is title, diagnostic code, path, offsets, and `newText`. Empty `newText` is a deletion and is allowed. |
|
||||
| PBS mapping | `PBSFrontendLanguageService` exposes the capability and returns repairs only for the requested regular file. `/virtual/stdlib` fails `Files.isRegularFile` and produces nothing. |
|
||||
| LSP | `BaselineDocumentIssue.code` is copied onto `Diagnostic.code`. `data` stays unset. The bridge drops repairs whose code and range do not match a context diagnostic. `PrometeuTextDocumentService.codeAction` honors the quick-fix `only` filter and never fails the request for “no fix”. |
|
||||
| Protocol | `codeActionProvider` is `CodeActionOptions` with kind `quickfix` and `resolveProvider` false, and only when the frontend reports support. Mapped actions are `CodeAction` values with a `WorkspaceEdit`. They are not `Command`s. |
|
||||
|
||||
Titles are `Remove duplicate reserved attribute` and `Remove InitAllowed arguments`.
|
||||
|
||||
## Examples
|
||||
|
||||
Duplicate `Doc` on a project file. The first copy stays. Each later copy is deleted at its own span:
|
||||
|
||||
```pbs
|
||||
[Doc(markdown = """
|
||||
First.
|
||||
""")]
|
||||
[Doc(markdown = """
|
||||
Second.
|
||||
""")]
|
||||
fn duplicated() -> void { return; }
|
||||
```
|
||||
|
||||
The quick fix removes the second attribute and leaves `First.`. A context diagnostic with the same range but code `E_SEM_MALFORMED_RESERVED_ATTRIBUTE` produces no action. An empty diagnostic list produces no action.
|
||||
|
||||
Malformed or empty Doc is visible and not repairable here:
|
||||
|
||||
```pbs
|
||||
[Doc(text = """
|
||||
Wrong argument.
|
||||
""")]
|
||||
fn malformed() -> void { return; }
|
||||
```
|
||||
|
||||
`InitAllowed` with arguments is repaired only on an interface-module host signature:
|
||||
|
||||
```pbs
|
||||
declare host Gfx {
|
||||
[Host(module = "gfx2d", name = "clear", version = 1)]
|
||||
[InitAllowed(flag = 1)]
|
||||
fn clear() -> void;
|
||||
|
||||
[Host(module = "gfx2d", name = "fill", version = 1)]
|
||||
[InitAllowed()]
|
||||
fn fill() -> void;
|
||||
}
|
||||
```
|
||||
|
||||
`clear` becomes `[InitAllowed]`. `fill` is already valid to the validator, so `[InitAllowed()]` is left alone. The same `InitAllowed(flag = 1)` inside a project file does not get that repair, because the validator does not emit the malformed-attribute diagnostic there.
|
||||
|
||||
The same collector deletes the extra copy of `BuiltinType`, `IntrinsicCall`, `BuiltinConst`, `Host`, and `AssetLowering` when the validator reports `E_SEM_DUPLICATE_RESERVED_ATTRIBUTE` for that surface. A malformed `Host` that merely shares the malformed-attribute code gets no edit.
|
||||
|
||||
## Pitfalls
|
||||
|
||||
Do not choose the edit in `prometeu-lsp` by switching on `E_SEM_MALFORMED_RESERVED_ATTRIBUTE` or by parsing the English message. The code is too coarse, and the message is not the identity.
|
||||
|
||||
Do not store the repair on compiler `Diagnostic` or in `Diagnostic.data`. Compilation and quick fix stay different surfaces. The published code exists so the client can echo it back.
|
||||
|
||||
Do not match on `Diagnostic.source` as if it were the long-term identity field. Today the bridge still copies the code into `source` for the existing presentation. The code-action match uses `Diagnostic.code`. `AGD-0054` may change `source` later.
|
||||
|
||||
Do not delete the first duplicate, and do not trim the whitespace around the deleted span. That cleanup is formatting and belongs to `AGD-0048`.
|
||||
|
||||
Do not insert `[Doc(markdown = """""")]`, an empty `[Host]`, or an empty `[BuiltinType]`. Those edits trade one diagnostic for another, or invent a declaration.
|
||||
|
||||
Do not treat `W_SEM_IGNORED_VALUE` as a source edit. Discard exists in lowering, not as PBS syntax.
|
||||
|
||||
Do not offer the `InitAllowed` rewrite for `[InitAllowed()]` or for a project file. The validator does not diagnose those shapes as “arguments not allowed”, so there is no diagnostic to attach.
|
||||
|
||||
Do not return a protocol error when there is no fix. Rename refuses a bad cursor with an error. Quick fix answers “nothing to do” with an empty list.
|
||||
|
||||
Do not advertise `codeActionProvider` for every frontend that has a language service. The default capability is unsupported.
|
||||
|
||||
Do not treat this lesson as closing formatting, import assistance, diagnostic presentation, snapshots, folding, document links, or hierarchy.
|
||||
|
||||
## References
|
||||
|
||||
- Agenda: `AGD-0047` (scope A, producer B, residence B, first wave C)
|
||||
- Decision: `DEC-0057`
|
||||
- Plan: `PLN-0136`
|
||||
- Spec 23 §8.3 — optional code actions; frontend-owned repair; match by code and range; empty list when unsupported
|
||||
- Spec: `docs/specs/compiler-languages/pbs/12. Diagnostics Specification.md` — wording is not identity; remediation stays outside the v1 diagnostic minimum
|
||||
- `LSN-0056` — code actions are an optional editorial capability
|
||||
- `LSN-0058` — generic `FrontendLanguageService` for the LSP
|
||||
- `LSN-0067` — no new editorial SPI without a real consumer; PBS implements the existing language service
|
||||
- Still open: `AGD-0048` formatting, `AGD-0049` import assistance, `AGD-0054` diagnostics UX, `AGD-0051` snapshots, `AGD-0056` hierarchy
|
||||
+82
@@ -0,0 +1,82 @@
|
||||
---
|
||||
id: LSN-0060
|
||||
ticket: multi-frontend-serializable-ir
|
||||
title: Data contract first for serializable IRBackend
|
||||
created: 2026-07-15
|
||||
tags: [compiler, compiler-general, ir, backend, serialization, multi-frontend]
|
||||
---
|
||||
|
||||
# Data contract first for serializable IRBackend
|
||||
|
||||
## Original Problem
|
||||
|
||||
The compiler already had a common executable handoff: `IRBackend`. PBS emits it, and common backend stages consume it before lowering to `IRVM`.
|
||||
|
||||
The remaining risk was subtler than direct PBS coupling. A Java-only handoff can accidentally grow around process-local assumptions: callbacks, services, object identity, mutable global state, unordered collections, lazy values, or direct references between live objects. Those shapes can work inside one JVM and still make a future external frontend or out-of-process boundary expensive to add.
|
||||
|
||||
The work needed to keep the handoff serializable by design without choosing JSON, Protobuf, RPC, plugin loading, or a separate process too early.
|
||||
|
||||
## Consolidated Decision
|
||||
|
||||
`IRBackend` is a data contract first.
|
||||
|
||||
Public `IRBackend` contract types must remain modelable as an acyclic, deterministic data graph made from primitives, strings, enums, immutable values, ordered lists, explicit ids, stable symbolic keys, and source attribution values such as file ids and spans.
|
||||
|
||||
The public handoff must not expose callbacks, lambdas, service objects, registries, visitors, live compiler services, frontend AST/parser/token/semantic/editorial objects, mutable global state, object identity semantics, unordered output-affecting collections, cyclic public references, process-dependent lazy values, or a selected wire format.
|
||||
|
||||
The important boundary is the data shape, not a codec. A future serializer should be able to consume the handoff because the public model is already disciplined, but this decision does not require a serializer to exist now.
|
||||
|
||||
## Final Implementation
|
||||
|
||||
The implementation updated the compiler-general backend spec with a new `IRBackend` serializability-by-design subsection. The spec now states the allowed and forbidden public shapes and keeps wire format selection explicitly deferred.
|
||||
|
||||
The conformance matrix added `G20-4.2.x` rows for the new requirements:
|
||||
|
||||
- public `IRBackend` modelability as an acyclic deterministic data graph;
|
||||
- rejection of callbacks, services, mutable or unordered collections, frontend-owned objects, process-dependent lazy values, cyclic public references, and wire-format commitments;
|
||||
- use of explicit ids or stable symbolic keys for cross-object references.
|
||||
|
||||
The executable guardrails live in `IRBackendExecutableContractTest`:
|
||||
|
||||
- the public contract audit covers all current `p.studio.compiler.models` handoff types and nested value types;
|
||||
- support types such as `FileId`, `ModuleId`, `CallableId`, `IntrinsicId`, `Span`, table reference records, and `ReadOnlyList` are explicitly classified;
|
||||
- reflection checks inspect public fields, record components, public constructors, public methods, and generic type arguments;
|
||||
- guardrails reject PBS/frontend exposure, callback shapes, service-like public shapes, mutable/unordered collection contracts, and other non-serializable public exposures;
|
||||
- deterministic aggregation tests prove stable ordering for functions, synthetic functions, globals, executable functions, module pools, callable signatures, intrinsic pools, reserved metadata, and required capabilities;
|
||||
- known references are locked to explicit ids or stable keys rather than direct object references.
|
||||
|
||||
The audit found no concrete public serialization leak that required changing the production model. That result is meaningful: the current `IRBackend` shape was already close to the target, so the correct implementation was spec clarification plus tests, not a redesign.
|
||||
|
||||
## Examples
|
||||
|
||||
Good public handoff shapes:
|
||||
|
||||
- `ModuleId`, `CallableId`, `IntrinsicId`, and `FileId` for table-scoped references;
|
||||
- `ReadOnlyList<T>` for ordered collections;
|
||||
- `ModuleReference`, `CallableSignatureRef`, and `IntrinsicReference` as stable table values;
|
||||
- `Span` for source attribution;
|
||||
- enums and records for fixed value surfaces.
|
||||
|
||||
Bad public handoff shapes:
|
||||
|
||||
- `Map`, `Set`, or mutable collection interfaces where output order matters;
|
||||
- `Runnable`, `Callable`, `Function`, visitors, or callbacks;
|
||||
- compiler services or registries exposed as public fields or constructor parameters;
|
||||
- frontend AST, parser, token, semantic, or editor types;
|
||||
- direct references to another handoff object where an id or ordered table entry is the stable contract.
|
||||
|
||||
## Pitfalls
|
||||
|
||||
- Do not confuse "serializable by design" with "serialize it now." A codec is a future implementation detail.
|
||||
- Do not add typed ids everywhere by taste. Add them when a real public field would otherwise depend on textual identity, object identity, or direct object references.
|
||||
- Do not treat `ReadOnlyList` as cosmetic. Ordered collections are part of the deterministic contract.
|
||||
- Do not let a private assembler or aggregator implementation shape leak into public handoff semantics.
|
||||
- Do not move the rule into PBS specs. PBS owns how it populates the handoff; compiler-general owns the common handoff contract.
|
||||
|
||||
## References
|
||||
|
||||
- `docs/specs/compiler/20. IRBackend to IRVM Lowering Specification.md`
|
||||
- `docs/specs/compiler/22. Backend Spec-to-Test Conformance Matrix.md`
|
||||
- `prometeu-compiler/prometeu-frontend-api/src/test/java/p/studio/compiler/models/IRBackendExecutableContractTest.java`
|
||||
- `prometeu-compiler/prometeu-build-pipeline/src/test/java/p/studio/compiler/specs/BackendConformanceMatrixSpecTest.java`
|
||||
- `prometeu-compiler/prometeu-build-pipeline/src/test/java/p/studio/compiler/backend/irvm/LowerToIRVMServiceTest.java`
|
||||
+143
@@ -0,0 +1,143 @@
|
||||
---
|
||||
id: LSN-0062
|
||||
ticket: multi-frontend-common-lifecycle
|
||||
title: Common lifecycle assembly after frontend declaration
|
||||
created: 2026-09-19
|
||||
tags: [compiler, compiler-general, compiler-pbs, lifecycle, backend, multi-frontend]
|
||||
---
|
||||
|
||||
# Common lifecycle assembly after frontend declaration
|
||||
|
||||
## Original Problem
|
||||
|
||||
`IRBackend` was already the common executable handoff, but the PBS frontend still
|
||||
owned two different jobs. It admitted language markers `[Init]`, `[Frame]`, and
|
||||
`InitAllowed`, and it also assembled the platform lifecycle: module init,
|
||||
project-init wrapper, published frame wrapper, physical entrypoint, and boot
|
||||
guard.
|
||||
|
||||
That second job discovered roles through `__pbs.*` names and lived inside
|
||||
`PBSFrontendPhaseService`. Another frontend could not reuse the boot sequence
|
||||
without copying PBS. Common backend code also risked treating PBS naming as the
|
||||
integration contract.
|
||||
|
||||
The old path had a concrete defect. The `[Init]` colocated with `[Frame]` is
|
||||
project init, but it was also included in the file-init fragment. The published
|
||||
wrapper then called module init and project init separately, so the same
|
||||
callable could run twice. Specs required project init exactly once, after all
|
||||
module initializers and before the frame root.
|
||||
|
||||
## Consolidated Decision
|
||||
|
||||
Declaration and assembly are separate.
|
||||
|
||||
An executable frontend emits an immutable, ordered, typed
|
||||
`IRLifecycleDeclaration` on `IRBackend`. The declaration carries:
|
||||
|
||||
- modules in explicit dependency order;
|
||||
- each module's ordered file-init fragment references;
|
||||
- an optional project-init callable;
|
||||
- exactly one frame-root callable.
|
||||
|
||||
References use `ModuleId`, `FileId`, `CallableId`, a typed role, and source
|
||||
attribution. Absence of a declaration means a deliberately non-executable
|
||||
handoff. It must not synthesize a default `main`.
|
||||
|
||||
`FrontendPhasePipelineStage` stops at that declarative backend.
|
||||
`AssembleLifecyclePipelineStage` runs immediately after it and is the terminal
|
||||
stage of `analyze()`. `LifecycleAssemblerService` is the only owner of derived
|
||||
lifecycle artifacts. `compile()` and `build()` reuse that single assembly pass.
|
||||
|
||||
`ResolveDepsPipelineStage` remains the ordering authority. Frontends propagate
|
||||
that order; the assembler validates and applies it. Neither side may rebuild
|
||||
order from synthetic names, `FileId`, textual module names, or incidental map
|
||||
order.
|
||||
|
||||
Project init is excluded from file-init fragments and runs exactly once. Common
|
||||
derived identities are neutral and deterministic. Common code must not import
|
||||
PBS packages or inspect `__pbs.*` prefixes. Typed roles, ids, and origins are
|
||||
the stable inspection surface; synthetic names are internal.
|
||||
|
||||
## Final Implementation
|
||||
|
||||
PBS now emits per-file lifecycle contributions and a project-level declaration.
|
||||
A colocated `[Init]` is the project-init reference only. File-init fragments
|
||||
remain frontend-lowered executables, consumed by id and role rather than by
|
||||
name prefix. `synthesizePublishedLifecycle` was removed.
|
||||
|
||||
The common assembler validates the declaration and materializes:
|
||||
|
||||
1. module init callables in declared module/file order;
|
||||
2. an optional project-init wrapper, invoked once;
|
||||
3. the published frame wrapper, which is the physical entrypoint;
|
||||
4. a hidden boot guard that prevents a second bootstrap after success.
|
||||
|
||||
The declaration remains on the assembled `IRBackend` as provenance. IRVM
|
||||
lowering keeps only assembled-graph preconditions such as wrapper identity,
|
||||
synthetic origin, and boot-guard presence. It does not reconstruct lifecycle
|
||||
from names.
|
||||
|
||||
`analyze()` still returns a fully assembled executable backend, without IRVM,
|
||||
bytecode, or file output. Neutral names use the `__prometeu.lifecycle.*` prefix.
|
||||
|
||||
Diagnostics stay split: PBS reports marker, signature, placement, cardinality,
|
||||
and colocation errors; the common layer reports unresolved ids, incompatible
|
||||
roles, missing frame root, invalid origins, and frontend-preassembled derived
|
||||
artifacts.
|
||||
|
||||
## Examples
|
||||
|
||||
Good frontend output:
|
||||
|
||||
- a file with globals or a non-project `[Init]` contributes a
|
||||
`FILE_INIT_FRAGMENT`;
|
||||
- the `[Init]` next to `[Frame]` is `PROJECT_INIT` only;
|
||||
- `[Frame]` is `FRAME_ROOT`;
|
||||
- module order follows the resolved dependency graph even when names or file
|
||||
ids would sort the other way.
|
||||
|
||||
Good assembled output:
|
||||
|
||||
- wrapper call order is module inits, then project init once, then frame root;
|
||||
- boot guard is a hidden global, not a user global;
|
||||
- `getLifecycleDeclaration()` still exposes the original typed references.
|
||||
|
||||
Bad output:
|
||||
|
||||
- PBS emitting `MODULE_INIT`, `PROJECT_INIT` wrappers, published wrappers, or
|
||||
boot guards;
|
||||
- common code matching `__pbs.frame_wrapper$m0` to discover the entrypoint;
|
||||
- sorting modules by `FileId` or textual path because the declaration order was
|
||||
inconvenient;
|
||||
- leaving both the PBS assembler and the common stage active.
|
||||
|
||||
## Pitfalls
|
||||
|
||||
- Do not treat `analyze()` as "frontend only." It now includes common lifecycle
|
||||
assembly so callers still receive an executable `IRBackend`.
|
||||
- Do not keep a temporary dual path. Two assemblers duplicate wrappers or init.
|
||||
- Do not infer missing frame roots or repair invalid declarations in the common
|
||||
layer. Fail deterministically.
|
||||
- Do not move PBS marker rules into the assembler. Language admission stays in
|
||||
PBS; structural handoff checks stay common.
|
||||
- Do not preserve `__pbs.*` names for common-derived artifacts as compatibility
|
||||
behavior. They were never a public ABI.
|
||||
- Do not confuse a frontend file-init fragment name with a common-derived
|
||||
identity. PBS may still name its own fragments; common code must not parse
|
||||
those names.
|
||||
|
||||
## References
|
||||
|
||||
- Decision: `DEC-0046`
|
||||
- Plan: `PLN-0125`
|
||||
- Related lessons: `LSN-0059`, `LSN-0060`
|
||||
- `docs/specs/compiler/23. Compiler Pipeline Entry Points Specification.md`
|
||||
- `docs/specs/compiler/20. IRBackend to IRVM Lowering Specification.md`
|
||||
- `docs/specs/compiler/22. Backend Spec-to-Test Conformance Matrix.md`
|
||||
- `docs/specs/compiler-languages/pbs/4. Static Semantics Specification.md`
|
||||
- `docs/specs/compiler-languages/pbs/9. Dynamic Semantics Specification.md`
|
||||
- `docs/specs/compiler-languages/pbs/12. Diagnostics Specification.md`
|
||||
- `docs/specs/compiler-languages/pbs/13. Lowering IRBackend Specification.md`
|
||||
- `prometeu-compiler/prometeu-frontend-api/src/main/java/p/studio/compiler/models/IRLifecycleDeclaration.java`
|
||||
- `prometeu-compiler/prometeu-build-pipeline/src/main/java/p/studio/compiler/lifecycle/LifecycleAssemblerService.java`
|
||||
- `prometeu-compiler/prometeu-build-pipeline/src/main/java/p/studio/compiler/workspaces/stages/AssembleLifecyclePipelineStage.java`
|
||||
+129
@@ -0,0 +1,129 @@
|
||||
---
|
||||
id: LSN-0063
|
||||
ticket: multi-frontend-validation-boundaries
|
||||
title: Language vs platform validation ownership
|
||||
created: 2026-09-19
|
||||
tags: [compiler, compiler-general, compiler-pbs, backend, validation, multi-frontend]
|
||||
---
|
||||
|
||||
# Language vs platform validation ownership
|
||||
|
||||
## Original Problem
|
||||
|
||||
PBS mixed two kinds of rejection. Some failures only make sense with the
|
||||
language: syntax, types, markers, barrel files, imports. Others belong to any
|
||||
executable frontend: malformed `IRBackend`, invalid lifecycle declarations,
|
||||
missing assembled wrappers, host-capability identity, bytecode/preload.
|
||||
|
||||
Without an ownership rule, the next frontend would copy PBS validators, or the
|
||||
common layer would start knowing `[Init]`, barrel, and `E_SEM_*`. Spec 19 was
|
||||
still titled as PBS verification, and the PBS diagnostics catalog listed
|
||||
wrapper and boot-guard failures as PBS coverage.
|
||||
|
||||
Lifecycle assembly had already moved (`LSN-0062`). That proved the pattern. It
|
||||
did not inventory the rest.
|
||||
|
||||
## Consolidated Decision
|
||||
|
||||
A validation lives at the lowest layer that understands the failure without
|
||||
knowing the source language.
|
||||
|
||||
- Language: needs AST, tokens, a language marker, a barrel, or another source
|
||||
rule.
|
||||
- Platform: can be checked on `IRBackend`, `IRLifecycleDeclaration`, IRVM, PBX,
|
||||
host/capability tables, or ids.
|
||||
|
||||
The discussion published that matrix. It did not extract a generic
|
||||
validator-core and did not move validators whose common contract is not closed.
|
||||
|
||||
Host admission is split. PBS owns the source shape of `[Host]` and
|
||||
`[Capability]`. Platform owns canonical `(module, name, version)` identity and
|
||||
capability consistency once those facts exist on `IRReservedMetadata`. The
|
||||
current validator may stay in the PBS package until a later plan. `E_HOST_*`
|
||||
is not eternal PBS semantics.
|
||||
|
||||
The same fact may exist on both sides with distinct identities. PBS can report
|
||||
`E_SEM_MISSING_PROJECT_FRAME`; the common layer still rejects an executable
|
||||
declaration with no frame root.
|
||||
|
||||
Platform codes are `COMMON_*`, `LOWER_IRVM_*`, or `MARSHAL_*`. PBS keeps
|
||||
`E_PARSE_*`, `E_SEM_*`, `E_LINK_*`, and `E_HOST_*`. Copy origin/span when
|
||||
present; a missing origin is a structural error, not a reason to invent a span.
|
||||
|
||||
Linking and barrel stay language-owned. `Addressable` is platform-owned and was
|
||||
classified only. SDK canonical source and the broad architectural harness stay
|
||||
on adjacent discussions.
|
||||
|
||||
## Final Implementation
|
||||
|
||||
The work was editorial and test-facing.
|
||||
|
||||
Spec 19 is now `Compiler Verification and Safety Checks Specification`. Gates
|
||||
S-U and S-I are unchanged. Section 11 states the classification rule, the
|
||||
English ownership matrix, diagnostic identity, dual reporting, and the
|
||||
host-admission split. It explicitly refuses validator-core extraction and
|
||||
package moves.
|
||||
|
||||
PBS diagnostics spec 12 keeps marker, syntax, semantics, linking, and
|
||||
host-attribute coverage. Common structural failures now point at spec 19
|
||||
section 11 and spec 20 instead of appearing as PBS required coverage.
|
||||
|
||||
Spec 20 cross-references that same compiler-general ownership. The conformance
|
||||
matrix added `G19-11.1` through `G19-11.6` and `PBS12-11`.
|
||||
`CommonBackendArchitectureTest` now guards `backend/`, `lifecycle/`, and all
|
||||
common pipeline stages. `ValidationOwnershipSpecTest` locks the title, matrix,
|
||||
and PBS recut.
|
||||
|
||||
`PbsHostAdmissionValidator` remains under `p.studio.compiler.pbs`. No linking
|
||||
or asset production code moved.
|
||||
|
||||
## Examples
|
||||
|
||||
Language-owned:
|
||||
|
||||
- parse errors;
|
||||
- `[Init]` / `[Frame]` signature and colocation;
|
||||
- barrel and import failures;
|
||||
- `host call not allowed during init`.
|
||||
|
||||
Platform-owned and already implemented:
|
||||
|
||||
- invalid `IRLifecycleDeclaration`;
|
||||
- assembled wrapper, boot guard, and synthetic origin preconditions;
|
||||
- IRVM and marshal rejection families.
|
||||
|
||||
Classified as platform, not moved:
|
||||
|
||||
- canonical host-binding identity on `IRReservedMetadata`;
|
||||
- `Addressable` / asset path.
|
||||
|
||||
Dual reporting:
|
||||
|
||||
- missing `[Frame]` in PBS source is `E_SEM_MISSING_PROJECT_FRAME`;
|
||||
- an executable declaration without frame root is a common structural error.
|
||||
|
||||
## Pitfalls
|
||||
|
||||
- Do not treat “classified as platform” as “move the class now.” Host admission
|
||||
still waits on the SDK source discussion.
|
||||
- Do not merge language and platform failures into one hybrid code. Two
|
||||
identities are cheaper than a lost message.
|
||||
- Do not put PBS governance or PBS diagnostics in charge of compiler-general
|
||||
safety gates.
|
||||
- Do not scan PBS frontend sources with the platform architecture guard. The
|
||||
guard is for common validators, not for the language package that must remain.
|
||||
- Do not invent a validator-core because several common checks exist. They
|
||||
already live on their stages.
|
||||
|
||||
## References
|
||||
|
||||
- Decision: `DEC-0047`
|
||||
- Plan: `PLN-0126`
|
||||
- Related lesson: `LSN-0062` - Common lifecycle assembly after frontend declaration
|
||||
- Related lesson: `LSN-0059` - Common IRBackend handoff and backend guardrails
|
||||
- `docs/specs/compiler/19. Verification and Safety Checks Specification.md`
|
||||
- `docs/specs/compiler-languages/pbs/12. Diagnostics Specification.md`
|
||||
- `docs/specs/compiler/20. IRBackend to IRVM Lowering Specification.md`
|
||||
- `docs/specs/compiler/22. Backend Spec-to-Test Conformance Matrix.md`
|
||||
- `prometeu-compiler/prometeu-build-pipeline/src/test/java/p/studio/compiler/specs/ValidationOwnershipSpecTest.java`
|
||||
- `prometeu-compiler/prometeu-build-pipeline/src/test/java/p/studio/compiler/specs/CommonBackendArchitectureTest.java`
|
||||
+121
@@ -0,0 +1,121 @@
|
||||
---
|
||||
id: LSN-0064
|
||||
ticket: multi-frontend-sdk-canonical-definition
|
||||
title: Runtime owns console ABI; PBS is delivery
|
||||
created: 2026-09-19
|
||||
tags: [compiler, compiler-general, sdk, stdlib, hostcalls, intrinsics, multi-frontend]
|
||||
---
|
||||
|
||||
# Runtime owns console ABI; PBS is delivery
|
||||
|
||||
## Original Problem
|
||||
|
||||
"SDK" mixed three layers: platform ABI, PBS stdlib shells, and docs. The PBS
|
||||
compiler reads `[Host]` and `[IntrinsicCall]` from `.pbs` files. It does not
|
||||
read the runtime registry. Intrinsics already had a CSV in the runtime
|
||||
repository, a handwritten Java enum, and a disabled parity test. Spec 8
|
||||
documented `audio` and `@core:math`. Disk had `game/stdlib/1` with `color`,
|
||||
`asset`, `composer`, `gfx`, `input`, and `log`. Spec 18 preferred `@sdk:*` for
|
||||
host APIs while `@sdk:input` was a builtin.
|
||||
|
||||
There is no second language in this phase. The risk was not a missing generic
|
||||
SDK. The risk was treating PBS shells, or a stale spec, as console ABI.
|
||||
DEC-0047 had already classified canonical host identity as platform-owned and
|
||||
left `PbsHostAdmissionValidator` in the PBS package until a shared source
|
||||
existed.
|
||||
|
||||
## Consolidated Decision
|
||||
|
||||
This discussion was an audit. It published an authority map. It did not create
|
||||
a canonical schema, generate bindings, enable intrinsic parity, or move the
|
||||
host-admission validator.
|
||||
|
||||
The console has two distinct axes:
|
||||
|
||||
- VM-owned intrinsics, identity `canonical_name@version` plus `final_id`;
|
||||
- host-backed calls, identity `(module, name, version)` plus capability.
|
||||
|
||||
Do not unify those axes into one catalog while PBS is the only frontend.
|
||||
|
||||
Conflict resolution:
|
||||
|
||||
- Intrinsic conflict: `runtime/docs/vm-arch/INTRINSICS.csv` wins. Studio
|
||||
`docs/vm-arch/INTRINSICS.csv` is a mirror. `IRVMIntrinsicDefinition` is
|
||||
derived. PBS `[BuiltinType]` / `[IntrinsicCall]` shells are delivery.
|
||||
- Host conflict: runtime spec 16 and `SyscallMeta` win. PBS `[Host]` attributes
|
||||
must not define ABI. They declare the shell the PBS compiler reads today.
|
||||
|
||||
`@sdk:*` / `@core:*` paths must not imply ownership. `@sdk:input` is a
|
||||
registered builtin exception. It was not moved to `@core`.
|
||||
|
||||
PBS conformance means PBS shells and docs match runtime ABI, not the reverse.
|
||||
`PbsHostAdmissionValidator` may stay in the PBS package. `E_HOST_*` is not
|
||||
eternal PBS semantics.
|
||||
|
||||
## Final Implementation
|
||||
|
||||
The work was editorial and test-facing.
|
||||
|
||||
Spec 18 now states that PBS stdlib is delivery and must not define syscall IDs,
|
||||
intrinsic `final_id` values, or `SyscallMeta`. Runtime catalogs outrank it.
|
||||
`@sdk:input` is recorded as the current builtin exception.
|
||||
|
||||
Spec 8 now documents `<target>/stdlib/<N>/...` with current line `1` at
|
||||
`game/stdlib/1`: `core/color` and `sdk/{asset,composer,gfx,input,log}`. It no
|
||||
longer ships `audio` or `@core:math` as current modules.
|
||||
|
||||
Spec 6.2 now requires PBS host shells to repeat the runtime registry and forbids
|
||||
inventing `(module, name, version)`. The authority example is
|
||||
`("gfx2d", "clear", 1)`.
|
||||
|
||||
`ConsoleAbiAuthoritySpecTest` locks those sentences. No production compiler
|
||||
code, stdlib `.pbs`, or validator package moved. The intrinsic parity test
|
||||
stays disabled.
|
||||
|
||||
## Examples
|
||||
|
||||
Runtime wins:
|
||||
|
||||
- `color.rgb@1` / `final_id` `0x1101` come from `INTRINSICS.csv`;
|
||||
- `("gfx2d", "clear", 1)` and `("asset", "load", 1)` come from `SyscallMeta`.
|
||||
|
||||
PBS delivers, and does not own, those identities:
|
||||
|
||||
- `@core:color` with `[BuiltinType(name = "color", version = 1)]`;
|
||||
- `@sdk:gfx` `LowGfx.clear` with `[Host(module = "gfx2d", name = "clear", version = 1)]`;
|
||||
- `@sdk:input` with `[BuiltinType]` / `[IntrinsicCall]` under `@sdk`.
|
||||
|
||||
Stale docs that the recut removed as current line-1 inventory:
|
||||
|
||||
- `stdlib/1/sdk/audio`;
|
||||
- `@core:math` as a packaged module.
|
||||
|
||||
## Pitfalls
|
||||
|
||||
- Do not treat PBS stdlib as the ABI catalog because the compiler already reads
|
||||
it. That is convenience, not authority.
|
||||
- Do not create `HOSTCALLS.csv` or generate the Java enum because the map now
|
||||
exists. A catalog waits on a second consumer.
|
||||
- Do not move `PbsHostAdmissionValidator` on the strength of this map. DEC-0047
|
||||
classified identity as platform; this discussion published who wins; the
|
||||
validator still has no shared catalog to consume.
|
||||
- Do not read `@sdk` as host and `@core` as VM. Path is packaging. `@sdk:input`
|
||||
is builtin.
|
||||
- Do not enable `IRVMIntrinsicRegistryParityTest` as a side effect of a doc
|
||||
recut. That is compiler/runtime sync, not PBS packaging conformance.
|
||||
- Do not put the authority map only in a decision. Housekeep deletes workflow
|
||||
artifacts. Specs and this lesson keep the map.
|
||||
|
||||
## References
|
||||
|
||||
- Decision: `DEC-0048`
|
||||
- Plan: `PLN-0127`
|
||||
- Related lesson: `LSN-0063` - Language vs platform validation ownership
|
||||
- Related lesson: `LSN-0061` - PBX is the language-neutral runtime boundary
|
||||
- `docs/specs/compiler/18. Standard Library Surface Specification.md`
|
||||
- `docs/specs/compiler-languages/pbs/8. Stdlib Environment Packaging and Loading Specification.md`
|
||||
- `docs/specs/compiler-languages/pbs/6.2. Host ABI Binding and Loader Resolution Specification.md`
|
||||
- `docs/vm-arch/README.md`
|
||||
- `../runtime/docs/vm-arch/INTRINSICS.csv`
|
||||
- `../runtime/docs/specs/runtime/16-host-abi-and-syscalls.md`
|
||||
- `prometeu-compiler/prometeu-build-pipeline/src/test/java/p/studio/compiler/specs/ConsoleAbiAuthoritySpecTest.java`
|
||||
+136
@@ -0,0 +1,136 @@
|
||||
---
|
||||
id: LSN-0061
|
||||
ticket: multi-frontend-pvm-neutrality
|
||||
title: PBX is the language-neutral runtime boundary
|
||||
created: 2026-09-18
|
||||
tags: [vm-arch, runtime, pvm, pbx, compiler, multi-frontend]
|
||||
---
|
||||
|
||||
# PBX is the language-neutral runtime boundary
|
||||
|
||||
## Original Problem
|
||||
|
||||
PBS was the first implemented frontend, so its name still appeared in a few
|
||||
common compiler specification titles. That editorial residue made it easier to
|
||||
misread the architecture as if PBS owned bytecode, IRVM, or the PVM execution
|
||||
model.
|
||||
|
||||
The implementation was already mostly neutral: the compiler emitted PBX, the
|
||||
runtime loaded PBX, and the common backend did not import PBS frontend packages.
|
||||
The real risk was future drift. In particular, IRVM could be mistaken for a
|
||||
runtime input, `PBS\0` could be confused with the executable magic, and duplicated
|
||||
VM-architecture documents could silently become competing authorities.
|
||||
|
||||
## Consolidated Decision
|
||||
|
||||
The executable pipeline is:
|
||||
|
||||
```text
|
||||
language frontend -> IRBackend -> IRVM -> PBX -> loader/verifier -> PVM
|
||||
```
|
||||
|
||||
`IRBackend`, `IRVM`, optimization, and PBX emission are compiler-owned.
|
||||
`IRVM` is an internal compiler representation and never crosses the runtime
|
||||
boundary. PBX is the only executable artifact consumed by the runtime.
|
||||
|
||||
The runtime repository owns PBX binary layout, Core ISA, loader behavior,
|
||||
verification, and PVM execution. Studio owns the common compiler transformations
|
||||
that produce conforming PBX. Studio copies of VM-architecture documents are
|
||||
mirrors, not independent authorities.
|
||||
|
||||
`PBS` names a language, frontend, stdlib, and explicitly language-specific
|
||||
integration. It does not name the executable format, magic, ISA, ABI, program
|
||||
image, or runtime type. The canonical persisted artifact is `program.pbx`, and
|
||||
its binary magic is `PBX\0`.
|
||||
|
||||
## Final Implementation
|
||||
|
||||
The common compiler specifications now identify bytecode/PBX and IRVM
|
||||
optimization as language-neutral surfaces. They explicitly state that IRVM is
|
||||
internal to the compiler and that PBX is the compiler/runtime boundary. Existing
|
||||
PBS references were retained where they describe legitimate frontend-specific
|
||||
publication or metadata behavior.
|
||||
|
||||
Studio's copies of `ARCHITECTURE.md`, `ISA_CORE.md`, and `INTRINSICS.csv` were
|
||||
synchronized with the runtime repository. A mirror policy now identifies the
|
||||
runtime repository as canonical and provides byte-for-byte comparison commands.
|
||||
|
||||
Existing Studio tests already proved two important invariants:
|
||||
|
||||
- `BytecodeModule` serializes the exact `PBX\0` header;
|
||||
- common backend contracts neither import nor publicly expose PBS frontend
|
||||
types.
|
||||
|
||||
Runtime conformance was strengthened in three focused places:
|
||||
|
||||
- the bytecode invalid-magic regression now explicitly proves that legacy
|
||||
`PBS\0` is rejected;
|
||||
- the PVM initialization regression now creates a `BytecodeModule` directly,
|
||||
serializes it, loads and verifies it, prepares the boot call, and executes it
|
||||
through `HALT` without any frontend;
|
||||
- a quality check inspects the `prometeu-bytecode` and `prometeu-vm` manifests
|
||||
and rejects dependencies whose identities belong to compiler or frontend
|
||||
layers.
|
||||
|
||||
No production VM behavior, ISA, ABI, or binary format changed.
|
||||
|
||||
## Examples
|
||||
|
||||
Language-specific work stops before the common backend:
|
||||
|
||||
```text
|
||||
PBS AST and semantic model
|
||||
-> PBS lowering
|
||||
-> neutral IRBackend data
|
||||
-> common IRVM lowering and optimization
|
||||
-> PBX\0
|
||||
```
|
||||
|
||||
A future frontend follows the same boundary:
|
||||
|
||||
```text
|
||||
FutureLanguage AST and semantic model
|
||||
-> FutureLanguage lowering
|
||||
-> neutral IRBackend data
|
||||
-> the same common IRVM and PBX stages
|
||||
```
|
||||
|
||||
The runtime sees the same PBX contract in both cases. It does not receive a
|
||||
`languageId`, source extension, AST object, IRVM object, or frontend service.
|
||||
|
||||
## Pitfalls and Anti-Patterns
|
||||
|
||||
- Do not expose IRVM as a convenient runtime protocol. It is optimized for
|
||||
compiler transformations, not binary compatibility or runtime loading.
|
||||
- Do not rename PBX concepts after the first frontend. `PBS\0` is invalid even
|
||||
when PBS produced the program.
|
||||
- Do not globally ban the word `PBS` from runtime documentation. PBS is a valid
|
||||
guest-language example; guards should inspect dependencies, public types, and
|
||||
format identities instead of raw text.
|
||||
- Do not duplicate tests when an existing guard proves the entire invariant.
|
||||
Extend coverage only for the missing distinction, such as explicit `PBS\0`
|
||||
rejection.
|
||||
- Do not let a documentation mirror become a second authority. Synchronize it
|
||||
against runtime or replace it with an explicit reference.
|
||||
- Loading a PBX image is not the same as beginning execution. The PVM boot test
|
||||
must prepare the published boot call before running the instruction budget.
|
||||
|
||||
## References
|
||||
|
||||
- `docs/specs/compiler/15. Bytecode and PBX Mapping Specification.md`
|
||||
- `docs/specs/compiler/20. IRBackend to IRVM Lowering Specification.md`
|
||||
- `docs/specs/compiler/21. IRVM Optimization Pipeline Specification.md`
|
||||
- `docs/vm-arch/README.md`
|
||||
- `prometeu-compiler/prometeu-build-pipeline/src/main/java/p/studio/compiler/backend/bytecode/BytecodeModule.java`
|
||||
- `prometeu-compiler/prometeu-build-pipeline/src/test/java/p/studio/compiler/specs/CommonBackendArchitectureTest.java`
|
||||
- Runtime: `crates/console/prometeu-bytecode/src/model.rs`
|
||||
- Runtime: `crates/console/prometeu-vm/src/virtual_machine.rs`
|
||||
- Runtime: `crates/dev/prometeu-quality-checks/tests/pvm_frontend_neutrality.rs`
|
||||
|
||||
## Takeaways
|
||||
|
||||
- PBX is the stable, language-neutral executable boundary.
|
||||
- IRVM stays private to the compiler pipeline.
|
||||
- Runtime authority and compiler authority are complementary, not competing.
|
||||
- Small dependency and artifact tests are enough to protect this boundary
|
||||
without introducing a plugin platform or a second language.
|
||||
+148
@@ -0,0 +1,148 @@
|
||||
---
|
||||
id: LSN-0065
|
||||
ticket: multi-frontend-synthetic-test-frontend
|
||||
title: Synthetic test frontend proves common pipeline neutrality
|
||||
created: 2026-09-19
|
||||
tags: [compiler, compiler-general, frontend, tests, backend, multi-frontend]
|
||||
---
|
||||
|
||||
# Synthetic test frontend proves common pipeline neutrality
|
||||
|
||||
## Original Problem
|
||||
|
||||
The common pipeline already had `FrontendProvider`, `IRBackend` as the
|
||||
executable handoff, common lifecycle assembly, and `IRBackend -> IRVM -> PBX`.
|
||||
Direct construction tests proved the backend could lower a handmade
|
||||
`IRBackend`. Import guards proved common backend code did not depend on PBS
|
||||
packages.
|
||||
|
||||
That was not enough. Nothing proved that a second provider, resolved by
|
||||
`languageId`, could enter through `DiscoverPhase` and
|
||||
`FrontendPhasePipelineStage`, assemble lifecycle, and finish
|
||||
`BuilderPipelineService.compile()` at verified bytecode without instantiating
|
||||
PBS, reading `.pbs` files, or loading PBS stdlib.
|
||||
|
||||
`CompileOnlyFrontendProvider` already existed as a local test double. It was
|
||||
not registered, returned an empty `IRBackend`, and never called the pipeline.
|
||||
It did not close this gap.
|
||||
|
||||
## Consolidated Decision
|
||||
|
||||
Pipeline neutrality is proved by a **test-only** compile-only
|
||||
`FrontendProvider`, not by a second product language and not by injecting IR
|
||||
into compile stages.
|
||||
|
||||
Locked shape (former Option A):
|
||||
|
||||
- `languageId` is `synth`.
|
||||
- The provider and `FrontendPhaseService` live only in
|
||||
`prometeu-build-pipeline` test sources.
|
||||
- `languageService()` is empty. There is no parser, grammar, semantic
|
||||
presentation, or stdlib catalog.
|
||||
- `sourceRoots` is `src`. `allowedExtensions` must not collide with `pbs` /
|
||||
`barrel`. The fixture must **not** create a source file of that extension.
|
||||
An empty `src/` directory must still exist because `WireProjectsPhase`
|
||||
resolves `toRealPath()`.
|
||||
- The compiler ignores source text and emits one module, one `frame` body
|
||||
that is a single `RET`, and an `IRLifecycleDeclaration` with exactly one
|
||||
`FRAME_ROOT` whose origin span is filled.
|
||||
- The handoff must not declare `FILE_INIT_FRAGMENT` or `PROJECT_INIT`, and
|
||||
must not pre-materialize wrappers, module-init, or `BOOT_GUARD`. The common
|
||||
assembler produces `__prometeu.lifecycle.frame_wrapper$mN` and the boot
|
||||
guard.
|
||||
- The IR must not contain host bindings, capabilities, intrinsics, PBS types,
|
||||
PBS stdlib, or `__pbs.` names.
|
||||
|
||||
The acceptance path is `compile()` through `VerifyBytecode`. Writing
|
||||
`program.pbx` is not the criterion. `build()` only adds disk I/O.
|
||||
|
||||
Registration stays on the existing static `FrontendRegistryService`.
|
||||
`register` and `unregister` are public. `unregister` refuses to remove the
|
||||
default PBS provider and is a no-op for unknown ids. Tests register `synth`
|
||||
for the duration of the run and unregister in `try/finally`.
|
||||
`bootstrapDefaults()`, `AppContainer`, and the Studio language catalog must
|
||||
not register `synth`.
|
||||
|
||||
Do not inject a `Registry` into the pipeline, add a `frontends/synth` module,
|
||||
scan the classpath, or treat a dummy on-disk extension as a language. Do not
|
||||
replace `LifecycleAssemblerServiceTest`, `LowerToIRVMServiceTest`, or
|
||||
`IRBackendExecutableContractTest` with this fixture.
|
||||
|
||||
A blank `prometeu.json` `language` field still defaults to PBS. The synthetic
|
||||
project must set `language: synth` explicitly.
|
||||
|
||||
## Final Implementation
|
||||
|
||||
`FrontendRegistryService.register(FrontendProvider)` is the explicit
|
||||
registration API. `unregister(String languageId)` removes a non-PBS provider
|
||||
or no-ops if the id is absent. Duplicate `register` still fails.
|
||||
`bootstrapDefaults()` still registers only PBS.
|
||||
|
||||
The test fixture is:
|
||||
|
||||
- `p.studio.compiler.synth.SyntheticFrontendProvider`
|
||||
- `p.studio.compiler.synth.SyntheticFrontendPhaseService`
|
||||
|
||||
`SyntheticFrontendPipelineTest` writes a temporary project
|
||||
(`language: synth`, `target: Game`, numeric `stdlib`, empty `src/`),
|
||||
registers the provider, calls `BuilderPipelineService.compile()`, and
|
||||
asserts:
|
||||
|
||||
- the synthetic compiler ran;
|
||||
- resolved `languageId` is `synth`, not `pbs`;
|
||||
- diagnostics have no errors;
|
||||
- in-memory bytecode is non-empty and verified;
|
||||
- assembled entrypoint is `__prometeu.lifecycle.frame_wrapper$m0`;
|
||||
- a hidden boot guard is present;
|
||||
- no `__pbs.` names;
|
||||
- no `.pbs` / `.barrel` sources were required;
|
||||
- after `unregister`, `listProviders()` is PBS-only.
|
||||
|
||||
Spec 23 section 8.3 records that a compile-only registered provider is a
|
||||
valid pipeline participant and that the common pipeline must not require PBS
|
||||
types, PBS sources, or PBS stdlib to emit verified bytecode. Spec 22 row
|
||||
`G23-8.3` binds that obligation to the synthetic pipeline test.
|
||||
|
||||
PBS production code, Studio, and `AppContainer` were not changed.
|
||||
|
||||
## Examples
|
||||
|
||||
Good:
|
||||
|
||||
- register `synth`, compile a temp project with empty `src/`, unregister;
|
||||
- `FRAME_ROOT` with `FileId(0)` and a non-none span, even with no source file
|
||||
in `FileTable`;
|
||||
- assert the synthetic compiler was invoked instead of importing
|
||||
`PBSFrontendPhaseService` from build-pipeline tests.
|
||||
|
||||
Bad:
|
||||
|
||||
- omitting `language` in the manifest so discovery silently uses PBS;
|
||||
- creating `main.dummy` and calling that a second frontend;
|
||||
- putting the provider under `prometeu-compiler/frontends/`;
|
||||
- leaving `synth` registered after the test so later tests see two providers;
|
||||
- using this pipeline test as a substitute for assembler or IRVM unit tests.
|
||||
|
||||
## Pitfalls
|
||||
|
||||
- `WireProjectsPhase` still needs `src/` on disk. Empty is not the same as
|
||||
missing.
|
||||
- Origin span `Span.none()` is rejected by the assembler. Use a real
|
||||
`FileId` even when no file was loaded.
|
||||
- `unregister("pbs")` must fail. A cleanup path that blindly unregisters the
|
||||
resolved language would delete the product default.
|
||||
- `listProviders()` feeds the Studio catalog. A leaked test registration
|
||||
would show `synth` as a new-project language.
|
||||
- Direct `IRBackend` construction tests still own backend-only proofs. The
|
||||
synthetic frontend owns the registry-plus-pipeline proof. Keep both.
|
||||
|
||||
## References
|
||||
|
||||
- Decision: `DEC-0049`
|
||||
- Plan: `PLN-0128`
|
||||
- Related lessons: `LSN-0055`, `LSN-0056`, `LSN-0059`, `LSN-0062`, `LSN-0061`
|
||||
- `docs/specs/compiler/23. Compiler Pipeline Entry Points Specification.md`
|
||||
- `docs/specs/compiler/22. Backend Spec-to-Test Conformance Matrix.md`
|
||||
- `prometeu-compiler/prometeu-frontend-registry/src/main/java/p/studio/compiler/FrontendRegistryService.java`
|
||||
- `prometeu-compiler/prometeu-build-pipeline/src/test/java/p/studio/compiler/synth/SyntheticFrontendProvider.java`
|
||||
- `prometeu-compiler/prometeu-build-pipeline/src/test/java/p/studio/compiler/integration/SyntheticFrontendPipelineTest.java`
|
||||
+151
@@ -0,0 +1,151 @@
|
||||
---
|
||||
id: LSN-0066
|
||||
ticket: multi-frontend-architectural-tests
|
||||
title: ArchUnit guards Java multi-frontend boundaries
|
||||
created: 2026-09-19
|
||||
tags: [compiler, compiler-general, studio, frontend, architecture, tests, multi-frontend]
|
||||
---
|
||||
|
||||
# ArchUnit guards Java multi-frontend boundaries
|
||||
|
||||
## Original Problem
|
||||
|
||||
The multi-frontend boundaries already existed in specs and lessons: common
|
||||
code selects a frontend by `languageId`, `IRBackend` is language-neutral,
|
||||
lifecycle assembly is common, and PBS is one provider. The automated
|
||||
protection did not match that model.
|
||||
|
||||
The old guards walked Java source and searched for substrings:
|
||||
|
||||
- `import p.studio.compiler.pbs`
|
||||
- `new PBSFrontendPhaseService(`
|
||||
- `new PbsEditorialSupportService(`
|
||||
|
||||
Those checks missed field, signature, and constructor coupling. They also
|
||||
treated `p.studio.compiler.pbs` as the whole PBS surface. Facades such as
|
||||
`PBSFrontendProvider`, `PBSDefinitions`, and `PBSFrontendPhaseService` live
|
||||
in the PBS module but not in that package. `prometeu-app` and
|
||||
`prometeu-lsp-v1` declared an `implementation` dependency on PBS without
|
||||
importing any PBS type.
|
||||
|
||||
## Consolidated Decision
|
||||
|
||||
Java multi-frontend boundaries are enforced by **ArchUnit + JUnit 5**, not by
|
||||
source substring search, except for the `__pbs.` literal scan that bytecode
|
||||
cannot see.
|
||||
|
||||
Durable locks from DEC-0050:
|
||||
|
||||
- ArchUnit is test-only, pinned in `gradle/libs.versions.toml`.
|
||||
- Rules live in the test-only Gradle project `:prometeu-architecture-tests`.
|
||||
That project has no production sources. It is not a plugin loader.
|
||||
- A PBS type is a class whose bytecode originates from
|
||||
`:prometeu-compiler:frontends:prometeu-frontend-pbs`. Package
|
||||
`p.studio.compiler.pbs` is not the complete boundary. Name prefixes
|
||||
`PBS*` / `Pbs*` are not the identity.
|
||||
- Production may depend on PBS types only in:
|
||||
- the PBS module itself;
|
||||
- `prometeu-frontend-registry` / `FrontendRegistryService`, and only on
|
||||
`PBSFrontendProvider` and `PBSDefinitions`.
|
||||
- `AppContainer` is not a PBS composition root. It may call
|
||||
`FrontendRegistryService.bootstrapDefaults()`. It must not instantiate PBS
|
||||
types.
|
||||
- `synth` is not in the production allowlist and must not be registered in
|
||||
`bootstrapDefaults()`.
|
||||
- Runtime, PVM, and the Rust repository stay out of this discussion
|
||||
(LSN-0061).
|
||||
- `IRBackendExecutableContractTest` remains the public-contract shape audit.
|
||||
ArchUnit covers module-origin dependence.
|
||||
|
||||
Do not migrate PBS facades into another package just to make the test
|
||||
easier. Do not ban the word `PBS` in docs, fixtures, or comments.
|
||||
|
||||
## Final Implementation
|
||||
|
||||
`:prometeu-architecture-tests` imports production classes under `p.studio`
|
||||
with `ImportOption.DoNotIncludeTests` and applies three ArchUnit rules:
|
||||
|
||||
1. classes outside the PBS module and the registry must not depend on
|
||||
PBS-module types;
|
||||
2. registry production may depend only on `PBSFrontendProvider` and
|
||||
`PBSDefinitions` from that module;
|
||||
3. frontend-api `p.studio.compiler.models` must not depend on PBS-module
|
||||
types.
|
||||
|
||||
A separate JUnit test walks `build.gradle.kts` files and allows the PBS
|
||||
project dependency only for:
|
||||
|
||||
- `:prometeu-compiler:prometeu-frontend-registry` as `implementation`/`api`;
|
||||
- `:prometeu-architecture-tests` as `testImplementation` (needed to classify
|
||||
class origin).
|
||||
|
||||
The `__pbs.` source scan moved to
|
||||
`CommonBackendPbsPrefixScanTest` and still covers `backend/`, `lifecycle/`,
|
||||
and `workspaces/stages/`.
|
||||
|
||||
Gradle graph cleanup:
|
||||
|
||||
- `prometeu-app` and `prometeu-lsp-v1` no longer `implementation` PBS.
|
||||
Runtime classloading of `PBSFrontendProvider` still comes through the
|
||||
registry's implementation dependency.
|
||||
- `prometeu-studio` no longer `testImplementation` PBS. No studio test
|
||||
compiled against PBS types.
|
||||
|
||||
Source-walk import/constructor tests were deleted.
|
||||
`FrontendProviderBoundaryTest` keeps only
|
||||
`compileOnlyFrontendProviderMayOmitLanguageService`.
|
||||
|
||||
Specs 19 §11 and 20 now say common/platform code must not depend on types
|
||||
from the PBS frontend module. Matrix rows G19-11.6, G20-4.1.2, and G20-4.3.3
|
||||
point at the ArchUnit rules and the `__pbs.` scan.
|
||||
|
||||
## Examples
|
||||
|
||||
Good:
|
||||
|
||||
- ArchUnit failure names the class that depends on a PBS-module type,
|
||||
including a facade in package `p.studio.compiler`.
|
||||
- Registry `bootstrapDefaults()` constructs `PBSFrontendProvider`. That is
|
||||
the allowed composition root.
|
||||
- App calls `FrontendRegistryService.bootstrapDefaults()` and has no PBS
|
||||
project dependency.
|
||||
|
||||
Bad:
|
||||
|
||||
- Searching source for `import p.studio.compiler.pbs` and calling the
|
||||
boundary protected.
|
||||
- Treating `AppContainer` as the place that may `new PBSFrontendProvider()`.
|
||||
- Identifying PBS by class name prefix, so a future `PbsLike` helper in
|
||||
common code is banned or a PBS facade is missed.
|
||||
- Adding ArchUnit to `java-common-conventions` for every module.
|
||||
|
||||
## Pitfalls
|
||||
|
||||
- Same Java package does not mean same Gradle module.
|
||||
`FrontendRegistryService` and `PBSFrontendProvider` both sit in
|
||||
`p.studio.compiler`. Origin is the module path or JAR name.
|
||||
- `@AnalyzeClasses` classes must not mix `@ArchTest` and Jupiter `@Test` on
|
||||
the same class. The ArchUnit engine owns `@ArchTest`.
|
||||
- `DoNotIncludeTests` is required. The architecture-test sources themselves
|
||||
reference PBS types in order to name the allowlist.
|
||||
- Removing PBS from app/lsp compile classpath is safe only because registry
|
||||
still `implementation`s PBS, which is runtime-transitive.
|
||||
- `testImplementation` of PBS on studio is not a production leak, but if no
|
||||
studio test needs PBS types it is still a lying graph. The allowlist test
|
||||
rejects it.
|
||||
- Do not point ArchUnit at the Rust runtime. `__pbs.` in Java source is a
|
||||
string contract, not a type dependency.
|
||||
|
||||
## References
|
||||
|
||||
- Decision: `DEC-0050`
|
||||
- Plan: `PLN-0129`
|
||||
- Related lessons: `LSN-0055`, `LSN-0059`, `LSN-0062`, `LSN-0063`,
|
||||
`LSN-0061`, `LSN-0065`
|
||||
- `docs/specs/compiler/19. Verification and Safety Checks Specification.md`
|
||||
- `docs/specs/compiler/20. IRBackend to IRVM Lowering Specification.md`
|
||||
- `docs/specs/compiler/22. Backend Spec-to-Test Conformance Matrix.md`
|
||||
- `prometeu-architecture-tests/src/test/java/p/studio/architecture/PbsModuleBoundaryArchTest.java`
|
||||
- `prometeu-architecture-tests/src/test/java/p/studio/architecture/PbsGradleDependencyAllowlistTest.java`
|
||||
- `prometeu-compiler/prometeu-frontend-registry/src/main/java/p/studio/compiler/FrontendRegistryService.java`
|
||||
- `prometeu-compiler/prometeu-frontend-api/src/test/java/p/studio/compiler/models/IRBackendExecutableContractTest.java`
|
||||
+167
@@ -0,0 +1,167 @@
|
||||
---
|
||||
id: LSN-0067
|
||||
ticket: multi-frontend-avoid-premature-abstractions
|
||||
title: Multi-frontend phase rejects premature infrastructure
|
||||
created: 2026-09-19
|
||||
tags: [compiler, compiler-general, studio, frontend, architecture, multi-frontend, simplicity]
|
||||
---
|
||||
|
||||
# Multi-frontend phase rejects premature infrastructure
|
||||
|
||||
## Original Problem
|
||||
|
||||
The multi-frontend preparation needed a standing simplicity rule. The original
|
||||
agenda asked for that rule *before* the other multi-frontend discussions.
|
||||
Those discussions already closed (DSC-0054 through DSC-0064). The remaining
|
||||
risk was not a missing plugin platform.
|
||||
|
||||
The remaining risk was twofold:
|
||||
|
||||
1. using "keep it simple" to put PBS construction back into common compiler,
|
||||
Studio, LSP, or app code;
|
||||
2. inventing marketplace, JAR loading, RPC, validator-core, or a generic SPI
|
||||
"for a future language" that does not exist in this repository.
|
||||
|
||||
`FrontendRegistryService` is a static singleton. The original agenda listed
|
||||
a global service locator as out of scope. Without an explicit exception, a
|
||||
later change could inject a `Registry` into the pipeline for purity, which
|
||||
DSC-0063 already refused.
|
||||
|
||||
## Consolidated Decision
|
||||
|
||||
This is standing policy for *future* work in the current phase: PBS as the
|
||||
only product frontend, `synth` as a test-only provider, frontends in-repo.
|
||||
It is not an audit of closed discussions and must not rewrite them.
|
||||
|
||||
Durable locks from DEC-0051:
|
||||
|
||||
- Implementation of this discussion is the decision plus this lesson. There
|
||||
is no new spec, no new ArchUnit rule, and no production refactor.
|
||||
- Spec 23 §2 and §8.3 remain the discovery MUST NOT surface. Do not copy
|
||||
those sentences into a new spec.
|
||||
- Architectural tests stay owned by LSN-0066.
|
||||
|
||||
### Static registry is allowed
|
||||
|
||||
`FrontendRegistryService` as a static singleton, with public `register` and
|
||||
`unregister` and `bootstrapDefaults()` registering only PBS, is the
|
||||
composition mechanism of this phase. Treat that as an explicit exception,
|
||||
not as a banned service locator.
|
||||
|
||||
Discovery must not use `ServiceLoader`, classpath scanning, reflection-based
|
||||
discovery, an external JAR, or runtime plugin installation.
|
||||
|
||||
Do not inject a `Registry` into the pipeline, LSP, or `AppContainer`.
|
||||
`AppContainer` is not a PBS composition root. It may call
|
||||
`FrontendRegistryService.bootstrapDefaults()`. It must not instantiate PBS
|
||||
types.
|
||||
|
||||
### Real in-repo consumer
|
||||
|
||||
A new interface, module, SPI, generator, or framework is allowed only when
|
||||
a real in-repo consumer exists. In this phase that consumer is one of:
|
||||
|
||||
- the PBS product frontend;
|
||||
- the `synth` test frontend;
|
||||
- a second product frontend accepted by its own decision.
|
||||
|
||||
"For a future language", "for the marketplace", or "when we have plugins"
|
||||
is not a consumer.
|
||||
|
||||
`FrontendProvider`, `IRBackend`, common lifecycle assembly, and test-only
|
||||
ArchUnit are not premature. They already have consumers.
|
||||
|
||||
### Forbidden in this phase
|
||||
|
||||
Until a later decision authorizes it with a real consumer, do not introduce:
|
||||
|
||||
1. dynamic frontend discovery (plugin, `ServiceLoader`, scan, external JAR,
|
||||
runtime install);
|
||||
2. RPC, sockets, a process supervisor, or version negotiation between
|
||||
compiler and frontend;
|
||||
3. a marketplace, hot reload, or frontend sandbox;
|
||||
4. a validator-core or generic validation framework;
|
||||
5. an SDK schema/generator or `HOSTCALLS.csv` as canonical ABI (LSN-0064);
|
||||
6. a product module `frontends/synth`;
|
||||
7. an injected `Registry`, or `AppContainer` as the PBS composition root.
|
||||
|
||||
This list is not a monorepo-wide simplicity charter. It does not govern
|
||||
JavaFX, packer, or LSP protocol design. Owner is `compiler/general`, with
|
||||
impact on `studio` on the multi-frontend axis.
|
||||
|
||||
### Neighbors stay closed
|
||||
|
||||
Do not reinterpret, relax, "simplify", or reimplement:
|
||||
|
||||
- provider/registry (LSN-0055 / spec 23 §8.3);
|
||||
- common lifecycle;
|
||||
- console ABI / PBS delivery;
|
||||
- `synth`;
|
||||
- ArchUnit / PBS module identity.
|
||||
|
||||
Using this policy to keep `new PBSFrontendPhaseService()` (or equivalent)
|
||||
in common code is refused. That is PBS recoupling, not simplicity.
|
||||
|
||||
A second product frontend needs its own decision. This lesson neither
|
||||
replaces that decision nor blocks it.
|
||||
|
||||
## Final Implementation
|
||||
|
||||
No production Java, Gradle, spec, or ArchUnit file changed.
|
||||
|
||||
The map above is the implementation. Future compiler/studio plans on this
|
||||
axis should cite it when they propose a new module, SPI, or discovery
|
||||
mechanism.
|
||||
|
||||
Code that already matches the phase:
|
||||
|
||||
- `FrontendProvider` exposes `specification()`, `compiler()`, and optional
|
||||
`languageService()`;
|
||||
- `FrontendRegistryService.bootstrapDefaults()` registers PBS only;
|
||||
- `AppContainer` only calls that bootstrap;
|
||||
- `synth` lives in build-pipeline test sources;
|
||||
- ArchUnit lives in `:prometeu-architecture-tests`.
|
||||
|
||||
## Examples
|
||||
|
||||
Good:
|
||||
|
||||
- add a method to `FrontendProvider` because PBS or `synth` cannot compile
|
||||
or register without it;
|
||||
- keep `unregister` on the static registry so `synth` tests can clean up;
|
||||
- reject a proposal to load language JARs from a plugin directory.
|
||||
|
||||
Bad:
|
||||
|
||||
- inject `Registry` into `BuilderPipelineService` because static state looks
|
||||
like a service locator;
|
||||
- create `frontends/synth` as a product module;
|
||||
- add validator-core "so the next language has somewhere to put checks";
|
||||
- keep `new PBSFrontendPhaseService()` in pipeline code and call that
|
||||
simpler than going through the provider.
|
||||
|
||||
## Pitfalls
|
||||
|
||||
- The original agenda order ("before the other agendas") is historical.
|
||||
Do not reopen DSC-0054..DSC-0064 to satisfy it.
|
||||
- Static registry plus explicit `register`/`unregister` is visible. Hidden
|
||||
`ServiceLoader` discovery is not the same thing.
|
||||
- A second product frontend *is* a real consumer. Do not use this lesson to
|
||||
refuse that frontend; use it to refuse infrastructure that frontend does
|
||||
not yet need.
|
||||
- Spec 23 already forbids plugin discovery. Do not duplicate it. Do not
|
||||
treat silence in spec 23 as permission for RPC or validator-core.
|
||||
- Simplicity does not mean PBS may leak into common modules. LSN-0066 still
|
||||
owns that boundary.
|
||||
|
||||
## References
|
||||
|
||||
- Decision: `DEC-0051`
|
||||
- Plan: `PLN-0130`
|
||||
- Related lessons: `LSN-0055`, `LSN-0060`, `LSN-0063`, `LSN-0064`,
|
||||
`LSN-0065`, `LSN-0066`
|
||||
- `docs/specs/compiler/23. Compiler Pipeline Entry Points Specification.md`
|
||||
(§2, §8.3)
|
||||
- `prometeu-compiler/prometeu-frontend-registry/src/main/java/p/studio/compiler/FrontendRegistryService.java`
|
||||
- `prometeu-compiler/prometeu-frontend-api/src/main/java/p/studio/compiler/services/FrontendProvider.java`
|
||||
- `prometeu-app/src/main/java/p/studio/AppContainer.java`
|
||||
@@ -1,62 +0,0 @@
|
||||
---
|
||||
id: AGD-0042
|
||||
ticket: pbs-lsp-go-to-definition
|
||||
title: PBS LSP Go to Definition
|
||||
status: open
|
||||
created: 2026-07-15
|
||||
resolved:
|
||||
decision:
|
||||
tags: [studio, lsp, vscode, compiler-pbs, editor, definition]
|
||||
---
|
||||
|
||||
## Pain
|
||||
|
||||
Domain owner: `studio/lsp`
|
||||
|
||||
PBS users cannot jump from a symbol use to its declaration, which makes navigation across source files, stdlib imports, services, and generated/editorial surfaces slow and error-prone.
|
||||
|
||||
## Context
|
||||
|
||||
The current LSP exposes diagnostics, hover, completion, signature help, and semantic tokens. The compiler already builds semantic read surfaces and editorial symbol resolution for hover/completion, but there is no LSP definition capability or stable location mapping exposed to VS Code.
|
||||
|
||||
## Open Questions
|
||||
|
||||
- [ ] Which symbol categories must be supported in the first definition wave?
|
||||
- [ ] Should stdlib and generated/supplemental declarations navigate to source files, virtual documents, or remain hover-only?
|
||||
- [ ] What identity model should connect an editor token to the canonical declaration without relying on text search?
|
||||
|
||||
## Options
|
||||
|
||||
### Option A - Syntactic location lookup
|
||||
|
||||
- **Approach:** Use parser spans and local AST traversal to map the token under cursor to a declaration with matching text.
|
||||
- **Pro:** Fast to implement and useful for same-file declarations.
|
||||
- **Con:** Breaks on overloads, imports, stdlib, aliases, and same-name symbols.
|
||||
- **Maintainability:** Weak; it creates a second navigation model separate from semantic resolution.
|
||||
|
||||
### Option B - Semantic identity lookup
|
||||
|
||||
- **Approach:** Extend the compiler/editorial surface with resolved declaration locations keyed by symbol identity, then expose `textDocument/definition`.
|
||||
- **Pro:** Correct for imports, overloads, methods, stdlib-backed declarations, and future references/rename.
|
||||
- **Con:** Requires explicit location metadata in semantic/editorial surfaces.
|
||||
- **Maintainability:** Strong; it becomes shared infrastructure for references, rename, hierarchy, and code actions.
|
||||
|
||||
## Tradeoffs
|
||||
|
||||
The syntactic option is tempting for speed, but it would likely be thrown away once references and rename arrive. The main tradeoff is whether stdlib/supplemental declarations must navigate to physical files immediately or can initially return no location while still supporting project symbols.
|
||||
|
||||
## Recommendation
|
||||
|
||||
Prefer Option B. Build a reusable semantic location index and implement the first wave for project source declarations, then define a policy for stdlib/supplemental targets.
|
||||
|
||||
## Discussion
|
||||
|
||||
This should probably be the first navigation agenda to resolve because references, rename, workspace symbols, and hierarchy depend on the same symbol identity/location model.
|
||||
|
||||
## Resolution
|
||||
|
||||
Ainda em aberto.
|
||||
|
||||
## Next Step
|
||||
|
||||
Decide the first-wave symbol categories and whether stdlib/supplemental declarations require virtual document support.
|
||||
@@ -1,62 +0,0 @@
|
||||
---
|
||||
id: AGD-0043
|
||||
ticket: pbs-lsp-find-references
|
||||
title: PBS LSP Find References
|
||||
status: open
|
||||
created: 2026-07-15
|
||||
resolved:
|
||||
decision:
|
||||
tags: [studio, lsp, vscode, compiler-pbs, editor, references]
|
||||
---
|
||||
|
||||
## Pain
|
||||
|
||||
Domain owner: `studio/lsp`
|
||||
|
||||
PBS users cannot ask where a symbol is used, so changes to functions, services, structs, constants, and stdlib-facing APIs require manual search that confuses overloads and unrelated text matches.
|
||||
|
||||
## Context
|
||||
|
||||
Completion and hover already resolve symbols in local editor context, but the LSP does not expose references and the compiler/editorial layer does not yet provide project-wide usage locations keyed by semantic identity.
|
||||
|
||||
## Open Questions
|
||||
|
||||
- [ ] Which declarations need reference tracking first: local functions, methods, types, constants, imports, stdlib symbols, or all of them?
|
||||
- [ ] How should overloads and same-name symbols in different scopes be disambiguated?
|
||||
- [ ] Should references include declarations, write/read classification, or only usage sites in the first wave?
|
||||
|
||||
## Options
|
||||
|
||||
### Option A - Text search with filters
|
||||
|
||||
- **Approach:** Search workspace text for the selected identifier and filter obvious false positives by token kind.
|
||||
- **Pro:** Simple and fast for early demos.
|
||||
- **Con:** Incorrect for overloads, scope, shadowing, fields, methods, imports, and generated/stdlib surfaces.
|
||||
- **Maintainability:** Poor; later semantic references would duplicate and replace it.
|
||||
|
||||
### Option B - Semantic usage index
|
||||
|
||||
- **Approach:** During semantic analysis, emit definition and usage sites tied to stable symbol identities and expose `textDocument/references`.
|
||||
- **Pro:** Correct foundation for rename, call hierarchy, diagnostics UX, and code actions.
|
||||
- **Con:** Requires compiler-facing usage modeling and careful invalidation.
|
||||
- **Maintainability:** Strong; one source of truth for all symbol usage features.
|
||||
|
||||
## Tradeoffs
|
||||
|
||||
Reference accuracy matters more than early breadth. False positives are worse than missing unsupported categories because users will trust rename and references for safe edits.
|
||||
|
||||
## Recommendation
|
||||
|
||||
Prefer Option B, but scope the first wave to project-owned declarations whose identity is already resolved reliably.
|
||||
|
||||
## Discussion
|
||||
|
||||
References should follow go-to-definition because both need the same identity and location model.
|
||||
|
||||
## Resolution
|
||||
|
||||
Ainda em aberto.
|
||||
|
||||
## Next Step
|
||||
|
||||
Define first-wave symbol categories and whether declarations are included in reference results.
|
||||
@@ -1,62 +0,0 @@
|
||||
---
|
||||
id: AGD-0044
|
||||
ticket: pbs-lsp-document-symbols-outline
|
||||
title: PBS LSP Document Symbols and Outline
|
||||
status: open
|
||||
created: 2026-07-15
|
||||
resolved:
|
||||
decision:
|
||||
tags: [studio, lsp, vscode, compiler-pbs, editor, outline, document-symbols]
|
||||
---
|
||||
|
||||
## Pain
|
||||
|
||||
Domain owner: `studio/lsp`
|
||||
|
||||
PBS files do not populate a reliable VS Code outline, forcing users to navigate long source files manually instead of scanning declarations and members structurally.
|
||||
|
||||
## Context
|
||||
|
||||
The parser and semantic surfaces know top-level declarations and many member declarations. The LSP currently does not announce documentSymbolProvider and does not map PBS declarations to DocumentSymbol or SymbolInformation payloads.
|
||||
|
||||
## Open Questions
|
||||
|
||||
- [ ] Should the first outline be syntactic, semantic, or hybrid?
|
||||
- [ ] Which hierarchy should be shown for structs, services, hosts, contracts, builtin types, enums, and methods?
|
||||
- [ ] How should invalid or partially parsed files contribute to outline during editing?
|
||||
|
||||
## Options
|
||||
|
||||
### Option A - AST-only outline
|
||||
|
||||
- **Approach:** Map parsed declarations and member spans directly to LSP `DocumentSymbol`.
|
||||
- **Pro:** Works even when semantic analysis is incomplete and gives immediate editor value.
|
||||
- **Con:** Cannot classify every symbol with semantic precision.
|
||||
- **Maintainability:** Good if kept as structural outline, not overloaded with semantic behavior.
|
||||
|
||||
### Option B - Semantic outline
|
||||
|
||||
- **Approach:** Build outline from semantic symbols after analysis.
|
||||
- **Pro:** More accurate kinds and can hide invalid/unresolved surfaces.
|
||||
- **Con:** More fragile during active editing and depends on full semantic success.
|
||||
- **Maintainability:** Good for final precision, but heavier than needed for outline.
|
||||
|
||||
## Tradeoffs
|
||||
|
||||
Outline should remain available during broken intermediate edits. Semantic precision is useful, but not at the cost of disappearing structure while typing.
|
||||
|
||||
## Recommendation
|
||||
|
||||
Prefer Option A with semantic enrichment where available. Use AST spans as the stable backbone.
|
||||
|
||||
## Discussion
|
||||
|
||||
Document symbols are relatively independent and can be implemented before definition/references.
|
||||
|
||||
## Resolution
|
||||
|
||||
Ainda em aberto.
|
||||
|
||||
## Next Step
|
||||
|
||||
Decide hierarchy and symbol kinds for PBS declarations and members.
|
||||
@@ -1,62 +0,0 @@
|
||||
---
|
||||
id: AGD-0045
|
||||
ticket: pbs-lsp-workspace-symbols
|
||||
title: PBS LSP Workspace Symbols
|
||||
status: open
|
||||
created: 2026-07-15
|
||||
resolved:
|
||||
decision:
|
||||
tags: [studio, lsp, vscode, compiler-pbs, editor, workspace-symbols]
|
||||
---
|
||||
|
||||
## Pain
|
||||
|
||||
Domain owner: `studio/lsp`
|
||||
|
||||
VS Code cannot search PBS symbols across the workspace, so users cannot quickly jump to functions, services, structs, constants, or stdlib-exposed APIs by name.
|
||||
|
||||
## Context
|
||||
|
||||
Document-level editorial features exist, but the LSP does not announce workspaceSymbolProvider and the compiler pipeline does not expose a project-wide symbol index designed for editor queries.
|
||||
|
||||
## Open Questions
|
||||
|
||||
- [ ] Should workspace symbols include only project files or also imported stdlib and SDK surfaces?
|
||||
- [ ] What symbol kinds and ranking should be returned for duplicate names or overloads?
|
||||
- [ ] Should the symbol index be cached from analysis snapshots or rebuilt per request in the first implementation?
|
||||
|
||||
## Options
|
||||
|
||||
### Option A - Project source index only
|
||||
|
||||
- **Approach:** Index project-owned declarations from analysis snapshots and expose `workspace/symbol`.
|
||||
- **Pro:** Clear ownership and physical locations.
|
||||
- **Con:** Does not help users discover stdlib/SDK symbols.
|
||||
- **Maintainability:** Strong as a first wave.
|
||||
|
||||
### Option B - Project plus stdlib index
|
||||
|
||||
- **Approach:** Include project declarations and imported stdlib/SDK surfaces in the workspace symbol result set.
|
||||
- **Pro:** Better discovery, especially for new users.
|
||||
- **Con:** Requires a navigation policy for stdlib source or virtual targets.
|
||||
- **Maintainability:** Good if stdlib target handling is solved; awkward otherwise.
|
||||
|
||||
## Tradeoffs
|
||||
|
||||
Workspace symbols are partly navigation and partly discovery. Including stdlib too early can create broken jumps if target locations are not defined.
|
||||
|
||||
## Recommendation
|
||||
|
||||
Prefer Option A first, then add stdlib once definition has a target policy.
|
||||
|
||||
## Discussion
|
||||
|
||||
This should follow document symbols and the semantic location/index work.
|
||||
|
||||
## Resolution
|
||||
|
||||
Ainda em aberto.
|
||||
|
||||
## Next Step
|
||||
|
||||
Decide whether first-wave workspace search includes stdlib or project-only symbols.
|
||||
@@ -1,62 +0,0 @@
|
||||
---
|
||||
id: AGD-0046
|
||||
ticket: pbs-lsp-rename-symbol
|
||||
title: PBS LSP Rename Symbol
|
||||
status: open
|
||||
created: 2026-07-15
|
||||
resolved:
|
||||
decision:
|
||||
tags: [studio, lsp, vscode, compiler-pbs, editor, rename]
|
||||
---
|
||||
|
||||
## Pain
|
||||
|
||||
Domain owner: `studio/lsp`
|
||||
|
||||
PBS users cannot safely rename a symbol through the editor, so they must edit text manually and risk missing references or changing unrelated overloads and same-name declarations.
|
||||
|
||||
## Context
|
||||
|
||||
Rename requires the same semantic identity and reference machinery needed by definition/references, plus workspace edits and conflict detection. The current LSP does not announce renameProvider.
|
||||
|
||||
## Open Questions
|
||||
|
||||
- [ ] Which symbols should be renameable in the first wave, and which should be protected such as stdlib, generated, host, or builtin declarations?
|
||||
- [ ] How should rename handle overloads, member methods, imports, and labels with the same text?
|
||||
- [ ] What validation should run before returning a WorkspaceEdit?
|
||||
|
||||
## Options
|
||||
|
||||
### Option A - Local file rename
|
||||
|
||||
- **Approach:** Rename only references in the current file using local semantic resolution.
|
||||
- **Pro:** Smaller blast radius and easier conflict handling.
|
||||
- **Con:** Incomplete for imported symbols and project-wide APIs.
|
||||
- **Maintainability:** Acceptable only if explicitly presented as limited.
|
||||
|
||||
### Option B - Workspace semantic rename
|
||||
|
||||
- **Approach:** Use a project-wide reference index and return a `WorkspaceEdit` for all usage and declaration sites.
|
||||
- **Pro:** Matches user expectations for editor rename.
|
||||
- **Con:** Requires reliable references, collision checks, and write-safety across files.
|
||||
- **Maintainability:** Strong once references exist.
|
||||
|
||||
## Tradeoffs
|
||||
|
||||
Rename is high trust. A partial or text-based rename can corrupt code silently, so scope must be explicit and conservative.
|
||||
|
||||
## Recommendation
|
||||
|
||||
Prefer Option B after semantic references are implemented. If delivered earlier, ship only a clearly limited local rename.
|
||||
|
||||
## Discussion
|
||||
|
||||
Do not implement rename before definition/references are resolved.
|
||||
|
||||
## Resolution
|
||||
|
||||
Ainda em aberto.
|
||||
|
||||
## Next Step
|
||||
|
||||
Decide whether rename waits for workspace references or ships a limited local-only wave.
|
||||
@@ -1,62 +0,0 @@
|
||||
---
|
||||
id: AGD-0047
|
||||
ticket: pbs-lsp-code-actions
|
||||
title: PBS LSP Code Actions and Quick Fixes
|
||||
status: open
|
||||
created: 2026-07-15
|
||||
resolved:
|
||||
decision:
|
||||
tags: [studio, lsp, vscode, compiler-pbs, editor, code-actions, quick-fix]
|
||||
---
|
||||
|
||||
## Pain
|
||||
|
||||
Domain owner: `studio/lsp`
|
||||
|
||||
PBS diagnostics are visible, but users do not get actionable quick fixes for common compiler/editor problems, making simple repairs slower than necessary.
|
||||
|
||||
## Context
|
||||
|
||||
The LSP maps diagnostics but does not announce codeActionProvider. Compiler diagnostics already carry codes and ranges, but not every diagnostic has enough structured repair data to generate safe edits.
|
||||
|
||||
## Open Questions
|
||||
|
||||
- [ ] Which diagnostics should receive quick fixes first?
|
||||
- [ ] Should code actions be produced from diagnostic codes only, or from structured compiler repair hints?
|
||||
- [ ] How should imports, reserved attributes, missing methods, and invalid Doc shapes be prioritized?
|
||||
|
||||
## Options
|
||||
|
||||
### Option A - Diagnostic-code quick fixes
|
||||
|
||||
- **Approach:** Map known diagnostic codes to simple edits in the LSP layer.
|
||||
- **Pro:** Fast for a small set of obvious repairs.
|
||||
- **Con:** Couples fixes to diagnostic text/ranges and can become brittle.
|
||||
- **Maintainability:** Moderate if limited to trivial edits.
|
||||
|
||||
### Option B - Compiler repair hints
|
||||
|
||||
- **Approach:** Extend diagnostics with structured repair metadata and let the LSP map hints to code actions.
|
||||
- **Pro:** Keeps product logic close to compiler knowledge.
|
||||
- **Con:** Requires a new diagnostic/repair contract.
|
||||
- **Maintainability:** Strong for non-trivial fixes and future frontends.
|
||||
|
||||
## Tradeoffs
|
||||
|
||||
Quick fixes are only useful if safe. Simple code-based fixes can ship first, but imports and generated stubs need stronger compiler context.
|
||||
|
||||
## Recommendation
|
||||
|
||||
Prefer Option B as the target design, with Option A allowed only for a small bootstrap set of unambiguous repairs.
|
||||
|
||||
## Discussion
|
||||
|
||||
This should follow diagnostics UX and import assistance for the first high-value fixes.
|
||||
|
||||
## Resolution
|
||||
|
||||
Ainda em aberto.
|
||||
|
||||
## Next Step
|
||||
|
||||
Pick the first three diagnostic codes eligible for safe quick fixes.
|
||||
@@ -1,76 +0,0 @@
|
||||
---
|
||||
id: AGD-0061
|
||||
ticket: multi-frontend-serializable-ir
|
||||
title: Manter a IR comum serializavel por design
|
||||
status: open
|
||||
created: 2026-07-15
|
||||
resolved:
|
||||
decision:
|
||||
tags: [compiler, compiler-general, ir, backend, serialization, multi-frontend]
|
||||
---
|
||||
|
||||
# Agenda - Manter a IR serializavel por design
|
||||
|
||||
## Objetivo
|
||||
|
||||
Domain owner: `compiler/general`.
|
||||
|
||||
Avaliar se a IR comum pode atravessar futuramente uma fronteira de processo sem redesenho, evitando callbacks, estado global, ciclos e identity equality como parte do contrato.
|
||||
|
||||
## Contexto atual
|
||||
|
||||
O pipeline atual roda na JVM, mas frontends futuros podem ser externos. O alinhamento proibe escolher JSON, Protobuf, RPC ou processo externo agora; a discussao deve focar no formato dos dados.
|
||||
|
||||
## Escopo
|
||||
|
||||
- Auditar records/classes da IR comum.
|
||||
- Identificar referencias a servicos, objetos mutaveis, ciclos e IDs implicitos.
|
||||
- Definir principios de modelagem: IDs explicitos, listas ordenadas, enums e valores primitivos.
|
||||
|
||||
## Fora de escopo
|
||||
|
||||
- Implementar codec.
|
||||
- Serializar a saida do PBS dentro do mesmo processo.
|
||||
- Escolher wire format.
|
||||
|
||||
## Arquivos e componentes a inspecionar
|
||||
|
||||
- `prometeu-compiler/prometeu-build-pipeline/src/main/java/p/studio/compiler/models/...`
|
||||
- `prometeu-compiler/prometeu-build-pipeline/src/main/java/p/studio/compiler/backend/...`
|
||||
- testes `IRBackendExecutableContractTest` e `LowerToIRVMServiceTest`
|
||||
- docs de specs do compiler geral
|
||||
|
||||
## Alteracoes propostas
|
||||
|
||||
Opcao A: documentar invariantes de serializabilidade e corrigir apenas vazamentos claros.
|
||||
|
||||
Opcao B: criar tipos de ID e spans onde hoje houver identidade textual ou referencias diretas instaveis.
|
||||
|
||||
Recomendacao inicial: comecar por auditoria e testes de reflexao leves antes de qualquer migracao estrutural.
|
||||
|
||||
## Estrategia de implementacao
|
||||
|
||||
Gerar uma lista de tipos publicos da IR, revisar construtores e campos, e propor correcoes incrementais para pontos que impediriam um codec futuro.
|
||||
|
||||
## Testes necessarios
|
||||
|
||||
- Teste de reflexao sobre campos publicos/record components da IR.
|
||||
- Teste de determinismo de ordenacao.
|
||||
- Teste de ausencia de referencias a AST, servicos ou callbacks.
|
||||
|
||||
## Criterios de aceitacao
|
||||
|
||||
- A IR pode ser descrita como grafo de dados aciclico ou com referencias por ID.
|
||||
- Nenhuma escolha prematura de wire format e introduzida.
|
||||
|
||||
## Riscos
|
||||
|
||||
- Overengineering de IDs onde o contrato ainda nao exige.
|
||||
- Quebrar ergonomia de testes ao tornar todos os objetos verbosos.
|
||||
|
||||
## Decisoes que devem ser registradas
|
||||
|
||||
- Regras minimas de serializabilidade.
|
||||
- Tipos de ID que devem existir agora.
|
||||
- Itens explicitamente adiados para codec futuro.
|
||||
|
||||
@@ -1,77 +0,0 @@
|
||||
---
|
||||
id: AGD-0062
|
||||
ticket: multi-frontend-common-lifecycle
|
||||
title: Extrair lifecycle comum das responsabilidades do frontend PBS
|
||||
status: open
|
||||
created: 2026-07-15
|
||||
resolved:
|
||||
decision:
|
||||
tags: [compiler, compiler-general, compiler-pbs, lifecycle, backend, multi-frontend]
|
||||
---
|
||||
|
||||
# Agenda - Extrair o lifecycle do frontend PBS
|
||||
|
||||
## Objetivo
|
||||
|
||||
Domain owner: `compiler/general`, com impacto em `compiler/pbs`.
|
||||
|
||||
Separar declaracao de lifecycle feita por uma linguagem da montagem comum de init, frame, module initializers e entrypoint publicado.
|
||||
|
||||
## Contexto atual
|
||||
|
||||
As lessons e specs antigas indicam que PBS ja trata lifecycle e wrapper/entrypoint. O alinhamento pede que `PBSFrontendPhaseService` deixe de conter regras universais da plataforma.
|
||||
|
||||
## Escopo
|
||||
|
||||
- Localizar onde PBS sintetiza ou valida lifecycle.
|
||||
- Definir contrato comum de `LifecycleDeclaration` ou equivalente.
|
||||
- Planejar servico comum para validar, ordenar e montar entrypoint.
|
||||
|
||||
## Fora de escopo
|
||||
|
||||
- Alterar sintaxe PBS.
|
||||
- Mudar comportamento observavel de projetos existentes.
|
||||
- Refatorar todo o backend junto da extracao.
|
||||
|
||||
## Arquivos e componentes a inspecionar
|
||||
|
||||
- `prometeu-compiler/frontends/prometeu-frontend-pbs/...PBSFrontendPhaseService...`
|
||||
- `prometeu-compiler/prometeu-build-pipeline/src/main/java/p/studio/compiler/backend/irvm/LowerToIRVMService.java`
|
||||
- `docs/specs/compiler/16. Runtime Execution and Initialization Specification.md`
|
||||
- `docs/specs/compiler/20. IRBackend to IRVM Lowering Specification.md`
|
||||
- `docs/specs/compiler-languages/pbs/13. Lowering IRBackend Specification.md`
|
||||
|
||||
## Alteracoes propostas
|
||||
|
||||
Opcao A: frontend PBS emite declaracoes neutras de lifecycle e backend/common assembler monta o entrypoint.
|
||||
|
||||
Opcao B: manter montagem no PBS por enquanto, mas isolar regras comuns em um servico compartilhado chamado pelo PBS.
|
||||
|
||||
Recomendacao inicial: extrair primeiro o servico comum com testes de caracterizacao, depois migrar o PBS para produzir apenas declaracoes.
|
||||
|
||||
## Estrategia de implementacao
|
||||
|
||||
Identificar fixture positiva atual, proteger com teste, criar contrato comum minimo, mover validacoes universais e manter mensagens PBS onde forem sintaxe/semantica da linguagem.
|
||||
|
||||
## Testes necessarios
|
||||
|
||||
- Lifecycle valido PBS continua gerando mesmo PBX/IRVM.
|
||||
- Lifecycle ausente ou frame invalido falha no nivel comum quando aplicavel.
|
||||
- Teste de IR comum com lifecycle sem parser PBS.
|
||||
|
||||
## Criterios de aceitacao
|
||||
|
||||
- PBS traduz a forma da linguagem para declaracoes neutras.
|
||||
- Servico comum valida e monta lifecycle da plataforma.
|
||||
|
||||
## Riscos
|
||||
|
||||
- Mover validacoes PBS-especificas para camada comum por engano.
|
||||
- Alterar ordem de inicializadores sem perceber.
|
||||
|
||||
## Decisoes que devem ser registradas
|
||||
|
||||
- Nome e ownership do servico comum.
|
||||
- Forma canonica das declaracoes de lifecycle.
|
||||
- Separacao entre erro de linguagem e erro de plataforma.
|
||||
|
||||
@@ -1,76 +0,0 @@
|
||||
---
|
||||
id: AGD-0063
|
||||
ticket: multi-frontend-validation-boundaries
|
||||
title: Separar validacoes de linguagem e validacoes de plataforma
|
||||
status: open
|
||||
created: 2026-07-15
|
||||
resolved:
|
||||
decision:
|
||||
tags: [compiler, compiler-general, compiler-pbs, backend, validation, multi-frontend]
|
||||
---
|
||||
|
||||
# Agenda - Separar validacoes de linguagem e plataforma
|
||||
|
||||
## Objetivo
|
||||
|
||||
Domain owner: `compiler/general`, com impacto em `compiler/pbs`.
|
||||
|
||||
Definir onde cada validacao deve viver: PBS para sintaxe e semantica da linguagem; compiler core/backend para entrypoints, exports, hostcalls, capabilities, layouts, IR e bytecode.
|
||||
|
||||
## Contexto atual
|
||||
|
||||
O PBS concentra parsing, semantica, lowering e algumas validacoes que podem ser universais. O backend ja possui validadores para IRVM, bytecode e precondicoes de lowering.
|
||||
|
||||
## Escopo
|
||||
|
||||
- Mapear diagnostics e validacoes atuais.
|
||||
- Classificar cada uma como linguagem ou plataforma.
|
||||
- Definir regra: colocar a validacao no nivel mais baixo que a compreende sem conhecer a linguagem.
|
||||
|
||||
## Fora de escopo
|
||||
|
||||
- Reescrever todas as mensagens diagnosticas.
|
||||
- Mudar codigos de erro sem necessidade.
|
||||
- Transferir validacoes antes de existir contrato comum suficiente.
|
||||
|
||||
## Arquivos e componentes a inspecionar
|
||||
|
||||
- `prometeu-compiler/frontends/prometeu-frontend-pbs/src/main/java/p/studio/compiler/pbs/semantics/...`
|
||||
- `prometeu-compiler/prometeu-build-pipeline/src/main/java/p/studio/compiler/backend/...`
|
||||
- `prometeu-compiler/prometeu-build-pipeline/src/test/java/p/studio/compiler/backend/...`
|
||||
- `docs/specs/compiler/19. Verification and Safety Checks Specification.md`
|
||||
- `docs/specs/compiler-languages/pbs/12. Diagnostics Specification.md`
|
||||
|
||||
## Alteracoes propostas
|
||||
|
||||
Opcao A: criar matriz de ownership de validacoes antes de mover codigo.
|
||||
|
||||
Opcao B: mover validacoes junto com lifecycle/IR quando cada fronteira for tocada.
|
||||
|
||||
Recomendacao inicial: matriz primeiro; migracao so quando uma decisao posterior fechar lifecycle e IR.
|
||||
|
||||
## Estrategia de implementacao
|
||||
|
||||
Auditar testes de erro existentes, agrupar por origem, decidir ownership e adicionar testes de regressao para impedir que o backend importe PBS.
|
||||
|
||||
## Testes necessarios
|
||||
|
||||
- Testes PBS para erros de sintaxe/semantica continuam no frontend.
|
||||
- Testes comuns para IR malformada, hostcall inexistente, export duplicado e lifecycle invalido.
|
||||
- Teste arquitetural de ausencia de imports PBS em validadores comuns.
|
||||
|
||||
## Criterios de aceitacao
|
||||
|
||||
- Validacoes da plataforma sao expressas sem conceitos PBS.
|
||||
- Validacoes PBS continuam preservadas e especificas.
|
||||
|
||||
## Riscos
|
||||
|
||||
- Perder qualidade de diagnostico ao mover validacao para camada comum.
|
||||
- Duplicar validacoes em vez de estabelecer ownership.
|
||||
|
||||
## Decisoes que devem ser registradas
|
||||
|
||||
- Matriz de validacoes e ownership.
|
||||
- Politica de diagnosticos quando o erro comum ainda precisa de source span de frontend.
|
||||
|
||||
@@ -1,78 +0,0 @@
|
||||
---
|
||||
id: AGD-0064
|
||||
ticket: multi-frontend-sdk-canonical-definition
|
||||
title: Auditoria e centralizacao gradual da definicao canonica do SDK
|
||||
status: open
|
||||
created: 2026-07-15
|
||||
resolved:
|
||||
decision:
|
||||
tags: [compiler, compiler-general, sdk, stdlib, hostcalls, intrinsics, multi-frontend]
|
||||
---
|
||||
|
||||
# Agenda - Centralizar a definicao do SDK
|
||||
|
||||
## Objetivo
|
||||
|
||||
Domain owner: `compiler/general`, com referencias a `compiler/pbs` e `vm-arch`.
|
||||
|
||||
Auditar onde hostcalls, intrinsics, tipos fundamentais e APIs do console sao definidos hoje antes de propor uma fonte canonica do SDK.
|
||||
|
||||
## Contexto atual
|
||||
|
||||
Existem specs em `docs/vm-arch/INTRINSICS.csv`, docs de stdlib em `docs/specs/compiler/18. Standard Library Surface Specification.md`, specs PBS de stdlib e host ABI, alem de possiveis registries em codigo e fixtures.
|
||||
|
||||
## Escopo
|
||||
|
||||
- Mapear fontes atuais da verdade.
|
||||
- Identificar definicoes geradas, duplicadas e manuais.
|
||||
- Propor caminho gradual para um schema canonico.
|
||||
|
||||
## Fora de escopo
|
||||
|
||||
- Migracao grande do SDK.
|
||||
- Gerar bindings para C#, Kotlin, TypeScript ou outras linguagens.
|
||||
- Escolher formato definitivo antes da auditoria.
|
||||
|
||||
## Arquivos e componentes a inspecionar
|
||||
|
||||
- `docs/vm-arch/INTRINSICS.csv`
|
||||
- `docs/specs/compiler/18. Standard Library Surface Specification.md`
|
||||
- `docs/specs/compiler-languages/pbs/5. Manifest, Stdlib, and SDK Resolution Specification.md`
|
||||
- `docs/specs/compiler-languages/pbs/6.1. Intrinsics and Builtin Types Specification.md`
|
||||
- `prometeu-compiler/...` registries de hostcalls/intrinsics/stdlib
|
||||
- runtime/PVM quando presente no workspace ou submodulos relacionados
|
||||
|
||||
## Alteracoes propostas
|
||||
|
||||
Opcao A: agenda de auditoria pura, produzindo mapa de fontes e duplicacoes.
|
||||
|
||||
Opcao B: criar schema canonico minimo depois da auditoria, sem migrar todos os consumidores.
|
||||
|
||||
Recomendacao inicial: primeiro fechar auditoria; so uma decision posterior deve escolher formato e migracao.
|
||||
|
||||
## Estrategia de implementacao
|
||||
|
||||
Listar cada hostcall/intrinsic/tipo fundamental em suas fontes atuais, comparar assinatura, capability, versao e docs, e classificar divergencias.
|
||||
|
||||
## Testes necessarios
|
||||
|
||||
- Testes de paridade entre registry runtime/backend e specs existentes, se ja houver fonte estruturada.
|
||||
- Testes de nao divergencia para IDs e assinaturas apos qualquer centralizacao.
|
||||
|
||||
## Criterios de aceitacao
|
||||
|
||||
- Existe mapa claro de fonte real da verdade.
|
||||
- Duplicacoes e divergencias ficam registradas.
|
||||
- Nenhuma migracao ampla e iniciada sem nova decisao.
|
||||
|
||||
## Riscos
|
||||
|
||||
- Tratar docs como fonte real quando o codigo ja diverge.
|
||||
- Iniciar geracao antes de saber quem consome cada definicao.
|
||||
|
||||
## Decisoes que devem ser registradas
|
||||
|
||||
- Fonte canonica proposta.
|
||||
- Campos obrigatorios do SDK.
|
||||
- Sequencia de migracao segura.
|
||||
|
||||
@@ -1,78 +0,0 @@
|
||||
---
|
||||
id: AGD-0065
|
||||
ticket: multi-frontend-pvm-neutrality
|
||||
title: Neutralidade da PVM e identificacao PBX independente de PBS
|
||||
status: open
|
||||
created: 2026-07-15
|
||||
resolved:
|
||||
decision:
|
||||
tags: [vm-arch, runtime, pvm, pbx, compiler, multi-frontend]
|
||||
---
|
||||
|
||||
# Agenda - Manter a PVM neutra
|
||||
|
||||
## Objetivo
|
||||
|
||||
Domain owner: `vm-arch`, com impacto em `compiler/general`.
|
||||
|
||||
Garantir que a PVM conheca apenas PBX/IRVM e conceitos runtime neutros, incluindo identificacao correta do formato como `PBX`/`PBX\0`, nao `PBS`.
|
||||
|
||||
## Contexto atual
|
||||
|
||||
O documento e focado no Studio, mas runtime neutrality e uma fronteira transversal. A PVM nao deve conhecer `PBS service`, `PBS struct`, `PBS optional` ou qualquer conceito de linguagem.
|
||||
|
||||
## Escopo
|
||||
|
||||
- Auditar nomenclatura e imports runtime/PVM disponiveis no repo.
|
||||
- Verificar magic/header de PBX quando o codigo estiver no workspace.
|
||||
- Confirmar que linguagem e convertida antes da execucao.
|
||||
|
||||
## Fora de escopo
|
||||
|
||||
- Modificar a PVM se o acoplamento estiver apenas no Studio ou compiler.
|
||||
- Alterar ISA sem necessidade.
|
||||
- Adicionar suporte a qualquer linguagem nova.
|
||||
|
||||
## Arquivos e componentes a inspecionar
|
||||
|
||||
- `docs/vm-arch/ARCHITECTURE.md`
|
||||
- `docs/vm-arch/ISA_CORE.md`
|
||||
- `docs/specs/compiler/15. Bytecode and PBX Mapping Specification.md`
|
||||
- `prometeu-compiler/prometeu-build-pipeline/src/main/java/p/studio/compiler/backend/bytecode/...`
|
||||
- runtime/PVM em repositorio ou modulo relacionado, quando presente
|
||||
|
||||
## Alteracoes propostas
|
||||
|
||||
Opcao A: auditoria documental e de codigo para nomes PBS indevidos em runtime/bytecode.
|
||||
|
||||
Opcao B: corrigir imediatamente apenas identificacao `PBS` vs `PBX` se houver bug confirmado e isolado.
|
||||
|
||||
Recomendacao inicial: auditar primeiro; corrigir somente caso a fronteira esteja claramente violada e a mudanca seja pequena.
|
||||
|
||||
## Estrategia de implementacao
|
||||
|
||||
Buscar termos PBS no runtime, bytecode e specs VM; classificar ocorrencias validas de docs historicas vs erros de contrato.
|
||||
|
||||
## Testes necessarios
|
||||
|
||||
- Teste de magic/header PBX.
|
||||
- Teste arquitetural impedindo imports PBS no runtime/PVM.
|
||||
- Teste de carregamento/verificacao de programa sem dependencia de linguagem.
|
||||
|
||||
## Criterios de aceitacao
|
||||
|
||||
- PVM nao depende de conceitos PBS.
|
||||
- Formato executavel e tratado como PBX.
|
||||
- Qualquer correcao runtime necessaria fica separada de refactors Studio/compiler.
|
||||
|
||||
## Riscos
|
||||
|
||||
- Confundir nomenclatura documental antiga com acoplamento real.
|
||||
- Expandir escopo para VM quando o problema pertence ao compiler.
|
||||
|
||||
## Decisoes que devem ser registradas
|
||||
|
||||
- Lista de conceitos permitidos na PVM.
|
||||
- Politica de nomenclatura PBX/PBS.
|
||||
- Onde ficam testes de neutralidade runtime.
|
||||
|
||||
@@ -1,77 +0,0 @@
|
||||
---
|
||||
id: AGD-0066
|
||||
ticket: multi-frontend-synthetic-test-frontend
|
||||
title: Frontend sintetico de teste para provar neutralidade do pipeline
|
||||
status: open
|
||||
created: 2026-07-15
|
||||
resolved:
|
||||
decision:
|
||||
tags: [compiler, compiler-general, frontend, tests, backend, multi-frontend]
|
||||
---
|
||||
|
||||
# Agenda - Criar um frontend sintetico de teste
|
||||
|
||||
## Objetivo
|
||||
|
||||
Domain owner: `compiler/general`.
|
||||
|
||||
Discutir um frontend exclusivo de testes que prove que o pipeline comum nao depende implicitamente do PBS.
|
||||
|
||||
## Contexto atual
|
||||
|
||||
O criterio arquitetural final exige que um frontend sintetico implemente contratos equivalentes a `FrontendProvider`, `FrontendSpec` e `FrontendCompiler`, produza IR comum minima e passe pelo backend ate PBX/verifier.
|
||||
|
||||
## Escopo
|
||||
|
||||
- Escolher entre frontend totalmente sintetico ou extensao ficticia.
|
||||
- Definir fixture de IR minima com `frame` vazio.
|
||||
- Garantir isolamento em testes.
|
||||
|
||||
## Fora de escopo
|
||||
|
||||
- Expor frontend sintetico no Studio.
|
||||
- Criar segunda linguagem real.
|
||||
- Criar parser completo ou grammar dummy complexa.
|
||||
|
||||
## Arquivos e componentes a inspecionar
|
||||
|
||||
- `prometeu-compiler/prometeu-frontend-registry/...`
|
||||
- `prometeu-compiler/prometeu-build-pipeline/...`
|
||||
- testes do build pipeline e backend
|
||||
- `prometeu-studio/src/main/java/p/studio/projects/...` apenas se a selecao por extensao for exercitada
|
||||
|
||||
## Alteracoes propostas
|
||||
|
||||
Opcao A: provider sintetico que ignora arquivos e retorna IR minima diretamente.
|
||||
|
||||
Opcao B: extensao `.dummy` reconhecida em fixture, com conteudo ignorado ou trivial.
|
||||
|
||||
Recomendacao inicial: preferir Opcao A para provar neutralidade do pipeline sem criar outra superficie de linguagem.
|
||||
|
||||
## Estrategia de implementacao
|
||||
|
||||
Esperar provider/IR/lifecycle estarem suficientemente definidos, entao adicionar fixture de teste que registra provider sintetico e executa pipeline comum sem PBS.
|
||||
|
||||
## Testes necessarios
|
||||
|
||||
- Provider registrado e resolvido por `languageId`.
|
||||
- Extensao/source handling testado se a opcao B for escolhida.
|
||||
- IR comum produzida, lifecycle montado, IRVM gerado, PBX emitido e verificado.
|
||||
|
||||
## Criterios de aceitacao
|
||||
|
||||
- Teste falha se pipeline comum instanciar PBS implicitamente.
|
||||
- Synthetic frontend existe apenas em test fixtures.
|
||||
- PBS nao e afetado.
|
||||
|
||||
## Riscos
|
||||
|
||||
- Fixture sintetica exercitar caminho feliz pequeno demais e nao proteger acoplamentos reais.
|
||||
- Virar uma segunda linguagem informal.
|
||||
|
||||
## Decisoes que devem ser registradas
|
||||
|
||||
- Forma do frontend sintetico.
|
||||
- Escopo minimo da IR fixture.
|
||||
- Onde o provider de teste pode ser registrado.
|
||||
|
||||
@@ -1,79 +0,0 @@
|
||||
---
|
||||
id: AGD-0067
|
||||
ticket: multi-frontend-architectural-tests
|
||||
title: Testes arquiteturais para fronteiras multi-frontend
|
||||
status: open
|
||||
created: 2026-07-15
|
||||
resolved:
|
||||
decision:
|
||||
tags: [compiler, compiler-general, studio, frontend, architecture, tests, multi-frontend]
|
||||
---
|
||||
|
||||
# Agenda - Criar testes arquiteturais
|
||||
|
||||
## Objetivo
|
||||
|
||||
Domain owner: `compiler/general`, com impacto em `studio` e `vm-arch`.
|
||||
|
||||
Definir testes que protejam fronteiras: backend comum sem PBS, IR comum sem AST PBS, Studio comum sem instanciacao PBS fora do composition root e runtime neutro.
|
||||
|
||||
## Contexto atual
|
||||
|
||||
O repo ja tem testes Java para backend, bytecode e IRVM. ArchUnit pode ser util, mas o alinhamento proibe adicionar biblioteca arquitetural quando testes simples bastarem.
|
||||
|
||||
## Escopo
|
||||
|
||||
- Escolher ferramenta minima.
|
||||
- Definir regras por pacote.
|
||||
- Adicionar testes que sejam baratos e claros.
|
||||
|
||||
## Fora de escopo
|
||||
|
||||
- Cobrir toda arquitetura do monorepo.
|
||||
- Adicionar ArchUnit sem justificativa concreta.
|
||||
- Bloquear referencias PBS em testes PBS ou no frontend PBS.
|
||||
|
||||
## Arquivos e componentes a inspecionar
|
||||
|
||||
- `build.gradle.kts` e version catalog se houver.
|
||||
- `prometeu-compiler/prometeu-build-pipeline/src/test/java/...`
|
||||
- `prometeu-compiler/frontends/prometeu-frontend-pbs/src/test/java/...`
|
||||
- `prometeu-studio/src/test/java/...`
|
||||
- pacotes runtime/PVM quando presentes
|
||||
|
||||
## Alteracoes propostas
|
||||
|
||||
Opcao A: testes Java/reflection simples para imports, nomes de tipos e packages publicos.
|
||||
|
||||
Opcao B: ArchUnit caso a quantidade de regras e modulos justifique.
|
||||
|
||||
Recomendacao inicial: comecar com testes simples; reavaliar ArchUnit se as regras virarem frageis.
|
||||
|
||||
## Estrategia de implementacao
|
||||
|
||||
Definir allowlist de packages PBS, composition root e testes PBS. Escrever verificacoes independentes por dominio para falhas legiveis.
|
||||
|
||||
## Testes necessarios
|
||||
|
||||
- Backend/common nao importa `frontend.pbs`, `parser.pbs` ou `semantic.pbs`.
|
||||
- IR comum nao expoe tipos PBS.
|
||||
- Studio comum nao instancia servicos PBS fora da allowlist.
|
||||
- Runtime nao usa nomenclatura ou semantica PBS.
|
||||
|
||||
## Criterios de aceitacao
|
||||
|
||||
- Regras rodam no build local.
|
||||
- Falhas apontam arquivo/pacote responsavel.
|
||||
- Excecoes autorizadas estao documentadas.
|
||||
|
||||
## Riscos
|
||||
|
||||
- Teste textual produzir falso positivo por docs ou fixtures.
|
||||
- Criar barreira rigida antes de definir provider e lifecycle.
|
||||
|
||||
## Decisoes que devem ser registradas
|
||||
|
||||
- Ferramenta escolhida.
|
||||
- Allowlist de packages.
|
||||
- Ordem de introducao das regras.
|
||||
|
||||
@@ -1,77 +0,0 @@
|
||||
---
|
||||
id: AGD-0068
|
||||
ticket: multi-frontend-avoid-premature-abstractions
|
||||
title: Evitar abstracoes prematuras na preparacao multi-frontend
|
||||
status: open
|
||||
created: 2026-07-15
|
||||
resolved:
|
||||
decision:
|
||||
tags: [compiler, compiler-general, studio, frontend, architecture, multi-frontend, simplicity]
|
||||
---
|
||||
|
||||
# Agenda - Evitar abstracoes prematuras
|
||||
|
||||
## Objetivo
|
||||
|
||||
Domain owner: `compiler/general`, com impacto em `studio`.
|
||||
|
||||
Definir limites para a preparacao multi-frontend: remover acoplamento com baixo custo sem construir marketplace, hot reload, RPC, sandbox ou infraestrutura generica antes da necessidade real.
|
||||
|
||||
## Contexto atual
|
||||
|
||||
O PBS continuara sendo o unico frontend implementado no curto prazo. O objetivo e preparar contratos, fronteiras e testes de neutralidade, nao criar uma plataforma completa de plugins.
|
||||
|
||||
## Escopo
|
||||
|
||||
- Estabelecer principios para as agendas derivadas.
|
||||
- Definir o que e explicitamente proibido nesta fase.
|
||||
- Criar criterio para rejeitar abstracoes sem uso real.
|
||||
|
||||
## Fora de escopo
|
||||
|
||||
- Plugin marketplace.
|
||||
- Carregamento dinamico de JARs.
|
||||
- RPC, sockets, process supervisor ou version negotiation complexa.
|
||||
- Service locator global.
|
||||
|
||||
## Arquivos e componentes a inspecionar
|
||||
|
||||
- `prometeu-compiler/prometeu-frontend-registry/...`
|
||||
- `prometeu-app/src/main/java/p/studio/AppContainer.java`
|
||||
- `prometeu-studio/src/main/java/p/studio/...`
|
||||
- planos futuros derivados das discussions multi-frontend
|
||||
|
||||
## Alteracoes propostas
|
||||
|
||||
Opcao A: registrar esta decisao como guardrail transversal antes das demais.
|
||||
|
||||
Opcao B: deixar cada agenda repetir suas restricoes locais.
|
||||
|
||||
Recomendacao inicial: criar uma decisao curta e transversal apos discussao, para guiar provider, language services, synthetic frontend e testes arquiteturais.
|
||||
|
||||
## Estrategia de implementacao
|
||||
|
||||
Transformar o alinhamento em criterios de review: interface pequena, registro explicito, DI/composicao, records imutaveis e testes; rejeitar infra que nao seja exigida pelo PBS ou pelo frontend sintetico de teste.
|
||||
|
||||
## Testes necessarios
|
||||
|
||||
- Nao ha teste direto para simplicidade, mas plans devem incluir criterio de aceite contra reflection/scanning/RPC quando aplicavel.
|
||||
- Testes arquiteturais podem proteger contra service locator global ou acoplamentos indevidos.
|
||||
|
||||
## Criterios de aceitacao
|
||||
|
||||
- Plans derivados nao introduzem infraestrutura de plugin antes da necessidade.
|
||||
- Registro manual do PBS e suficiente.
|
||||
- O frontend sintetico prova neutralidade sem virar plataforma externa.
|
||||
|
||||
## Riscos
|
||||
|
||||
- Usar "evitar abstracao" como desculpa para manter acoplamento PBS.
|
||||
- Criar contratos tao pequenos que precisem ser quebrados imediatamente.
|
||||
|
||||
## Decisoes que devem ser registradas
|
||||
|
||||
- Guardrails obrigatorios para esta fase.
|
||||
- Lista de mecanismos proibidos.
|
||||
- Criterio para aceitar uma nova abstracao.
|
||||
|
||||
@@ -82,7 +82,8 @@ The following inputs are already fixed elsewhere and must not be contradicted he
|
||||
- Stable source span metadata is required at the token level and must remain useful to later diagnostics.
|
||||
- Traps are fatal runtime outcomes rather than a recoverable userland diagnostic flow.
|
||||
- Qualitative cost facts such as retention-bearing operations and host-boundary crossings are normative, but quantitative performance metrics are not.
|
||||
- Topic `19` requires deterministic diagnostics for globals, lifecycle markers, init admission, and published-wrapper structural failures.
|
||||
- PBS requires deterministic diagnostics for source-form globals, lifecycle markers, and init admission.
|
||||
- Published-wrapper, boot-guard, synthetic-origin, and invalid-lifecycle-declaration failures are compiler-general. See `docs/specs/compiler/19. Verification and Safety Checks Specification.md` section 11 and `docs/specs/compiler/20. IRBackend to IRVM Lowering Specification.md`.
|
||||
|
||||
## 6. Required Diagnostic Phases
|
||||
|
||||
@@ -97,6 +98,8 @@ PBS-facing tooling must distinguish at least the following external diagnostic p
|
||||
|
||||
`linking` is a first-class phase in the external diagnostics contract and must not be collapsed away into a generic resolution bucket.
|
||||
|
||||
The `host-binding/capability admission` phase covers the source shape of `[Host]` and `[Capability]`. Canonical host-binding identity and capability consistency over `IRReservedMetadata` are platform-owned and are not moved by this specification.
|
||||
|
||||
This document does not require one finer-grained public phase split for verifier internals, artifact offsets, or transport-specific backend stages beyond what is stated here.
|
||||
|
||||
## 7. Required Diagnostic Identity, Payload, and Attribution
|
||||
@@ -180,7 +183,7 @@ At minimum, the PBS diagnostics baseline must cover:
|
||||
5. malformed, unauthorized, or capability-rejected host usage required by `6.2. Host ABI Binding and Loader Resolution Specification.md` and `7. Cartridge Manifest and Runtime Capabilities Specification.md`,
|
||||
6. source-attributable backend-originated failures that remain user-actionable under normative lowering or load-facing rules.
|
||||
7. dependency-scoped fail-fast admission at frontend boundary: when one module is rejected, modules that import it (directly or transitively) must not be emitted, while diagnostics collection for independent modules must continue.
|
||||
8. lifecycle and globals diagnostics required by topic `19`, including:
|
||||
8. lifecycle-marker and source-form global diagnostics, including:
|
||||
- `global initializer uses unsupported form`,
|
||||
- `global dependency cycle detected`,
|
||||
- `global import must resolve through a global barrel entry`,
|
||||
@@ -194,16 +197,13 @@ At minimum, the PBS diagnostics baseline must cover:
|
||||
- `project init must be colocated with frame`,
|
||||
- `Init attribute target invalid`,
|
||||
- `InitAllowed is valid only on SDK host methods`,
|
||||
- `host call not allowed during init`,
|
||||
- `synthetic wrapper entrypoint missing`,
|
||||
- `published entrypoint is not function index 0`,
|
||||
- `hidden boot guard is missing`,
|
||||
- `synthetic callable origin missing`.
|
||||
9. symbolic asset-reference diagnostics required by backend-owned `Addressable` resolution, including:
|
||||
- `host call not allowed during init`.
|
||||
9. compiler-general lifecycle-assembly and IRVM-precondition failures, which this PBS catalog MUST NOT claim as PBS required coverage; see `docs/specs/compiler/19. Verification and Safety Checks Specification.md` section 11 and `docs/specs/compiler/20. IRBackend to IRVM Lowering Specification.md`.
|
||||
10. symbolic asset-reference diagnostics required by backend-owned `Addressable` resolution, including:
|
||||
- unresolved terminal asset reference,
|
||||
- namespace-versus-terminal asset misuse,
|
||||
- structurally invalid symbolic asset path admitted by source syntax but rejected by semantic surface rules.
|
||||
10. ignored-value diagnostics for expression statements, including:
|
||||
11. ignored-value diagnostics for expression statements, including:
|
||||
- a stable warning when a materialized value is produced and then ignored,
|
||||
- and no warning for unit-like expression statements.
|
||||
|
||||
|
||||
@@ -86,10 +86,12 @@ For each admitted PBS source unit and callable in the current lowering slice, PB
|
||||
4. source attribution anchor (`file + span`) for diagnostics and traceability,
|
||||
5. source-observable parse intent for statement/expression structure (including precedence/associativity outcome already fixed by AST shape).
|
||||
6. deterministic `requiredCapabilities` derived from admitted host-binding metadata for packer/runtime-manifest assistance.
|
||||
7. compiler-selected published-wrapper entrypoint identity for backend handoff,
|
||||
8. explicit global and synthetic lifecycle structure required by executable lowering.
|
||||
7. a typed `IRLifecycleDeclaration` for executable programs, with file-init fragment, optional project-init, and required frame-root references,
|
||||
8. explicit user globals and frontend-lowered file-init fragments required by later common lifecycle assembly,
|
||||
9. backend-owned symbolic identities that must survive to later executable lowering, including symbolic asset references when admitted by the source slice.
|
||||
|
||||
PBS lowering MUST NOT emit module init, project-init wrapper, published frame wrapper, physical entrypoint, or boot guard. Those artifacts are produced exclusively by common lifecycle assembly.
|
||||
|
||||
Lowering must not collapse source categories in a way that erases required declaration/callable identity needed by downstream diagnostics or conformance assertions.
|
||||
|
||||
The normative contract is obligation-based, not tied to one mandatory in-memory class graph.
|
||||
@@ -221,20 +223,18 @@ It does not replace:
|
||||
2. `docs/specs/compiler/21. IRVM Optimization Pipeline Specification.md`,
|
||||
3. or `docs/specs/compiler/15. Bytecode and PBX Mapping Specification.md`.
|
||||
|
||||
### 12.7 Executable Lifecycle and Published Wrapper Obligation
|
||||
### 12.7 Executable Lifecycle Declaration Obligation
|
||||
|
||||
For executable PBS frontends, PBS lowering must preserve the compiler-selected published wrapper rather than a frontend-declared nominal entrypoint.
|
||||
For executable PBS frontends, PBS lowering MUST emit a typed `IRLifecycleDeclaration` rather than assembling the published lifecycle.
|
||||
|
||||
At `IRBackend` emission time:
|
||||
At frontend `IRBackend` emission time:
|
||||
|
||||
1. the lowered graph must contain explicit lifecycle structure for:
|
||||
- user-authored globals,
|
||||
- file init fragments,
|
||||
- module init,
|
||||
- project init when present,
|
||||
- and the published frame wrapper,
|
||||
2. the published frame wrapper must be the effective entrypoint identity handed to common backend stages,
|
||||
3. the userland callable marked with `[Frame]` must remain distinguishable as the logical frame root,
|
||||
4. the wrapper must own final `FRAME_RET`,
|
||||
5. common backend stages must not reintroduce manifest-owned or `FrontendSpec`-owned nominal entrypoint authority,
|
||||
6. and hidden compiler-owned lifecycle state such as the boot guard must remain structurally distinguishable from user globals.
|
||||
1. PBS MUST retain marker admission for `[Init]`, `[Frame]`, and `InitAllowed`,
|
||||
2. PBS MUST emit typed references for:
|
||||
- file-init fragments that include global materialization and non-project `[Init]`,
|
||||
- the optional project-init callable, which is the `[Init]` colocated with `[Frame]`,
|
||||
- and the required frame-root callable marked with `[Frame]`,
|
||||
3. the colocated project init MUST be excluded from file-init fragments,
|
||||
4. module order in the declaration MUST propagate the explicit dependency order already derived from resolved project/module data, without sorting by `FileId`, textual module name, or synthetic callable name,
|
||||
5. PBS MUST NOT emit module init, project-init wrapper, published frame wrapper, physical entrypoint, or boot guard,
|
||||
6. and common lifecycle assembly remains the owner of derived artifacts, including the published wrapper that becomes the physical entrypoint and owns the final frame return.
|
||||
|
||||
@@ -250,6 +250,8 @@ Rules:
|
||||
- A file may declare at most one `[Init]`.
|
||||
- The `[Init]` colocated with `[Frame]` is the project init.
|
||||
- Project init must be colocated with `[Frame]`.
|
||||
- PBS static semantics and lowering admit those markers and translate them into a typed `IRLifecycleDeclaration`.
|
||||
- PBS MUST NOT materialize module init, project-init wrapper, published frame wrapper, physical entrypoint, or boot guard; those artifacts belong to common lifecycle assembly.
|
||||
- `InitAllowed` is valid only on SDK host methods and is invalid on userland `fn`, `global`, `service`, `const`, `struct`, `contract`, and callback surfaces.
|
||||
- A host method signature in a reserved stdlib/interface module MUST carry exactly one `Host` attribute.
|
||||
- A host method signature in a reserved stdlib/interface module MUST carry exactly one `Capability` attribute.
|
||||
|
||||
+17
-6
@@ -15,6 +15,10 @@ This document defines the current contract between:
|
||||
Its purpose is to let compiler and runtime work in parallel without diverging on the most critical boundary:
|
||||
how host-backed SDK calls become load-time-resolved numeric syscalls.
|
||||
|
||||
PBS `declare host` / `[Host]` shells are compile-time delivery. The
|
||||
loader-facing catalog is runtime-owned. This document MUST NOT publish syscall
|
||||
IDs or `SyscallMeta`.
|
||||
|
||||
This document is intentionally narrower than a full PBX or VM specification.
|
||||
It focuses on loader behavior and the minimum artifact contract the loader must consume.
|
||||
|
||||
@@ -44,16 +48,20 @@ This document does not define:
|
||||
|
||||
This document follows two prior decisions:
|
||||
|
||||
1. Canonical host identity is defined by the hardware ABI as `(module, name, version)`.
|
||||
1. Canonical host identity is defined by the runtime host registry as `(module, name, version)`.
|
||||
2. User code does not declare host bindings directly; SDK/toolchain-controlled modules expose reserved `declare host` surfaces and the compiler lowers those usages into PBX host-binding metadata.
|
||||
|
||||
PBS shells MUST repeat identities already published by the runtime registry
|
||||
(`../runtime/docs/specs/runtime/16-host-abi-and-syscalls.md` and `SyscallMeta`).
|
||||
They MUST NOT invent `(module, name, version)`.
|
||||
|
||||
This document therefore treats:
|
||||
|
||||
- `declare host Gfx { fn draw_pixel(...); }`
|
||||
- `declare host LowGfx { [Host(module = "gfx2d", name = "clear", version = 1)] fn clear(...); }`
|
||||
|
||||
as compile-time surface only, and treats:
|
||||
|
||||
- `("gfx", "draw_pixel", 1)`
|
||||
- `("gfx2d", "clear", 1)`
|
||||
|
||||
as the normative runtime-facing identity.
|
||||
|
||||
@@ -63,7 +71,7 @@ The host-binding pipeline is:
|
||||
|
||||
1. User code imports SDK surfaces such as `Gfx` from `@sdk:gfx` and `Composer` from `@sdk:composer`.
|
||||
2. The compiler resolves those surfaces against the selected stdlib line.
|
||||
3. The compiler maps each host-backed SDK member to a canonical identity `(module, name, version)`.
|
||||
3. The compiler maps each host-backed SDK member to a canonical identity `(module, name, version)` that already exists in the runtime host registry.
|
||||
4. The compiler emits those required canonical identities into the PBX `SYSC` table.
|
||||
5. The compiler emits pre-load host call sites as `HOSTCALL <sysc_index>`.
|
||||
6. At cartridge load time, the loader resolves `SYSC` entries against the host syscall registry.
|
||||
@@ -84,7 +92,7 @@ Every host binding is identified by the triple:
|
||||
|
||||
Rules:
|
||||
|
||||
- `module` is the canonical host subsystem namespace, such as `gfx` or `audio`.
|
||||
- `module` is the canonical host subsystem namespace, such as `gfx2d` or `asset`.
|
||||
- `name` is the canonical host operation name within that module.
|
||||
- `version` is the canonical ABI version of that host operation.
|
||||
- This identity is stable across source languages and SDK naming styles.
|
||||
@@ -310,7 +318,10 @@ Rules:
|
||||
- the loader resolves only against this canonical registry,
|
||||
- unknown identities are load errors,
|
||||
- successful resolution yields numeric syscall identifiers and associated metadata,
|
||||
- the resolved metadata is authoritative for capability gating and later runtime verification.
|
||||
- the resolved metadata is authoritative for capability gating and later runtime verification,
|
||||
- PBS `declare host` / `[Host]` shells MUST repeat identities from this registry,
|
||||
- PBS shells MUST NOT invent `(module, name, version)`,
|
||||
- this specification MUST NOT publish the syscall catalog; runtime spec 16 and `SyscallMeta` do.
|
||||
|
||||
For the current asset runtime surface, the canonical registry entries include:
|
||||
|
||||
|
||||
+49
-30
@@ -16,7 +16,11 @@ Its purpose is to make the stdlib:
|
||||
|
||||
This document complements the normative language-level model in:
|
||||
|
||||
- [5. Manifest, Stdlib, and SDK Resolution Specification.md](/Users/niltonconstantino/personal/workspace.personal/intrepid/prometeu/studio/docs/specs/pbs/5.%20Manifest,%20Stdlib,%20and%20SDK%20Resolution%20Specification.md)
|
||||
- [5. Manifest, Stdlib, and SDK Resolution Specification.md](5.%20Manifest%2C%20Stdlib%2C%20and%20SDK%20Resolution%20Specification.md)
|
||||
|
||||
This document is PBS packaging. It MUST NOT define console ABI. Intrinsic
|
||||
`final_id` values and host `SyscallMeta` remain runtime-owned. Physical stdlib
|
||||
path MUST NOT imply VM-owned versus host-backed ownership.
|
||||
|
||||
## 2. Scope
|
||||
|
||||
@@ -53,52 +57,66 @@ The recommended Studio layout is:
|
||||
```text
|
||||
prometeu-compiler/frontends/prometeu-frontend-pbs/
|
||||
src/main/resources/
|
||||
stdlib/
|
||||
1/
|
||||
sdk/
|
||||
composer/
|
||||
main.pbs
|
||||
mod.barrel
|
||||
gfx/
|
||||
main.pbs
|
||||
mod.barrel
|
||||
asset/
|
||||
main.pbs
|
||||
mod.barrel
|
||||
audio/
|
||||
main.pbs
|
||||
mod.barrel
|
||||
core/
|
||||
math/
|
||||
main.pbs
|
||||
mod.barrel
|
||||
<target>/
|
||||
stdlib/
|
||||
1/
|
||||
core/
|
||||
color/
|
||||
main.pbs
|
||||
mod.barrel
|
||||
sdk/
|
||||
asset/
|
||||
main.pbs
|
||||
mod.barrel
|
||||
composer/
|
||||
main.pbs
|
||||
mod.barrel
|
||||
gfx/
|
||||
main.pbs
|
||||
mod.barrel
|
||||
input/
|
||||
main.pbs
|
||||
mod.barrel
|
||||
log/
|
||||
main.pbs
|
||||
mod.barrel
|
||||
```
|
||||
|
||||
Interpretation:
|
||||
|
||||
- `stdlib/1` selects stdlib major line `1`,
|
||||
- `<target>` is the `AppMode` export name (`game` for the current line-1 environment),
|
||||
- `game/stdlib/1` selects stdlib major line `1` for that target,
|
||||
- `sdk` and `core` are reserved project spaces,
|
||||
- `composer`, `gfx`, `audio`, `math` are module paths within those reserved spaces,
|
||||
- current line `1` modules are `color`, `asset`, `composer`, `gfx`, `input`, and `log`,
|
||||
- `main.pbs` and `mod.barrel` form the interface module contents.
|
||||
|
||||
Current line `1` MUST NOT be documented as shipping `audio` or `@core:math`.
|
||||
Those names are not packaged in the current environment. `@sdk:input` is a
|
||||
VM-owned builtin shell; its path does not make it host-backed.
|
||||
|
||||
## 5. Logical Mapping
|
||||
|
||||
The compiler must treat the physical layout as a logical stdlib environment.
|
||||
|
||||
Required mapping:
|
||||
|
||||
- `stdlib/<N>/sdk/gfx` -> `@sdk:gfx`
|
||||
- `stdlib/<N>/sdk/composer` -> `@sdk:composer`
|
||||
- `stdlib/<N>/sdk/asset` -> `@sdk:asset`
|
||||
- `stdlib/<N>/sdk/audio` -> `@sdk:audio`
|
||||
- `stdlib/<N>/core/math` -> `@core:math`
|
||||
- `stdlib/<N>/core/math/vector` -> `@core:math/vector`
|
||||
- `<target>/stdlib/<N>/<space>/<module>` -> `@<space>:<module>`
|
||||
|
||||
Current line `1` (`game`) mapping:
|
||||
|
||||
- `game/stdlib/1/core/color` -> `@core:color`
|
||||
- `game/stdlib/1/sdk/asset` -> `@sdk:asset`
|
||||
- `game/stdlib/1/sdk/composer` -> `@sdk:composer`
|
||||
- `game/stdlib/1/sdk/gfx` -> `@sdk:gfx`
|
||||
- `game/stdlib/1/sdk/input` -> `@sdk:input`
|
||||
- `game/stdlib/1/sdk/log` -> `@sdk:log`
|
||||
|
||||
Rules:
|
||||
|
||||
- physical storage is an implementation detail,
|
||||
- logical module identity is authoritative,
|
||||
- callers of the resolver should work with logical addresses such as `@sdk:gfx` and `@sdk:composer`, not resource paths.
|
||||
- callers of the resolver should work with logical addresses such as `@sdk:gfx` and `@core:color`, not resource paths,
|
||||
- physical path MUST NOT imply VM-owned versus host-backed ownership.
|
||||
|
||||
## 6. Module File Convention
|
||||
|
||||
@@ -150,7 +168,8 @@ Minimum operations:
|
||||
|
||||
- `resolve(@sdk:gfx)`
|
||||
- `resolve(@sdk:composer)`
|
||||
- `resolve(@core:math/vector)`
|
||||
- `resolve(@sdk:input)`
|
||||
- `resolve(@core:color)`
|
||||
|
||||
### 7.3 `StdlibModuleSource`
|
||||
|
||||
|
||||
@@ -102,17 +102,21 @@ Executable PBS programs have a logical bootstrap sequence before ordinary frame
|
||||
Normative order:
|
||||
|
||||
1. materialize globals for each file according to dependency order,
|
||||
2. execute that file's `[Init]`, if present,
|
||||
2. execute that file's non-project `[Init]`, if present,
|
||||
3. compose those steps into one synthetic module init per module,
|
||||
4. execute project init, if present,
|
||||
4. execute project init exactly once, if present, after all module initializers,
|
||||
5. then invoke the userland callable marked with `[Frame]`.
|
||||
|
||||
The `[Init]` colocated with `[Frame]` is project init. It MUST NOT also run as a file-init fragment.
|
||||
|
||||
Lifecycle bootstrap is one-shot:
|
||||
|
||||
- no automatic retry occurs after boot failure,
|
||||
- failure during module init aborts boot,
|
||||
- failure during project init aborts boot.
|
||||
|
||||
Common lifecycle assembly materializes this order from the typed declaration. PBS remains the language source of marker meaning; it is not the owner of the published wrapper.
|
||||
|
||||
## 6.2 Logical frame root and physical wrapper
|
||||
|
||||
PBS distinguishes the logical frame root from the physical published entrypoint:
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# PBS Bytecode and PBX Mapping Specification
|
||||
# Bytecode and PBX Mapping Specification
|
||||
|
||||
Status: Draft v1 (Backend Baseline)
|
||||
Applies to: mapping from lowered/optimized backend programs into PBX sections, bytecode-facing artifacts, and source-to-artifact invariants required by loader/verifier/runtime
|
||||
@@ -9,6 +9,10 @@ This document defines the normative mapping between backend-lowered semantics an
|
||||
|
||||
Its purpose is to keep artifact emission deterministic and compatible with runtime loader/verifier contracts.
|
||||
|
||||
PBX is the only executable boundary between the compiler and runtime. `IRVM`
|
||||
is a compiler-internal representation consumed by bytecode emission; it MUST
|
||||
NOT be exposed to or consumed by the runtime loader, verifier, or PVM.
|
||||
|
||||
## 2. Scope
|
||||
|
||||
This document defines:
|
||||
|
||||
@@ -7,6 +7,9 @@ Applies to: normative stdlib-facing API surface, reserved stdlib project spaces,
|
||||
|
||||
This document will define the normative user-facing standard-library surface for PBS.
|
||||
|
||||
This document is PBS delivery. It does not own console ABI. Intrinsic
|
||||
`final_id` values and host syscall metadata are runtime-owned.
|
||||
|
||||
## 2. Scope
|
||||
|
||||
This document is intended to define:
|
||||
@@ -28,15 +31,22 @@ This document does not define:
|
||||
|
||||
Normative precedence:
|
||||
|
||||
1. `5. Manifest, Stdlib, and SDK Resolution Specification.md`
|
||||
2. `8. Stdlib Environment Packaging and Loading Specification.md`
|
||||
3. `6. VM-owned vs Host-backed.md`
|
||||
4. `6.1. Intrinsics and Builtin Types Specification.md`
|
||||
5. `6.2. Host ABI Binding and Loader Resolution Specification.md`
|
||||
6. This document
|
||||
1. Runtime intrinsic catalog (`../runtime/docs/vm-arch/INTRINSICS.csv`; Studio mirror `docs/vm-arch/INTRINSICS.csv`)
|
||||
2. Runtime host ABI (`../runtime/docs/specs/runtime/16-host-abi-and-syscalls.md` and `SyscallMeta`)
|
||||
3. `5. Manifest, Stdlib, and SDK Resolution Specification.md`
|
||||
4. `8. Stdlib Environment Packaging and Loading Specification.md`
|
||||
5. `6. VM-owned vs Host-backed.md`
|
||||
6. `6.1. Intrinsics and Builtin Types Specification.md`
|
||||
7. `6.2. Host ABI Binding and Loader Resolution Specification.md`
|
||||
8. This document
|
||||
|
||||
If a rule here conflicts with higher-precedence specs, it is invalid.
|
||||
|
||||
This document MUST NOT define numeric syscall identifiers, intrinsic `final_id`
|
||||
values, or `SyscallMeta`. PBS `[Host]` and `[IntrinsicCall]` attributes MUST
|
||||
repeat identities already published by those runtime catalogs. They MUST NOT
|
||||
invent console ABI.
|
||||
|
||||
## 4. Normative Inputs
|
||||
|
||||
This document depends on, at minimum:
|
||||
@@ -57,6 +67,9 @@ The following inputs are already fixed elsewhere and must not be contradicted he
|
||||
- User code must import stdlib modules explicitly.
|
||||
- Canonical host identity comes from reserved host-binding metadata, not from source owner spelling.
|
||||
- VM-owned builtin type, builtin constant, and intrinsic surfaces may be exposed through reserved stdlib shells without transferring semantic ownership away from the VM.
|
||||
- Console ABI authority is runtime-owned. PBS stdlib is delivery.
|
||||
- Reserved project-space path (`@sdk:*` / `@core:*`) MUST NOT imply VM-owned versus host-backed ownership.
|
||||
- Current stdlib line `1` ships a VM-owned builtin input shell at `@sdk:input`. That exception does not make `@sdk:*` the VM-owned space.
|
||||
|
||||
## 6. Initial Section Targets
|
||||
|
||||
@@ -78,7 +91,10 @@ The following items remain to be closed in future agenda discussion.
|
||||
- Whether `@core:*` is specified as language-adjacent utility surface or as ordinary stdlib contract.
|
||||
- How stdlib API evolution is documented and conformance-tested.
|
||||
- Whether some interface modules remain toolchain-private and outside user-facing stdlib surface.
|
||||
- Whether builtin shells may appear in `@sdk:*` as well as `@core:*`, or whether `@sdk:*` should remain host-facing only by policy.
|
||||
|
||||
Settled by DEC-0048 and not reopened here:
|
||||
|
||||
- Builtin shells MAY appear in `@sdk:*` as well as `@core:*`. Path MUST NOT imply ownership. Current line `1` exception: `@sdk:input`.
|
||||
|
||||
## 8. Non-Goals
|
||||
|
||||
@@ -127,6 +143,12 @@ Rules:
|
||||
- but ownership remains governed by the VM-owned vs host-backed classification,
|
||||
- and placing a builtin shell in stdlib does not make it host-backed.
|
||||
|
||||
Current line `1` exception:
|
||||
|
||||
- `@sdk:input` exposes VM-owned builtin input types through `[BuiltinType]` and `[IntrinsicCall]`.
|
||||
- that module is not host-backed.
|
||||
- the `@sdk:*` preference for host-backed APIs still holds for new host modules.
|
||||
|
||||
## 11. Builtin Shell Surfaces
|
||||
|
||||
Reserved stdlib modules may expose builtin declarations as compile-time-only
|
||||
@@ -205,6 +227,10 @@ Their canonical runtime-facing identities still come from builtin metadata such
|
||||
as `BuiltinType(name="vec2", version=1)` and
|
||||
`BuiltinConst(target="vec2", name="zero", version=1)`.
|
||||
|
||||
Current stdlib line `1` ships `Color` at `@core:color`. The `@core:math` import
|
||||
above is an identity illustration, not a claim that `@core:math` is packaged in
|
||||
line `1`.
|
||||
|
||||
## 14. Deterministic Stdlib Surface Failures
|
||||
|
||||
At minimum, a conforming implementation must reject:
|
||||
@@ -214,3 +240,15 @@ At minimum, a conforming implementation must reject:
|
||||
3. a user-facing stdlib module that exports executable PBS bodies for builtin semantics,
|
||||
4. a stdlib line that exposes conflicting canonical builtin identities through the same resolved environment,
|
||||
5. a stdlib line that exposes conflicting canonical host identities through the same resolved environment.
|
||||
|
||||
## 15. Console ABI Non-Ownership
|
||||
|
||||
This specification MUST NOT:
|
||||
|
||||
1. define numeric syscall identifiers,
|
||||
2. define intrinsic `final_id` values,
|
||||
3. publish `SyscallMeta`,
|
||||
4. or treat PBS `[Host]` / `[IntrinsicCall]` attributes as the ABI catalog.
|
||||
|
||||
PBS shells MUST repeat identities already published by the runtime catalogs
|
||||
named in section 3.
|
||||
|
||||
@@ -1,18 +1,21 @@
|
||||
# PBS Verification and Safety Checks Specification
|
||||
# Compiler Verification and Safety Checks Specification
|
||||
|
||||
Status: Draft v1 (Quality-Gate Baseline)
|
||||
Applies to: test-backed safety gates for backend compiler stages and integration regression safety checks against runtime
|
||||
Applies to: test-backed safety gates for common compiler stages, validation ownership across executable frontends, and integration regression safety checks against runtime
|
||||
|
||||
## 1. Purpose
|
||||
|
||||
This document defines the minimum safety/verification quality gates that must be enforced for executable backend pipelines.
|
||||
This document defines the minimum safety/verification quality gates that must be enforced for executable compiler pipelines, and the ownership rule that separates language validation from platform validation.
|
||||
|
||||
Its purpose is to keep safety measurable and deterministic across:
|
||||
|
||||
- lowering,
|
||||
- optimization,
|
||||
- emission,
|
||||
- and runtime integration boundaries.
|
||||
- runtime integration boundaries,
|
||||
- and the classification of diagnostics that every executable frontend must obey.
|
||||
|
||||
PBS is the current executable frontend. It is an example, not the owner of this specification.
|
||||
|
||||
## 2. Scope
|
||||
|
||||
@@ -20,37 +23,41 @@ This document defines:
|
||||
|
||||
- mandatory compiler-stage safety checks for executable pipeline stages,
|
||||
- conditional integration safety regression checks against runtime line,
|
||||
- and evidence requirements for safety-related support claims.
|
||||
- evidence requirements for safety-related support claims,
|
||||
- and validation-ownership rules that apply to all executable frontends.
|
||||
|
||||
This document does not define:
|
||||
|
||||
- full runtime verifier algorithm internals,
|
||||
- formal proof of all runtime safety properties,
|
||||
- or one mandatory verifier/optimizer architecture.
|
||||
- one mandatory verifier/optimizer architecture,
|
||||
- PBS syntax or static-semantics catalogs,
|
||||
- or a generic validator-core package.
|
||||
|
||||
## 3. Authority and Precedence
|
||||
|
||||
Normative precedence:
|
||||
|
||||
1. `docs/pbs/specs/2. Governance and Versioning.md`
|
||||
2. `docs/pbs/specs/12. Diagnostics Specification.md`
|
||||
1. Runtime authority (`docs/specs/hardware/topics/chapter-2.md`, `chapter-3.md`, `chapter-9.md`, `chapter-12.md`, `chapter-16.md`)
|
||||
2. Bytecode authority (`docs/specs/bytecode/ISA_CORE.md`)
|
||||
3. `20. IRBackend to IRVM Lowering Specification.md`
|
||||
4. `21. IRVM Optimization Pipeline Specification.md`
|
||||
5. `15. Bytecode and PBX Mapping Specification.md`
|
||||
6. `13. Conformance Test Specification.md`
|
||||
7. This document
|
||||
8. Frontend diagnostics specifications, including `docs/specs/compiler-languages/pbs/12. Diagnostics Specification.md`, for language-owned coverage only
|
||||
|
||||
If a rule here conflicts with higher-precedence authorities, it is invalid.
|
||||
If a rule here conflicts with a higher-precedence authority, it is invalid. Frontend diagnostics documents MUST NOT redefine compiler-general safety gates or platform validation ownership.
|
||||
|
||||
## 4. Normative Inputs
|
||||
|
||||
This document depends on:
|
||||
|
||||
- `docs/pbs/specs/12. Diagnostics Specification.md`
|
||||
- `13. Conformance Test Specification.md`
|
||||
- `15. Bytecode and PBX Mapping Specification.md`
|
||||
- `20. IRBackend to IRVM Lowering Specification.md`
|
||||
- `21. IRVM Optimization Pipeline Specification.md`
|
||||
- `docs/specs/compiler-languages/pbs/12. Diagnostics Specification.md` as the current frontend diagnostics catalog, not as the owner of this specification
|
||||
|
||||
## 5. Safety Gate Model
|
||||
|
||||
@@ -133,3 +140,74 @@ This document is healthy when:
|
||||
2. executable backends have explicit S-I status (`pass`/`fail`/`deferred`),
|
||||
3. integration safety regressions are preserved in tests,
|
||||
4. and safety-related support claims remain evidence-backed.
|
||||
|
||||
## 11. Validation Ownership
|
||||
|
||||
A validation MUST live at the lowest layer that understands the failure without knowing the source language.
|
||||
|
||||
- A check is language-owned if it needs AST, tokens, a language marker, a barrel, or another source-language rule.
|
||||
- A check is platform-owned if it can be performed on `IRBackend`, `IRLifecycleDeclaration`, IRVM, PBX, host/capability tables, or ids.
|
||||
|
||||
Adding a validation MUST record:
|
||||
|
||||
1. the input artifact the check reads;
|
||||
2. whether that artifact is language source/AST/marker or a common contract;
|
||||
3. the matrix owner;
|
||||
4. the code family (`E_PARSE_*` / `E_SEM_*` / `E_LINK_*` / `E_HOST_*` versus `COMMON_*` / `LOWER_IRVM_*` / `MARSHAL_*`);
|
||||
5. whether the span comes from a common-contract origin or from language tokens/AST.
|
||||
|
||||
If item 2 is both, the implementation MUST emit two diagnostics with distinct identities, not one hybrid.
|
||||
|
||||
### 11.1 Diagnostic identity and span
|
||||
|
||||
Platform diagnostics MUST use `COMMON_*`, `LOWER_IRVM_*`, or `MARSHAL_*` codes and the phase of the pipeline stage that reports them.
|
||||
|
||||
PBS MUST keep its current `E_PARSE_*`, `E_SEM_*`, `E_LINK_*`, and `E_HOST_*` codes.
|
||||
|
||||
This specification MUST NOT rewrite diagnostic messages or renumber existing codes.
|
||||
|
||||
Common code MUST copy origin/span when the declaration, instruction, or metadata carries one. A missing origin MUST be a structural error. Implementations MUST NOT invent a span.
|
||||
|
||||
The same fact MAY exist on both sides. PBS explains the language rule; the common layer rejects an invalid handoff even when the frontend has no PBS markers. The two errors MUST keep distinct identities. Example: `E_SEM_MISSING_PROJECT_FRAME` and a missing frame root on an executable `IRLifecycleDeclaration`.
|
||||
|
||||
### 11.2 Initial ownership matrix
|
||||
|
||||
| Family | Owner | Status | Notes |
|
||||
| --- | --- | --- | --- |
|
||||
| Parse / syntax (`ParseErrors`) | `compiler/pbs` | language | remains |
|
||||
| Type, flow, declaration, const, and source-form global semantics | `compiler/pbs` | language | remains |
|
||||
| Markers `[Init]`, `[Frame]`, `InitAllowed`, signature, colocation | `compiler/pbs` | language | already split by lifecycle assembly |
|
||||
| `host call not allowed during init` | `compiler/pbs` | language | marker/source rule |
|
||||
| PBS linking (`PbsLinkErrors`, barrel, import, visibility) | `compiler/pbs` | language | do not extract |
|
||||
| Source shape of `[Host]` / `[Capability]` | `compiler/pbs` | language | host-admission split |
|
||||
| Canonical host-binding identity and capability over `IRReservedMetadata` | `compiler/general` | platform | classified; validator remains in the PBS package until a later plan |
|
||||
| Lifecycle assembler | `compiler/general` | platform | already implemented |
|
||||
| IRVM preconditions for wrapper, boot guard, origin | `compiler/general` | platform | already implemented |
|
||||
| `IRVMValidator`, lowering, marshal/bytecode | `compiler/general` | platform | already implemented |
|
||||
| `Addressable` / asset path | `compiler/general` | platform | classified; no extra migration in this specification |
|
||||
| Gates S-U/S-I | `compiler/general` | platform | this document |
|
||||
|
||||
### 11.3 Host admission, assets, and linking
|
||||
|
||||
Host admission is split:
|
||||
|
||||
- language owns the source shape of `[Host]` and `[Capability]`;
|
||||
- platform owns canonical binding identity `(module, name, version)`, unknown capability, undeclared capability, and inconsistent binding once those facts exist on `IRReservedMetadata`.
|
||||
|
||||
`PbsHostAdmissionValidator` MAY remain in the PBS package until a later plan. `E_HOST_*` MUST NOT be treated as eternal PBS semantics.
|
||||
|
||||
`Addressable` / asset-path resolution is platform-owned. This specification classifies it and MUST NOT move additional asset code.
|
||||
|
||||
PBS linking, barrel files, and `PbsLinkErrors` remain language-owned. `ResolveDeps` does not authorize extracting them.
|
||||
|
||||
### 11.4 What this section does not authorize
|
||||
|
||||
This specification MUST NOT be read as authorizing:
|
||||
|
||||
- a generic validator-core package;
|
||||
- moving `PbsHostAdmissionValidator` into a common package;
|
||||
- moving asset-resolution production code;
|
||||
- extracting PBS linking;
|
||||
- or reopening lifecycle-assembly ownership.
|
||||
|
||||
Platform validators MUST NOT depend on types from the PBS frontend module (`prometeu-frontend-pbs`). The package `p.studio.compiler.pbs` is not the complete boundary; facades shipped by that module remain PBS-owned. Platform validators MUST NOT discover roles from `__pbs.` prefixes.
|
||||
|
||||
@@ -11,6 +11,12 @@ Its purpose is to make backend lowering deterministic, reviewable, and compatibl
|
||||
|
||||
`IRBackend` is the common frontend-to-backend executable handoff. It is emitted by frontends and consumed by common backend stages. Backend lowering MUST NOT require PBS AST nodes, PBS tokens, PBS parser structures, PBS semantic objects, PBS editorial objects, or equivalent language-owned objects from future frontends.
|
||||
|
||||
`IRVM` is an internal compiler representation. It MUST be consumed by common
|
||||
compiler optimization and PBX emission stages, and it MUST NOT cross the
|
||||
compiler/runtime boundary or become an input, dependency, public type, or
|
||||
operational concept of the runtime loader, verifier, or PVM. PBX is the only
|
||||
executable artifact boundary between compiler and runtime.
|
||||
|
||||
## 2. Scope
|
||||
|
||||
This document defines:
|
||||
@@ -66,28 +72,86 @@ At this boundary, `IRBackend` may contain only language-neutral compiler concept
|
||||
8. host-call metadata,
|
||||
9. intrinsic metadata,
|
||||
10. reserved metadata required for backend lowering,
|
||||
11. and required runtime or platform capabilities.
|
||||
11. required runtime or platform capabilities,
|
||||
12. and an optional typed `IRLifecycleDeclaration` used as lifecycle provenance after common assembly.
|
||||
|
||||
The common backend contract MUST express these concepts as backend obligations, not as PBS syntax or PBS semantic rules. When a concept currently originates from PBS, the backend contract still owns only the language-neutral obligation carried by `IRBackend`.
|
||||
|
||||
### 4.3 IRLifecycleDeclaration
|
||||
|
||||
`IRLifecycleDeclaration` is the typed, immutable, serializable-by-design lifecycle provenance carried by `IRBackend`.
|
||||
|
||||
An executable handoff MUST contain exactly one declaration before common assembly. A deliberately non-executable handoff MAY omit it; absence MUST NOT synthesize a default `main` or published wrapper.
|
||||
|
||||
The declaration MUST represent, using ordered collections and typed ids:
|
||||
|
||||
1. modules in explicit dependency order,
|
||||
2. each module's ordered file-init fragment references,
|
||||
3. an optional project-init callable reference,
|
||||
4. and exactly one frame-root callable reference.
|
||||
|
||||
References MUST use `ModuleId`, `FileId`, `CallableId`, a typed role, and source attribution. The public shape MUST NOT expose maps, sets, callbacks, compiler services, or frontend-owned types.
|
||||
|
||||
`AssembleLifecyclePipelineStage` MUST run after `FrontendPhasePipelineStage` and before `LowerToIRVMPipelineStage`. `LifecycleAssemblerService` is the only owner of derived lifecycle artifacts: module init, project-init wrapper, published frame wrapper, physical entrypoint, and hidden boot guard. Those artifacts MUST use deterministic neutral internal identities. Common code MUST NOT discover roles from `__pbs.*` prefixes or depend on types from the PBS frontend module (`prometeu-frontend-pbs`). The package `p.studio.compiler.pbs` is not the complete boundary.
|
||||
|
||||
The declaration MUST remain available on the assembled `IRBackend` as typed provenance. Downstream inspection MUST use roles, ids, and origins rather than synthetic names.
|
||||
|
||||
Project init MUST be absent from file-init fragments and MUST execute exactly once, after all module initializers and before the frame root. Bootstrap failure MUST abort without retry. The boot guard MUST prevent a second bootstrap after successful completion. The published wrapper owns the final frame return.
|
||||
|
||||
The common backend contract MUST NOT expose or require:
|
||||
|
||||
1. `PbsExpression`, `PbsStatement`, `PbsToken`, or equivalent PBS-owned syntax objects,
|
||||
2. PBS parser cursors, parse contexts, parse nodes, or token kinds,
|
||||
3. PBS semantic validator internals,
|
||||
4. PBS editorial or language-service objects,
|
||||
5. or any type under a language frontend package as part of the public backend handoff.
|
||||
5. or any type from the PBS frontend module (`prometeu-frontend-pbs`) or an equivalent language frontend module as part of the public backend handoff.
|
||||
|
||||
## 4.2 Serializable-by-Design Contract Shape
|
||||
|
||||
The public `IRBackend` handoff MUST remain serializable by design. This requirement does not select a wire format, schema language, RPC mechanism, process boundary, plugin runtime, or external frontend transport. It only constrains the public data shape so those choices remain possible later without redesigning the handoff.
|
||||
|
||||
Public `IRBackend` contract types MUST be modelable as an acyclic, deterministic data graph made of:
|
||||
|
||||
1. primitive values and strings,
|
||||
2. enums,
|
||||
3. immutable value objects,
|
||||
4. ordered lists,
|
||||
5. nullable or optional scalar fields only where absence is part of the contract,
|
||||
6. explicit identifier values for cross-references,
|
||||
7. and source attribution values such as file ids and spans.
|
||||
|
||||
The public handoff MUST NOT expose, require, or rely on:
|
||||
|
||||
1. callbacks, lambdas, service objects, registries, visitors, or live compiler services,
|
||||
2. frontend AST, parser, token, semantic, or editorial objects,
|
||||
3. mutable global state as part of interpretation,
|
||||
4. object identity equality as a semantic key,
|
||||
5. unordered collections where iteration order affects output,
|
||||
6. cyclic references between public handoff objects,
|
||||
7. lazy values whose result depends on current process state,
|
||||
8. or a selected wire format.
|
||||
|
||||
Cross-object references MUST use explicit ids or stable symbolic keys. Existing table-scoped identifiers such as `FileId`, `ModuleId`, `CallableId`, and `IntrinsicId` are valid handoff values when their table scope is explicit and deterministic. New typed ids SHOULD be introduced only when a concrete public handoff field would otherwise depend on textual identity, object identity, or a direct object reference.
|
||||
|
||||
Ordered collections MUST preserve deterministic order. Any map-like data that becomes part of the handoff MUST either be represented as an ordered list of entries or define deterministic key ordering before it reaches the public contract.
|
||||
|
||||
Initial enforcement for this contract SHOULD be audit and guardrail based: specs, reflection tests over public handoff surfaces, deterministic ordering tests, and targeted fixes for concrete leaks. A serializer or schema implementation is not required for conformance to this subsection.
|
||||
|
||||
## 5. Backend Entry Preconditions
|
||||
|
||||
Lowering from `IRBackend` to `IRVM` may start only when:
|
||||
|
||||
1. frontend admission to `IRBackend` is complete for the active slice,
|
||||
2. required callsite categories (`CALL_FUNC`/`CALL_HOST`/`CALL_INTRINSIC`) are available,
|
||||
3. required canonical host/intrinsic metadata is available for admitted callsites,
|
||||
4. dependency-scoped fail-fast exclusions have already been applied at the `IRBackend` boundary,
|
||||
5. compiler-selected published-wrapper entrypoint identity is present and unambiguous,
|
||||
6. and target `vm_profile` is selected deterministically.
|
||||
2. common lifecycle assembly has already materialized derived artifacts for an executable handoff,
|
||||
3. required callsite categories (`CALL_FUNC`/`CALL_HOST`/`CALL_INTRINSIC`) are available,
|
||||
4. required canonical host/intrinsic metadata is available for admitted callsites,
|
||||
5. dependency-scoped fail-fast exclusions have already been applied at the `IRBackend` boundary,
|
||||
6. compiler-selected published-wrapper entrypoint identity is present and unambiguous,
|
||||
7. and target `vm_profile` is selected deterministically.
|
||||
|
||||
Declaration validation, role uniqueness, explicit order, and rejection of frontend-preassembled derived artifacts belong to `LifecycleAssemblerService`. `IRBackend -> IRVM` MUST keep only backend preconditions on the assembled graph, such as published-wrapper identity, synthetic origin presence, and hidden boot-guard presence. It MUST NOT reconstruct lifecycle order from callable names.
|
||||
|
||||
Those common structural diagnostics are compiler-general. Classification, code families, and dual language/platform reporting are owned by `docs/specs/compiler/19. Verification and Safety Checks Specification.md` section 11. They MUST NOT be catalogued as PBS-facing required coverage.
|
||||
|
||||
## 6. IRVM Model Obligations
|
||||
|
||||
@@ -128,13 +192,14 @@ Function indexing must be deterministic:
|
||||
4. manifest-owned or name-only entrypoint fallback is forbidden,
|
||||
5. and identical admitted input graphs must produce identical function-id assignments.
|
||||
|
||||
For PBS executable lowering:
|
||||
For executable lowering:
|
||||
|
||||
- the userland callable marked with `[Frame]` remains the logical frame root,
|
||||
- the wrapper path must contain final `FRAME_RET`,
|
||||
- the declared frame-root callable remains the logical frame root,
|
||||
- the assembled published wrapper is the physical entrypoint,
|
||||
- the wrapper path must contain the final frame return,
|
||||
- and lowering must preserve that distinction through `IRVM`.
|
||||
|
||||
These PBS-facing names describe the current frontend source of the lifecycle structure. The backend-owned obligation is the neutral requirement that the compiler-selected published wrapper be the physical entrypoint and that lifecycle state remain explicit in `IRBackend`.
|
||||
PBS `[Init]`/`[Frame]` markers are a frontend source of the declaration. The backend-owned obligation is the neutral requirement that the compiler-selected published wrapper be the physical entrypoint and that lifecycle provenance remain explicit in `IRBackend` through typed roles and ids. Neutral synthetic names are internal and are not a public ABI.
|
||||
|
||||
## 9. Callsite Lowering Obligations
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# PBS IRVM Optimization Pipeline Specification
|
||||
# IRVM Optimization Pipeline Specification
|
||||
|
||||
Status: Draft v1 (Pipeline Baseline)
|
||||
Applies to: placement and invariants of the `OptimizeIRVM` stage between lowering and bytecode emission
|
||||
@@ -9,6 +9,10 @@ This document defines the normative placement and safety invariants of the `Opti
|
||||
|
||||
Its purpose is to allow optimization in the backend pipeline without transferring semantic optimization responsibility to runtime.
|
||||
|
||||
`IRVM` is internal to the compiler. Optimization output MUST flow to PBX
|
||||
emission and MUST NOT be exposed as a runtime input or protocol. PBX remains the
|
||||
only executable boundary consumed by the runtime loader, verifier, and PVM.
|
||||
|
||||
## 2. Scope
|
||||
|
||||
This document defines:
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
Status: Draft v1 (Traceability Baseline)
|
||||
Applies to: compiler/backend conformance traceability for canonical stage order and entrypoint-specific contracts
|
||||
|
||||
Last Updated: 2026-07-15
|
||||
Last Updated: 2026-09-19
|
||||
|
||||
## 1. Purpose
|
||||
|
||||
@@ -40,9 +40,22 @@ to concrete positive/negative test evidence and current status.
|
||||
| G19-5.2.6 | Gate S-I MUST reject missing capability at load-time. | N/A | `BackendGateIIntegrationTest#gateI_rejectMissingCapability` | pass | |
|
||||
| G19-5.2.7 | Gate S-I MUST cover valid VM-owned intrinsic path. | `BackendGateIIntegrationTest#gateI_validIntrinsicPath` | N/A | pass | |
|
||||
| G19-5.2.8 | Gate S-I MUST cover repeatability across runtime line. | `RuntimeBackedCompatibilityAdapterTest#checkMustPassInStrictModeWhenRuntimeCommandIsValid`; `RuntimeBackedCompatibilityAdapterTest#checkMustBeRepeatableAcrossDeclaredRuntimeLinesInStrictMode` | `RuntimeBackedCompatibilityAdapterTest#checkMustFailInStrictModeWhenRuntimeCommandIsUnavailable` | pass | Multi-line repeatability is asserted with strict runtime-backed checks over distinct declared runtime lines. |
|
||||
| G19-11.1 | A validation MUST live at the lowest layer that understands the failure without knowing the source language. | `ValidationOwnershipSpecTest#spec19MustBeCompilerGeneralAndPublishValidationOwnership` | N/A | pass | Spec 19 section 11 states the classification rule. |
|
||||
| G19-11.2 | Spec 19 MUST publish the validation ownership matrix. | `ValidationOwnershipSpecTest#spec19MustBeCompilerGeneralAndPublishValidationOwnership` | N/A | pass | Matrix families include parse/syntax, PBS linking, and lifecycle assembler. |
|
||||
| G19-11.3 | Platform diagnostics MUST use `COMMON_*` / `LOWER_IRVM_*` / `MARSHAL_*` and MUST copy origin/span when present. | `ValidationOwnershipSpecTest#spec19MustBeCompilerGeneralAndPublishValidationOwnership`; `LifecycleAssemblerServiceTest#assembleMustRejectMissingFrameRootWithoutRepair` | N/A | pass | Code families and span policy are normative in spec 19 section 11.1. |
|
||||
| G19-11.4 | The same fact MAY exist as a language diagnostic and a platform diagnostic with distinct identities. | `ValidationOwnershipSpecTest#spec19MustBeCompilerGeneralAndPublishValidationOwnership` | N/A | pass | Dual reporting is required when a check reads both source and common contract. |
|
||||
| G19-11.5 | Host admission MUST split source attribute shape from canonical `IRReservedMetadata` identity without moving the PBS validator in this plan. | `ValidationOwnershipSpecTest#spec19MustBeCompilerGeneralAndPublishValidationOwnership` | N/A | pass | Classified as platform; validator remains in the PBS package. |
|
||||
| G19-11.6 | Platform validators MUST NOT depend on PBS frontend module types or match `__pbs.` prefixes. | `PbsModuleBoundaryArchTest#productionOutsideAllowlistMustNotDependOnPbsModuleTypes`; `CommonBackendPbsPrefixScanTest#commonLifecycleAndBackendMustNotDiscoverRolesFromPbsNamePrefixes` | N/A | pass | ArchUnit covers PBS module origin, including facades outside `p.studio.compiler.pbs`; source scan still rejects `__pbs.` in backend, lifecycle, and common pipeline stages. |
|
||||
| PBS12-11 | PBS diagnostics MUST NOT claim common structural lifecycle/IRVM failures as PBS required coverage. | `ValidationOwnershipSpecTest#pbsDiagnosticsMustNotClaimCommonStructuralFailures` | N/A | pass | PBS spec 12 points those failures at spec 19 section 11 and spec 20. |
|
||||
| G20-4.1.1 | `IRBackend` MUST be the common frontend-to-backend executable handoff. | `LowerToIRVMServiceTest#lowerMustAcceptManuallyConstructedCommonIRBackend` | N/A | pass | Direct backend lowering from manually constructed common IRBackend proves PBS parser/frontend services are not required. |
|
||||
| G20-4.1.2 | Common backend code MUST NOT depend on `p.studio.compiler.pbs`. | `CommonBackendArchitectureTest#commonBackendMustNotImportPbsFrontendPackages` | N/A | pass | Source-level architectural guard rejects PBS frontend imports in common backend packages. |
|
||||
| G20-4.1.2 | Common backend code MUST NOT depend on types from the PBS frontend module. | `PbsModuleBoundaryArchTest#productionOutsideAllowlistMustNotDependOnPbsModuleTypes`; `PbsModuleBoundaryArchTest#irBackendModelsMustNotDependOnPbsModuleTypes` | N/A | pass | ArchUnit rejects PBS-module origin types in common production code, including facades outside `p.studio.compiler.pbs`. |
|
||||
| G20-4.1.3 | Public `IRBackend` contract MUST NOT expose PBS AST, token, parser, semantic, or editorial types. | `IRBackendExecutableContractTest#publicIRBackendContractMustNotExposePbsTypes` | N/A | pass | Reflection guard covers public contract fields, constructors, methods, and record components. |
|
||||
| G20-4.2.1 | Public `IRBackend` contract types MUST remain modelable as an acyclic, deterministic data graph. | `IRBackendExecutableContractTest#publicIRBackendContractMustExposeOnlySerializableShapes`; `IRBackendExecutableContractTest#aggregatorMustEmitDeterministicOrderedPublicContractShape` | N/A | pass | Covers public shape guardrails, generic type arguments, ordered aggregate emission, table remapping, and capability de-duplication order. |
|
||||
| G20-4.2.2 | Public `IRBackend` contract types MUST NOT expose callbacks, services, mutable/unordered collection contracts, frontend-owned objects, process-dependent lazy values, cyclic public references, or wire-format commitments. | `IRBackendExecutableContractTest#publicIRBackendContractMustExposeOnlySerializableShapes` | N/A | pass | Reflection guard covers public contract fields, constructors, methods, record components, and generic type arguments. |
|
||||
| G20-4.2.3 | Public `IRBackend` cross-object references MUST use explicit ids or stable symbolic keys. | `IRBackendExecutableContractTest#publicIRBackendContractAuditMustClassifyAllowedSupportTypes`; `IRBackendExecutableContractTest#publicIRBackendContractMustUseExplicitIdsOrStableKeysForKnownReferences` | N/A | pass | Current audit found no concrete public serialization leak requiring model correction. Existing `FileId`, `ModuleId`, `CallableId`, and `IntrinsicId` remain explicit table-scoped identifiers. |
|
||||
| G20-4.3.1 | Executable `IRBackend` MUST carry a typed, ordered, id-based `IRLifecycleDeclaration` as provenance. | `IRBackendExecutableContractTest#aggregatorMustRemapTypedLifecycleReferencesAndPreserveDeclaredModuleOrder`; `LifecycleAssemblerServiceTest#assembleMustMaterializeNeutralLifecycleArtifactsInDeclaredOrder` | `IRBackendExecutableContractTest#aggregatorMustOmitLifecycleDeclarationWhenNoFileContributesOne` | pass | Declaration uses `ReadOnlyList`, typed ids, roles, and source attribution; aggregator remaps ids with explicit module order. |
|
||||
| G20-4.3.2 | Missing lifecycle declaration MUST mean a deliberately non-executable handoff and MUST NOT synthesize entrypoints. | `LifecycleAssemblerServiceTest#assembleMustNoOpWhenLifecycleDeclarationIsAbsent`; `AssembleLifecyclePipelineStageTest#runMustNoOpForDeliberatelyNonExecutableHandoff` | N/A | pass | Assembler and stage leave the backend unchanged when the declaration is absent. |
|
||||
| G20-4.3.3 | Common lifecycle assembly MUST be the exclusive owner of derived artifacts and MUST use neutral identities. | `LifecycleAssemblerServiceTest#assembleMustMaterializeNeutralLifecycleArtifactsInDeclaredOrder`; `CommonBackendPbsPrefixScanTest#commonLifecycleAndBackendMustNotDiscoverRolesFromPbsNamePrefixes`; `PbsModuleBoundaryArchTest#productionOutsideAllowlistMustNotDependOnPbsModuleTypes` | `LifecycleAssemblerServiceTest#assembleMustRejectPreMaterializedDerivedArtifacts` | pass | Derived wrappers and boot guard are common-owned; ArchUnit rejects PBS-module types and the source scan rejects `__pbs.` prefix matching. |
|
||||
| G20-6.2 | `IRVM_EXT` MUST declare structural metadata (`pops/pushes/is_branch/is_terminator`). | `IRVMValidatorTest#validateMustApplyStructuralMetadataForCustomInternalExtension`; `IRVMValidatorTest#validateMustRejectCustomInternalExtensionWhenStructuralMetadataUnderflowsStack`; `IRVMOp` record contract (`pops/pushes/branch/terminator/internal`) | N/A | pass | Dedicated extension fixtures now assert structural metadata is consumed by validation behavior. |
|
||||
| G20-6.3 | `IRVM_EXT` MUST be eliminable before bytecode emission. | `OptimizeIRVMServiceTest#optimizeDefaultPassesMustEliminateUnreachableInternalExtensionBeforeEmission` | `EmitBytecodePipelineStageTest#runMustFailWhenInternalOpcodesRemain`; `EmitBytecodePipelineStageTest#runMustFailWhenInternalOpcodesRemainEvenWithNonEmptyEmissionPlan`; `IRVMValidatorTest#validateMustRejectInternalOpcodeWhenConfigured` | pass | Optimizer elimination path and emit-stage hard rejection path are both covered. |
|
||||
| G20-6.4 | IRVM MUST preserve per-function slot and identity headers. | `IRVMProgramTest#constructorMustRejectModuleAndEmissionPlanMismatch` | `IRVMProgramTest#constructorMustRejectModuleAndEmissionPlanMismatch` | pass | Header mismatch is rejected deterministically. |
|
||||
@@ -70,14 +83,19 @@ to concrete positive/negative test evidence and current status.
|
||||
| G21-9.1 | Validation MUST include optimized-vs-non-optimized equivalence fixtures. | `OptimizeIRVMEquivalenceHarnessTest#optimizeOnOffMustPreserveObservableTraceForLoweredHostIntrinsicFixture`; `OptimizeIRVMEquivalenceHarnessTest#optimizeOnOffMustPreserveObservableTraceForConditionalJoinFixture`; `OptimizeIRVMEquivalenceHarnessTest#optimizeOnOffMustPreserveObservableTraceForSimpleLoopFixture`; `OptimizeIRVMEquivalenceHarnessTest#optimizeOnOffMustPreserveObservableTraceForLinearCallFixture` | N/A | pass | Dedicated opt on/off harness with reusable interpreter and deterministic trace assertions is in place. |
|
||||
| G21-9.2 | Validation MUST preserve known negative loader/verifier behavior. | `BackendSafetyGateSUTest#emitStageMustExposeMarshalingLinkageFailureDeterministically`; `BackendGateIIntegrationTest` rejection suite | N/A | pass | |
|
||||
| G21-9.3 | Validation MUST preserve deterministic artifact-level invariants. | `BackendSafetyGateSUTest#fullPipelineMustProduceDeterministicBytecodeForSameInput`; `BytecodeEmitterTest#emitMustRemainDeterministicAfterInterning` | N/A | pass | |
|
||||
| G23-5.1 | Canonical compiler pipeline MUST preserve the shared stage order through `WriteBytecodeArtifact`. | `MainProjectPipelineIntegrationTest#analyzeShouldNotWriteProgramBytecode`; `MainProjectPipelineIntegrationTest#compileShouldProduceInMemoryBytecodeWithoutWritingProgramBytecode`; `MainProjectPipelineIntegrationTest#buildShouldWriteProgramBytecode` | N/A | partial | Entrypoint execution now covers the full analyze -> compile -> build path, but a dedicated order-only assertion for every terminal boundary is still missing. |
|
||||
| G23-6.1 | `analyze` MUST terminate after `FrontendPhase` and MUST NOT execute backend artifact stages. | `MainProjectPipelineIntegrationTest#analyzeShouldNotWriteProgramBytecode` | N/A | pass | The integration fixture asserts the analysis snapshot contract and proves `program.pbx` is not written on the analysis path. |
|
||||
| G23-5.1 | Canonical compiler pipeline MUST preserve the shared stage order through `WriteBytecodeArtifact`. | `BuilderPipelineServiceOrderTest#canonicalOrderMustContainOptimizeBetweenLowerAndEmit`; `MainProjectPipelineIntegrationTest#analyzeShouldNotWriteProgramBytecode`; `MainProjectPipelineIntegrationTest#compileShouldProduceInMemoryBytecodeWithoutWritingProgramBytecode`; `MainProjectPipelineIntegrationTest#buildShouldWriteProgramBytecode` | N/A | pass | Dedicated order assertion now covers analyses, compile, and build stage lists, including `AssembleLifecyclePipelineStage`. |
|
||||
| G23-5.2 | `AssembleLifecyclePipelineStage` MUST run immediately after `FrontendPhasePipelineStage` and before IRVM lowering. | `BuilderPipelineServiceOrderTest#canonicalOrderMustContainOptimizeBetweenLowerAndEmit`; `BuilderPipelineServiceOrderTest#analyzeMustTerminateAfterLifecycleAssemblyWithoutBackendArtifacts` | N/A | pass | Analyses terminate at lifecycle assembly; compile stages begin at `LowerToIRVMPipelineStage`. |
|
||||
| G23-6.1 | `analyze` MUST terminate after `AssembleLifecycle` and MUST NOT execute backend artifact stages. | `BuilderPipelineServiceOrderTest#analyzeMustTerminateAfterLifecycleAssemblyWithoutBackendArtifacts`; `MainProjectPipelineIntegrationTest#analyzeShouldNotWriteProgramBytecode` | N/A | pass | Analyze returns an assembled executable `IRBackend` with no IRVM, bytecode, or file output. |
|
||||
| G23-6.2 | `compile` MUST terminate after `VerifyBytecode` and MUST return a validated in-memory executable result without disk write. | `MainProjectPipelineIntegrationTest#compileShouldProduceInMemoryBytecodeWithoutWritingProgramBytecode`; `BuilderPipelinePublicSurfaceTest#compileResultMustExposeValidatedInMemoryArtifacts` | N/A | pass | Coverage asserts validated in-memory bytecode artifacts and the no-write boundary for `compile`. |
|
||||
| G23-6.3 | `build` MUST extend `compile` only with terminal artifact persistence. | `MainProjectPipelineIntegrationTest#buildShouldWriteProgramBytecode`; `BuilderPipelinePublicSurfaceTest#buildResultMustExposeArtifactPathAndCompilePayload` | N/A | pass | Coverage asserts that `build` retains the compile payload and writes the filesystem artifact path expected by callers. |
|
||||
| G23-7.1 | `AnalysisSnapshot` MUST expose the minimum shared analysis contract. | `MainProjectPipelineIntegrationTest#analyzeShouldNotWriteProgramBytecode`; `BuilderPipelinePublicSurfaceTest#analysisSnapshotMustExposeMinimumSharedContract` | N/A | pass | Both executable and structural contract checks now cover the shared minimum analysis payload. |
|
||||
| G23-8.1 | Caller-specific configs/contexts MUST NOT redefine canonical stage semantics. | N/A | N/A | missing | Requires explicit multi-entrypoint composition tests once non-filesystem contexts are implemented. |
|
||||
| G23-8.3 | A compile-only `FrontendProvider` registered by `languageId` MUST traverse `compile()` to verified bytecode without PBS, `.pbs` sources, or PBS stdlib. | `SyntheticFrontendPipelineTest#compileMustEmitVerifiedBytecodeWithoutPbs` | `FrontendRegistryServiceTest#unregisterMustRefuseToRemoveDefaultPbs` | pass | Synthetic `synth` provider is test-only; common pipeline must not require PBS types, PBS sources, or PBS stdlib. |
|
||||
| G23-9.1 | Legacy public `run` MUST be removed as the normative entrypoint and filesystem-default behavior MUST be expressed through `build`. | `BuilderPipelinePublicSurfaceTest#publicServiceSurfaceMustExposeExplicitEntrypointsAndNoPublicRun`; `MainProjectPipelineIntegrationTest#buildShouldWriteProgramBytecode` | N/A | partial | Public service coverage now proves `run` is no longer public and `build` is the filesystem artifact path, but the CLI composition path is not yet exercised by a dedicated automated test. |
|
||||
| PBS13-12.0 | PBS executable lowering MUST emit `IRBackend` satisfying frontend handoff obligations before common backend lowering. | `IRBackendExecutableContractTest` suite; `PBSFrontendPhaseServiceTest#shouldSynthesizePositiveTopic19FixtureAcrossFileInitProjectInitAndFrame` | `LowerToIRVMServiceTest#lowerMustRejectWhenSyntheticWrapperEntrypointIsMissing`; `LowerToIRVMServiceTest#lowerMustRejectWhenHiddenBootGuardIsMissing`; `LowerToIRVMServiceTest#lowerMustRejectWhenSyntheticCallableOriginIsMissing` | pass | Row group `PBS13-12.x` verifies PBS emission into the common handoff; common backend ownership is covered by G20 rows. |
|
||||
| PBS13-12.7 | PBS executable lowering MUST emit a typed lifecycle declaration and MUST NOT assemble derived wrappers. | `PBSFrontendPhaseServiceTest#shouldSynthesizePositiveTopic19FixtureAcrossFileInitProjectInitAndFrame`; `PbsFrontendCompilerTest#shouldExposeGlobalsAndTypedLifecycleDeclarationInBackendFile` | N/A | pass | Frontend tests assert declaration roles and the absence of module init, published wrapper, and boot guard. |
|
||||
| PBS13-12.8 | Project init MUST be excluded from file-init fragments and MUST execute exactly once after module initializers. | `PbsFrontendCompilerTest#shouldExposeGlobalsAndTypedLifecycleDeclarationInBackendFile`; `LifecycleAssemblerServiceTest#assembleMustInvokeProjectInitExactlyOnceAndExcludeItFromFileInit` | N/A | pass | Colocated `[Init]` is declared as project init and invoked once by the assembled wrapper. |
|
||||
| PBS13-12.9 | Lifecycle module order MUST propagate resolved dependency order without name or `FileId` inference. | `PBSFrontendPhaseServiceTest#shouldPublishDependencyOrderedLifecycleModulesInsteadOfNameOrFileIdOrder`; `IRBackendExecutableContractTest#aggregatorMustRemapTypedLifecycleReferencesAndPreserveDeclaredModuleOrder` | N/A | pass | Adversarial module names and file registration order do not change declared dependency order. |
|
||||
| PBS13-12.1.1 | Callable identity MUST be preserved at handoff. | `IRBackendExecutableContractTest#aggregatorMustPreserveExecutableFunctionOrderDeterministically` | N/A | pass | |
|
||||
| PBS13-12.1.2 | Observable callable signature MUST be preserved at handoff. | `IRBackendExecutableContractTest#functionContractMustRejectInvalidSlotAndSpanBounds` | N/A | pass | |
|
||||
| PBS13-12.1.3 | Callable category MUST be preserved at handoff. | `PbsFrontendCompilerTest#shouldLowerExecutableFunctionsWithCallsiteCategories` | N/A | pass | |
|
||||
|
||||
@@ -65,12 +65,13 @@ The canonical stage order is:
|
||||
1. `ResolveDepsPipelineStage`
|
||||
2. `LoadSourcesPipelineStage`
|
||||
3. `FrontendPhasePipelineStage`
|
||||
4. `LowerToIRVMPipelineStage`
|
||||
5. `OptimizeIRVMPipelineStage`
|
||||
6. `EmitBytecodePipelineStage`
|
||||
7. `LinkBytecodePipelineStage`
|
||||
8. `VerifyBytecodePipelineStage`
|
||||
9. `WriteBytecodeArtifactPipelineStage`
|
||||
4. `AssembleLifecyclePipelineStage`
|
||||
5. `LowerToIRVMPipelineStage`
|
||||
6. `OptimizeIRVMPipelineStage`
|
||||
7. `EmitBytecodePipelineStage`
|
||||
8. `LinkBytecodePipelineStage`
|
||||
9. `VerifyBytecodePipelineStage`
|
||||
10. `WriteBytecodeArtifactPipelineStage`
|
||||
|
||||
Public entrypoints MAY terminate early according to this document, but they MUST NOT:
|
||||
|
||||
@@ -82,21 +83,23 @@ Public entrypoints MAY terminate early according to this document, but they MUST
|
||||
|
||||
### 6.1 `analyze`
|
||||
|
||||
`analyze` MUST terminate at `FrontendPhasePipelineStage`.
|
||||
`analyze` MUST terminate at `AssembleLifecyclePipelineStage`.
|
||||
|
||||
`analyze` is defined as:
|
||||
|
||||
1. `ResolveDeps`
|
||||
2. `LoadSources`
|
||||
3. `FrontendPhase`
|
||||
4. `AssembleLifecycle`
|
||||
|
||||
`analyze` MUST:
|
||||
|
||||
1. resolve workspace/dependency inputs needed by the frontend,
|
||||
2. load source surfaces admitted by the selected compiler configuration,
|
||||
3. run frontend semantic analysis,
|
||||
4. return an `AnalysisSnapshot` or equivalent result contract,
|
||||
5. and remain free of backend artifact side effects.
|
||||
3. run frontend semantic analysis and emit a declarative `IRBackend`,
|
||||
4. assemble the common lifecycle from `IRLifecycleDeclaration` when present,
|
||||
5. return an `AnalysisSnapshot` or equivalent result contract whose `IRBackend` is fully assembled when the handoff is executable,
|
||||
6. and remain free of backend artifact side effects.
|
||||
|
||||
`analyze` MUST NOT:
|
||||
|
||||
@@ -269,6 +272,18 @@ Absent editor capabilities MUST have deterministic fallback behavior at tooling
|
||||
3. host protocols that can represent unsupported operations SHOULD do so explicitly;
|
||||
4. and absent editor capability MUST NOT be reported as a compiler failure.
|
||||
|
||||
When a frontend exposes definition or navigation, each returned location MUST identify a compiler-known physical source file. A resolved symbol without a physical file MUST produce an empty definition response. Tooling MUST NOT require virtual documents, untitled buffers, or synthetic URIs for this capability.
|
||||
|
||||
When a frontend exposes find-references, each returned usage or declaration location MUST identify a compiler-known physical source file. A cursor offset whose definition response is empty MUST produce an empty references response. Host `includeDeclaration` MAY add the canonical declaration location only when that declaration is a compiler-known physical source file; it MUST NOT invent a virtual, untitled, or synthetic location.
|
||||
|
||||
When a frontend exposes document symbols or outline, the result MUST be the named declaration tree of the requested document. Presence, hierarchy, and ranges MUST come from that document's recovered syntax tree. Semantic success MUST NOT be required. Semantic enrichment MUST NOT drop a named declaration that the syntax tree still exposes. A missing syntax tree MUST produce an empty list. Document symbols MUST NOT be a workspace symbol index, folding ranges, or a navigation list of foreign files.
|
||||
|
||||
When a frontend exposes workspace symbols, the result MUST be a flat search of named declarations whose locations identify compiler-known physical source files of the current analysis. Presence, names, kinds, details, and ranges MUST come from the recovered syntax of those files. Semantic success MUST NOT be required. Semantic enrichment MUST NOT drop a named declaration that the syntax tree still exposes. A missing analysis surface MUST produce an empty list. The workspace-symbol request MUST NOT require an open text document. A declaration without a compiler-known physical file MUST be omitted. Tooling MUST NOT require virtual documents, untitled buffers, or synthetic URIs for this capability. Workspace symbols MUST NOT be a document outline, folding ranges, a persistent symbol index, or a navigation list of virtual locations.
|
||||
|
||||
When a frontend exposes rename, the result MUST be a validated workspace edit of identifier spans whose locations identify compiler-known physical source files. Identity MUST be the physical declaration locations that definition returns at the cursor. A local or parameter name span MUST still be renameable when definition at that offset is empty. Each rewritten location MUST identify a compiler-known physical source file. A cursor that is not renameable, including builtins, virtual paths, unresolved names, keywords, comments, strings, import aliases and uses of those aliases, error case labels without their own span, and barrel files, MUST produce a protocol error or a null prepareRename result. Tooling MUST NOT return a successful empty workspace edit for a refused cursor or an invalid new name. The new name MUST be a language identifier that is not a keyword and MUST NOT collide in the same binding space, ignoring the sites being rewritten and the overload set being renamed. The server MUST NOT write files and MUST NOT rename file paths. Host prepareRename MUST advertise a prepareProvider when rename is exposed. Tooling MUST NOT require virtual documents, untitled buffers, or synthetic URIs for this capability.
|
||||
|
||||
When a frontend exposes code actions, the result MUST be quick fixes only: one workspace edit tied to a diagnostic of the requested physical document. The frontend MUST produce each repair from that document's syntax. Each repair MUST name the stable diagnostic code, the primary span, and exactly one local text edit. Tooling MUST transport that repair. Tooling MUST NOT choose the edit by parsing the diagnostic message or by a diagnostic-code table. A repair MUST NOT be a required field of compiler diagnostics and MUST NOT be published inside diagnostic data. The published diagnostic MUST carry the stable code so a later code-action request can match it. A repair MUST be returned only when the request context contains a diagnostic with the same code and the same primary range. An empty diagnostic context MUST produce an empty list. The edit MUST change only the requested physical source file. The server MUST NOT write files, MUST NOT return a command, and MUST NOT require a resolve round trip. A missing code-action capability MUST NOT advertise code actions and MUST produce an empty list rather than a protocol error. Virtual, untitled, or synthetic documents MUST NOT receive an edit. Code actions MUST NOT include organize-imports, source actions, refactors, or generated stubs unless a future accepted decision says so.
|
||||
|
||||
Compiler diagnostics and editor diagnostics are distinct ownership surfaces. Diagnostics returned by `analyze`, `compile`, and `build` are compiler contract output. Editor diagnostics MAY reuse compiler analysis results, live overlays, caches, or cancellation-aware tooling state, but a frontend MUST NOT be required to provide editor diagnostics in order to compile.
|
||||
|
||||
`FrontendSpec` remains the source of static frontend-owned presentation metadata such as semantic vocabularies, host projections, and visual themes. Producing semantic tokens for a live document is an optional editor-facing capability; the existence of static presentation metadata MUST NOT imply that every frontend can provide live semantic-token results.
|
||||
@@ -281,6 +296,10 @@ Provider registration MUST be explicit in v1. The registry contract MUST NOT use
|
||||
|
||||
PBS is the only initial real provider for this contract. PBS MAY be registered by an application composition root, but PBS MUST NOT become an exclusive semantic owner of the shared compiler pipeline.
|
||||
|
||||
A compile-only `FrontendProvider` registered by `languageId` MUST be a valid participant of `analyze`, `compile`, and `build`. The shared pipeline MUST NOT require PBS frontend types, `.pbs` or `.barrel` sources, or PBS stdlib in order to emit verified bytecode. Test-only frontends MAY exist solely as fixtures. They MUST NOT be product languages, MUST NOT be registered by default bootstrap or Studio composition, and MUST NOT be discovered by plugin scanning, classpath scanning, or external JAR loading.
|
||||
|
||||
The frontend registry MUST expose explicit `register` and `unregister` operations. `unregister` MUST refuse to remove the default PBS provider. Lookup of an unknown `languageId` MUST fail explicitly. `unregister` of an unknown `languageId` MUST be a no-op.
|
||||
|
||||
## 9. Public Surface Rule
|
||||
|
||||
The shared compiler public surface MUST expose explicit entrypoints equivalent in meaning to:
|
||||
|
||||
@@ -9,7 +9,7 @@ Scope boundary:
|
||||
- PROMETEU itself is a fantasy handheld / fantasy console with a broader machine model, firmware model, cartridge model, and virtual hardware surface.
|
||||
- This document does not define the whole PROMETEU machine.
|
||||
- This document defines the VM/runtime subsystem that executes bytecode inside that machine.
|
||||
- For broader machine-level framing, see [`../specs/README.md`](../specs/README.md).
|
||||
- For broader machine-level framing, see [`../specs/README.md`](../specs/runtime/README.md).
|
||||
|
||||
Document roles:
|
||||
|
||||
@@ -149,6 +149,7 @@ The verifier statically checks bytecode for structural safety and stack‑shape
|
||||
- `SyscallMeta` defines expected arity and return slot counts. The loader resolves `HOSTCALL` against this metadata and rejects raw `SYSCALL` in PBX pre-load artifacts; the verifier checks final IDs/arity/return‑slot counts against the same metadata.
|
||||
- Arguments and returns
|
||||
- Arguments are taken from the operand stack in the order defined by the ABI. Returns use multi‑slot results via a host‑side return buffer (`HostReturn`) which the VM copies back onto the stack, or zero slots for “void”. A mismatch in result counts is a fault/panic per current hardening logic.
|
||||
- Example: the canonical asset runtime load surface is `asset.load(asset_id, slot) -> (status, handle)`. The caller does not supply `asset_name` or `asset_type`; bank kind is derived from `asset_table` using `asset_id`.
|
||||
- Capabilities
|
||||
- Cartridge capability flags are applied before load-time host resolution. Missing required capability aborts load; invoking a syscall without the required capability also traps defensively at runtime.
|
||||
|
||||
|
||||
@@ -78,6 +78,17 @@ Authority rule:
|
||||
- `INTRINSIC u32` — final numeric VM-owned intrinsic call.
|
||||
- `FRAME_SYNC` — yield until the next frame boundary (e.g., vblank); explicit safepoint.
|
||||
|
||||
Host service arity is not encoded in the opcode itself. It is defined by resolved syscall metadata.
|
||||
|
||||
Example:
|
||||
|
||||
- `asset.load` currently resolves with `arg_slots = 2` and `ret_slots = 2`.
|
||||
- The canonical stack contract is `asset_id, slot -> status, handle`.
|
||||
- Callers do not provide an explicit asset kind; the runtime derives it from `asset_table`.
|
||||
- `composer.bind_scene` resolves with `arg_slots = 1` and `ret_slots = 1`.
|
||||
- The canonical stack contract is `bank_id -> status`.
|
||||
- `composer.emit_sprite` resolves with `arg_slots = 9` and `ret_slots = 1`.
|
||||
|
||||
#### Canonical Intrinsic Registry Artifact
|
||||
|
||||
- Final intrinsic IDs and intrinsic stack metadata are published in [`INTRINSICS.csv`](INTRINSICS.csv).
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
# VM Architecture Mirror Policy
|
||||
|
||||
The Prometeu runtime repository is the normative authority for PBX binary
|
||||
layout, Core ISA, loader behavior, verification, and PVM execution semantics.
|
||||
The files in this directory are convenience mirrors for Studio-side compiler
|
||||
and integration work; they are not an independent architectural authority.
|
||||
|
||||
Canonical runtime sources:
|
||||
|
||||
- `../runtime/docs/vm-arch/ARCHITECTURE.md`
|
||||
- `../runtime/docs/vm-arch/ISA_CORE.md`
|
||||
- `../runtime/docs/vm-arch/INTRINSICS.csv`
|
||||
|
||||
When these mirrors are retained, an integration change that updates a canonical
|
||||
runtime source MUST update the corresponding Studio mirror in the same logical
|
||||
change. Verify synchronization from the Studio repository root with:
|
||||
|
||||
```bash
|
||||
diff -u docs/vm-arch/ARCHITECTURE.md ../runtime/docs/vm-arch/ARCHITECTURE.md
|
||||
diff -u docs/vm-arch/ISA_CORE.md ../runtime/docs/vm-arch/ISA_CORE.md
|
||||
diff -u docs/vm-arch/INTRINSICS.csv ../runtime/docs/vm-arch/INTRINSICS.csv
|
||||
```
|
||||
|
||||
All three commands MUST exit successfully with no output before a change claims
|
||||
that the mirrors are synchronized. If the runtime repository is not available
|
||||
in the same checkout, synchronization evidence must be produced against the
|
||||
canonical runtime revision before merging.
|
||||
|
||||
Compiler-owned transformation contracts remain under `docs/specs/compiler`.
|
||||
Those specifications define `IRBackend -> IRVM -> PBX` emission, but they MUST
|
||||
conform to the runtime-owned PBX and ISA contracts and MUST NOT redefine runtime
|
||||
execution semantics.
|
||||
@@ -5,6 +5,7 @@ jackson = "2.18.2"
|
||||
jacoco = "0.8.12"
|
||||
lombok = "1.18.32"
|
||||
junit-jupiter = "5.12.1"
|
||||
archunit = "1.4.2"
|
||||
slf4j = "2.0.7"
|
||||
lsp4j = "1.0.0"
|
||||
|
||||
@@ -19,6 +20,7 @@ apache-commons-collections = { group = "org.apache.commons", name = "commons-col
|
||||
jacoco-core = { group = "org.jacoco", name = "org.jacoco.core", version.ref = "jacoco" }
|
||||
lombok = { group = "org.projectlombok", name = "lombok", version.ref = "lombok" }
|
||||
junit-jupiter = { group = "org.junit.jupiter", name = "junit-jupiter", version.ref = "junit-jupiter" }
|
||||
archunit-junit5 = { group = "com.tngtech.archunit", name = "archunit-junit5", version.ref = "archunit" }
|
||||
slf4j-api = { group = "org.slf4j", name = "slf4j-api", version.ref = "slf4j" }
|
||||
slf4j-simple = { group = "org.slf4j", name = "slf4j-simple", version.ref = "slf4j" }
|
||||
lsp4j = { group = "org.eclipse.lsp4j", name = "org.eclipse.lsp4j", version.ref = "lsp4j" }
|
||||
|
||||
@@ -7,7 +7,6 @@ dependencies {
|
||||
implementation(project(":prometeu-infra"))
|
||||
implementation(project(":prometeu-lsp:prometeu-lsp-api"))
|
||||
implementation(project(":prometeu-lsp:prometeu-lsp-v1"))
|
||||
implementation(project(":prometeu-compiler:frontends:prometeu-frontend-pbs"))
|
||||
implementation(project(":prometeu-compiler:prometeu-frontend-registry"))
|
||||
implementation(project(":prometeu-packer:prometeu-packer-api"))
|
||||
implementation(project(":prometeu-packer:prometeu-packer-v1"))
|
||||
|
||||
@@ -0,0 +1,23 @@
|
||||
plugins {
|
||||
id("gradle.java-library-conventions")
|
||||
}
|
||||
|
||||
dependencies {
|
||||
testImplementation(libs.archunit.junit5)
|
||||
|
||||
testImplementation(project(":prometeu-compiler:frontends:prometeu-frontend-pbs"))
|
||||
testImplementation(project(":prometeu-compiler:prometeu-frontend-registry"))
|
||||
testImplementation(project(":prometeu-compiler:prometeu-compiler-core"))
|
||||
testImplementation(project(":prometeu-compiler:prometeu-frontend-api"))
|
||||
testImplementation(project(":prometeu-compiler:prometeu-build-pipeline"))
|
||||
testImplementation(project(":prometeu-compiler:prometeu-deps"))
|
||||
testImplementation(project(":prometeu-infra"))
|
||||
testImplementation(project(":prometeu-lsp:prometeu-lsp-api"))
|
||||
testImplementation(project(":prometeu-lsp:prometeu-lsp-v1"))
|
||||
testImplementation(project(":prometeu-studio"))
|
||||
testImplementation(project(":prometeu-app"))
|
||||
}
|
||||
|
||||
tasks.named<JacocoReport>("jacocoTestReport") {
|
||||
enabled = false
|
||||
}
|
||||
+63
@@ -0,0 +1,63 @@
|
||||
package p.studio.architecture;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
import static org.junit.jupiter.api.Assertions.fail;
|
||||
|
||||
class CommonBackendPbsPrefixScanTest {
|
||||
private static final String COMPILER_SOURCE_ROOT =
|
||||
"prometeu-compiler/prometeu-build-pipeline/src/main/java/p/studio/compiler";
|
||||
private static final List<String> GUARDED_RELATIVE_ROOTS = List.of(
|
||||
"backend",
|
||||
"lifecycle",
|
||||
"workspaces/stages");
|
||||
private static final String FORBIDDEN_PBS_PREFIX = "__pbs.";
|
||||
|
||||
@Test
|
||||
void commonLifecycleAndBackendMustNotDiscoverRolesFromPbsNamePrefixes() throws IOException {
|
||||
final var violations = new ArrayList<String>();
|
||||
final var repoRoot = locateRepoRoot();
|
||||
final var compilerRoot = repoRoot.resolve(COMPILER_SOURCE_ROOT);
|
||||
for (final var relativeRoot : GUARDED_RELATIVE_ROOTS) {
|
||||
final var root = compilerRoot.resolve(relativeRoot);
|
||||
if (!Files.exists(root)) {
|
||||
fail("guarded source root is missing: " + root);
|
||||
}
|
||||
try (final var paths = Files.walk(root)) {
|
||||
paths.filter(path -> path.toString().endsWith(".java")).forEach(path -> {
|
||||
try {
|
||||
if (Files.readString(path).contains(FORBIDDEN_PBS_PREFIX)) {
|
||||
violations.add(repoRoot.relativize(path).toString());
|
||||
}
|
||||
} catch (IOException e) {
|
||||
throw new IllegalStateException("failed to read source file: " + path, e);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
assertTrue(
|
||||
violations.isEmpty(),
|
||||
"common lifecycle/backend code must not inspect __pbs. prefixes: " + violations);
|
||||
}
|
||||
|
||||
private static Path locateRepoRoot() {
|
||||
var cursor = Path.of(System.getProperty("user.dir")).toAbsolutePath().normalize();
|
||||
while (cursor != null) {
|
||||
final var hasDocs = Files.isDirectory(cursor.resolve("docs/specs/compiler"));
|
||||
final var hasCompiler = Files.isDirectory(cursor.resolve("prometeu-compiler"));
|
||||
if (hasDocs && hasCompiler) {
|
||||
return cursor;
|
||||
}
|
||||
cursor = cursor.getParent();
|
||||
}
|
||||
fail("could not locate repository root from working directory");
|
||||
throw new IllegalStateException("unreachable");
|
||||
}
|
||||
}
|
||||
+22
@@ -0,0 +1,22 @@
|
||||
package p.studio.architecture;
|
||||
|
||||
import com.tngtech.archunit.base.DescribedPredicate;
|
||||
import com.tngtech.archunit.core.domain.JavaClass;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.Set;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
final class DescribedPredicates {
|
||||
private DescribedPredicates() {
|
||||
}
|
||||
|
||||
static DescribedPredicate<JavaClass> notBelongingTo(final Class<?>... allowed) {
|
||||
final Set<String> allowedNames = Arrays.stream(allowed)
|
||||
.map(Class::getName)
|
||||
.collect(Collectors.toUnmodifiableSet());
|
||||
return DescribedPredicate.describe(
|
||||
"do not belong to " + allowedNames,
|
||||
javaClass -> !allowedNames.contains(javaClass.getName()));
|
||||
}
|
||||
}
|
||||
+85
@@ -0,0 +1,85 @@
|
||||
package p.studio.architecture;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
import static org.junit.jupiter.api.Assertions.fail;
|
||||
|
||||
class PbsGradleDependencyAllowlistTest {
|
||||
private static final Pattern PBS_PROJECT_DEP = Pattern.compile(
|
||||
"(\\w+)\\(\\s*project\\(\\s*\"" + Pattern.quote(PbsModuleOrigins.PBS_GRADLE_PATH) + "\"\\s*\\)");
|
||||
private static final Map<String, Set<String>> ALLOWED_CONFIGURATIONS = Map.of(
|
||||
":prometeu-compiler:prometeu-frontend-registry", Set.of("implementation", "api"),
|
||||
":prometeu-architecture-tests", Set.of("testImplementation"));
|
||||
|
||||
@Test
|
||||
void onlyAllowlistedProjectsMayDependOnThePbsFrontendModule() throws IOException {
|
||||
final var repoRoot = locateRepoRoot();
|
||||
final var violations = new ArrayList<String>();
|
||||
|
||||
try (final var paths = Files.walk(repoRoot)) {
|
||||
paths.filter(path -> path.getFileName().toString().equals("build.gradle.kts"))
|
||||
.filter(path -> !path.toString().contains("/buildSrc/"))
|
||||
.filter(path -> !path.toString().contains("/build/"))
|
||||
.forEach(path -> collectViolations(repoRoot, path, violations));
|
||||
}
|
||||
|
||||
assertTrue(violations.isEmpty(), "PBS Gradle project dependency allowlist violated: " + violations);
|
||||
}
|
||||
|
||||
private static void collectViolations(
|
||||
final Path repoRoot,
|
||||
final Path buildFile,
|
||||
final ArrayList<String> violations) {
|
||||
final var projectPath = toProjectPath(repoRoot, buildFile);
|
||||
if (PbsModuleOrigins.PBS_GRADLE_PATH.equals(projectPath)) {
|
||||
return;
|
||||
}
|
||||
|
||||
final String content;
|
||||
try {
|
||||
content = Files.readString(buildFile);
|
||||
} catch (IOException e) {
|
||||
throw new IllegalStateException("failed to read " + buildFile, e);
|
||||
}
|
||||
|
||||
final var matcher = PBS_PROJECT_DEP.matcher(content);
|
||||
while (matcher.find()) {
|
||||
final var configuration = matcher.group(1);
|
||||
final var allowed = ALLOWED_CONFIGURATIONS.getOrDefault(projectPath, Set.of());
|
||||
if (!allowed.contains(configuration)) {
|
||||
violations.add(projectPath + " " + configuration + " " + PbsModuleOrigins.PBS_GRADLE_PATH);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private static String toProjectPath(final Path repoRoot, final Path buildFile) {
|
||||
final var relative = repoRoot.relativize(buildFile.getParent()).toString().replace('\\', '/');
|
||||
if (relative.isEmpty() || ".".equals(relative)) {
|
||||
return ":";
|
||||
}
|
||||
return ":" + relative.replace('/', ':');
|
||||
}
|
||||
|
||||
private static Path locateRepoRoot() {
|
||||
var cursor = Path.of(System.getProperty("user.dir")).toAbsolutePath().normalize();
|
||||
while (cursor != null) {
|
||||
final var hasDocs = Files.isDirectory(cursor.resolve("docs/specs/compiler"));
|
||||
final var hasCompiler = Files.isDirectory(cursor.resolve("prometeu-compiler"));
|
||||
if (hasDocs && hasCompiler) {
|
||||
return cursor;
|
||||
}
|
||||
cursor = cursor.getParent();
|
||||
}
|
||||
fail("could not locate repository root from working directory");
|
||||
throw new IllegalStateException("unreachable");
|
||||
}
|
||||
}
|
||||
+43
@@ -0,0 +1,43 @@
|
||||
package p.studio.architecture;
|
||||
|
||||
import com.tngtech.archunit.core.importer.ImportOption;
|
||||
import com.tngtech.archunit.junit.AnalyzeClasses;
|
||||
import com.tngtech.archunit.junit.ArchTest;
|
||||
import com.tngtech.archunit.lang.ArchRule;
|
||||
import p.studio.compiler.PBSDefinitions;
|
||||
import p.studio.compiler.PBSFrontendProvider;
|
||||
|
||||
import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.noClasses;
|
||||
import static p.studio.architecture.PbsModuleOrigins.fromFrontendApiModule;
|
||||
import static p.studio.architecture.PbsModuleOrigins.fromPbsModule;
|
||||
import static p.studio.architecture.PbsModuleOrigins.fromRegistryModule;
|
||||
|
||||
@AnalyzeClasses(packages = "p.studio", importOptions = ImportOption.DoNotIncludeTests.class)
|
||||
class PbsModuleBoundaryArchTest {
|
||||
|
||||
@ArchTest
|
||||
static final ArchRule productionOutsideAllowlistMustNotDependOnPbsModuleTypes = noClasses()
|
||||
.that(fromPbsModule().negate())
|
||||
.and(fromRegistryModule().negate())
|
||||
.should()
|
||||
.dependOnClassesThat(fromPbsModule())
|
||||
.because("DEC-0050: only prometeu-frontend-pbs and prometeu-frontend-registry may depend on PBS module types");
|
||||
|
||||
@ArchTest
|
||||
static final ArchRule registryMustOnlyDependOnPbsProviderFacade = noClasses()
|
||||
.that(fromRegistryModule())
|
||||
.should()
|
||||
.dependOnClassesThat(
|
||||
fromPbsModule()
|
||||
.and(DescribedPredicates.notBelongingTo(PBSFrontendProvider.class, PBSDefinitions.class)))
|
||||
.because("DEC-0050: registry may depend only on PBSFrontendProvider and PBSDefinitions");
|
||||
|
||||
@ArchTest
|
||||
static final ArchRule irBackendModelsMustNotDependOnPbsModuleTypes = noClasses()
|
||||
.that(fromFrontendApiModule())
|
||||
.and()
|
||||
.resideInAPackage("p.studio.compiler.models..")
|
||||
.should()
|
||||
.dependOnClassesThat(fromPbsModule())
|
||||
.because("DEC-0050: public IRBackend contract types must not depend on PBS module types");
|
||||
}
|
||||
+36
@@ -0,0 +1,36 @@
|
||||
package p.studio.architecture;
|
||||
|
||||
import com.tngtech.archunit.core.importer.ClassFileImporter;
|
||||
import com.tngtech.archunit.core.importer.ImportOption;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
import static org.junit.jupiter.api.Assertions.fail;
|
||||
|
||||
class PbsModuleClasspathTest {
|
||||
|
||||
@Test
|
||||
void importerMustSeePbsAndRegistryModuleOrigins() {
|
||||
final var classes = new ClassFileImporter()
|
||||
.withImportOption(ImportOption.Predefined.DO_NOT_INCLUDE_TESTS)
|
||||
.importPackages("p.studio");
|
||||
|
||||
final var pbsSample = classes.stream()
|
||||
.filter(PbsModuleOrigins::isPbsModule)
|
||||
.findFirst();
|
||||
final var registrySample = classes.stream()
|
||||
.filter(PbsModuleOrigins::isRegistryModule)
|
||||
.findFirst();
|
||||
|
||||
if (pbsSample.isEmpty() || registrySample.isEmpty()) {
|
||||
final var uris = classes.stream()
|
||||
.limit(20)
|
||||
.map(javaClass -> javaClass.getName() + " -> " + PbsModuleOrigins.sourceUri(javaClass))
|
||||
.toList();
|
||||
fail("PBS/registry module origins were not visible to ArchUnit. sample URIs: " + uris);
|
||||
}
|
||||
|
||||
assertTrue(pbsSample.isPresent());
|
||||
assertTrue(registrySample.isPresent());
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,60 @@
|
||||
package p.studio.architecture;
|
||||
|
||||
import com.tngtech.archunit.base.DescribedPredicate;
|
||||
import com.tngtech.archunit.core.domain.JavaClass;
|
||||
|
||||
final class PbsModuleOrigins {
|
||||
static final String PBS_GRADLE_PATH = ":prometeu-compiler:frontends:prometeu-frontend-pbs";
|
||||
|
||||
private PbsModuleOrigins() {
|
||||
}
|
||||
|
||||
static boolean isPbsModule(final JavaClass javaClass) {
|
||||
return uriContains(javaClass, "/prometeu-frontend-pbs/")
|
||||
|| uriContains(javaClass, "prometeu-frontend-pbs.jar");
|
||||
}
|
||||
|
||||
static boolean isRegistryModule(final JavaClass javaClass) {
|
||||
return uriContains(javaClass, "/prometeu-frontend-registry/")
|
||||
|| uriContains(javaClass, "prometeu-frontend-registry.jar");
|
||||
}
|
||||
|
||||
static boolean isFrontendApiModule(final JavaClass javaClass) {
|
||||
return uriContains(javaClass, "/prometeu-frontend-api/")
|
||||
|| uriContains(javaClass, "prometeu-frontend-api.jar");
|
||||
}
|
||||
|
||||
static DescribedPredicate<JavaClass> fromPbsModule() {
|
||||
return DescribedPredicate.describe(
|
||||
"originate from the PBS frontend module",
|
||||
PbsModuleOrigins::isPbsModule);
|
||||
}
|
||||
|
||||
static DescribedPredicate<JavaClass> fromRegistryModule() {
|
||||
return DescribedPredicate.describe(
|
||||
"originate from the frontend registry module",
|
||||
PbsModuleOrigins::isRegistryModule);
|
||||
}
|
||||
|
||||
static DescribedPredicate<JavaClass> fromFrontendApiModule() {
|
||||
return DescribedPredicate.describe(
|
||||
"originate from the frontend-api module",
|
||||
PbsModuleOrigins::isFrontendApiModule);
|
||||
}
|
||||
|
||||
static String sourceUri(final JavaClass javaClass) {
|
||||
return javaClass.getSource()
|
||||
.map(source -> normalize(source.getUri().toString()))
|
||||
.orElse("<no source>");
|
||||
}
|
||||
|
||||
private static boolean uriContains(final JavaClass javaClass, final String fragment) {
|
||||
return javaClass.getSource()
|
||||
.map(source -> normalize(source.getUri().toString()).contains(fragment))
|
||||
.orElse(false);
|
||||
}
|
||||
|
||||
private static String normalize(final String uri) {
|
||||
return uri.replace('\\', '/');
|
||||
}
|
||||
}
|
||||
+447
-1
@@ -6,12 +6,26 @@ import p.studio.compiler.messages.FrontendPhaseContext;
|
||||
import p.studio.compiler.models.FrontendSemanticToken;
|
||||
import p.studio.compiler.pbs.ast.PbsAst;
|
||||
import p.studio.compiler.pbs.semantics.PbsEditorialCompletionCandidate;
|
||||
import p.studio.compiler.pbs.semantics.PbsEditorialDocumentSymbol;
|
||||
import p.studio.compiler.pbs.semantics.PbsEditorialLocation;
|
||||
import p.studio.compiler.pbs.semantics.PbsEditorialResolvedSymbol;
|
||||
import p.studio.compiler.pbs.semantics.PbsEditorialSignatureHelp;
|
||||
import p.studio.compiler.pbs.semantics.PbsEditorialSymbolKind;
|
||||
import p.studio.compiler.pbs.semantics.PbsEditorialSupportService;
|
||||
import p.studio.compiler.pbs.semantics.PbsEditorialSupportService.EditorialDocument;
|
||||
import p.studio.compiler.models.SourceKind;
|
||||
import p.studio.compiler.pbs.semantics.PbsEditorialRename;
|
||||
import p.studio.compiler.pbs.semantics.PbsEditorialWorkspaceSymbol;
|
||||
import p.studio.compiler.pbs.semantics.PbsQuickFix;
|
||||
import p.studio.compiler.pbs.semantics.PbsQuickFixCollector;
|
||||
import p.studio.compiler.services.PBSFrontendPhaseService.PbsSemanticReadSurface;
|
||||
import p.studio.compiler.services.FrontendCodeAction;
|
||||
import p.studio.compiler.services.FrontendCompletionCandidate;
|
||||
import p.studio.compiler.services.FrontendDefinitionLocation;
|
||||
import p.studio.compiler.services.FrontendDocumentRequest;
|
||||
import p.studio.compiler.services.FrontendDocumentSymbol;
|
||||
import p.studio.compiler.services.FrontendRenameEdit;
|
||||
import p.studio.compiler.services.FrontendRenameResult;
|
||||
import p.studio.compiler.services.FrontendDocumentation;
|
||||
import p.studio.compiler.services.FrontendEditorialContext;
|
||||
import p.studio.compiler.services.FrontendHover;
|
||||
@@ -19,11 +33,20 @@ import p.studio.compiler.services.FrontendLanguageService;
|
||||
import p.studio.compiler.services.FrontendSignature;
|
||||
import p.studio.compiler.services.FrontendSignatureHelp;
|
||||
import p.studio.compiler.services.FrontendSymbolKind;
|
||||
import p.studio.compiler.services.FrontendWorkspaceRequest;
|
||||
import p.studio.compiler.services.FrontendWorkspaceSymbol;
|
||||
import p.studio.compiler.services.PBSFrontendPhaseService;
|
||||
import p.studio.compiler.source.Span;
|
||||
import p.studio.compiler.source.diagnostics.DiagnosticSink;
|
||||
import p.studio.compiler.source.identifiers.FileId;
|
||||
import p.studio.compiler.source.tables.FileTableReader;
|
||||
import p.studio.utilities.structures.ReadOnlyList;
|
||||
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Comparator;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
import java.util.Optional;
|
||||
@@ -43,6 +66,23 @@ public final class PBSFrontendLanguageService implements FrontendLanguageService
|
||||
this.semanticTokenProvider = Objects.requireNonNull(semanticTokenProvider, "semanticTokenProvider");
|
||||
}
|
||||
|
||||
@Override
|
||||
public Optional<FrontendEditorialContext> prepareEditorialContext(final FrontendPhaseContext phaseContext) {
|
||||
if (phaseContext == null) {
|
||||
return Optional.empty();
|
||||
}
|
||||
final var semanticReadSurface = PBSFrontendPhaseService.semanticReadSurface(
|
||||
phaseContext,
|
||||
DiagnosticSink.empty(),
|
||||
BuildingIssueSink.empty());
|
||||
return Optional.of(new FrontendEditorialContext(
|
||||
null,
|
||||
ReadOnlyList.empty(),
|
||||
phaseContext.feSurfaceContext(),
|
||||
phaseContext.fileTable,
|
||||
semanticReadSurface));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Optional<FrontendEditorialContext> prepareEditorialContext(
|
||||
final FrontendPhaseContext phaseContext,
|
||||
@@ -61,7 +101,9 @@ public final class PBSFrontendLanguageService implements FrontendLanguageService
|
||||
return Optional.of(new FrontendEditorialContext(
|
||||
ast,
|
||||
semanticReadSurface.supplementalTopDeclsByFile().getOrDefault(fileId, ReadOnlyList.empty()),
|
||||
phaseContext.feSurfaceContext()));
|
||||
phaseContext.feSurfaceContext(),
|
||||
phaseContext.fileTable,
|
||||
semanticReadSurface));
|
||||
}
|
||||
|
||||
public List<PbsEditorialCompletionCandidate> completion(
|
||||
@@ -167,6 +209,272 @@ public final class PBSFrontendLanguageService implements FrontendLanguageService
|
||||
.orElseGet(FrontendSignatureHelp::empty);
|
||||
}
|
||||
|
||||
public List<PbsEditorialLocation> definition(
|
||||
final String sourceText,
|
||||
final PbsAst.File ast,
|
||||
final ReadOnlyList<PbsAst.TopDecl> supplementalTopDecls,
|
||||
final FESurfaceContext feSurfaceContext,
|
||||
final int offset) {
|
||||
return editorialSupportService.definition(sourceText, ast, supplementalTopDecls, feSurfaceContext, offset);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<FrontendDefinitionLocation> definition(
|
||||
final FrontendDocumentRequest request,
|
||||
final FrontendEditorialContext editorialContext,
|
||||
final int offset) {
|
||||
if (request == null
|
||||
|| editorialContext == null
|
||||
|| !(editorialContext.syntaxTree() instanceof PbsAst.File ast)
|
||||
|| !(editorialContext.supplementalDeclarations() instanceof ReadOnlyList<?> supplementalTopDecls)
|
||||
|| !(editorialContext.semanticContext() instanceof FESurfaceContext feSurfaceContext)
|
||||
|| !(editorialContext.sourceFiles() instanceof FileTableReader fileTable)) {
|
||||
return List.of();
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
final ReadOnlyList<PbsAst.TopDecl> typedSupplementalTopDecls =
|
||||
(ReadOnlyList<PbsAst.TopDecl>) supplementalTopDecls;
|
||||
final ArrayList<FrontendDefinitionLocation> locations = new ArrayList<>();
|
||||
for (final PbsEditorialLocation location : definition(
|
||||
request.documentText(),
|
||||
ast,
|
||||
typedSupplementalTopDecls,
|
||||
feSurfaceContext,
|
||||
offset)) {
|
||||
toFrontendLocation(location, fileTable).ifPresent(locations::add);
|
||||
}
|
||||
return List.copyOf(locations);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<FrontendDefinitionLocation> references(
|
||||
final FrontendDocumentRequest request,
|
||||
final FrontendEditorialContext editorialContext,
|
||||
final int offset) {
|
||||
if (request == null
|
||||
|| editorialContext == null
|
||||
|| !(editorialContext.syntaxTree() instanceof PbsAst.File ast)
|
||||
|| !(editorialContext.supplementalDeclarations() instanceof ReadOnlyList<?> supplementalTopDecls)
|
||||
|| !(editorialContext.semanticContext() instanceof FESurfaceContext feSurfaceContext)
|
||||
|| !(editorialContext.sourceFiles() instanceof FileTableReader fileTable)) {
|
||||
return List.of();
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
final ReadOnlyList<PbsAst.TopDecl> typedSupplementalTopDecls =
|
||||
(ReadOnlyList<PbsAst.TopDecl>) supplementalTopDecls;
|
||||
final List<PbsEditorialLocation> editorialIdentity = definition(
|
||||
request.documentText(),
|
||||
ast,
|
||||
typedSupplementalTopDecls,
|
||||
feSurfaceContext,
|
||||
offset);
|
||||
final ArrayList<PbsEditorialLocation> physicalIdentity = new ArrayList<>();
|
||||
for (final PbsEditorialLocation location : editorialIdentity) {
|
||||
if (toFrontendLocation(location, fileTable).isPresent()) {
|
||||
physicalIdentity.add(location);
|
||||
}
|
||||
}
|
||||
if (physicalIdentity.isEmpty()) {
|
||||
return List.of();
|
||||
}
|
||||
|
||||
final EditorialDocument cursorDocument = new EditorialDocument(
|
||||
request.documentText(),
|
||||
ast,
|
||||
typedSupplementalTopDecls,
|
||||
feSurfaceContext);
|
||||
final List<PbsEditorialLocation> usages = editorialSupportService.references(
|
||||
cursorDocument,
|
||||
offset,
|
||||
projectDocuments(request, editorialContext, cursorDocument, fileTable));
|
||||
final LinkedHashMap<String, FrontendDefinitionLocation> mapped = new LinkedHashMap<>();
|
||||
for (final PbsEditorialLocation usage : usages) {
|
||||
toFrontendLocation(usage, fileTable).ifPresent(location ->
|
||||
mapped.putIfAbsent(frontendLocationKey(location), location));
|
||||
}
|
||||
return List.copyOf(mapped.values());
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<FrontendDocumentSymbol> documentSymbols(
|
||||
final FrontendDocumentRequest request,
|
||||
final FrontendEditorialContext editorialContext) {
|
||||
if (editorialContext == null || !(editorialContext.syntaxTree() instanceof PbsAst.File ast)) {
|
||||
return List.of();
|
||||
}
|
||||
return editorialSupportService.documentSymbols(ast).stream()
|
||||
.map(this::toFrontendDocumentSymbol)
|
||||
.toList();
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<FrontendWorkspaceSymbol> workspaceSymbols(
|
||||
final FrontendWorkspaceRequest request,
|
||||
final FrontendEditorialContext editorialContext) {
|
||||
if (request == null
|
||||
|| editorialContext == null
|
||||
|| !(editorialContext.sourceFiles() instanceof FileTableReader fileTable)
|
||||
|| !(editorialContext.projectSurface() instanceof PbsSemanticReadSurface surface)
|
||||
|| surface.astByFile() == null
|
||||
|| surface.astByFile().isEmpty()) {
|
||||
return List.of();
|
||||
}
|
||||
final ArrayList<FrontendWorkspaceSymbol> symbols = new ArrayList<>();
|
||||
for (final var entry : surface.astByFile().entrySet()) {
|
||||
final Path path = pathForRegularSource(entry.getKey(), fileTable);
|
||||
if (path == null) {
|
||||
continue;
|
||||
}
|
||||
final PbsAst.File fileAst = entry.getValue();
|
||||
if (fileAst == null) {
|
||||
continue;
|
||||
}
|
||||
for (final PbsEditorialWorkspaceSymbol symbol : editorialSupportService.workspaceSymbols(
|
||||
fileAst,
|
||||
request.query())) {
|
||||
toFrontendWorkspaceSymbol(symbol, path).ifPresent(symbols::add);
|
||||
}
|
||||
}
|
||||
symbols.sort(Comparator
|
||||
.comparing(FrontendWorkspaceSymbol::name, String.CASE_INSENSITIVE_ORDER)
|
||||
.thenComparing(symbol -> symbol.path().toString())
|
||||
.thenComparingInt(FrontendWorkspaceSymbol::startOffset));
|
||||
return List.copyOf(symbols);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Optional<FrontendDefinitionLocation> prepareRename(
|
||||
final FrontendDocumentRequest request,
|
||||
final FrontendEditorialContext editorialContext,
|
||||
final int offset) {
|
||||
final PbsEditorialRename planned = editorialRename(request, editorialContext, offset, null);
|
||||
if (planned == null || !planned.allowed()) {
|
||||
return Optional.empty();
|
||||
}
|
||||
if (!(editorialContext.sourceFiles() instanceof FileTableReader fileTable)) {
|
||||
return Optional.empty();
|
||||
}
|
||||
if (physicalIdentity(planned, fileTable).isEmpty()) {
|
||||
return Optional.empty();
|
||||
}
|
||||
return toFrontendLocation(planned.placeholder(), fileTable);
|
||||
}
|
||||
|
||||
@Override
|
||||
public FrontendRenameResult rename(
|
||||
final FrontendDocumentRequest request,
|
||||
final FrontendEditorialContext editorialContext,
|
||||
final int offset,
|
||||
final String newName) {
|
||||
if (newName == null) {
|
||||
return FrontendRenameResult.refused("invalid identifier");
|
||||
}
|
||||
final PbsEditorialRename planned = editorialRename(request, editorialContext, offset, newName);
|
||||
if (planned == null) {
|
||||
return FrontendRenameResult.refused("not renameable");
|
||||
}
|
||||
if (!planned.allowed()) {
|
||||
return FrontendRenameResult.refused(planned.refusal());
|
||||
}
|
||||
if (!(editorialContext.sourceFiles() instanceof FileTableReader fileTable)) {
|
||||
return FrontendRenameResult.refused("not renameable");
|
||||
}
|
||||
if (physicalIdentity(planned, fileTable).isEmpty()) {
|
||||
return FrontendRenameResult.refused("not renameable");
|
||||
}
|
||||
final LinkedHashMap<String, FrontendRenameEdit> edits = new LinkedHashMap<>();
|
||||
for (final PbsEditorialLocation site : planned.sites()) {
|
||||
toFrontendLocation(site, fileTable).ifPresent(location ->
|
||||
edits.putIfAbsent(
|
||||
frontendLocationKey(location),
|
||||
new FrontendRenameEdit(
|
||||
location.path(),
|
||||
location.startOffset(),
|
||||
location.endOffset(),
|
||||
newName)));
|
||||
}
|
||||
if (edits.isEmpty()) {
|
||||
return FrontendRenameResult.refused("not renameable");
|
||||
}
|
||||
return FrontendRenameResult.applied(List.copyOf(edits.values()));
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean codeActionsSupported() {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<FrontendCodeAction> codeActions(
|
||||
final FrontendDocumentRequest request,
|
||||
final FrontendEditorialContext editorialContext) {
|
||||
if (request == null
|
||||
|| editorialContext == null
|
||||
|| !(editorialContext.syntaxTree() instanceof PbsAst.File ast)
|
||||
|| !(editorialContext.sourceFiles() instanceof FileTableReader fileTable)) {
|
||||
return List.of();
|
||||
}
|
||||
final FileId fileId = ast.span() == null ? null : ast.span().getFileId();
|
||||
final Path path = pathForRegularSource(fileId, fileTable);
|
||||
if (path == null || !path.equals(request.documentPath().toAbsolutePath().normalize())) {
|
||||
return List.of();
|
||||
}
|
||||
final boolean interfaceModule = editorialContext.projectSurface() instanceof PbsSemanticReadSurface surface
|
||||
&& surface.sourceKindByFile() != null
|
||||
&& surface.sourceKindByFile().get(fileId) == SourceKind.SDK_INTERFACE;
|
||||
final ArrayList<FrontendCodeAction> actions = new ArrayList<>();
|
||||
for (final PbsQuickFix repair : PbsQuickFixCollector.collect(ast, interfaceModule)) {
|
||||
actions.add(new FrontendCodeAction(
|
||||
repair.title(),
|
||||
repair.diagnosticCode(),
|
||||
path,
|
||||
repair.startOffset(),
|
||||
repair.endOffset(),
|
||||
repair.newText()));
|
||||
}
|
||||
return List.copyOf(actions);
|
||||
}
|
||||
|
||||
private PbsEditorialRename editorialRename(
|
||||
final FrontendDocumentRequest request,
|
||||
final FrontendEditorialContext editorialContext,
|
||||
final int offset,
|
||||
final String newName) {
|
||||
if (request == null
|
||||
|| editorialContext == null
|
||||
|| !(editorialContext.syntaxTree() instanceof PbsAst.File ast)
|
||||
|| !(editorialContext.supplementalDeclarations() instanceof ReadOnlyList<?> supplementalTopDecls)
|
||||
|| !(editorialContext.semanticContext() instanceof FESurfaceContext feSurfaceContext)
|
||||
|| !(editorialContext.sourceFiles() instanceof FileTableReader fileTable)) {
|
||||
return null;
|
||||
}
|
||||
@SuppressWarnings("unchecked")
|
||||
final ReadOnlyList<PbsAst.TopDecl> typedSupplementalTopDecls =
|
||||
(ReadOnlyList<PbsAst.TopDecl>) supplementalTopDecls;
|
||||
final EditorialDocument cursorDocument = new EditorialDocument(
|
||||
request.documentText(),
|
||||
ast,
|
||||
typedSupplementalTopDecls,
|
||||
feSurfaceContext);
|
||||
return editorialSupportService.rename(
|
||||
cursorDocument,
|
||||
offset,
|
||||
newName,
|
||||
projectDocuments(request, editorialContext, cursorDocument, fileTable));
|
||||
}
|
||||
|
||||
private List<FrontendDefinitionLocation> physicalIdentity(
|
||||
final PbsEditorialRename planned,
|
||||
final FileTableReader fileTable) {
|
||||
final ArrayList<FrontendDefinitionLocation> locations = new ArrayList<>();
|
||||
for (final PbsEditorialLocation location : planned.identity()) {
|
||||
toFrontendLocation(location, fileTable).ifPresent(locations::add);
|
||||
}
|
||||
return List.copyOf(locations);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<FrontendSemanticToken> semanticTokens(final FrontendDocumentRequest request) {
|
||||
return semanticTokens(request == null ? "" : request.documentText());
|
||||
@@ -213,4 +521,142 @@ public final class PBSFrontendLanguageService implements FrontendLanguageService
|
||||
private FrontendSymbolKind toFrontendSymbolKind(final PbsEditorialSymbolKind kind) {
|
||||
return FrontendSymbolKind.valueOf(kind.name());
|
||||
}
|
||||
|
||||
private Optional<FrontendWorkspaceSymbol> toFrontendWorkspaceSymbol(
|
||||
final PbsEditorialWorkspaceSymbol symbol,
|
||||
final Path path) {
|
||||
if (symbol == null || path == null || symbol.span() == null || symbol.span().isNone()) {
|
||||
return Optional.empty();
|
||||
}
|
||||
return Optional.of(new FrontendWorkspaceSymbol(
|
||||
symbol.name(),
|
||||
toFrontendSymbolKind(symbol.kind()),
|
||||
symbol.detail(),
|
||||
symbol.containerName(),
|
||||
path,
|
||||
toOffset(symbol.span().getStart()),
|
||||
toOffset(symbol.span().getEnd())));
|
||||
}
|
||||
|
||||
private FrontendDocumentSymbol toFrontendDocumentSymbol(final PbsEditorialDocumentSymbol symbol) {
|
||||
final int start = toOffset(symbol.span().getStart());
|
||||
final int end = toOffset(symbol.span().getEnd());
|
||||
return new FrontendDocumentSymbol(
|
||||
symbol.name(),
|
||||
toFrontendSymbolKind(symbol.kind()),
|
||||
symbol.detail(),
|
||||
start,
|
||||
end,
|
||||
start,
|
||||
end,
|
||||
symbol.children().stream().map(this::toFrontendDocumentSymbol).toList());
|
||||
}
|
||||
|
||||
private List<EditorialDocument> projectDocuments(
|
||||
final FrontendDocumentRequest request,
|
||||
final FrontendEditorialContext editorialContext,
|
||||
final EditorialDocument cursorDocument,
|
||||
final FileTableReader fileTable) {
|
||||
if (!(editorialContext.projectSurface() instanceof PbsSemanticReadSurface surface)
|
||||
|| surface.astByFile() == null
|
||||
|| surface.astByFile().isEmpty()) {
|
||||
return List.of(cursorDocument);
|
||||
}
|
||||
final ArrayList<EditorialDocument> documents = new ArrayList<>();
|
||||
for (final var entry : surface.astByFile().entrySet()) {
|
||||
if (!isRegularSource(entry.getKey(), fileTable)) {
|
||||
continue;
|
||||
}
|
||||
final PbsAst.File fileAst = entry.getValue();
|
||||
if (fileAst == null) {
|
||||
continue;
|
||||
}
|
||||
final ReadOnlyList<PbsAst.TopDecl> fileSupplementals = fileAst == cursorDocument.ast()
|
||||
? cursorDocument.supplementalTopDecls()
|
||||
: surface.supplementalTopDeclsByFile().getOrDefault(entry.getKey(), ReadOnlyList.empty());
|
||||
documents.add(new EditorialDocument(
|
||||
textForFile(entry.getKey(), fileTable, request),
|
||||
fileAst,
|
||||
fileSupplementals,
|
||||
cursorDocument.feSurfaceContext()));
|
||||
}
|
||||
if (documents.isEmpty()) {
|
||||
return List.of(cursorDocument);
|
||||
}
|
||||
return List.copyOf(documents);
|
||||
}
|
||||
|
||||
private Path pathForRegularSource(
|
||||
final FileId fileId,
|
||||
final FileTableReader fileTable) {
|
||||
if (!isRegularSource(fileId, fileTable)) {
|
||||
return null;
|
||||
}
|
||||
return fileTable.get(fileId).getCanonPath().toAbsolutePath().normalize();
|
||||
}
|
||||
|
||||
private boolean isRegularSource(
|
||||
final FileId fileId,
|
||||
final FileTableReader fileTable) {
|
||||
if (fileId == null || fileId.isNone() || fileTable == null) {
|
||||
return false;
|
||||
}
|
||||
final var sourceHandle = fileTable.get(fileId);
|
||||
if (sourceHandle == null || sourceHandle.getCanonPath() == null) {
|
||||
return false;
|
||||
}
|
||||
return Files.isRegularFile(sourceHandle.getCanonPath().toAbsolutePath().normalize());
|
||||
}
|
||||
|
||||
private String textForFile(
|
||||
final FileId fileId,
|
||||
final FileTableReader fileTable,
|
||||
final FrontendDocumentRequest request) {
|
||||
final var sourceHandle = fileTable.get(fileId);
|
||||
if (sourceHandle == null || sourceHandle.getCanonPath() == null) {
|
||||
return "";
|
||||
}
|
||||
final Path path = sourceHandle.getCanonPath().toAbsolutePath().normalize();
|
||||
if (request != null
|
||||
&& request.documentPath() != null
|
||||
&& path.equals(request.documentPath().toAbsolutePath().normalize())) {
|
||||
return request.documentText() == null ? "" : request.documentText();
|
||||
}
|
||||
return sourceHandle.readUtf8().orElse("");
|
||||
}
|
||||
|
||||
private static String frontendLocationKey(final FrontendDefinitionLocation location) {
|
||||
return location.path() + ":" + location.startOffset() + ":" + location.endOffset();
|
||||
}
|
||||
|
||||
private Optional<FrontendDefinitionLocation> toFrontendLocation(
|
||||
final PbsEditorialLocation location,
|
||||
final FileTableReader fileTable) {
|
||||
if (location == null || fileTable == null) {
|
||||
return Optional.empty();
|
||||
}
|
||||
final Span span = location.span();
|
||||
if (span == null || span.isNone() || span.getFileId() == null || span.getFileId().isNone()) {
|
||||
return Optional.empty();
|
||||
}
|
||||
final var sourceHandle = fileTable.get(span.getFileId());
|
||||
if (sourceHandle == null || sourceHandle.getCanonPath() == null) {
|
||||
return Optional.empty();
|
||||
}
|
||||
final Path path = sourceHandle.getCanonPath().toAbsolutePath().normalize();
|
||||
if (!Files.isRegularFile(path)) {
|
||||
return Optional.empty();
|
||||
}
|
||||
return Optional.of(new FrontendDefinitionLocation(
|
||||
path,
|
||||
toOffset(span.getStart()),
|
||||
toOffset(span.getEnd())));
|
||||
}
|
||||
|
||||
private static int toOffset(final long value) {
|
||||
if (value <= 0L) {
|
||||
return 0;
|
||||
}
|
||||
return (int) Math.min(Integer.MAX_VALUE, value);
|
||||
}
|
||||
}
|
||||
|
||||
+76
-47
@@ -8,6 +8,9 @@ import p.studio.compiler.models.IRFunction;
|
||||
import p.studio.compiler.models.IRGlobal;
|
||||
import p.studio.compiler.models.IRGlobalOrigin;
|
||||
import p.studio.compiler.models.IRGlobalVisibility;
|
||||
import p.studio.compiler.models.IRLifecycleCallableReference;
|
||||
import p.studio.compiler.models.IRLifecycleCallableRole;
|
||||
import p.studio.compiler.models.IRLifecycleFileDeclaration;
|
||||
import p.studio.compiler.models.IRReservedMetadata;
|
||||
import p.studio.compiler.models.IRSyntheticCallableKind;
|
||||
import p.studio.compiler.models.IRSyntheticFunction;
|
||||
@@ -215,6 +218,12 @@ public final class PbsFrontendCompiler {
|
||||
if (fileInitExecutable != null) {
|
||||
executableFunctions.add(fileInitExecutable);
|
||||
}
|
||||
final var lifecycleDeclaration = lowerLifecycleDeclaration(
|
||||
fileId,
|
||||
effectiveModuleId,
|
||||
lifecycleArtifacts,
|
||||
fileInitExecutable,
|
||||
executableFunctions);
|
||||
return new IRBackendFile(
|
||||
fileId,
|
||||
functions,
|
||||
@@ -224,7 +233,8 @@ public final class PbsFrontendCompiler {
|
||||
reservedMetadata,
|
||||
effectiveModulePool,
|
||||
ReadOnlyList.wrap(callableSignatures),
|
||||
executableLowering.intrinsicPool());
|
||||
executableLowering.intrinsicPool(),
|
||||
lifecycleDeclaration);
|
||||
}
|
||||
|
||||
public String callableShapeSurfaceOf(final PbsAst.FunctionDecl functionDecl) {
|
||||
@@ -306,33 +316,19 @@ public final class PbsFrontendCompiler {
|
||||
final var frameDecl = lifecycleArtifacts.frameDecl();
|
||||
final var firstGlobalDecl = lifecycleArtifacts.firstGlobalDecl();
|
||||
|
||||
final var fileInitAnchorSpan = initDecl != null ? initDecl.span() : firstGlobalDecl == null ? null : firstGlobalDecl.span();
|
||||
final var fileInitAnchorName = initDecl != null ? initDecl.name() : firstGlobalDecl == null ? "" : firstGlobalDecl.name();
|
||||
final var ordinaryFileInit = frameDecl == null ? initDecl : null;
|
||||
final var fileInitAnchorSpan = ordinaryFileInit != null
|
||||
? ordinaryFileInit.span()
|
||||
: firstGlobalDecl == null ? null : firstGlobalDecl.span();
|
||||
final var fileInitAnchorName = ordinaryFileInit != null
|
||||
? ordinaryFileInit.name()
|
||||
: firstGlobalDecl == null ? "" : firstGlobalDecl.name();
|
||||
if (fileInitAnchorSpan != null) {
|
||||
syntheticFunctions.add(new IRSyntheticFunction(
|
||||
moduleId,
|
||||
fileInitCallableName(fileId),
|
||||
IRSyntheticCallableKind.FILE_INIT_FRAGMENT,
|
||||
new IRSyntheticOrigin(fileId, fileInitAnchorName, fileInitAnchorSpan)));
|
||||
syntheticFunctions.add(new IRSyntheticFunction(
|
||||
moduleId,
|
||||
moduleInitCallableName(moduleId),
|
||||
IRSyntheticCallableKind.MODULE_INIT,
|
||||
new IRSyntheticOrigin(fileId, fileInitAnchorName, fileInitAnchorSpan)));
|
||||
}
|
||||
if (initDecl != null && frameDecl != null) {
|
||||
syntheticFunctions.add(new IRSyntheticFunction(
|
||||
moduleId,
|
||||
projectInitCallableName(moduleId),
|
||||
IRSyntheticCallableKind.PROJECT_INIT,
|
||||
new IRSyntheticOrigin(fileId, initDecl.name(), initDecl.span())));
|
||||
}
|
||||
if (frameDecl != null) {
|
||||
syntheticFunctions.add(new IRSyntheticFunction(
|
||||
moduleId,
|
||||
frameWrapperCallableName(moduleId),
|
||||
IRSyntheticCallableKind.PUBLISHED_FRAME_WRAPPER,
|
||||
new IRSyntheticOrigin(fileId, frameDecl.name(), frameDecl.span())));
|
||||
}
|
||||
return ReadOnlyList.wrap(syntheticFunctions);
|
||||
}
|
||||
@@ -343,8 +339,10 @@ public final class PbsFrontendCompiler {
|
||||
final PbsLifecycleArtifacts lifecycleArtifacts,
|
||||
final ArrayList<IRBackendExecutableFunction> executableFunctions,
|
||||
final ArrayList<CallableSignatureRef> callableSignatures) {
|
||||
if (lifecycleArtifacts.firstGlobalDecl() == null
|
||||
&& lifecycleArtifacts.initDecl() == null) {
|
||||
final var ordinaryFileInit = lifecycleArtifacts.frameDecl() == null
|
||||
? lifecycleArtifacts.initDecl()
|
||||
: null;
|
||||
if (lifecycleArtifacts.firstGlobalDecl() == null && ordinaryFileInit == null) {
|
||||
return null;
|
||||
}
|
||||
final var syntheticCallableName = fileInitCallableName(fileId);
|
||||
@@ -352,8 +350,8 @@ public final class PbsFrontendCompiler {
|
||||
callableSignatures.add(new CallableSignatureRef(moduleId, syntheticCallableName, 0, "() -> unit"));
|
||||
|
||||
final var instructions = new ArrayList<IRBackendExecutableFunction.Instruction>();
|
||||
final var moduleInitSource = lifecycleArtifacts.initDecl();
|
||||
if (moduleInitSource != null && moduleInitSource != lifecycleArtifacts.frameDecl()) {
|
||||
final var moduleInitSource = ordinaryFileInit;
|
||||
if (moduleInitSource != null) {
|
||||
final var initExecutable = resolveLifecycleExecutable(executableFunctions, moduleId, moduleInitSource.name());
|
||||
if (initExecutable != null) {
|
||||
instructions.add(new IRBackendExecutableFunction.Instruction(
|
||||
@@ -390,6 +388,58 @@ public final class PbsFrontendCompiler {
|
||||
span);
|
||||
}
|
||||
|
||||
private IRLifecycleFileDeclaration lowerLifecycleDeclaration(
|
||||
final FileId fileId,
|
||||
final ModuleId moduleId,
|
||||
final PbsLifecycleArtifacts lifecycleArtifacts,
|
||||
final IRBackendExecutableFunction fileInitExecutable,
|
||||
final ArrayList<IRBackendExecutableFunction> executableFunctions) {
|
||||
final var fileInitReference = fileInitExecutable == null
|
||||
? null
|
||||
: new IRLifecycleCallableReference(
|
||||
moduleId,
|
||||
fileId,
|
||||
fileInitExecutable.callableId(),
|
||||
IRLifecycleCallableRole.FILE_INIT_FRAGMENT,
|
||||
fileInitExecutable.span());
|
||||
|
||||
final var projectInitSource = lifecycleArtifacts.frameDecl() == null
|
||||
? null
|
||||
: lifecycleArtifacts.initDecl();
|
||||
final var projectInitExecutable = projectInitSource == null
|
||||
? null
|
||||
: resolveLifecycleExecutable(executableFunctions, moduleId, projectInitSource.name());
|
||||
final var projectInitReference = projectInitExecutable == null
|
||||
? null
|
||||
: new IRLifecycleCallableReference(
|
||||
moduleId,
|
||||
fileId,
|
||||
projectInitExecutable.callableId(),
|
||||
IRLifecycleCallableRole.PROJECT_INIT,
|
||||
projectInitSource.span());
|
||||
|
||||
final var frameSource = lifecycleArtifacts.frameDecl();
|
||||
final var frameExecutable = frameSource == null
|
||||
? null
|
||||
: resolveLifecycleExecutable(executableFunctions, moduleId, frameSource.name());
|
||||
final var frameReference = frameExecutable == null
|
||||
? null
|
||||
: new IRLifecycleCallableReference(
|
||||
moduleId,
|
||||
fileId,
|
||||
frameExecutable.callableId(),
|
||||
IRLifecycleCallableRole.FRAME_ROOT,
|
||||
frameSource.span());
|
||||
|
||||
final var declaration = new IRLifecycleFileDeclaration(
|
||||
moduleId,
|
||||
fileId,
|
||||
fileInitReference,
|
||||
projectInitReference,
|
||||
frameReference);
|
||||
return declaration.isEmpty() ? null : declaration;
|
||||
}
|
||||
|
||||
private IRBackendExecutableFunction resolveLifecycleExecutable(
|
||||
final ArrayList<IRBackendExecutableFunction> executableFunctions,
|
||||
final ModuleId moduleId,
|
||||
@@ -443,27 +493,6 @@ public final class PbsFrontendCompiler {
|
||||
return "__pbs.file_init$f" + fileId.getId();
|
||||
}
|
||||
|
||||
public static String moduleInitCallableName(final ModuleId moduleId) {
|
||||
return "__pbs.module_init$m" + normalizedModuleIndex(moduleId);
|
||||
}
|
||||
|
||||
public static String projectInitCallableName(final ModuleId moduleId) {
|
||||
return "__pbs.project_init$m" + normalizedModuleIndex(moduleId);
|
||||
}
|
||||
|
||||
public static String frameWrapperCallableName(final ModuleId moduleId) {
|
||||
return "__pbs.frame_wrapper$m" + normalizedModuleIndex(moduleId);
|
||||
}
|
||||
|
||||
public static String bootGuardGlobalName(final ModuleId moduleId) {
|
||||
return "__pbs.boot_guard$m" + normalizedModuleIndex(moduleId);
|
||||
}
|
||||
|
||||
private static int normalizedModuleIndex(final ModuleId moduleId) {
|
||||
final var normalized = moduleId == null ? ModuleId.none() : moduleId;
|
||||
return normalized.isNone() ? -1 : normalized.getIndex();
|
||||
}
|
||||
|
||||
private int safeToInt(final long value) {
|
||||
if (value > Integer.MAX_VALUE) {
|
||||
return Integer.MAX_VALUE;
|
||||
|
||||
+26
@@ -46,6 +46,32 @@ public final class PbsLexer {
|
||||
return lexer.lexInternal();
|
||||
}
|
||||
|
||||
public static boolean isKeyword(final String text) {
|
||||
return text != null && KEYWORDS.containsKey(text);
|
||||
}
|
||||
|
||||
public static boolean isIdentifierLexeme(final String text) {
|
||||
if (text == null || text.isEmpty() || isKeyword(text)) {
|
||||
return false;
|
||||
}
|
||||
int index = 0;
|
||||
final int first = text.codePointAt(0);
|
||||
if (!(first == '_' || Character.isAlphabetic(first))) {
|
||||
return false;
|
||||
}
|
||||
index += Character.charCount(first);
|
||||
while (index < text.length()) {
|
||||
final int codePoint = text.codePointAt(index);
|
||||
if (!(codePoint == '_'
|
||||
|| Character.isAlphabetic(codePoint)
|
||||
|| Character.isDigit(codePoint))) {
|
||||
return false;
|
||||
}
|
||||
index += Character.charCount(codePoint);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
private ReadOnlyList<PbsToken> lexInternal() {
|
||||
while (!isAtEnd() || state != LexerState.DEFAULT) {
|
||||
switch (state) {
|
||||
|
||||
+321
@@ -0,0 +1,321 @@
|
||||
package p.studio.compiler.pbs.semantics;
|
||||
|
||||
import p.studio.compiler.pbs.ast.PbsAst;
|
||||
import p.studio.compiler.source.Span;
|
||||
import p.studio.utilities.structures.ReadOnlyList;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
|
||||
final class PbsAstDocumentSymbols {
|
||||
private PbsAstDocumentSymbols() {
|
||||
}
|
||||
|
||||
static List<PbsEditorialDocumentSymbol> list(final PbsAst.File ast) {
|
||||
if (ast == null || ast.topDecls() == null) {
|
||||
return List.of();
|
||||
}
|
||||
final ArrayList<PbsEditorialDocumentSymbol> symbols = new ArrayList<>();
|
||||
for (final PbsAst.TopDecl topDecl : ast.topDecls()) {
|
||||
symbolFor(topDecl).ifPresent(symbols::add);
|
||||
}
|
||||
return List.copyOf(symbols);
|
||||
}
|
||||
|
||||
private static Optional<PbsEditorialDocumentSymbol> symbolFor(final PbsAst.TopDecl topDecl) {
|
||||
if (topDecl instanceof PbsAst.FunctionDecl functionDecl) {
|
||||
return callableSymbol(
|
||||
functionDecl.name(),
|
||||
PbsEditorialSymbolKind.FUNCTION,
|
||||
functionDecl.parameters(),
|
||||
functionDecl.returnKind(),
|
||||
functionDecl.returnType(),
|
||||
functionDecl.resultErrorType(),
|
||||
functionDecl.span());
|
||||
}
|
||||
if (topDecl instanceof PbsAst.StructDecl structDecl) {
|
||||
return structSymbol(structDecl);
|
||||
}
|
||||
if (topDecl instanceof PbsAst.ServiceDecl serviceDecl) {
|
||||
return namedSymbol(
|
||||
serviceDecl.name(),
|
||||
PbsEditorialSymbolKind.SERVICE,
|
||||
"",
|
||||
serviceDecl.span(),
|
||||
methodSymbols(serviceDecl.methods()));
|
||||
}
|
||||
if (topDecl instanceof PbsAst.ContractDecl contractDecl) {
|
||||
return namedSymbol(
|
||||
contractDecl.name(),
|
||||
PbsEditorialSymbolKind.CONTRACT,
|
||||
"",
|
||||
contractDecl.span(),
|
||||
signatureSymbols(contractDecl.signatures()));
|
||||
}
|
||||
if (topDecl instanceof PbsAst.HostDecl hostDecl) {
|
||||
return namedSymbol(
|
||||
hostDecl.name(),
|
||||
PbsEditorialSymbolKind.HOST,
|
||||
"",
|
||||
hostDecl.span(),
|
||||
signatureSymbols(hostDecl.signatures()));
|
||||
}
|
||||
if (topDecl instanceof PbsAst.BuiltinTypeDecl builtinTypeDecl) {
|
||||
return builtinTypeSymbol(builtinTypeDecl);
|
||||
}
|
||||
if (topDecl instanceof PbsAst.EnumDecl enumDecl) {
|
||||
return enumSymbol(enumDecl);
|
||||
}
|
||||
if (topDecl instanceof PbsAst.ErrorDecl errorDecl) {
|
||||
return errorSymbol(errorDecl);
|
||||
}
|
||||
if (topDecl instanceof PbsAst.CallbackDecl callbackDecl) {
|
||||
return callableSymbol(
|
||||
callbackDecl.name(),
|
||||
PbsEditorialSymbolKind.CALLBACK,
|
||||
callbackDecl.parameters(),
|
||||
callbackDecl.returnKind(),
|
||||
callbackDecl.returnType(),
|
||||
callbackDecl.resultErrorType(),
|
||||
callbackDecl.span());
|
||||
}
|
||||
if (topDecl instanceof PbsAst.GlobalDecl globalDecl) {
|
||||
return namedSymbol(
|
||||
globalDecl.name(),
|
||||
PbsEditorialSymbolKind.GLOBAL,
|
||||
formatTypeRef(globalDecl.explicitType()),
|
||||
globalDecl.span(),
|
||||
List.of());
|
||||
}
|
||||
if (topDecl instanceof PbsAst.ConstDecl constDecl) {
|
||||
return namedSymbol(
|
||||
constDecl.name(),
|
||||
PbsEditorialSymbolKind.CONST,
|
||||
formatTypeRef(constDecl.explicitType()),
|
||||
constDecl.span(),
|
||||
List.of());
|
||||
}
|
||||
if (topDecl instanceof PbsAst.ImplementsDecl implementsDecl) {
|
||||
return namedSymbol(
|
||||
implementsDecl.contractName(),
|
||||
PbsEditorialSymbolKind.CONTRACT,
|
||||
implementsDecl.ownerName() == null ? "" : implementsDecl.ownerName(),
|
||||
implementsDecl.span(),
|
||||
methodSymbols(implementsDecl.methods()));
|
||||
}
|
||||
return Optional.empty();
|
||||
}
|
||||
|
||||
private static Optional<PbsEditorialDocumentSymbol> structSymbol(final PbsAst.StructDecl structDecl) {
|
||||
final ArrayList<PbsEditorialDocumentSymbol> children = new ArrayList<>();
|
||||
for (final PbsAst.StructField field : structDecl.fields()) {
|
||||
namedSymbol(
|
||||
field.name(),
|
||||
PbsEditorialSymbolKind.FIELD,
|
||||
formatTypeRef(field.typeRef()),
|
||||
field.span(),
|
||||
List.of()).ifPresent(children::add);
|
||||
}
|
||||
for (final PbsAst.CtorDecl ctorDecl : structDecl.ctors()) {
|
||||
namedSymbol(
|
||||
ctorDecl.name(),
|
||||
PbsEditorialSymbolKind.CONSTRUCTOR,
|
||||
ctorDetail(ctorDecl.parameters()),
|
||||
ctorDecl.span(),
|
||||
List.of()).ifPresent(children::add);
|
||||
}
|
||||
children.addAll(methodSymbols(structDecl.methods()));
|
||||
return namedSymbol(
|
||||
structDecl.name(),
|
||||
PbsEditorialSymbolKind.STRUCT,
|
||||
"",
|
||||
structDecl.span(),
|
||||
children);
|
||||
}
|
||||
|
||||
private static Optional<PbsEditorialDocumentSymbol> builtinTypeSymbol(final PbsAst.BuiltinTypeDecl builtinTypeDecl) {
|
||||
final ArrayList<PbsEditorialDocumentSymbol> children = new ArrayList<>();
|
||||
for (final PbsAst.BuiltinFieldDecl field : builtinTypeDecl.fields()) {
|
||||
namedSymbol(
|
||||
field.name(),
|
||||
PbsEditorialSymbolKind.FIELD,
|
||||
formatTypeRef(field.typeRef()),
|
||||
field.span(),
|
||||
List.of()).ifPresent(children::add);
|
||||
}
|
||||
children.addAll(signatureSymbols(builtinTypeDecl.signatures()));
|
||||
return namedSymbol(
|
||||
builtinTypeDecl.name(),
|
||||
PbsEditorialSymbolKind.BUILTIN_TYPE,
|
||||
"",
|
||||
builtinTypeDecl.span(),
|
||||
children);
|
||||
}
|
||||
|
||||
private static Optional<PbsEditorialDocumentSymbol> enumSymbol(final PbsAst.EnumDecl enumDecl) {
|
||||
final ArrayList<PbsEditorialDocumentSymbol> children = new ArrayList<>();
|
||||
for (final PbsAst.EnumCase enumCase : enumDecl.cases()) {
|
||||
final String detail = enumCase.explicitValue() == null ? "" : String.valueOf(enumCase.explicitValue());
|
||||
namedSymbol(
|
||||
enumCase.name(),
|
||||
PbsEditorialSymbolKind.ENUM,
|
||||
detail,
|
||||
enumCase.span(),
|
||||
List.of()).ifPresent(children::add);
|
||||
}
|
||||
return namedSymbol(
|
||||
enumDecl.name(),
|
||||
PbsEditorialSymbolKind.ENUM,
|
||||
"",
|
||||
enumDecl.span(),
|
||||
children);
|
||||
}
|
||||
|
||||
private static Optional<PbsEditorialDocumentSymbol> errorSymbol(final PbsAst.ErrorDecl errorDecl) {
|
||||
final ArrayList<PbsEditorialDocumentSymbol> children = new ArrayList<>();
|
||||
for (final String label : errorDecl.cases()) {
|
||||
namedSymbol(
|
||||
label,
|
||||
PbsEditorialSymbolKind.ERROR,
|
||||
"",
|
||||
errorDecl.span(),
|
||||
List.of()).ifPresent(children::add);
|
||||
}
|
||||
return namedSymbol(
|
||||
errorDecl.name(),
|
||||
PbsEditorialSymbolKind.ERROR,
|
||||
"",
|
||||
errorDecl.span(),
|
||||
children);
|
||||
}
|
||||
|
||||
private static List<PbsEditorialDocumentSymbol> methodSymbols(final ReadOnlyList<PbsAst.FunctionDecl> methods) {
|
||||
if (methods == null || methods.isEmpty()) {
|
||||
return List.of();
|
||||
}
|
||||
final ArrayList<PbsEditorialDocumentSymbol> symbols = new ArrayList<>();
|
||||
for (final PbsAst.FunctionDecl method : methods) {
|
||||
callableSymbol(
|
||||
method.name(),
|
||||
PbsEditorialSymbolKind.METHOD,
|
||||
method.parameters(),
|
||||
method.returnKind(),
|
||||
method.returnType(),
|
||||
method.resultErrorType(),
|
||||
method.span()).ifPresent(symbols::add);
|
||||
}
|
||||
return symbols;
|
||||
}
|
||||
|
||||
private static List<PbsEditorialDocumentSymbol> signatureSymbols(
|
||||
final ReadOnlyList<PbsAst.FunctionSignature> signatures) {
|
||||
if (signatures == null || signatures.isEmpty()) {
|
||||
return List.of();
|
||||
}
|
||||
final ArrayList<PbsEditorialDocumentSymbol> symbols = new ArrayList<>();
|
||||
for (final PbsAst.FunctionSignature signature : signatures) {
|
||||
callableSymbol(
|
||||
signature.name(),
|
||||
PbsEditorialSymbolKind.METHOD,
|
||||
signature.parameters(),
|
||||
signature.returnKind(),
|
||||
signature.returnType(),
|
||||
signature.resultErrorType(),
|
||||
signature.span()).ifPresent(symbols::add);
|
||||
}
|
||||
return symbols;
|
||||
}
|
||||
|
||||
private static Optional<PbsEditorialDocumentSymbol> callableSymbol(
|
||||
final String name,
|
||||
final PbsEditorialSymbolKind kind,
|
||||
final ReadOnlyList<PbsAst.Parameter> parameters,
|
||||
final PbsAst.ReturnKind returnKind,
|
||||
final PbsAst.TypeRef returnType,
|
||||
final PbsAst.TypeRef resultErrorType,
|
||||
final Span span) {
|
||||
return namedSymbol(
|
||||
name,
|
||||
kind,
|
||||
callableDetail(parameters, returnKind, returnType, resultErrorType),
|
||||
span,
|
||||
List.of());
|
||||
}
|
||||
|
||||
private static Optional<PbsEditorialDocumentSymbol> namedSymbol(
|
||||
final String name,
|
||||
final PbsEditorialSymbolKind kind,
|
||||
final String detail,
|
||||
final Span span,
|
||||
final List<PbsEditorialDocumentSymbol> children) {
|
||||
if (name == null || name.isBlank() || span == null || span.isNone()) {
|
||||
return Optional.empty();
|
||||
}
|
||||
return Optional.of(new PbsEditorialDocumentSymbol(name, kind, detail, span, children));
|
||||
}
|
||||
|
||||
private static String callableDetail(
|
||||
final ReadOnlyList<PbsAst.Parameter> parameters,
|
||||
final PbsAst.ReturnKind returnKind,
|
||||
final PbsAst.TypeRef returnType,
|
||||
final PbsAst.TypeRef resultErrorType) {
|
||||
return "(" + formatParameters(parameters) + ") -> " + formatReturn(returnKind, returnType, resultErrorType);
|
||||
}
|
||||
|
||||
private static String ctorDetail(final ReadOnlyList<PbsAst.Parameter> parameters) {
|
||||
return "(" + formatParameters(parameters) + ")";
|
||||
}
|
||||
|
||||
private static String formatParameters(final ReadOnlyList<PbsAst.Parameter> parameters) {
|
||||
if (parameters == null || parameters.isEmpty()) {
|
||||
return "";
|
||||
}
|
||||
final ArrayList<String> parts = new ArrayList<>(parameters.size());
|
||||
for (final PbsAst.Parameter parameter : parameters) {
|
||||
parts.add(parameter.name() + ": " + formatTypeRef(parameter.typeRef()));
|
||||
}
|
||||
return String.join(", ", parts);
|
||||
}
|
||||
|
||||
private static String formatReturn(
|
||||
final PbsAst.ReturnKind returnKind,
|
||||
final PbsAst.TypeRef returnType,
|
||||
final PbsAst.TypeRef resultErrorType) {
|
||||
if (returnKind == null) {
|
||||
return formatTypeRef(returnType);
|
||||
}
|
||||
return switch (returnKind) {
|
||||
case INFERRED_UNIT, EXPLICIT_UNIT -> "void";
|
||||
case PLAIN -> formatTypeRef(returnType);
|
||||
case RESULT -> {
|
||||
final String errorType = formatTypeRef(resultErrorType);
|
||||
if (returnType == null || returnType.kind() == PbsAst.TypeRefKind.UNIT) {
|
||||
yield "result<" + errorType + ">";
|
||||
}
|
||||
yield "result<" + errorType + "> " + formatTypeRef(returnType);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
private static String formatTypeRef(final PbsAst.TypeRef typeRef) {
|
||||
if (typeRef == null) {
|
||||
return "void";
|
||||
}
|
||||
return switch (typeRef.kind()) {
|
||||
case UNIT -> typeRef.name() == null || typeRef.name().isBlank() ? "void" : typeRef.name();
|
||||
case SELF -> "Self";
|
||||
case SIMPLE -> typeRef.name() == null ? "void" : typeRef.name();
|
||||
case OPTIONAL -> "optional " + formatTypeRef(typeRef.inner());
|
||||
case GROUP -> "(" + formatTypeRef(typeRef.inner()) + ")";
|
||||
case NAMED_TUPLE -> {
|
||||
final ArrayList<String> fields = new ArrayList<>(typeRef.fields().size());
|
||||
for (final var field : typeRef.fields()) {
|
||||
fields.add(field.label() + ": " + formatTypeRef(field.typeRef()));
|
||||
}
|
||||
yield "(" + String.join(", ", fields) + ")";
|
||||
}
|
||||
case ERROR -> "unknown";
|
||||
};
|
||||
}
|
||||
}
|
||||
+55
@@ -0,0 +1,55 @@
|
||||
package p.studio.compiler.pbs.semantics;
|
||||
|
||||
import p.studio.compiler.pbs.ast.PbsAst;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
|
||||
final class PbsAstWorkspaceSymbols {
|
||||
private PbsAstWorkspaceSymbols() {
|
||||
}
|
||||
|
||||
static List<PbsEditorialWorkspaceSymbol> list(
|
||||
final PbsAst.File ast,
|
||||
final String query) {
|
||||
if (ast == null) {
|
||||
return List.of();
|
||||
}
|
||||
final ArrayList<PbsEditorialWorkspaceSymbol> symbols = new ArrayList<>();
|
||||
for (final PbsEditorialDocumentSymbol topDecl : PbsAstDocumentSymbols.list(ast)) {
|
||||
flatten(topDecl, "", query, symbols);
|
||||
}
|
||||
return List.copyOf(symbols);
|
||||
}
|
||||
|
||||
private static void flatten(
|
||||
final PbsEditorialDocumentSymbol symbol,
|
||||
final String containerName,
|
||||
final String query,
|
||||
final ArrayList<PbsEditorialWorkspaceSymbol> symbols) {
|
||||
if (matches(symbol.name(), query)) {
|
||||
symbols.add(new PbsEditorialWorkspaceSymbol(
|
||||
symbol.name(),
|
||||
symbol.kind(),
|
||||
symbol.detail(),
|
||||
containerName,
|
||||
symbol.span()));
|
||||
}
|
||||
for (final PbsEditorialDocumentSymbol child : symbol.children()) {
|
||||
flatten(child, symbol.name(), query, symbols);
|
||||
}
|
||||
}
|
||||
|
||||
static boolean matches(
|
||||
final String name,
|
||||
final String query) {
|
||||
if (name == null || name.isBlank()) {
|
||||
return false;
|
||||
}
|
||||
if (query == null || query.isBlank()) {
|
||||
return true;
|
||||
}
|
||||
return name.toLowerCase(Locale.ROOT).contains(query.trim().toLowerCase(Locale.ROOT));
|
||||
}
|
||||
}
|
||||
+22
@@ -0,0 +1,22 @@
|
||||
package p.studio.compiler.pbs.semantics;
|
||||
|
||||
import p.studio.compiler.source.Span;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
|
||||
public record PbsEditorialDocumentSymbol(
|
||||
String name,
|
||||
PbsEditorialSymbolKind kind,
|
||||
String detail,
|
||||
Span span,
|
||||
List<PbsEditorialDocumentSymbol> children) {
|
||||
|
||||
public PbsEditorialDocumentSymbol {
|
||||
name = Objects.requireNonNull(name, "name").trim();
|
||||
kind = Objects.requireNonNull(kind, "kind");
|
||||
detail = detail == null ? "" : detail;
|
||||
span = Objects.requireNonNull(span, "span");
|
||||
children = children == null ? List.of() : List.copyOf(children);
|
||||
}
|
||||
}
|
||||
+11
@@ -0,0 +1,11 @@
|
||||
package p.studio.compiler.pbs.semantics;
|
||||
|
||||
import p.studio.compiler.source.Span;
|
||||
|
||||
import java.util.Objects;
|
||||
|
||||
public record PbsEditorialLocation(Span span) {
|
||||
public PbsEditorialLocation {
|
||||
Objects.requireNonNull(span, "span");
|
||||
}
|
||||
}
|
||||
+40
@@ -0,0 +1,40 @@
|
||||
package p.studio.compiler.pbs.semantics;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
|
||||
public record PbsEditorialRename(
|
||||
String refusal,
|
||||
PbsEditorialLocation placeholder,
|
||||
List<PbsEditorialLocation> identity,
|
||||
List<PbsEditorialLocation> sites) {
|
||||
|
||||
public PbsEditorialRename {
|
||||
refusal = refusal == null ? "" : refusal;
|
||||
identity = identity == null ? List.of() : List.copyOf(identity);
|
||||
sites = sites == null ? List.of() : List.copyOf(sites);
|
||||
}
|
||||
|
||||
public static PbsEditorialRename refused(final String reason) {
|
||||
return new PbsEditorialRename(
|
||||
reason == null || reason.isBlank() ? "not renameable" : reason,
|
||||
null,
|
||||
List.of(),
|
||||
List.of());
|
||||
}
|
||||
|
||||
public static PbsEditorialRename applied(
|
||||
final PbsEditorialLocation placeholder,
|
||||
final List<PbsEditorialLocation> identity,
|
||||
final List<PbsEditorialLocation> sites) {
|
||||
return new PbsEditorialRename(
|
||||
"",
|
||||
Objects.requireNonNull(placeholder, "placeholder"),
|
||||
identity,
|
||||
sites);
|
||||
}
|
||||
|
||||
public boolean allowed() {
|
||||
return refusal.isBlank() && placeholder != null && !identity.isEmpty() && !sites.isEmpty();
|
||||
}
|
||||
}
|
||||
+835
@@ -74,6 +74,157 @@ public final class PbsEditorialSupportService {
|
||||
return context.resolveSymbolHover(token.lexeme(), tokenIndex, scopeState);
|
||||
}
|
||||
|
||||
public List<PbsEditorialDocumentSymbol> documentSymbols(final PbsAst.File ast) {
|
||||
return PbsAstDocumentSymbols.list(ast);
|
||||
}
|
||||
|
||||
public List<PbsEditorialWorkspaceSymbol> workspaceSymbols(
|
||||
final PbsAst.File ast,
|
||||
final String query) {
|
||||
return PbsAstWorkspaceSymbols.list(ast, query);
|
||||
}
|
||||
|
||||
public List<PbsEditorialLocation> definition(
|
||||
final String sourceText,
|
||||
final PbsAst.File ast,
|
||||
final ReadOnlyList<PbsAst.TopDecl> supplementalTopDecls,
|
||||
final int offset) {
|
||||
return definition(sourceText, ast, supplementalTopDecls, FESurfaceContext.empty(), offset);
|
||||
}
|
||||
|
||||
public List<PbsEditorialLocation> definition(
|
||||
final String sourceText,
|
||||
final PbsAst.File ast,
|
||||
final ReadOnlyList<PbsAst.TopDecl> supplementalTopDecls,
|
||||
final FESurfaceContext feSurfaceContext,
|
||||
final int offset) {
|
||||
return buildContext(sourceText, ast, supplementalTopDecls, feSurfaceContext).definitionAt(offset);
|
||||
}
|
||||
|
||||
public List<PbsEditorialLocation> references(
|
||||
final String sourceText,
|
||||
final PbsAst.File ast,
|
||||
final ReadOnlyList<PbsAst.TopDecl> supplementalTopDecls,
|
||||
final int offset) {
|
||||
return references(sourceText, ast, supplementalTopDecls, FESurfaceContext.empty(), offset);
|
||||
}
|
||||
|
||||
public List<PbsEditorialLocation> references(
|
||||
final String sourceText,
|
||||
final PbsAst.File ast,
|
||||
final ReadOnlyList<PbsAst.TopDecl> supplementalTopDecls,
|
||||
final FESurfaceContext feSurfaceContext,
|
||||
final int offset) {
|
||||
final EditorialDocument cursor = new EditorialDocument(sourceText, ast, supplementalTopDecls, feSurfaceContext);
|
||||
return references(cursor, offset, List.of(cursor));
|
||||
}
|
||||
|
||||
public List<PbsEditorialLocation> references(
|
||||
final EditorialDocument cursorDocument,
|
||||
final int offset,
|
||||
final List<EditorialDocument> projectDocuments) {
|
||||
if (cursorDocument == null) {
|
||||
return List.of();
|
||||
}
|
||||
final List<PbsEditorialLocation> identity = definition(
|
||||
cursorDocument.sourceText(),
|
||||
cursorDocument.ast(),
|
||||
cursorDocument.supplementalTopDecls(),
|
||||
cursorDocument.feSurfaceContext(),
|
||||
offset);
|
||||
if (identity.isEmpty()) {
|
||||
return List.of();
|
||||
}
|
||||
final Set<String> identityKeys = locationKeys(identity);
|
||||
final LinkedHashMap<String, PbsEditorialLocation> usages = new LinkedHashMap<>();
|
||||
final List<EditorialDocument> documents = projectDocuments == null || projectDocuments.isEmpty()
|
||||
? List.of(cursorDocument)
|
||||
: projectDocuments;
|
||||
for (final EditorialDocument document : documents) {
|
||||
if (document == null || document.ast() == null) {
|
||||
continue;
|
||||
}
|
||||
for (final PbsEditorialLocation usage : buildContext(
|
||||
document.sourceText(),
|
||||
document.ast(),
|
||||
document.supplementalTopDecls(),
|
||||
document.feSurfaceContext()).usagesMatching(identityKeys)) {
|
||||
usages.putIfAbsent(locationKey(usage.span()), usage);
|
||||
}
|
||||
}
|
||||
return List.copyOf(usages.values());
|
||||
}
|
||||
|
||||
public Optional<PbsEditorialLocation> prepareRename(
|
||||
final String sourceText,
|
||||
final PbsAst.File ast,
|
||||
final ReadOnlyList<PbsAst.TopDecl> supplementalTopDecls,
|
||||
final int offset) {
|
||||
return prepareRename(sourceText, ast, supplementalTopDecls, FESurfaceContext.empty(), offset);
|
||||
}
|
||||
|
||||
public Optional<PbsEditorialLocation> prepareRename(
|
||||
final String sourceText,
|
||||
final PbsAst.File ast,
|
||||
final ReadOnlyList<PbsAst.TopDecl> supplementalTopDecls,
|
||||
final FESurfaceContext feSurfaceContext,
|
||||
final int offset) {
|
||||
final EditorialDocument cursor = new EditorialDocument(sourceText, ast, supplementalTopDecls, feSurfaceContext);
|
||||
return prepareRename(cursor, offset, List.of(cursor));
|
||||
}
|
||||
|
||||
public Optional<PbsEditorialLocation> prepareRename(
|
||||
final EditorialDocument cursorDocument,
|
||||
final int offset,
|
||||
final List<EditorialDocument> projectDocuments) {
|
||||
final PbsEditorialRename planned = planRename(cursorDocument, offset, projectDocuments, null);
|
||||
if (!planned.allowed()) {
|
||||
return Optional.empty();
|
||||
}
|
||||
return Optional.of(planned.placeholder());
|
||||
}
|
||||
|
||||
public PbsEditorialRename rename(
|
||||
final String sourceText,
|
||||
final PbsAst.File ast,
|
||||
final ReadOnlyList<PbsAst.TopDecl> supplementalTopDecls,
|
||||
final int offset,
|
||||
final String newName) {
|
||||
return rename(sourceText, ast, supplementalTopDecls, FESurfaceContext.empty(), offset, newName);
|
||||
}
|
||||
|
||||
public PbsEditorialRename rename(
|
||||
final String sourceText,
|
||||
final PbsAst.File ast,
|
||||
final ReadOnlyList<PbsAst.TopDecl> supplementalTopDecls,
|
||||
final FESurfaceContext feSurfaceContext,
|
||||
final int offset,
|
||||
final String newName) {
|
||||
final EditorialDocument cursor = new EditorialDocument(sourceText, ast, supplementalTopDecls, feSurfaceContext);
|
||||
return rename(cursor, offset, newName, List.of(cursor));
|
||||
}
|
||||
|
||||
public PbsEditorialRename rename(
|
||||
final EditorialDocument cursorDocument,
|
||||
final int offset,
|
||||
final String newName,
|
||||
final List<EditorialDocument> projectDocuments) {
|
||||
return planRename(cursorDocument, offset, projectDocuments, newName);
|
||||
}
|
||||
|
||||
public record EditorialDocument(
|
||||
String sourceText,
|
||||
PbsAst.File ast,
|
||||
ReadOnlyList<PbsAst.TopDecl> supplementalTopDecls,
|
||||
FESurfaceContext feSurfaceContext) {
|
||||
public EditorialDocument {
|
||||
sourceText = sourceText == null ? "" : sourceText;
|
||||
Objects.requireNonNull(ast, "ast");
|
||||
supplementalTopDecls = supplementalTopDecls == null ? ReadOnlyList.empty() : supplementalTopDecls;
|
||||
feSurfaceContext = feSurfaceContext == null ? FESurfaceContext.empty() : feSurfaceContext;
|
||||
}
|
||||
}
|
||||
|
||||
public Optional<PbsEditorialSignatureHelp> signatureHelp(
|
||||
final String sourceText,
|
||||
final PbsAst.File ast,
|
||||
@@ -108,6 +259,76 @@ public final class PbsEditorialSupportService {
|
||||
return Optional.of(new PbsEditorialSignatureHelp(signatures, 0, callSite.activeParameter()));
|
||||
}
|
||||
|
||||
private PbsEditorialRename planRename(
|
||||
final EditorialDocument cursorDocument,
|
||||
final int offset,
|
||||
final List<EditorialDocument> projectDocuments,
|
||||
final String newName) {
|
||||
if (cursorDocument == null || cursorDocument.ast() == null) {
|
||||
return PbsEditorialRename.refused("not renameable");
|
||||
}
|
||||
final DocumentContext cursor = buildContext(
|
||||
cursorDocument.sourceText(),
|
||||
cursorDocument.ast(),
|
||||
cursorDocument.supplementalTopDecls(),
|
||||
cursorDocument.feSurfaceContext());
|
||||
final RenameCursor renameCursor = cursor.renameCursorAt(offset);
|
||||
if (renameCursor.refusal() != null) {
|
||||
return PbsEditorialRename.refused(renameCursor.refusal());
|
||||
}
|
||||
if (newName != null) {
|
||||
if (!PbsLexer.isIdentifierLexeme(newName)) {
|
||||
return PbsEditorialRename.refused("invalid identifier");
|
||||
}
|
||||
if (cursor.collides(newName, renameCursor)) {
|
||||
return PbsEditorialRename.refused("name collision");
|
||||
}
|
||||
}
|
||||
final List<EditorialDocument> documents = projectDocuments == null || projectDocuments.isEmpty()
|
||||
? List.of(cursorDocument)
|
||||
: projectDocuments;
|
||||
final LinkedHashMap<String, PbsEditorialLocation> sites = new LinkedHashMap<>();
|
||||
sites.putIfAbsent(locationKey(renameCursor.placeholder().span()), renameCursor.placeholder());
|
||||
final Set<String> identityKeys = locationKeys(renameCursor.identity());
|
||||
for (final EditorialDocument document : documents) {
|
||||
if (document == null || document.ast() == null) {
|
||||
continue;
|
||||
}
|
||||
final DocumentContext documentContext = buildContext(
|
||||
document.sourceText(),
|
||||
document.ast(),
|
||||
document.supplementalTopDecls(),
|
||||
document.feSurfaceContext());
|
||||
for (final PbsEditorialLocation site : documentContext.renameSitesMatching(
|
||||
identityKeys,
|
||||
renameCursor.originalName())) {
|
||||
sites.putIfAbsent(locationKey(site.span()), site);
|
||||
}
|
||||
final FileId documentFileId = document.ast().span() == null
|
||||
? FileId.none()
|
||||
: document.ast().span().getFileId();
|
||||
for (final PbsEditorialLocation location : renameCursor.identity()) {
|
||||
if (location == null || location.span() == null || location.span().isNone()) {
|
||||
continue;
|
||||
}
|
||||
if (location.span().length() != renameCursor.originalName().length()) {
|
||||
continue;
|
||||
}
|
||||
if (location.span().getFileId() == null || !location.span().getFileId().equals(documentFileId)) {
|
||||
continue;
|
||||
}
|
||||
sites.putIfAbsent(locationKey(location.span()), location);
|
||||
}
|
||||
}
|
||||
if (sites.isEmpty()) {
|
||||
return PbsEditorialRename.refused("not renameable");
|
||||
}
|
||||
return PbsEditorialRename.applied(
|
||||
renameCursor.placeholder(),
|
||||
renameCursor.identity(),
|
||||
List.copyOf(sites.values()));
|
||||
}
|
||||
|
||||
private DocumentContext buildContext(
|
||||
final String sourceText,
|
||||
final PbsAst.File ast,
|
||||
@@ -116,6 +337,25 @@ public final class PbsEditorialSupportService {
|
||||
return new DocumentContext(sourceText, ast, supplementalTopDecls, feSurfaceContext);
|
||||
}
|
||||
|
||||
private static Set<String> locationKeys(final List<PbsEditorialLocation> locations) {
|
||||
final LinkedHashSet<String> keys = new LinkedHashSet<>();
|
||||
if (locations == null) {
|
||||
return Set.of();
|
||||
}
|
||||
for (final PbsEditorialLocation location : locations) {
|
||||
if (location != null && location.span() != null) {
|
||||
keys.add(locationKey(location.span()));
|
||||
}
|
||||
}
|
||||
return Set.copyOf(keys);
|
||||
}
|
||||
|
||||
private static String locationKey(final Span span) {
|
||||
final FileId fileId = span.getFileId();
|
||||
final int fileNumber = fileId == null ? -1 : fileId.getId();
|
||||
return fileNumber + ":" + span.getStart() + ":" + span.getEnd();
|
||||
}
|
||||
|
||||
private static final class DocumentContext {
|
||||
private final String sourceText;
|
||||
private final PbsAst.File ast;
|
||||
@@ -610,6 +850,264 @@ public final class PbsEditorialSupportService {
|
||||
return Optional.empty();
|
||||
}
|
||||
|
||||
private List<PbsEditorialLocation> definitionAt(final int offset) {
|
||||
final Integer tokenIndex = identifierTokenIndexAt(offset);
|
||||
if (tokenIndex == null) {
|
||||
return List.of();
|
||||
}
|
||||
final var scopeState = scopeStateAt(offset);
|
||||
final var token = token(tokenIndex);
|
||||
final Integer previousTokenIndex = previousSignificantTokenIndex(tokenIndex);
|
||||
if (previousTokenIndex != null && token(previousTokenIndex).kind() == PbsTokenKind.DOT) {
|
||||
final TypeView receiverType = resolveReceiverTypeBeforeDot(previousTokenIndex, scopeState);
|
||||
return resolveMemberDefinition(receiverType, token.lexeme());
|
||||
}
|
||||
return resolveSymbolDefinition(token.lexeme(), tokenIndex, scopeState, offset);
|
||||
}
|
||||
|
||||
private List<PbsEditorialLocation> usagesMatching(final Set<String> identityKeys) {
|
||||
if (identityKeys == null || identityKeys.isEmpty()) {
|
||||
return List.of();
|
||||
}
|
||||
final FileId fileId = ast.span() == null ? FileId.none() : ast.span().getFileId();
|
||||
final LinkedHashMap<String, PbsEditorialLocation> usages = new LinkedHashMap<>();
|
||||
for (final PbsToken token : tokens) {
|
||||
if (token.kind() != PbsTokenKind.IDENTIFIER) {
|
||||
continue;
|
||||
}
|
||||
if (!intersects(definitionAt(token.start()), identityKeys)) {
|
||||
continue;
|
||||
}
|
||||
final Span usageSpan = new Span(fileId, token.start(), token.end());
|
||||
if (!hasPhysicalSpan(usageSpan)) {
|
||||
continue;
|
||||
}
|
||||
usages.putIfAbsent(locationKey(usageSpan), new PbsEditorialLocation(usageSpan));
|
||||
}
|
||||
return List.copyOf(usages.values());
|
||||
}
|
||||
|
||||
private boolean intersects(
|
||||
final List<PbsEditorialLocation> locations,
|
||||
final Set<String> identityKeys) {
|
||||
if (locations == null || locations.isEmpty()) {
|
||||
return false;
|
||||
}
|
||||
for (final PbsEditorialLocation location : locations) {
|
||||
if (location != null && location.span() != null && identityKeys.contains(locationKey(location.span()))) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private List<PbsEditorialLocation> resolveSymbolDefinition(
|
||||
final String symbolName,
|
||||
final int tokenIndex,
|
||||
final ScopeState scopeState,
|
||||
final int offset) {
|
||||
if (scopeState.parameterNames().contains(symbolName)) {
|
||||
return parameterLocations(symbolName, offset);
|
||||
}
|
||||
final Scope.LocalSymbol localSymbol = scopeState.scope().entries().get(symbolName);
|
||||
if (localSymbol != null) {
|
||||
return localLocations(symbolName, offset);
|
||||
}
|
||||
final Integer previousTokenIndex = previousSignificantTokenIndex(tokenIndex);
|
||||
if (previousTokenIndex != null && token(previousTokenIndex).kind() == PbsTokenKind.NEW) {
|
||||
return constructorLocations(resolveTopDeclSymbol(symbolName));
|
||||
}
|
||||
final TopDeclSymbol importedSymbol = importedSymbols.get(symbolName);
|
||||
if (importedSymbol != null) {
|
||||
return topDeclLocations(importedSymbol);
|
||||
}
|
||||
final TopDeclSymbol supplementalSymbol = supplementalSymbols.get(symbolName);
|
||||
if (supplementalSymbol != null) {
|
||||
return topDeclLocations(supplementalSymbol);
|
||||
}
|
||||
final TopDeclSymbol topLevelSymbol = topLevelSymbols.get(symbolName);
|
||||
if (topLevelSymbol != null) {
|
||||
return topDeclLocations(topLevelSymbol);
|
||||
}
|
||||
return List.of();
|
||||
}
|
||||
|
||||
private List<PbsEditorialLocation> resolveMemberDefinition(
|
||||
final TypeView receiverType,
|
||||
final String memberName) {
|
||||
if (receiverType == null) {
|
||||
return List.of();
|
||||
}
|
||||
if (receiverType.kind() == Kind.STRUCT) {
|
||||
final Span fieldSpan = structFieldSpan(receiverType.name(), memberName);
|
||||
if (fieldSpan != null) {
|
||||
return locations(fieldSpan);
|
||||
}
|
||||
final StructInfo structInfo = model.structs.get(receiverType.name());
|
||||
if (structInfo == null) {
|
||||
return List.of();
|
||||
}
|
||||
return callableLocations(structInfo.methods().get(memberName));
|
||||
}
|
||||
if (receiverType.kind() == Kind.SERVICE || receiverType.kind() == Kind.CONTRACT) {
|
||||
final Map<String, List<CallableSymbol>> methods = receiverType.kind() == Kind.SERVICE
|
||||
? Optional.ofNullable(model.services.get(receiverType.name())).map(ServiceInfo::methods).orElse(Map.of())
|
||||
: Optional.ofNullable(model.contracts.get(receiverType.name())).map(ContractInfo::methods).orElse(Map.of());
|
||||
return callableLocations(methods.get(memberName));
|
||||
}
|
||||
return List.of();
|
||||
}
|
||||
|
||||
private List<PbsEditorialLocation> parameterLocations(
|
||||
final String symbolName,
|
||||
final int offset) {
|
||||
final CallableFrame callableFrame = callableFrameAt(offset);
|
||||
if (callableFrame == null) {
|
||||
return List.of();
|
||||
}
|
||||
for (final var parameter : callableFrame.parameters()) {
|
||||
if (symbolName.equals(parameter.name())) {
|
||||
return locations(parameter.span());
|
||||
}
|
||||
}
|
||||
return List.of();
|
||||
}
|
||||
|
||||
private List<PbsEditorialLocation> localLocations(
|
||||
final String symbolName,
|
||||
final int offset) {
|
||||
final CallableFrame callableFrame = callableFrameAt(offset);
|
||||
if (callableFrame == null) {
|
||||
return List.of();
|
||||
}
|
||||
return locations(bindingSpan(callableFrame.body(), symbolName, offset, null));
|
||||
}
|
||||
|
||||
private Span bindingSpan(
|
||||
final PbsAst.Block block,
|
||||
final String symbolName,
|
||||
final int offset,
|
||||
final Span current) {
|
||||
Span found = current;
|
||||
for (final var statement : block.statements()) {
|
||||
if (statement.span().getStart() >= offset) {
|
||||
break;
|
||||
}
|
||||
if (statement instanceof PbsAst.LetStatement letStatement && symbolName.equals(letStatement.name())) {
|
||||
found = letStatement.nameSpan() == null ? letStatement.span() : letStatement.nameSpan();
|
||||
}
|
||||
if (statement.span().contains(offset)) {
|
||||
if (statement instanceof PbsAst.IfStatement ifStatement) {
|
||||
if (ifStatement.thenBlock().span().contains(offset)) {
|
||||
return bindingSpan(ifStatement.thenBlock(), symbolName, offset, found);
|
||||
}
|
||||
if (ifStatement.elseBlock() != null && ifStatement.elseBlock().span().contains(offset)) {
|
||||
return bindingSpan(ifStatement.elseBlock(), symbolName, offset, found);
|
||||
}
|
||||
if (ifStatement.elseIf() != null && ifStatement.elseIf().span().contains(offset)) {
|
||||
final var nestedBlock = new PbsAst.Block(
|
||||
ReadOnlyList.wrap(List.of(ifStatement.elseIf())),
|
||||
null,
|
||||
ifStatement.elseIf().span());
|
||||
return bindingSpan(nestedBlock, symbolName, offset, found);
|
||||
}
|
||||
} else if (statement instanceof PbsAst.ForStatement forStatement) {
|
||||
Span loopFound = found;
|
||||
if (symbolName.equals(forStatement.iteratorName())) {
|
||||
loopFound = forStatement.span();
|
||||
}
|
||||
if (forStatement.body().span().contains(offset)) {
|
||||
return bindingSpan(forStatement.body(), symbolName, offset, loopFound);
|
||||
}
|
||||
} else if (statement instanceof PbsAst.WhileStatement whileStatement
|
||||
&& whileStatement.body().span().contains(offset)) {
|
||||
return bindingSpan(whileStatement.body(), symbolName, offset, found);
|
||||
}
|
||||
return found;
|
||||
}
|
||||
}
|
||||
return found;
|
||||
}
|
||||
|
||||
private List<PbsEditorialLocation> constructorLocations(final TopDeclSymbol topDeclSymbol) {
|
||||
if (topDeclSymbol == null) {
|
||||
return List.of();
|
||||
}
|
||||
if (topDeclSymbol.decl() instanceof PbsAst.StructDecl structDecl) {
|
||||
if (structDecl.ctors().isEmpty()) {
|
||||
return locations(structDecl.span());
|
||||
}
|
||||
final ArrayList<Span> ctorSpans = new ArrayList<>();
|
||||
for (final var ctor : structDecl.ctors()) {
|
||||
ctorSpans.add(ctor.span());
|
||||
}
|
||||
return locations(ctorSpans.toArray(Span[]::new));
|
||||
}
|
||||
return topDeclLocations(topDeclSymbol);
|
||||
}
|
||||
|
||||
private List<PbsEditorialLocation> topDeclLocations(final TopDeclSymbol topDeclSymbol) {
|
||||
if (topDeclSymbol == null) {
|
||||
return List.of();
|
||||
}
|
||||
return locations(topDeclSymbol.decl().span());
|
||||
}
|
||||
|
||||
private List<PbsEditorialLocation> callableLocations(final List<CallableSymbol> callables) {
|
||||
if (callables == null || callables.isEmpty()) {
|
||||
return List.of();
|
||||
}
|
||||
final ArrayList<Span> spans = new ArrayList<>();
|
||||
for (final var callable : callables) {
|
||||
spans.add(callable.span());
|
||||
}
|
||||
return locations(spans.toArray(Span[]::new));
|
||||
}
|
||||
|
||||
private Span structFieldSpan(
|
||||
final String typeName,
|
||||
final String fieldName) {
|
||||
final TopDeclSymbol typeSymbol = resolveTopDeclSymbol(typeName);
|
||||
if (typeSymbol == null) {
|
||||
return null;
|
||||
}
|
||||
if (typeSymbol.decl() instanceof PbsAst.StructDecl structDecl) {
|
||||
for (final var field : structDecl.fields()) {
|
||||
if (fieldName.equals(field.name())) {
|
||||
return field.span();
|
||||
}
|
||||
}
|
||||
}
|
||||
if (typeSymbol.decl() instanceof PbsAst.BuiltinTypeDecl builtinTypeDecl) {
|
||||
for (final var field : builtinTypeDecl.fields()) {
|
||||
if (fieldName.equals(field.name())) {
|
||||
return field.span();
|
||||
}
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
private List<PbsEditorialLocation> locations(final Span... spans) {
|
||||
final ArrayList<PbsEditorialLocation> locations = new ArrayList<>();
|
||||
if (spans == null) {
|
||||
return List.of();
|
||||
}
|
||||
for (final Span span : spans) {
|
||||
if (hasPhysicalSpan(span)) {
|
||||
locations.add(new PbsEditorialLocation(span));
|
||||
}
|
||||
}
|
||||
return List.copyOf(locations);
|
||||
}
|
||||
|
||||
private boolean hasPhysicalSpan(final Span span) {
|
||||
return span != null
|
||||
&& !span.isNone()
|
||||
&& span.getFileId() != null
|
||||
&& !span.getFileId().isNone();
|
||||
}
|
||||
|
||||
private List<PbsEditorialSignature> resolveCallableSignatures(
|
||||
final String callableName,
|
||||
final ScopeState scopeState) {
|
||||
@@ -1128,6 +1626,332 @@ public final class PbsEditorialSupportService {
|
||||
throw new IndexOutOfBoundsException("No significant token at index " + significantIndex);
|
||||
}
|
||||
|
||||
private RenameCursor renameCursorAt(final int offset) {
|
||||
final Integer tokenIndex = identifierTokenIndexAt(offset);
|
||||
if (tokenIndex == null) {
|
||||
return RenameCursor.refused("not an identifier");
|
||||
}
|
||||
final PbsToken token = token(tokenIndex);
|
||||
final String lexeme = token.lexeme();
|
||||
if (isImportAliasLexeme(lexeme)) {
|
||||
return RenameCursor.refused("import alias");
|
||||
}
|
||||
List<PbsEditorialLocation> identity = definitionAt(offset);
|
||||
if (identity.isEmpty()) {
|
||||
identity = localLocations(lexeme, offset);
|
||||
}
|
||||
if (identity.isEmpty()) {
|
||||
identity = parameterLocations(lexeme, offset);
|
||||
}
|
||||
if (isErrorCaseLabel(lexeme, offset, identity)) {
|
||||
return RenameCursor.refused("error case label");
|
||||
}
|
||||
if (identity.isEmpty()) {
|
||||
return RenameCursor.refused("not renameable");
|
||||
}
|
||||
final FileId fileId = ast.span() == null ? FileId.none() : ast.span().getFileId();
|
||||
final Span placeholderSpan = new Span(fileId, token.start(), token.end());
|
||||
if (!hasPhysicalSpan(placeholderSpan)) {
|
||||
return RenameCursor.refused("not renameable");
|
||||
}
|
||||
return new RenameCursor(
|
||||
lexeme,
|
||||
new PbsEditorialLocation(placeholderSpan),
|
||||
identity,
|
||||
null);
|
||||
}
|
||||
|
||||
private List<PbsEditorialLocation> renameSitesMatching(
|
||||
final Set<String> identityKeys,
|
||||
final String originalName) {
|
||||
if (identityKeys == null || identityKeys.isEmpty() || originalName == null || originalName.isBlank()) {
|
||||
return List.of();
|
||||
}
|
||||
final FileId fileId = ast.span() == null ? FileId.none() : ast.span().getFileId();
|
||||
final LinkedHashMap<String, PbsEditorialLocation> sites = new LinkedHashMap<>();
|
||||
for (final PbsToken token : tokens) {
|
||||
if (token.kind() != PbsTokenKind.IDENTIFIER || !originalName.equals(token.lexeme())) {
|
||||
continue;
|
||||
}
|
||||
if (isImportAliasLexeme(token.lexeme())) {
|
||||
continue;
|
||||
}
|
||||
if (!intersects(definitionAt(token.start()), identityKeys)) {
|
||||
continue;
|
||||
}
|
||||
final Span usageSpan = new Span(fileId, token.start(), token.end());
|
||||
if (!hasPhysicalSpan(usageSpan)) {
|
||||
continue;
|
||||
}
|
||||
sites.putIfAbsent(locationKey(usageSpan), new PbsEditorialLocation(usageSpan));
|
||||
}
|
||||
return List.copyOf(sites.values());
|
||||
}
|
||||
|
||||
private boolean isImportAliasLexeme(final String lexeme) {
|
||||
if (lexeme == null || lexeme.isBlank()) {
|
||||
return false;
|
||||
}
|
||||
for (final var importDecl : ast.imports()) {
|
||||
for (final var item : importDecl.items()) {
|
||||
if (item.alias() == null || item.alias().isBlank()) {
|
||||
continue;
|
||||
}
|
||||
if (lexeme.equals(item.alias()) && !item.alias().equals(item.name())) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private boolean isErrorCaseLabel(
|
||||
final String lexeme,
|
||||
final int offset,
|
||||
final List<PbsEditorialLocation> identity) {
|
||||
if (lexeme == null || lexeme.isBlank()) {
|
||||
return false;
|
||||
}
|
||||
for (final var topDecl : ast.topDecls()) {
|
||||
if (!(topDecl instanceof PbsAst.ErrorDecl errorDecl)) {
|
||||
continue;
|
||||
}
|
||||
if (lexeme.equals(errorDecl.name()) || !errorDecl.cases().asList().contains(lexeme)) {
|
||||
continue;
|
||||
}
|
||||
if (errorDecl.span() != null && errorDecl.span().contains(offset)) {
|
||||
return true;
|
||||
}
|
||||
final String errorKey = locationKey(errorDecl.span());
|
||||
for (final PbsEditorialLocation location : identity) {
|
||||
if (location != null && location.span() != null && errorKey.equals(locationKey(location.span()))) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private boolean collides(
|
||||
final String newName,
|
||||
final RenameCursor renameCursor) {
|
||||
if (newName == null || newName.equals(renameCursor.originalName())) {
|
||||
return false;
|
||||
}
|
||||
if (isLocalOrParameterIdentity(renameCursor)) {
|
||||
return localBindingNames((int) renameCursor.placeholder().span().getStart()).contains(newName);
|
||||
}
|
||||
if (isStructFieldIdentity(renameCursor)) {
|
||||
return structFieldNames(renameCursor).contains(newName);
|
||||
}
|
||||
if (isMethodIdentity(renameCursor)) {
|
||||
return methodNames(renameCursor).contains(newName);
|
||||
}
|
||||
if (isEnumCaseIdentity(renameCursor)) {
|
||||
return enumCaseNames(renameCursor).contains(newName);
|
||||
}
|
||||
return topLevelBindingNames().contains(newName);
|
||||
}
|
||||
|
||||
private boolean isLocalOrParameterIdentity(final RenameCursor renameCursor) {
|
||||
final Set<String> keys = locationKeys(renameCursor.identity());
|
||||
for (final var topDecl : ast.topDecls()) {
|
||||
if (!(topDecl instanceof PbsAst.FunctionDecl functionDecl) || functionDecl.body() == null) {
|
||||
continue;
|
||||
}
|
||||
for (final var parameter : functionDecl.parameters()) {
|
||||
if (keys.contains(locationKey(parameter.span()))) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
if (containsLetNameSpan(functionDecl.body(), keys)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
for (final var topDecl : ast.topDecls()) {
|
||||
if (!(topDecl instanceof PbsAst.StructDecl structDecl)) {
|
||||
continue;
|
||||
}
|
||||
for (final var method : structDecl.methods()) {
|
||||
if (method.body() == null) {
|
||||
continue;
|
||||
}
|
||||
for (final var parameter : method.parameters()) {
|
||||
if (keys.contains(locationKey(parameter.span()))) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
if (containsLetNameSpan(method.body(), keys)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private boolean containsLetNameSpan(
|
||||
final PbsAst.Block block,
|
||||
final Set<String> keys) {
|
||||
if (block == null) {
|
||||
return false;
|
||||
}
|
||||
for (final var statement : block.statements()) {
|
||||
if (statement instanceof PbsAst.LetStatement letStatement
|
||||
&& letStatement.nameSpan() != null
|
||||
&& keys.contains(locationKey(letStatement.nameSpan()))) {
|
||||
return true;
|
||||
}
|
||||
if (statement instanceof PbsAst.IfStatement ifStatement) {
|
||||
if (containsLetNameSpan(ifStatement.thenBlock(), keys)
|
||||
|| containsLetNameSpan(ifStatement.elseBlock(), keys)) {
|
||||
return true;
|
||||
}
|
||||
} else if (statement instanceof PbsAst.ForStatement forStatement) {
|
||||
if (containsLetNameSpan(forStatement.body(), keys)) {
|
||||
return true;
|
||||
}
|
||||
} else if (statement instanceof PbsAst.WhileStatement whileStatement
|
||||
&& containsLetNameSpan(whileStatement.body(), keys)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private Set<String> localBindingNames(final int offset) {
|
||||
final LinkedHashSet<String> names = new LinkedHashSet<>();
|
||||
final CallableFrame frame = callableFrameAt(offset);
|
||||
if (frame == null) {
|
||||
return Set.of();
|
||||
}
|
||||
names.addAll(frame.parameterNames());
|
||||
collectLetNames(frame.body(), names);
|
||||
return names;
|
||||
}
|
||||
|
||||
private void collectLetNames(
|
||||
final PbsAst.Block block,
|
||||
final Set<String> names) {
|
||||
if (block == null) {
|
||||
return;
|
||||
}
|
||||
for (final var statement : block.statements()) {
|
||||
if (statement instanceof PbsAst.LetStatement letStatement) {
|
||||
names.add(letStatement.name());
|
||||
} else if (statement instanceof PbsAst.IfStatement ifStatement) {
|
||||
collectLetNames(ifStatement.thenBlock(), names);
|
||||
collectLetNames(ifStatement.elseBlock(), names);
|
||||
} else if (statement instanceof PbsAst.ForStatement forStatement) {
|
||||
names.add(forStatement.iteratorName());
|
||||
collectLetNames(forStatement.body(), names);
|
||||
} else if (statement instanceof PbsAst.WhileStatement whileStatement) {
|
||||
collectLetNames(whileStatement.body(), names);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private boolean isStructFieldIdentity(final RenameCursor renameCursor) {
|
||||
return !structFieldNames(renameCursor).isEmpty()
|
||||
&& structFieldIdentityMatch(renameCursor);
|
||||
}
|
||||
|
||||
private boolean structFieldIdentityMatch(final RenameCursor renameCursor) {
|
||||
final Set<String> keys = locationKeys(renameCursor.identity());
|
||||
for (final var topDecl : ast.topDecls()) {
|
||||
if (!(topDecl instanceof PbsAst.StructDecl structDecl)) {
|
||||
continue;
|
||||
}
|
||||
for (final var field : structDecl.fields()) {
|
||||
if (keys.contains(locationKey(field.span()))) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private Set<String> structFieldNames(final RenameCursor renameCursor) {
|
||||
final Set<String> keys = locationKeys(renameCursor.identity());
|
||||
for (final var topDecl : ast.topDecls()) {
|
||||
if (!(topDecl instanceof PbsAst.StructDecl structDecl)) {
|
||||
continue;
|
||||
}
|
||||
for (final var field : structDecl.fields()) {
|
||||
if (keys.contains(locationKey(field.span()))) {
|
||||
final LinkedHashSet<String> names = new LinkedHashSet<>();
|
||||
for (final var sibling : structDecl.fields()) {
|
||||
names.add(sibling.name());
|
||||
}
|
||||
return names;
|
||||
}
|
||||
}
|
||||
}
|
||||
return Set.of();
|
||||
}
|
||||
|
||||
private boolean isMethodIdentity(final RenameCursor renameCursor) {
|
||||
return !methodNames(renameCursor).isEmpty();
|
||||
}
|
||||
|
||||
private Set<String> methodNames(final RenameCursor renameCursor) {
|
||||
final Set<String> keys = locationKeys(renameCursor.identity());
|
||||
for (final var topDecl : ast.topDecls()) {
|
||||
if (!(topDecl instanceof PbsAst.StructDecl structDecl)) {
|
||||
continue;
|
||||
}
|
||||
for (final var method : structDecl.methods()) {
|
||||
if (keys.contains(locationKey(method.span()))) {
|
||||
final LinkedHashSet<String> names = new LinkedHashSet<>();
|
||||
for (final var sibling : structDecl.methods()) {
|
||||
names.add(sibling.name());
|
||||
}
|
||||
return names;
|
||||
}
|
||||
}
|
||||
}
|
||||
return Set.of();
|
||||
}
|
||||
|
||||
private boolean isEnumCaseIdentity(final RenameCursor renameCursor) {
|
||||
return !enumCaseNames(renameCursor).isEmpty();
|
||||
}
|
||||
|
||||
private Set<String> enumCaseNames(final RenameCursor renameCursor) {
|
||||
final Set<String> keys = locationKeys(renameCursor.identity());
|
||||
for (final var topDecl : ast.topDecls()) {
|
||||
if (!(topDecl instanceof PbsAst.EnumDecl enumDecl)) {
|
||||
continue;
|
||||
}
|
||||
for (final var enumCase : enumDecl.cases()) {
|
||||
if (keys.contains(locationKey(enumCase.span()))) {
|
||||
final LinkedHashSet<String> names = new LinkedHashSet<>();
|
||||
for (final var sibling : enumDecl.cases()) {
|
||||
names.add(sibling.name());
|
||||
}
|
||||
return names;
|
||||
}
|
||||
}
|
||||
}
|
||||
return Set.of();
|
||||
}
|
||||
|
||||
private Set<String> topLevelBindingNames() {
|
||||
final LinkedHashSet<String> names = new LinkedHashSet<>();
|
||||
for (final var topDecl : ast.topDecls()) {
|
||||
if (topDecl instanceof PbsAst.FunctionDecl functionDecl) {
|
||||
names.add(functionDecl.name());
|
||||
} else if (topDecl instanceof PbsAst.ServiceDecl serviceDecl) {
|
||||
names.add(serviceDecl.name());
|
||||
} else if (topDecl instanceof PbsAst.GlobalDecl globalDecl) {
|
||||
names.add(globalDecl.name());
|
||||
} else if (topDecl instanceof PbsAst.ConstDecl constDecl) {
|
||||
names.add(constDecl.name());
|
||||
}
|
||||
}
|
||||
names.addAll(importedSymbols.keySet());
|
||||
return names;
|
||||
}
|
||||
|
||||
private PbsToken token(final int index) {
|
||||
return tokens.get(index);
|
||||
}
|
||||
@@ -1336,6 +2160,17 @@ public final class PbsEditorialSupportService {
|
||||
String origin) {
|
||||
}
|
||||
|
||||
private record RenameCursor(
|
||||
String originalName,
|
||||
PbsEditorialLocation placeholder,
|
||||
List<PbsEditorialLocation> identity,
|
||||
String refusal) {
|
||||
|
||||
private static RenameCursor refused(final String reason) {
|
||||
return new RenameCursor("", null, List.of(), reason);
|
||||
}
|
||||
}
|
||||
|
||||
private record CallableFrame(
|
||||
ReadOnlyList<PbsAst.Parameter> parameters,
|
||||
PbsAst.Block body,
|
||||
|
||||
+21
@@ -0,0 +1,21 @@
|
||||
package p.studio.compiler.pbs.semantics;
|
||||
|
||||
import p.studio.compiler.source.Span;
|
||||
|
||||
import java.util.Objects;
|
||||
|
||||
public record PbsEditorialWorkspaceSymbol(
|
||||
String name,
|
||||
PbsEditorialSymbolKind kind,
|
||||
String detail,
|
||||
String containerName,
|
||||
Span span) {
|
||||
|
||||
public PbsEditorialWorkspaceSymbol {
|
||||
name = Objects.requireNonNull(name, "name").trim();
|
||||
kind = Objects.requireNonNull(kind, "kind");
|
||||
detail = detail == null ? "" : detail;
|
||||
containerName = containerName == null ? "" : containerName.trim();
|
||||
span = Objects.requireNonNull(span, "span");
|
||||
}
|
||||
}
|
||||
+33
@@ -0,0 +1,33 @@
|
||||
package p.studio.compiler.pbs.semantics;
|
||||
|
||||
import java.util.Objects;
|
||||
|
||||
public record PbsQuickFix(
|
||||
String diagnosticCode,
|
||||
int startOffset,
|
||||
int endOffset,
|
||||
String newText,
|
||||
String title) {
|
||||
|
||||
public PbsQuickFix {
|
||||
diagnosticCode = requireText(diagnosticCode, "diagnosticCode");
|
||||
title = requireText(title, "title");
|
||||
if (startOffset < 0) {
|
||||
throw new IllegalArgumentException("startOffset must not be negative");
|
||||
}
|
||||
if (endOffset < startOffset) {
|
||||
throw new IllegalArgumentException("endOffset must not be before startOffset");
|
||||
}
|
||||
newText = Objects.requireNonNull(newText, "newText");
|
||||
}
|
||||
|
||||
private static String requireText(
|
||||
final String value,
|
||||
final String field) {
|
||||
final String candidate = Objects.requireNonNull(value, field).trim();
|
||||
if (candidate.isEmpty()) {
|
||||
throw new IllegalArgumentException(field + " must not be blank");
|
||||
}
|
||||
return candidate;
|
||||
}
|
||||
}
|
||||
+148
@@ -0,0 +1,148 @@
|
||||
package p.studio.compiler.pbs.semantics;
|
||||
|
||||
import p.studio.compiler.pbs.ast.PbsAst;
|
||||
import p.studio.compiler.source.Span;
|
||||
import p.studio.utilities.structures.ReadOnlyList;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Comparator;
|
||||
import java.util.List;
|
||||
|
||||
public final class PbsQuickFixCollector {
|
||||
static final String REMOVE_DUPLICATE_TITLE = "Remove duplicate reserved attribute";
|
||||
static final String REMOVE_INIT_ALLOWED_ARGUMENTS_TITLE = "Remove InitAllowed arguments";
|
||||
private static final String INIT_ALLOWED_REPLACEMENT = "[InitAllowed]";
|
||||
|
||||
private PbsQuickFixCollector() {
|
||||
}
|
||||
|
||||
public static List<PbsQuickFix> collect(
|
||||
final PbsAst.File ast,
|
||||
final boolean interfaceModule) {
|
||||
if (ast == null) {
|
||||
return List.of();
|
||||
}
|
||||
final ArrayList<PbsQuickFix> repairs = new ArrayList<>();
|
||||
for (final PbsAst.TopDecl topDecl : ast.topDecls()) {
|
||||
switch (topDecl) {
|
||||
case PbsAst.FunctionDecl functionDecl -> duplicateDoc(functionDecl.attributes(), repairs);
|
||||
case PbsAst.StructDecl structDecl -> {
|
||||
duplicateDoc(structDecl.attributes(), repairs);
|
||||
for (final PbsAst.FunctionDecl method : structDecl.methods()) {
|
||||
duplicateDoc(method.attributes(), repairs);
|
||||
}
|
||||
}
|
||||
case PbsAst.ServiceDecl serviceDecl -> {
|
||||
duplicateDoc(serviceDecl.attributes(), repairs);
|
||||
for (final PbsAst.FunctionDecl method : serviceDecl.methods()) {
|
||||
duplicateDoc(method.attributes(), repairs);
|
||||
}
|
||||
}
|
||||
case PbsAst.ContractDecl contractDecl -> {
|
||||
duplicateDoc(contractDecl.attributes(), repairs);
|
||||
if (interfaceModule) {
|
||||
for (final PbsAst.FunctionSignature signature : contractDecl.signatures()) {
|
||||
duplicateDoc(signature.attributes(), repairs);
|
||||
}
|
||||
}
|
||||
}
|
||||
case PbsAst.HostDecl hostDecl -> {
|
||||
duplicateDoc(hostDecl.attributes(), repairs);
|
||||
if (interfaceModule) {
|
||||
for (final PbsAst.FunctionSignature signature : hostDecl.signatures()) {
|
||||
collectHostSignature(signature, repairs);
|
||||
}
|
||||
}
|
||||
}
|
||||
case PbsAst.BuiltinTypeDecl builtinTypeDecl -> {
|
||||
if (interfaceModule) {
|
||||
duplicateDoc(builtinTypeDecl.attributes(), repairs);
|
||||
duplicateNamed(builtinTypeDecl.attributes(), "BuiltinType", repairs);
|
||||
for (final PbsAst.FunctionSignature signature : builtinTypeDecl.signatures()) {
|
||||
duplicateDoc(signature.attributes(), repairs);
|
||||
duplicateNamed(signature.attributes(), "IntrinsicCall", repairs);
|
||||
}
|
||||
}
|
||||
}
|
||||
case PbsAst.ErrorDecl errorDecl -> duplicateDoc(errorDecl.attributes(), repairs);
|
||||
case PbsAst.EnumDecl enumDecl -> duplicateDoc(enumDecl.attributes(), repairs);
|
||||
case PbsAst.CallbackDecl callbackDecl -> duplicateDoc(callbackDecl.attributes(), repairs);
|
||||
case PbsAst.ConstDecl constDecl -> {
|
||||
duplicateDoc(constDecl.attributes(), repairs);
|
||||
duplicateNamed(constDecl.attributes(), "BuiltinConst", repairs);
|
||||
}
|
||||
default -> {
|
||||
}
|
||||
}
|
||||
}
|
||||
repairs.sort(Comparator
|
||||
.comparingInt(PbsQuickFix::startOffset)
|
||||
.thenComparingInt(PbsQuickFix::endOffset)
|
||||
.thenComparing(PbsQuickFix::diagnosticCode));
|
||||
return List.copyOf(repairs);
|
||||
}
|
||||
|
||||
private static void collectHostSignature(
|
||||
final PbsAst.FunctionSignature signature,
|
||||
final List<PbsQuickFix> repairs) {
|
||||
duplicateDoc(signature.attributes(), repairs);
|
||||
duplicateNamed(signature.attributes(), "Host", repairs);
|
||||
duplicateNamed(signature.attributes(), "InitAllowed", repairs);
|
||||
duplicateNamed(signature.attributes(), "AssetLowering", repairs);
|
||||
final List<PbsAst.Attribute> initAllowed = named(signature.attributes(), "InitAllowed");
|
||||
if (!initAllowed.isEmpty() && !initAllowed.getFirst().arguments().isEmpty()) {
|
||||
add(repairs, initAllowed.getFirst(), PbsSemanticsErrors.E_SEM_MALFORMED_RESERVED_ATTRIBUTE.name(),
|
||||
INIT_ALLOWED_REPLACEMENT, REMOVE_INIT_ALLOWED_ARGUMENTS_TITLE);
|
||||
}
|
||||
}
|
||||
|
||||
private static void duplicateDoc(
|
||||
final ReadOnlyList<PbsAst.Attribute> attributes,
|
||||
final List<PbsQuickFix> repairs) {
|
||||
duplicateNamed(attributes, "Doc", repairs);
|
||||
}
|
||||
|
||||
private static void duplicateNamed(
|
||||
final ReadOnlyList<PbsAst.Attribute> attributes,
|
||||
final String name,
|
||||
final List<PbsQuickFix> repairs) {
|
||||
final List<PbsAst.Attribute> matches = named(attributes, name);
|
||||
for (int index = 1; index < matches.size(); index++) {
|
||||
add(repairs, matches.get(index), PbsSemanticsErrors.E_SEM_DUPLICATE_RESERVED_ATTRIBUTE.name(),
|
||||
"", REMOVE_DUPLICATE_TITLE);
|
||||
}
|
||||
}
|
||||
|
||||
private static List<PbsAst.Attribute> named(
|
||||
final ReadOnlyList<PbsAst.Attribute> attributes,
|
||||
final String name) {
|
||||
final ArrayList<PbsAst.Attribute> matches = new ArrayList<>();
|
||||
if (attributes == null) {
|
||||
return matches;
|
||||
}
|
||||
for (final PbsAst.Attribute attribute : attributes) {
|
||||
if (name.equals(attribute.name())) {
|
||||
matches.add(attribute);
|
||||
}
|
||||
}
|
||||
return matches;
|
||||
}
|
||||
|
||||
private static void add(
|
||||
final List<PbsQuickFix> repairs,
|
||||
final PbsAst.Attribute attribute,
|
||||
final String code,
|
||||
final String newText,
|
||||
final String title) {
|
||||
if (attribute == null || attribute.span() == null || attribute.span().isNone()) {
|
||||
return;
|
||||
}
|
||||
final Span span = attribute.span();
|
||||
final long start = span.getStart();
|
||||
final long end = span.getEnd();
|
||||
if (start < 0 || end < start || end > Integer.MAX_VALUE) {
|
||||
return;
|
||||
}
|
||||
repairs.add(new PbsQuickFix(code, (int) start, (int) end, newText, title));
|
||||
}
|
||||
}
|
||||
+56
-426
@@ -5,24 +5,16 @@ import p.studio.compiler.messages.BuildingIssueSink;
|
||||
import p.studio.compiler.messages.FESurfaceContext;
|
||||
import p.studio.compiler.messages.FrontendPhaseContext;
|
||||
import p.studio.compiler.models.IRBackend;
|
||||
import p.studio.compiler.models.IRBackendExecutableFunction;
|
||||
import p.studio.compiler.models.IRGlobal;
|
||||
import p.studio.compiler.models.IRGlobalOrigin;
|
||||
import p.studio.compiler.models.IRGlobalVisibility;
|
||||
import p.studio.compiler.models.IRHiddenGlobalKind;
|
||||
import p.studio.compiler.models.IRSyntheticCallableKind;
|
||||
import p.studio.compiler.models.SourceKind;
|
||||
import p.studio.compiler.pbs.PbsFrontendCompiler;
|
||||
import p.studio.compiler.pbs.PbsReservedMetadataExtractor;
|
||||
import p.studio.compiler.pbs.semantics.PbsFlowSemanticsValidator;
|
||||
import p.studio.compiler.pbs.stdlib.InterfaceModuleLoader;
|
||||
import p.studio.compiler.pbs.stdlib.ResourceStdlibEnvironmentResolver;
|
||||
import p.studio.compiler.pbs.stdlib.StdlibEnvironmentResolver;
|
||||
import p.studio.compiler.source.Span;
|
||||
import p.studio.compiler.source.diagnostics.DiagnosticSink;
|
||||
import p.studio.compiler.source.identifiers.CallableId;
|
||||
import p.studio.compiler.source.identifiers.FileId;
|
||||
import p.studio.compiler.source.identifiers.ModuleId;
|
||||
import p.studio.compiler.source.tables.CallableSignatureRef;
|
||||
import p.studio.utilities.logs.LogAggregator;
|
||||
import p.studio.utilities.structures.ReadOnlyList;
|
||||
|
||||
@@ -136,11 +128,15 @@ public class PBSFrontendPhaseService implements FrontendPhaseService {
|
||||
final Map<FileId, p.studio.compiler.pbs.ast.PbsAst.File> astByFile = new LinkedHashMap<>();
|
||||
final Map<FileId, ReadOnlyList<p.studio.compiler.pbs.ast.PbsAst.TopDecl>> supplementalTopDeclsByFile = new LinkedHashMap<>();
|
||||
final Map<FileId, ReadOnlyList<PbsInlineHintSurface>> inlineHintsByFile = new LinkedHashMap<>();
|
||||
final Map<FileId, SourceKind> sourceKindByFile = new LinkedHashMap<>();
|
||||
for (final var entry : importedSemanticContexts.entrySet()) {
|
||||
supplementalTopDeclsByFile.put(entry.getKey(), entry.getValue().supplementalTopDecls());
|
||||
}
|
||||
for (final var parsedSourceFile : assembly.parsedSourceFiles()) {
|
||||
astByFile.put(parsedSourceFile.fileId(), parsedSourceFile.ast());
|
||||
sourceKindByFile.put(
|
||||
parsedSourceFile.fileId(),
|
||||
parsedSourceFile.sourceKind() == null ? SourceKind.PROJECT : parsedSourceFile.sourceKind());
|
||||
final var importedSemanticContext = importedSemanticContexts.getOrDefault(
|
||||
parsedSourceFile.fileId(),
|
||||
PbsImportedSemanticContext.empty());
|
||||
@@ -156,19 +152,21 @@ public class PBSFrontendPhaseService implements FrontendPhaseService {
|
||||
return new PbsSemanticReadSurface(
|
||||
Map.copyOf(astByFile),
|
||||
Map.copyOf(supplementalTopDeclsByFile),
|
||||
Map.copyOf(inlineHintsByFile));
|
||||
Map.copyOf(inlineHintsByFile),
|
||||
Map.copyOf(sourceKindByFile));
|
||||
}
|
||||
|
||||
public record PbsSemanticReadSurface(
|
||||
Map<FileId, p.studio.compiler.pbs.ast.PbsAst.File> astByFile,
|
||||
Map<FileId, ReadOnlyList<p.studio.compiler.pbs.ast.PbsAst.TopDecl>> supplementalTopDeclsByFile,
|
||||
Map<FileId, ReadOnlyList<PbsInlineHintSurface>> inlineHintsByFile) {
|
||||
Map<FileId, ReadOnlyList<PbsInlineHintSurface>> inlineHintsByFile,
|
||||
Map<FileId, SourceKind> sourceKindByFile) {
|
||||
}
|
||||
|
||||
private IRBackend mergeCompiledSources(
|
||||
final ArrayList<CompiledSourceFile> compiledSourceFiles,
|
||||
final Set<ModuleId> failedModuleIds,
|
||||
final Map<ModuleId, Set<ModuleId>> moduleDependencyGraph) {
|
||||
final Map<ModuleId, ReadOnlyList<ModuleId>> moduleDependencyGraph) {
|
||||
final var irBackendAggregator = IRBackend.aggregator();
|
||||
final var blockedModuleIds = blockedModulesByDependency(failedModuleIds, moduleDependencyGraph);
|
||||
|
||||
@@ -178,438 +176,70 @@ public class PBSFrontendPhaseService implements FrontendPhaseService {
|
||||
}
|
||||
irBackendAggregator.merge(compiledSource.irBackendFile());
|
||||
}
|
||||
return synthesizePublishedLifecycle(irBackendAggregator.emit());
|
||||
irBackendAggregator.lifecycleModuleOrder(lifecycleModuleOrder(
|
||||
compiledSourceFiles,
|
||||
blockedModuleIds,
|
||||
moduleDependencyGraph));
|
||||
return irBackendAggregator.emit();
|
||||
}
|
||||
|
||||
private IRBackend synthesizePublishedLifecycle(final IRBackend baseBackend) {
|
||||
final var callableSignatures = new ArrayList<>(baseBackend.getCallableSignatures().asList());
|
||||
final var executableFunctions = new ArrayList<>(baseBackend.getExecutableFunctions().asList());
|
||||
final var globals = new ArrayList<>(baseBackend.getGlobals().asList());
|
||||
final var fileInitFunctionsByModule = new LinkedHashMap<ModuleId, List<IRBackendExecutableFunction>>();
|
||||
final var projectInitAnchorsByModule = new LinkedHashMap<ModuleId, String>();
|
||||
final var wrapperNamesByModule = new LinkedHashMap<ModuleId, String>();
|
||||
final var frameAnchorsByModule = new LinkedHashMap<ModuleId, String>();
|
||||
|
||||
for (final var executable : executableFunctions) {
|
||||
if (!executable.callableName().startsWith("__pbs.file_init$")) {
|
||||
continue;
|
||||
}
|
||||
fileInitFunctionsByModule
|
||||
.computeIfAbsent(normalizeModuleId(executable.moduleId()), ignored -> new ArrayList<>())
|
||||
.add(executable);
|
||||
}
|
||||
for (final var syntheticFunction : baseBackend.getSyntheticFunctions()) {
|
||||
final var moduleId = normalizeModuleId(syntheticFunction.moduleId());
|
||||
switch (syntheticFunction.kind()) {
|
||||
case PROJECT_INIT -> projectInitAnchorsByModule.put(moduleId, syntheticFunction.origin().anchorCallableName());
|
||||
case PUBLISHED_FRAME_WRAPPER -> {
|
||||
wrapperNamesByModule.put(moduleId, syntheticFunction.callableName());
|
||||
frameAnchorsByModule.put(moduleId, syntheticFunction.origin().anchorCallableName());
|
||||
}
|
||||
default -> {
|
||||
}
|
||||
private ReadOnlyList<ModuleId> lifecycleModuleOrder(
|
||||
final ArrayList<CompiledSourceFile> compiledSourceFiles,
|
||||
final Set<ModuleId> blockedModuleIds,
|
||||
final Map<ModuleId, ReadOnlyList<ModuleId>> dependenciesByModule) {
|
||||
final var availableModules = new LinkedHashSet<ModuleId>();
|
||||
for (final var compiledSource : compiledSourceFiles) {
|
||||
if (!blockedModuleIds.contains(compiledSource.moduleId())) {
|
||||
availableModules.add(compiledSource.moduleId());
|
||||
}
|
||||
}
|
||||
|
||||
final ModuleId entryPointModuleId;
|
||||
final String entryPointCallableName;
|
||||
if (wrapperNamesByModule.size() == 1) {
|
||||
entryPointModuleId = wrapperNamesByModule.keySet().iterator().next();
|
||||
entryPointCallableName = wrapperNamesByModule.get(entryPointModuleId);
|
||||
} else {
|
||||
entryPointModuleId = baseBackend.getEntryPointModuleId();
|
||||
entryPointCallableName = baseBackend.getEntryPointCallableName();
|
||||
}
|
||||
|
||||
final var sortedModuleIds = new ArrayList<ModuleId>();
|
||||
sortedModuleIds.addAll(fileInitFunctionsByModule.keySet());
|
||||
for (final var moduleId : wrapperNamesByModule.keySet()) {
|
||||
if (!sortedModuleIds.contains(moduleId)) {
|
||||
sortedModuleIds.add(moduleId);
|
||||
}
|
||||
}
|
||||
sortedModuleIds.sort(Comparator.comparing(moduleId -> moduleSortKey(baseBackend, moduleId)));
|
||||
|
||||
final var moduleInitCallableIds = new LinkedHashMap<ModuleId, CallableId>();
|
||||
for (final var moduleId : sortedModuleIds) {
|
||||
final var moduleInitName = PbsFrontendCompiler.moduleInitCallableName(moduleId);
|
||||
final var fileInitFunctions = new ArrayList<>(fileInitFunctionsByModule.getOrDefault(moduleId, List.of()));
|
||||
if (fileInitFunctions.isEmpty()) {
|
||||
continue;
|
||||
}
|
||||
fileInitFunctions.sort(Comparator.comparingInt(fn -> fn.fileId().getId()));
|
||||
|
||||
final var callableId = new CallableId(callableSignatures.size());
|
||||
callableSignatures.add(new CallableSignatureRef(moduleId, moduleInitName, 0, "() -> unit"));
|
||||
moduleInitCallableIds.put(moduleId, callableId);
|
||||
|
||||
final var instructions = new ArrayList<IRBackendExecutableFunction.Instruction>();
|
||||
var anchorSpan = fileInitFunctions.getFirst().span();
|
||||
var anchorFileId = fileInitFunctions.getFirst().fileId();
|
||||
for (final var fileInitFunction : fileInitFunctions) {
|
||||
instructions.add(callInstruction(fileInitFunction, fileInitFunction.span()));
|
||||
anchorSpan = fileInitFunction.span();
|
||||
anchorFileId = fileInitFunction.fileId();
|
||||
}
|
||||
instructions.add(retInstruction(anchorSpan));
|
||||
executableFunctions.add(new IRBackendExecutableFunction(
|
||||
anchorFileId,
|
||||
final var ordered = new ArrayList<ModuleId>(availableModules.size());
|
||||
final var visiting = new HashSet<ModuleId>();
|
||||
final var visited = new HashSet<ModuleId>();
|
||||
for (final var moduleId : availableModules) {
|
||||
appendDependenciesFirst(
|
||||
moduleId,
|
||||
moduleInitName,
|
||||
callableId,
|
||||
safeToInt(anchorSpan.getStart()),
|
||||
safeToInt(anchorSpan.getEnd()),
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
1,
|
||||
ReadOnlyList.wrap(instructions),
|
||||
anchorSpan));
|
||||
availableModules,
|
||||
dependenciesByModule,
|
||||
visiting,
|
||||
visited,
|
||||
ordered);
|
||||
}
|
||||
|
||||
CallableId projectInitCallableId = null;
|
||||
if (!entryPointModuleId.isNone()) {
|
||||
final var projectInitAnchor = projectInitAnchorsByModule.get(entryPointModuleId);
|
||||
final var projectInitTarget = resolveExecutable(executableFunctions, entryPointModuleId, projectInitAnchor);
|
||||
if (projectInitTarget != null) {
|
||||
final var projectInitName = PbsFrontendCompiler.projectInitCallableName(entryPointModuleId);
|
||||
projectInitCallableId = new CallableId(callableSignatures.size());
|
||||
callableSignatures.add(new CallableSignatureRef(entryPointModuleId, projectInitName, 0, "() -> unit"));
|
||||
executableFunctions.add(new IRBackendExecutableFunction(
|
||||
projectInitTarget.fileId(),
|
||||
entryPointModuleId,
|
||||
projectInitName,
|
||||
projectInitCallableId,
|
||||
projectInitTarget.sourceStart(),
|
||||
projectInitTarget.sourceEnd(),
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
1,
|
||||
ReadOnlyList.from(
|
||||
callInstruction(projectInitTarget, projectInitTarget.span()),
|
||||
retInstruction(projectInitTarget.span())),
|
||||
projectInitTarget.span()));
|
||||
}
|
||||
}
|
||||
|
||||
final var frameExecutable = resolveExecutable(
|
||||
executableFunctions,
|
||||
entryPointModuleId,
|
||||
frameAnchorsByModule.get(entryPointModuleId));
|
||||
if (frameExecutable != null
|
||||
&& entryPointCallableName != null
|
||||
&& !entryPointCallableName.isBlank()
|
||||
&& !entryPointModuleId.isNone()) {
|
||||
final var existingBootGuard = globals.stream()
|
||||
.filter(global -> moduleIdsMatch(entryPointModuleId, global.moduleId()))
|
||||
.filter(global -> global.hiddenKind() == IRHiddenGlobalKind.BOOT_GUARD)
|
||||
.findFirst()
|
||||
.orElse(null);
|
||||
final var bootGuardSlot = existingBootGuard != null
|
||||
? existingBootGuard.slot()
|
||||
: nextGlobalSlot(globals, entryPointModuleId);
|
||||
final var wrapperCallableId = new CallableId(callableSignatures.size());
|
||||
callableSignatures.add(new CallableSignatureRef(entryPointModuleId, entryPointCallableName, 0, "() -> unit"));
|
||||
final var instructions = new ArrayList<IRBackendExecutableFunction.Instruction>();
|
||||
instructions.add(getGlobalInstruction(bootGuardSlot, frameExecutable.span()));
|
||||
instructions.add(pushBoolInstruction(true, frameExecutable.span()));
|
||||
instructions.add(eqInstruction(frameExecutable.span()));
|
||||
instructions.add(jumpIfTrueInstruction("bootstrap_done", frameExecutable.span()));
|
||||
for (final var moduleId : sortedModuleIds) {
|
||||
final var moduleInitCallableId = moduleInitCallableIds.get(moduleId);
|
||||
if (moduleInitCallableId == null) {
|
||||
continue;
|
||||
}
|
||||
instructions.add(new IRBackendExecutableFunction.Instruction(
|
||||
IRBackendExecutableFunction.InstructionKind.CALL_FUNC,
|
||||
moduleId,
|
||||
PbsFrontendCompiler.moduleInitCallableName(moduleId),
|
||||
moduleInitCallableId,
|
||||
null,
|
||||
null,
|
||||
0,
|
||||
0,
|
||||
frameExecutable.span()));
|
||||
}
|
||||
if (projectInitCallableId != null) {
|
||||
instructions.add(new IRBackendExecutableFunction.Instruction(
|
||||
IRBackendExecutableFunction.InstructionKind.CALL_FUNC,
|
||||
entryPointModuleId,
|
||||
PbsFrontendCompiler.projectInitCallableName(entryPointModuleId),
|
||||
projectInitCallableId,
|
||||
null,
|
||||
null,
|
||||
0,
|
||||
0,
|
||||
frameExecutable.span()));
|
||||
}
|
||||
instructions.add(pushBoolInstruction(true, frameExecutable.span()));
|
||||
instructions.add(setGlobalInstruction(bootGuardSlot, frameExecutable.span()));
|
||||
instructions.add(labelInstruction("bootstrap_done", frameExecutable.span()));
|
||||
instructions.add(callInstruction(frameExecutable, frameExecutable.span()));
|
||||
instructions.add(retInstruction(frameExecutable.span()));
|
||||
executableFunctions.add(new IRBackendExecutableFunction(
|
||||
frameExecutable.fileId(),
|
||||
entryPointModuleId,
|
||||
entryPointCallableName,
|
||||
wrapperCallableId,
|
||||
frameExecutable.sourceStart(),
|
||||
frameExecutable.sourceEnd(),
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
2,
|
||||
ReadOnlyList.wrap(instructions),
|
||||
frameExecutable.span()));
|
||||
|
||||
if (existingBootGuard == null) {
|
||||
globals.add(new IRGlobal(
|
||||
frameExecutable.fileId(),
|
||||
entryPointModuleId,
|
||||
PbsFrontendCompiler.bootGuardGlobalName(entryPointModuleId),
|
||||
"bool",
|
||||
bootGuardSlot,
|
||||
IRGlobalVisibility.MODULE,
|
||||
true,
|
||||
IRHiddenGlobalKind.BOOT_GUARD,
|
||||
new IRGlobalOrigin(
|
||||
frameExecutable.fileId(),
|
||||
entryPointModuleId,
|
||||
frameAnchorsByModule.getOrDefault(entryPointModuleId, frameExecutable.callableName()),
|
||||
frameExecutable.span(),
|
||||
"BOOT_GUARD"),
|
||||
frameExecutable.span()));
|
||||
}
|
||||
}
|
||||
|
||||
final var normalizedGlobals = normalizeGlobalSlots(globals);
|
||||
|
||||
return IRBackend.builder()
|
||||
.entryPointCallableName(entryPointCallableName)
|
||||
.entryPointModuleId(entryPointModuleId)
|
||||
.functions(baseBackend.getFunctions())
|
||||
.syntheticFunctions(baseBackend.getSyntheticFunctions())
|
||||
.globals(ReadOnlyList.wrap(normalizedGlobals))
|
||||
.executableFunctions(ReadOnlyList.wrap(executableFunctions))
|
||||
.modulePool(baseBackend.getModulePool())
|
||||
.callableSignatures(ReadOnlyList.wrap(callableSignatures))
|
||||
.intrinsicPool(baseBackend.getIntrinsicPool())
|
||||
.reservedMetadata(baseBackend.getReservedMetadata())
|
||||
.build();
|
||||
return ReadOnlyList.wrap(ordered);
|
||||
}
|
||||
|
||||
private int nextGlobalSlot(
|
||||
final ArrayList<IRGlobal> globals,
|
||||
final ModuleId moduleId) {
|
||||
var nextSlot = 0;
|
||||
for (final var global : globals) {
|
||||
if (!moduleIdsMatch(moduleId, global.moduleId())) {
|
||||
continue;
|
||||
}
|
||||
nextSlot = Math.max(nextSlot, global.slot() + 1);
|
||||
}
|
||||
return nextSlot;
|
||||
}
|
||||
|
||||
private ArrayList<IRGlobal> normalizeGlobalSlots(final ArrayList<IRGlobal> globals) {
|
||||
final var nextSlotByModule = new LinkedHashMap<ModuleId, Integer>();
|
||||
final var normalized = new ArrayList<IRGlobal>(globals.size());
|
||||
for (final var global : globals) {
|
||||
final var moduleId = normalizeModuleId(global.moduleId());
|
||||
final var slot = nextSlotByModule.getOrDefault(moduleId, 0);
|
||||
nextSlotByModule.put(moduleId, slot + 1);
|
||||
normalized.add(new IRGlobal(
|
||||
global.fileId(),
|
||||
moduleId,
|
||||
global.name(),
|
||||
global.declaredTypeSurface(),
|
||||
slot,
|
||||
global.visibility(),
|
||||
global.isHidden(),
|
||||
global.hiddenKind(),
|
||||
global.origin(),
|
||||
global.span()));
|
||||
}
|
||||
return normalized;
|
||||
}
|
||||
|
||||
private IRBackendExecutableFunction resolveExecutable(
|
||||
final ArrayList<IRBackendExecutableFunction> executableFunctions,
|
||||
private void appendDependenciesFirst(
|
||||
final ModuleId moduleId,
|
||||
final String callableName) {
|
||||
if (callableName == null || callableName.isBlank()) {
|
||||
return null;
|
||||
final Set<ModuleId> availableModules,
|
||||
final Map<ModuleId, ReadOnlyList<ModuleId>> dependenciesByModule,
|
||||
final Set<ModuleId> visiting,
|
||||
final Set<ModuleId> visited,
|
||||
final ArrayList<ModuleId> ordered) {
|
||||
if (visited.contains(moduleId) || !availableModules.contains(moduleId)) {
|
||||
return;
|
||||
}
|
||||
for (final var executable : executableFunctions) {
|
||||
if (!callableName.equals(executable.callableName())) {
|
||||
continue;
|
||||
}
|
||||
if (!moduleIdsMatch(moduleId, executable.moduleId())) {
|
||||
continue;
|
||||
}
|
||||
return executable;
|
||||
if (!visiting.add(moduleId)) {
|
||||
return;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
private IRBackendExecutableFunction.Instruction callInstruction(
|
||||
final IRBackendExecutableFunction callee,
|
||||
final Span span) {
|
||||
return new IRBackendExecutableFunction.Instruction(
|
||||
IRBackendExecutableFunction.InstructionKind.CALL_FUNC,
|
||||
callee.moduleId(),
|
||||
callee.callableName(),
|
||||
callee.callableId(),
|
||||
null,
|
||||
null,
|
||||
callee.paramSlots(),
|
||||
callee.returnSlots(),
|
||||
span);
|
||||
}
|
||||
|
||||
private IRBackendExecutableFunction.Instruction retInstruction(final Span span) {
|
||||
return new IRBackendExecutableFunction.Instruction(
|
||||
IRBackendExecutableFunction.InstructionKind.RET,
|
||||
"",
|
||||
null,
|
||||
null,
|
||||
span);
|
||||
}
|
||||
|
||||
private IRBackendExecutableFunction.Instruction getGlobalInstruction(
|
||||
final int slot,
|
||||
final Span span) {
|
||||
return new IRBackendExecutableFunction.Instruction(
|
||||
IRBackendExecutableFunction.InstructionKind.GET_GLOBAL,
|
||||
"",
|
||||
null,
|
||||
null,
|
||||
null,
|
||||
slot,
|
||||
null,
|
||||
span);
|
||||
}
|
||||
|
||||
private IRBackendExecutableFunction.Instruction setGlobalInstruction(
|
||||
final int slot,
|
||||
final Span span) {
|
||||
return new IRBackendExecutableFunction.Instruction(
|
||||
IRBackendExecutableFunction.InstructionKind.SET_GLOBAL,
|
||||
"",
|
||||
null,
|
||||
null,
|
||||
null,
|
||||
slot,
|
||||
null,
|
||||
span);
|
||||
}
|
||||
|
||||
private IRBackendExecutableFunction.Instruction pushBoolInstruction(
|
||||
final boolean value,
|
||||
final Span span) {
|
||||
return new IRBackendExecutableFunction.Instruction(
|
||||
IRBackendExecutableFunction.InstructionKind.PUSH_BOOL,
|
||||
"",
|
||||
null,
|
||||
null,
|
||||
null,
|
||||
value ? "true" : "false",
|
||||
null,
|
||||
null,
|
||||
null,
|
||||
span);
|
||||
}
|
||||
|
||||
private IRBackendExecutableFunction.Instruction eqInstruction(final Span span) {
|
||||
return new IRBackendExecutableFunction.Instruction(
|
||||
IRBackendExecutableFunction.InstructionKind.EQ,
|
||||
"",
|
||||
null,
|
||||
null,
|
||||
null,
|
||||
span);
|
||||
}
|
||||
|
||||
private IRBackendExecutableFunction.Instruction labelInstruction(
|
||||
final String label,
|
||||
final Span span) {
|
||||
return new IRBackendExecutableFunction.Instruction(
|
||||
IRBackendExecutableFunction.InstructionKind.LABEL,
|
||||
"",
|
||||
null,
|
||||
null,
|
||||
null,
|
||||
label,
|
||||
null,
|
||||
null,
|
||||
null,
|
||||
span);
|
||||
}
|
||||
|
||||
private IRBackendExecutableFunction.Instruction jumpIfTrueInstruction(
|
||||
final String targetLabel,
|
||||
final Span span) {
|
||||
return new IRBackendExecutableFunction.Instruction(
|
||||
IRBackendExecutableFunction.InstructionKind.JMP_IF_TRUE,
|
||||
"",
|
||||
null,
|
||||
null,
|
||||
null,
|
||||
null,
|
||||
targetLabel,
|
||||
null,
|
||||
null,
|
||||
span);
|
||||
}
|
||||
|
||||
private ModuleId normalizeModuleId(final ModuleId moduleId) {
|
||||
return moduleId == null ? ModuleId.none() : moduleId;
|
||||
}
|
||||
|
||||
private boolean moduleIdsMatch(
|
||||
final ModuleId left,
|
||||
final ModuleId right) {
|
||||
final var normalizedLeft = normalizeModuleId(left);
|
||||
final var normalizedRight = normalizeModuleId(right);
|
||||
if (normalizedLeft.isNone() && normalizedRight.isNone()) {
|
||||
return true;
|
||||
for (final var dependency : dependenciesByModule.getOrDefault(moduleId, ReadOnlyList.empty())) {
|
||||
appendDependenciesFirst(
|
||||
dependency,
|
||||
availableModules,
|
||||
dependenciesByModule,
|
||||
visiting,
|
||||
visited,
|
||||
ordered);
|
||||
}
|
||||
return !normalizedLeft.isNone()
|
||||
&& !normalizedRight.isNone()
|
||||
&& normalizedLeft.getIndex() == normalizedRight.getIndex();
|
||||
}
|
||||
|
||||
private String moduleSortKey(
|
||||
final IRBackend backend,
|
||||
final ModuleId moduleId) {
|
||||
if (moduleId != null && !moduleId.isNone()) {
|
||||
final var index = moduleId.getIndex();
|
||||
if (index >= 0 && index < backend.getModulePool().size()) {
|
||||
final var moduleReference = backend.getModulePool().get(index);
|
||||
final var joiner = new StringJoiner("/", moduleReference.project() + ":", "");
|
||||
for (final var segment : moduleReference.pathSegments()) {
|
||||
joiner.add(segment);
|
||||
}
|
||||
return joiner.toString();
|
||||
}
|
||||
visiting.remove(moduleId);
|
||||
if (visited.add(moduleId)) {
|
||||
ordered.add(moduleId);
|
||||
}
|
||||
return "";
|
||||
}
|
||||
|
||||
private int safeToInt(final long value) {
|
||||
if (value > Integer.MAX_VALUE) {
|
||||
return Integer.MAX_VALUE;
|
||||
}
|
||||
if (value < Integer.MIN_VALUE) {
|
||||
return Integer.MIN_VALUE;
|
||||
}
|
||||
return (int) value;
|
||||
}
|
||||
|
||||
private Set<ModuleId> blockedModulesByDependency(
|
||||
final Set<ModuleId> failedModuleIds,
|
||||
final Map<ModuleId, Set<ModuleId>> dependenciesByModule) {
|
||||
final Map<ModuleId, ReadOnlyList<ModuleId>> dependenciesByModule) {
|
||||
final Map<ModuleId, Set<ModuleId>> dependentsByModule = new HashMap<>();
|
||||
for (final var entry : dependenciesByModule.entrySet()) {
|
||||
final var importer = entry.getKey();
|
||||
|
||||
+5
-4
@@ -7,13 +7,14 @@ import p.studio.compiler.source.tables.ModuleTable;
|
||||
import p.studio.utilities.structures.ReadOnlyList;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
record PbsModuleAssembly(
|
||||
ReadOnlyList<PbsParsedSourceFile> parsedSourceFiles,
|
||||
Map<ModuleId, Set<ModuleId>> moduleDependencyGraph,
|
||||
Map<ModuleId, ReadOnlyList<ModuleId>> moduleDependencyGraph,
|
||||
ReadOnlyList<ModuleReference> canonicalModulePool,
|
||||
Set<ModuleId> failedModuleIds,
|
||||
ModuleTable moduleTable,
|
||||
@@ -26,11 +27,11 @@ record PbsModuleAssembly(
|
||||
if (moduleDependencyGraph == null || moduleDependencyGraph.isEmpty()) {
|
||||
moduleDependencyGraph = Map.of();
|
||||
} else {
|
||||
final var copiedGraph = new HashMap<ModuleId, Set<ModuleId>>();
|
||||
final var copiedGraph = new LinkedHashMap<ModuleId, ReadOnlyList<ModuleId>>();
|
||||
for (final var entry : moduleDependencyGraph.entrySet()) {
|
||||
copiedGraph.put(entry.getKey(), Set.copyOf(entry.getValue() == null ? Set.of() : entry.getValue()));
|
||||
copiedGraph.put(entry.getKey(), entry.getValue() == null ? ReadOnlyList.empty() : entry.getValue());
|
||||
}
|
||||
moduleDependencyGraph = Map.copyOf(copiedGraph);
|
||||
moduleDependencyGraph = java.util.Collections.unmodifiableMap(copiedGraph);
|
||||
}
|
||||
|
||||
if (moduleTable == null) {
|
||||
|
||||
+8
-4
@@ -353,20 +353,24 @@ final class PbsModuleAssemblyService {
|
||||
}
|
||||
}
|
||||
|
||||
private Map<ModuleId, Set<ModuleId>> buildModuleDependencyGraph(
|
||||
private Map<ModuleId, ReadOnlyList<ModuleId>> buildModuleDependencyGraph(
|
||||
final ArrayList<PbsParsedSourceFile> parsedSourceFiles,
|
||||
final ModuleTable moduleTable) {
|
||||
final Map<ModuleId, Set<ModuleId>> dependenciesByModule = new HashMap<>();
|
||||
final Map<ModuleId, LinkedHashSet<ModuleId>> dependenciesByModule = new LinkedHashMap<>();
|
||||
for (final var parsedSource : parsedSourceFiles) {
|
||||
final var moduleDependencies = dependenciesByModule.computeIfAbsent(
|
||||
parsedSource.moduleId(),
|
||||
ignored -> new HashSet<>());
|
||||
ignored -> new LinkedHashSet<>());
|
||||
for (final var importDecl : parsedSource.ast().imports()) {
|
||||
final var moduleRef = importDecl.moduleRef();
|
||||
moduleDependencies.add(moduleId(moduleTable, moduleRef.project(), moduleRef.pathSegments()));
|
||||
}
|
||||
}
|
||||
return dependenciesByModule;
|
||||
final Map<ModuleId, ReadOnlyList<ModuleId>> ordered = new LinkedHashMap<>();
|
||||
for (final var entry : dependenciesByModule.entrySet()) {
|
||||
ordered.put(entry.getKey(), ReadOnlyList.wrap(new ArrayList<>(entry.getValue())));
|
||||
}
|
||||
return java.util.Collections.unmodifiableMap(ordered);
|
||||
}
|
||||
|
||||
private ModuleId moduleId(
|
||||
|
||||
+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
|
||||
|
||||
+8
@@ -8,6 +8,7 @@ import java.nio.charset.StandardCharsets;
|
||||
import java.util.List;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertFalse;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
|
||||
class PbsLexerTest {
|
||||
@@ -34,6 +35,13 @@ class PbsLexerTest {
|
||||
.kind());
|
||||
assertEquals(PbsTokenKind.EOF, tokens.getLast().kind());
|
||||
assertTrue(diagnostics.isEmpty(), "Lexer should not report diagnostics for valid input");
|
||||
assertTrue(PbsLexer.isKeyword("fn"));
|
||||
assertTrue(PbsLexer.isKeyword("step"));
|
||||
assertTrue(PbsLexer.isIdentifierLexeme("helper"));
|
||||
assertTrue(PbsLexer.isIdentifierLexeme("_value"));
|
||||
assertFalse(PbsLexer.isIdentifierLexeme("fn"));
|
||||
assertFalse(PbsLexer.isIdentifierLexeme("1ab"));
|
||||
assertFalse(PbsLexer.isIdentifierLexeme(""));
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
+487
@@ -265,6 +265,473 @@ final class PbsEditorialSupportServiceTest {
|
||||
&& candidate.detail().equals("draw_pixel(x: int, y: int, color: int) -> void")));
|
||||
}
|
||||
|
||||
@Test
|
||||
void shouldResolveDefinitionForLocalsParametersMembersAndCanonicalImports() {
|
||||
final var source = """
|
||||
import { Log as Logger } from @sdk:log;
|
||||
|
||||
fn helper(value: int) -> int {
|
||||
let total = value;
|
||||
Logger.info("hello");
|
||||
missingName;
|
||||
return total;
|
||||
}
|
||||
""";
|
||||
final var ast = parseOrdinary(source);
|
||||
final var supplementalTopDecls = supplementalTopDecls("""
|
||||
declare service Log {
|
||||
fn info(message: str) -> void {
|
||||
return;
|
||||
}
|
||||
}
|
||||
""");
|
||||
|
||||
final var parameter = requireDefinition(source, ast, supplementalTopDecls, "value;");
|
||||
assertEquals(1, parameter.size());
|
||||
assertEquals(0, parameter.getFirst().span().getFileId().getId());
|
||||
assertTrue(parameter.getFirst().span().contains(source.indexOf("value: int")));
|
||||
|
||||
final var local = requireDefinition(source, ast, supplementalTopDecls, "total;");
|
||||
assertEquals(1, local.size());
|
||||
assertEquals(0, local.getFirst().span().getFileId().getId());
|
||||
assertTrue(local.getFirst().span().contains(source.indexOf("total = value")));
|
||||
|
||||
final var function = requireDefinition(source, ast, supplementalTopDecls, "helper(value");
|
||||
assertEquals(1, function.size());
|
||||
assertEquals(0, function.getFirst().span().getFileId().getId());
|
||||
assertTrue(function.getFirst().span().getStart() <= source.indexOf("fn helper"));
|
||||
|
||||
final var imported = requireDefinition(source, ast, supplementalTopDecls, "Logger.info");
|
||||
assertEquals(1, imported.size());
|
||||
assertEquals(100, imported.getFirst().span().getFileId().getId());
|
||||
assertNotEquals(ast.span().getFileId().getId(), imported.getFirst().span().getFileId().getId());
|
||||
|
||||
final var member = requireDefinition(source, ast, supplementalTopDecls, "info(");
|
||||
assertEquals(1, member.size());
|
||||
assertEquals(100, member.getFirst().span().getFileId().getId());
|
||||
|
||||
assertTrue(service.definition(source, ast, supplementalTopDecls, source.indexOf("fn helper")).isEmpty());
|
||||
assertTrue(service.definition(source, ast, supplementalTopDecls, source.indexOf("int")).isEmpty());
|
||||
assertTrue(service.definition(source, ast, supplementalTopDecls, source.indexOf("missingName")).isEmpty());
|
||||
}
|
||||
|
||||
@Test
|
||||
void shouldReturnEveryMatchingDeclarationLocationForOverloadedMembers() {
|
||||
final var source = """
|
||||
declare struct Vec() {
|
||||
fn blend(dx: int) -> int { return dx; }
|
||||
fn blend(dx: int, dy: int) -> int { return dx; }
|
||||
}
|
||||
|
||||
fn main(vec: Vec) -> void {
|
||||
vec.blend(1, 2);
|
||||
}
|
||||
""";
|
||||
final var ast = parseOrdinary(source);
|
||||
final var locations = requireDefinition(source, ast, ReadOnlyList.empty(), "blend(1");
|
||||
assertEquals(2, locations.size());
|
||||
assertTrue(locations.getFirst().span().contains(source.indexOf("fn blend(dx: int)")));
|
||||
assertTrue(locations.get(1).span().contains(source.indexOf("fn blend(dx: int, dy: int)")));
|
||||
}
|
||||
|
||||
@Test
|
||||
void shouldCollectSameFileReferencesForPhysicalSymbolsAndSkipTrivia() {
|
||||
final var source = """
|
||||
fn helper(value: int) -> int {
|
||||
let total = value;
|
||||
return total;
|
||||
}
|
||||
|
||||
fn frame() -> void {
|
||||
helper(1);
|
||||
helper(2);
|
||||
// helper
|
||||
let text = "helper";
|
||||
missingName;
|
||||
}
|
||||
""";
|
||||
final var ast = parseOrdinary(source);
|
||||
|
||||
final var helperRefs = service.references(source, ast, ReadOnlyList.empty(), source.indexOf("helper(1)"));
|
||||
assertEquals(3, helperRefs.size(), helperRefs.toString());
|
||||
assertTrue(helperRefs.stream().anyMatch(location -> location.span().contains(source.indexOf("helper(value"))));
|
||||
assertTrue(helperRefs.stream().anyMatch(location -> location.span().contains(source.indexOf("helper(1)"))));
|
||||
assertTrue(helperRefs.stream().anyMatch(location -> location.span().contains(source.indexOf("helper(2)"))));
|
||||
assertTrue(helperRefs.stream().noneMatch(location -> location.span().contains(source.indexOf("// helper"))));
|
||||
assertTrue(helperRefs.stream().noneMatch(location -> location.span().contains(source.indexOf("\"helper\""))));
|
||||
|
||||
final var parameterRefs = service.references(source, ast, ReadOnlyList.empty(), source.indexOf("value;"));
|
||||
assertEquals(2, parameterRefs.size());
|
||||
assertTrue(parameterRefs.stream().anyMatch(location -> location.span().contains(source.indexOf("value: int"))));
|
||||
assertTrue(parameterRefs.stream().anyMatch(location -> location.span().contains(source.indexOf("value;"))));
|
||||
|
||||
final var localRefs = service.references(source, ast, ReadOnlyList.empty(), source.indexOf("total;"));
|
||||
assertEquals(1, localRefs.size());
|
||||
assertTrue(localRefs.getFirst().span().contains(source.indexOf("total;")));
|
||||
assertTrue(service.definition(source, ast, ReadOnlyList.empty(), source.indexOf("total = value")).isEmpty());
|
||||
|
||||
assertTrue(service.references(source, ast, ReadOnlyList.empty(), source.indexOf("fn helper")).isEmpty());
|
||||
assertTrue(service.references(source, ast, ReadOnlyList.empty(), source.indexOf("int")).isEmpty());
|
||||
assertTrue(service.references(source, ast, ReadOnlyList.empty(), source.indexOf("missingName")).isEmpty());
|
||||
}
|
||||
|
||||
@Test
|
||||
void shouldCollectImportedAndOverloadedReferencesByDefinitionIntersection() {
|
||||
final var importedSource = """
|
||||
declare service Log {
|
||||
fn info(message: str) -> void {
|
||||
return;
|
||||
}
|
||||
}
|
||||
""";
|
||||
final var importedAst = parseInterface(importedSource, new FileId(100));
|
||||
final var source = """
|
||||
import { Log as Logger } from @sdk:log;
|
||||
|
||||
declare struct Vec() {
|
||||
fn blend(dx: int) -> int { return dx; }
|
||||
fn blend(dx: int, dy: int) -> int { return dx; }
|
||||
}
|
||||
|
||||
fn frame(vec: Vec) -> void {
|
||||
Logger.info("a");
|
||||
Logger.info("b");
|
||||
vec.blend(1, 2);
|
||||
}
|
||||
""";
|
||||
final var ast = parseOrdinary(source);
|
||||
final var supplementalTopDecls = importedAst.topDecls();
|
||||
|
||||
final var infoRefs = service.references(
|
||||
new PbsEditorialSupportService.EditorialDocument(source, ast, supplementalTopDecls, null),
|
||||
source.indexOf("info(\"a\")"),
|
||||
List.of(
|
||||
new PbsEditorialSupportService.EditorialDocument(source, ast, supplementalTopDecls, null),
|
||||
new PbsEditorialSupportService.EditorialDocument(
|
||||
importedSource,
|
||||
importedAst,
|
||||
ReadOnlyList.empty(),
|
||||
null)));
|
||||
assertEquals(2, infoRefs.stream().filter(location -> location.span().getFileId().getId() == 0).count());
|
||||
assertTrue(infoRefs.stream().anyMatch(location -> location.span().contains(source.indexOf("info(\"a\")"))));
|
||||
assertTrue(infoRefs.stream().anyMatch(location -> location.span().contains(source.indexOf("info(\"b\")"))));
|
||||
|
||||
final var blendRefs = service.references(source, ast, supplementalTopDecls, source.indexOf("blend(1"));
|
||||
assertTrue(blendRefs.stream().anyMatch(location -> location.span().contains(source.indexOf("blend(1"))));
|
||||
final var blendIdentity = service.definition(source, ast, supplementalTopDecls, source.indexOf("blend(1"));
|
||||
assertEquals(2, blendIdentity.size());
|
||||
}
|
||||
|
||||
private List<PbsEditorialLocation> requireDefinition(
|
||||
final String source,
|
||||
final PbsAst.File ast,
|
||||
final ReadOnlyList<PbsAst.TopDecl> supplementalTopDecls,
|
||||
final String needle) {
|
||||
final int offset = source.indexOf(needle);
|
||||
assertTrue(offset >= 0, "Expected to find needle: " + needle);
|
||||
final var locations = service.definition(source, ast, supplementalTopDecls, offset);
|
||||
assertFalse(locations.isEmpty(), "Expected definition for needle: " + needle);
|
||||
return locations;
|
||||
}
|
||||
|
||||
@Test
|
||||
void shouldBuildAstBackedOutlineHierarchyAndKeepOverloadsAsSiblings() {
|
||||
final var source = """
|
||||
import { Log } from @sdk:log;
|
||||
|
||||
[Init]
|
||||
fn init() -> void { return; }
|
||||
fn helper(a: int) -> int { return a; }
|
||||
fn helper(a: int, b: int) -> int { return a; }
|
||||
declare struct Point(x: int, pub y: int) {
|
||||
ctor make(x: int) { return; }
|
||||
fn run() -> void { return; }
|
||||
}
|
||||
declare contract TickLike { fn tick(dt: int) -> void; }
|
||||
declare service Physics { fn tick() -> void { return; } }
|
||||
declare error Io { NotFound; Busy; }
|
||||
declare enum Mode(Idle = 0, Run = 1);
|
||||
declare callback OnClick(x: int) -> result<Io> int;
|
||||
declare global STATE: int = 10;
|
||||
declare const LIMIT: int = 10;
|
||||
implements TickLike for Point using s { fn tick(dt: int) -> void { return; } }
|
||||
|
||||
fn frame() -> void {
|
||||
let local = 1;
|
||||
helper(local);
|
||||
}
|
||||
""";
|
||||
final var ast = parseOrdinary(source);
|
||||
final var symbols = service.documentSymbols(ast);
|
||||
|
||||
assertEquals(List.of(
|
||||
"init",
|
||||
"helper",
|
||||
"helper",
|
||||
"Point",
|
||||
"TickLike",
|
||||
"Physics",
|
||||
"Io",
|
||||
"Mode",
|
||||
"OnClick",
|
||||
"STATE",
|
||||
"LIMIT",
|
||||
"TickLike",
|
||||
"frame"), names(symbols));
|
||||
assertTrue(symbols.stream().noneMatch(symbol -> symbol.name().equals("Log") || symbol.name().equals("local")));
|
||||
assertTrue(symbols.getFirst().name().equals("init"));
|
||||
assertFalse(symbols.getFirst().name().contains("Init"));
|
||||
assertEquals("(a: int) -> int", symbols.get(1).detail());
|
||||
assertEquals("(a: int, b: int) -> int", symbols.get(2).detail());
|
||||
|
||||
final var point = requireNamed(symbols, "Point");
|
||||
assertEquals(PbsEditorialSymbolKind.STRUCT, point.kind());
|
||||
assertEquals(List.of("x", "y", "make", "run"), names(point.children()));
|
||||
assertEquals(PbsEditorialSymbolKind.FIELD, point.children().getFirst().kind());
|
||||
assertEquals("int", point.children().getFirst().detail());
|
||||
assertEquals(PbsEditorialSymbolKind.CONSTRUCTOR, point.children().get(2).kind());
|
||||
assertEquals("(x: int)", point.children().get(2).detail());
|
||||
assertEquals(PbsEditorialSymbolKind.METHOD, point.children().get(3).kind());
|
||||
|
||||
final var contract = symbols.get(4);
|
||||
assertEquals(PbsEditorialSymbolKind.CONTRACT, contract.kind());
|
||||
assertEquals(List.of("tick"), names(contract.children()));
|
||||
assertEquals("(dt: int) -> void", contract.children().getFirst().detail());
|
||||
|
||||
final var physics = requireNamed(symbols, "Physics");
|
||||
assertEquals(PbsEditorialSymbolKind.SERVICE, physics.kind());
|
||||
assertEquals(List.of("tick"), names(physics.children()));
|
||||
|
||||
final var error = requireNamed(symbols, "Io");
|
||||
assertEquals(PbsEditorialSymbolKind.ERROR, error.kind());
|
||||
assertEquals(List.of("NotFound", "Busy"), names(error.children()));
|
||||
|
||||
final var mode = requireNamed(symbols, "Mode");
|
||||
assertEquals(PbsEditorialSymbolKind.ENUM, mode.kind());
|
||||
assertEquals(List.of("Idle", "Run"), names(mode.children()));
|
||||
assertEquals("0", mode.children().getFirst().detail());
|
||||
|
||||
final var callback = requireNamed(symbols, "OnClick");
|
||||
assertEquals(PbsEditorialSymbolKind.CALLBACK, callback.kind());
|
||||
assertEquals("(x: int) -> result<Io> int", callback.detail());
|
||||
|
||||
assertEquals(PbsEditorialSymbolKind.GLOBAL, requireNamed(symbols, "STATE").kind());
|
||||
assertEquals("int", requireNamed(symbols, "STATE").detail());
|
||||
assertEquals(PbsEditorialSymbolKind.CONST, requireNamed(symbols, "LIMIT").kind());
|
||||
|
||||
final var implementsSymbol = symbols.get(11);
|
||||
assertEquals("TickLike", implementsSymbol.name());
|
||||
assertEquals("Point", implementsSymbol.detail());
|
||||
assertEquals(PbsEditorialSymbolKind.CONTRACT, implementsSymbol.kind());
|
||||
assertEquals(List.of("tick"), names(implementsSymbol.children()));
|
||||
}
|
||||
|
||||
@Test
|
||||
void shouldFlattenOutlineMembersForWorkspaceSearchAndFilterByName() {
|
||||
final var source = """
|
||||
import { Log } from @sdk:log;
|
||||
|
||||
declare struct Vec(x: int) {
|
||||
ctor make(x: int) { return; }
|
||||
fn blend(dx: int, dy: int) -> int { return dx; }
|
||||
}
|
||||
|
||||
fn helper() -> int { return 42; }
|
||||
fn helper(value: int) -> int { return value; }
|
||||
|
||||
fn frame() -> void {
|
||||
let local = 1;
|
||||
helper(local);
|
||||
}
|
||||
""";
|
||||
final var ast = parseOrdinary(source);
|
||||
final var all = service.workspaceSymbols(ast, "");
|
||||
assertEquals(List.of(
|
||||
"Vec",
|
||||
"x",
|
||||
"make",
|
||||
"blend",
|
||||
"helper",
|
||||
"helper",
|
||||
"frame"), all.stream().map(PbsEditorialWorkspaceSymbol::name).toList());
|
||||
assertEquals("", all.getFirst().containerName());
|
||||
assertEquals("Vec", all.stream().filter(symbol -> symbol.name().equals("blend")).findFirst().orElseThrow().containerName());
|
||||
assertEquals("Vec", all.stream().filter(symbol -> symbol.name().equals("x")).findFirst().orElseThrow().containerName());
|
||||
assertTrue(all.stream().noneMatch(symbol -> symbol.name().equals("Log") || symbol.name().equals("local")));
|
||||
|
||||
final var blendHits = service.workspaceSymbols(ast, "BLEND");
|
||||
assertEquals(List.of("blend"), blendHits.stream().map(PbsEditorialWorkspaceSymbol::name).toList());
|
||||
assertEquals("Vec", blendHits.getFirst().containerName());
|
||||
|
||||
final var helperHits = service.workspaceSymbols(ast, "helper");
|
||||
assertEquals(2, helperHits.size());
|
||||
assertNotEquals(helperHits.getFirst().detail(), helperHits.get(1).detail());
|
||||
|
||||
final var qualifiedMiss = service.workspaceSymbols(ast, "Vec.blend");
|
||||
assertTrue(qualifiedMiss.isEmpty());
|
||||
}
|
||||
|
||||
@Test
|
||||
void shouldOmitInvalidDeclarationsAndKeepNamedDeclsFromRecoveredAst() {
|
||||
final var source = """
|
||||
declare ;
|
||||
fn ok() -> int { return 1; }
|
||||
""";
|
||||
final var ast = parseAllowingErrors(source);
|
||||
final var symbols = service.documentSymbols(ast);
|
||||
assertEquals(List.of("ok"), names(symbols));
|
||||
assertEquals(PbsEditorialSymbolKind.FUNCTION, symbols.getFirst().kind());
|
||||
final var workspaceSymbols = service.workspaceSymbols(ast, "");
|
||||
assertEquals(List.of("ok"), workspaceSymbols.stream().map(PbsEditorialWorkspaceSymbol::name).toList());
|
||||
}
|
||||
|
||||
@Test
|
||||
void shouldOutlineHostAndBuiltinTypeDeclarationsFromInterfaceModules() {
|
||||
final var source = """
|
||||
declare host Gfx {
|
||||
fn clear(color: int) -> void;
|
||||
}
|
||||
declare builtin type Color(
|
||||
pub r: int
|
||||
) {
|
||||
fn pack() -> int;
|
||||
}
|
||||
""";
|
||||
final var ast = parseInterface(source, new FileId(0));
|
||||
final var symbols = service.documentSymbols(ast);
|
||||
assertEquals(List.of("Gfx", "Color"), names(symbols));
|
||||
assertEquals(PbsEditorialSymbolKind.HOST, symbols.getFirst().kind());
|
||||
assertEquals(List.of("clear"), names(symbols.getFirst().children()));
|
||||
assertEquals(PbsEditorialSymbolKind.BUILTIN_TYPE, symbols.get(1).kind());
|
||||
assertEquals(List.of("r", "pack"), names(symbols.get(1).children()));
|
||||
}
|
||||
|
||||
@Test
|
||||
void renameRewritesPhysicalFunctionSitesAndSkipsCommentsStringsAndCollisions() {
|
||||
final var source = """
|
||||
fn helper() -> int { return 1; }
|
||||
|
||||
fn helper(value: int) -> int { return value; }
|
||||
|
||||
fn frame() -> void {
|
||||
helper();
|
||||
helper(2);
|
||||
// helper
|
||||
let text = "helper";
|
||||
}
|
||||
""";
|
||||
final var ast = parseOrdinary(source);
|
||||
final var renamed = service.rename(source, ast, ReadOnlyList.empty(), source.indexOf("helper();"), "aid");
|
||||
assertTrue(renamed.allowed(), renamed.refusal());
|
||||
assertEquals(4, renamed.sites().size(), renamed.sites().toString());
|
||||
assertTrue(service.prepareRename(source, ast, ReadOnlyList.empty(), source.indexOf("helper();")).isPresent());
|
||||
|
||||
final var keyword = service.rename(source, ast, ReadOnlyList.empty(), source.indexOf("helper();"), "fn");
|
||||
assertFalse(keyword.allowed());
|
||||
assertEquals("invalid identifier", keyword.refusal());
|
||||
|
||||
final var collision = service.rename(source, ast, ReadOnlyList.empty(), source.indexOf("helper();"), "frame");
|
||||
assertFalse(collision.allowed());
|
||||
assertEquals("name collision", collision.refusal());
|
||||
}
|
||||
|
||||
@Test
|
||||
void renameAllowsLocalNameSpanAndRefusesAliasBuiltinAndErrorLabel() {
|
||||
final var source = """
|
||||
import { Log as Logger } from @sdk:log;
|
||||
|
||||
declare error Boom {
|
||||
Missing;
|
||||
}
|
||||
|
||||
fn frame() -> void {
|
||||
let total = 1;
|
||||
Logger.info("x");
|
||||
let n: int = total;
|
||||
n;
|
||||
}
|
||||
""";
|
||||
final var ast = parseOrdinary(source);
|
||||
final var supplemental = supplementalTopDecls("""
|
||||
declare service Log {
|
||||
fn info(message: str) -> void {
|
||||
return;
|
||||
}
|
||||
}
|
||||
""");
|
||||
|
||||
final var local = service.rename(
|
||||
source,
|
||||
ast,
|
||||
supplemental,
|
||||
source.indexOf("total ="),
|
||||
"sum");
|
||||
assertTrue(local.allowed(), local.refusal());
|
||||
assertEquals(2, local.sites().size(), local.sites().toString());
|
||||
|
||||
final var alias = service.prepareRename(
|
||||
source,
|
||||
ast,
|
||||
supplemental,
|
||||
source.indexOf("Logger.info"));
|
||||
assertTrue(alias.isEmpty());
|
||||
|
||||
final var builtin = service.prepareRename(
|
||||
source,
|
||||
ast,
|
||||
supplemental,
|
||||
source.indexOf("int = total"));
|
||||
assertTrue(builtin.isEmpty());
|
||||
|
||||
final var errorLabel = service.prepareRename(
|
||||
source,
|
||||
ast,
|
||||
supplemental,
|
||||
source.indexOf("Missing"));
|
||||
assertTrue(errorLabel.isEmpty());
|
||||
}
|
||||
|
||||
@Test
|
||||
void renameOfExportDoesNotRewriteDifferingAlias() {
|
||||
final var exporter = """
|
||||
fn helper() -> int { return 1; }
|
||||
""";
|
||||
final var importer = """
|
||||
import { helper as aid } from @sdk:log;
|
||||
|
||||
fn frame() -> void {
|
||||
aid();
|
||||
}
|
||||
""";
|
||||
final var exporterAst = parse(exporter, new FileId(1), PbsParser.ParseMode.ORDINARY);
|
||||
final var importerAst = parseOrdinary(importer);
|
||||
final var exporterDoc = new PbsEditorialSupportService.EditorialDocument(
|
||||
exporter,
|
||||
exporterAst,
|
||||
ReadOnlyList.empty(),
|
||||
p.studio.compiler.messages.FESurfaceContext.empty());
|
||||
final var importerDoc = new PbsEditorialSupportService.EditorialDocument(
|
||||
importer,
|
||||
importerAst,
|
||||
exporterAst.topDecls(),
|
||||
p.studio.compiler.messages.FESurfaceContext.empty());
|
||||
final var renamed = service.rename(
|
||||
exporterDoc,
|
||||
exporter.indexOf("helper"),
|
||||
"renamed",
|
||||
List.of(exporterDoc, importerDoc));
|
||||
assertTrue(renamed.allowed(), renamed.refusal());
|
||||
assertEquals(2, renamed.sites().size(), renamed.sites().toString());
|
||||
assertTrue(renamed.sites().stream().anyMatch(site ->
|
||||
site.span().getFileId().equals(exporterAst.span().getFileId())));
|
||||
assertTrue(renamed.sites().stream().anyMatch(site ->
|
||||
site.span().getFileId().equals(importerAst.span().getFileId())));
|
||||
final int aliasUse = importer.indexOf("aid();");
|
||||
assertTrue(renamed.sites().stream().noneMatch(site ->
|
||||
site.span().getFileId().equals(importerAst.span().getFileId())
|
||||
&& site.span().getStart() == aliasUse));
|
||||
}
|
||||
|
||||
private PbsEditorialResolvedSymbol requireHover(
|
||||
final String source,
|
||||
final PbsAst.File ast,
|
||||
@@ -286,6 +753,26 @@ final class PbsEditorialSupportServiceTest {
|
||||
return ReadOnlyList.wrap(topDecls);
|
||||
}
|
||||
|
||||
private List<String> names(final List<PbsEditorialDocumentSymbol> symbols) {
|
||||
return symbols.stream().map(PbsEditorialDocumentSymbol::name).toList();
|
||||
}
|
||||
|
||||
private PbsEditorialDocumentSymbol requireNamed(
|
||||
final List<PbsEditorialDocumentSymbol> symbols,
|
||||
final String name) {
|
||||
return symbols.stream()
|
||||
.filter(symbol -> symbol.name().equals(name))
|
||||
.findFirst()
|
||||
.orElseThrow(() -> new AssertionError("missing symbol: " + name + " in " + names(symbols)));
|
||||
}
|
||||
|
||||
private PbsAst.File parseAllowingErrors(final String source) {
|
||||
final var diagnostics = DiagnosticSink.empty();
|
||||
final var fileId = new FileId(0);
|
||||
final var tokens = PbsLexer.lex(source, fileId, diagnostics);
|
||||
return PbsParser.parse(tokens, fileId, diagnostics, PbsParser.ParseMode.ORDINARY);
|
||||
}
|
||||
|
||||
private PbsAst.File parseOrdinary(final String source) {
|
||||
return parse(source, new FileId(0), PbsParser.ParseMode.ORDINARY);
|
||||
}
|
||||
|
||||
+234
@@ -0,0 +1,234 @@
|
||||
package p.studio.compiler.pbs.semantics;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
import p.studio.compiler.models.SourceKind;
|
||||
import p.studio.compiler.pbs.ast.PbsAst;
|
||||
import p.studio.compiler.pbs.lexer.PbsLexer;
|
||||
import p.studio.compiler.pbs.parser.PbsParser;
|
||||
import p.studio.compiler.source.diagnostics.Diagnostic;
|
||||
import p.studio.compiler.source.diagnostics.DiagnosticSink;
|
||||
import p.studio.compiler.source.identifiers.FileId;
|
||||
import p.studio.compiler.source.tables.NameTable;
|
||||
|
||||
import java.util.Comparator;
|
||||
import java.util.List;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertFalse;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
|
||||
class PbsQuickFixCollectorTest {
|
||||
|
||||
@Test
|
||||
void duplicateDocRepairsMatchValidatorSpansAndKeepTheFirstCopy() {
|
||||
final var parsed = parse("""
|
||||
[Doc(markdown = \"""
|
||||
First.
|
||||
\""")]
|
||||
[Doc(markdown = \"""
|
||||
Second.
|
||||
\""")]
|
||||
[Doc(markdown = \"""
|
||||
Third.
|
||||
\""")]
|
||||
fn duplicated() -> void { return; }
|
||||
|
||||
declare struct Player(x: int) {
|
||||
[Doc(markdown = \"""
|
||||
Kept.
|
||||
\""")]
|
||||
[Doc(markdown = \"""
|
||||
Extra method.
|
||||
\""")]
|
||||
fn update() -> void { return; }
|
||||
}
|
||||
""", SourceKind.PROJECT);
|
||||
|
||||
final var duplicates = diagnostics(parsed, PbsSemanticsErrors.E_SEM_DUPLICATE_RESERVED_ATTRIBUTE.name());
|
||||
assertEquals(3, duplicates.size(), parsed.diagnostics().stream().map(Diagnostic::getMessage).toList().toString());
|
||||
assertEquals(3, parsed.repairs().size());
|
||||
assertTrue(parsed.repairs().stream().allMatch(repair ->
|
||||
repair.newText().isEmpty()
|
||||
&& repair.title().equals(PbsQuickFixCollector.REMOVE_DUPLICATE_TITLE)
|
||||
&& repair.diagnosticCode().equals(PbsSemanticsErrors.E_SEM_DUPLICATE_RESERVED_ATTRIBUTE.name())));
|
||||
assertRepairsMatchDiagnostics(parsed);
|
||||
|
||||
final String edited = apply(parsed.source(), parsed.repairs());
|
||||
assertTrue(edited.contains("First."));
|
||||
assertTrue(edited.contains("Kept."));
|
||||
assertFalse(edited.contains("Second."));
|
||||
assertFalse(edited.contains("Third."));
|
||||
assertFalse(edited.contains("Extra method."));
|
||||
}
|
||||
|
||||
@Test
|
||||
void malformedAndEmptyDocProduceNoRepair() {
|
||||
final var parsed = parse("""
|
||||
[Doc(text = \"""
|
||||
Wrong argument.
|
||||
\""")]
|
||||
fn malformed() -> void { return; }
|
||||
|
||||
[Doc(markdown = \"""
|
||||
|
||||
\""")]
|
||||
fn empty() -> void { return; }
|
||||
|
||||
[InitAllowed(flag = 1)]
|
||||
fn frame() -> void { return; }
|
||||
""", SourceKind.PROJECT);
|
||||
|
||||
assertTrue(diagnostics(parsed, PbsSemanticsErrors.E_SEM_MALFORMED_RESERVED_ATTRIBUTE.name()).size() >= 2);
|
||||
assertTrue(parsed.repairs().isEmpty(), parsed.repairs().toString());
|
||||
}
|
||||
|
||||
@Test
|
||||
void initAllowedArgumentsAreRewrittenOnlyForInterfaceHostSignatures() {
|
||||
final var parsed = parse("""
|
||||
declare host Gfx {
|
||||
[Host(module = "gfx2d", name = "clear", version = 1)]
|
||||
[InitAllowed(flag = 1)]
|
||||
fn clear() -> void;
|
||||
|
||||
[Host(module = "gfx2d", name = "fill", version = 1)]
|
||||
[InitAllowed()]
|
||||
fn fill() -> void;
|
||||
|
||||
[Host(module = "gfx2d", name = "blit", version = 1)]
|
||||
[InitAllowed]
|
||||
fn blit() -> void;
|
||||
|
||||
[Host(module = "gfx2d")]
|
||||
fn broken() -> void;
|
||||
|
||||
[Host(module = "gfx2d", name = "copy", version = 1)]
|
||||
[Host(module = "gfx2d", name = "copy", version = 1)]
|
||||
fn copy() -> void;
|
||||
}
|
||||
""", SourceKind.SDK_INTERFACE);
|
||||
|
||||
final var argumentRepairs = parsed.repairs().stream()
|
||||
.filter(repair -> repair.newText().equals("[InitAllowed]"))
|
||||
.toList();
|
||||
assertEquals(1, argumentRepairs.size(), parsed.repairs().toString());
|
||||
assertEquals(PbsSemanticsErrors.E_SEM_MALFORMED_RESERVED_ATTRIBUTE.name(), argumentRepairs.getFirst().diagnosticCode());
|
||||
assertEquals(PbsQuickFixCollector.REMOVE_INIT_ALLOWED_ARGUMENTS_TITLE, argumentRepairs.getFirst().title());
|
||||
assertRepairsMatchDiagnostics(parsed);
|
||||
|
||||
final var duplicateRepairs = parsed.repairs().stream()
|
||||
.filter(repair -> repair.diagnosticCode().equals(PbsSemanticsErrors.E_SEM_DUPLICATE_RESERVED_ATTRIBUTE.name()))
|
||||
.toList();
|
||||
assertEquals(1, duplicateRepairs.size());
|
||||
assertTrue(duplicateRepairs.getFirst().newText().isEmpty());
|
||||
|
||||
final String edited = apply(parsed.source(), parsed.repairs());
|
||||
assertTrue(edited.contains("[InitAllowed]\n"));
|
||||
assertFalse(edited.contains("flag = 1"));
|
||||
assertTrue(edited.contains("[InitAllowed()]"));
|
||||
assertEquals(1, count(edited, "[Host(module = \"gfx2d\", name = \"copy\", version = 1)]"));
|
||||
|
||||
final var projectHost = parse("""
|
||||
declare host Gfx {
|
||||
[Host(module = "gfx2d", name = "clear", version = 1)]
|
||||
[InitAllowed(flag = 1)]
|
||||
fn clear() -> void;
|
||||
}
|
||||
""", SourceKind.PROJECT);
|
||||
assertTrue(projectHost.repairs().stream().noneMatch(repair -> repair.newText().equals("[InitAllowed]")));
|
||||
}
|
||||
|
||||
@Test
|
||||
void builtinConstTypeIntrinsicAndAssetLoweringDuplicatesAreDeleted() {
|
||||
final var parsed = parse("""
|
||||
[BuiltinType(name = "Color", version = 1)]
|
||||
[BuiltinType(name = "Color", version = 1)]
|
||||
declare builtin type Color(
|
||||
pub raw: int
|
||||
) {
|
||||
[IntrinsicCall(name = "width", version = 1)]
|
||||
[IntrinsicCall(name = "width", version = 1)]
|
||||
fn width() -> int;
|
||||
}
|
||||
[BuiltinConst(target = "Color", name = "white", version = 1)]
|
||||
[BuiltinConst(target = "Color", name = "white", version = 1)]
|
||||
declare const WHITE: Color;
|
||||
declare host LowAssets {
|
||||
[Host(module = "asset", name = "load", version = 1)]
|
||||
[AssetLowering(param = 0)]
|
||||
[AssetLowering(param = 0)]
|
||||
fn load(addressable: int) -> void;
|
||||
}
|
||||
""", SourceKind.SDK_INTERFACE);
|
||||
|
||||
assertEquals(4, parsed.repairs().size(), parsed.repairs().toString());
|
||||
assertTrue(parsed.repairs().stream().allMatch(repair ->
|
||||
repair.newText().isEmpty()
|
||||
&& repair.diagnosticCode().equals(PbsSemanticsErrors.E_SEM_DUPLICATE_RESERVED_ATTRIBUTE.name())));
|
||||
assertRepairsMatchDiagnostics(parsed);
|
||||
final String edited = apply(parsed.source(), parsed.repairs());
|
||||
assertEquals(1, count(edited, "[BuiltinType(name = \"Color\", version = 1)]"));
|
||||
assertEquals(1, count(edited, "[IntrinsicCall(name = \"width\", version = 1)]"));
|
||||
assertEquals(1, count(edited, "[BuiltinConst(target = \"Color\", name = \"white\", version = 1)]"));
|
||||
assertEquals(1, count(edited, "[AssetLowering(param = 0)]"));
|
||||
}
|
||||
|
||||
private static Parsed parse(final String source, final SourceKind sourceKind) {
|
||||
final var diagnostics = DiagnosticSink.empty();
|
||||
final var fileId = new FileId(0);
|
||||
final var tokens = PbsLexer.lex(source, fileId, diagnostics);
|
||||
final var parseMode = sourceKind == SourceKind.SDK_INTERFACE
|
||||
? PbsParser.ParseMode.INTERFACE_MODULE
|
||||
: PbsParser.ParseMode.ORDINARY;
|
||||
final PbsAst.File ast = PbsParser.parse(tokens, fileId, diagnostics, parseMode);
|
||||
new PbsDeclarationSemanticsValidator(new NameTable()).validate(ast, sourceKind, diagnostics);
|
||||
return new Parsed(
|
||||
source,
|
||||
diagnostics,
|
||||
PbsQuickFixCollector.collect(ast, sourceKind == SourceKind.SDK_INTERFACE));
|
||||
}
|
||||
|
||||
private static List<Diagnostic> diagnostics(final Parsed parsed, final String code) {
|
||||
return parsed.diagnostics().stream().filter(diagnostic -> diagnostic.getCode().equals(code)).toList();
|
||||
}
|
||||
|
||||
private static void assertRepairsMatchDiagnostics(final Parsed parsed) {
|
||||
for (final PbsQuickFix repair : parsed.repairs()) {
|
||||
assertTrue(parsed.diagnostics().stream().anyMatch(diagnostic ->
|
||||
diagnostic.getCode().equals(repair.diagnosticCode())
|
||||
&& diagnostic.getSpan().getStart() == repair.startOffset()
|
||||
&& diagnostic.getSpan().getEnd() == repair.endOffset()),
|
||||
repair + " missing from " + parsed.diagnostics());
|
||||
}
|
||||
}
|
||||
|
||||
private static String apply(final String source, final List<PbsQuickFix> repairs) {
|
||||
final var ordered = repairs.stream()
|
||||
.sorted(Comparator.comparingInt(PbsQuickFix::startOffset).reversed())
|
||||
.toList();
|
||||
String current = source;
|
||||
for (final PbsQuickFix repair : ordered) {
|
||||
current = current.substring(0, repair.startOffset()) + repair.newText() + current.substring(repair.endOffset());
|
||||
}
|
||||
return current;
|
||||
}
|
||||
|
||||
private static int count(final String source, final String needle) {
|
||||
int count = 0;
|
||||
int from = 0;
|
||||
while (from <= source.length()) {
|
||||
final int found = source.indexOf(needle, from);
|
||||
if (found < 0) {
|
||||
return count;
|
||||
}
|
||||
count += 1;
|
||||
from = found + needle.length();
|
||||
}
|
||||
return count;
|
||||
}
|
||||
|
||||
private record Parsed(
|
||||
String source,
|
||||
DiagnosticSink diagnostics,
|
||||
List<PbsQuickFix> repairs) {
|
||||
}
|
||||
}
|
||||
+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
|
||||
|
||||
+2
@@ -500,6 +500,8 @@ public class LowerToIRVMService {
|
||||
}
|
||||
|
||||
private void validateCommonLifecycleStructure(final IRBackend backend) {
|
||||
// Backend precondition on an already-assembled handoff. Declaration
|
||||
// validation and materialization belong to LifecycleAssemblerService.
|
||||
if (backend.getSyntheticFunctions().isEmpty()) {
|
||||
return;
|
||||
}
|
||||
|
||||
+532
@@ -0,0 +1,532 @@
|
||||
package p.studio.compiler.lifecycle;
|
||||
|
||||
import p.studio.compiler.messages.BuildingIssueSink;
|
||||
import p.studio.compiler.models.*;
|
||||
import p.studio.compiler.source.Span;
|
||||
import p.studio.compiler.source.identifiers.CallableId;
|
||||
import p.studio.compiler.source.identifiers.ModuleId;
|
||||
import p.studio.compiler.source.tables.CallableSignatureRef;
|
||||
import p.studio.utilities.structures.ReadOnlyList;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashSet;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.Set;
|
||||
|
||||
public final class LifecycleAssemblerService {
|
||||
public static final String PHASE = "lifecycle-assembly";
|
||||
public static final String INVALID_DECLARATION = "COMMON_LIFECYCLE_INVALID_DECLARATION";
|
||||
|
||||
public IRBackend assemble(
|
||||
final IRBackend backend,
|
||||
final BuildingIssueSink issues) {
|
||||
if (backend == null) {
|
||||
report(issues, null, "IRBackend is required for lifecycle assembly");
|
||||
return null;
|
||||
}
|
||||
final var declaration = backend.getLifecycleDeclaration();
|
||||
if (declaration == null) {
|
||||
return backend;
|
||||
}
|
||||
if (!validate(backend, declaration, issues)) {
|
||||
return backend;
|
||||
}
|
||||
|
||||
final var callableSignatures = new ArrayList<>(backend.getCallableSignatures().asList());
|
||||
final var executableFunctions = new ArrayList<>(backend.getExecutableFunctions().asList());
|
||||
final var syntheticFunctions = new ArrayList<>(backend.getSyntheticFunctions().asList());
|
||||
final var globals = new ArrayList<>(backend.getGlobals().asList());
|
||||
final var moduleInitCallableIds = new LinkedHashMap<ModuleId, CallableId>();
|
||||
|
||||
for (final var module : declaration.modules()) {
|
||||
if (module.fileInitFragments().isEmpty()) {
|
||||
continue;
|
||||
}
|
||||
final var moduleId = module.moduleId();
|
||||
final var moduleInitName = moduleInitCallableName(moduleId);
|
||||
final var moduleInitCallableId = new CallableId(callableSignatures.size());
|
||||
callableSignatures.add(new CallableSignatureRef(moduleId, moduleInitName, 0, "() -> unit"));
|
||||
moduleInitCallableIds.put(moduleId, moduleInitCallableId);
|
||||
|
||||
final var instructions = new ArrayList<IRBackendExecutableFunction.Instruction>();
|
||||
IRBackendExecutableFunction anchor = null;
|
||||
for (final var fragment : module.fileInitFragments()) {
|
||||
final var executable = resolveExecutable(backend, fragment);
|
||||
instructions.add(callInstruction(executable, fragment.origin()));
|
||||
anchor = executable;
|
||||
}
|
||||
instructions.add(retInstruction(anchor.span()));
|
||||
executableFunctions.add(new IRBackendExecutableFunction(
|
||||
anchor.fileId(),
|
||||
moduleId,
|
||||
moduleInitName,
|
||||
moduleInitCallableId,
|
||||
anchor.sourceStart(),
|
||||
anchor.sourceEnd(),
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
1,
|
||||
ReadOnlyList.wrap(instructions),
|
||||
anchor.span()));
|
||||
syntheticFunctions.add(new IRSyntheticFunction(
|
||||
moduleId,
|
||||
moduleInitName,
|
||||
IRSyntheticCallableKind.MODULE_INIT,
|
||||
new IRSyntheticOrigin(anchor.fileId(), anchor.callableName(), anchor.span())));
|
||||
}
|
||||
|
||||
final var frameExecutable = resolveExecutable(backend, declaration.frameRoot());
|
||||
final var entryPointModuleId = frameExecutable.moduleId();
|
||||
|
||||
CallableId projectInitCallableId = null;
|
||||
if (declaration.projectInit() != null) {
|
||||
final var projectInitTarget = resolveExecutable(backend, declaration.projectInit());
|
||||
final var projectInitName = projectInitCallableName(entryPointModuleId);
|
||||
projectInitCallableId = new CallableId(callableSignatures.size());
|
||||
callableSignatures.add(new CallableSignatureRef(
|
||||
entryPointModuleId,
|
||||
projectInitName,
|
||||
0,
|
||||
"() -> unit"));
|
||||
executableFunctions.add(new IRBackendExecutableFunction(
|
||||
projectInitTarget.fileId(),
|
||||
entryPointModuleId,
|
||||
projectInitName,
|
||||
projectInitCallableId,
|
||||
projectInitTarget.sourceStart(),
|
||||
projectInitTarget.sourceEnd(),
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
1,
|
||||
ReadOnlyList.from(
|
||||
callInstruction(projectInitTarget, projectInitTarget.span()),
|
||||
retInstruction(projectInitTarget.span())),
|
||||
projectInitTarget.span()));
|
||||
syntheticFunctions.add(new IRSyntheticFunction(
|
||||
entryPointModuleId,
|
||||
projectInitName,
|
||||
IRSyntheticCallableKind.PROJECT_INIT,
|
||||
new IRSyntheticOrigin(
|
||||
projectInitTarget.fileId(),
|
||||
projectInitTarget.callableName(),
|
||||
projectInitTarget.span())));
|
||||
}
|
||||
|
||||
final var entryPointCallableName = frameWrapperCallableName(entryPointModuleId);
|
||||
final var bootGuardSlot = nextGlobalSlot(globals, entryPointModuleId);
|
||||
final var wrapperCallableId = new CallableId(callableSignatures.size());
|
||||
callableSignatures.add(new CallableSignatureRef(
|
||||
entryPointModuleId,
|
||||
entryPointCallableName,
|
||||
0,
|
||||
"() -> unit"));
|
||||
|
||||
final var wrapperInstructions = new ArrayList<IRBackendExecutableFunction.Instruction>();
|
||||
wrapperInstructions.add(getGlobalInstruction(bootGuardSlot, frameExecutable.span()));
|
||||
wrapperInstructions.add(pushBoolInstruction(true, frameExecutable.span()));
|
||||
wrapperInstructions.add(eqInstruction(frameExecutable.span()));
|
||||
wrapperInstructions.add(jumpIfTrueInstruction("bootstrap_done", frameExecutable.span()));
|
||||
for (final var module : declaration.modules()) {
|
||||
final var moduleInitCallableId = moduleInitCallableIds.get(module.moduleId());
|
||||
if (moduleInitCallableId == null) {
|
||||
continue;
|
||||
}
|
||||
wrapperInstructions.add(new IRBackendExecutableFunction.Instruction(
|
||||
IRBackendExecutableFunction.InstructionKind.CALL_FUNC,
|
||||
module.moduleId(),
|
||||
moduleInitCallableName(module.moduleId()),
|
||||
moduleInitCallableId,
|
||||
null,
|
||||
null,
|
||||
0,
|
||||
0,
|
||||
frameExecutable.span()));
|
||||
}
|
||||
if (projectInitCallableId != null) {
|
||||
wrapperInstructions.add(new IRBackendExecutableFunction.Instruction(
|
||||
IRBackendExecutableFunction.InstructionKind.CALL_FUNC,
|
||||
entryPointModuleId,
|
||||
projectInitCallableName(entryPointModuleId),
|
||||
projectInitCallableId,
|
||||
null,
|
||||
null,
|
||||
0,
|
||||
0,
|
||||
frameExecutable.span()));
|
||||
}
|
||||
wrapperInstructions.add(pushBoolInstruction(true, frameExecutable.span()));
|
||||
wrapperInstructions.add(setGlobalInstruction(bootGuardSlot, frameExecutable.span()));
|
||||
wrapperInstructions.add(labelInstruction("bootstrap_done", frameExecutable.span()));
|
||||
wrapperInstructions.add(callInstruction(frameExecutable, frameExecutable.span()));
|
||||
wrapperInstructions.add(retInstruction(frameExecutable.span()));
|
||||
executableFunctions.add(new IRBackendExecutableFunction(
|
||||
frameExecutable.fileId(),
|
||||
entryPointModuleId,
|
||||
entryPointCallableName,
|
||||
wrapperCallableId,
|
||||
frameExecutable.sourceStart(),
|
||||
frameExecutable.sourceEnd(),
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
2,
|
||||
ReadOnlyList.wrap(wrapperInstructions),
|
||||
frameExecutable.span()));
|
||||
syntheticFunctions.add(new IRSyntheticFunction(
|
||||
entryPointModuleId,
|
||||
entryPointCallableName,
|
||||
IRSyntheticCallableKind.PUBLISHED_FRAME_WRAPPER,
|
||||
new IRSyntheticOrigin(
|
||||
frameExecutable.fileId(),
|
||||
frameExecutable.callableName(),
|
||||
frameExecutable.span())));
|
||||
|
||||
globals.add(new IRGlobal(
|
||||
frameExecutable.fileId(),
|
||||
entryPointModuleId,
|
||||
bootGuardGlobalName(entryPointModuleId),
|
||||
"bool",
|
||||
bootGuardSlot,
|
||||
IRGlobalVisibility.MODULE,
|
||||
true,
|
||||
IRHiddenGlobalKind.BOOT_GUARD,
|
||||
new IRGlobalOrigin(
|
||||
frameExecutable.fileId(),
|
||||
entryPointModuleId,
|
||||
frameExecutable.callableName(),
|
||||
frameExecutable.span(),
|
||||
"BOOT_GUARD"),
|
||||
frameExecutable.span()));
|
||||
|
||||
return IRBackend.builder()
|
||||
.entryPointCallableName(entryPointCallableName)
|
||||
.entryPointModuleId(entryPointModuleId)
|
||||
.functions(backend.getFunctions())
|
||||
.syntheticFunctions(ReadOnlyList.wrap(syntheticFunctions))
|
||||
.globals(ReadOnlyList.wrap(normalizeGlobalSlots(globals)))
|
||||
.executableFunctions(ReadOnlyList.wrap(executableFunctions))
|
||||
.modulePool(backend.getModulePool())
|
||||
.callableSignatures(ReadOnlyList.wrap(callableSignatures))
|
||||
.intrinsicPool(backend.getIntrinsicPool())
|
||||
.reservedMetadata(backend.getReservedMetadata())
|
||||
.lifecycleDeclaration(declaration)
|
||||
.build();
|
||||
}
|
||||
|
||||
private boolean validate(
|
||||
final IRBackend backend,
|
||||
final IRLifecycleDeclaration declaration,
|
||||
final BuildingIssueSink issues) {
|
||||
var valid = true;
|
||||
for (final var synthetic : backend.getSyntheticFunctions()) {
|
||||
if (synthetic.kind() != IRSyntheticCallableKind.FILE_INIT_FRAGMENT) {
|
||||
report(issues, synthetic.origin().span(),
|
||||
"frontend handoff contains pre-materialized lifecycle artifact: " + synthetic.kind());
|
||||
valid = false;
|
||||
}
|
||||
}
|
||||
for (final var global : backend.getGlobals()) {
|
||||
if (global.hiddenKind() == IRHiddenGlobalKind.BOOT_GUARD) {
|
||||
report(issues, global.span(), "frontend handoff contains pre-materialized boot guard");
|
||||
valid = false;
|
||||
}
|
||||
}
|
||||
|
||||
final Set<Integer> moduleIds = new HashSet<>();
|
||||
final Set<Integer> lifecycleCallableIds = new HashSet<>();
|
||||
for (final var module : declaration.modules()) {
|
||||
final var moduleIndex = module.moduleId().isNone() ? -1 : module.moduleId().getIndex();
|
||||
if (!moduleIds.add(moduleIndex)) {
|
||||
report(issues, null, "duplicate lifecycle module: " + moduleIndex);
|
||||
valid = false;
|
||||
}
|
||||
for (final var fragment : module.fileInitFragments()) {
|
||||
valid &= validateReference(
|
||||
backend,
|
||||
fragment,
|
||||
IRLifecycleCallableRole.FILE_INIT_FRAGMENT,
|
||||
module.moduleId(),
|
||||
lifecycleCallableIds,
|
||||
issues);
|
||||
}
|
||||
}
|
||||
if (declaration.projectInit() != null) {
|
||||
valid &= validateReference(
|
||||
backend,
|
||||
declaration.projectInit(),
|
||||
IRLifecycleCallableRole.PROJECT_INIT,
|
||||
declaration.projectInit().moduleId(),
|
||||
lifecycleCallableIds,
|
||||
issues);
|
||||
}
|
||||
if (declaration.frameRoot() == null) {
|
||||
report(issues, null, "executable lifecycle declaration is missing frame root");
|
||||
valid = false;
|
||||
} else {
|
||||
valid &= validateReference(
|
||||
backend,
|
||||
declaration.frameRoot(),
|
||||
IRLifecycleCallableRole.FRAME_ROOT,
|
||||
declaration.frameRoot().moduleId(),
|
||||
lifecycleCallableIds,
|
||||
issues);
|
||||
}
|
||||
return valid;
|
||||
}
|
||||
|
||||
private boolean validateReference(
|
||||
final IRBackend backend,
|
||||
final IRLifecycleCallableReference reference,
|
||||
final IRLifecycleCallableRole expectedRole,
|
||||
final ModuleId expectedModuleId,
|
||||
final Set<Integer> lifecycleCallableIds,
|
||||
final BuildingIssueSink issues) {
|
||||
if (reference == null) {
|
||||
report(issues, null, "missing lifecycle reference for role " + expectedRole);
|
||||
return false;
|
||||
}
|
||||
var valid = true;
|
||||
if (reference.role() != expectedRole) {
|
||||
report(issues, reference.origin(), "incompatible lifecycle role: expected "
|
||||
+ expectedRole + " but found " + reference.role());
|
||||
valid = false;
|
||||
}
|
||||
if (!sameModuleId(reference.moduleId(), expectedModuleId)) {
|
||||
report(issues, reference.origin(), "lifecycle reference module does not match declaration module");
|
||||
valid = false;
|
||||
}
|
||||
if (reference.origin() == null || reference.origin().isNone()) {
|
||||
report(issues, reference.origin(), "lifecycle reference origin is missing for role " + expectedRole);
|
||||
valid = false;
|
||||
}
|
||||
final var callableIndex = reference.callableId().getIndex();
|
||||
if (!lifecycleCallableIds.add(callableIndex)) {
|
||||
report(issues, reference.origin(), "callable is assigned to multiple lifecycle roles: " + callableIndex);
|
||||
valid = false;
|
||||
}
|
||||
if (callableIndex < 0 || callableIndex >= backend.getCallableSignatures().size()) {
|
||||
report(issues, reference.origin(), "unresolved lifecycle callable id: " + callableIndex);
|
||||
return false;
|
||||
}
|
||||
final var signature = backend.getCallableSignatures().get(callableIndex);
|
||||
if (!sameModuleId(signature.moduleId(), reference.moduleId())) {
|
||||
report(issues, reference.origin(), "lifecycle callable signature module mismatch: " + callableIndex);
|
||||
valid = false;
|
||||
}
|
||||
if (resolveExecutable(backend, reference) == null) {
|
||||
report(issues, reference.origin(), "lifecycle callable has no executable body: " + callableIndex);
|
||||
valid = false;
|
||||
}
|
||||
return valid;
|
||||
}
|
||||
|
||||
private IRBackendExecutableFunction resolveExecutable(
|
||||
final IRBackend backend,
|
||||
final IRLifecycleCallableReference reference) {
|
||||
if (reference == null) {
|
||||
return null;
|
||||
}
|
||||
for (final var executable : backend.getExecutableFunctions()) {
|
||||
if (executable.callableId().getIndex() == reference.callableId().getIndex()
|
||||
&& sameModuleId(executable.moduleId(), reference.moduleId())) {
|
||||
return executable;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
private void report(
|
||||
final BuildingIssueSink issues,
|
||||
final Span span,
|
||||
final String message) {
|
||||
final var effectiveSpan = span == null ? Span.none() : span;
|
||||
issues.report(builder -> builder
|
||||
.error(true)
|
||||
.phase(PHASE)
|
||||
.code(INVALID_DECLARATION)
|
||||
.fileId(effectiveSpan.getFileId().isNone() ? null : effectiveSpan.getFileId().getId())
|
||||
.start(safeToInt(effectiveSpan.getStart()))
|
||||
.end(safeToInt(effectiveSpan.getEnd()))
|
||||
.message(message));
|
||||
}
|
||||
|
||||
private int nextGlobalSlot(
|
||||
final ArrayList<IRGlobal> globals,
|
||||
final ModuleId moduleId) {
|
||||
var nextSlot = 0;
|
||||
for (final var global : globals) {
|
||||
if (sameModuleId(moduleId, global.moduleId())) {
|
||||
nextSlot = Math.max(nextSlot, global.slot() + 1);
|
||||
}
|
||||
}
|
||||
return nextSlot;
|
||||
}
|
||||
|
||||
private ArrayList<IRGlobal> normalizeGlobalSlots(final ArrayList<IRGlobal> globals) {
|
||||
final var nextSlotByModule = new LinkedHashMap<ModuleId, Integer>();
|
||||
final var normalized = new ArrayList<IRGlobal>(globals.size());
|
||||
for (final var global : globals) {
|
||||
final var moduleId = normalizeModuleId(global.moduleId());
|
||||
final var slot = nextSlotByModule.getOrDefault(moduleId, 0);
|
||||
nextSlotByModule.put(moduleId, slot + 1);
|
||||
normalized.add(new IRGlobal(
|
||||
global.fileId(),
|
||||
moduleId,
|
||||
global.name(),
|
||||
global.declaredTypeSurface(),
|
||||
slot,
|
||||
global.visibility(),
|
||||
global.isHidden(),
|
||||
global.hiddenKind(),
|
||||
global.origin(),
|
||||
global.span()));
|
||||
}
|
||||
return normalized;
|
||||
}
|
||||
|
||||
private IRBackendExecutableFunction.Instruction callInstruction(
|
||||
final IRBackendExecutableFunction callee,
|
||||
final Span span) {
|
||||
return new IRBackendExecutableFunction.Instruction(
|
||||
IRBackendExecutableFunction.InstructionKind.CALL_FUNC,
|
||||
callee.moduleId(),
|
||||
callee.callableName(),
|
||||
callee.callableId(),
|
||||
null,
|
||||
null,
|
||||
callee.paramSlots(),
|
||||
callee.returnSlots(),
|
||||
span);
|
||||
}
|
||||
|
||||
private IRBackendExecutableFunction.Instruction retInstruction(final Span span) {
|
||||
return new IRBackendExecutableFunction.Instruction(
|
||||
IRBackendExecutableFunction.InstructionKind.RET,
|
||||
"",
|
||||
null,
|
||||
null,
|
||||
span);
|
||||
}
|
||||
|
||||
private IRBackendExecutableFunction.Instruction getGlobalInstruction(final int slot, final Span span) {
|
||||
return new IRBackendExecutableFunction.Instruction(
|
||||
IRBackendExecutableFunction.InstructionKind.GET_GLOBAL,
|
||||
"",
|
||||
null,
|
||||
null,
|
||||
null,
|
||||
slot,
|
||||
null,
|
||||
span);
|
||||
}
|
||||
|
||||
private IRBackendExecutableFunction.Instruction setGlobalInstruction(final int slot, final Span span) {
|
||||
return new IRBackendExecutableFunction.Instruction(
|
||||
IRBackendExecutableFunction.InstructionKind.SET_GLOBAL,
|
||||
"",
|
||||
null,
|
||||
null,
|
||||
null,
|
||||
slot,
|
||||
null,
|
||||
span);
|
||||
}
|
||||
|
||||
private IRBackendExecutableFunction.Instruction pushBoolInstruction(final boolean value, final Span span) {
|
||||
return new IRBackendExecutableFunction.Instruction(
|
||||
IRBackendExecutableFunction.InstructionKind.PUSH_BOOL,
|
||||
"",
|
||||
null,
|
||||
null,
|
||||
null,
|
||||
value ? "true" : "false",
|
||||
null,
|
||||
null,
|
||||
null,
|
||||
span);
|
||||
}
|
||||
|
||||
private IRBackendExecutableFunction.Instruction eqInstruction(final Span span) {
|
||||
return new IRBackendExecutableFunction.Instruction(
|
||||
IRBackendExecutableFunction.InstructionKind.EQ,
|
||||
"",
|
||||
null,
|
||||
null,
|
||||
null,
|
||||
span);
|
||||
}
|
||||
|
||||
private IRBackendExecutableFunction.Instruction labelInstruction(final String label, final Span span) {
|
||||
return new IRBackendExecutableFunction.Instruction(
|
||||
IRBackendExecutableFunction.InstructionKind.LABEL,
|
||||
"",
|
||||
null,
|
||||
null,
|
||||
null,
|
||||
label,
|
||||
null,
|
||||
null,
|
||||
null,
|
||||
span);
|
||||
}
|
||||
|
||||
private IRBackendExecutableFunction.Instruction jumpIfTrueInstruction(final String label, final Span span) {
|
||||
return new IRBackendExecutableFunction.Instruction(
|
||||
IRBackendExecutableFunction.InstructionKind.JMP_IF_TRUE,
|
||||
"",
|
||||
null,
|
||||
null,
|
||||
null,
|
||||
null,
|
||||
label,
|
||||
null,
|
||||
null,
|
||||
span);
|
||||
}
|
||||
|
||||
private ModuleId normalizeModuleId(final ModuleId moduleId) {
|
||||
return moduleId == null ? ModuleId.none() : moduleId;
|
||||
}
|
||||
|
||||
private boolean sameModuleId(final ModuleId left, final ModuleId right) {
|
||||
final var normalizedLeft = normalizeModuleId(left);
|
||||
final var normalizedRight = normalizeModuleId(right);
|
||||
if (normalizedLeft.isNone() || normalizedRight.isNone()) {
|
||||
return normalizedLeft.isNone() && normalizedRight.isNone();
|
||||
}
|
||||
return normalizedLeft.getIndex() == normalizedRight.getIndex();
|
||||
}
|
||||
|
||||
private String moduleInitCallableName(final ModuleId moduleId) {
|
||||
return "__prometeu.lifecycle.module_init$m" + normalizedModuleIndex(moduleId);
|
||||
}
|
||||
|
||||
private String projectInitCallableName(final ModuleId moduleId) {
|
||||
return "__prometeu.lifecycle.project_init$m" + normalizedModuleIndex(moduleId);
|
||||
}
|
||||
|
||||
private String frameWrapperCallableName(final ModuleId moduleId) {
|
||||
return "__prometeu.lifecycle.frame_wrapper$m" + normalizedModuleIndex(moduleId);
|
||||
}
|
||||
|
||||
private String bootGuardGlobalName(final ModuleId moduleId) {
|
||||
return "__prometeu.lifecycle.boot_guard$m" + normalizedModuleIndex(moduleId);
|
||||
}
|
||||
|
||||
private int normalizedModuleIndex(final ModuleId moduleId) {
|
||||
final var normalized = normalizeModuleId(moduleId);
|
||||
return normalized.isNone() ? -1 : normalized.getIndex();
|
||||
}
|
||||
|
||||
private int safeToInt(final long value) {
|
||||
if (value > Integer.MAX_VALUE) {
|
||||
return Integer.MAX_VALUE;
|
||||
}
|
||||
if (value < Integer.MIN_VALUE) {
|
||||
return Integer.MIN_VALUE;
|
||||
}
|
||||
return (int) value;
|
||||
}
|
||||
}
|
||||
+2
-1
@@ -23,7 +23,8 @@ public class BuilderPipelineService {
|
||||
final var analyses = List.<PipelineStage>of(
|
||||
new ResolveDepsPipelineStage(),
|
||||
new LoadSourcesPipelineStage(),
|
||||
new FrontendPhasePipelineStage()
|
||||
new FrontendPhasePipelineStage(),
|
||||
new AssembleLifecyclePipelineStage()
|
||||
);
|
||||
|
||||
final var compile = List.<PipelineStage>of(
|
||||
|
||||
+32
@@ -0,0 +1,32 @@
|
||||
package p.studio.compiler.workspaces.stages;
|
||||
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import p.studio.compiler.lifecycle.LifecycleAssemblerService;
|
||||
import p.studio.compiler.messages.BuildingIssueSink;
|
||||
import p.studio.compiler.models.BuilderPipelineContext;
|
||||
import p.studio.compiler.workspaces.PipelineStage;
|
||||
import p.studio.utilities.logs.LogAggregator;
|
||||
|
||||
@Slf4j
|
||||
public final class AssembleLifecyclePipelineStage implements PipelineStage {
|
||||
private final LifecycleAssemblerService assembler;
|
||||
|
||||
public AssembleLifecyclePipelineStage() {
|
||||
this(new LifecycleAssemblerService());
|
||||
}
|
||||
|
||||
AssembleLifecyclePipelineStage(final LifecycleAssemblerService assembler) {
|
||||
this.assembler = assembler;
|
||||
}
|
||||
|
||||
@Override
|
||||
public BuildingIssueSink run(final BuilderPipelineContext ctx, final LogAggregator logs) {
|
||||
final var issues = BuildingIssueSink.empty();
|
||||
final var assembled = assembler.assemble(ctx.irBackend, issues);
|
||||
if (!issues.hasErrors()) {
|
||||
ctx.irBackend = assembled;
|
||||
logs.using(log).debug("Common lifecycle assembly completed successfully!");
|
||||
}
|
||||
return issues;
|
||||
}
|
||||
}
|
||||
+22
-22
@@ -67,31 +67,31 @@ class LowerToIRVMServiceTest {
|
||||
@Test
|
||||
void lowerMustPublishSyntheticWrapperAtFunctionZeroAndKeepFinalRetInWrapperPath() {
|
||||
final var backend = IRBackend.builder()
|
||||
.entryPointCallableName("__pbs.frame_wrapper$m0")
|
||||
.entryPointCallableName("__prometeu.lifecycle.frame_wrapper$m0")
|
||||
.entryPointModuleId(new ModuleId(0))
|
||||
.globals(ReadOnlyList.from(hiddenBootGuard(0)))
|
||||
.syntheticFunctions(ReadOnlyList.from(new IRSyntheticFunction(
|
||||
new ModuleId(0),
|
||||
"__pbs.frame_wrapper$m0",
|
||||
"__prometeu.lifecycle.frame_wrapper$m0",
|
||||
IRSyntheticCallableKind.PUBLISHED_FRAME_WRAPPER,
|
||||
new IRSyntheticOrigin(new FileId(0), "frame", new Span(new FileId(0), 1, 10)))))
|
||||
.executableFunctions(ReadOnlyList.from(
|
||||
fn("__pbs.file_init$f1", "app", 30, ReadOnlyList.from(ret())),
|
||||
fn("__pbs.module_init$m0", "app", 31, ReadOnlyList.from(
|
||||
callFunc("app", "__pbs.file_init$f1", 30),
|
||||
fn("__prometeu.lifecycle.file_init$f1", "app", 30, ReadOnlyList.from(ret())),
|
||||
fn("__prometeu.lifecycle.module_init$m0", "app", 31, ReadOnlyList.from(
|
||||
callFunc("app", "__prometeu.lifecycle.file_init$f1", 30),
|
||||
ret())),
|
||||
fn("__pbs.project_init$m0", "app", 32, ReadOnlyList.from(
|
||||
fn("__prometeu.lifecycle.project_init$m0", "app", 32, ReadOnlyList.from(
|
||||
callFunc("app", "boot", 10),
|
||||
ret())),
|
||||
fn("boot", "app", 10, ReadOnlyList.from(ret())),
|
||||
fn("frame", "app", 20, ReadOnlyList.from(ret())),
|
||||
fn("__pbs.frame_wrapper$m0", "app", 40, ReadOnlyList.from(
|
||||
fn("__prometeu.lifecycle.frame_wrapper$m0", "app", 40, ReadOnlyList.from(
|
||||
getGlobal(0),
|
||||
pushBool(true),
|
||||
eq(),
|
||||
jmpIfTrue("bootstrap_done"),
|
||||
callFunc("app", "__pbs.module_init$m0", 31),
|
||||
callFunc("app", "__pbs.project_init$m0", 32),
|
||||
callFunc("app", "__prometeu.lifecycle.module_init$m0", 31),
|
||||
callFunc("app", "__prometeu.lifecycle.project_init$m0", 32),
|
||||
pushBool(true),
|
||||
setGlobal(0),
|
||||
label("bootstrap_done"),
|
||||
@@ -101,7 +101,7 @@ class LowerToIRVMServiceTest {
|
||||
|
||||
final var lowered = new LowerToIRVMService().lower(backend);
|
||||
|
||||
assertEquals("__pbs.frame_wrapper$m0", lowered.module().functions().get(0).name());
|
||||
assertEquals("__prometeu.lifecycle.frame_wrapper$m0", lowered.module().functions().get(0).name());
|
||||
assertEquals(IRVMOp.GET_GLOBAL, lowered.module().functions().get(0).instructions().get(0).op());
|
||||
assertEquals(IRVMOp.PUSH_BOOL, lowered.module().functions().get(0).instructions().get(1).op());
|
||||
assertEquals(IRVMOp.EQ, lowered.module().functions().get(0).instructions().get(2).op());
|
||||
@@ -124,12 +124,12 @@ class LowerToIRVMServiceTest {
|
||||
@Test
|
||||
void lowerMustRejectWhenSyntheticWrapperEntrypointIsMissing() {
|
||||
final var backend = IRBackend.builder()
|
||||
.entryPointCallableName("__pbs.frame_wrapper$m0")
|
||||
.entryPointCallableName("__prometeu.lifecycle.frame_wrapper$m0")
|
||||
.entryPointModuleId(new ModuleId(0))
|
||||
.globals(ReadOnlyList.from(hiddenBootGuard(0)))
|
||||
.syntheticFunctions(ReadOnlyList.from(new IRSyntheticFunction(
|
||||
new ModuleId(0),
|
||||
"__pbs.frame_wrapper$m0",
|
||||
"__prometeu.lifecycle.frame_wrapper$m0",
|
||||
IRSyntheticCallableKind.PUBLISHED_FRAME_WRAPPER,
|
||||
new IRSyntheticOrigin(new FileId(0), "frame", new Span(new FileId(0), 1, 10)))))
|
||||
.executableFunctions(ReadOnlyList.from(
|
||||
@@ -148,11 +148,11 @@ class LowerToIRVMServiceTest {
|
||||
.globals(ReadOnlyList.from(hiddenBootGuard(0)))
|
||||
.syntheticFunctions(ReadOnlyList.from(new IRSyntheticFunction(
|
||||
new ModuleId(0),
|
||||
"__pbs.frame_wrapper$m0",
|
||||
"__prometeu.lifecycle.frame_wrapper$m0",
|
||||
IRSyntheticCallableKind.PUBLISHED_FRAME_WRAPPER,
|
||||
new IRSyntheticOrigin(new FileId(0), "frame", new Span(new FileId(0), 1, 10)))))
|
||||
.executableFunctions(ReadOnlyList.from(
|
||||
fn("__pbs.frame_wrapper$m0", "app", 40, ReadOnlyList.from(
|
||||
fn("__prometeu.lifecycle.frame_wrapper$m0", "app", 40, ReadOnlyList.from(
|
||||
callFunc("app", "frame", 20),
|
||||
ret())),
|
||||
fn("frame", "app", 20, ReadOnlyList.from(ret()))))
|
||||
@@ -165,15 +165,15 @@ class LowerToIRVMServiceTest {
|
||||
@Test
|
||||
void lowerMustRejectWhenHiddenBootGuardIsMissing() {
|
||||
final var backend = IRBackend.builder()
|
||||
.entryPointCallableName("__pbs.frame_wrapper$m0")
|
||||
.entryPointCallableName("__prometeu.lifecycle.frame_wrapper$m0")
|
||||
.entryPointModuleId(new ModuleId(0))
|
||||
.syntheticFunctions(ReadOnlyList.from(new IRSyntheticFunction(
|
||||
new ModuleId(0),
|
||||
"__pbs.frame_wrapper$m0",
|
||||
"__prometeu.lifecycle.frame_wrapper$m0",
|
||||
IRSyntheticCallableKind.PUBLISHED_FRAME_WRAPPER,
|
||||
new IRSyntheticOrigin(new FileId(0), "frame", new Span(new FileId(0), 1, 10)))))
|
||||
.executableFunctions(ReadOnlyList.from(
|
||||
fn("__pbs.frame_wrapper$m0", "app", 40, ReadOnlyList.from(
|
||||
fn("__prometeu.lifecycle.frame_wrapper$m0", "app", 40, ReadOnlyList.from(
|
||||
callFunc("app", "frame", 20),
|
||||
ret())),
|
||||
fn("frame", "app", 20, ReadOnlyList.from(ret()))))
|
||||
@@ -186,16 +186,16 @@ class LowerToIRVMServiceTest {
|
||||
@Test
|
||||
void lowerMustRejectWhenSyntheticCallableOriginIsMissing() {
|
||||
final var backend = IRBackend.builder()
|
||||
.entryPointCallableName("__pbs.frame_wrapper$m0")
|
||||
.entryPointCallableName("__prometeu.lifecycle.frame_wrapper$m0")
|
||||
.entryPointModuleId(new ModuleId(0))
|
||||
.globals(ReadOnlyList.from(userVisibleGlobal("__pbs.boot_guard$m0", 0)))
|
||||
.globals(ReadOnlyList.from(userVisibleGlobal("__prometeu.lifecycle.boot_guard$m0", 0)))
|
||||
.syntheticFunctions(ReadOnlyList.from(new IRSyntheticFunction(
|
||||
new ModuleId(0),
|
||||
"__pbs.frame_wrapper$m0",
|
||||
"__prometeu.lifecycle.frame_wrapper$m0",
|
||||
IRSyntheticCallableKind.PUBLISHED_FRAME_WRAPPER,
|
||||
new IRSyntheticOrigin(new FileId(0), "", Span.none()))))
|
||||
.executableFunctions(ReadOnlyList.from(
|
||||
fn("__pbs.frame_wrapper$m0", "app", 40, ReadOnlyList.from(
|
||||
fn("__prometeu.lifecycle.frame_wrapper$m0", "app", 40, ReadOnlyList.from(
|
||||
callFunc("app", "frame", 20),
|
||||
ret())),
|
||||
fn("frame", "app", 20, ReadOnlyList.from(ret()))))
|
||||
@@ -450,7 +450,7 @@ class LowerToIRVMServiceTest {
|
||||
return new IRGlobal(
|
||||
fileId,
|
||||
ownerModuleId,
|
||||
"__pbs.boot_guard$m" + moduleId,
|
||||
"__prometeu.lifecycle.boot_guard$m" + moduleId,
|
||||
"bool",
|
||||
0,
|
||||
IRGlobalVisibility.MODULE,
|
||||
|
||||
+99
@@ -0,0 +1,99 @@
|
||||
package p.studio.compiler.integration;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.api.io.TempDir;
|
||||
import p.studio.compiler.FrontendRegistryService;
|
||||
import p.studio.compiler.messages.BuilderPipelineConfig;
|
||||
import p.studio.compiler.models.BuilderPipelineContext;
|
||||
import p.studio.compiler.models.IRBackendReader;
|
||||
import p.studio.compiler.models.IRHiddenGlobalKind;
|
||||
import p.studio.compiler.synth.SyntheticFrontendProvider;
|
||||
import p.studio.compiler.workspaces.BuilderPipelineService;
|
||||
import p.studio.utilities.logs.LogAggregator;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertFalse;
|
||||
import static org.junit.jupiter.api.Assertions.assertNotNull;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
|
||||
class SyntheticFrontendPipelineTest {
|
||||
|
||||
@TempDir
|
||||
Path projectRoot;
|
||||
|
||||
@Test
|
||||
void compileMustEmitVerifiedBytecodeWithoutPbs() throws IOException {
|
||||
writeSyntheticProject();
|
||||
final var provider = new SyntheticFrontendProvider();
|
||||
FrontendRegistryService.register(provider);
|
||||
try {
|
||||
final var context = BuilderPipelineContext.fromConfig(
|
||||
new BuilderPipelineConfig(false, projectRoot.toString()));
|
||||
final var result = BuilderPipelineService.INSTANCE.compile(context, LogAggregator.empty());
|
||||
|
||||
assertTrue(provider.syntheticCompiler().invoked(), "synthetic compiler must be the effective frontend");
|
||||
assertEquals(
|
||||
SyntheticFrontendProvider.LANGUAGE_ID,
|
||||
result.analysisSnapshot().frontendSpec().getLanguageId());
|
||||
assertFalse("pbs".equals(result.analysisSnapshot().frontendSpec().getLanguageId()));
|
||||
assertTrue(provider.languageService().isEmpty());
|
||||
assertTrue(
|
||||
result.diagnostics().stream().noneMatch(issue -> issue.isError()),
|
||||
result.diagnostics().toString());
|
||||
assertNotNull(result.bytecodeModule());
|
||||
assertNotNull(result.bytecodeBytes());
|
||||
assertTrue(result.bytecodeBytes().length > 0);
|
||||
|
||||
final var backend = result.analysisSnapshot().irBackend();
|
||||
assertEquals("__prometeu.lifecycle.frame_wrapper$m0", backend.getEntryPointCallableName());
|
||||
assertTrue(backend.getGlobals().stream().anyMatch(global ->
|
||||
global.hiddenKind() == IRHiddenGlobalKind.BOOT_GUARD
|
||||
&& "__prometeu.lifecycle.boot_guard$m0".equals(global.name())));
|
||||
assertNoPbsNames(backend);
|
||||
assertTrue(noPbsSources(projectRoot));
|
||||
} finally {
|
||||
FrontendRegistryService.unregister(SyntheticFrontendProvider.LANGUAGE_ID);
|
||||
assertEquals(1, FrontendRegistryService.listProviders().size());
|
||||
assertEquals(
|
||||
"pbs",
|
||||
FrontendRegistryService.listProviders().getFirst().specification().getLanguageId());
|
||||
}
|
||||
}
|
||||
|
||||
private void writeSyntheticProject() throws IOException {
|
||||
Files.writeString(projectRoot.resolve("prometeu.json"), """
|
||||
{
|
||||
"name": "synth-fixture",
|
||||
"version": "1.0.0",
|
||||
"language": "synth",
|
||||
"stdlib": "1",
|
||||
"target": "Game",
|
||||
"dependencies": []
|
||||
}
|
||||
""");
|
||||
Files.createDirectory(projectRoot.resolve("src"));
|
||||
}
|
||||
|
||||
private void assertNoPbsNames(final IRBackendReader backend) {
|
||||
assertFalse(backend.getEntryPointCallableName().contains("__pbs."));
|
||||
assertTrue(backend.getExecutableFunctions().stream()
|
||||
.noneMatch(function -> function.callableName().contains("__pbs.")));
|
||||
assertTrue(backend.getSyntheticFunctions().stream()
|
||||
.noneMatch(function -> function.callableName().contains("__pbs.")));
|
||||
assertTrue(backend.getGlobals().stream()
|
||||
.noneMatch(global -> global.name().contains("__pbs.")));
|
||||
}
|
||||
|
||||
private boolean noPbsSources(final Path root) throws IOException {
|
||||
try (final var files = Files.walk(root)) {
|
||||
return files
|
||||
.filter(Files::isRegularFile)
|
||||
.map(path -> path.getFileName().toString())
|
||||
.noneMatch(name -> name.endsWith(".pbs") || name.endsWith(".barrel"));
|
||||
}
|
||||
}
|
||||
}
|
||||
+367
@@ -0,0 +1,367 @@
|
||||
package p.studio.compiler.lifecycle;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
import p.studio.compiler.messages.BuildingIssueSink;
|
||||
import p.studio.compiler.models.IRBackend;
|
||||
import p.studio.compiler.models.IRBackendExecutableFunction;
|
||||
import p.studio.compiler.models.IRGlobal;
|
||||
import p.studio.compiler.models.IRGlobalOrigin;
|
||||
import p.studio.compiler.models.IRGlobalVisibility;
|
||||
import p.studio.compiler.models.IRHiddenGlobalKind;
|
||||
import p.studio.compiler.models.IRLifecycleCallableReference;
|
||||
import p.studio.compiler.models.IRLifecycleCallableRole;
|
||||
import p.studio.compiler.models.IRLifecycleDeclaration;
|
||||
import p.studio.compiler.models.IRLifecycleModuleDeclaration;
|
||||
import p.studio.compiler.models.IRSyntheticCallableKind;
|
||||
import p.studio.compiler.models.IRSyntheticFunction;
|
||||
import p.studio.compiler.models.IRSyntheticOrigin;
|
||||
import p.studio.compiler.source.Span;
|
||||
import p.studio.compiler.source.identifiers.CallableId;
|
||||
import p.studio.compiler.source.identifiers.FileId;
|
||||
import p.studio.compiler.source.identifiers.ModuleId;
|
||||
import p.studio.compiler.source.tables.CallableSignatureRef;
|
||||
import p.studio.compiler.source.tables.ModuleReference;
|
||||
import p.studio.utilities.structures.ReadOnlyList;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Arrays;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.*;
|
||||
|
||||
class LifecycleAssemblerServiceTest {
|
||||
|
||||
@Test
|
||||
void assembleMustMaterializeNeutralLifecycleArtifactsInDeclaredOrder() {
|
||||
final var backend = declarativeBackend();
|
||||
final var issues = BuildingIssueSink.empty();
|
||||
|
||||
final var assembled = new LifecycleAssemblerService().assemble(backend, issues);
|
||||
|
||||
assertFalse(issues.hasErrors(), issues.asCollection().toString());
|
||||
assertSame(backend.getLifecycleDeclaration(), assembled.getLifecycleDeclaration());
|
||||
assertEquals("__prometeu.lifecycle.frame_wrapper$m1", assembled.getEntryPointCallableName());
|
||||
assertEquals(1, assembled.getEntryPointModuleId().getIndex());
|
||||
assertTrue(assembled.getSyntheticFunctions().stream().anyMatch(fn ->
|
||||
fn.kind() == IRSyntheticCallableKind.MODULE_INIT
|
||||
&& "__prometeu.lifecycle.module_init$m0".equals(fn.callableName())));
|
||||
assertTrue(assembled.getSyntheticFunctions().stream().anyMatch(fn ->
|
||||
fn.kind() == IRSyntheticCallableKind.PROJECT_INIT
|
||||
&& "__prometeu.lifecycle.project_init$m1".equals(fn.callableName())));
|
||||
assertTrue(assembled.getSyntheticFunctions().stream().anyMatch(fn ->
|
||||
fn.kind() == IRSyntheticCallableKind.PUBLISHED_FRAME_WRAPPER
|
||||
&& "__prometeu.lifecycle.frame_wrapper$m1".equals(fn.callableName())));
|
||||
assertTrue(assembled.getGlobals().stream().anyMatch(global ->
|
||||
global.hiddenKind() == IRHiddenGlobalKind.BOOT_GUARD
|
||||
&& global.isHidden()
|
||||
&& "__prometeu.lifecycle.boot_guard$m1".equals(global.name())));
|
||||
assertTrue(assembled.getSyntheticFunctions().stream().noneMatch(fn ->
|
||||
fn.callableName().contains("__pbs.")));
|
||||
assertTrue(assembled.getGlobals().stream().noneMatch(global ->
|
||||
global.name().contains("__pbs.")));
|
||||
|
||||
final var wrapper = executable(assembled, "__prometeu.lifecycle.frame_wrapper$m1");
|
||||
final var calledNames = wrapper.instructions().stream()
|
||||
.filter(instruction -> instruction.kind() == IRBackendExecutableFunction.InstructionKind.CALL_FUNC)
|
||||
.map(IRBackendExecutableFunction.Instruction::calleeCallableName)
|
||||
.toList();
|
||||
assertEquals(
|
||||
List.of(
|
||||
"__prometeu.lifecycle.module_init$m0",
|
||||
"__prometeu.lifecycle.module_init$m1",
|
||||
"__prometeu.lifecycle.project_init$m1",
|
||||
"frame"),
|
||||
calledNames);
|
||||
assertEquals(
|
||||
1,
|
||||
calledNames.stream().filter("__prometeu.lifecycle.project_init$m1"::equals).count());
|
||||
assertEquals(IRBackendExecutableFunction.InstructionKind.RET, wrapper.instructions().getLast().kind());
|
||||
|
||||
final var moduleInit = executable(assembled, "__prometeu.lifecycle.module_init$m0");
|
||||
assertEquals(
|
||||
List.of("file_init_dep"),
|
||||
moduleInit.instructions().stream()
|
||||
.filter(instruction -> instruction.kind() == IRBackendExecutableFunction.InstructionKind.CALL_FUNC)
|
||||
.map(IRBackendExecutableFunction.Instruction::calleeCallableName)
|
||||
.toList());
|
||||
final var hostModuleInit = executable(assembled, "__prometeu.lifecycle.module_init$m1");
|
||||
assertEquals(
|
||||
List.of("file_init_host"),
|
||||
hostModuleInit.instructions().stream()
|
||||
.filter(instruction -> instruction.kind() == IRBackendExecutableFunction.InstructionKind.CALL_FUNC)
|
||||
.map(IRBackendExecutableFunction.Instruction::calleeCallableName)
|
||||
.toList());
|
||||
}
|
||||
|
||||
@Test
|
||||
void assembleMustInvokeProjectInitExactlyOnceAndExcludeItFromFileInit() {
|
||||
final var assembled = new LifecycleAssemblerService().assemble(declarativeBackend(), BuildingIssueSink.empty());
|
||||
final var wrapperCalls = executable(assembled, assembled.getEntryPointCallableName()).instructions().stream()
|
||||
.filter(instruction -> instruction.kind() == IRBackendExecutableFunction.InstructionKind.CALL_FUNC)
|
||||
.map(IRBackendExecutableFunction.Instruction::calleeCallableName)
|
||||
.toList();
|
||||
final var fileInitCalls = executable(assembled, "file_init_host").instructions().stream()
|
||||
.filter(instruction -> instruction.kind() == IRBackendExecutableFunction.InstructionKind.CALL_FUNC)
|
||||
.map(IRBackendExecutableFunction.Instruction::calleeCallableName)
|
||||
.toList();
|
||||
|
||||
assertEquals(1, wrapperCalls.stream().filter("__prometeu.lifecycle.project_init$m1"::equals).count());
|
||||
assertTrue(wrapperCalls.contains("frame"));
|
||||
assertTrue(fileInitCalls.stream().noneMatch("boot"::equals));
|
||||
final var projectInitWrapper = executable(assembled, "__prometeu.lifecycle.project_init$m1");
|
||||
assertEquals(
|
||||
List.of("boot"),
|
||||
projectInitWrapper.instructions().stream()
|
||||
.filter(instruction -> instruction.kind() == IRBackendExecutableFunction.InstructionKind.CALL_FUNC)
|
||||
.map(IRBackendExecutableFunction.Instruction::calleeCallableName)
|
||||
.toList());
|
||||
}
|
||||
|
||||
@Test
|
||||
void assembleMustNoOpWhenLifecycleDeclarationIsAbsent() {
|
||||
final var backend = IRBackend.builder()
|
||||
.entryPointCallableName("main")
|
||||
.entryPointModuleId(new ModuleId(0))
|
||||
.executableFunctions(ReadOnlyList.from(fn("main", 0, 0, 0, span(1))))
|
||||
.callableSignatures(ReadOnlyList.from(new CallableSignatureRef(new ModuleId(0), "main", 0, "() -> unit")))
|
||||
.build();
|
||||
final var issues = BuildingIssueSink.empty();
|
||||
|
||||
final var assembled = new LifecycleAssemblerService().assemble(backend, issues);
|
||||
|
||||
assertFalse(issues.hasErrors());
|
||||
assertSame(backend, assembled);
|
||||
assertNull(assembled.getLifecycleDeclaration());
|
||||
assertTrue(assembled.getSyntheticFunctions().isEmpty());
|
||||
}
|
||||
|
||||
@Test
|
||||
void assembleMustRejectMissingFrameRootWithoutRepair() {
|
||||
final var backend = backendWithDeclaration(new IRLifecycleDeclaration(
|
||||
ReadOnlyList.from(new IRLifecycleModuleDeclaration(new ModuleId(0), ReadOnlyList.empty())),
|
||||
null,
|
||||
null));
|
||||
final var issues = BuildingIssueSink.empty();
|
||||
|
||||
final var assembled = new LifecycleAssemblerService().assemble(backend, issues);
|
||||
|
||||
assertTrue(issues.hasErrors());
|
||||
assertSame(backend, assembled);
|
||||
assertEquals(LifecycleAssemblerService.INVALID_DECLARATION, firstCode(issues));
|
||||
assertTrue(firstMessage(issues).contains("frame root"));
|
||||
}
|
||||
|
||||
@Test
|
||||
void assembleMustRejectUnresolvedCallableIds() {
|
||||
final var backend = backendWithDeclaration(new IRLifecycleDeclaration(
|
||||
ReadOnlyList.empty(),
|
||||
null,
|
||||
reference(0, 1, 99, IRLifecycleCallableRole.FRAME_ROOT, span(3))));
|
||||
final var issues = BuildingIssueSink.empty();
|
||||
|
||||
new LifecycleAssemblerService().assemble(backend, issues);
|
||||
|
||||
assertTrue(issues.hasErrors());
|
||||
assertTrue(firstMessage(issues).contains("unresolved lifecycle callable id"));
|
||||
}
|
||||
|
||||
@Test
|
||||
void assembleMustRejectIncompatibleRoles() {
|
||||
final var backend = backendWithDeclaration(new IRLifecycleDeclaration(
|
||||
ReadOnlyList.empty(),
|
||||
null,
|
||||
reference(0, 1, 2, IRLifecycleCallableRole.PROJECT_INIT, span(3))));
|
||||
final var issues = BuildingIssueSink.empty();
|
||||
|
||||
new LifecycleAssemblerService().assemble(backend, issues);
|
||||
|
||||
assertTrue(issues.hasErrors());
|
||||
assertTrue(firstMessage(issues).contains("incompatible lifecycle role"));
|
||||
}
|
||||
|
||||
@Test
|
||||
void assembleMustRejectMissingOrigin() {
|
||||
final var backend = backendWithDeclaration(new IRLifecycleDeclaration(
|
||||
ReadOnlyList.empty(),
|
||||
null,
|
||||
reference(0, 1, 2, IRLifecycleCallableRole.FRAME_ROOT, Span.none())));
|
||||
final var issues = BuildingIssueSink.empty();
|
||||
|
||||
new LifecycleAssemblerService().assemble(backend, issues);
|
||||
|
||||
assertTrue(issues.hasErrors());
|
||||
assertTrue(firstMessage(issues).contains("origin is missing"));
|
||||
}
|
||||
|
||||
@Test
|
||||
void assembleMustRejectPreMaterializedDerivedArtifacts() {
|
||||
final var backend = declarativeBackend(new IRSyntheticFunction(
|
||||
new ModuleId(1),
|
||||
"already_wrapped",
|
||||
IRSyntheticCallableKind.PUBLISHED_FRAME_WRAPPER,
|
||||
new IRSyntheticOrigin(new FileId(2), "frame", span(2))));
|
||||
final var issues = BuildingIssueSink.empty();
|
||||
|
||||
final var assembled = new LifecycleAssemblerService().assemble(backend, issues);
|
||||
|
||||
assertTrue(issues.hasErrors());
|
||||
assertSame(backend, assembled);
|
||||
assertTrue(firstMessage(issues).contains("pre-materialized lifecycle artifact"));
|
||||
}
|
||||
|
||||
@Test
|
||||
void assembleMustRejectDuplicateModuleContributions() {
|
||||
final var module = new IRLifecycleModuleDeclaration(
|
||||
new ModuleId(0),
|
||||
ReadOnlyList.from(reference(0, 1, 0, IRLifecycleCallableRole.FILE_INIT_FRAGMENT, span(1))));
|
||||
final var backend = backendWithDeclaration(new IRLifecycleDeclaration(
|
||||
ReadOnlyList.from(module, module),
|
||||
reference(1, 2, 3, IRLifecycleCallableRole.PROJECT_INIT, span(2)),
|
||||
reference(1, 2, 2, IRLifecycleCallableRole.FRAME_ROOT, span(2))));
|
||||
final var issues = BuildingIssueSink.empty();
|
||||
|
||||
new LifecycleAssemblerService().assemble(backend, issues);
|
||||
|
||||
assertTrue(issues.hasErrors());
|
||||
assertTrue(firstMessage(issues).contains("duplicate lifecycle module"));
|
||||
}
|
||||
|
||||
@Test
|
||||
void assembleMustRejectNullBackend() {
|
||||
final var issues = BuildingIssueSink.empty();
|
||||
|
||||
final var assembled = new LifecycleAssemblerService().assemble(null, issues);
|
||||
|
||||
assertNull(assembled);
|
||||
assertTrue(issues.hasErrors());
|
||||
assertEquals(LifecycleAssemblerService.PHASE, issues.asCollection().iterator().next().getPhase());
|
||||
}
|
||||
|
||||
private static IRBackend declarativeBackend(final IRSyntheticFunction... extraSynthetics) {
|
||||
return declarativeBackend(null, extraSynthetics);
|
||||
}
|
||||
|
||||
private static IRBackend backendWithDeclaration(final IRLifecycleDeclaration declaration) {
|
||||
return declarativeBackend(declaration);
|
||||
}
|
||||
|
||||
private static IRBackend declarativeBackend(
|
||||
final IRLifecycleDeclaration declarationOverride,
|
||||
final IRSyntheticFunction... extraSynthetics) {
|
||||
final var depSpan = span(1);
|
||||
final var hostSpan = span(2);
|
||||
final var synthetics = new ArrayList<IRSyntheticFunction>();
|
||||
synthetics.add(new IRSyntheticFunction(
|
||||
new ModuleId(0),
|
||||
"file_init_dep",
|
||||
IRSyntheticCallableKind.FILE_INIT_FRAGMENT,
|
||||
new IRSyntheticOrigin(new FileId(1), "warmup", depSpan)));
|
||||
synthetics.add(new IRSyntheticFunction(
|
||||
new ModuleId(1),
|
||||
"file_init_host",
|
||||
IRSyntheticCallableKind.FILE_INIT_FRAGMENT,
|
||||
new IRSyntheticOrigin(new FileId(2), "boot", hostSpan)));
|
||||
synthetics.addAll(Arrays.asList(extraSynthetics));
|
||||
final var declaration = declarationOverride != null
|
||||
? declarationOverride
|
||||
: new IRLifecycleDeclaration(
|
||||
ReadOnlyList.from(
|
||||
new IRLifecycleModuleDeclaration(
|
||||
new ModuleId(0),
|
||||
ReadOnlyList.from(reference(0, 1, 0, IRLifecycleCallableRole.FILE_INIT_FRAGMENT, depSpan))),
|
||||
new IRLifecycleModuleDeclaration(
|
||||
new ModuleId(1),
|
||||
ReadOnlyList.from(reference(1, 2, 1, IRLifecycleCallableRole.FILE_INIT_FRAGMENT, hostSpan)))),
|
||||
reference(1, 2, 3, IRLifecycleCallableRole.PROJECT_INIT, hostSpan),
|
||||
reference(1, 2, 2, IRLifecycleCallableRole.FRAME_ROOT, hostSpan));
|
||||
return IRBackend.builder()
|
||||
.entryPointCallableName("frame")
|
||||
.entryPointModuleId(new ModuleId(1))
|
||||
.modulePool(ReadOnlyList.from(
|
||||
new ModuleReference("app", ReadOnlyList.from("zzz")),
|
||||
new ModuleReference("app", ReadOnlyList.from("aaa"))))
|
||||
.callableSignatures(ReadOnlyList.from(
|
||||
new CallableSignatureRef(new ModuleId(0), "file_init_dep", 0, "() -> unit"),
|
||||
new CallableSignatureRef(new ModuleId(1), "file_init_host", 0, "() -> unit"),
|
||||
new CallableSignatureRef(new ModuleId(1), "frame", 0, "() -> unit"),
|
||||
new CallableSignatureRef(new ModuleId(1), "boot", 0, "() -> unit")))
|
||||
.executableFunctions(ReadOnlyList.from(
|
||||
fn("file_init_dep", 1, 0, 0, depSpan),
|
||||
fn("file_init_host", 2, 1, 1, hostSpan),
|
||||
fn("frame", 2, 1, 2, hostSpan),
|
||||
fn("boot", 2, 1, 3, hostSpan)))
|
||||
.syntheticFunctions(ReadOnlyList.wrap(synthetics))
|
||||
.globals(ReadOnlyList.from(new IRGlobal(
|
||||
new FileId(1),
|
||||
new ModuleId(0),
|
||||
"SCORE",
|
||||
"int",
|
||||
0,
|
||||
IRGlobalVisibility.MODULE,
|
||||
false,
|
||||
IRHiddenGlobalKind.NONE,
|
||||
new IRGlobalOrigin(new FileId(1), new ModuleId(0), "SCORE", depSpan, "SCORE"),
|
||||
depSpan)))
|
||||
.lifecycleDeclaration(declaration)
|
||||
.build();
|
||||
}
|
||||
|
||||
private static IRLifecycleCallableReference reference(
|
||||
final int moduleId,
|
||||
final int fileId,
|
||||
final int callableId,
|
||||
final IRLifecycleCallableRole role,
|
||||
final Span origin) {
|
||||
return new IRLifecycleCallableReference(
|
||||
new ModuleId(moduleId),
|
||||
new FileId(fileId),
|
||||
new CallableId(callableId),
|
||||
role,
|
||||
origin);
|
||||
}
|
||||
|
||||
private static IRBackendExecutableFunction fn(
|
||||
final String name,
|
||||
final int fileId,
|
||||
final int moduleId,
|
||||
final int callableId,
|
||||
final Span span) {
|
||||
return new IRBackendExecutableFunction(
|
||||
new FileId(fileId),
|
||||
new ModuleId(moduleId),
|
||||
name,
|
||||
new CallableId(callableId),
|
||||
(int) span.getStart(),
|
||||
(int) span.getEnd(),
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
1,
|
||||
ReadOnlyList.from(new IRBackendExecutableFunction.Instruction(
|
||||
IRBackendExecutableFunction.InstructionKind.RET,
|
||||
"",
|
||||
null,
|
||||
null,
|
||||
span)),
|
||||
span);
|
||||
}
|
||||
|
||||
private static IRBackendExecutableFunction executable(final IRBackend backend, final String name) {
|
||||
return backend.getExecutableFunctions().stream()
|
||||
.filter(function -> name.equals(function.callableName()))
|
||||
.findFirst()
|
||||
.orElseThrow(() -> new AssertionError("missing executable " + name));
|
||||
}
|
||||
|
||||
private static Span span(final int fileId) {
|
||||
return new Span(new FileId(fileId), 4, 16);
|
||||
}
|
||||
|
||||
private static String firstCode(final BuildingIssueSink issues) {
|
||||
return issues.asCollection().iterator().next().getCode();
|
||||
}
|
||||
|
||||
private static String firstMessage(final BuildingIssueSink issues) {
|
||||
return issues.asCollection().iterator().next().getMessage();
|
||||
}
|
||||
}
|
||||
+19
-1
@@ -36,9 +36,22 @@ class BackendConformanceMatrixSpecTest {
|
||||
"G19-5.2.6",
|
||||
"G19-5.2.7",
|
||||
"G19-5.2.8",
|
||||
"G19-11.1",
|
||||
"G19-11.2",
|
||||
"G19-11.3",
|
||||
"G19-11.4",
|
||||
"G19-11.5",
|
||||
"G19-11.6",
|
||||
"PBS12-11",
|
||||
"G20-4.1.1",
|
||||
"G20-4.1.2",
|
||||
"G20-4.1.3",
|
||||
"G20-4.2.1",
|
||||
"G20-4.2.2",
|
||||
"G20-4.2.3",
|
||||
"G20-4.3.1",
|
||||
"G20-4.3.2",
|
||||
"G20-4.3.3",
|
||||
"G20-6.2",
|
||||
"G20-6.3",
|
||||
"G20-6.4",
|
||||
@@ -78,7 +91,12 @@ class BackendConformanceMatrixSpecTest {
|
||||
"PBS13-12.3.2",
|
||||
"PBS13-12.4.1",
|
||||
"PBS13-12.4.2",
|
||||
"PBS13-12.5");
|
||||
"PBS13-12.5",
|
||||
"PBS13-12.7",
|
||||
"PBS13-12.8",
|
||||
"PBS13-12.9",
|
||||
"G23-5.2",
|
||||
"G23-8.3");
|
||||
|
||||
@Test
|
||||
void matrixMustExistAndContainRequiredRequirementRows() throws IOException {
|
||||
|
||||
-60
@@ -1,60 +0,0 @@
|
||||
package p.studio.compiler.specs;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.util.ArrayList;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
import static org.junit.jupiter.api.Assertions.fail;
|
||||
|
||||
class CommonBackendArchitectureTest {
|
||||
private static final String BACKEND_SOURCE_ROOT =
|
||||
"prometeu-compiler/prometeu-build-pipeline/src/main/java/p/studio/compiler/backend";
|
||||
private static final String FORBIDDEN_PBS_PACKAGE = "p.studio.compiler.pbs";
|
||||
|
||||
@Test
|
||||
void commonBackendMustNotImportPbsFrontendPackages() throws IOException {
|
||||
final var backendRoot = locateRepoRoot().resolve(BACKEND_SOURCE_ROOT);
|
||||
final var violations = new ArrayList<String>();
|
||||
|
||||
try (final var paths = Files.walk(backendRoot)) {
|
||||
paths.filter(path -> path.toString().endsWith(".java"))
|
||||
.forEach(path -> assertNoPbsImport(path, violations));
|
||||
}
|
||||
|
||||
assertTrue(
|
||||
violations.isEmpty(),
|
||||
"common backend must not import PBS frontend packages: " + violations);
|
||||
}
|
||||
|
||||
private static void assertNoPbsImport(
|
||||
final Path path,
|
||||
final ArrayList<String> violations) {
|
||||
try {
|
||||
final var content = Files.readString(path);
|
||||
if (content.contains("import " + FORBIDDEN_PBS_PACKAGE)
|
||||
|| content.contains("import static " + FORBIDDEN_PBS_PACKAGE)) {
|
||||
violations.add(locateRepoRoot().relativize(path).toString());
|
||||
}
|
||||
} catch (IOException e) {
|
||||
throw new IllegalStateException("failed to read source file: " + path, e);
|
||||
}
|
||||
}
|
||||
|
||||
private static Path locateRepoRoot() {
|
||||
var cursor = Path.of(System.getProperty("user.dir")).toAbsolutePath().normalize();
|
||||
while (cursor != null) {
|
||||
final var hasDocs = Files.isDirectory(cursor.resolve("docs/specs/compiler"));
|
||||
final var hasCompiler = Files.isDirectory(cursor.resolve("prometeu-compiler"));
|
||||
if (hasDocs && hasCompiler) {
|
||||
return cursor;
|
||||
}
|
||||
cursor = cursor.getParent();
|
||||
}
|
||||
fail("could not locate repository root from working directory");
|
||||
throw new IllegalStateException("unreachable");
|
||||
}
|
||||
}
|
||||
+109
@@ -0,0 +1,109 @@
|
||||
package p.studio.compiler.specs;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertFalse;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
import static org.junit.jupiter.api.Assertions.fail;
|
||||
|
||||
class ConsoleAbiAuthoritySpecTest {
|
||||
private static final String SPEC_18 =
|
||||
"docs/specs/compiler/18. Standard Library Surface Specification.md";
|
||||
private static final String PBS_SPEC_8 =
|
||||
"docs/specs/compiler-languages/pbs/8. Stdlib Environment Packaging and Loading Specification.md";
|
||||
private static final String PBS_SPEC_6_2 =
|
||||
"docs/specs/compiler-languages/pbs/6.2. Host ABI Binding and Loader Resolution Specification.md";
|
||||
|
||||
@Test
|
||||
void spec18MustTreatStdlibAsDeliveryAndMustNotOwnConsoleAbi() throws IOException {
|
||||
final var content = Files.readString(locateRepoRoot().resolve(SPEC_18));
|
||||
|
||||
assertTrue(
|
||||
content.contains("This document is PBS delivery. It does not own console ABI."),
|
||||
"spec 18 must state that PBS stdlib is delivery, not console ABI");
|
||||
assertTrue(
|
||||
content.contains("This document MUST NOT define numeric syscall identifiers, intrinsic `final_id`"),
|
||||
"spec 18 must forbid defining syscall IDs and intrinsic final IDs");
|
||||
assertTrue(
|
||||
content.contains("or `SyscallMeta`"),
|
||||
"spec 18 must forbid publishing SyscallMeta");
|
||||
assertTrue(
|
||||
content.contains("## 15. Console ABI Non-Ownership"),
|
||||
"spec 18 must contain Console ABI Non-Ownership");
|
||||
assertTrue(
|
||||
content.contains("Reserved project-space path (`@sdk:*` / `@core:*`) MUST NOT imply VM-owned versus host-backed ownership."),
|
||||
"spec 18 must state that @sdk/@core paths do not imply ownership");
|
||||
assertTrue(
|
||||
content.contains("Current stdlib line `1` ships a VM-owned builtin input shell at `@sdk:input`."),
|
||||
"spec 18 must record @sdk:input as the current builtin exception");
|
||||
}
|
||||
|
||||
@Test
|
||||
void spec8MustDocumentCurrentGameStdlibLayout() throws IOException {
|
||||
final var content = Files.readString(locateRepoRoot().resolve(PBS_SPEC_8));
|
||||
final var layoutFence = extractFirstTextFence(content);
|
||||
|
||||
assertTrue(content.contains("game/stdlib/1"), "spec 8 must document game/stdlib/1");
|
||||
assertTrue(content.contains("game/stdlib/1/core/color"), "spec 8 must map @core:color");
|
||||
assertTrue(content.contains("game/stdlib/1/sdk/input"), "spec 8 must map @sdk:input");
|
||||
assertTrue(content.contains("game/stdlib/1/sdk/log"), "spec 8 must map @sdk:log");
|
||||
assertTrue(
|
||||
content.contains("Physical stdlib\npath MUST NOT imply VM-owned versus host-backed ownership."),
|
||||
"spec 8 must state that packaging path does not imply ownership");
|
||||
assertTrue(layoutFence.contains("core/\n color/"), "layout fence must include core/color");
|
||||
assertTrue(layoutFence.contains("input/"), "layout fence must include sdk/input");
|
||||
assertTrue(layoutFence.contains("log/"), "layout fence must include sdk/log");
|
||||
assertFalse(layoutFence.contains("audio/"), "layout fence must not ship audio as a current module");
|
||||
assertFalse(layoutFence.contains("math/"), "layout fence must not ship core/math as a current module");
|
||||
}
|
||||
|
||||
@Test
|
||||
void spec62MustRequirePbsHostShellsToRepeatRuntimeRegistry() throws IOException {
|
||||
final var content = Files.readString(locateRepoRoot().resolve(PBS_SPEC_6_2));
|
||||
|
||||
assertTrue(
|
||||
content.contains("PBS shells MUST repeat identities already published by the runtime registry"),
|
||||
"spec 6.2 must require PBS shells to repeat the runtime registry");
|
||||
assertTrue(
|
||||
content.contains("They MUST NOT invent `(module, name, version)`."),
|
||||
"spec 6.2 must forbid inventing canonical host identity");
|
||||
assertTrue(
|
||||
content.contains("This document MUST NOT publish syscall\nIDs or `SyscallMeta`."),
|
||||
"spec 6.2 must not publish the syscall catalog");
|
||||
assertTrue(
|
||||
content.contains("(\"gfx2d\", \"clear\", 1)"),
|
||||
"spec 6.2 authority example must use a current runtime identity");
|
||||
}
|
||||
|
||||
private static String extractFirstTextFence(final String content) {
|
||||
final var startToken = "```text";
|
||||
final var start = content.indexOf(startToken);
|
||||
if (start < 0) {
|
||||
fail("spec 8 must contain a text layout fence");
|
||||
}
|
||||
final var fenceStart = start + startToken.length();
|
||||
final var end = content.indexOf("```", fenceStart);
|
||||
if (end < 0) {
|
||||
fail("spec 8 layout fence is unclosed");
|
||||
}
|
||||
return content.substring(fenceStart, end);
|
||||
}
|
||||
|
||||
private static Path locateRepoRoot() {
|
||||
var cursor = Path.of(System.getProperty("user.dir")).toAbsolutePath().normalize();
|
||||
while (cursor != null) {
|
||||
final var hasDocs = Files.isDirectory(cursor.resolve("docs/specs/compiler"));
|
||||
final var hasCompiler = Files.isDirectory(cursor.resolve("prometeu-compiler"));
|
||||
if (hasDocs && hasCompiler) {
|
||||
return cursor;
|
||||
}
|
||||
cursor = cursor.getParent();
|
||||
}
|
||||
fail("could not locate repository root from working directory");
|
||||
throw new IllegalStateException("unreachable");
|
||||
}
|
||||
}
|
||||
-102
@@ -11,93 +11,11 @@ import p.studio.compiler.source.diagnostics.DiagnosticSink;
|
||||
import p.studio.utilities.logs.LogAggregator;
|
||||
import p.studio.utilities.structures.ReadOnlySet;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.util.List;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertNotNull;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
import static org.junit.jupiter.api.Assertions.fail;
|
||||
|
||||
class FrontendProviderBoundaryTest {
|
||||
|
||||
@Test
|
||||
void commonModulesMustNotInstantiatePbsFrontendPhaseServiceDirectly() throws IOException {
|
||||
final var repoRoot = findRepoRoot(Path.of("").toAbsolutePath().normalize());
|
||||
final var commonSourceRoots = List.of(
|
||||
repoRoot.resolve("prometeu-compiler/prometeu-build-pipeline/src/main/java"),
|
||||
repoRoot.resolve("prometeu-compiler/prometeu-deps/src/main/java"),
|
||||
repoRoot.resolve("prometeu-studio/src/main/java"),
|
||||
repoRoot.resolve("prometeu-app/src/main/java"));
|
||||
|
||||
for (final var sourceRoot : commonSourceRoots) {
|
||||
if (!Files.exists(sourceRoot)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
try (final var files = Files.walk(sourceRoot)) {
|
||||
final var violations = files
|
||||
.filter(path -> path.toString().endsWith(".java"))
|
||||
.filter(path -> contains(path, "new PBSFrontendPhaseService("))
|
||||
.toList();
|
||||
if (!violations.isEmpty()) {
|
||||
fail("common modules must resolve frontend compiler behavior through FrontendProvider: " + violations);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
void commonModulesMustNotInstantiatePbsEditorialSupportServiceDirectly() throws IOException {
|
||||
final var repoRoot = findRepoRoot(Path.of("").toAbsolutePath().normalize());
|
||||
final var sourceRoots = List.of(
|
||||
repoRoot.resolve("prometeu-compiler/prometeu-build-pipeline/src/main/java"),
|
||||
repoRoot.resolve("prometeu-compiler/prometeu-deps/src/main/java"),
|
||||
repoRoot.resolve("prometeu-lsp/prometeu-lsp-v1/src/main/java"),
|
||||
repoRoot.resolve("prometeu-studio/src/main/java"),
|
||||
repoRoot.resolve("prometeu-app/src/main/java"));
|
||||
|
||||
for (final var sourceRoot : sourceRoots) {
|
||||
if (!Files.exists(sourceRoot)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
try (final var files = Files.walk(sourceRoot)) {
|
||||
final var violations = files
|
||||
.filter(path -> path.toString().endsWith(".java"))
|
||||
.filter(path -> contains(path, "new PbsEditorialSupportService("))
|
||||
.toList();
|
||||
if (!violations.isEmpty()) {
|
||||
fail("common modules must resolve PBS editor behavior through FrontendProvider.languageService(): " + violations);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
void commonLspMustNotImportPbsImplementationPackages() throws IOException {
|
||||
final var repoRoot = findRepoRoot(Path.of("").toAbsolutePath().normalize());
|
||||
final var sourceRoot = repoRoot.resolve("prometeu-lsp/prometeu-lsp-v1/src/main/java");
|
||||
final var prohibitedNeedles = List.of(
|
||||
"p.studio.compiler.PBSFrontendLanguageService",
|
||||
"p.studio.compiler.services.PBSFrontendPhaseService",
|
||||
"p.studio.compiler.pbs",
|
||||
"PbsAst",
|
||||
"PbsEditorial");
|
||||
|
||||
try (final var files = Files.walk(sourceRoot)) {
|
||||
final var violations = files
|
||||
.filter(path -> path.toString().endsWith(".java"))
|
||||
.filter(path -> prohibitedNeedles.stream().anyMatch(needle -> contains(path, needle)))
|
||||
.toList();
|
||||
if (!violations.isEmpty()) {
|
||||
fail("common LSP code must consume generic frontend language-service contracts instead of PBS implementation packages: "
|
||||
+ violations);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
void compileOnlyFrontendProviderMayOmitLanguageService() {
|
||||
final FrontendProvider provider = new CompileOnlyFrontendProvider();
|
||||
@@ -110,26 +28,6 @@ class FrontendProviderBoundaryTest {
|
||||
BuildingIssueSink.empty()));
|
||||
}
|
||||
|
||||
private boolean contains(final Path path, final String needle) {
|
||||
try {
|
||||
return Files.readString(path).contains(needle);
|
||||
} catch (IOException e) {
|
||||
throw new IllegalStateException("failed to read " + path, e);
|
||||
}
|
||||
}
|
||||
|
||||
private Path findRepoRoot(final Path start) {
|
||||
var current = start;
|
||||
while (current != null) {
|
||||
if (Files.exists(current.resolve("settings.gradle.kts"))) {
|
||||
return current;
|
||||
}
|
||||
current = current.getParent();
|
||||
}
|
||||
fail("unable to locate repository root from " + start);
|
||||
return start;
|
||||
}
|
||||
|
||||
private static final class CompileOnlyFrontendProvider implements FrontendProvider {
|
||||
private final FrontendSpec specification = FrontendSpec.builder()
|
||||
.languageId("compile-only")
|
||||
|
||||
+83
@@ -0,0 +1,83 @@
|
||||
package p.studio.compiler.specs;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.util.List;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertFalse;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
import static org.junit.jupiter.api.Assertions.fail;
|
||||
|
||||
class ValidationOwnershipSpecTest {
|
||||
private static final String SPEC_19 =
|
||||
"docs/specs/compiler/19. Verification and Safety Checks Specification.md";
|
||||
private static final String PBS_SPEC_12 =
|
||||
"docs/specs/compiler-languages/pbs/12. Diagnostics Specification.md";
|
||||
private static final List<String> PBS_FORBIDDEN_COMMON_COVERAGE = List.of(
|
||||
"synthetic wrapper entrypoint missing",
|
||||
"published entrypoint is not function index 0",
|
||||
"hidden boot guard is missing",
|
||||
"synthetic callable origin missing");
|
||||
|
||||
@Test
|
||||
void spec19MustBeCompilerGeneralAndPublishValidationOwnership() throws IOException {
|
||||
final var content = Files.readString(locateRepoRoot().resolve(SPEC_19));
|
||||
|
||||
assertFalse(
|
||||
content.startsWith("# PBS Verification"),
|
||||
"spec 19 must not be titled as PBS Verification");
|
||||
assertTrue(
|
||||
content.contains("# Compiler Verification and Safety Checks Specification"),
|
||||
"spec 19 must use the compiler-general title");
|
||||
assertTrue(content.contains("## 11. Validation Ownership"), "spec 19 must contain Validation Ownership");
|
||||
assertTrue(
|
||||
content.contains("lowest layer that understands the failure without knowing the source language"),
|
||||
"spec 19 must state the classification MUST");
|
||||
assertTrue(content.contains("Parse / syntax"), "spec 19 matrix must include parse/syntax");
|
||||
assertTrue(content.contains("PBS linking"), "spec 19 matrix must include PBS linking");
|
||||
assertTrue(content.contains("Lifecycle assembler"), "spec 19 matrix must include lifecycle assembler");
|
||||
assertTrue(
|
||||
content.contains("Canonical host-binding identity"),
|
||||
"spec 19 matrix must include the host-admission split");
|
||||
assertTrue(
|
||||
content.contains("MUST NOT depend on types from the PBS frontend module"),
|
||||
"spec 19 must forbid PBS frontend module types in platform validators");
|
||||
assertTrue(
|
||||
content.contains("`p.studio.compiler.pbs` is not the complete boundary"),
|
||||
"spec 19 must not treat package p.studio.compiler.pbs as the complete PBS boundary");
|
||||
}
|
||||
|
||||
@Test
|
||||
void pbsDiagnosticsMustNotClaimCommonStructuralFailures() throws IOException {
|
||||
final var content = Files.readString(locateRepoRoot().resolve(PBS_SPEC_12));
|
||||
|
||||
for (final var forbidden : PBS_FORBIDDEN_COMMON_COVERAGE) {
|
||||
assertFalse(
|
||||
content.contains(forbidden),
|
||||
"PBS spec 12 must not list common structural coverage: " + forbidden);
|
||||
}
|
||||
assertTrue(
|
||||
content.contains("docs/specs/compiler/19. Verification and Safety Checks Specification.md"),
|
||||
"PBS spec 12 must point common structural failures at spec 19");
|
||||
assertTrue(
|
||||
content.contains("init function must have signature fn name() -> void"),
|
||||
"PBS spec 12 must retain lifecycle-marker coverage");
|
||||
}
|
||||
|
||||
private static Path locateRepoRoot() {
|
||||
var cursor = Path.of(System.getProperty("user.dir")).toAbsolutePath().normalize();
|
||||
while (cursor != null) {
|
||||
final var hasDocs = Files.isDirectory(cursor.resolve("docs/specs/compiler"));
|
||||
final var hasCompiler = Files.isDirectory(cursor.resolve("prometeu-compiler"));
|
||||
if (hasDocs && hasCompiler) {
|
||||
return cursor;
|
||||
}
|
||||
cursor = cursor.getParent();
|
||||
}
|
||||
fail("could not locate repository root from working directory");
|
||||
throw new IllegalStateException("unreachable");
|
||||
}
|
||||
}
|
||||
+81
@@ -0,0 +1,81 @@
|
||||
package p.studio.compiler.synth;
|
||||
|
||||
import p.studio.compiler.messages.BuildingIssueSink;
|
||||
import p.studio.compiler.messages.FrontendPhaseContext;
|
||||
import p.studio.compiler.models.IRBackend;
|
||||
import p.studio.compiler.models.IRBackendExecutableFunction;
|
||||
import p.studio.compiler.models.IRLifecycleCallableReference;
|
||||
import p.studio.compiler.models.IRLifecycleCallableRole;
|
||||
import p.studio.compiler.models.IRLifecycleDeclaration;
|
||||
import p.studio.compiler.models.IRLifecycleModuleDeclaration;
|
||||
import p.studio.compiler.services.FrontendPhaseService;
|
||||
import p.studio.compiler.source.Span;
|
||||
import p.studio.compiler.source.diagnostics.DiagnosticSink;
|
||||
import p.studio.compiler.source.identifiers.CallableId;
|
||||
import p.studio.compiler.source.identifiers.FileId;
|
||||
import p.studio.compiler.source.identifiers.ModuleId;
|
||||
import p.studio.compiler.source.tables.CallableSignatureRef;
|
||||
import p.studio.compiler.source.tables.ModuleReference;
|
||||
import p.studio.utilities.logs.LogAggregator;
|
||||
import p.studio.utilities.structures.ReadOnlyList;
|
||||
|
||||
import java.util.concurrent.atomic.AtomicBoolean;
|
||||
|
||||
public final class SyntheticFrontendPhaseService implements FrontendPhaseService {
|
||||
private final AtomicBoolean invoked = new AtomicBoolean();
|
||||
|
||||
public boolean invoked() {
|
||||
return invoked.get();
|
||||
}
|
||||
|
||||
@Override
|
||||
public IRBackend compile(
|
||||
final FrontendPhaseContext request,
|
||||
final DiagnosticSink diagnostics,
|
||||
final LogAggregator logs,
|
||||
final BuildingIssueSink issues) {
|
||||
invoked.set(true);
|
||||
|
||||
final var moduleId = new ModuleId(0);
|
||||
final var fileId = new FileId(0);
|
||||
final var callableId = new CallableId(0);
|
||||
final var span = new Span(fileId, 0, 1);
|
||||
final var frame = new IRBackendExecutableFunction(
|
||||
fileId,
|
||||
moduleId,
|
||||
"frame",
|
||||
callableId,
|
||||
0,
|
||||
1,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
1,
|
||||
ReadOnlyList.from(new IRBackendExecutableFunction.Instruction(
|
||||
IRBackendExecutableFunction.InstructionKind.RET,
|
||||
"",
|
||||
null,
|
||||
null,
|
||||
span)),
|
||||
span);
|
||||
final var frameRoot = new IRLifecycleCallableReference(
|
||||
moduleId,
|
||||
fileId,
|
||||
callableId,
|
||||
IRLifecycleCallableRole.FRAME_ROOT,
|
||||
span);
|
||||
|
||||
return IRBackend.builder()
|
||||
.entryPointCallableName("frame")
|
||||
.entryPointModuleId(moduleId)
|
||||
.modulePool(ReadOnlyList.from(new ModuleReference("synth", ReadOnlyList.from("main"))))
|
||||
.callableSignatures(ReadOnlyList.from(
|
||||
new CallableSignatureRef(moduleId, "frame", 0, "() -> unit")))
|
||||
.executableFunctions(ReadOnlyList.from(frame))
|
||||
.lifecycleDeclaration(new IRLifecycleDeclaration(
|
||||
ReadOnlyList.from(new IRLifecycleModuleDeclaration(moduleId, ReadOnlyList.empty())),
|
||||
null,
|
||||
frameRoot))
|
||||
.build();
|
||||
}
|
||||
}
|
||||
+31
@@ -0,0 +1,31 @@
|
||||
package p.studio.compiler.synth;
|
||||
|
||||
import p.studio.compiler.models.FrontendSpec;
|
||||
import p.studio.compiler.services.FrontendPhaseService;
|
||||
import p.studio.compiler.services.FrontendProvider;
|
||||
import p.studio.utilities.structures.ReadOnlySet;
|
||||
|
||||
public final class SyntheticFrontendProvider implements FrontendProvider {
|
||||
public static final String LANGUAGE_ID = "synth";
|
||||
|
||||
private final FrontendSpec specification = FrontendSpec.builder()
|
||||
.languageId(LANGUAGE_ID)
|
||||
.allowedExtensions(ReadOnlySet.from("synth"))
|
||||
.sourceRoots(ReadOnlySet.from("src"))
|
||||
.build();
|
||||
private final SyntheticFrontendPhaseService compiler = new SyntheticFrontendPhaseService();
|
||||
|
||||
@Override
|
||||
public FrontendSpec specification() {
|
||||
return specification;
|
||||
}
|
||||
|
||||
@Override
|
||||
public FrontendPhaseService compiler() {
|
||||
return compiler;
|
||||
}
|
||||
|
||||
public SyntheticFrontendPhaseService syntheticCompiler() {
|
||||
return compiler;
|
||||
}
|
||||
}
|
||||
+156
@@ -0,0 +1,156 @@
|
||||
package p.studio.compiler.workspaces;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
import p.studio.AppMode;
|
||||
import p.studio.compiler.lifecycle.LifecycleAssemblerService;
|
||||
import p.studio.compiler.messages.BuilderPipelineConfig;
|
||||
import p.studio.compiler.models.BuilderPipelineContext;
|
||||
import p.studio.compiler.models.IRBackend;
|
||||
import p.studio.compiler.models.ResolvedWorkspace;
|
||||
import p.studio.compiler.source.identifiers.ProjectId;
|
||||
import p.studio.compiler.models.IRBackendExecutableFunction;
|
||||
import p.studio.compiler.models.IRLifecycleCallableReference;
|
||||
import p.studio.compiler.models.IRLifecycleCallableRole;
|
||||
import p.studio.compiler.models.IRLifecycleDeclaration;
|
||||
import p.studio.compiler.models.IRLifecycleModuleDeclaration;
|
||||
import p.studio.compiler.models.IRSyntheticCallableKind;
|
||||
import p.studio.compiler.source.Span;
|
||||
import p.studio.compiler.source.identifiers.CallableId;
|
||||
import p.studio.compiler.source.identifiers.FileId;
|
||||
import p.studio.compiler.source.identifiers.ModuleId;
|
||||
import p.studio.compiler.source.tables.CallableSignatureRef;
|
||||
import p.studio.compiler.source.tables.ModuleReference;
|
||||
import p.studio.compiler.workspaces.stages.AssembleLifecyclePipelineStage;
|
||||
import p.studio.compiler.workspaces.stages.EmitBytecodePipelineStage;
|
||||
import p.studio.compiler.workspaces.stages.FrontendPhasePipelineStage;
|
||||
import p.studio.compiler.workspaces.stages.LinkBytecodePipelineStage;
|
||||
import p.studio.compiler.workspaces.stages.LoadSourcesPipelineStage;
|
||||
import p.studio.compiler.workspaces.stages.LowerToIRVMPipelineStage;
|
||||
import p.studio.compiler.workspaces.stages.OptimizeIRVMPipelineStage;
|
||||
import p.studio.compiler.workspaces.stages.ResolveDepsPipelineStage;
|
||||
import p.studio.compiler.workspaces.stages.VerifyBytecodePipelineStage;
|
||||
import p.studio.compiler.workspaces.stages.WriteBytecodeArtifactPipelineStage;
|
||||
import p.studio.utilities.logs.LogAggregator;
|
||||
import p.studio.utilities.structures.ReadOnlyList;
|
||||
|
||||
import java.lang.reflect.Field;
|
||||
import java.util.List;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.*;
|
||||
|
||||
class BuilderPipelineServiceOrderTest {
|
||||
|
||||
@Test
|
||||
void canonicalOrderMustContainOptimizeBetweenLowerAndEmit() {
|
||||
final var analyses = stageNames("analyses");
|
||||
final var compile = stageNames("compile");
|
||||
final var build = stageNames("build");
|
||||
|
||||
assertEquals(
|
||||
List.of(
|
||||
ResolveDepsPipelineStage.class.getSimpleName(),
|
||||
LoadSourcesPipelineStage.class.getSimpleName(),
|
||||
FrontendPhasePipelineStage.class.getSimpleName(),
|
||||
AssembleLifecyclePipelineStage.class.getSimpleName()),
|
||||
analyses);
|
||||
assertEquals(
|
||||
List.of(
|
||||
LowerToIRVMPipelineStage.class.getSimpleName(),
|
||||
OptimizeIRVMPipelineStage.class.getSimpleName(),
|
||||
EmitBytecodePipelineStage.class.getSimpleName(),
|
||||
LinkBytecodePipelineStage.class.getSimpleName(),
|
||||
VerifyBytecodePipelineStage.class.getSimpleName()),
|
||||
compile);
|
||||
assertEquals(List.of(WriteBytecodeArtifactPipelineStage.class.getSimpleName()), build);
|
||||
assertEquals(
|
||||
FrontendPhasePipelineStage.class.getSimpleName(),
|
||||
analyses.get(analyses.size() - 2));
|
||||
assertEquals(
|
||||
AssembleLifecyclePipelineStage.class.getSimpleName(),
|
||||
analyses.getLast());
|
||||
}
|
||||
|
||||
@Test
|
||||
void analyzeMustTerminateAfterLifecycleAssemblyWithoutBackendArtifacts() {
|
||||
final var ctx = BuilderPipelineContext.fromConfig(new BuilderPipelineConfig(false, "."));
|
||||
ctx.irBackend = validDeclaration();
|
||||
ctx.resolvedWorkspace = new ResolvedWorkspace(
|
||||
new ProjectId(0),
|
||||
null,
|
||||
1,
|
||||
AppMode.Game,
|
||||
null,
|
||||
null);
|
||||
final var pipeline = new BuilderPipelineService(
|
||||
List.of(new AssembleLifecyclePipelineStage()),
|
||||
List.of(new LowerToIRVMPipelineStage()),
|
||||
List.of());
|
||||
|
||||
final var snapshot = pipeline.analyze(ctx, LogAggregator.empty());
|
||||
|
||||
assertNotNull(snapshot.irBackend());
|
||||
assertTrue(snapshot.irBackend().getSyntheticFunctions().stream().anyMatch(fn ->
|
||||
fn.kind() == IRSyntheticCallableKind.PUBLISHED_FRAME_WRAPPER));
|
||||
assertEquals(
|
||||
"__prometeu.lifecycle.frame_wrapper$m0",
|
||||
snapshot.irBackend().getEntryPointCallableName());
|
||||
assertSame(ctx.irBackend.getLifecycleDeclaration(), snapshot.irBackend().getLifecycleDeclaration());
|
||||
assertNull(ctx.irvm);
|
||||
assertNull(ctx.optimizedIrvm);
|
||||
assertNull(ctx.bytecodeModule);
|
||||
assertNull(ctx.bytecodeBytes);
|
||||
assertNull(ctx.bytecodeArtifactPath);
|
||||
assertTrue(snapshot.diagnostics().stream().noneMatch(issue ->
|
||||
LifecycleAssemblerService.INVALID_DECLARATION.equals(issue.getCode())));
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
private static List<String> stageNames(final String fieldName) {
|
||||
try {
|
||||
final Field field = BuilderPipelineService.class.getDeclaredField(fieldName);
|
||||
field.setAccessible(true);
|
||||
final var stages = (List<PipelineStage>) field.get(BuilderPipelineService.INSTANCE);
|
||||
return stages.stream().map(stage -> stage.getClass().getSimpleName()).toList();
|
||||
} catch (ReflectiveOperationException e) {
|
||||
throw new AssertionError("failed to inspect pipeline field " + fieldName, e);
|
||||
}
|
||||
}
|
||||
|
||||
private static IRBackend validDeclaration() {
|
||||
final var span = new Span(new FileId(1), 1, 8);
|
||||
return IRBackend.builder()
|
||||
.entryPointCallableName("frame")
|
||||
.entryPointModuleId(new ModuleId(0))
|
||||
.modulePool(ReadOnlyList.from(new ModuleReference("app", ReadOnlyList.from("main"))))
|
||||
.callableSignatures(ReadOnlyList.from(
|
||||
new CallableSignatureRef(new ModuleId(0), "frame", 0, "() -> unit")))
|
||||
.executableFunctions(ReadOnlyList.from(new IRBackendExecutableFunction(
|
||||
new FileId(1),
|
||||
new ModuleId(0),
|
||||
"frame",
|
||||
new CallableId(0),
|
||||
1,
|
||||
8,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
1,
|
||||
ReadOnlyList.from(new IRBackendExecutableFunction.Instruction(
|
||||
IRBackendExecutableFunction.InstructionKind.RET,
|
||||
"",
|
||||
null,
|
||||
null,
|
||||
span)),
|
||||
span)))
|
||||
.lifecycleDeclaration(new IRLifecycleDeclaration(
|
||||
ReadOnlyList.from(new IRLifecycleModuleDeclaration(new ModuleId(0), ReadOnlyList.empty())),
|
||||
null,
|
||||
new IRLifecycleCallableReference(
|
||||
new ModuleId(0),
|
||||
new FileId(1),
|
||||
new CallableId(0),
|
||||
IRLifecycleCallableRole.FRAME_ROOT,
|
||||
span)))
|
||||
.build();
|
||||
}
|
||||
}
|
||||
+131
@@ -0,0 +1,131 @@
|
||||
package p.studio.compiler.workspaces.stages;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
import p.studio.compiler.lifecycle.LifecycleAssemblerService;
|
||||
import p.studio.compiler.messages.BuilderPipelineConfig;
|
||||
import p.studio.compiler.messages.BuildingIssueSink;
|
||||
import p.studio.compiler.models.BuilderPipelineContext;
|
||||
import p.studio.compiler.models.IRBackend;
|
||||
import p.studio.compiler.models.IRBackendExecutableFunction;
|
||||
import p.studio.compiler.models.IRLifecycleCallableReference;
|
||||
import p.studio.compiler.models.IRLifecycleCallableRole;
|
||||
import p.studio.compiler.models.IRLifecycleDeclaration;
|
||||
import p.studio.compiler.models.IRLifecycleModuleDeclaration;
|
||||
import p.studio.compiler.models.IRSyntheticCallableKind;
|
||||
import p.studio.compiler.source.Span;
|
||||
import p.studio.compiler.source.identifiers.CallableId;
|
||||
import p.studio.compiler.source.identifiers.FileId;
|
||||
import p.studio.compiler.source.identifiers.ModuleId;
|
||||
import p.studio.compiler.source.tables.CallableSignatureRef;
|
||||
import p.studio.compiler.source.tables.ModuleReference;
|
||||
import p.studio.utilities.logs.LogAggregator;
|
||||
import p.studio.utilities.structures.ReadOnlyList;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.*;
|
||||
|
||||
class AssembleLifecyclePipelineStageTest {
|
||||
|
||||
@Test
|
||||
void runMustAssignAssembledBackendOnSuccess() {
|
||||
final var ctx = BuilderPipelineContext.fromConfig(new BuilderPipelineConfig(false, "."));
|
||||
ctx.irBackend = validDeclaration();
|
||||
final var original = ctx.irBackend;
|
||||
|
||||
final var issues = new AssembleLifecyclePipelineStage().run(ctx, LogAggregator.empty());
|
||||
|
||||
assertFalse(issues.hasErrors(), issues.asCollection().toString());
|
||||
assertNotSame(original, ctx.irBackend);
|
||||
assertTrue(ctx.irBackend.getSyntheticFunctions().stream().anyMatch(fn ->
|
||||
fn.kind() == IRSyntheticCallableKind.PUBLISHED_FRAME_WRAPPER));
|
||||
assertEquals(
|
||||
original.getLifecycleDeclaration(),
|
||||
ctx.irBackend.getLifecycleDeclaration());
|
||||
assertNull(ctx.irvm);
|
||||
assertNull(ctx.bytecodeModule);
|
||||
assertNull(ctx.bytecodeBytes);
|
||||
}
|
||||
|
||||
@Test
|
||||
void runMustKeepOriginalBackendAndReportStructuralErrors() {
|
||||
final var ctx = BuilderPipelineContext.fromConfig(new BuilderPipelineConfig(false, "."));
|
||||
ctx.irBackend = IRBackend.builder()
|
||||
.entryPointCallableName("frame")
|
||||
.entryPointModuleId(new ModuleId(0))
|
||||
.executableFunctions(ReadOnlyList.from(fn("frame", 0, 0)))
|
||||
.callableSignatures(ReadOnlyList.from(new CallableSignatureRef(new ModuleId(0), "frame", 0, "() -> unit")))
|
||||
.lifecycleDeclaration(new IRLifecycleDeclaration(ReadOnlyList.empty(), null, null))
|
||||
.build();
|
||||
final var original = ctx.irBackend;
|
||||
|
||||
final var issues = new AssembleLifecyclePipelineStage().run(ctx, LogAggregator.empty());
|
||||
|
||||
assertTrue(issues.hasErrors());
|
||||
assertSame(original, ctx.irBackend);
|
||||
assertEquals(LifecycleAssemblerService.INVALID_DECLARATION, issues.asCollection().iterator().next().getCode());
|
||||
assertEquals(LifecycleAssemblerService.PHASE, issues.asCollection().iterator().next().getPhase());
|
||||
assertNull(ctx.irvm);
|
||||
}
|
||||
|
||||
@Test
|
||||
void runMustNoOpForDeliberatelyNonExecutableHandoff() {
|
||||
final var ctx = BuilderPipelineContext.fromConfig(new BuilderPipelineConfig(false, "."));
|
||||
ctx.irBackend = IRBackend.builder()
|
||||
.entryPointCallableName("main")
|
||||
.entryPointModuleId(new ModuleId(0))
|
||||
.executableFunctions(ReadOnlyList.from(fn("main", 0, 0)))
|
||||
.build();
|
||||
final var original = ctx.irBackend;
|
||||
|
||||
final var issues = new AssembleLifecyclePipelineStage().run(ctx, LogAggregator.empty());
|
||||
|
||||
assertFalse(issues.hasErrors());
|
||||
assertSame(original, ctx.irBackend);
|
||||
assertTrue(ctx.irBackend.getSyntheticFunctions().isEmpty());
|
||||
}
|
||||
|
||||
private static IRBackend validDeclaration() {
|
||||
final var span = new Span(new FileId(1), 1, 8);
|
||||
return IRBackend.builder()
|
||||
.entryPointCallableName("frame")
|
||||
.entryPointModuleId(new ModuleId(0))
|
||||
.modulePool(ReadOnlyList.from(new ModuleReference("app", ReadOnlyList.from("main"))))
|
||||
.callableSignatures(ReadOnlyList.from(
|
||||
new CallableSignatureRef(new ModuleId(0), "frame", 0, "() -> unit")))
|
||||
.executableFunctions(ReadOnlyList.from(fn("frame", 0, 0)))
|
||||
.lifecycleDeclaration(new IRLifecycleDeclaration(
|
||||
ReadOnlyList.from(new IRLifecycleModuleDeclaration(new ModuleId(0), ReadOnlyList.empty())),
|
||||
null,
|
||||
new IRLifecycleCallableReference(
|
||||
new ModuleId(0),
|
||||
new FileId(1),
|
||||
new CallableId(0),
|
||||
IRLifecycleCallableRole.FRAME_ROOT,
|
||||
span)))
|
||||
.build();
|
||||
}
|
||||
|
||||
private static IRBackendExecutableFunction fn(
|
||||
final String name,
|
||||
final int moduleId,
|
||||
final int callableId) {
|
||||
final var span = new Span(new FileId(1), 1, 8);
|
||||
return new IRBackendExecutableFunction(
|
||||
new FileId(1),
|
||||
new ModuleId(moduleId),
|
||||
name,
|
||||
new CallableId(callableId),
|
||||
1,
|
||||
8,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
1,
|
||||
ReadOnlyList.from(new IRBackendExecutableFunction.Instruction(
|
||||
IRBackendExecutableFunction.InstructionKind.RET,
|
||||
"",
|
||||
null,
|
||||
null,
|
||||
span)),
|
||||
span);
|
||||
}
|
||||
}
|
||||
+93
@@ -34,6 +34,7 @@ public class IRBackend implements IRBackendReader {
|
||||
private final ReadOnlyList<IntrinsicReference> intrinsicPool = ReadOnlyList.empty();
|
||||
@Builder.Default
|
||||
private final IRReservedMetadata reservedMetadata = IRReservedMetadata.empty();
|
||||
private final IRLifecycleDeclaration lifecycleDeclaration;
|
||||
|
||||
public static IRBackendAggregator aggregator() {
|
||||
return new IRBackendAggregator();
|
||||
@@ -53,6 +54,8 @@ public class IRBackend implements IRBackendReader {
|
||||
private final ArrayList<IRReservedMetadata.BuiltinTypeSurface> builtinTypeSurfaces = new ArrayList<>();
|
||||
private final ArrayList<IRReservedMetadata.BuiltinConstSurface> builtinConstSurfaces = new ArrayList<>();
|
||||
private final LinkedHashSet<String> requiredCapabilities = new LinkedHashSet<>();
|
||||
private final ArrayList<IRLifecycleFileDeclaration> lifecycleFiles = new ArrayList<>();
|
||||
private ReadOnlyList<ModuleId> lifecycleModuleOrder = ReadOnlyList.empty();
|
||||
|
||||
public void merge(final IRBackendFile backendFile) {
|
||||
if (backendFile == null) {
|
||||
@@ -90,6 +93,12 @@ public class IRBackend implements IRBackendReader {
|
||||
for (final var function : backendFile.executableFunctions()) {
|
||||
executableFunctions.add(remapExecutableFunction(function, moduleRemap, callableRemap, intrinsicRemap));
|
||||
}
|
||||
if (backendFile.lifecycleDeclaration() != null && !backendFile.lifecycleDeclaration().isEmpty()) {
|
||||
lifecycleFiles.add(remapLifecycleFileDeclaration(
|
||||
backendFile.lifecycleDeclaration(),
|
||||
moduleRemap,
|
||||
callableRemap));
|
||||
}
|
||||
final var metadata = backendFile.reservedMetadata();
|
||||
hostMethodBindings.addAll(metadata.hostMethodBindings().asList());
|
||||
builtinTypeSurfaces.addAll(metadata.builtinTypeSurfaces().asList());
|
||||
@@ -111,6 +120,11 @@ public class IRBackend implements IRBackendReader {
|
||||
return this;
|
||||
}
|
||||
|
||||
public IRBackendAggregator lifecycleModuleOrder(final ReadOnlyList<ModuleId> moduleOrder) {
|
||||
lifecycleModuleOrder = moduleOrder == null ? ReadOnlyList.empty() : moduleOrder;
|
||||
return this;
|
||||
}
|
||||
|
||||
private ModuleId[] reindexModules(final ReadOnlyList<ModuleReference> localModulePool) {
|
||||
if (localModulePool == null || localModulePool.isEmpty()) {
|
||||
return new ModuleId[0];
|
||||
@@ -203,6 +217,37 @@ public class IRBackend implements IRBackendReader {
|
||||
function.span());
|
||||
}
|
||||
|
||||
private IRLifecycleFileDeclaration remapLifecycleFileDeclaration(
|
||||
final IRLifecycleFileDeclaration declaration,
|
||||
final ModuleId[] moduleRemap,
|
||||
final CallableId[] callableRemap) {
|
||||
final var remappedModuleId = remapModuleId(
|
||||
declaration.moduleId(),
|
||||
moduleRemap,
|
||||
"lifecycle file");
|
||||
return new IRLifecycleFileDeclaration(
|
||||
remappedModuleId,
|
||||
declaration.fileId(),
|
||||
remapLifecycleCallable(declaration.fileInitFragment(), moduleRemap, callableRemap),
|
||||
remapLifecycleCallable(declaration.projectInit(), moduleRemap, callableRemap),
|
||||
remapLifecycleCallable(declaration.frameRoot(), moduleRemap, callableRemap));
|
||||
}
|
||||
|
||||
private IRLifecycleCallableReference remapLifecycleCallable(
|
||||
final IRLifecycleCallableReference reference,
|
||||
final ModuleId[] moduleRemap,
|
||||
final CallableId[] callableRemap) {
|
||||
if (reference == null) {
|
||||
return null;
|
||||
}
|
||||
return new IRLifecycleCallableReference(
|
||||
remapModuleId(reference.moduleId(), moduleRemap, "lifecycle callable"),
|
||||
reference.fileId(),
|
||||
remapCallableId(reference.callableId(), callableRemap, "lifecycle callable"),
|
||||
reference.role(),
|
||||
reference.origin());
|
||||
}
|
||||
|
||||
private ModuleId remapModuleId(
|
||||
final ModuleId localModuleId,
|
||||
final ModuleId[] moduleRemap,
|
||||
@@ -273,6 +318,52 @@ public class IRBackend implements IRBackendReader {
|
||||
return ReadOnlyList.wrap(pool);
|
||||
}
|
||||
|
||||
private IRLifecycleDeclaration emitLifecycleDeclaration() {
|
||||
if (lifecycleFiles.isEmpty()) {
|
||||
return null;
|
||||
}
|
||||
if (lifecycleModuleOrder.isEmpty()) {
|
||||
throw new IllegalStateException("lifecycle module order is required for executable handoff");
|
||||
}
|
||||
|
||||
final var modules = new ArrayList<IRLifecycleModuleDeclaration>();
|
||||
IRLifecycleCallableReference projectInit = null;
|
||||
IRLifecycleCallableReference frameRoot = null;
|
||||
for (final var moduleId : lifecycleModuleOrder) {
|
||||
final var fragments = new ArrayList<IRLifecycleCallableReference>();
|
||||
var hasLifecycleContribution = false;
|
||||
for (final var lifecycleFile : lifecycleFiles) {
|
||||
if (!sameModuleId(moduleId, lifecycleFile.moduleId())) {
|
||||
continue;
|
||||
}
|
||||
hasLifecycleContribution = true;
|
||||
if (lifecycleFile.fileInitFragment() != null) {
|
||||
fragments.add(lifecycleFile.fileInitFragment());
|
||||
}
|
||||
if (projectInit == null && lifecycleFile.projectInit() != null) {
|
||||
projectInit = lifecycleFile.projectInit();
|
||||
}
|
||||
if (frameRoot == null && lifecycleFile.frameRoot() != null) {
|
||||
frameRoot = lifecycleFile.frameRoot();
|
||||
}
|
||||
}
|
||||
if (hasLifecycleContribution) {
|
||||
modules.add(new IRLifecycleModuleDeclaration(moduleId, ReadOnlyList.wrap(fragments)));
|
||||
}
|
||||
}
|
||||
return new IRLifecycleDeclaration(ReadOnlyList.wrap(modules), projectInit, frameRoot);
|
||||
}
|
||||
|
||||
private boolean sameModuleId(final ModuleId left, final ModuleId right) {
|
||||
if (left == null || right == null) {
|
||||
return left == right;
|
||||
}
|
||||
if (left.isNone() || right.isNone()) {
|
||||
return left.isNone() && right.isNone();
|
||||
}
|
||||
return left.getIndex() == right.getIndex();
|
||||
}
|
||||
|
||||
public IRBackend emit() {
|
||||
return IRBackend
|
||||
.builder()
|
||||
@@ -290,6 +381,7 @@ public class IRBackend implements IRBackendReader {
|
||||
ReadOnlyList.wrap(builtinTypeSurfaces),
|
||||
ReadOnlyList.wrap(builtinConstSurfaces),
|
||||
ReadOnlyList.wrap(requiredCapabilities.stream().toList())))
|
||||
.lifecycleDeclaration(emitLifecycleDeclaration())
|
||||
.build();
|
||||
}
|
||||
|
||||
@@ -321,6 +413,7 @@ public class IRBackend implements IRBackendReader {
|
||||
.append(", builtinTypes=").append(reservedMetadata.builtinTypeSurfaces().size())
|
||||
.append(", builtinConsts=").append(reservedMetadata.builtinConstSurfaces().size())
|
||||
.append(", requiredCapabilities=").append(reservedMetadata.requiredCapabilities().size())
|
||||
.append(", lifecycle=").append(lifecycleDeclaration == null ? "none" : "declared")
|
||||
.append('}');
|
||||
|
||||
if (functions.isEmpty()) {
|
||||
|
||||
+35
-6
@@ -17,7 +17,8 @@ public record IRBackendFile(
|
||||
IRReservedMetadata reservedMetadata,
|
||||
ReadOnlyList<ModuleReference> modulePool,
|
||||
ReadOnlyList<CallableSignatureRef> callableSignatures,
|
||||
ReadOnlyList<IntrinsicReference> intrinsicPool) {
|
||||
ReadOnlyList<IntrinsicReference> intrinsicPool,
|
||||
IRLifecycleFileDeclaration lifecycleDeclaration) {
|
||||
public IRBackendFile {
|
||||
fileId = Objects.requireNonNull(fileId, "fileId");
|
||||
functions = functions == null ? ReadOnlyList.empty() : functions;
|
||||
@@ -30,6 +31,29 @@ public record IRBackendFile(
|
||||
intrinsicPool = intrinsicPool == null ? ReadOnlyList.empty() : intrinsicPool;
|
||||
}
|
||||
|
||||
public IRBackendFile(
|
||||
final FileId fileId,
|
||||
final ReadOnlyList<IRFunction> functions,
|
||||
final ReadOnlyList<IRSyntheticFunction> syntheticFunctions,
|
||||
final ReadOnlyList<IRGlobal> globals,
|
||||
final ReadOnlyList<IRBackendExecutableFunction> executableFunctions,
|
||||
final IRReservedMetadata reservedMetadata,
|
||||
final ReadOnlyList<ModuleReference> modulePool,
|
||||
final ReadOnlyList<CallableSignatureRef> callableSignatures,
|
||||
final ReadOnlyList<IntrinsicReference> intrinsicPool) {
|
||||
this(
|
||||
fileId,
|
||||
functions,
|
||||
syntheticFunctions,
|
||||
globals,
|
||||
executableFunctions,
|
||||
reservedMetadata,
|
||||
modulePool,
|
||||
callableSignatures,
|
||||
intrinsicPool,
|
||||
null);
|
||||
}
|
||||
|
||||
public IRBackendFile(
|
||||
final FileId fileId,
|
||||
final ReadOnlyList<IRFunction> functions) {
|
||||
@@ -42,7 +66,8 @@ public record IRBackendFile(
|
||||
IRReservedMetadata.empty(),
|
||||
ReadOnlyList.empty(),
|
||||
ReadOnlyList.empty(),
|
||||
ReadOnlyList.empty());
|
||||
ReadOnlyList.empty(),
|
||||
null);
|
||||
}
|
||||
|
||||
public static IRBackendFile empty(final FileId fileId) {
|
||||
@@ -55,7 +80,8 @@ public record IRBackendFile(
|
||||
IRReservedMetadata.empty(),
|
||||
ReadOnlyList.empty(),
|
||||
ReadOnlyList.empty(),
|
||||
ReadOnlyList.empty());
|
||||
ReadOnlyList.empty(),
|
||||
null);
|
||||
}
|
||||
|
||||
public IRBackendFile(
|
||||
@@ -71,7 +97,8 @@ public record IRBackendFile(
|
||||
reservedMetadata,
|
||||
ReadOnlyList.empty(),
|
||||
ReadOnlyList.empty(),
|
||||
ReadOnlyList.empty());
|
||||
ReadOnlyList.empty(),
|
||||
null);
|
||||
}
|
||||
|
||||
public IRBackendFile(
|
||||
@@ -90,7 +117,8 @@ public record IRBackendFile(
|
||||
reservedMetadata,
|
||||
ReadOnlyList.empty(),
|
||||
callableSignatures,
|
||||
intrinsicPool);
|
||||
intrinsicPool,
|
||||
null);
|
||||
}
|
||||
|
||||
public IRBackendFile(
|
||||
@@ -110,6 +138,7 @@ public record IRBackendFile(
|
||||
reservedMetadata,
|
||||
modulePool,
|
||||
callableSignatures,
|
||||
intrinsicPool);
|
||||
intrinsicPool,
|
||||
null);
|
||||
}
|
||||
}
|
||||
|
||||
+1
@@ -17,4 +17,5 @@ public interface IRBackendReader {
|
||||
ReadOnlyList<CallableSignatureRef> getCallableSignatures();
|
||||
ReadOnlyList<IntrinsicReference> getIntrinsicPool();
|
||||
IRReservedMetadata getReservedMetadata();
|
||||
IRLifecycleDeclaration getLifecycleDeclaration();
|
||||
}
|
||||
|
||||
+23
@@ -0,0 +1,23 @@
|
||||
package p.studio.compiler.models;
|
||||
|
||||
import p.studio.compiler.source.Span;
|
||||
import p.studio.compiler.source.identifiers.CallableId;
|
||||
import p.studio.compiler.source.identifiers.FileId;
|
||||
import p.studio.compiler.source.identifiers.ModuleId;
|
||||
|
||||
import java.util.Objects;
|
||||
|
||||
public record IRLifecycleCallableReference(
|
||||
ModuleId moduleId,
|
||||
FileId fileId,
|
||||
CallableId callableId,
|
||||
IRLifecycleCallableRole role,
|
||||
Span origin) {
|
||||
public IRLifecycleCallableReference {
|
||||
moduleId = Objects.requireNonNull(moduleId, "moduleId");
|
||||
fileId = Objects.requireNonNull(fileId, "fileId");
|
||||
callableId = Objects.requireNonNull(callableId, "callableId");
|
||||
role = Objects.requireNonNull(role, "role");
|
||||
origin = origin == null ? Span.none() : origin;
|
||||
}
|
||||
}
|
||||
+7
@@ -0,0 +1,7 @@
|
||||
package p.studio.compiler.models;
|
||||
|
||||
public enum IRLifecycleCallableRole {
|
||||
FILE_INIT_FRAGMENT,
|
||||
PROJECT_INIT,
|
||||
FRAME_ROOT
|
||||
}
|
||||
+12
@@ -0,0 +1,12 @@
|
||||
package p.studio.compiler.models;
|
||||
|
||||
import p.studio.utilities.structures.ReadOnlyList;
|
||||
|
||||
public record IRLifecycleDeclaration(
|
||||
ReadOnlyList<IRLifecycleModuleDeclaration> modules,
|
||||
IRLifecycleCallableReference projectInit,
|
||||
IRLifecycleCallableReference frameRoot) {
|
||||
public IRLifecycleDeclaration {
|
||||
modules = modules == null ? ReadOnlyList.empty() : modules;
|
||||
}
|
||||
}
|
||||
+22
@@ -0,0 +1,22 @@
|
||||
package p.studio.compiler.models;
|
||||
|
||||
import p.studio.compiler.source.identifiers.FileId;
|
||||
import p.studio.compiler.source.identifiers.ModuleId;
|
||||
|
||||
import java.util.Objects;
|
||||
|
||||
public record IRLifecycleFileDeclaration(
|
||||
ModuleId moduleId,
|
||||
FileId fileId,
|
||||
IRLifecycleCallableReference fileInitFragment,
|
||||
IRLifecycleCallableReference projectInit,
|
||||
IRLifecycleCallableReference frameRoot) {
|
||||
public IRLifecycleFileDeclaration {
|
||||
moduleId = Objects.requireNonNull(moduleId, "moduleId");
|
||||
fileId = Objects.requireNonNull(fileId, "fileId");
|
||||
}
|
||||
|
||||
public boolean isEmpty() {
|
||||
return fileInitFragment == null && projectInit == null && frameRoot == null;
|
||||
}
|
||||
}
|
||||
+15
@@ -0,0 +1,15 @@
|
||||
package p.studio.compiler.models;
|
||||
|
||||
import p.studio.compiler.source.identifiers.ModuleId;
|
||||
import p.studio.utilities.structures.ReadOnlyList;
|
||||
|
||||
import java.util.Objects;
|
||||
|
||||
public record IRLifecycleModuleDeclaration(
|
||||
ModuleId moduleId,
|
||||
ReadOnlyList<IRLifecycleCallableReference> fileInitFragments) {
|
||||
public IRLifecycleModuleDeclaration {
|
||||
moduleId = Objects.requireNonNull(moduleId, "moduleId");
|
||||
fileInitFragments = fileInitFragments == null ? ReadOnlyList.empty() : fileInitFragments;
|
||||
}
|
||||
}
|
||||
+36
@@ -0,0 +1,36 @@
|
||||
package p.studio.compiler.services;
|
||||
|
||||
import java.nio.file.Path;
|
||||
import java.util.Objects;
|
||||
|
||||
public record FrontendCodeAction(
|
||||
String title,
|
||||
String diagnosticCode,
|
||||
Path path,
|
||||
int startOffset,
|
||||
int endOffset,
|
||||
String newText) {
|
||||
|
||||
public FrontendCodeAction {
|
||||
title = requireText(title, "title");
|
||||
diagnosticCode = requireText(diagnosticCode, "diagnosticCode");
|
||||
path = Objects.requireNonNull(path, "path").toAbsolutePath().normalize();
|
||||
if (startOffset < 0) {
|
||||
throw new IllegalArgumentException("startOffset must not be negative");
|
||||
}
|
||||
if (endOffset < startOffset) {
|
||||
throw new IllegalArgumentException("endOffset must not be before startOffset");
|
||||
}
|
||||
newText = Objects.requireNonNull(newText, "newText");
|
||||
}
|
||||
|
||||
private static String requireText(
|
||||
final String value,
|
||||
final String field) {
|
||||
final String candidate = Objects.requireNonNull(value, field).trim();
|
||||
if (candidate.isEmpty()) {
|
||||
throw new IllegalArgumentException(field + " must not be blank");
|
||||
}
|
||||
return candidate;
|
||||
}
|
||||
}
|
||||
+20
@@ -0,0 +1,20 @@
|
||||
package p.studio.compiler.services;
|
||||
|
||||
import java.nio.file.Path;
|
||||
import java.util.Objects;
|
||||
|
||||
public record FrontendDefinitionLocation(
|
||||
Path path,
|
||||
int startOffset,
|
||||
int endOffset) {
|
||||
|
||||
public FrontendDefinitionLocation {
|
||||
path = Objects.requireNonNull(path, "path").toAbsolutePath().normalize();
|
||||
if (startOffset < 0) {
|
||||
throw new IllegalArgumentException("startOffset must not be negative");
|
||||
}
|
||||
if (endOffset < startOffset) {
|
||||
throw new IllegalArgumentException("endOffset must not be before startOffset");
|
||||
}
|
||||
}
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user