New macro system and stdlib additions

orchid-std/src/std/string/str_atom.rs

@@ -11,9 +11,11 @@ use orchid_base::format::{FmtCtx, FmtUnit};
 use orchid_base::interner::Tok;
 use orchid_extension::atom::{AtomMethod, Atomic, MethodSetBuilder, Supports, TAtom};
 use orchid_extension::atom_owned::{DeserializeCtx, OwnedAtom, OwnedVariant};
+use orchid_extension::context::i;
 use orchid_extension::conv::TryFromExpr;
 use orchid_extension::expr::Expr;
-use orchid_extension::system::SysCtx;
+
+use crate::std::string::to_string::ToStringMethod;
 
 #[derive(Copy, Clone, Debug, Coding)]
 pub struct StringGetVal;
@@ -24,8 +26,11 @@ impl AtomMethod for StringGetVal {
 	const NAME: &str = "std::string_get_val";
 }
 impl Supports<StringGetVal> for StrAtom {
-	async fn handle(&self, _: SysCtx, _: StringGetVal) -> <StringGetVal as Request>::Response {
-		self.0.clone()
+	async fn handle(&self, _: StringGetVal) -> <StringGetVal as Request>::Response { self.0.clone() }
+}
+impl Supports<ToStringMethod> for StrAtom {
+	async fn handle(&self, _: ToStringMethod) -> <ToStringMethod as Request>::Response {
+		self.0.as_str().to_string()
 	}
 }
 
@@ -46,7 +51,7 @@ impl Deref for StrAtom {
 impl OwnedAtom for StrAtom {
 	type Refs = ();
 	async fn val(&self) -> Cow<'_, Self::Data> { Cow::Owned(()) }
-	async fn serialize(&self, _: SysCtx, sink: Pin<&mut (impl AsyncWrite + ?Sized)>) -> Self::Refs {
+	async fn serialize(&self, sink: Pin<&mut (impl AsyncWrite + ?Sized)>) -> Self::Refs {
 		self.deref().encode(sink).await
 	}
 	async fn print_atom<'a>(&'a self, _: &'a (impl FmtCtx + ?Sized + 'a)) -> FmtUnit {
@@ -58,7 +63,7 @@ impl OwnedAtom for StrAtom {
 }
 
 #[derive(Debug, Clone)]
-pub struct IntStrAtom(Tok<String>);
+pub struct IntStrAtom(pub(crate) Tok<String>);
 impl Atomic for IntStrAtom {
 	type Variant = OwnedVariant;
 	type Data = orchid_api::TStr;
@@ -72,19 +77,28 @@ impl OwnedAtom for IntStrAtom {
 	async fn print_atom<'a>(&'a self, _: &'a (impl FmtCtx + ?Sized + 'a)) -> FmtUnit {
 		format!("{:?}i", *self.0).into()
 	}
-	async fn serialize(&self, _: SysCtx, write: Pin<&mut (impl AsyncWrite + ?Sized)>) {
+	async fn serialize(&self, write: Pin<&mut (impl AsyncWrite + ?Sized)>) {
 		self.0.encode(write).await
 	}
-	async fn deserialize(mut ctx: impl DeserializeCtx, _: ()) -> Self {
-		let s = ctx.decode::<String>().await;
-		Self(ctx.sys().i().i(&s).await)
+	async fn deserialize(mut dctx: impl DeserializeCtx, _: ()) -> Self {
+		let s = dctx.decode::<String>().await;
+		Self(i().i(&s).await)
+	}
+}
+impl TryFromExpr for IntStrAtom {
+	async fn try_from_expr(expr: Expr) -> OrcRes<Self> {
+		Ok(IntStrAtom(i().ex(TAtom::<IntStrAtom>::try_from_expr(expr).await?.value).await))
+	}
+}
+impl Supports<ToStringMethod> for IntStrAtom {
+	async fn handle(&self, _: ToStringMethod) -> <ToStringMethod as Request>::Response {
+		self.0.as_str().to_string()
 	}
 }
 
 #[derive(Clone)]
 pub struct OrcString {
 	kind: OrcStringKind,
-	ctx: SysCtx,
 }
 
 #[derive(Clone)]
@@ -95,7 +109,7 @@ pub enum OrcStringKind {
 impl OrcString {
 	pub async fn get_string(&self) -> Rc<String> {
 		match &self.kind {
-			OrcStringKind::Int(tok) => self.ctx.i().ex(**tok).await.rc(),
+			OrcStringKind::Int(tok) => i().ex(**tok).await.rc(),
 			OrcStringKind::Val(atom) => atom.request(StringGetVal).await,
 		}
 	}
@@ -104,12 +118,11 @@ impl OrcString {
 impl TryFromExpr for OrcString {
 	async fn try_from_expr(expr: Expr) -> OrcRes<OrcString> {
 		if let Ok(v) = TAtom::<StrAtom>::try_from_expr(expr.clone()).await {
-			return Ok(OrcString { ctx: expr.ctx(), kind: OrcStringKind::Val(v) });
+			return Ok(OrcString { kind: OrcStringKind::Val(v) });
 		}
-		let ctx = expr.ctx();
 		match TAtom::<IntStrAtom>::try_from_expr(expr).await {
-			Ok(t) => Ok(OrcString { ctx: t.untyped.ctx().clone(), kind: OrcStringKind::Int(t) }),
-			Err(e) => Err(mk_errv(ctx.i().i("A string was expected").await, "", e.pos_iter())),
+			Ok(t) => Ok(OrcString { kind: OrcStringKind::Int(t) }),
+			Err(e) => Err(mk_errv(i().i("A string was expected").await, "", e.pos_iter())),
 		}
 	}
 }