test top level expr parsing

edn/src/lib.rs

@@ -43,44 +43,65 @@ pub(crate) use std::fmt::{Debug, Display, Formatter, Result as FormatResult, Err
     }
 }
 #[cfg(test)] #[test] fn test_token () -> Result<(), Box<dyn std::error::Error>> {
-    use Token::*;
-    assert_eq!(Nil, Token::chomp_one("")?);
-    assert_eq!(Nil, Token::chomp_one("  \n    \r   \t  ")?);
-    assert_eq!(Num("8", 0, 1), Token::chomp_one("8")?);
-    assert_eq!(Num("   8     ", 3, 1), Token::chomp_one("   8     ")?);
-    assert_eq!(Sym(":foo", 0, 4), Token::chomp_one(":foo")?);
-    assert_eq!(Sym("@bar", 0, 4), Token::chomp_one("@bar")?);
-    assert_eq!(Key("foo/bar", 0, 7), Token::chomp_one("foo/bar")?);
+    let source = ":f00";
+    let mut token = Token { source, start: 0, length: 1, value: Sym(":") };
+    token = token.grow_sym();
+    assert_eq!(token, Token { source, start: 0, length: 2, value: Sym(":f") }); 
+    token = token.grow_sym();
+    assert_eq!(token, Token { source, start: 0, length: 3, value: Sym(":f0") }); 
+    token = token.grow_sym();
+    assert_eq!(token, Token { source, start: 0, length: 4, value: Sym(":f00") }); 
+
+    let src = "";
+    assert_eq!(None, TokenIter(src).next());
+
+    let src = "  \n    \r   \t  ";
+    assert_eq!(None, TokenIter(src).next());
+
+    let src = "7";
+    assert_eq!(Num(7), TokenIter(src).next().unwrap().0.value);
+
+    let src = "     100         ";
+    assert_eq!(Num(100), TokenIter(src).next().unwrap().0.value);
+
+    let src = "     9a         ";
+    assert_eq!(Err(Unexpected('a')), TokenIter(src).next().unwrap().0.value);
+
+    let src = "     :123foo      ";
+    assert_eq!(Sym(":123foo"), TokenIter(src).next().unwrap().0.value);
+
+    let src = " \r\r\r\n\n\n@bar456\t\t\t\t\t\t";
+    assert_eq!(Sym("@bar456"), TokenIter(src).next().unwrap().0.value);
+
+    let src = "foo123";
+    assert_eq!(Key("foo123"), TokenIter(src).next().unwrap().0.value);
+
+    let src = "foo/bar";
+    assert_eq!(Key("foo/bar"), TokenIter(src).next().unwrap().0.value);
+
     Ok(())
 }
-#[cfg(test)] #[test] fn test_lang () -> Result<(), ParseError> {
-    use Atom::*;
-    assert_eq!(Atom::read_all("")?,
-        vec![]);
-    assert_eq!(Atom::read_all("  ")?,
-        vec![]);
-    assert_eq!(Atom::read_all("1234")?,
-        vec![Num(1234)]);
-    assert_eq!(Atom::read_all("1234 5 67")?,
-        vec![Num(1234), Num(5), Num(67)]);
-    assert_eq!(Atom::read_all("foo/bar")?,
-        vec![Key("foo/bar".into())]);
-    assert_eq!(Atom::read_all(":symbol")?,
-        vec![Sym(":symbol".into())]);
-    assert_eq!(Atom::read_all("      foo/bar :baz       456")?,
-        vec![Key("foo/bar".into()), Sym(":baz".into()), Num(456)]);
-    assert_eq!(Atom::read_all("    (foo/bar       :baz 456)   ")?,
-        vec![Exp(vec![Key("foo/bar".into()), Sym(":baz".into()), Num(456)])]);
-    Ok(())
-}
-#[cfg(test)] #[test] fn test_lang_examples () -> Result<(), ParseError> {
-    for example in [
-        include_str!("../../tui/examples/edn01.edn"),
-        include_str!("../../tui/examples/edn02.edn"),
-    ] {
-        let items = Atom::read_all(example)?;
-        //panic!("{layout:?}");
-        //let content = <dyn ViewContext<::tek_engine::tui::Tui>>::from(&layout);
-    }
+#[cfg(test)] #[test] fn test_examples () -> Result<(), ParseError> {    
+    let src = include_str!("../../tek/src/view_arranger.edn");
+    let mut view = TokenIter(src);
+    assert_eq!(view.0, src);
+    let mut expr = view.peek();
+    assert_eq!(view.0, src);
+    assert_eq!(expr, Some(Token {
+        source: src,
+        start:  0,
+        length: src.len(),
+        value:  Exp(0, TokenIter(src))
+    }));
+    //panic!("{view:?}");
+    //panic!("{:#?}", expr);
+    //for example in [
+        //include_str!("../../tui/examples/edn01.edn"),
+        //include_str!("../../tui/examples/edn02.edn"),
+    //] {
+        ////let items = Atom::read_all(example)?;
+        ////panic!("{layout:?}");
+        ////let content = <dyn ViewContext<::tek_engine::tui::Tui>>::from(&layout);
+    //}
     Ok(())
 }