Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ const TRANSLATE_DAG: &str = include_str!("../../../../v4/compiler/06_translate.d
const TRANSLATE_PATH: &str = "src/v4/compiler/06_translate.dag";
const EMIT_DAG: &str = include_str!("../../../../v4/compiler/05_emit.dag");
const EMIT_PATH: &str = "src/v4/compiler/05_emit.dag";
const RUST_LANGUAGE_DAG: &str = include_str!("../../../../v4/extdeps/languages/rust.dag");
const RUST_LANGUAGE_PATH: &str = "src/v4/extdeps/languages/rust.dag";
const MVP1_CLAIM_DAG: &str =
include_str!("../../../../v4/test/claim/manual/mvp1_rust_add_translate.dag");
const MVP1_CLAIM_PATH: &str = "src/v4/test/claim/manual/mvp1_rust_add_translate.dag";
Expand Down Expand Up @@ -165,6 +167,27 @@ fn v4_emit_dag_does_not_import_find_witness() {
);
}

#[test]
fn v4_rust_language_model_declares_t11_translation_rules() {
let module = parse_module(RUST_LANGUAGE_DAG, RUST_LANGUAGE_PATH);
assert!(
import_includes_name(
&module,
&["v4", "std", "target_model"],
"target_model_edge_translation_rules"
),
"{RUST_LANGUAGE_PATH}: Rust TargetModel must consume the shared translation-rules edge"
);
assert!(
surface_declares_type(&module, "RustGrammarRelationRow"),
"{RUST_LANGUAGE_PATH}: must declare the grammar relation row carrier"
);
assert!(
surface_declares_fn(&module, "rust_mvp1_translation_rules_node"),
"{RUST_LANGUAGE_PATH}: must project MVP-1 Rust translation rules into the target model"
);
}

#[test]
fn v4_mvp1_rust_add_claim_tokenizes_and_parses() {
let _module = parse_module(MVP1_CLAIM_DAG, MVP1_CLAIM_PATH);
Expand Down Expand Up @@ -243,3 +266,21 @@ fn surface_declares_fn(module: &v3_compiler::parse_surface::SurfaceModule, name:
_ => false,
})
}

fn surface_declares_type(module: &v3_compiler::parse_surface::SurfaceModule, name: &str) -> bool {
module.items.iter().any(|item| match item {
SurfaceItem::TypeAlias {
name: item_name, ..
}
| SurfaceItem::TypeRecord {
name: item_name, ..
}
| SurfaceItem::TypeSum {
name: item_name, ..
}
| SurfaceItem::TypeAtom {
name: item_name, ..
} => item_name == name,
_ => false,
})
}
39 changes: 25 additions & 14 deletions src/v4/compiler/05_emit.dag
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
// src/v4/compiler/05_emit.dag
// Scope: Stage 5b — T-10 emit surface + fail-closed staging (not grammar-bidir serialize yet).
// Owns: emit_stage_locus_port, serialize_source_for_emitted, serialize_target, emit.
// Consumes: v4.std.target_model (target_model_edge_serialize_emitted, target_model_edge_serialize_source).
// Owns: emit_stage_locus_port, target_translation_rules_from_model, serialize_source_for_emitted,
// serialize_target, emit.
// Consumes: v4.std.target_model (target_model_edge_translation_rules,
// target_model_edge_serialize_emitted, target_model_edge_serialize_source).
// Consumes: compiler/04_infer.dag, compiler/06_translate.dag, compiler/07_target_carriers.dag,
// std/diagnostic.dag,
// std/node.dag, std/text.dag.
Expand All @@ -22,6 +24,7 @@ import v4.compiler.translate {
translate
}
import v4.std.target_model {
target_model_edge_translation_rules,
target_model_edge_serialize_emitted,
target_model_edge_serialize_source
}
Expand All @@ -47,23 +50,31 @@ fn emit_serialize_emitted_mismatch_diagnostic(emitted: Node, target: TargetModel
correction: Unavailable { reason: ExternalContractUnknown }
}
}
// Staging only: compare emitted tree to bundle `serialize_emitted` fixture, then fail-closed source
// lookup — not grammar-as-bidirectional inverse walk (DECISIONS C5 deferred).
fn target_translation_rules_from_model(target: TargetModel) -> Outcome<Node> {
target_bundle_child(target: target, edge_name: target_model_edge_translation_rules)
}
// Staging only: require the target's grammar relation table, compare emitted tree to the
// `serialize_emitted` fixture, then fail-closed source lookup — full inverse walk deferred.
fn serialize_source_for_emitted(
emitted: TargetNodeTree,
target: TargetModel
) -> Outcome<TargetSource> {
bind_outcome(
o: target_bundle_child(target: target, edge_name: target_model_edge_serialize_emitted),
f: fn(expected_emitted) {
if emitted == expected_emitted {
target_serialize_source_from_model(target: target)
} else {
outcome_rejected(emit_serialize_emitted_mismatch_diagnostic(
emitted: emitted,
target: target
))
}
o: target_translation_rules_from_model(target: target),
f: fn(rules) {
bind_outcome(
o: target_bundle_child(target: target, edge_name: target_model_edge_serialize_emitted),
f: fn(expected_emitted) {
if emitted == expected_emitted {
target_serialize_source_from_model(target: target)
} else {
outcome_rejected(emit_serialize_emitted_mismatch_diagnostic(
emitted: emitted,
target: target
))
}
}
)
}
)
}
Expand Down
Loading
Loading