Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/v4/TASKS.md
Original file line number Diff line number Diff line change
Expand Up @@ -399,9 +399,9 @@ substrate imported them, so the cut is a pure scope reduction.
- The sugar-name authority is the `LanguageModel`'s, consumed — never
re-minted in this stage (single-authority, Practice 5).
- **CP-1b bucket C (native `.dag` LM):** `DagLanguageModel` carries
`canonical_symbols: Set<Symbol>` as declared data; resolve reads that field
only—no inferring the native C3 prelude `Set` from void lex/grammar shape
inside `03_resolve.dag` (DECISIONS §CP-1b item 2).
`canonical_symbols: Set<Symbol>` as declared data; resolve reads it only via
`dag_language_model_canonical_symbols/1`—no inferring the native C3 prelude `Set` from void lex/grammar shape
inside `03_resolve.dag` (TASKS T-8 / CP-1b bucket C).

**Reference**:
- v2: `src/v2/03_normalize.dag`, `src/v2/03_resolve.dag`
Expand Down
17 changes: 10 additions & 7 deletions src/v4/compiler/03_resolve.dag
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,18 @@
//
// Scope: Stage 3b — NormalizedTree→ResolvedTree; K-1 Atom use→def.
// Owns: ResolvedTree; Namespace; Scope; BindEdgeAcc; ResolveResult; ResolveChildrenResult; resolve; Symbol reasons.
// Consumes: std/node.dag, std/diagnostic.dag, std/collection.dag, compiler/03_normalize.dag, extdeps/languages/dag.dag (DagLanguageModel.canonical_symbols prelude fact).
// Consumes: std/node.dag, std/diagnostic.dag, std/collection.dag, compiler/03_normalize.dag, extdeps/languages/dag.dag (DagLanguageModel for canonical_symbols).
// Status: scaffold — TASKS T-8.
// Anchor: https://en.wikipedia.org/wiki/Name_resolution_(programming_languages)

module v4.compiler.resolve


