Significantly extended stdlib

orchid-std/src/std/std_system.rs

@@ -9,6 +9,7 @@ use orchid_base::sym;
 use orchid_extension::atom::{AtomDynfo, AtomicFeatures};
 use orchid_extension::conv::ToExpr;
 use orchid_extension::expr::Expr;
+use orchid_extension::gen_expr::new_atom;
 use orchid_extension::lexer::LexerObj;
 use orchid_extension::parser::ParserObj;
 use orchid_extension::system::{System, SystemCard};
@@ -18,6 +19,10 @@ use orchid_extension::tree::{GenMember, merge_trivial};
 use super::number::num_lib::gen_num_lib;
 use super::string::str_atom::{IntStrAtom, StrAtom};
 use super::string::str_lib::gen_str_lib;
+use crate::std::binary::binary_atom::BlobAtom;
+use crate::std::binary::binary_lib::gen_binary_lib;
+use crate::std::boolean::gen_bool_lib;
+use crate::std::number::num_atom::{CreateFloat, CreateInt};
 use crate::std::number::num_lexer::NumLexer;
 use crate::std::ops::gen_ops_lib;
 use crate::std::ops::subscript_lexer::SubscriptLexer;
@@ -36,6 +41,8 @@ use crate::{Float, Int};
 #[extendable]
 #[allow(clippy::enum_variant_names, reason = "For the time being there are only ctor calls")]
 pub enum StdReq {
+	CreateInt(CreateInt),
+	CreateFloat(CreateFloat),
 	CreateTag(CreateTag),
 	CreateTuple(CreateTuple),
 	CreateRecord(CreateRecord),
@@ -56,6 +63,7 @@ impl SystemCard for StdSystem {
 	type Req = StdReq;
 	fn atoms() -> impl IntoIterator<Item = Option<Box<dyn AtomDynfo>>> {
 		[
+			Some(BlobAtom::dynfo()),
 			Some(Int::dynfo()),
 			Some(Float::dynfo()),
 			Some(StrAtom::dynfo()),
@@ -72,9 +80,13 @@ impl SystemCard for StdSystem {
 impl System for StdSystem {
 	async fn request<'a>(xreq: Box<dyn ReqHandle<'a> + 'a>, req: Self::Req) -> Receipt<'a> {
 		match req {
+			StdReq::CreateInt(ref req @ CreateInt(int)) =>
+				xreq.reply(req, &new_atom(int).to_expr().await.serialize().await).await.unwrap(),
+			StdReq::CreateFloat(ref req @ CreateFloat(float)) =>
+				xreq.reply(req, &new_atom(float).to_expr().await.serialize().await).await.unwrap(),
 			StdReq::CreateTuple(ref req @ CreateTuple(ref items)) => {
 				let tpl = Tuple(Rc::new(join_all(items.iter().copied().map(Expr::deserialize)).await));
-				let tk = tpl.to_expr().await.serialize().await;
+				let tk = new_atom(tpl).to_expr().await.serialize().await;
 				xreq.reply(req, &tk).await.unwrap()
 			},
 			StdReq::CreateRecord(ref req @ CreateRecord(ref items)) => {
@@ -82,12 +94,12 @@ impl System for StdSystem {
 					join_all(items.iter().map(async |(k, v)| (es(*k).await, Expr::deserialize(*v).await)))
 						.await;
 				let rec = RecordAtom(Rc::new(values.into_iter().collect()));
-				let tk = rec.to_expr().await.serialize().await;
+				let tk = new_atom(rec).to_expr().await.serialize().await;
 				xreq.reply(req, &tk).await.unwrap()
 			},
 			StdReq::CreateSymAtom(ref req @ CreateSymAtom(sym_tok)) => {
 				let sym_atom = SymAtom(Sym::from_api(sym_tok).await);
-				xreq.reply(req, &sym_atom.to_expr().await.serialize().await).await.unwrap()
+				xreq.reply(req, &new_atom(sym_atom).to_expr().await.serialize().await).await.unwrap()
 			},
 			StdReq::CreateTag(ref req @ CreateTag { name, ref impls }) => {
 				let tag_atom = Tag {
@@ -102,7 +114,7 @@ impl System for StdSystem {
 						.collect(),
 					),
 				};
-				xreq.reply(req, &tag_atom.to_expr().await.serialize().await).await.unwrap()
+				xreq.reply(req, &new_atom(tag_atom).to_expr().await.serialize().await).await.unwrap()
 			},
 		}
 	}
@@ -110,6 +122,7 @@ impl System for StdSystem {
 	fn parsers() -> Vec<ParserObj> { vec![&AsTypeParser, &TypeParser, &AsProtoParser, &ProtoParser] }
 	async fn env() -> Vec<GenMember> {
 		merge_trivial([
+			gen_bool_lib(),
 			gen_num_lib(),
 			gen_str_lib(),
 			gen_option_lib(),
@@ -118,9 +131,10 @@ impl System for StdSystem {
 			gen_protocol_lib(),
 			gen_sym_lib().await,
 			gen_ops_lib(),
+			gen_binary_lib(),
 		])
 	}
 	async fn prelude() -> Vec<Sym> {
-		vec![sym!(std), sym!(std::tuple), sym!(std::option), sym!(std::record)]
+		vec![sym!(std), sym!(std::tuple), sym!(std::option), sym!(std::record), sym!(std::string)]
 	}
 }