Protocols and operators mostly

orchid-std/src/macros/macro_lib.rs

@@ -14,17 +14,36 @@ use crate::{HomoTpl, UntypedTuple};
 pub async fn gen_macro_lib() -> Vec<GenMember> {
 	prefix("macros", [
 		fun(true, "resolve", async |tpl: TAtom<MacTree>| resolve(own(&tpl).await).await),
-		// TODO test whether any of this worked
 		prefix("common", [
 			build_macro(None, ["..", "_"]).finish(),
 			build_macro(Some(1), ["+"])
-				.rule(mactreev!("...$" lhs 0 macros::common::+ "...$" rhs 1), [async |[lhs, rhs]| {
-					call(sym_ref(sym!(std::number::add)), [resolve(lhs).await, resolve(rhs).await])
+				.rule(mactreev!("...$" lhs 1 macros::common::+ "...$" rhs 0), [async |[lhs, rhs]| {
+					call(sym_ref(sym!(std::ops::add::resolve)), [resolve(lhs).await, resolve(rhs).await])
+				}])
+				.finish(),
+			build_macro(Some(1), ["-"])
+				.rule(mactreev!("...$" lhs 1 macros::common::- "...$" rhs 0), [async |[lhs, rhs]| {
+					call(sym_ref(sym!(std::ops::sub::resolve)), [resolve(lhs).await, resolve(rhs).await])
 				}])
 				.finish(),
 			build_macro(Some(2), ["*"])
-				.rule(mactreev!("...$" lhs 0 macros::common::* "...$" rhs 1), [async |[lhs, rhs]| {
-					call(sym_ref(sym!(std::number::mul)), [resolve(lhs).await, resolve(rhs).await])
+				.rule(mactreev!("...$" lhs 1 macros::common::* "...$" rhs 0), [async |[lhs, rhs]| {
+					call(sym_ref(sym!(std::ops::mul::resolve)), [resolve(lhs).await, resolve(rhs).await])
+				}])
+				.finish(),
+			build_macro(Some(2), ["/"])
+				.rule(mactreev!("...$" lhs 1 macros::common::/ "...$" rhs 0), [async |[lhs, rhs]| {
+					call(sym_ref(sym!(std::ops::div::resolve)), [resolve(lhs).await, resolve(rhs).await])
+				}])
+				.finish(),
+			build_macro(Some(2), ["%"])
+				.rule(mactreev!("...$" lhs 1 macros::common::% "...$" rhs 0), [async |[lhs, rhs]| {
+					call(sym_ref(sym!(std::ops::mod::resolve)), [resolve(lhs).await, resolve(rhs).await])
+				}])
+				.finish(),
+			build_macro(Some(10), ["."])
+				.rule(mactreev!("...$" lhs 1 macros::common::. "...$" rhs 0), [async |[lhs, rhs]| {
+					call(sym_ref(sym!(std::ops::get::resolve)), [resolve(lhs).await, resolve(rhs).await])
 				}])
 				.finish(),
 			build_macro(None, ["comma_list", ","])

orchid-std/src/macros/rule/build.rs

@@ -123,12 +123,13 @@ async fn mk_scalar(pattern: &MacTree) -> OrcRes<ScalMatcher> {
 			PhKind::Scalar => ScalMatcher::Placeh { key: name.clone() },
 		},
 		MacTok::S(c, body) => ScalMatcher::S(*c, Box::new(mk_any(&body.items).boxed_local().await?)),
-		MacTok::Lambda(..) =>
+		MacTok::Lambda(..) => {
 			return Err(mk_errv(
 				is("Lambda in matcher").await,
 				"Lambdas can't be matched for, only generated in templates",
 				[pattern.pos()],
-			)),
+			));
+		},
 		MacTok::Value(_) | MacTok::Slot => panic!("Only used for templating"),
 		MacTok::Bottom(errv) => return Err(errv.clone()),
 	})

orchid-std/src/macros/std_macros.rs

@@ -95,6 +95,30 @@ pub async fn gen_std_macro_lib() -> Vec<GenMember> {
 				.finish(),
 			fun(false, "matcher_body", tuple_matcher_body),
 		]),
+		prefix("record", [
+			build_macro(None, ["r"])
+			.rule(mactreev!(std::record::r[ "...$" elements 0 ]), [async |[elements]: [_;_]| {
+				exec(async move |mut h| {
+					let tup = h
+						.exec::<HomoTpl<TAtom<MacTree>>>(call(sym_ref(sym!(macros::resolve)), [
+							mactree!((macros::common::comma_list "push" elements ;)).to_gen().await,
+						]))
+						.await?;
+					let val = stream::iter(&tup.0[..])
+						.fold(sym_ref(sym!(std::tuple::empty)), async |head, new| {
+							call(sym_ref(sym!(std::tuple::cat)), [
+								head,
+								call(sym_ref(sym!(std::tuple::one)), [call(
+									sym_ref(sym!(macros::resolve)),
+									[new.clone().to_gen().await],
+								)]),
+							])
+						})
+						.await;
+					Ok(val)
+				}).await
+			}]).finish(),
+		])
 	])
 }