fork/Graphite
1
0
Fork 0
mirror of https://github.com/GraphiteEditor/Graphite.git synced 2026-09-15 22:28:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Treat Modify bounds as transparent and drop the redundant fold-context validation

Browse Source
This commit is contained in:
Dennis Kobert
2026-08-25 10:47:45 +00:00
parent 888cdf17b0
commit 9cf037e992
2 changed files with 5 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
node-graph/node-macro/src/parsing.rs
View File

@@ -940,11 +940,15 @@ fn parse_context_feature_idents(ty: &Type) -> Vec<ContextFeatureDecl> {
| "InjectVarArgs" => {
features.push(ContextFeatureDecl::new(segment.ident.clone()));
}
// Modify* is conditionally transparent: the node rewrites the
// field only on its content's behalf, so it names no
// requirement of its own and the field nullifies early when
// nothing upstream reads it.
"ModifyFootprint" | "ModifyRealTime" | "ModifyAnimationTime" | "ModifyPointerPosition" | "ModifyPosition" | "ModifyIndex" | "ModifyVarArgs" => {}
// InjectIndex stays undeclared: a record node's injection
// re-addresses lanes derived from the incoming index, so it
// must not cancel the cone's index requirement in the
// nullification pass.
// Skip Modify* traits as they don't affect usage tracking
// Also ignore other traits like Ctx, ExtractAll, etc.
_ => {}
}

25
node-graph/node-macro/src/validation.rs
View File

@@ -15,7 +15,6 @@ pub fn validate_node_fn(parsed: &ParsedNodeFn) -> syn::Result<()> {
validate_lend_fields,
validate_record_io,
validate_lazy_reads,
validate_materialized_ctx,
];
for validator in validators {
@@ -262,30 +261,6 @@ fn validate_async_source(parsed: &ParsedNodeFn) {
}
}
fn validate_materialized_ctx(parsed: &ParsedNodeFn) {
let materialized = parsed
.fields
.iter()
.any(|field| matches!(&field.ty, ParsedFieldType::Regular(RegularParsedField { list_levels, .. }) if *list_levels > 0));
if !materialized {
return;
}
let Some(ctx) = crate::codegen::classify::context_param(parsed) else { return };
let has = |name: &str| {
ctx.bounds
.iter()
.any(|bound| matches!(bound, syn::TypeParamBound::Trait(bound) if bound.path.segments.last().is_some_and(|segment| segment.ident == name)))
};
let missing: Vec<&str> = ["InjectIndex", "Copy"].into_iter().filter(|name| !has(name)).collect();
if !missing.is_empty() {
emit_error!(
parsed.input.pat_ident.span(),
"a node folding a ranked `List` input drives `eval_batch` over it, so its context must add `{}`; spell `impl Ctx + InjectIndex + Copy`",
missing.join(" + ")
);
}
}
fn validate_lend_fields(parsed: &ParsedNodeFn) {
let future_kernel = crate::codegen::is_source_kernel(&parsed.output_type);
for field in &parsed.fields {