osui-rs/osui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

removed unecesary params

Browse Source
This commit is contained in:
selimaj-dev
2024-10-18 18:46:28 +02:00
parent 83b9a66515
commit 08ef8b59db
4 changed files with 29 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/macros.rs
+13 -7
View File
@@ -74,7 +74,7 @@ macro_rules! __oml {
macro_rules! oml {
// Props (P)
($tag:ident ($($k:ident = $v:expr),*)) => {{
let mut c = $tag(osui::Params { children: Vec::new(), expr: String::new() });
let mut c = $tag();
$(
c.$k = $v;
)*
@@ -83,7 +83,9 @@ macro_rules! oml {
// Expression, With components (EC)
( $tag:ident ($expr:expr; $($k:ident = $v:expr),* ) {$($inner:tt)*} ) => {{
let mut c = $tag(osui::Params { children: osui::__oml!($($inner)*), expr: String::from($expr) });
let mut c = $tag();
c.children = osui::__oml!($($inner)*);
c.params = String::from($expr);
$(
c.$k = $v;
)*
@@ -92,7 +94,8 @@ macro_rules! oml {
// Expression (E)
( $tag:ident ($expr:expr; $($k:ident = $v:expr),*) ) => {{
let mut c = $tag(osui::Params { children: Vec::new(), expr: String::from($expr) });
let mut c = $tag();
c.expr = String::from($expr);
$(
c.$k = $v;
)*
@@ -100,13 +103,16 @@ macro_rules! oml {
}};
// Components (C)
( $tag:ident {$($inner:tt)*} ) => {
$tag(osui::Params { children: osui::__oml!($($inner)*), expr: String::new() })
};
( $tag:ident {$($inner:tt)*} ) => {{
let mut c = $tag();
c.children = osui::__oml!($($inner)*);
c
}};
// Props, With components (PC)
( $tag:ident ($($k:ident = $v:expr),*) {$($inner:tt)*} ) => {{
let mut c = $tag(osui::Params { children: osui::__oml!($($inner)*), expr: String::new() });
let mut c = $tag();
c.children = osui::__oml!($($inner)*);
$(
c.$k = $v;
)*