(draft) Defer atomization to AstBuilder, and use SourceSliceIndex for string literal and property name

crates/ast/ast.json

@@ -210,7 +210,7 @@
       "unicode": "bool"
     },
     "LiteralStringExpression": {
-      "value": "SourceAtomSetIndex"
+      "value": "SourceSliceIndex"
     },
     "ArrayExpression": "ArrayExpression",
     "ArrowExpression": {
@@ -602,7 +602,7 @@
   },
   "StaticPropertyName": {
     "_type": "struct",
-    "value": "SourceAtomSetIndex"
+    "value": "SourceSliceIndex"
   },
   "NumericLiteral": {
     "_type": "struct",

crates/ast/generate_ast.py

@@ -55,7 +55,7 @@ def to_rust_type(self, ast):
         if self.name in RUST_BUILTIN_TYPES:
             return self.name
         if self.name == 'Token':
-            return "Token"
+            return "Token<'alloc>"
         if self.name in ast.type_decls and ast.type_decls[self.name].has_lifetime:
             return "{}<'alloc>".format(self.name)
         return self.name
@@ -429,7 +429,6 @@ def emit_variant_none_call(indent, enum_name, variant_name):
         write(0, "#![allow(dead_code)]")
         write(0, "")
         write(0, "use crate::arena;")
-        write(0, "use crate::source_atom_set::SourceAtomSetIndex;")
         write(0, "use crate::source_slice_list::SourceSliceIndex;")
         write(0, "use crate::types::*;")
         write(0, "")

crates/ast/src/source_atom_set.rs

@@ -111,7 +111,6 @@ macro_rules! for_all_common_atoms {
             ("while", while_, While),
             ("with", with, With),
             ("yield", yield_, Yield),
-            ("use strict", use_strict, UseStrict),
             ("__proto__", __proto__, Proto),
         );
     }

crates/emitter/src/ast_emitter.rs

@@ -453,7 +453,7 @@ impl<'alloc, 'opt> AstEmitter<'alloc, 'opt> {
             }
 
             Expression::LiteralStringExpression { value, .. } => {
-                let str_index = self.emit.get_atom_gcthing_index(*value);
+                let str_index = self.emit.get_slice_gcthing_index(*value);
                 self.emit.string(str_index);
             }
 

crates/emitter/src/emitter.rs

@@ -6,6 +6,7 @@
 #![allow(dead_code)]
 
 use ast::source_atom_set::SourceAtomSetIndex;
+use ast::source_slice_list::SourceSliceIndex;
 use byteorder::{ByteOrder, LittleEndian};
 use std::cmp;
 use std::collections::HashMap;
@@ -1384,6 +1385,10 @@ impl InstructionWriter {
         }
     }
 
+    pub fn get_slice_gcthing_index(&mut self, slice: SourceSliceIndex) -> GCThingIndex {
+        self.gcthings.push_slice(slice)
+    }
+
     pub fn get_function_gcthing_index(&mut self, fun_index: ScriptStencilIndex) -> GCThingIndex {
         self.gcthings.push_function(fun_index)
     }

crates/emitter/src/object_emitter.rs

@@ -1,6 +1,6 @@
 use crate::ast_emitter::AstEmitter;
 use crate::emitter::EmitError;
-use ast::source_atom_set::SourceAtomSetIndex;
+use ast::source_slice_list::SourceSliceIndex;
 
 /// Struct for emitting bytecode for a property where its name is string.
 ///
@@ -12,7 +12,7 @@ where
     F: Fn(&mut AstEmitter) -> Result<(), EmitError>,
 {
     pub state: &'a mut ObjectEmitterState,
-    pub key: SourceAtomSetIndex,
+    pub key: SourceSliceIndex,
     pub value: F,
 }
 
@@ -34,7 +34,7 @@ where
                 //      [stack] OBJ
             }
             None => {
-                let name_index = emitter.emit.get_atom_gcthing_index(self.key);
+                let name_index = emitter.emit.get_slice_gcthing_index(self.key);
 
                 (self.value)(emitter)?;
                 //      [stack] OBJ VALUE
@@ -46,12 +46,8 @@ where
         Ok(())
     }
 
-    fn to_property_index(
-        &self,
-        emitter: &mut AstEmitter,
-        index: SourceAtomSetIndex,
-    ) -> Option<u32> {
-        let s = emitter.compilation_info.atoms.get(index);
+    fn to_property_index(&self, emitter: &mut AstEmitter, index: SourceSliceIndex) -> Option<u32> {
+        let s = emitter.compilation_info.slices.get(index);
         s.parse::<u32>().ok()
     }
 }