From 01815214d62e9f45f9cd4883eb6590d4939ded62 Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Sun, 15 Nov 2026 02:46:16 +0000 Subject: [PATCH] Reuse XFL wire scalar parsers --- crates/xfl/src/shape.rs | 6 +++--- crates/xfl/src/shape_hints.rs | 10 +--------- crates/xfl/src/tween.rs | 10 +--------- 3 files changed, 5 insertions(+), 21 deletions(-) diff --git a/crates/xfl/src/shape.rs b/crates/xfl/src/shape.rs index bcd3e9373..6077b17a9 100644 --- a/crates/xfl/src/shape.rs +++ b/crates/xfl/src/shape.rs @@ -93,15 +93,15 @@ impl Matrix { pub const IDENTITY: Matrix = Matrix { a: 1.0, b: 0.0, c: 0.0, d: 1.0, tx: 0.0, ty: 0.0 }; } -fn number(element: &impl XflElement, name: &str) -> Option { +pub(crate) fn number(element: &impl XflElement, name: &str) -> Option { element.attr(name)?.trim().parse::().ok().filter(|value| value.is_finite()) } -fn integer(element: &impl XflElement, name: &str) -> Option { +pub(crate) fn integer(element: &impl XflElement, name: &str) -> Option { element.attr(name)?.trim().parse::().ok() } -fn boolean(element: &impl XflElement, name: &str) -> Option { +pub(crate) fn boolean(element: &impl XflElement, name: &str) -> Option { element.attr(name).map(|value| value.trim() == "true") } diff --git a/crates/xfl/src/shape_hints.rs b/crates/xfl/src/shape_hints.rs index 0a9e99d42..681e0c5a9 100644 --- a/crates/xfl/src/shape_hints.rs +++ b/crates/xfl/src/shape_hints.rs @@ -3,7 +3,7 @@ //! These parse the native point encodings and hint ordering. Snapping points onto consumer //! geometry and pairing start/end keyframes remain application responsibilities. -use crate::shape::XflElement; +use crate::shape::{XflElement, integer, number}; /// A native XFL point in document coordinates. #[derive(Clone, Copy, Debug, PartialEq)] @@ -77,14 +77,6 @@ fn read_point(element: &impl XflElement, joined: &str, x: &str, y: &str) -> Opti (point.x.is_finite() && point.y.is_finite()).then_some(point) } -fn number(element: &impl XflElement, name: &str) -> Option { - element.attr(name)?.trim().parse::().ok().filter(|value| value.is_finite()) -} - -fn integer(element: &impl XflElement, name: &str) -> Option { - element.attr(name)?.trim().parse::().ok() -} - #[cfg(test)] mod tests { use super::*; diff --git a/crates/xfl/src/tween.rs b/crates/xfl/src/tween.rs index 753be73d1..a894d5c29 100644 --- a/crates/xfl/src/tween.rs +++ b/crates/xfl/src/tween.rs @@ -3,7 +3,7 @@ //! This parses the native attributes and point lists. Interpreting easing curves and applying //! them to an application's timeline model remain consumer responsibilities. -use crate::shape::XflElement; +use crate::shape::{XflElement, boolean, number}; /// Native motion/shape tween settings on a `DOMFrame`. #[derive(Clone, Copy, Debug)] @@ -78,14 +78,6 @@ impl EasePoint<'_, E> { } } -fn number(element: &impl XflElement, name: &str) -> Option { - element.attr(name)?.trim().parse::().ok().filter(|value| value.is_finite()) -} - -fn boolean(element: &impl XflElement, name: &str) -> Option { - element.attr(name).map(|value| value.trim() == "true") -} - #[cfg(test)] mod tests { use super::*;