Merge pull request #40 from aDotInTheVoid/complex-values

Complex values infrastructure

Cargo.toml

@@ -15,6 +15,7 @@ fs-err = "2.5.0"
 lalrpop-util = { version = "0.19.5", features = ["lexer"] }
 regex = "1.4.6"
 serde = { version = "1.0.125", features = ["derive"] }
+slotmap = { version = "1.0.3", features = ["serde"] }
 
 [build-dependencies]
 lalrpop = "0.19.5"

src/env.rs

@@ -1,10 +1,24 @@
 use std::collections::HashMap;
 
-use crate::value::Value;
+use slotmap::SlotMap;
+
+use crate::ast::{Function, Spanned};
+use crate::value::{BigValue, HeapKey, Value};
+
+// Scope only sticks around for the duration of a function call, wheras env
+// exists for the duration Of a program. Both of these will neeed to be
+// signifagently changed when we do GC and RR, so try not to make it too
+// hard to do that.
 
 #[derive(Debug, Default)]
 pub struct Scope<'a> {
-    vars: Vec<HashMap<&'a str, Value>>,
+    pub(crate) vars: Vec<HashMap<&'a str, Value>>,
+}
+
+#[derive(Debug, Default)]
+pub(crate) struct Env<'a> {
+    pub(crate) functions: HashMap<&'a str, &'a Spanned<Function<'a>>>,
+    pub(crate) heap: SlotMap<HeapKey, BigValue>,
 }
 
 impl<'a> Scope<'a> {
@@ -53,3 +67,9 @@ impl<'a> Scope<'a> {
         self.vars.pop().unwrap();
     }
 }
+
+impl<'a> Env<'a> {
+    pub fn add_to_heap(&mut self, v: BigValue) -> HeapKey {
+        self.heap.insert(v)
+    }
+}