wip: partial AST implemented

Cargo.toml

@@ -53,3 +53,5 @@ human-repr = "1.1.0"
 fancy-duration = "0.9.2"
 indexmap = "2.7.0"
 nom_locate = "4.2.0"
+nom-supreme = "0.8.0"
+nom-span = "0.1.2"

metadata/Cargo.toml

@@ -6,5 +6,7 @@ edition = "2021"
 [dependencies]
 nom = { workspace = true }
 nom_locate = { workspace = true }
+nom-supreme = { workspace = true }
 encoding_rs = { workspace = true }
 indexmap = { workspace = true }
+nom-span = { workspace = true }

metadata/src/ao.rs

@@ -1,23 +1,14 @@
 mod ast;
 
-use crate::{
-    core::{
-        bom, expr_block, extends, is_abstract,
-        tokens::{Expr, ExprBlock, Span},
-        version,
-    },
-    visitor::Visitor,
+use crate::core::{
+    bom, expr, extends, is_abstract,
+    tokens::{Expr, Span},
+    version,
 };
 use nom::{combinator::opt, multi::many0, sequence::Tuple, IResult};
 
 pub fn parse_ao<'a>(input: Span<'a>) -> IResult<Span<'a>, AO<'a>> {
-    (
-        opt(bom),
-        version,
-        opt(is_abstract),
-        extends,
-        many0(expr_block),
-    )
+    (opt(bom), version, opt(is_abstract), extends, many0(expr))
         .parse(input)
         .map(|(input, (_, version, is_abstract, extends, blocks))| {
             (
@@ -40,7 +31,7 @@ pub struct AO<'a> {
     version: u32,
     is_abstract: bool,
     extends: Option<Span<'a>>,
-    children: Vec<ExprBlock<'a>>,
+    children: Vec<Expr<'a>>,
 }
 
 // impl AO<'_> {
@@ -103,7 +94,7 @@ mod tests {
         let src = include_bytes!("../resources/character.aoc");
         let src = read_string_from_utf16(src);
 
-        // let (input, ao) = parse_ao(Span::new(&src)).unwrap();
+        // let (input, ao) = parse_ao(Span::new(&src, false)).unwrap();
         // dbg!(&ao);
 
         // assert_eq!(ao.version, 2);
@@ -116,9 +107,6 @@ mod tests {
         let src = include_bytes!("../resources/gravestoneamuletheld.aoc");
         let src = read_string_from_utf16(src);
 
-        let (input, ao) = parse_ao(Span::new(&src)).unwrap();
-        dbg!(&ao);
-
         // assert_eq!(ao.version, 2);
         // assert_eq!(ao.is_abstract, false);
         // assert_eq!(ao.extends, Some("Metadata/Parent"));