From d1c56b02bb211bf1f96cda1c7957f5d560f3288e Mon Sep 17 00:00:00 2001
From: teo3300 <matteo.rogora@live.it>
Date: Mon, 12 Jun 2023 00:54:15 +0200
Subject: [PATCH] Added pointer for outer environment

Signed-off-by: teo3300 <matteo.rogora@live.it>
---
 src/envs.rs     | 4 +++-
 src/main.rs     | 2 +-
 src/mal_core.rs | 6 +++---
 src/printer.rs  | 2 +-
 src/types.rs    | 4 ++--
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/envs.rs b/src/envs.rs
index 02ec1fd..d3a5eec 100644
--- a/src/envs.rs
+++ b/src/envs.rs
@@ -5,12 +5,14 @@ use crate::types::{int_op, MalArgs, MalRet, MalType};
 
 pub struct Env {
     map: HashMap<String, MalType>,
+    outer: Option<Box<Env>>,
 }
 
 impl Env {
-    pub fn new() -> Self {
+    pub fn new(outer: Option<Box<Env>>) -> Self {
         let mut env = Env {
             map: HashMap::new(),
+            outer,
         };
         env.init();
         env
diff --git a/src/main.rs b/src/main.rs
index a711b45..a5d7ead 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -14,7 +14,7 @@ use step2_eval::rep;
 
 fn main() {
     let mut num = 0;
-    let env = Env::new();
+    let env = Env::new(None);
 
     loop {
         let mut input = String::new();
diff --git a/src/mal_core.rs b/src/mal_core.rs
index 2715707..80e7263 100644
--- a/src/mal_core.rs
+++ b/src/mal_core.rs
@@ -5,7 +5,7 @@ use crate::types::{MalArgs, MalRet, MalType};
 fn call_func(func: &MalType, args: MalArgs) -> MalRet {
     match func {
         Fun(func) => func(args),
-        _ => panic!("Calling not a function"),
+        _ => Err(format!("{:?} is not a function", func)),
     }
 }
 
@@ -28,8 +28,8 @@ pub fn eval(ast: MalType, env: &Env) -> MalRet {
     match &ast {
         List(list) => {
             if list.is_empty() {
-                Ok(Nil)
-                // Previously Ok(ast)
+                // Ok(Nil) // Should be the normal behavior
+                Ok(ast)
             } else {
                 eval_func(eval_ast(ast, env)?)
             }
diff --git a/src/printer.rs b/src/printer.rs
index 8878b38..a26b02f 100644
--- a/src/printer.rs
+++ b/src/printer.rs
@@ -6,7 +6,7 @@ pub fn pr_str(ast: &MalType, print_readably: bool) -> String {
     match ast {
         Nil => "nil".to_string(),
         Sym(sym) => sym.to_string(),
-        Key(sym) => sym[1..sym.len() - 1].to_string(),
+        Key(sym) => sym[2..].to_string(),
         Int(val) => val.to_string(),
         Bool(val) => val.to_string(),
         Str(str) => {
diff --git a/src/types.rs b/src/types.rs
index 664c112..f26c196 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -31,7 +31,7 @@ pub type MalErr = String;
 pub type MalArgs = Vec<MalType>;
 pub type MalRet = Result<MalType, MalErr>;
 
-use MalType::{Key, Map, Str, Sym};
+use MalType::{Key, Map, Str};
 
 pub fn make_map(list: MalArgs) -> MalRet {
     if list.len() % 2 != 0 {
@@ -42,7 +42,7 @@ pub fn make_map(list: MalArgs) -> MalRet {
 
     for i in (0..list.len()).step_by(2) {
         match &list[i] {
-            Sym(k) | Key(k) | Str(k) => {
+            Key(k) | Str(k) => {
                 let v = list[i + 1].clone();
                 map.insert(k.clone(), v);
             }