bug fixes and performance improvements

src/utils/mod.rs

@@ -1,87 +1,26 @@
 mod cache;
 pub mod translate;
 mod replace_first;
-mod interned_display;
-pub use interned_display::InternedDisplay;
-// mod visitor;
+// mod interned_display;
+// mod interner;
+mod variant;
+mod print_nname;
+mod pushed;
+pub use pushed::pushed;
+pub use print_nname::{print_nname_seq, print_nname};
+// pub use interner::*;
+// pub use interned_display::InternedDisplay;
 pub use replace_first::replace_first;
 pub use cache::Cache;
 mod substack;
-pub use substack::Stackframe;
+pub use substack::{Stackframe, Substack, SubstackIterator};
 mod side;
 pub use side::Side;
 mod unwrap_or;
 pub mod iter;
 pub use iter::BoxedIter;
-mod bfs;
 mod string_from_charset;
 pub use string_from_charset::string_from_charset;
 mod xloop;
 mod protomap;
-pub use protomap::ProtoMap;
-mod product2;
-pub use product2::Product2;
-
-use mappable_rc::Mrc;
-
-pub fn mrc_derive<T: ?Sized, P, U: ?Sized>(m: &Mrc<T>, p: P) -> Mrc<U>
-where P: for<'a> FnOnce(&'a T) -> &'a U {
-  Mrc::map(Mrc::clone(m), p)
-}
-
-pub fn mrc_try_derive<T: ?Sized, P, U: ?Sized>(m: &Mrc<T>, p: P) -> Option<Mrc<U>>
-where P: for<'a> FnOnce(&'a T) -> Option<&'a U> {
-  Mrc::try_map(Mrc::clone(m), p).ok()
-}
-
-pub fn mrc_empty_slice<T>() -> Mrc<[T]> {
-  mrc_derive_slice(&Mrc::new(Vec::new()))
-}
-
-pub fn to_mrc_slice<T>(v: Vec<T>) -> Mrc<[T]> {
-  Mrc::map(Mrc::new(v), |v| v.as_slice())
-}
-
-pub fn collect_to_mrc<I>(iter: I) -> Mrc<[I::Item]> where I: Iterator {
-  to_mrc_slice(iter.collect())
-}
-
-pub fn mrc_derive_slice<T>(mv: &Mrc<Vec<T>>) -> Mrc<[T]> {
-  mrc_derive(mv, |v| v.as_slice())
-}
-
-pub fn one_mrc_slice<T>(t: T) -> Mrc<[T]> {
-  Mrc::map(Mrc::new([t; 1]), |v| v.as_slice())
-}
-
-pub fn mrc_to_iter<T>(ms: Mrc<[T]>) -> impl Iterator<Item = Mrc<T>> {
-  let mut i = 0;
-  std::iter::from_fn(move || if i < ms.len() {
-    let out = Some(mrc_derive(&ms, |s| &s[i]));
-    i += 1;
-    out
-  } else {None})
-}
-
-pub fn mrc_unnest<T>(m: &Mrc<Mrc<T>>) -> Mrc<T> {
-  Mrc::clone(m.as_ref())
-}
-
-pub fn mrc_slice_to_only<T>(m: Mrc<[T]>) -> Result<Mrc<T>, ()> {
-  Mrc::try_map(m, |slice| {
-    if slice.len() != 1 {None}
-    else {Some(&slice[0])}
-  }).map_err(|_| ())
-}
-
-pub fn mrc_slice_to_only_option<T>(m: Mrc<[T]>) -> Result<Option<Mrc<T>>, ()> {
-  if m.len() > 1 {return Err(())}
-  Ok(Mrc::try_map(m, |slice| {
-    if slice.len() == 0 {None}
-    else {Some(&slice[0])}
-  }).ok())
-}
-
-pub fn mrc_concat<T: Clone>(a: &Mrc<[T]>, b: &Mrc<[T]>) -> Mrc<[T]> {
-  collect_to_mrc(a.iter().chain(b.iter()).cloned())
-}
+pub use protomap::ProtoMap;