New macro system and stdlib additions

orchid-base/src/format.rs

@@ -7,7 +7,7 @@ use std::rc::Rc;
 use std::str::FromStr;
 
 use futures::future::join_all;
-use itertools::Itertools;
+use itertools::{Itertools, chain};
 use never::Never;
 use regex::Regex;
 
@@ -47,12 +47,14 @@ impl FmtUnit {
 		}
 	}
 	pub fn sequence(
+		head: &str,
 		delim: &str,
+		tail: &str,
 		seq_bnd: Option<bool>,
 		seq: impl IntoIterator<Item = FmtUnit>,
 	) -> Self {
 		let items = seq.into_iter().collect_vec();
-		FmtUnit::new(Variants::sequence(items.len(), delim, seq_bnd), items)
+		Variants::default().sequence(items.len(), head, delim, tail, seq_bnd).units_own(items)
 	}
 }
 impl<T> From<T> for FmtUnit
@@ -110,8 +112,29 @@ pub struct Variant {
 
 #[test]
 fn variants_parse_test() {
-	let vars = Variants::default().bounded("({0})");
-	println!("final: {vars:?}")
+	let vars = Rc::new(Variants::default().bounded("({{{0}}})"));
+	let expected_vars = Rc::new(Variants(vec![Variant {
+		bounded: true,
+		elements: vec![
+			FmtElement::String(Rc::new("({".to_string())),
+			FmtElement::Sub { bounded: Some(false), slot: 0 },
+			FmtElement::String(Rc::new("})".to_string())),
+		],
+	}]));
+	assert_eq!(vars.as_ref(), expected_vars.as_ref());
+	let unit = vars.units(["1".into()]);
+	assert_eq!(unit, FmtUnit {
+		subs: vec![FmtUnit {
+			subs: vec![],
+			variants: Rc::new(Variants(vec![Variant {
+				bounded: true,
+				elements: vec![FmtElement::String(Rc::new("1".to_string()))]
+			}]))
+		}],
+		variants: expected_vars
+	});
+	let str = take_first(&unit, true);
+	assert_eq!(str, "({1})");
 }
 
 /// Represents a collection of formatting strings for the same set of parameters
@@ -208,12 +231,27 @@ impl Variants {
 		self.add(false, s);
 		self
 	}
-	pub fn sequence(len: usize, delim: &str, seq_bnd: Option<bool>) -> Rc<Self> {
-		let seq = Itertools::intersperse(
-			FmtElement::sequence(len, seq_bnd).into_iter(),
-			FmtElement::str(delim),
+	pub fn sequence(
+		mut self,
+		len: usize,
+		head: &str,
+		delim: &str,
+		tail: &str,
+		seq_bnd: Option<bool>,
+	) -> Self {
+		let seq = chain!(
+			[FmtElement::str(head)],
+			Itertools::intersperse(
+				FmtElement::sequence(len, seq_bnd).into_iter(),
+				FmtElement::str(delim),
+			),
+			[FmtElement::str(tail)],
 		);
-		Rc::new(Variants(vec![Variant { bounded: true, elements: seq.collect_vec() }]))
+		self.0.push(Variant { bounded: true, elements: seq.collect_vec() });
+		self
+	}
+	pub fn units_own(self, subs: impl IntoIterator<Item = FmtUnit>) -> FmtUnit {
+		FmtUnit::new(Rc::new(self), subs)
 	}
 	pub fn units(self: &Rc<Self>, subs: impl IntoIterator<Item = FmtUnit>) -> FmtUnit {
 		FmtUnit::new(self.clone(), subs)