wip: fix(dsl): maybe getting somewhere?

dsl/src/lib.rs

@@ -1,152 +1,17 @@
-//! [Token]s are parsed substrings with an associated [Value].
-//!
-//! * [ ] FIXME: Value may be [Err] which may shadow [Result::Err]
-//! * [Value::Exp] wraps an expression depth and a [SourceIter]
-//!   with the remaining part of the expression.
-//!   * expression depth other that 0 mean unclosed parenthesis.
-//!   * closing and unopened parenthesis panics during reading.
-//!   * [ ] TODO: signed depth might be interesting
-//! * [Value::Sym] and [Value::Key] are stringish literals
-//!   with slightly different parsing rules.
-//! * [Value::Num] is an unsigned integer literal.
-//!```
-//! use tengri_dsl::{*, Value::*};
-//! let source = include_str!("../test.edn");
-//! let mut view = TokenIter::new(source);
-//! assert_eq!(view.peek(), Some(Token {
-//!     source,
-//!     start: 0,
-//!     length: source.len(),
-//!     value: Exp(0, TokenIter::new(&source[1..]))
-//! }));
-//!```
-//! The token iterator [TokenIter] allows you to get the
-//! general-purpose syntactic [Token]s represented by the source text.
-//!
-//! Both iterators are `peek`able:
-//!
-//! ```
-//! let src = include_str!("../test.edn");
-//! let mut view = tengri_dsl::TokenIter::new(src);
-//! assert_eq!(view.0.0, src);
-//! assert_eq!(view.peek(), view.0.peek())
-//! ```
 #![feature(adt_const_params)]
 #![feature(type_alias_impl_trait)]
 #![feature(impl_trait_in_fn_trait_return)]
 pub(crate) use ::tengri_core::*;
-pub(crate) use std::fmt::Debug;//, Display};//, Formatter, Error as FormatError};
+pub(crate) use std::fmt::Debug;
 pub(crate) use std::sync::Arc;
 pub(crate) use std::collections::VecDeque;
 pub(crate) use konst::iter::{ConstIntoIter, IsIteratorKind};
 pub(crate) use konst::string::{split_at, str_range, char_indices};
 pub(crate) use thiserror::Error;
-pub(crate) use self::DslError::*;
+pub(crate) use self::DslErr::*;
 
 mod dsl; pub use self::dsl::*;
 mod ast; pub use self::ast::*;
 mod cst; pub use self::cst::*;
 
-#[cfg(test)] mod test_token_iter {
-    use crate::*;
-    //use proptest::prelude::*;
-    #[test] fn test_iters () {
-        let mut iter = crate::SourceIter::new(&":foo :bar");
-        let _ = iter.next();
-    }
-    #[test] const fn test_const_iters () {
-        let iter = crate::SourceConstIter::new(&":foo :bar");
-        let _ = iter.next();
-    }
-    #[test] fn test_num () {
-        let _digit  = to_digit('0');
-        let _digit  = to_digit('x');
-        let _number = to_number(&"123");
-        let _number = to_number(&"12asdf3");
-    }
-    //proptest! {
-        //#[test] fn proptest_source_iter (
-            //source in "\\PC*"
-        //) {
-            //let mut iter = crate::SourceIter::new(&source);
-            ////let _ = iter.next()
-        //}
-        //#[test] fn proptest_token_iter (
-            //source in "\\PC*"
-        //) {
-            //let mut iter = crate::TokenIter::new(&source);
-            ////let _ = iter.next();
-        //}
-    //}
-}
-
-//#[cfg(test)] mod test_token_prop {
-    //use crate::{Cst, CstMeta, Value::*};
-    //use proptest::prelude::*;
-    //proptest! {
-        //#[test] fn test_token_prop (
-            //source in "\\PC*",
-            //start  in usize::MIN..usize::MAX,
-            //length in usize::MIN..usize::MAX,
-        //) {
-            //let token = Cst(Nil, CstMeta { source: &source, start, length });
-            //let _ = token.slice();
-        //}
-    //}
-//}
-
-#[cfg(test)] #[test] fn test_token () -> Result<(), Box<dyn std::error::Error>> {
-    use crate::DslValue::*;
-    let source = ":f00";
-    let mut token = Cst::new(source, 0, 1, Sym(":"));
-    token = token.grow_sym();
-    assert_eq!(token, Cst::new(source, 0, 2, Sym(":f")));
-    token = token.grow_sym();
-    assert_eq!(token, Cst::new(source, 0, 3, Sym(":f0")));
-    token = token.grow_sym();
-    assert_eq!(token, Cst::new(source, 0, 4, Sym(":f00")));
-
-    assert_eq!(None, SourceIter::new("").next());
-    assert_eq!(None, SourceIter::new("  \n    \r   \t  ").next());
-
-    assert_eq!(Err(Unexpected('a')), SourceIter::new("     9a         ").next().unwrap().value());
-
-    assert_eq!(Num(7),   SourceIter::new("7").next().unwrap().value());
-    assert_eq!(Num(100), SourceIter::new("     100       ").next().unwrap().value());
-
-    assert_eq!(Sym(":123foo"), SourceIter::new("     :123foo      ").next().unwrap().value());
-    assert_eq!(Sym("@bar456"), SourceIter::new(" \r\r\n\n@bar456\t\t\t").next().unwrap().value());
-
-    assert_eq!(Key("foo123"),  SourceIter::new("foo123").next().unwrap().value());
-    assert_eq!(Key("foo/bar"), SourceIter::new("foo/bar").next().unwrap().value());
-
-    assert_eq!(Str("foo/bar"), SourceIter::new("\"foo/bar\"").next().unwrap().value());
-    assert_eq!(Str("foo/bar"), SourceIter::new("    \"foo/bar\"    ").next().unwrap().value());
-
-    Ok(())
-}
-
-//#[cfg(test)] #[test] fn test_examples () -> Result<(), DslError> {
-    //// Let's pretend to render some view.
-    //let source = include_str!("../../tek/src/view_arranger.edn");
-    //// The token iterator allows you to get the tokens represented by the source text.
-    //let mut view = TokenIter(source);
-    //// The token iterator wraps a const token+source iterator.
-    //assert_eq!(view.0.0, source);
-    //let mut expr = view.peek();
-    //assert_eq!(view.0.0, source);
-    //assert_eq!(expr, Some(Token {
-        //source, start: 0, length: source.len() - 1, value: Exp(0, SourceIter::new(&source[1..]))
-    //}));
-    ////panic!("{view:?}");
-    ////panic!("{:#?}", expr);
-    ////for example in [
-        ////include_str!("../../tui/examples/edn01.edn"),
-        ////include_str!("../../tui/examples/edn02.edn"),
-    ////] {
-        //////let items = Dsl::read_all(example)?;
-        //////panic!("{layout:?}");
-        //////let content = <dyn ViewContext<::tengri_engine::tui::Tui>>::from(&layout);
-    ////}
-    //Ok(())
-//}
+#[cfg(test)] mod test;