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

wip: wee

Browse source
This commit is contained in:
🪞👃🪞 2025-05-26 23:21:38 +03:00
parent d6e8be6ce5
commit f77139c8fd
5 changed files with 68 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

24
dsl/src/dsl_ast.rs
View file

@ -3,12 +3,13 @@ use std::sync::Arc;
use std::borrow::Cow;
/// Owns its values, and has no metadata.
pub type AstToken = Token<AstValue, AstMeta>;
#[derive(PartialEq, Clone, Default, Debug)]
pub struct AstToken(pub AstValue, pub AstMeta);
#[derive(Debug, Copy, Clone, Default, PartialEq)]
pub struct AstMeta;
pub type AstValue = Value<Arc<str>, AstExp>;
pub type AstValue = Value<Arc<str>, Vec<AstToken>>;
impl<'source> From<CstValue<'source>> for AstValue {
fn from (value: CstValue<'source>) -> Self {
use Value::*;
@ -19,18 +20,15 @@ impl<'source> From<CstValue<'source>> for AstValue {
Sym(s) => Sym(s.into()),
Key(s) => Key(s.into()),
Str(s) => Str(s.into()),
Exp(x) => Exp(x.into()),
Exp(d, x) => Exp(d, x.into()),
}
}
}
#[derive(Clone, Default, PartialEq)]
pub struct AstExp(pub Vec<AstToken>);
impl<'source> From<CstExp<'source>> for AstExp {
fn from (exp: CstExp<'source>) -> AstExp {
AstExp(exp.words.map(|token|Token(
AstValue::from(token.value()),
AstMeta,
)).collect())
}
}
pub trait AstIter: DslIter<Token = AstToken> {}
//impl<'source> From<CstExp<'source>> for AstExp {
//fn from (exp: CstExp<'source>) -> AstExp {
//AstExp(exp.words.map(|token|Token(AstValue::from(token.value()), AstMeta,)).collect())
//}
//}

10
dsl/src/dsl_cst.rs
View file

@ -1,7 +1,8 @@
use crate::*;
/// Keeps the reference to the source slice.
pub type CstToken<'source> = Token<CstValue<'source>, CstMeta<'source>>;
#[derive(Debug, Copy, Clone, Default, PartialEq)]
pub struct CstToken<'source>(pub CstValue<'source>, pub CstMeta<'source>);
#[derive(Debug, Copy, Clone, Default, PartialEq)] pub struct CstMeta<'source> {
pub source: &'source str,
@ -9,9 +10,4 @@ pub type CstToken<'source> = Token<CstValue<'source>, CstMeta<'source>>;
pub length: usize,
}
pub type CstValue<'source> = Value<&'source str, CstExp<'source>>;
#[derive(Debug, Copy, Clone, Default, PartialEq)] pub struct CstExp<'source> {
pub depth: usize,
pub words: SourceIter<'source>
}
pub type CstValue<'source> = Value<&'source str, SourceIter<'source>>;

13
dsl/src/dsl_display.rs
View file

@ -1,7 +1,5 @@
use crate::*;
use std::fmt::{Debug, Display, Formatter, Error as FormatError};
impl Display for AstValue {
fn fmt (&self, out: &mut Formatter) -> Result<(), FormatError> {
use Value::*;
@ -12,17 +10,10 @@ impl Display for AstValue {
Sym(s) => format!("{s}"),
Key(s) => format!("{s}"),
Str(s) => format!("{s}"),
Exp(e) => format!("{e:?}"),
Exp(_, e) => format!("{e:?}"),
})
}
}
impl Debug for AstExp {
fn fmt (&self, out: &mut Formatter) -> Result<(), FormatError> {
todo!()
}
}
impl<'source> Display for CstValue<'source> {
fn fmt (&self, out: &mut Formatter) -> Result<(), FormatError> {
use Value::*;
@ -33,7 +24,7 @@ impl<'source> Display for CstValue<'source> {
Sym(s) => format!("{s}"),
Key(s) => format!("{s}"),
Str(s) => format!("{s}"),
Exp(e) => format!("{e:?}"),
Exp(_, e) => format!("{e:?}"),
})
}
}

