From 1ef898ac32a8292d8c4ecf056f8d8c7d957f2991 Mon Sep 17 00:00:00 2001 From: unspeaker Date: Sun, 17 Aug 2025 19:32:43 +0300 Subject: [PATCH] remove DslKey --- dsl/src/dsl.rs | 23 ----------------------- proc/src/proc_expose.rs | 2 +- 2 files changed, 1 insertion(+), 24 deletions(-) diff --git a/dsl/src/dsl.rs b/dsl/src/dsl.rs index c37910f..ce30384 100644 --- a/dsl/src/dsl.rs +++ b/dsl/src/dsl.rs @@ -242,29 +242,6 @@ dsl_type!(DslText { } }); -pub const fn is_key_start (c: char) -> bool { matches!(c, '/'|('a'..='z')) } -pub const fn is_key_char (c: char) -> bool { is_key_start(c) || matches!(c, '0'..='9'|'-') } -pub const fn is_key_end (c: char) -> bool { !is_key_char(c) } -dsl_type!(DslKey { - fn key (&self) -> DslPerhaps<&str> { ok_flat(self.src()?.map(key_peek_only)) } -} { - pub const fn key_peek [generated]; - pub const fn key_peek_only [generated]; - pub const fn key_seek [generated]; - pub const fn key_seek_start (src) { - for_each!((i, c) in char_indices(src) => - if is_key_start(c) { return Ok(Some(i)) } else - if !is_space(c) { return Err(Unexpected(c, Some(i), None)) }); - Ok(None) - } - pub const fn key_seek_length (src) { - for_each!((i, c) in char_indices(src) => - if is_key_end(c) { return Ok(Some(i)) } else - if !is_key_char(c) { return Err(Unexpected(c, Some(i), None)) }); - Ok(Some(src.len())) - } -}); - dsl_type!(DslNum { fn num (&self) -> DslPerhaps<&str> {ok_flat(self.src()?.map(num_peek_only))} } { diff --git a/proc/src/proc_expose.rs b/proc/src/proc_expose.rs index fa2707c..bb6794b 100644 --- a/proc/src/proc_expose.rs +++ b/proc/src/proc_expose.rs @@ -87,7 +87,7 @@ impl ExposeImpl { /// Generated by [tengri_proc::expose]. impl ::tengri::dsl::FromDsl<#state> for #t { fn from_dsl (state: &#state, dsl: &impl Dsl) -> Perhaps { - match dsl.key()? { + match dsl.word()? { Some("true") => Ok(Some(true)), Some("false") => Ok(Some(false)), _ => match dsl.word()? { #(#variants)* _ => Ok(None) }