X-Git-Url: https://dreyeck.freedombox.rocks/gitweb/topic-maps.git/blobdiff_plain/fb60afd548d679d83fd8ec76bc5ff384c1e23e5f..66664dbff6275d60dab1bc6a232fa70f7b916b8c:/README.md?ds=sidebyside diff --git a/README.md b/README.md index 7113a49..5316919 100644 --- a/README.md +++ b/README.md @@ -1,19 +1,23 @@ -# Common Lisp Topic Maps — Slice 1 +# Common Lisp Topic Maps — Slice 2 A working ANSI Common Lisp reader for the first CTM identity/default-name -subset, with a minimal TMDM information-item model. HyperDoc remains a possible -future client and is neither the codebase nor a dependency. There is no CXTM +subset, with same-map Topic/Name merging in a minimal TMDM model. HyperDoc +remains a possible future client and is neither the codebase nor a dependency. There is no CXTM canonicalizer, association/template implementation or cross-document merge engine. Systems: `topic-maps` (the retained foundation), `topic-maps/tests`, -`topic-maps/tmdm`, `topic-maps/ctm` and `topic-maps/ctm/tests`. +`topic-maps/tmdm`, `topic-maps/ctm`, `topic-maps/ctm/tests` and +`topic-maps/ctm/merging-tests`. The core reader/model uses ANSI Common Lisp; the foundation/tooling uses ASDF/UIOP and Python's standard library. No Quicklisp packages are required. -Start with [Reading the First Five CTM Documents](docs/reading-first-five-ctm-documents.md) +Start with [Reading Topic Identity and Merging](docs/reading-topic-merging.md) +for the current API, reference replacement, identifier tails and exact subset +boundaries. See [Reading the First Five CTM Documents](docs/reading-first-five-ctm-documents.md) for original sources, actual objects, normative clauses, baseline evidence and copy-pasteable DESCRIBE forms. [API and boundaries](docs/slice-1-api-and-boundaries.md) -document the supported language, conditions, identity and report separation. +document the accepted Slice 1 baseline; the Slice 2 document supersedes its +statements about absent identity tails, merging and immutable Name references. The pinned suite targets the **CTM draft dated 2010-03-31**. Passing it alone does not establish full ISO/IEC 13250-6:2010 conformity. @@ -35,6 +39,7 @@ In a new Common Lisp process, with this checkout selected: (topic-maps.test-foundation:select-cases *corpus* :id "ctm/in/simple.ctm") (asdf:test-system "topic-maps/tests") (asdf:test-system "topic-maps/ctm/tests") +(asdf:test-system "topic-maps/ctm/merging-tests") (topic-maps.test-foundation:write-validation-report *corpus* #p"/tmp/topic-maps-inventory.json") ``` @@ -76,17 +81,19 @@ CXTM baselines only under `ctm/baseline`. Auxiliary files are reported separatel ## Current validation and historical foundation The complete pinned corpus remains unchanged: 231 valid CTM inputs, 42 invalid -inputs, 231 CXTM baselines and 22 CTM auxiliary files. Five selected semantic +inputs, 231 CXTM baselines and 22 CTM auxiliary files. Sixteen selected semantic cases pass; their imported canonical contracts remain NOT-RUN. Only `ctm/invalid/prefix-undefined.ctm` is PASS under its CTM rejection contract; 272 imported contracts remain NOT-RUN. Unsupported constructs and I/O errors cannot count as that required rejection. The full launcher runs the retained 54 foundation checks, two Python integrity -fixtures, 100 semantic checks, imported-report validation and selected baseline +fixtures, 123 retained identity checks, 646 merge checks, imported-report validation and selected baseline property evidence. A report path also produces `.semantics.json` with -separate model observations. Both reports are deterministic across the tested -SBCL versions and checkout relocation. See [Slice 1 validation](docs/slice-1-validation.md), +separate model observations, plus `.merging.json` for the new cases. +The merge checks include 128 graph/order variants with an independent reachability +oracle. Reports are deterministic across the tested SBCL versions and checkout +relocation. See [Slice 2 validation](docs/slice-2-validation.md), [imported contracts](reports/slice-1/validation.json) and [semantic observations](reports/slice-1/semantics.json). @@ -95,4 +102,6 @@ SBCL versions and checkout relocation. See [Slice 1 validation](docs/slice-1-val foundation records. Their original report/logs are preserved. Their statements about absent reader/model systems describe Slice 0, not the current branch. Slice 1 is built from `9c83db34eb1ba8091b004433f088056717dbaa7e` on -`codex/ctm-slice-1`. Slice 2 is not started automatically. +`codex/ctm-slice-1`. Slice 2 starts from the accepted Slice 1a commit +`fb60afd548d679d83fd8ec76bc5ff384c1e23e5f` on `codex/ctm-slice-2`. +Associations/Roles are not part of this slice; await review before continuing.