fix: lower LetStatement assignment, insert Define, improve HashMap error

lccc-project · Aug 2, 2023 · 0a1dfec · 0a1dfec
1 parent d6024e4
commit 0a1dfec
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/rust/src/sema/hir.rs b/rust/src/sema/hir.rs
@@ -413,6 +413,14 @@ impl<'a> HirLowerer<'a> {
                     var,
                     ty,
                 }));
+                if let Some(x) = &stmt.val {
+                    let val = self.desugar_expr(x)?;
+                    self.stmts.push(stmt.copy_span(|_| HirStatement::Assign {
+                        dest: var.copy_span(|x| HirExpr::Var(*x)),
+                        val,
+                        op: None,
+                    }));
+                }
             }
             ast::Statement::Block(blk) => match &blk.body {
                 ast::CompoundBlock::SimpleBlock(blk) => {

diff --git a/rust/src/sema/mir.rs b/rust/src/sema/mir.rs
@@ -834,7 +834,9 @@ impl<'a> MirConverter<'a> {
                 let val = self.lower_expr(val)?;
                 self.lower_write(dest, val, op, span)?;
             }
-            ThirStatement::Define { .. } => {}
+            ThirStatement::Define { var, .. } => {
+                self.hir_def_spans.insert(var.body, var.span);
+            }
             ThirStatement::Return(expr) => {
                 let expr = self.lower_expr(expr)?;
 

diff --git a/xlang/xlang_abi/src/collection.rs b/xlang/xlang_abi/src/collection.rs
@@ -632,7 +632,7 @@ where
 {
     type Output = V;
     fn index(&self, idx: &'a Q) -> &V {
-        self.get(idx).unwrap()
+        self.get(idx).expect("no entry found for key")
     }
 }