introduce bespoke Heap type for in-heap partial strings

build/static_string_indexing.rs

@@ -84,6 +84,18 @@ impl<'ast> Visit<'ast> for StaticStrVisitor {
     }
 }
 
+const INLINED_ATOM_MAX_LEN: usize = 6;
+
+fn static_string_index(string: &str, index: usize) -> u64 {
+    if 0 < string.len() && string.len() <= INLINED_ATOM_MAX_LEN {
+        let mut string_buf: [u8; 8] = [0u8; 8];
+        string_buf[.. string.len()].copy_from_slice(string.as_bytes());
+        (u64::from_le_bytes(string_buf) << 1) | 1
+    } else {
+        (index << 1) as u64
+    }
+}
+
 pub fn index_static_strings(instruction_rs_path: &std::path::Path) -> TokenStream {
     use quote::*;
 
@@ -149,11 +161,26 @@ pub fn index_static_strings(instruction_rs_path: &std::path::Path) -> TokenStrea
         visitor.visit_file(&syntax)
     }
 
-    let indices = (0..visitor.static_strs.len()).map(|i| (i << 3) as u64);
-    let indices_iter = indices.clone();
+    let mut static_str_keys = vec![];
+    let mut static_strs = vec![];
+    let mut static_str_indices = vec![];
 
-    let static_strs_len = visitor.static_strs.len();
-    let static_strs: &Vec<_> = &visitor.static_strs.into_iter().collect();
+    let indices: Vec<u64> = visitor.static_strs.iter().map(|string| {
+        let index = static_string_index(string, static_strs.len());
+
+        static_str_keys.push(string);
+
+        if index & 1 == 1 {
+            index
+        } else {
+            static_str_indices.push(index);
+            static_strs.push(string);
+            index
+        }
+    }).collect();
+
+    let static_strs_len = static_strs.len(); // visitor.static_strs.len();
+    //let static_strs: &Vec<_> = &visitor.static_strs.into_iter().collect();
 
     quote! {
         static STRINGS: [&str; #static_strs_len] = [
@@ -163,11 +190,11 @@ pub fn index_static_strings(instruction_rs_path: &std::path::Path) -> TokenStrea
         ];
 
         macro_rules! atom {
-            #((#static_strs) => { Atom { index: #indices_iter } };)*
+            #((#static_str_keys) => { Atom { index: #indices } };)*
         }
 
         pub static STATIC_ATOMS_MAP: phf::Map<&'static str, Atom> = phf::phf_map! {
-            #(#static_strs => { Atom { index: #indices } },)*
+            #(#static_strs => { Atom { index: #static_str_indices } },)*
         };
     }
 }