implement import & scopedImport (WIP, ResolvePath resolves to string)

fix-codegen/src/disassembler.rs

@@ -98,7 +98,11 @@ impl<'a, Ctx: DisassemblerContext> Disassembler<'a, Ctx> {
                 self.read_u32();
             }
             Builtins => {}
-            ReplBinding | ScopedImportBinding => {
+            ReplBinding => {
+                self.read_u32();
+            }
+            ScopedImportBinding => {
+                self.read_u32();
                 self.read_u32();
             }
         }
@@ -420,7 +424,11 @@ impl<'a, Ctx: DisassemblerContext> Disassembler<'a, Ctx> {
                 ("ConcatStrings", format!("count={} force={}", count, force))
             }
             Op::CoerceToString => ("CoerceToString", String::new()),
-            Op::ResolvePath => ("ResolvePath", String::new()),
+            Op::ResolvePath => {
+                let dir_id = self.read_u32();
+                let dir = self.ctx.resolve_string(dir_id);
+                ("ResolvePath", format!("dir={:?}", dir))
+            }
             Op::Assert => {
                 let raw_idx = self.read_u32();
                 let span_id = self.read_u32();
@@ -447,9 +455,10 @@ impl<'a, Ctx: DisassemblerContext> Disassembler<'a, Ctx> {
                 ("LoadReplBinding", format!("{:?}", name))
             }
             Op::LoadScopedBinding => {
+                let slot = self.read_u32();
                 let idx = self.read_u32();
                 let name = self.ctx.resolve_string(idx);
-                ("LoadScopedBinding", format!("{:?}", name))
+                ("LoadScopedBinding", format!("slot={} {:?}", slot, name))
             }
             Op::Return => ("Return", String::new()),
             Op::Illegal => ("Illegal", String::new()),

fix-codegen/src/lib.rs

@@ -16,6 +16,8 @@ pub trait BytecodeContext {
     fn get_code(&self) -> &[u8];
     fn get_code_mut(&mut self) -> &mut Vec<u8>;
     fn add_constant(&mut self, val: Const) -> u32;
+    fn current_source_dir(&mut self) -> StringId;
+    fn current_scope_slot(&self) -> Option<u32>;
 }
 
 #[repr(u8)]
@@ -232,6 +234,11 @@ impl<'a, Ctx: BytecodeContext> BytecodeEmitter<'a, Ctx> {
             }
             ScopedImportBinding(id) => {
                 self.emit_u8(OperandType::ScopedImportBinding as u8);
+                let slot = self
+                    .ctx
+                    .current_scope_slot()
+                    .expect("ScopedImportBinding outside scoped compilation");
+                self.emit_u32(slot);
                 self.emit_str_id(id);
             }
         }
@@ -423,6 +430,8 @@ impl<'a, Ctx: BytecodeContext> BytecodeEmitter<'a, Ctx> {
             &Ir::Path(p) => {
                 self.emit_expr(p);
                 self.emit_op(Op::ResolvePath);
+                let dir_id = self.ctx.current_source_dir();
+                self.emit_str_id(dir_id);
             }
             &Ir::If { cond, consq, alter } => {
                 self.emit_expr(cond);
@@ -548,6 +557,11 @@ impl<'a, Ctx: BytecodeContext> BytecodeEmitter<'a, Ctx> {
             }
             &Ir::ScopedImportBinding(name) => {
                 self.emit_op(Op::LoadScopedBinding);
+                let slot = self
+                    .ctx
+                    .current_scope_slot()
+                    .expect("ScopedImportBinding outside scoped compilation");
+                self.emit_u32(slot);
                 self.emit_str_id(name);
             }
             Ir::WithLookup { sym, namespaces } => {
@@ -592,6 +606,8 @@ impl<'a, Ctx: BytecodeContext> BytecodeEmitter<'a, Ctx> {
                         self.emit_op(Op::PushString);
                         self.emit_str_id(id);
                         self.emit_op(Op::ResolvePath);
+                        let dir_id = self.ctx.current_source_dir();
+                        self.emit_str_id(dir_id);
                     }
                     Thunk(id) => {
                         let (layer, local) = self.resolve_thunk(id);
@@ -615,6 +631,11 @@ impl<'a, Ctx: BytecodeContext> BytecodeEmitter<'a, Ctx> {
                     }
                     ScopedImportBinding(name) => {
                         self.emit_op(Op::LoadScopedBinding);
+                        let slot = self
+                            .ctx
+                            .current_scope_slot()
+                            .expect("ScopedImportBinding outside scoped compilation");
+                        self.emit_u32(slot);
                         self.emit_str_id(name);
                     }
                 }