wip: issue/88

Author: morganthomas

crates/lean_compiler/src/a_simplify_lang.rs

@@ -1997,6 +1997,9 @@ impl SimpleLine {
     fn to_string_with_indent(&self, indent: usize) -> String {
         let spaces = "    ".repeat(indent);
         let line_str = match self {
+            Self::ForwardDeclaration { var } => {
+                format!("var {var}")
+            }
             Self::Match { value, arms } => {
                 let arms_str = arms
                     .iter()

crates/lean_compiler/src/b_compile_intermediate.rs

@@ -19,6 +19,7 @@ struct Compiler {
     stack_size: usize,
 }
 
+#[derive(Default)]
 struct StackFrameLayout {
     // Innermost lexical scope last
     scopes: Vec<ScopeLayout>,
@@ -36,7 +37,7 @@ impl Compiler {
             VarOrConstMallocAccess::Var(var) => {
                 for scope in self.stack_frame_layout.scopes.iter().rev() {
                     if let Some(offset) = scope.var_positions.get(var) {
-                        return offset.into();
+                        return (*offset).into();
                     }
                 }
                 panic!("Variable {var} not in scope");
@@ -45,9 +46,9 @@ impl Compiler {
                 for scope in self.stack_frame_layout.scopes.iter().rev() {
                     if let Some(base) = scope.const_mallocs.get(malloc_label) {
                         return ConstExpression::Binary {
-                            left: Box::new(base.into()),
+                            left: Box::new((*base).into()),
                             operation: HighLevelOperation::Add,
-                            right: Box::new(offset.clone()),
+                            right: Box::new((*offset).clone()),
                         };
                     }
                 }
@@ -82,7 +83,10 @@ impl IntermediateValue {
             },
             SimpleExpr::Constant(c) => Self::Constant(c.clone()),
             SimpleExpr::ConstMallocAccess { malloc_label, offset } => Self::MemoryAfterFp {
-                offset: compiler.get_offset(SimpleExpr::ConstMallocAccess { malloc_label, offset }),
+                offset: compiler.get_offset(&VarOrConstMallocAccess::ConstMallocAccess {
+                    malloc_label: *malloc_label,
+                    offset: offset.clone()
+                }),
             },
         }
     }
@@ -115,15 +119,14 @@ fn compile_function(
 ) -> Result<Vec<IntermediateInstruction>, String> {
     // memory layout: pc, fp, args, return_vars, internal_vars
     let mut stack_pos = 2; // Reserve space for pc and fp
-    let mut var_positions = BTreeMap::new();
-    let mut function_scope = Scope::default();
+    let mut function_scope_layout = ScopeLayout::default();
     compiler.stack_frame_layout = StackFrameLayout {
-        scopes: vec![function_scope],
+        scopes: vec![function_scope_layout],
     };
-    let function_scope = &mut compiler.stack_frame_layout.scopes[0];
+    let function_scope_layout = &mut compiler.stack_frame_layout.scopes[0];
 
     for (i, var) in function.arguments.iter().enumerate() {
-        function_scope.var_positions.insert(var.clone(), stack_pos + i);
+        function_scope_layout.var_positions.insert(var.clone(), stack_pos + i);
     }
     stack_pos += function.arguments.len();
 
@@ -156,7 +159,7 @@ fn compile_lines(
 
     for (i, line) in lines.iter().enumerate() {
         match line {
-            SimpleLine::ForwardDeclaration => {
+            SimpleLine::ForwardDeclaration { .. } => {
                 todo!(); // amend stack frame layout
             }
 
@@ -600,7 +603,8 @@ fn handle_const_malloc(
             offset: compiler.get_offset(&var.clone().into()),
         },
     });
-    compiler.const_mallocs.insert(*label, compiler.stack_size);
+    let current_scope = compiler.stack_frame_layout.scopes.last_mut().unwrap();
+    current_scope.const_mallocs.insert(*label, compiler.stack_size);
     compiler.stack_size += size;
 }
 
@@ -693,6 +697,9 @@ fn find_internal_vars(lines: &[SimpleLine]) -> BTreeSet<Var> {
     let mut internal_vars = BTreeSet::new();
     for line in lines {
         match line {
+            SimpleLine::ForwardDeclaration { var } => {
+                internal_vars.insert(var.clone());
+            }
             SimpleLine::Match { arms, .. } => {
                 for arm in arms {
                     internal_vars.extend(find_internal_vars(arm));

crates/lean_compiler/src/lang.rs

@@ -398,6 +398,7 @@ impl Context {
     }
 }
 
+#[derive(Default)]
 pub struct Scope {
     /// A set of declared variables.
     pub vars: BTreeSet<Var>,