Clean up examples; Implement type tool

examples/clue_solver.ds

@@ -10,12 +10,12 @@ take_turn = function <current_room opponent_card> {
 
 remove_card = function <opponent_card> {
 	for card_list in cards {
-		remove card from cards {
+		removed = remove card from card_list {
 			card == opponent_card
 		}
 	}
 
-	if type of removed_card == 'empty' {
+	if removed == 'empty' {
 		(output 'Card not found.')
 	}
 }

examples/collections.ds

@@ -1,114 +0,0 @@
-# transform
-
-list = (1, 2, 3);
-test = transform(list, 'input + 1');
-assert_equal((2, 3, 4), test);
-
-# string
-
-test = string(42);
-assert_equal("42", test);
-
-test = string(42.42);
-assert_equal("42.42", test);
-
-test = string(false);
-assert_equal("false", test);
-
-# create_table
-
-table = create_table(
-	("text", "num"),
-	(
-		("foo", 1),
-		("bar", 2)
-	)
-);
-
-# rows
-
-test = rows(table);
-assert_equal(
-	(
-		("foo", 1),
-		("bar", 2)
-	),
-	test
-);
-
-# insert
-
-test = insert(
-	table,
-	(
-		("foo", 1),
-		("bar", 2)
-	)
-);
-assert_equal(
-	create_table(
-		("text", "num"),
-		(
-			("foo", 1),
-			("bar", 2),
-			("foo", 1),
-			("bar", 2)
-		)
-	),
-	test
-);
-
-# select
-
-table = create_table(
-	("text", "number", "bool"),
-	(
-		("a", 1, true),
-		("b", 2, true),
-		("a", 3, true)
-	)
-);
-
-test_table = create_table(
-	("text", "bool"),
-	(
-		("a", true),
-		("b", true),
-		("a", true)
-	)
-);
-
-assert_equal(select(table, ("text", "bool")), test_table);
-
-test_table = create_table(
-	("text", "number", "bool"),
-	(
-		("a", 1, true),
-		("a", 3, true)
-	)
-);
-
-assert_equal(where(table, 'text == "a"'), test_table);
-
-# count
-
-table = create_table(
-	("text", "number", "bool"),
-	(
-		("a", 1, true),
-		("b", 2, true),
-		("a", 3, true)
-	)
-);
-test = count(table);
-assert_equal(3, test);
-
-test = count("123");
-assert_equal(3, test);
-
-test = count(1, 2, 3);
-assert_equal(3, test);
-
-map.x.z.y = 1;
-test = count(map);
-assert_equal(1, test);

examples/data_formats.ds

@@ -1,4 +0,0 @@
-dob = from_toml("1979-05-27T07:32:00-08:00");
-toml = to_toml(dob);
-
-assert_equal(toml, "1979-05-27T07:32:00-08:00");

src/abstract_tree/insert.rs

@@ -1,7 +1,7 @@
 use serde::{Deserialize, Serialize};
 use tree_sitter::Node;
 
-use crate::{AbstractTree, Expression, Identifier, Item, Result, Value, VariableMap};
+use crate::{AbstractTree, Expression, Identifier, Result, Value, VariableMap};
 
 #[derive(Debug, Clone, Serialize, Deserialize, Eq, PartialEq, PartialOrd, Ord)]
 pub struct Insert {

src/abstract_tree/tool.rs

@@ -8,7 +8,7 @@ use std::{
 use serde::{Deserialize, Serialize};
 use tree_sitter::Node;
 
-use crate::{AbstractTree, Error, Expression, Result, Table, Value, VariableMap};
+use crate::{AbstractTree, Error, Expression, Result, Table, Value, ValueType, VariableMap};
 
 #[derive(Debug, Clone, Serialize, Deserialize, Eq, PartialEq, PartialOrd, Ord)]
 pub enum Tool {
@@ -19,6 +19,7 @@ pub enum Tool {
     Length(Expression),
     Output(Vec<Expression>),
     OutputError(Vec<Expression>),
+    Type(Expression),
 
     // Filesystem
     Append(Vec<Expression>),
@@ -99,6 +100,12 @@ impl AbstractTree for Tool {
 
                 Tool::OutputError(expressions)
             }
+            "type" => {
+                let expression_node = node.child(2).unwrap();
+                let expression = Expression::from_syntax_node(source, expression_node)?;
+
+                Tool::Type(expression)
+            }
             "append" => {
                 let expressions = parse_expressions(source, node)?;
 
@@ -264,6 +271,18 @@ impl AbstractTree for Tool {
 
                 Ok(Value::Empty)
             }
+            Tool::Type(expression) => {
+                let run_expression = expression.run(source, context);
+                let value_type = if let Ok(value) = run_expression {
+                    value.value_type()
+                } else if let Err(Error::VariableIdentifierNotFound(_)) = run_expression {
+                    ValueType::Empty
+                } else {
+                    return run_expression;
+                };
+
+                Ok(Value::String(value_type.to_string()))
+            }
             Tool::Append(expressions) => {
                 let path_value = expressions[0].run(source, context)?;
                 let path = path_value.as_string()?;

tests/dust_examples.rs

@@ -9,20 +9,6 @@ fn clue_solver() {
     evaluate(&file_contents).unwrap();
 }
 
-#[test]
-fn collections() {
-    let file_contents = read_to_string("examples/collections.ds").unwrap();
-
-    evaluate(&file_contents).unwrap();
-}
-
-#[test]
-fn data_formats() {
-    let file_contents = read_to_string("examples/data_formats.ds").unwrap();
-
-    evaluate(&file_contents).unwrap();
-}
-
 #[test]
 fn fetch() {
     let file_contents = read_to_string("examples/fetch.ds").unwrap();

tree-sitter-dust/grammar.js

@@ -265,7 +265,8 @@ module.exports = grammar({
       'help',
       'length',
       'output',
-      'output_error',     
+      'output_error',
+      'type',
 
       // Filesystem
       'append',

tree-sitter-dust/src/grammar.json

@@ -1090,6 +1090,10 @@
           "type": "STRING",
           "value": "output_error"
         },
+        {
+          "type": "STRING",
+          "value": "type"
+        },
         {
           "type": "STRING",
           "value": "append"

tree-sitter-dust/src/node-types.json

@@ -865,6 +865,10 @@
     "type": "true",
     "named": false
   },
+  {
+    "type": "type",
+    "named": false
+  },
   {
     "type": "while",
     "named": false