Sync commit

src/utils/protomap.rs

@@ -118,7 +118,9 @@ impl<'a, K, V, const STACK_COUNT: usize> ProtoMap<'a, K, V, STACK_COUNT> {
     }
 }
 
-impl<T, K, V> From<T> for ProtoMap<'_, K, V> where T: IntoIterator<Item = (K, V)> {
+impl<T, K, V, const STACK_COUNT: usize>
+From<T> for ProtoMap<'_, K, V, STACK_COUNT>
+where T: IntoIterator<Item = (K, V)> {
     fn from(value: T) -> Self {
         Self {
             entries: value.into_iter().map(|(k, v)| (k, Some(v))).collect(),
@@ -127,14 +129,17 @@ impl<T, K, V> From<T> for ProtoMap<'_, K, V> where T: IntoIterator<Item = (K, V)
     }
 }
 
-impl<Q: ?Sized, K, V> Index<&Q> for ProtoMap<'_, K, V> where K: Borrow<Q>, Q: Eq {
+impl<Q: ?Sized, K, V, const STACK_COUNT: usize>
+Index<&Q> for ProtoMap<'_, K, V, STACK_COUNT>
+where K: Borrow<Q>, Q: Eq {
     type Output = V;
     fn index(&self, index: &Q) -> &Self::Output {
         self.get(index).expect("Index not found in map")
     }
 }
 
-impl<K: Clone, V: Clone> Clone for ProtoMap<'_, K, V> {
+impl<K: Clone, V: Clone, const STACK_COUNT: usize>
+Clone for ProtoMap<'_, K, V, STACK_COUNT> {
     fn clone(&self) -> Self {
         Self {
             entries: self.entries.clone(),
@@ -143,8 +148,9 @@ impl<K: Clone, V: Clone> Clone for ProtoMap<'_, K, V> {
     }
 }
 
-impl<'a, K: 'a, V: 'a> Add<(K, V)> for &'a ProtoMap<'a, K, V> {
-    type Output = ProtoMap<'a, K, V>;
+impl<'a, K: 'a, V: 'a, const STACK_COUNT: usize>
+Add<(K, V)> for &'a ProtoMap<'a, K, V, STACK_COUNT> {
+    type Output = ProtoMap<'a, K, V, STACK_COUNT>;
     fn add(self, rhs: (K, V)) -> Self::Output {
         ProtoMap::from([rhs]).set_proto(self)
     }

src/utils/string_from_charset.rs

@@ -1,14 +1,14 @@
-fn string_from_charset_rec(val: usize, digits: &str) -> String {
-    let radix = digits.len();
+fn string_from_charset_rec(val: u64, digits: &str) -> String {
+    let radix = digits.len() as u64;
     let mut prefix = if val > radix {
         string_from_charset_rec(val / radix, digits)
     } else {String::new()};
-    prefix.push(digits.chars().nth(val - 1).unwrap_or_else(|| {
-        panic!("Overindexed digit set \"{}\" with {}", digits, val - 1)
-    }));
+    prefix.push(digits.chars().nth(val as usize - 1).unwrap_or_else(
+        || panic!("Overindexed digit set \"{}\" with {}", digits, val - 1)
+    ));
     prefix
 }
 
-pub fn string_from_charset(val: usize, digits: &str) -> String {
+pub fn string_from_charset(val: u64, digits: &str) -> String {
     string_from_charset_rec(val + 1, digits)
 }

src/utils/substack.rs

@@ -33,17 +33,21 @@ impl<'a, T: 'a> Stackframe<'a, T> {
             len: self.len + 1
         }
     }
-    pub fn opush(prev: &Option<Self>, item: T) -> Option<Self> {
-        Some(Self {
+    pub fn opush(prev: Option<&Self>, item: T) -> Self {
+        Self {
             item,
-            prev: prev.as_ref(),
+            prev,
             len: prev.map_or(1, |s| s.len)
-        })
+        }
     }
     pub fn len(&self) -> usize { self.len }
     pub fn pop(&self, count: usize) -> Option<&Self> {
         if count == 0 {Some(self)}
-        else {self.prev.and_then(|prev| prev.pop(count - 1))}
+        else {self.prev.expect("Index out of range").pop(count - 1)}
+    }
+    pub fn opop(cur: Option<&Self>, count: usize) -> Option<&Self> {
+        if count == 0 {cur}
+        else {Self::opop(cur.expect("Index out of range").prev, count - 1)}
     }
 }