From 121a2737885a7d99cbf1392921412871cd3767ea Mon Sep 17 00:00:00 2001
From: unspeaker <hora.nqma@protonmail.com>
Date: Tue, 29 Jul 2025 17:04:24 +0300
Subject: [PATCH] wip: 1e !

---
 crates/app/src/model.rs | 57 ++++++++++++++++++++++++-----------------
 deps/tengri             |  2 +-
 2 files changed, 35 insertions(+), 24 deletions(-)

diff --git a/crates/app/src/model.rs b/crates/app/src/model.rs
index 113ec3b4..f360bca5 100644
--- a/crates/app/src/model.rs
+++ b/crates/app/src/model.rs
@@ -335,29 +335,40 @@ pub struct Configuration {
 
 impl Configuration {
     pub fn from_path (path: &impl AsRef<Path>, _watch: bool) -> Usually<Self> {
-        let mut config = Self::default();
-        config.path = path.as_ref().into();
-        let mut dsl = read_and_leak(path.as_ref())?;
-        while let Some(mut exp) = dsl.exp_next()? {
-            match exp.exp_head()?.key()? {
-                Some("name") => match exp.text()? {
-                    Some(name) => config.name = Some(name.into()),
-                    _ => return Err(format!("missing name definition").into())
-                },
-                Some("info") => match exp.text()? {
-                    Some(info) => config.info = Some(info.into()),
-                    _ => return Err(format!("missing info definition").into())
-                },
-                Some("keys") => match exp.text()? {
-                    Some(keys) => config.keys = EventMap::from_dsl(keys)?,
-                    _ => return Err(format!("missing keys definition").into())
-                },
-                Some("view") => match exp.exp_tail()? {
-                    Some(tail) => config.view = tail.src().into(),
-                    _ => return Err(format!("missing view definition").into())
-                },
-                Some(k) => return Err(format!("(e3) unexpected key {k:?} in {exp:?}").into()),
-                None => return Err(format!("(e2) unexpected exp {exp:?}").into()),
+        let mut config = Self { path: path.as_ref().into(), ..Default::default() };
+        let mut dsl    = read_and_leak(path.as_ref())?;
+        let mut head   = dsl.head()?;
+        let mut tail   = dsl.tail()?;
+        loop {
+            if let Some(exp) = head.exp()? {
+                match exp.head()?.key()? {
+                    Some("name") => match exp.tail()?.text()? {
+                        Some(name) => config.name = Some(name.into()),
+                        _ => return Err(format!("missing name definition").into())
+                    },
+                    Some("info") => match exp.tail()?.text()? {
+                        Some(info) => config.info = Some(info.into()),
+                        _ => return Err(format!("missing info definition").into())
+                    },
+                    Some("keys") => match exp.tail()? {
+                        Some(keys) => config.keys = EventMap::from_dsl(&mut &keys)?,
+                        _ => return Err(format!("missing keys definition").into())
+                    },
+                    Some("view") => match exp.tail()? {
+                        Some(tail) => config.view = tail.src().into(),
+                        _ => return Err(format!("missing view definition").into())
+                    },
+                    Some(k) => return Err(format!("(e3) unexpected key {k:?} in {exp:?}").into()),
+                    None => return Err(format!("(e2) unexpected exp {exp:?}").into()),
+                }
+            } else {
+                break
+            }
+            if let Some(next) = tail {
+                head = next.head()?;
+                tail = next.tail()?;
+            } else {
+                break
             }
         }
         Ok(config)
diff --git a/deps/tengri b/deps/tengri
index 360b404b..16969aeb 160000
--- a/deps/tengri
+++ b/deps/tengri
@@ -1 +1 @@
-Subproject commit 360b404b69abb1ec4e0e9959667e08d4b99c6131
+Subproject commit 16969aeb64a61a6c9819e7533e435ee2d693dddd