From 1b60b979a4c0ecf3164a383ac9c9ad41023533d7 Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Sun, 15 Nov 2026 02:44:36 +0000 Subject: [PATCH] Reuse XFL wire value parsers --- crates/xfl/src/filters.rs | 14 +------------- crates/xfl/src/shape.rs | 6 +++--- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/crates/xfl/src/filters.rs b/crates/xfl/src/filters.rs index 4c8feb2d4..ef29a3707 100644 --- a/crates/xfl/src/filters.rs +++ b/crates/xfl/src/filters.rs @@ -3,7 +3,7 @@ //! This module parses the wire-level filter names, fields, and gradient-ramp entries. Consumers //! remain responsible for mapping those values into their own rendering/filter models. -use crate::shape::{self, Color, XflElement}; +use crate::shape::{self, Color, XflElement, boolean, integer, number}; /// Native filter variants understood by XFL. #[derive(Clone, Copy, Debug, PartialEq, Eq)] @@ -173,18 +173,6 @@ impl<'a, E: XflElement> RampEntry<'a, E> { } } -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() -} - -fn boolean(element: &impl XflElement, name: &str) -> Option { - element.attr(name).map(|value| value.trim() == "true") -} - #[cfg(test)] mod tests { use super::*; 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") }