[#36] Add UiParser

Orchaldir · Sep 10, 2023 · 6742df7 · 6742df7
1 parent cbc3b45
commit 6742df7
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 6 deletions.
diff --git a/macro_ui/src/lib.rs b/macro_ui/src/lib.rs
@@ -123,6 +123,14 @@ fn handle_struct(name: &Ident, fields: &FieldsNamed) -> TokenStream2 {
                 println!("{}Finish Viewer for struct {} with path '{}'!", spaces, stringify!(#name), visitor.get_path());
             }
         }
+
+        #[automatically_derived]
+        impl #name {
+            fn parse(parser: &dyn UiParser, path: &str, spaces: &str) -> #name {
+                println!("{}Parse struct {} with path '{}'", spaces, stringify!(#name), path);
+                #name::default()
+            }
+        }
     }
 }
 

diff --git a/rpg_tools_core/src/model/character/appearance/body.rs b/rpg_tools_core/src/model/character/appearance/body.rs
@@ -1,6 +1,6 @@
 use crate::model::character::appearance::skin::Skin;
 use crate::model::width::Width;
-use crate::ui::{UiVisitor, UI};
+use crate::ui::{UiParser, UiVisitor, UI};
 use macro_convert::Convert;
 use macro_ui::ui;
 use serde::{Deserialize, Serialize};

diff --git a/rpg_tools_core/src/model/character/appearance/hair/ponytail/mod.rs b/rpg_tools_core/src/model/character/appearance/hair/ponytail/mod.rs
@@ -3,15 +3,15 @@ use crate::model::character::appearance::hair::ponytail::position::PonytailPosit
 use crate::model::character::appearance::hair::ponytail::style::PonytailStyle;
 use crate::model::color::Color;
 use crate::model::length::Length;
-use crate::ui::{UiVisitor, UI};
+use crate::ui::{UiParser, UiVisitor, UI};
 use macro_ui::ui;
 use serde::{Deserialize, Serialize};
 
 pub mod position;
 pub mod style;
 
 /// How does the ponytail look like?
-#[derive(ui, Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)]
+#[derive(ui, Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
 pub struct Ponytail {
     pub position: PonytailPosition,
     pub style: PonytailStyle,

diff --git a/rpg_tools_core/src/model/character/appearance/head.rs b/rpg_tools_core/src/model/character/appearance/head.rs
@@ -3,7 +3,7 @@ use crate::model::character::appearance::eye::Eyes;
 use crate::model::character::appearance::hair::Hair;
 use crate::model::character::appearance::mouth::Mouth;
 use crate::model::character::appearance::skin::Skin;
-use crate::ui::{UiVisitor, UI};
+use crate::ui::{UiParser, UiVisitor, UI};
 use macro_convert::Convert;
 use macro_ui::ui;
 use serde::{Deserialize, Serialize};

diff --git a/rpg_tools_core/src/model/length.rs b/rpg_tools_core/src/model/length.rs
@@ -1,12 +1,12 @@
-use crate::ui::{UiVisitor, UI};
+use crate::ui::{UiParser, UiVisitor, UI};
 use macro_ui::ui;
 use serde::{Deserialize, Serialize};
 
 const METRE_FACTOR: f32 = 1000.0;
 const CENTIMETRE_FACTOR: f32 = 10.0;
 
 /// A length or distance. The internal unit is millimetre.
-#[derive(ui, Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)]
+#[derive(ui, Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
 pub struct Length {
     millimetre: u32,
 }

diff --git a/rpg_tools_core/src/ui/mod.rs b/rpg_tools_core/src/ui/mod.rs
@@ -23,3 +23,10 @@ pub trait UI {
     /// Create a viewer ui.
     fn create_viewer(visitor: &mut dyn UiVisitor, spaces: &str, in_tuple: bool);
 }
+
+pub trait UiParser {
+    fn enter(&self, name: &str) -> dyn UiParser;
+
+    /// Parse a string from a path.
+    fn get_str<'a>(&self, name: &str) -> &'a str;
+}