Fixed a very nasty deadlock

orchid-std/src/macros/stdlib/option.rs

@@ -0,0 +1,56 @@
+use futures::StreamExt;
+use orchid_base::sym;
+use orchid_extension::atom::TAtom;
+use orchid_extension::conv::ToExpr;
+use orchid_extension::coroutine_exec::exec;
+use orchid_extension::expr::Expr;
+use orchid_extension::gen_expr::{call, sym_ref};
+use orchid_extension::tree::{GenMember, fun, prefix};
+
+use crate::macros::match_macros::MatcherAtom;
+use crate::macros::resolve::resolve;
+use crate::macros::utils::{build_macro, mactree, mactreev};
+use crate::{OrcOpt, Tpl};
+
+pub async fn gen_option_macro_lib() -> Vec<GenMember> {
+	prefix("std::option", [
+		fun(false, "is_some_body", |sub: TAtom<MatcherAtom>, val: OrcOpt<Expr>| {
+			exec(async move |mut h| {
+				let Some(sub_val) = val.0 else { return Ok(OrcOpt(None)) };
+				sub.run_matcher(&mut h, sub_val).await
+			})
+		}),
+		fun(
+			false,
+			"is_none_body",
+			async |val: OrcOpt<Expr>| {
+				if val.0.is_none() { OrcOpt(Some(Tpl(()))) } else { OrcOpt(None) }
+			},
+		),
+		build_macro(None, ["some", "none"])
+			.rule(mactreev!(pattern::match_rule ( std::option::some "...$" sub_pattern  0)), [
+				|[sub]: [_; _]| {
+					exec(async move |mut h| {
+						let sub = h
+							.exec::<TAtom<MatcherAtom>>(resolve(mactree!(pattern::match_rule "push" sub;)).await)
+							.await?;
+						Ok(MatcherAtom {
+							keys: sub.keys().collect().await,
+							matcher: h
+								.register(call(sym_ref(sym!(std::option::is_some_body)), [sub.to_gen().await]))
+								.await,
+						})
+					})
+				},
+			])
+			.rule(mactreev!(pattern::match_rule(std::option::none)), [|[]: [_; _]| {
+				exec(async |mut h| {
+					Ok(MatcherAtom {
+						keys: vec![],
+						matcher: h.register(sym_ref(sym!(std::option::is_none_body))).await,
+					})
+				})
+			}])
+			.finish(),
+	])
+}