Fixed a very nasty deadlock

orchid-std/src/std/std_system.rs

@@ -2,6 +2,7 @@ use std::rc::Rc;
 
 use futures::future::join_all;
 use orchid_api_derive::{Coding, Hierarchy};
+use orchid_base::interner::es;
 use orchid_base::name::Sym;
 use orchid_base::reqnot::{Receipt, ReqHandle, ReqHandleExt};
 use orchid_base::sym;
@@ -23,7 +24,7 @@ use crate::std::option::{OptAtom, gen_option_lib};
 use crate::std::protocol::proto_parser::{AsProtoParser, ProtoParser};
 use crate::std::protocol::type_parser::{AsTypeParser, TypeParser};
 use crate::std::protocol::types::{CreateTag, Tag, Tagged, gen_protocol_lib};
-use crate::std::record::record_atom::Record;
+use crate::std::record::record_atom::{CreateRecord, RecordAtom};
 use crate::std::record::record_lib::gen_record_lib;
 use crate::std::reflection::sym_atom::{CreateSymAtom, SymAtom, gen_sym_lib};
 use crate::std::string::str_lexer::StringLexer;
@@ -36,6 +37,7 @@ use crate::{Float, Int};
 pub enum StdReq {
 	CreateTag(CreateTag),
 	CreateTuple(CreateTuple),
+	CreateRecord(CreateRecord),
 	CreateSymAtom(CreateSymAtom),
 }
 
@@ -58,7 +60,7 @@ impl SystemCard for StdSystem {
 			Some(StrAtom::dynfo()),
 			Some(IntStrAtom::dynfo()),
 			Some(OptAtom::dynfo()),
-			Some(Record::dynfo()),
+			Some(RecordAtom::dynfo()),
 			Some(Tuple::dynfo()),
 			Some(TupleBuilder::dynfo()),
 			Some(Tag::dynfo()),
@@ -74,6 +76,14 @@ impl System for StdSystem {
 				let tk = tpl.to_expr().await.serialize().await;
 				xreq.reply(req, &tk).await.unwrap()
 			},
+			StdReq::CreateRecord(ref req @ CreateRecord(ref items)) => {
+				let values =
+					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;
+				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()
@@ -109,5 +119,7 @@ impl System for StdSystem {
 			gen_ops_lib(),
 		])
 	}
-	async fn prelude() -> Vec<Sym> { vec![sym!(std), sym!(std::tuple), sym!(std::option)] }
+	async fn prelude() -> Vec<Sym> {
+		vec![sym!(std), sym!(std::tuple), sym!(std::option), sym!(std::record)]
+	}
 }