From e7e8c4f9e5228730909b2ccf665a74038646bde1 Mon Sep 17 00:00:00 2001
From: Jeff <dev@jeffa.io>
Date: Tue, 22 Aug 2023 22:20:42 -0400
Subject: [PATCH] Fix u tests and examples

---
 examples/cpu_monitor.whale             |  9 ------
 examples/fetch.ds                      |  4 +++
 examples/fetch.whale                   |  4 ---
 examples/hello_world.whale             |  1 -
 examples/map.whale                     |  7 -----
 examples/random_user_data.whale        | 14 ---------
 examples/toolbox.whale                 | 21 --------------
 examples/wait.whale                    |  3 --
 src/interface.rs                       | 20 +++++++++++--
 src/value/variable_map.rs              |  2 +-
 tests/dust_tests.rs                    | 28 ++++++++++++++++++
 tests/list.ds                          | 12 ++++++++
 tests/logic.rs                         | 39 --------------------------
 tests/scope.ds                         |  9 ++++++
 examples/table.whale => tests/table.ds |  0
 tests/variables.ds                     | 13 +++++++++
 16 files changed, 84 insertions(+), 102 deletions(-)
 delete mode 100644 examples/cpu_monitor.whale
 create mode 100644 examples/fetch.ds
 delete mode 100644 examples/fetch.whale
 delete mode 100644 examples/hello_world.whale
 delete mode 100644 examples/map.whale
 delete mode 100644 examples/random_user_data.whale
 delete mode 100644 examples/toolbox.whale
 delete mode 100644 examples/wait.whale
 create mode 100644 tests/list.ds
 delete mode 100644 tests/logic.rs
 create mode 100644 tests/scope.ds
 rename examples/table.whale => tests/table.ds (100%)
 create mode 100644 tests/variables.ds

