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

Read declared attributes through one core-types helper

Browse Source
This commit is contained in:
Dennis Kobert
2026-08-29 20:16:17 +00:00
parent 78e35eb6ea
commit 641fcc88c6
2 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
node-graph/libraries/core-types/src/record.rs
View File

@@ -318,6 +318,25 @@ impl<A: attribute::Attribute> FieldOffset<A> {
}
}
/// Reads a declared attribute out of a record at a wiring-resolved offset,
/// falling back to the marker's census default where the layout does not carry
/// the name.
///
/// # Safety
/// `rec` must be a live record of the layout `offset` was resolved against,
/// and `offset`, where present, must be that layout's offset for `A` at the
/// read's level. The census admits one value type per attribute name and
/// panics on a conflicting declaration, so that field's bytes are a value of
/// `A::Value`, differing from the read type only in `'e`, which must not
/// outlive the evaluation a parked payload is arena-resident for.
pub unsafe fn read_at<'e, A: attribute::Attribute>(rec: Rec<'_>, offset: Option<usize>) -> attribute::Attr<'e, A> {
attribute::Attr(match offset {
// SAFETY: the caller's contract.
Some(offset) => unsafe { rec.read::<A::Value<'e>>(offset) },
None => A::default(),
})
}
/// The stand-in fed to a kernel's unbounded `element: T` parameter. The type
/// system forces the kernel to route it to the element position of its return
/// tuple, so the passthrough is explicit in the signature while the lowering

12
node-graph/node-macro/src/codegen.rs
View File

@@ -1243,10 +1243,7 @@ pub(crate) fn generate_node_impl(crate_ident: &CrateIdent, parsed: &ParsedNodeFn
let marker = &read.marker;
let slot = format_ident!("__read_{slot}");
quote! {
let #pat = #core_types::attribute::Attr::<#marker>(match self.#slot {
Some(__offset) => unsafe { #rec.read(__offset) },
None => <#marker as #core_types::attribute::Attribute>::default(),
});
let #pat = unsafe { #core_types::record::read_at::<#marker>(#rec, self.#slot) };
}
};
let reads_of = |field_index: usize| {
@@ -2705,12 +2702,7 @@ pub(crate) fn generate_node_impl(crate_ident: &CrateIdent, parsed: &ParsedNodeFn
.collect();
let attr_slots = field.attribute_reads.iter().enumerate().map(|(slot, read)| {
let marker = &read.marker;
quote! {
#core_types::attribute::Attr::<#marker>(match __reads[#slot] {
Some(__offset) => unsafe { __rec.read(__offset) },
None => <#marker as #core_types::attribute::Attribute>::default(),
})
}
quote!(unsafe { #core_types::record::read_at::<#marker>(__rec, __reads[#slot]) })
});
let attr_tys = field.attribute_reads.iter().map(|read| {
let marker = &read.marker;