|
|
@@ -1,9 +1,9 @@
|
|
|
# Git branches and tags — how this repository is organised
|
|
|
|
|
|
-**Snapshot:** 2026-10-24, after the language/robustness pass.
|
|
|
-`master` = the current ADDRESS-equality/docs/tag-map commit;
|
|
|
+**Snapshot:** 2026-10-24, after wide sets and `SET OF CARDINAL`.
|
|
|
+`master` = the current wide-set/docs/tag-map commit;
|
|
|
`origin/master` = `b1d14f9` (the PDF comparison commit).
|
|
|
-333 tags (331 `v3-*` checkpoints).
|
|
|
+334 tags (332 `v3-*` checkpoints).
|
|
|
|
|
|
Mental model:
|
|
|
|
|
|
@@ -14,7 +14,7 @@ Mental model:
|
|
|
|
|
|
| Branch | State | What it is |
|
|
|
| --- | --- | --- |
|
|
|
-| **`master`** | current ADDRESS-equality commit, 12 commits ahead of origin | The only active branch; all current work is here. |
|
|
|
+| **`master`** | current wide-set commit, 14 commits ahead of origin | The only active branch; all current work is here. |
|
|
|
| `ast-stage-c` | `0f611c0` (2026-10-08), local only | Old stage branch, fully merged into master. Stale. |
|
|
|
| `generics-inc1` | `6639c19`, 6 commits behind `origin/generics-inc1` | Old generics work, fully merged into master. Stale. |
|
|
|
| `resolve-check` | `95ca4d6`, in sync with origin | Old branch merged into master. Stale. |
|
|
|
@@ -68,6 +68,7 @@ Each points at the commit that landed a feature, all with green gates:
|
|
|
| `v3-generic-instances` | `a3664a2` | separate type/value/procedure generic-instance objects |
|
|
|
| `v3-generic-class-instances` | `b4a70fa` | generic-class instance objects; imported impls parsed but not emitted |
|
|
|
| `v3-language-robustness` | `1017487` | ADDRESS/pointer equality + language/robustness notes |
|
|
|
+| `v3-wide-sets` | `31eaefe` | wide sets and bounded `SET OF CARDINAL` |
|
|
|
|
|
|
These are immutable checkpoints. Useful commands:
|
|
|
|
|
|
@@ -124,15 +125,15 @@ git push origin :refs/tags/v3-session-2026-10-22-final
|
|
|
The project convention is one `v3-*` tag per green step across all
|
|
|
sessions (two-phase parse slices, generics increments, Unicode, stdlib,
|
|
|
…). They are a searchable history of passing states, not branches.
|
|
|
-`git tag --list | wc -l` = 333 (331 `v3-*`) is expected; only the
|
|
|
+`git tag --list | wc -l` = 334 (332 `v3-*`) is expected; only the
|
|
|
recent ones above matter for the current session.
|
|
|
|
|
|
## Current state
|
|
|
|
|
|
- `origin/master` = `b1d14f9` (the PDF comparison commit).
|
|
|
- Local `master` is **12 commits ahead**: P1, per-object fixpoint,
|
|
|
- ABI/class, generic-instance, generic-class and language/robustness
|
|
|
- feature/map commits.
|
|
|
+ Local `master` is **14 commits ahead**: P1, per-object fixpoint,
|
|
|
+ ABI/class, generic-instance, generic-class, language/robustness and
|
|
|
+ wide-set feature/map commits.
|
|
|
- The recent feature tags are local; push them with `master` when
|
|
|
ready.
|
|
|
- Next session: start from `master` and read
|