diff --git a/examples/cpu_monitor.whale b/examples/cpu_monitor.whale
deleted file mode 100644
index 475ec22..0000000
--- a/examples/cpu_monitor.whale
+++ /dev/null
@@ -1,9 +0,0 @@
-loop('
-	speed = cpu_speed();
-	message = "Current CPU clock: " + string(speed);
-
-	output(message);
-	wait 300;
-');
-
-
diff --git a/examples/fetch.ds b/examples/fetch.ds
new file mode 100644
index 0000000..7a11fab
--- /dev/null
+++ b/examples/fetch.ds
@@ -0,0 +1,4 @@
+raw_data = download("https://api.sampleapis.com/futurama/cast");
+data = from_json(raw_data);
+
+assert_equal("Billy West", data.0.name);
diff --git a/examples/fetch.whale b/examples/fetch.whale
deleted file mode 100644
index ad19c67..0000000
--- a/examples/fetch.whale
+++ /dev/null
@@ -1,4 +0,0 @@
-raw_data = download "https://api.sampleapis.com/futurama/cast";
-data = raw_data:from_json();
-first = data:get 0;
-first.name
diff --git a/examples/hello_world.whale b/examples/hello_world.whale
deleted file mode 100644
index 83743f0..0000000
--- a/examples/hello_world.whale
+++ /dev/null
@@ -1 +0,0 @@
-output "Hello world!"
diff --git a/examples/map.whale b/examples/map.whale
deleted file mode 100644
index c2c89a1..0000000
--- a/examples/map.whale
+++ /dev/null
@@ -1,7 +0,0 @@
-x = 1;
-y = 2;
-z = 3;
-a = "foo";
-b = "bar";
-c = "foobar";
-d = ("abc", "123", "xyz");
diff --git a/examples/random_user_data.whale b/examples/random_user_data.whale
deleted file mode 100644
index b028177..0000000
--- a/examples/random_user_data.whale
+++ /dev/null
@@ -1,14 +0,0 @@
-create_user = '
-	names = ("bob", "bill", "mary", "susan");
-	(random_integer(), names:random(), random_integer(0, 100))
-';
-
-create_table(
-	("id", "name", "age"),
-	(
-	 	repeat (
-			create_user,
-			10
-		)
-	)
-)
\ No newline at end of file
diff --git a/examples/toolbox.whale b/examples/toolbox.whale
deleted file mode 100644
index 660fe86..0000000
--- a/examples/toolbox.whale
+++ /dev/null
@@ -1,21 +0,0 @@
-enable_copr_repositories = ("varlad/helix");
-enable_rpm_repositories (
-	"https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-38.noarch.rpm",
-	"https://mirrors.rpmfusion.org/free/fedora/rpmfusion-nonfree-release-38.noarch.rpm"
-);
-install_package (
-	"bat",
-	"egl-wayland",
-	"fd-find",
-	"fish",
-	"fzf",
-	"lsd",
-	"kitty",
-	"helix",
-	"libwayland-cursor",
-	"libwayland-egl",
-	"wl-clipboard"
-);
-
-sh "curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh";
-sh "cargo install starship zoxide";
\ No newline at end of file
diff --git a/examples/wait.whale b/examples/wait.whale
deleted file mode 100644
index 2aaec87..0000000
--- a/examples/wait.whale
+++ /dev/null
@@ -1,3 +0,0 @@
-output "foo...";
-wait 1;
-output "bar!";
\ No newline at end of file
diff --git a/src/interface.rs b/src/interface.rs
index f44e864..850e94c 100644
--- a/src/interface.rs
+++ b/src/interface.rs
@@ -29,8 +29,21 @@ pub fn eval(string: &str) -> Result<Value> {
 /// ```
 ///
 /// *See the [crate doc](index.html) for more examples and explanations of the expression format.*
-pub fn eval_with_context(string: &str, context: &mut VariableMap) -> Result<Value> {
-    let split = string.split_once("::");
+pub fn eval_with_context(input: &str, context: &mut VariableMap) -> Result<Value> {
+    let without_comments = input
+        .lines()
+        .map(|line| {
+            let split = line.split_once('#');
+
+            if let Some((code, _comment)) = split {
+                code
+            } else {
+                line
+            }
+        })
+        .collect::<String>();
+
+    let split = without_comments.split_once("->");
 
     if let Some((left, right)) = split {
         let left_result = tree::tokens_to_operator_tree(token::tokenize(left)?)?
@@ -42,6 +55,7 @@ pub fn eval_with_context(string: &str, context: &mut VariableMap) -> Result<Valu
 
         Ok(right_result)
     } else {
-        tree::tokens_to_operator_tree(token::tokenize(string)?)?.eval_with_context_mut(context)
+        tree::tokens_to_operator_tree(token::tokenize(&without_comments)?)?
+            .eval_with_context_mut(context)
     }
 }
diff --git a/src/value/variable_map.rs b/src/value/variable_map.rs
index 7bfb02e..7c9e409 100644
--- a/src/value/variable_map.rs
+++ b/src/value/variable_map.rs
@@ -41,7 +41,7 @@ impl VariableMap {
         for (key, value) in &self.variables {
             if identifier == key {
                 if let Ok(function) = value.as_function() {
-                    let mut context = VariableMap::new();
+                    let mut context = self.clone();
 
                     context.set_value("input", argument.clone())?;
 
diff --git a/tests/dust_tests.rs b/tests/dust_tests.rs
index 664dc83..895de3d 100644
--- a/tests/dust_tests.rs
+++ b/tests/dust_tests.rs
@@ -8,3 +8,31 @@ fn collections() {
 
     eval(&file_contents).unwrap();
 }
+
+#[test]
+fn list() {
+    let file_contents = read_to_string("tests/list.ds").unwrap();
+
+    eval(&file_contents).unwrap();
+}
+
+#[test]
+fn table() {
+    let file_contents = read_to_string("tests/table.ds").unwrap();
+
+    eval(&file_contents).unwrap();
+}
+
+#[test]
+fn variables() {
+    let file_contents = read_to_string("tests/variables.ds").unwrap();
+
+    eval(&file_contents).unwrap();
+}
+
+#[test]
+fn scope() {
+    let file_contents = read_to_string("tests/scope.ds").unwrap();
+
+    eval(&file_contents).unwrap();
+}
diff --git a/tests/list.ds b/tests/list.ds
new file mode 100644
index 0000000..a252616
--- /dev/null
+++ b/tests/list.ds
@@ -0,0 +1,12 @@
+# Lists are created by grouping items in partheses and separating them with
+# commas.
+
+numbers = (1, 2, 3);
+
+# To access the values in a list, use an integer as an index.
+
+x = numbers.0;
+y = numbers.1;
+z = numbers.2;
+
+assert_equal(x + y, z);
diff --git a/tests/logic.rs b/tests/logic.rs
deleted file mode 100644
index 90a178f..0000000
--- a/tests/logic.rs
+++ /dev/null
@@ -1,39 +0,0 @@
-use whale_lib::*;
-
-#[test]
-fn assert() {
-    eval("assert(true)").unwrap();
-    eval("assert(false)").unwrap_err();
-}
-
-#[test]
-fn assert_equal() {
-    eval("assert_equal(true, true)").unwrap();
-    eval("assert_equal(true, false)").unwrap_err();
-}
-
-#[test]
-fn r#if() {
-    eval("if(true, assert(true))").unwrap();
-
-    let value = eval("if(true, 1)").unwrap();
-    assert_eq!(Value::Integer(1), value);
-
-    let value = eval("if(false, 1)").unwrap();
-    assert_eq!(Value::Empty, value);
-}
-
-#[test]
-fn r#if_else() {
-    let value = eval("if_else(true, 1, 2)").unwrap();
-    assert_eq!(Value::Integer(1), value);
-
-    let value = eval("if_else(false, 1, 2)").unwrap();
-    assert_eq!(Value::Integer(2), value);
-
-    let value = eval("if_else(true, '1', '2')").unwrap();
-    assert_eq!(Value::Integer(1), value);
-
-    let value = eval("if_else(false, '1', '2')").unwrap();
-    assert_eq!(Value::Integer(2), value);
-}
diff --git a/tests/scope.ds b/tests/scope.ds
new file mode 100644
index 0000000..0bf0a5b
--- /dev/null
+++ b/tests/scope.ds
@@ -0,0 +1,9 @@
+foo = "bar";
+func = 'foo';
+
+assert_equal("bar", func());
+
+foo = "xyz";
+
+assert_equal("xyz", func());
+
diff --git a/examples/table.whale b/tests/table.ds
similarity index 100%
rename from examples/table.whale
rename to tests/table.ds
diff --git a/tests/variables.ds b/tests/variables.ds
new file mode 100644
index 0000000..79e306c
--- /dev/null
+++ b/tests/variables.ds
@@ -0,0 +1,13 @@
+# Dust is data-oriented, so variables are declared with minimal syntax. A
+# single character, the assignment operator (`=`), sets a variable.
+
+x = 1;
+y = "hello dust!";
+z = 42.0;
+list = (3, 2, x);
+big_list = (x, y, z, list);
+map.x = "foobar";
+function = '
+	message = "I am a function!";
+	output message;
+';
\ No newline at end of file