unspeaker/tengri
1
0
Fork 0
mirror of https://codeberg.org/unspeaker/tengri.git synced 2025-12-06 19:56:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

FromDsl -> Namespace

Browse source
This commit is contained in:
🪞👃🪞 2025-05-21 00:06:36 +03:00
parent 455d6d00d5
commit f714302f21
8 changed files with 33 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

14
dsl/src/dsl_provide.rs
View file

@ -1,6 +1,6 @@
use crate::*; use crate::*;
pub trait Dsl<Other>: Sized { pub trait Dsl<Other> {
fn take <'state, 'source: 'state> ( fn take <'state, 'source: 'state> (
&'state self, &'state self,
token: &mut TokenIter<'source> token: &mut TokenIter<'source>
@ -18,7 +18,7 @@ pub trait Dsl<Other>: Sized {
} }
} }
} }
pub trait FromDsl<'source, State>: Sized { pub trait Namespace<'source, State>: Sized {
fn take_from <'state> (state: &'state State, token: &mut TokenIter<'source>) fn take_from <'state> (state: &'state State, token: &mut TokenIter<'source>)
-> Perhaps<Self>; -> Perhaps<Self>;
fn take_from_or_fail <'state> ( fn take_from_or_fail <'state> (
@ -26,14 +26,14 @@ pub trait FromDsl<'source, State>: Sized {
token: &mut TokenIter<'source>, token: &mut TokenIter<'source>,
error: impl Into<Box<dyn std::error::Error>> error: impl Into<Box<dyn std::error::Error>>
) -> Usually<Self> { ) -> Usually<Self> {
if let Some(value) = FromDsl::<State>::take_from(state, token)? { if let Some(value) = Namespace::<State>::take_from(state, token)? {
Ok(value) Ok(value)
} else { } else {
Result::Err(error.into()) Result::Err(error.into())
} }
} }
} }
//impl<State: Dsl<T>, T> FromDsl<State> for T { //impl<State: Dsl<T>, T> Namespace<State> for T {
//fn take_from <'state, 'source: 'state> (state: &'state State, token: &mut TokenIter<'source>) //fn take_from <'state, 'source: 'state> (state: &'state State, token: &mut TokenIter<'source>)
//-> Perhaps<Self> //-> Perhaps<Self>
//{ //{
@ -45,7 +45,7 @@ pub trait FromDsl<'source, State>: Sized {
/// specifying two types and providing an expression. /// specifying two types and providing an expression.
#[macro_export] macro_rules! from_dsl { #[macro_export] macro_rules! from_dsl {
(@a: $T:ty: |$state:ident, $words:ident|$expr:expr) => { (@a: $T:ty: |$state:ident, $words:ident|$expr:expr) => {
impl<'source, State: Dsl<A>, A> FromDsl<'source, State> for $T { impl<'source, State: Dsl<A>, A> Namespace<'source, State> for $T {
fn take_from <'state> ( fn take_from <'state> (
$state: &'state State, $state: &'state State,
$words: &mut TokenIter<'source>, $words: &mut TokenIter<'source>,
@ -55,7 +55,7 @@ pub trait FromDsl<'source, State>: Sized {
} }
}; };
(@ab: $T:ty: |$state:ident, $words:ident|$expr:expr) => { (@ab: $T:ty: |$state:ident, $words:ident|$expr:expr) => {
impl<'source, State: Dsl<A> + Dsl<B>, A, B> FromDsl<'source, State> for $T { impl<'source, State: Dsl<A> + Dsl<B>, A, B> Namespace<'source, State> for $T {
fn take_from <'state> ( fn take_from <'state> (
$state: &'state State, $state: &'state State,
$words: &mut TokenIter<'source>, $words: &mut TokenIter<'source>,
@ -65,7 +65,7 @@ pub trait FromDsl<'source, State>: Sized {
} }
}; };
($T:ty: |$state:ident:$S:ty, $words:ident|$expr:expr) => { ($T:ty: |$state:ident:$S:ty, $words:ident|$expr:expr) => {
impl<'source> FromDsl<'source, $S> for $T { impl<'source> Namespace<'source, $S> for $T {
fn take_from <'state> ( fn take_from <'state> (
$state: &'state $S, $state: &'state $S,
$words: &mut TokenIter<'source>, $words: &mut TokenIter<'source>,

29
input/src/input_dsl.rs
View file

@ -5,13 +5,13 @@ use std::marker::PhantomData;
pub trait DslInput: Input { fn matches_dsl (&self, token: &str) -> bool; } pub trait DslInput: Input { fn matches_dsl (&self, token: &str) -> bool; }
/// A pre-configured mapping of input events to commands. /// A pre-configured mapping of input events to commands.
pub trait KeyMap<'source, S, C: FromDsl<'source, S> + Command<S>, I: DslInput> { pub trait KeyMap<'source, S, C: Namespace<'source, S> + Command<S>, I: DslInput> {
/// Try to find a command that matches the current input event. /// Try to find a command that matches the current input event.
fn keybind_resolve (&self, state: &S, input: &I) -> Perhaps<C>; fn keybind_resolve (&self, state: &S, input: &I) -> Perhaps<C>;
} }
/// A [SourceIter] can be a [KeyMap]. /// A [SourceIter] can be a [KeyMap].
impl<'source, S, C: FromDsl<'source, S> + Command<S>, I: DslInput> impl<'source, S, C: Namespace<'source, S> + Command<S>, I: DslInput>
KeyMap<'source, S, C, I> KeyMap<'source, S, C, I>
for SourceIter<'source> { for SourceIter<'source> {
fn keybind_resolve (&self, state: &S, input: &I) -> Perhaps<C> { fn keybind_resolve (&self, state: &S, input: &I) -> Perhaps<C> {
@ -24,7 +24,7 @@ for SourceIter<'source> {
match exp_iter.next() { match exp_iter.next() {
Some(Token { value: Value::Sym(binding), .. }) => { Some(Token { value: Value::Sym(binding), .. }) => {
if input.matches_dsl(binding) { if input.matches_dsl(binding) {
if let Some(command) = FromDsl::take_from(state, &mut exp_iter)? { if let Some(command) = Namespace::take_from(state, &mut exp_iter)? {
return Ok(Some(command)) return Ok(Some(command))
} }
} }
@ -40,7 +40,7 @@ for SourceIter<'source> {
} }
/// A [TokenIter] can be a [KeyMap]. /// A [TokenIter] can be a [KeyMap].
impl<'source, S, C: FromDsl<'source, S> + Command<S>, I: DslInput> impl<'source, S, C: Namespace<'source, S> + Command<S>, I: DslInput>
KeyMap<'source, S, C, I> KeyMap<'source, S, C, I>
for TokenIter<'source> { for TokenIter<'source> {
fn keybind_resolve (&self, state: &S, input: &I) -> Perhaps<C> { fn keybind_resolve (&self, state: &S, input: &I) -> Perhaps<C> {
@ -52,7 +52,7 @@ for TokenIter<'source> {
match e.next() { match e.next() {
Some(Token { value: Value::Sym(binding), .. }) => { Some(Token { value: Value::Sym(binding), .. }) => {
if input.matches_dsl(binding) { if input.matches_dsl(binding) {
if let Some(command) = FromDsl::take_from(state, &mut e)? { if let Some(command) = Namespace::take_from(state, &mut e)? {
return Ok(Some(command)) return Ok(Some(command))
} }
} }
@ -67,23 +67,24 @@ for TokenIter<'source> {
} }
} }
pub type InputLayerCond<'source, S> = Box<dyn Fn(&S)->Usually<bool> + 'source>; pub type InputCondition<'source, S> =
Box<dyn Fn(&S)->Usually<bool> + Send + Sync + 'source>;
/// A collection of pre-configured mappings of input events to commands, /// A collection of pre-configured mappings of input events to commands,
/// which may be made available subject to given conditions. /// which may be made available subject to given conditions.
pub struct InputMap<'source, pub struct InputMap<'source,
S, S,
C: Command<S> + FromDsl<'source, S>, C: Command<S> + Namespace<'source, S>,
I: DslInput, I: DslInput,
M: KeyMap<'source, S, C, I> M: KeyMap<'source, S, C, I>
> { > {
__: PhantomData<&'source (S, C, I)>, __: PhantomData<&'source (S, C, I)>,
pub layers: Vec<(InputLayerCond<'source, S>, M)>, pub layers: Vec<(InputCondition<'source, S>, M)>,
} }
impl<'source, impl<'source,
S, S,
C: Command<S> + FromDsl<'source, S>, C: Command<S> + Namespace<'source, S>,
I: DslInput, I: DslInput,
M: KeyMap<'source, S, C, I> M: KeyMap<'source, S, C, I>
> Default for InputMap<'source, S, C, I, M>{ > Default for InputMap<'source, S, C, I, M>{
@ -94,7 +95,7 @@ impl<'source,
impl<'source, impl<'source,
S, S,
C: Command<S> + FromDsl<'source, S>, C: Command<S> + Namespace<'source, S>,
I: DslInput, I: DslInput,
M: KeyMap<'source, S, C, I> M: KeyMap<'source, S, C, I>
> InputMap<'source, S, C, I, M> { > InputMap<'source, S, C, I, M> {
@ -109,11 +110,11 @@ impl<'source,
self.add_layer_if(Box::new(|_|Ok(true)), keymap); self.add_layer_if(Box::new(|_|Ok(true)), keymap);
self self
} }
pub fn layer_if (mut self, condition: InputLayerCond<'source, S>, keymap: M) -> Self { pub fn layer_if (mut self, condition: InputCondition<'source, S>, keymap: M) -> Self {
self.add_layer_if(condition, keymap); self.add_layer_if(condition, keymap);
self self
} }
pub fn add_layer_if (&mut self, condition: InputLayerCond<'source, S>, keymap: M) -> &mut Self { pub fn add_layer_if (&mut self, condition: InputCondition<'source, S>, keymap: M) -> &mut Self {
self.layers.push((Box::new(condition), keymap)); self.layers.push((Box::new(condition), keymap));
self self
} }
@ -121,7 +122,7 @@ impl<'source,
impl<'source, impl<'source,
S, S,
C: Command<S> + FromDsl<'source, S>, C: Command<S> + Namespace<'source, S>,
I: DslInput, I: DslInput,
M: KeyMap<'source, S, C, I> M: KeyMap<'source, S, C, I>
> std::fmt::Debug for InputMap<'source, S, C, I, M> { > std::fmt::Debug for InputMap<'source, S, C, I, M> {
@ -133,7 +134,7 @@ impl<'source,
/// An [InputMap] can be a [KeyMap]. /// An [InputMap] can be a [KeyMap].
impl<'source, impl<'source,
S, S,
C: Command<S> + FromDsl<'source, S>, C: Command<S> + Namespace<'source, S>,
I: DslInput, I: DslInput,
M: KeyMap<'source, S, C, I> M: KeyMap<'source, S, C, I>
> KeyMap<'source, S, C, I> for InputMap<'source, S, C, I, M> { > KeyMap<'source, S, C, I> for InputMap<'source, S, C, I, M> {

4
output/src/ops/cond.rs
View file

@ -18,7 +18,7 @@ impl<A, B> Either<A, B> {
} }
} }
#[cfg(feature = "dsl")] #[cfg(feature = "dsl")]
impl<'source, A, T: Dsl<bool> + Dsl<A>> FromDsl<'source, T> for When<A> { impl<'source, A, T: Dsl<bool> + Dsl<A>> Namespace<'source, T> for When<A> {
fn take_from <'state> ( fn take_from <'state> (
state: &'state T, state: &'state T,
token: &mut TokenIter<'source> token: &mut TokenIter<'source>
@ -56,7 +56,7 @@ impl<E: Output, A: Render<E>> Content<E> for When<A> {
} }
} }
#[cfg(feature = "dsl")] #[cfg(feature = "dsl")]
impl<'source, A, B, T: Dsl<bool> + Dsl<A> + Dsl<B>> FromDsl<'source, T> for Either<A, B> { impl<'source, A, B, T: Dsl<bool> + Dsl<A> + Dsl<B>> Namespace<'source, T> for Either<A, B> {
fn take_from <'state> ( fn take_from <'state> (
state: &'state T, state: &'state T,
token: &mut TokenIter<'source> token: &mut TokenIter<'source>

4
output/src/ops/transform.rs
View file

@ -33,7 +33,7 @@ macro_rules! transform_xy {
#[inline] pub const fn xy (item: A) -> Self { Self::XY(item) } #[inline] pub const fn xy (item: A) -> Self { Self::XY(item) }
} }
#[cfg(feature = "dsl")] #[cfg(feature = "dsl")]
impl<'source, A, T: Dsl<A>> FromDsl<'source, T> for $Enum<A> { impl<'source, A, T: Dsl<A>> Namespace<'source, T> for $Enum<A> {
fn take_from <'state> (state: &'state T, iter: &mut TokenIter<'source>) -> Perhaps<Self> { fn take_from <'state> (state: &'state T, iter: &mut TokenIter<'source>) -> Perhaps<Self> {
if let Some(Token { value: Value::Key(k), .. }) = iter.peek() { if let Some(Token { value: Value::Key(k), .. }) = iter.peek() {
let mut base = iter.clone(); let mut base = iter.clone();
@ -77,7 +77,7 @@ macro_rules! transform_xy_unit {
#[inline] pub const fn xy (x: U, y: U, item: A) -> Self { Self::XY(x, y, item) } #[inline] pub const fn xy (x: U, y: U, item: A) -> Self { Self::XY(x, y, item) }
} }
#[cfg(feature = "dsl")] #[cfg(feature = "dsl")]
impl<'source, A, U: Coordinate, T: Dsl<A> + Dsl<U>> FromDsl<'source, T> for $Enum<U, A> { impl<'source, A, U: Coordinate, T: Dsl<A> + Dsl<U>> Namespace<'source, T> for $Enum<U, A> {
fn take_from <'state> (state: &'state T, iter: &mut TokenIter<'source>) -> Perhaps<Self> { fn take_from <'state> (state: &'state T, iter: &mut TokenIter<'source>) -> Perhaps<Self> {
Ok(if let Some(Token { value: Value::Key($x|$y|$xy), .. }) = iter.peek() { Ok(if let Some(Token { value: Value::Key($x|$y|$xy), .. }) = iter.peek() {
let mut base = iter.clone(); let mut base = iter.clone();

4
output/src/view.rs
View file

@ -13,7 +13,7 @@ use crate::*;
//// Provides components to the view. //// Provides components to the view.
//#[cfg(feature = "dsl")] //#[cfg(feature = "dsl")]
//pub trait ViewContext<'state, E: Output + 'state>: //pub trait ViewContext<'state, E: Output + 'state>:
//FromDsl<bool> + FromDsl<usize> + FromDsl<E::Unit> + Send + Sync //Namespace<bool> + Namespace<usize> + Namespace<E::Unit> + Send + Sync
//{ //{
//fn get_content_sym <'source: 'state> (&'state self, iter: &mut TokenIter<'source>) //fn get_content_sym <'source: 'state> (&'state self, iter: &mut TokenIter<'source>)
//-> Perhaps<RenderBox<'state, E>>; //-> Perhaps<RenderBox<'state, E>>;
@ -39,7 +39,7 @@ use crate::*;
//} //}
//#[cfg(feature = "dsl")] //#[cfg(feature = "dsl")]
//impl<'context, O: Output + 'context, T: ViewContext<'context, O>> FromDsl<T> for RenderBox<'context, O> { //impl<'context, O: Output + 'context, T: ViewContext<'context, O>> Namespace<T> for RenderBox<'context, O> {
//fn take_from <'state, 'source: 'state> (state: &'state T, token: &mut TokenIter<'source>) //fn take_from <'state, 'source: 'state> (state: &'state T, token: &mut TokenIter<'source>)
//-> Perhaps<RenderBox<'context, O>> //-> Perhaps<RenderBox<'context, O>>
//{ //{

4
proc/src/proc_command.rs
View file

@ -84,7 +84,7 @@ impl ToTokens for CommandDef {
let mut out = TokenStream2::new(); let mut out = TokenStream2::new();
for (arg, ty) in arm.args() { for (arg, ty) in arm.args() {
write_quote_to(&mut out, quote! { write_quote_to(&mut out, quote! {
#arg: FromDsl::take_from_or_fail(self, words)?, #arg: Namespace::take_from_or_fail(self, words)?,
}); });
} }
out out
@ -149,7 +149,7 @@ impl ToTokens for CommandDef {
} }
} }
/// Generated by [tengri_proc::command]. /// Generated by [tengri_proc::command].
impl<'source> ::tengri::dsl::FromDsl<'source, #state> for #command_enum { impl<'source> ::tengri::dsl::Namespace<'source, #state> for #command_enum {
fn take_from <'state> ( fn take_from <'state> (
state: &'state #state, state: &'state #state,
words: &mut ::tengri::dsl::TokenIter<'source> words: &mut ::tengri::dsl::TokenIter<'source>

2
proc/src/proc_expose.rs
View file

@ -85,7 +85,7 @@ impl ToTokens for ExposeImpl {
let values = variants.iter().map(ExposeArm::from); let values = variants.iter().map(ExposeArm::from);
write_quote_to(out, quote! { write_quote_to(out, quote! {
/// Generated by [tengri_proc::expose]. /// Generated by [tengri_proc::expose].
impl<'source> ::tengri::dsl::FromDsl<'source, #state> for #t { impl<'source> ::tengri::dsl::Namespace<'source, #state> for #t {
fn take_from <'state> ( fn take_from <'state> (
state: &'state #state, state: &'state #state,
words: &mut ::tengri::dsl::TokenIter<'source> words: &mut ::tengri::dsl::TokenIter<'source>

2
proc/src/proc_view.rs
View file

@ -70,7 +70,7 @@ impl ToTokens for ViewDef {
/// Gives [#view] the ability to construct the [Render]able /// Gives [#view] the ability to construct the [Render]able
/// which might corresponds to a given [TokenStream], /// which might corresponds to a given [TokenStream],
/// while taking [#view]'s state into consideration. /// while taking [#view]'s state into consideration.
impl<'source> ::tengri::dsl::FromDsl<'source, #view> for Box<dyn Render<#output> + 'source> { impl<'source> ::tengri::dsl::Namespace<'source, #view> for Box<dyn Render<#output> + 'source> {
fn take_from <'state> ( fn take_from <'state> (
state: &'state #view, state: &'state #view,
words: &mut ::tengri::dsl::TokenIter<'source>, words: &mut ::tengri::dsl::TokenIter<'source>,