import v4.compiler.normalize { NormalizedTree }
import v4.extdeps.languages.dag { DagLanguageModel }
import v4.extdeps.languages.dag {
DagLanguageModel,
dag_language_model_canonical_symbols
}
import v4.std.collection { Set }
import v4.std.diagnostic {
Diagnostic,
Expand Down Expand Up @@ -47,19 +50,19 @@ type Namespace {
}


// 🟡 coproduct dissolution — CP-1b item 7 (Scope).
// 🟡 coproduct dissolution — feature:T-8-lexical-scope-chain — scaffold:TASKS T-8; dissolve-on-arrival: CP-1b/T-8→T-9 close (Scope).
type Scope
= ScopeRoot { module: Namespace }
| ScopeFrame { locals: Map<Symbol, Symbol>, outer: Scope }


// 🟡 coproduct dissolution — CP-1b item 8 (ResolveResult).
// 🟡 coproduct dissolution — feature:K-1-per-node-resolve-outcome — scaffold:TASKS T-8; dissolve-on-arrival: CP-1b/T-8→T-9 close (ResolveResult).
type ResolveResult
= ResolvedNode { node: Node }
| ResolveRejected { diagnostic: Diagnostic }


// 🟡 coproduct dissolution — CP-1b item 9 (ResolveChildrenResult).
// 🟡 coproduct dissolution — feature:T-8-edge-resolve-fold-outcome — scaffold:TASKS T-8; dissolve-on-arrival: CP-1b/T-8→T-9 close (ResolveChildrenResult).
type ResolveChildrenResult
= ResolvedChildren { children: List<Edge> }
| ResolveChildrenRejected { diagnostic: Diagnostic }
Expand Down Expand Up @@ -183,7 +186,7 @@ fn add_bind_atom_binder(n: Node, acc: Map<Symbol, Symbol>) -> Map<Symbol, Symbol
fn build_program_namespace(tree: NormalizedTree, lm: DagLanguageModel) -> Namespace {
Namespace {
bindings: add_module_named_exports(root: tree, acc: empty_map()),
canonical_symbols: lm.canonical_symbols
canonical_symbols: dag_language_model_canonical_symbols(lm: lm)
}
}

Expand Down Expand Up @@ -399,7 +402,7 @@ fn resolve_edges_first_outer_then_inner(
}


// §CP-1b (item 3).
// bind-binder-target projection (TASKS T-8 / CP-1b item 3).
fn resolve_bind_binder_target(t: Node) -> ResolveResult {
match t.kind {
TypeNode { connective: Atom { identity: id } } =>
Expand Down
68 changes: 30 additions & 38 deletions src/v4/extdeps/languages/dag.dag
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// src/v4/extdeps/languages/dag.dag
//
// Scope: gunbc `.dag` LanguageModel (typed lex + grammar model; Shape A).
// Owns: DagLanguageModel; dag_c3_surface_sugar_*; dag_language_model_surface_id; dag_surface_empty_lex; dag_surface_empty_grammar; dag_language_model_surface_prelude_full; dag_language_model_surface_empty_prelude; dag_language_model_surface_prelude_atoms; dag_language_model_is_surface_empty_shape; dag_language_model_empty_canonical_symbol_set.
// Owns: DagLanguageModel; dag_c3_surface_sugar_*; dag_language_model_surface_id; dag_wave1_*; dag_language_model_wave1_void; dag_language_model_surface_empty_prelude; dag_language_model_canonical_symbols; dag_language_model_surface_prelude_atoms; dag_language_model_empty_canonical_symbol_set.
// Consumes: compiler/tokenize.dag, compiler/parse.dag, std/collection.dag, std/node.dag.
// Status: scaffold — TASKS T-4/T-6/T-7.
// Anchor: docs/v3-spec.md
Expand Down Expand Up @@ -32,38 +32,17 @@ type DagLanguageModel {
}


fn dag_surface_empty_lex() -> LexRules {
fn dag_wave1_e0_void_lex() -> LexRules {
VoidLexRules
}


fn dag_surface_empty_grammar() -> Grammar {
fn dag_wave1_g0_void_grammar() -> Grammar {
VoidGrammar
}


fn dag_language_model_surface_prelude_full() -> DagLanguageModel {
DagLanguageModel {
lex: dag_surface_empty_lex(),
grammar: dag_surface_empty_grammar(),
language_identity: dag_language_model_surface_id,
canonical_symbols: dag_language_model_surface_prelude_atoms()
}
}


// CP-1b item 2 (compile-anchor empty prelude; same language_identity as prelude_full).
fn dag_language_model_surface_empty_prelude() -> DagLanguageModel {
DagLanguageModel {
lex: dag_surface_empty_lex(),
grammar: dag_surface_empty_grammar(),
language_identity: dag_language_model_surface_id,
canonical_symbols: dag_language_model_empty_canonical_symbol_set()
}
}


// CP-1b (item 1).
// wave-1 void LM canonical prelude atoms (TASKS T-8 / CP-1b bucket C).
fn dag_language_model_surface_prelude_atoms() -> Set<Symbol> {
Set {
member: fn(sym) {
Expand All @@ -76,23 +55,36 @@ fn dag_language_model_surface_prelude_atoms() -> Set<Symbol> {
}


// 🟡 predicate dissolution — §CP-1b item 2.
fn dag_language_model_is_surface_empty_shape(lm: DagLanguageModel) -> Bool {
match lm.lex {
VoidLexRules =>
match lm.grammar {
VoidGrammar => true
ModeledGrammar { root: _ } => false
}
ModeledLexRules { root: _ } => false
}
}


fn dag_language_model_empty_canonical_symbol_set() -> Set<Symbol> {
Set {
member: fn(_) {
false
}
}
}


fn dag_language_model_wave1_void() -> DagLanguageModel {
DagLanguageModel {
lex: dag_wave1_e0_void_lex(),
grammar: dag_wave1_g0_void_grammar(),
language_identity: dag_language_model_surface_id,
canonical_symbols: dag_language_model_surface_prelude_atoms()
}
}


// compile-anchor empty prelude; same language_identity as wave1_void (TASKS T-8 / CP-1b bucket C).
fn dag_language_model_surface_empty_prelude() -> DagLanguageModel {
DagLanguageModel {
lex: dag_wave1_e0_void_lex(),
grammar: dag_wave1_g0_void_grammar(),
language_identity: dag_language_model_surface_id,
canonical_symbols: dag_language_model_empty_canonical_symbol_set()
}
}


fn dag_language_model_canonical_symbols(lm: DagLanguageModel) -> Set<Symbol> {
lm.canonical_symbols
}
105 changes: 92 additions & 13 deletions src/v4/test/claim/manual/resolve_compile_anchor.dag
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// src/v4/test/claim/manual/resolve_compile_anchor.dag
//
// Scope: Tier-1 v2-bootstrap compile anchor for `resolve` + surface LM `canonical_symbols` (ledger: DECISIONS CP-1b item 10).
// Owns: anchor_resolve_surface_prelude_full_service_atom; anchor_resolve_surface_empty_prelude_service_atom.
// Scope: Tier-1 v2-bootstrap compile anchor for `resolve` + LM `canonical_symbols` (TASKS T-8).
// Owns: anchor_resolve_wave1_service_atom_via_canonical_symbols; anchor_resolve_wave1_empty_prelude_service_atom; anchor_resolve_wave1_multi_edge_conj_via_canonical_symbols; anchor_resolve_wave1_bind_binder_use.
// Consumes: compiler/03_resolve.dag, extdeps/languages/dag.dag, std/diagnostic.dag, std/node.dag.
// Status: scaffold — compile-only until T-22; `v2 run` TestClaims per MOVE1_COVERAGE.txt.
// Anchor: https://en.wikipedia.org/wiki/Name_resolution_(programming_languages)
Expand All @@ -11,58 +11,137 @@ module v4.test.claim.manual.resolve_compile_anchor

import v4.compiler.resolve { resolve, ResolvedTree }
import v4.extdeps.languages.dag {
dag_c3_surface_sugar_fn,
dag_c3_surface_sugar_service,
dag_c3_surface_sugar_type,
dag_language_model_surface_empty_prelude,
dag_language_model_surface_prelude_full
dag_language_model_wave1_void
}
import v4.std.diagnostic { Outcome }
import v4.std.node {
Atom,
Bind,
ComputationNode,
Conj,
Edge,
Named,
Node,
Positional,
Symbol,
TypeNode
}


fn anchor_resolve_surface_prelude_full_service_atom() -> Outcome<ResolvedTree> {
data anchor_decl_first: Symbol = anchor_decl_first
data anchor_decl_second: Symbol = anchor_decl_second


fn service_atom_conj_tree() -> Node {
Node {
kind: TypeNode { connective: Conj },
children: [
Edge {
label: Positional,
target: Node {
kind: TypeNode {
connective: Atom { identity: dag_c3_surface_sugar_service }
},
children: []
}
}
]
}
}


fn anchor_resolve_wave1_service_atom_via_canonical_symbols() -> Outcome<ResolvedTree> {
resolve(
tree: service_atom_conj_tree(),
lm: dag_language_model_wave1_void()
)
}


fn anchor_resolve_wave1_empty_prelude_service_atom() -> Outcome<ResolvedTree> {
resolve(
tree: service_atom_conj_tree(),
lm: dag_language_model_surface_empty_prelude()
)
}


fn anchor_resolve_wave1_multi_edge_conj_via_canonical_symbols() -> Outcome<ResolvedTree> {
resolve(
tree: Node {
kind: TypeNode { connective: Conj },
children: [
Edge {
label: Positional,
label: Named { name: anchor_decl_first },
target: Node {
kind: TypeNode {
connective: Atom { identity: dag_c3_surface_sugar_service }
},
children: []
}
},
Edge {
label: Named { name: anchor_decl_second },
target: Node {
kind: TypeNode {
connective: Atom { identity: dag_c3_surface_sugar_type }
},
children: []
}
}
]
},
lm: dag_language_model_surface_prelude_full()
lm: dag_language_model_wave1_void()
)
}


fn anchor_resolve_surface_empty_prelude_service_atom() -> Outcome<ResolvedTree> {
fn anchor_resolve_wave1_bind_binder_use() -> Outcome<ResolvedTree> {
resolve(
tree: Node {
kind: TypeNode { connective: Conj },
children: [
Edge {
label: Positional,
label: Named { name: anchor_decl_first },
target: Node {
kind: TypeNode {
connective: Atom { identity: dag_c3_surface_sugar_service }
},
children: []
kind: ComputationNode { behavior: Bind },
children: [
Edge {
label: Positional,
target: Node {
kind: TypeNode {
connective: Atom { identity: dag_c3_surface_sugar_fn }
},
children: []
}
},
Edge {
label: Positional,
target: Node {
kind: TypeNode {
connective: Atom { identity: dag_c3_surface_sugar_service }
},
children: []
}
},
Edge {
label: Positional,
target: Node {
kind: TypeNode {
connective: Atom { identity: dag_c3_surface_sugar_fn }
},
children: []
}
}
]
}
}
]
},
lm: dag_language_model_surface_empty_prelude()
lm: dag_language_model_wave1_void()
)
}
Loading