58
dsl/src/dsl_iter.rs
View file

@ -13,30 +13,48 @@ pub trait DslIter {
/// [Cst::next] returns just the [CstToken] and mutates `self`,
/// instead of returning an updated version of the struct as [SourceConstIter::next] does.
#[derive(Copy, Clone, Debug, Default, PartialEq)]
pub struct SourceIter<'a>(pub SourceConstIter<'a>);
pub struct SourceIter<'source>(pub SourceConstIter<'source>);
impl<'a> SourceIter<'a> {
pub const fn new (source: &'a str) -> Self {
impl<'source> SourceIter<'source> {
pub const fn new (source: &'source str) -> Self {
Self(SourceConstIter::new(source))
}
pub const fn peek (&self) -> Option<CstToken<'a>> {
pub const fn peek (&self) -> Option<CstToken<'source>> {
self.0.peek()
}
}
impl<'a> Iterator for SourceIter<'a> {
type Item = CstToken<'a>;
fn next (&mut self) -> Option<CstToken<'a>> {
impl<'source> Iterator for SourceIter<'source> {
type Item = CstToken<'source>;
fn next (&mut self) -> Option<CstToken<'source>> {
self.0.next().map(|(item, rest)|{self.0 = rest; item})
}
}
impl<'a> From<&'a str> for SourceIter<'a> {
fn from (source: &'a str) -> Self{
impl<'source> From<&'source str> for SourceIter<'source> {
fn from (source: &'source str) -> Self{
Self(SourceConstIter(source))
}
}
impl<'source> Into<Vec<CstToken<'source>>> for SourceIter<'source> {
fn into (self) -> Vec<CstToken<'source>> {
self.collect()
}
}
impl<'source> Into<Vec<AstToken>> for SourceIter<'source> {
fn into (self) -> Vec<AstToken> {
self.map(Into::into).collect()
}
}
impl<'source> From<CstToken<'source>> for AstToken {
fn from (value: CstToken<'source>) -> Self {
Self(value.0.into(), AstMeta)
}
}
/// Implement the const iterator pattern.
#[macro_export] macro_rules! const_iter {
($(<$l:lifetime>)?|$self:ident: $Struct:ty| => $Item:ty => $expr:expr) => {
@ -58,34 +76,34 @@ impl<'a> From<&'a str> for SourceIter<'a> {
/// * the source text remaining
/// * [ ] TODO: maybe [SourceConstIter::next] should wrap the remaining source in `Self` ?
#[derive(Copy, Clone, Debug, Default, PartialEq)]
pub struct SourceConstIter<'a>(pub &'a str);
pub struct SourceConstIter<'source>(pub &'source str);
impl<'a> From<SourceConstIter<'a>> for SourceIter<'a> {
fn from (source: SourceConstIter<'a>) -> Self{
impl<'source> From<SourceConstIter<'source>> for SourceIter<'source> {
fn from (source: SourceConstIter<'source>) -> Self{
Self(source)
}
}
impl<'a> From<&'a str> for SourceConstIter<'a> {
fn from (source: &'a str) -> Self{
impl<'source> From<&'source str> for SourceConstIter<'source> {
fn from (source: &'source str) -> Self{
Self::new(source)
}
}
impl<'a> SourceConstIter<'a> {
pub const fn new (source: &'a str) -> Self {
impl<'source> SourceConstIter<'source> {
pub const fn new (source: &'source str) -> Self {
Self(source)
}
pub const fn chomp (&self, index: usize) -> Self {
Self(split_at(self.0, index).1)
}
pub const fn next (mut self) -> Option<(CstToken<'a>, Self)> {
pub const fn next (mut self) -> Option<(CstToken<'source>, Self)> {
Self::next_mut(&mut self)
}
pub const fn peek (&self) -> Option<CstToken<'a>> {
pub const fn peek (&self) -> Option<CstToken<'source>> {
peek_src(self.0)
}
pub const fn next_mut (&mut self) -> Option<(CstToken<'a>, Self)> {
pub const fn next_mut (&mut self) -> Option<(CstToken<'source>, Self)> {
match self.peek() {
Some(token) => Some((token, self.chomp(token.end()))),
None => None
@ -93,4 +111,4 @@ impl<'a> SourceConstIter<'a> {
}
}
const_iter!(<'a>|self: SourceConstIter<'a>| => CstToken<'a> => self.next_mut().map(|(result, _)|result));
const_iter!(<'source>|self: SourceConstIter<'source>| => CstToken<'source> => self.next_mut().map(|(result, _)|result));

22
dsl/src/dsl_token.rs
View file

@ -5,9 +5,14 @@ pub enum Value<
S: PartialEq + Clone + Default + Debug,
X: PartialEq + Clone + Default + Debug,
> {
#[default] Nil, Err(DslError), Num(usize), Sym(S), Key(S), Str(S), Exp(X),
#[default] Nil, Err(DslError), Num(usize), Sym(S), Key(S), Str(S), Exp(usize, X),
}
impl<
S: Copy + PartialEq + Clone + Default + Debug,
X: Copy + PartialEq + Clone + Default + Debug,
> Copy for Value<S, X> {}
pub trait DslValue: PartialEq + Clone + Default + Debug {
type Err: PartialEq + Clone + Debug;
type Num: PartialEq + Copy + Clone + Default + Debug;
@ -20,8 +25,9 @@ pub trait DslValue: PartialEq + Clone + Default + Debug {
fn key (&self) -> Option<&Self::Str>;
fn str (&self) -> Option<&Self::Str>;
fn exp (&self) -> Option<&Self::Exp>;
fn exp_head (&self) -> Option<&Self> { None } // TODO
fn exp_tail (&self) -> Option<&[Self]> { None } // TODO
fn exp_depth (&self) -> Option<usize> { None } // TODO
fn exp_head (&self) -> Option<&Self> { None } // TODO
fn exp_tail (&self) -> Option<&[Self]> { None } // TODO
}
impl<
@ -51,7 +57,7 @@ impl<
if let Self::Str(s) = self { Some(s) } else { None }
}
fn exp (&self) -> Option<&Exp> {
if let Self::Exp(x) = self { Some(x) } else { None }
if let Self::Exp(_, x) = self { Some(x) } else { None }
}
}
@ -136,14 +142,14 @@ impl<'source> CstToken<'source> {
use Value::*;
let token = self.grow();
if let Exp(depth, _) = token.value() {
token.with_value(Exp(depth, Cst::new(token.slice_source_exp(self.source))))
token.with_value(Exp(depth, SourceIter::new(token.slice_source_exp(self.1.source))))
} else {
unreachable!()
}
}
pub const fn grow_in (self) -> Self {
let token = self.grow_exp();
if let Value::Exp(depth, source) = token.value {
if let Value::Exp(depth, source) = token.value() {
token.with_value(Value::Exp(depth.saturating_add(1), source))
} else {
unreachable!()
@ -151,7 +157,7 @@ impl<'source> CstToken<'source> {
}
pub const fn grow_out (self) -> Self {
let token = self.grow_exp();
if let Value::Exp(depth, source) = token.value {
if let Value::Exp(depth, source) = token.value() {
if depth > 0 {
token.with_value(Value::Exp(depth - 1, source))
} else {
@ -200,7 +206,7 @@ pub const fn peek_src <'a> (source: &'a str) -> Option<CstToken<'a>> {
' '|'\n'|'\r'|'\t' =>
token.grow(),
'(' =>
CstToken::new(source, start, 1, Exp(1, Cst::new(str_range(source, start, start + 1)))),
CstToken::new(source, start, 1, Exp(1, SourceIter::new(str_range(source, start, start + 1)))),
'"' =>
CstToken::new(source, start, 1, Str(str_range(source, start, start + 1))),
':'|'@' =>