Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "dust-lang"
 description = "General purpose programming language"
-version = "0.4.2"
+version = "0.4.1"
 repository = "https://git.jeffa.io/jeff/dust.git"
 edition = "2021"
 license = "MIT"
@@ -18,8 +18,16 @@ opt-level = 1
 opt-level = 3
 
 [dependencies]
+ansi_term = "0.12.1"
 clap = { version = "4.4.4", features = ["derive"] }
 csv = "1.2.2"
+egui = "0.24.1"
+eframe = { version = "0.24.1", default-features = false, features = [
+    "accesskit",
+    "default_fonts", 
+    "glow",   
+    "persistence",
+] }
 libc = "0.2.148"
 log = "0.4.20"
 rand = "0.8.5"
@@ -29,18 +37,13 @@ serde = { version = "1.0.188", features = ["derive"] }
 serde_json = "1.0.107"
 toml = "0.8.1"
 tree-sitter = "0.20.10"
+egui_extras = "0.24.2"
 enum-iterator = "1.4.1"
 env_logger = "0.10"
-reedline = { version = "0.28.0", features = ["clipboard", "sqlite"] }
-crossterm = "0.27.0"
-nu-ansi-term = "0.49.0"
-humantime = "2.1.0"
-stanza = "0.5.1"
-colored = "2.1.0"
-lyneate = "0.2.1"
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 env_logger = "0.10"
+rustyline = { version = "12.0.0", features = ["derive", "with-file-history"] }
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 getrandom = { version = "0.2", features = ["js"] }

README.md

@@ -1,100 +1,303 @@
 # Dust
 
-High-level programming language with effortless concurrency, automatic memory management, type safety and strict error handling.
+Dust is a general purpose programming language that emphasises concurrency and correctness.
 
-![Dust version of an example from The Rust Programming Language.](https://git.jeffa.io/jeff/dust/raw/branch/main/docs/assets/example_0.png)
+A basic dust program:
+
+```dust
+output("Hello world!")
+```
+
+Dust can do two (or more) things at the same time with effortless concurrency:
+
+```dust
+async {
+    output('will this one finish first?')
+    output('or will this one?')
+}
+```
+
+You can make *any* block, i.e. `{}`, run its statements in parallel by changing it to `async {}`.
+
+```dust
+if random_boolean() {
+    output("Do something...")
+} else async {
+    output("Do something else instead...")
+    output("And another thing at the same time...")
+}
+```
+
+Dust is an interpreted, strictly typed language with first class functions. It emphasises concurrency by allowing any group of statements to be executed in parallel. Dust includes built-in tooling to import and export data in a variety of formats, including JSON, TOML, YAML and CSV.
 
 <!--toc:start-->
 - [Dust](#dust)
   - [Features](#features)
-    - [Easy to Read and Write](#easy-to-read-and-write)
+  - [Usage](#usage)
-    - [Effortless Concurrency](#effortless-concurrency)
+  - [Installation](#installation)
-    - [Helpful Errors](#helpful-errors)
+  - [Benchmarks](#benchmarks)
-    - [Static analysis](#static-analysis)
+  - [Implementation](#implementation)
-    - [Debugging](#debugging)
+  - [The Dust Programming Language](#the-dust-programming-language)
-    - [Automatic Memory Management](#automatic-memory-management)
+    - [Declaring Variables](#declaring-variables)
-    - [Error Handling](#error-handling)
+    - [Lists](#lists)
-  - [Installation and Usage](#installation-and-usage)
+    - [Maps](#maps)
+    - [Loops](#loops)
+    - [Functions](#functions)
+    - [Option](#option)
+    - [Concurrency](#concurrency)
+  - [Acknowledgements](#acknowledgements)
 <!--toc:end-->
 
 ## Features
 
-### Easy to Read and Write
+- Simplicity: Dust is designed to be easy to learn.
+- Speed: Dust is built on [Tree Sitter] and [Rust] to prioritize performance and correctness. See [Benchmarks] below.
+- Concurrency: Safe, effortless parallel code using thread pools.
+- Safety: Written in safe, stable Rust.
+- Correctness: Type checking makes it easy to write good code.
 
-Dust has simple, easy-to-learn syntax.
+## Usage
 
-```js
+Dust is an experimental project under active development. At this stage, features come and go and the API is always changing. It should not be considered for serious use yet.
-output('Hello world!')
-```
 
-### Effortless Concurrency
+```sh
-
-Write multi-threaded code as easily as you would write code for a single thread.
-
-```js
-async {
-    output('Will this one print first?')
-    output('Or will this one?')
-    output('Who knows! Each "output" will run in its own thread!')
-}
-```
-
-### Helpful Errors
-
-Dust shows you exactly where your code went wrong and suggests changes.
-
-![Example of syntax error output.](https://git.jeffa.io/jeff/dust/raw/branch/main/docs/assets/syntax_error.png)
-
-### Static analysis
-
-Your code is always validated for safety before it is run.
-
-![Example of type error output.](https://git.jeffa.io/jeff/dust/raw/branch/main/docs/assets/type_error.png)
-
-Dust
-
-### Debugging
-
-Just set the environment variable `DUST_LOG=info` and Dust will tell you exactly what your code is doing while it's doing it. If you set `DUST_LOG=trace`, it will output detailed logs about parsing, abstraction, validation, memory management and runtime. Here are some of the logs from the end of a simple [fizzbuzz example](https://git.jeffa.io/jeff/dust/src/branch/main/examples/fizzbuzz.ds).
-
-![Example of debug output.](https://git.jeffa.io/jeff/dust/raw/branch/main/docs/assets/debugging.png)
-
-### Automatic Memory Management
-
-Thanks to static analysis, Dust knows exactly how many times each variable is used. This allows Dust to free memory as soon as the variable will no longer be used, without any help from the user.
-
-### Error Handling
-
-Runtime errors are no problem with Dust. The `Result` type represents the output of an operation that might fail. The user must decide what to do in the case of an error.
-
-```dust
-match io:stdin() {
-    Result::Ok(input) -> output("We read this input: " + input)
-    Result::Error(message) -> output("We got this error: " + message)
-}
-```
-
-## Installation and Usage
-
-There are two ways to compile Dust. **It is best to clone the repository and compile the latest code**, otherwise the program may be a different version than the one shown on GitHub. Either way, you must have `rustup`, `cmake` and a C compiler installed.
-
-To install from the git repository:
-
-```fish
-git clone https://git.jeffa.io/jeff/dust
-cd dust
-cargo run --release
-```
-
-To install with cargo:
-
-```fish
 cargo install dust-lang
-dust
+dust -c "output('Hello world!')"
 ```
 
+```txt
+General purpose programming language
+
+Usage: dust [OPTIONS] [PATH]
+
+Arguments:
+  [PATH]  Location of the file to run
+
+Options:
+  -c, --command <COMMAND>        Dust source code to evaluate
+  -i, --input <INPUT>            Data to assign to the "input" variable
+  -p, --input-path <INPUT_PATH>  A path to file whose contents will be assigned to the "input" variable
+  -t, --tree                     Show the syntax tree
+  -h, --help                     Print help
+  -V, --version                  Print version    
+```
+
+## Installation
+
+You must have the default rust toolchain installed and up-to-date. Install [rustup] if it is not already installed. Run `cargo install dust-lang` then run `dust` to start the interactive shell. Use `dust --help` to see the full command line options.
+
+To build from source, clone the repository and build the parser. To do so, enter the `tree-sitter-dust` directory and run `tree-sitter-generate`. In the project root, run `cargo run` to start the shell. To see other command line options, use `cargo run -- --help`.
+
 ## Benchmarks
 
-## Development Status
+Dust is at a very early development stage but performs strongly in preliminary benchmarks. The examples given were tested using [Hyperfine] on a single-core cloud instance with 1024 MB RAM. Each test was run 1000 times. The test script is shown below. Each test asks the program to read a JSON file and count the objects. Dust is a command line shell, programming language and data manipulation tool so three appropriate targets were chosen for comparison: nushell, NodeJS and jq. The programs produced identical output with the exception that NodeJS printed in color.
 
-Currently, Dust is being prepared for version 1.0. Until then, there may be breaking changes to the language and CLI.
+For the first test, a file with four entries was used.
+
+| Command | Mean [ms] | Min [ms] | Max [ms] 
+|:---|---:|---:|---:|
+| Dust | 3.1 ± 0.5 | 2.4 | 8.4 |
+| jq | 33.7 ± 2.2 | 30.0 | 61.8 |
+| NodeJS | 226.4 ± 13.1 | 197.6 | 346.2 |
+| Nushell | 51.6 ± 3.7 | 45.4 | 104.3 |
+
+The second set of data is from the GitHub API, it consists of 100 commits from the jq GitHub repo.
+
+| Command | Mean [ms] | Min [ms] | Max [ms] |
+|:---|---:|---:|---:|
+| Dust | 6.8 ± 0.6 | 5.7 | 12.0 | 2.20 ± 0.40 |
+| jq | 43.3 ± 3.6 | 37.6 | 81.6 | 13.95 ± 2.49 |
+| NodeJS | 224.9 ± 12.3 | 194.8 | 298.5 |
+| Nushell | 59.2 ± 5.7 | 49.7 | 125.0 | 19.11 ± 3.55 |
+
+This data came from CERN, it is a massive file of 100,000 entries.
+
+| Command | Mean [ms] | Min [ms] | Max [ms] |
+|:---|---:|---:|---:|
+| Dust | 1080.8 ± 38.7 | 975.3 | 1326.6 |
+| jq | 1305.3 ± 64.3 | 1159.7 | 1925.1 |
+| NodeJS | 1850.5 ± 72.5 | 1641.9 | 2395.1 |
+| Nushell | 1850.5 ± 86.2 | 1625.5 | 2400.7 |
+
+The tests were run after 5 warmup runs and the cache was cleared before each run.
+
+```sh
+hyperfine \
+	--shell none \
+	--warmup 5 \
+	--prepare "rm -rf /root/.cache" \
+	--runs 1000 \
+	--parameter-list data_path seaCreatures.json,jq_data.json,dielectron.json \
+	--export-markdown test_output.md \
+	"dust -c '(length (from_json input))' -p {data_path}" \
+	"jq 'length' {data_path}" \
+	"node --eval \"require('node:fs').readFile('{data_path}',(err,data)=>{console.log(JSON.parse(data).length)})\"" \
+	"nu -c 'open {data_path} | length'"
+```
+
+## Implementation
+
+Dust is formally defined as a Tree Sitter grammar in the tree-sitter-dust directory. Tree sitter generates a parser, written in C, from a set of rules defined in JavaScript. Dust itself is a rust binary that calls the C parser using FFI.
+
+Tests are written in three places: in the Rust library, in Dust as examples and in the Tree Sitter test format. Generally, features are added by implementing and testing the syntax in the tree-sitter-dust repository, then writing library tests to evaluate the new syntax. Implementation tests run the Dust files in the "examples" directory and should be used to demonstrate and verify that features work together.
+
+Tree Sitter generates a concrete syntax tree, which Dust traverses to create an abstract syntax tree that can run the Dust code. The CST generation is an extra step but it allows easy testing of the parser, defining the language in one file and makes the syntax easy to modify and expand. Because it uses Tree Sitter, developer-friendly features like syntax highlighting and code navigation are already available in any text editor that supports Tree Sitter.
+
+## The Dust Programming Language
+
+Dust is easy to learn. Aside from this guide, the best way to learn Dust is to read the examples and tests to get a better idea of what it can do.
+
+### Declaring Variables
+
+Variables have two parts: a key and a value. The key is always a string. The value can be any of the following data types:
+
+- string
+- integer
+- float
+- boolean
+- list
+- map
+- option
+- function
+
+Here are some examples of variables in dust.
+
+```dust
+string = "foobar"
+integer = 42
+float = 42.42
+list = [1 2 string integer float] # Commas are optional when writing lists.
+map = {
+    key = 'value'
+}
+```
+
+Note that strings can be wrapped with any kind of quote: single, double or backticks. Numbers are always integers by default. Floats are declared by adding a decimal. If you divide integers or do any kind of math with a float, you will create a float value.
+
+Dust enforces strict type checking, but you don't usually need to write the type, dust can figure it out on its own. The **number** and **any** types are special types that allow you to relax the type bounds.
+
+```dust
+string <str> = "foobar"
+integer <int> = 42
+float <float> = 42.42
+
+numbers <[number]> = [integer float]
+
+stuff <[any]> = [string integer float]
+```
+
+### Lists
+
+Lists are sequential collections. They can be built by grouping values with square brackets. Commas are optional. Values can be indexed by their position using a colon `:` followed by an integer. Dust lists are zero-indexed.
+
+```dust
+list = [true 41 "Ok"]
+
+assert_equal(list:0 true)
+
+the_answer = list:1 + 1
+
+assert_equal(the_answer, 42) # You can use commas when passing values a function. 
+```
+
+### Maps
+
+Maps are flexible collections with arbitrary key-value pairs, similar to JSON objects. A map is created with a pair of curly braces and its entries are variables declared inside those braces. Map contents can be accessed using a colon `:`.
+
+```dust
+reminder = {
+    message = "Buy milk"
+    tags = ["groceries", "home"]
+}
+
+output(reminder:message)
+```
+
+### Loops
+
+A **while** loop continues until a predicate is false.
+
+```dust
+i = 0
+while i < 10 {
+    output(i)
+    i += 1
+}
+```
+
+A **for** loop operates on a list without mutating it or the items inside. It does not return a value.
+
+```dust
+list = [ 1, 2, 3 ]
+
+for number in list {
+    output(number + 1)
+}
+```
+
+### Functions
+
+Functions are first-class values in dust, so they are assigned to variables like any other value.
+
+```dust
+# This simple function has no arguments and no return value.
+say_hi = () <none> {
+    output("hi")
+}
+
+# This function has one argument and will return a value.
+add_one = (number <num>) <num> {
+    number + 1
+}
+
+say_hi()
+assert_equal(add_one(3), 4)
+```
+
+You don't need commas when listing arguments and you don't need to add whitespace inside the function body but doing so may make your code easier to read.
+
+### Option
+
+An **option** represents a value that may not be present. It has two variants: **some** and **none**. Dust includes built-in functions to work with option values: `is_none`, `is_some` and `either_or`.
+
+```dust
+say_something = (message <option(str)>) <str> {
+    either_or(message, "hiya")
+}
+
+say_something(some("goodbye"))
+# goodbye
+
+say_something(none)
+# hiya
+```
+
+### Concurrency
+
+Dust features effortless concurrency anywhere in your code. Any block of code can be made to run its contents asynchronously. Dust's concurrency is written in safe Rust and uses a thread pool whose size depends on the number of cores available.
+
+```dust
+# An async block will run each statement in its own thread.
+async {
+    output(random_integer())
+    output(random_float())
+    output(random_boolean())
+}
+```
+
+```dust
+data = async {
+    output("Reading a file...")
+    read("examples/assets/faithful.csv")
+}
+```
+
+## Acknowledgements
+
+Dust began as a fork of [evalexpr]. Some of the original code is still in place but the project has dramatically changed and no longer uses any of its parsing or interpreting.
+
+[Tree Sitter]: https://tree-sitter.github.io/tree-sitter/
+[Rust]: https://rust-lang.org
+[evalexpr]: https://github.com/ISibboI/evalexpr
+[rustup]: https://rustup.rs
+[Hyperfine]: https://github.com/sharkdp/hyperfine

build.rs

@@ -1,17 +1,15 @@
 fn main() {
     let src_dir = std::path::Path::new("tree-sitter-dust/src");
-    let mut c_config = cc::Build::new();
 
+    let mut c_config = cc::Build::new();
     c_config.include(src_dir);
     c_config
         .flag_if_supported("-Wno-unused-parameter")
         .flag_if_supported("-Wno-unused-but-set-variable")
         .flag_if_supported("-Wno-trigraphs");
-
     let parser_path = src_dir.join("parser.c");
-
     c_config.file(&parser_path);
-    c_config.compile("parser");
 
+    c_config.compile("parser");
     println!("cargo:rerun-if-changed={}", parser_path.to_str().unwrap());
 }

docs/language.md

@@ -1,515 +0,0 @@
-# Dust Language Reference
-
-!!! This is a **work in progress** and has incomplete information. !!!
-
-This is an in-depth description of the syntax and abstractions used by the Dust language. It is not
-necessary to read or understand all of it before you start using Dust. Instead, refer to it when
-you need help with the syntax or understanding how the code is run.
-
-Each section of this document corresponds to a node in the concrete syntax tree. Creating this tree
-is the first step in interpreting Dust code. Second, the syntax tree is traversed and an abstract
-tree is generated. Each node in the syntax tree corresponds to a node in the abstract tree. Third,
-the abstract tree is verified to ensure that it will not generate any values that violate the type
-restrictions. Finally, the abstract tree is run, beginning at the [root](#root).
-
-You may reference the [grammar file](tree-sitter-dust/grammar.js) and the [Tree Sitter docs]
-(https://tree-sitter.github.io/) while reading this guide to understand how the language is parsed.
-
-<!--toc:start-->
-- [Dust Language Reference](#dust-language-reference)
-  - [Root](#root)
-  - [Values](#values)
-    - [Boolean](#boolean)
-    - [Integer](#integer)
-    - [Float](#float)
-    - [Range](#range)
-    - [String](#string)
-    - [List](#list)
-    - [Map](#map)
-    - [Function](#function)
-    - [Option](#option)
-    - [Structure](#structure)
-  - [Types](#types)
-    - [Basic Types](#basic-types)
-    - [Number](#number)
-    - [Any](#any)
-    - [None](#none)
-    - [List Type](#list-type)
-    - [Map Type](#map-type)
-    - [Iter](#iter)
-    - [Function Type](#function-type)
-    - [Option Type](#option-type)
-    - [Custom Types](#custom-types)
-  - [Statements](#statements)
-    - [Assignment](#assignment)
-    - [Blocks](#blocks)
-      - [Synchronous Blocks](#synchronous-blocks)
-      - [Asynchronous Blocks](#asynchronous-blocks)
-    - [Break](#break)
-    - [For Loop](#for-loop)
-    - [While Loop](#while-loop)
-    - [If/Else](#ifelse)
-    - [Match](#match)
-    - [Pipe](#pipe)
-    - [Expression](#expression)
-  - [Expressions](#expressions)
-      - [Identifier](#identifier)
-      - [Index](#index)
-      - [Logic](#logic)
-      - [Math](#math)
-      - [Value](#value)
-      - [New](#new)
-      - [Command](#command)
-  - [Built-In Values](#built-in-values)
-  - [Comments](#comments)
-<!--toc:end-->
-
-## Root
-
-The root node represents all of the source code. It is a sequence of [statements](#statements) that
-are executed synchronously, in order. The output of the program is always the result of the final
-statement or the first error encountered.
-
-## Values
-
-There are ten kinds of value in Dust. Some are very simple and are parsed directly from the source
-code, some are collections and others are used in special ways, like functions and structures. All
-values can be assinged to an [identifier](#identifiers).
-
-Dust does not have a null type. Absent values are represented with the `none` value, which is a
-kind of [option](#option). You may not create a variable without a value and no variable can ever
-be in an 'undefined' state during execution.
-
-### Boolean
-
-Booleans are true or false. They are represented by the literal tokens `true` and `false`.
-
-### Integer
-
-Integers are whole numbers that may be positive, negative or zero. Internally, an integer is a
-signed 64-bit value.
-
-```dust
-42
-```
-
-Integers always **overflow** when their maximum or minimum value is reached. Overflowing means that
-if the value is too high or low for the 64-bit integer, it will wrap around. You can use the built-
-in values `int:max` and `int:min` to get the highest and lowest possible values.
-
-```dust
-assert_equal(int:max + 1, int:min)
-assert_equal(int:min - 1, int:max)
-```
-
-### Float
-
-A float is a numeric value with a decimal. Floats are 64-bit and, like integers, will **overflow**
-at their bounds.
-
-```dust
-42.0
-```
-
-### Range
-
-A range represents a contiguous sequence of integers. Dust ranges are **inclusive** so both the high
-and low bounds will be represented.
-
-```dust
-0..100
-```
-
-### String
-
-A string is a **utf-8** sequence used to represent text. Strings can be wrapped in single or double quotes as well as backticks.
-
-```dust
-'42'
-"42"
-`42`
-'forty-two'
-```
-
-### List
-
-A list is **collection** of values stored as a sequence and accessible by [indexing](#index) their position with an integer. Lists indexes begin at zero for the first item.
-
-```dust
-[ 42 'forty-two' ]
-[ 123, 'one', 'two', 'three' ]
-```
-
-Note that the commas are optional, including trailing commas.
-
-```dust
-[1 2 3 4 5]:2
-# Output: 3
-```
-
-### Map
-
-Maps are flexible collections with arbitrary **key-value pairs**, similar to JSON objects. A map is
-created with a pair of curly braces and its entries are variables declared inside those braces. Map
-contents can be accessed using a colon `:`. Commas may optionally be included after the key-value
-pairs.
-
-```dust
-reminder = {
-    message = "Buy milk"
-    tags = ["groceries", "home"]
-}
-
-reminder:message
-# Output: Buy milk
-```
-
-Internally a map is represented by a B-tree. The implicit advantage of using a B-tree instead of a
-hash map is that a B-tree is sorted and therefore can be easily compared to another. Maps are also
-used by the interpreter as the data structure for holding variables. You can even inspect the active
-**execution context** by calling the built-in `context()` function.
-
-The map stores each [identifier](#identifiers)'s key with a value and the value's type. For internal
-use by the interpreter, a type can be set to a key without a value. This makes it possible to check
-the types of values before they are computed.
-
-### Function
-
-A function encapsulates a section of the abstract tree so that it can be run seperately and with
-different arguments. The function body is a [block](#block), so adding `async` will cause the body
-to run like any other `async` block. Unlike some languages, there are no concepts like futures or
-async functions in Dust.
-
-Functions are **first-class values** in Dust, so they can be assigned to variables like any other
-value.
-
-```dust
-# This simple function has no arguments and no return value.
-say_hi = () <none> {
-    output("hi") # The "output" function is a built-in that prints to stdout.
-}
-
-# This function has one argument and will return a value.
-add_one = (number <num>) <num> {
-    number + 1
-}
-
-say_hi()
-assert_equal(add_one(3), 4)
-```
-
-Functions can also be **anonymous**. This is useful for using **callbacks** (i.e. functions that are
-called by another function).
-
-```dust
-# Use a callback to retain only the numeric characters in a string.
-str:retain(
-	'a1b2c3'
-	(char <str>) <bool> {
-		is_some(int:parse(char))
-	}
-)
-```
-
-### Option
-
-An option represents a value that may not be present. It has two variants: **some** and **none**. 
-
-```dust
-say_something = (message <option(str)>) <str> {
-    either_or(message, "hiya")
-}
-
-say_something(some("goodbye"))
-# goodbye
-
-say_something(none)
-# hiya
-```
-
-Dust includes built-in functions to work with option values: `is_none`, `is_some` and `either_or`.
-
-### Structure
-
-A structure is a **concrete type value**. It is a value, like any other, and can be [assigned]
-(#assignment) to an [identifier](#identifier). It can then be instantiated as a [map](#map) that
-will only allow the variables present in the structure. Default values may be provided for each
-variable in the structure, which will be propagated to the map it creates. Values without defaults
-must be given a value during instantiation.
-
-```dust
-struct User {
-    name <str>
-    email <str>
-    id <int> = generate_id()
-}
-
-bob = new User {
-    name = "Bob"
-    email = "bob@example.com"
-}
-
-# The variable "bob" is a structured map.
-```
-
-A map created by using [new](#new) is called a **structured map**. In other languages it may be
-called a "homomorphic mapped type". Dust will generate errors if you try to set any values on the
-structured map that are not allowed by the structure.
-
-## Types
-
-Dust enforces strict type checking. To make the language easier to write, **type inference** is used
-to allow variables to be declared without specifying the type. Instead, the interpreter will figure
-it out and set the strictest type possible.
-
-To make the type-setting syntax easier to distinguish from the rest of your code, a **type
-specification** is wrapped in pointed brackets. So variable assignment using types looks like this:
-
-```dust
-my_float <float> = 666.0
-```
-
-### Basic Types
-
-The simple types, and their notation are:
-
-- boolean `bool`
-- integer `int`
-- float `float`
-- string `str`
-
-### Number
-
-The `num` type may represent a value of type `int` or `float`.
-
-### Any
-
-The `any` type does not enforce type bounds.
-
-### None
-
-The `none` type indicates that no value should be found after executing the statement or block, with
-one expection: the `none` variant of the `option` type.
-
-### List Type
-
-A list's contents can be specified to create type-safe lists. The `list(str)` type would only allow
-string values. Writing `list` without the parentheses and content type is equivalent to writing
-`list(any)`.
-
-### Map Type
-
-The `map` type is unstructured and can hold any key-value pair.
-
-### Iter
-
-The `iter` type refers to types that can be used with a [for loop](#for-loop). These include `list`,
-`range`, `string` and `map`.
-
-### Function Type
-
-A function's type specification is more complex than other types. A function value must always have
-its arguments and return type specified when the **function value** is created.
-
-```dust
-my_function = (number <int>, text <str>) <none> {
-    output(number)
-    output(text)
-}
-```
-
-But what if we need to specify a **function type** without creating the function value? This is
-necessary when using callbacks or defining structures that have functions set at instantiation.
-
-```dust
-use_adder = (adder <(int) -> int>, number <int>) -> <int> {
-    adder(number)
-}
-
-use_adder(
-    (i <int>) <int> { i + 2 }
-    40
-)
-
-# Output: 42
-```
-
-```dust
-struct Message {
-    send_n_times <(str, int) -> none>
-}
-
-stdout_message = new Message {
-    send_n_times = (content <str>, n <int>) <none> {
-        for _ in 0..n {
-            output(content)
-        }
-    }
-}
-```
-
-### Option Type
-
-The `option(type)` type is expected to be either `some(value)` or `none`. The type of the value
-inside the `some` is always specified.
-
-```dust
-result <option(str)> = none
-
-for file in fs:read_dir("./") {
-    if file:size > 100 {
-        result = some(file:path)
-        break
-    }
-}
-
-output(result)
-```
-
-```dust
-get_line_break_index(text <str>) <some(int)> {
-    str:find(text, '\n')
-}
-```
-
-### Custom Types
-
-Custom types such as **structures** are referenced by their variable identifier.
-
-```dust
-File = struct {
-    path <str>
-    size <int>
-    type <str>
-}
-
-print_file_info(file <File>) <none> {
-  	info = file:path
-    		+ '\n'
-    		+ file:size
-    		+ '\n' 
-    		+ file:type
-		
-  	output(info)
-}
-```
-
-## Statements
-
-TODO
-
-### Assignment
-
-TODO
-
-### Blocks
-
-TODO
-
-#### Synchronous Blocks
-
-TODO
-
-#### Asynchronous Blocks
-
-```dust
-# An async block will run each statement in its own thread.
-async {
-    output(random_integer())
-    output(random_float())
-    output(random_boolean())
-}
-```
-
-```dust
-data = async {
-    output("Reading a file...")
-    read("examples/assets/faithful.csv")
-}
-```
-
-### Break
-
-TODO
-
-### For Loop
-
-TODO
-
-```dust
-list = [ 1, 2, 3 ]
-
-for number in list {
-    output(number + 1)
-}
-```
-
-### While Loop
-
-TODO
-
-A **while** loop continues until a predicate is false.
-
-```dust
-i = 0
-while i < 10 {
-    output(i)
-    i += 1
-}
-```
-
-### If/Else
-
-TODO
-
-### Match
-
-TODO
-
-### Pipe
-
-TODO
-
-### Expression
-
-TODO
-
-## Expressions
-
-TODO
-
-#### Identifier
-
-TODO
-
-#### Index
-
-TODO
-
-#### Logic
-
-TODO
-
-#### Math
-
-TODO
-
-#### Value
-
-TODO
-
-#### New
-
-TODO
-
-#### Command
-
-TODO
-
-## Built-In Values
-
-TODO
-
-## Comments
-
-TODO

examples/async_commands.ds

@@ -1,17 +0,0 @@
-async {
-	{
-		^echo 'Starting 1...'
-		^sleep 1
-		^echo 'Finished 1.'
-	}
-	{
-		^echo 'Starting 2...'
-		^sleep 2
-		^echo 'Finished 2.'
-	}
-	{
-		^echo 'Starting 3...'
-		^sleep 3
-		^echo 'Finished 3.'
-	}
-}

examples/async_download.ds

@@ -1,20 +1,11 @@
-cast_len = 0
+cast = download("https://api.sampleapis.com/futurama/cast")
-characters_len = 0
+characters = download("https://api.sampleapis.com/futurama/characters")	
-episodes_len = 0
+episodes = download("https://api.sampleapis.com/futurama/episodes")
 
 async {	
-	{
-		cast = download("https://api.sampleapis.com/futurama/cast")
 	cast_len = length(from_json(cast))
-	}
-	{
-		characters = download("https://api.sampleapis.com/futurama/characters")	
 	characters_len = length(from_json(characters))
-	}
-	{
-		episodes = download("https://api.sampleapis.com/futurama/episodes")
 	episodes_len = length(from_json(episodes))
 }
-}
 
 output ([cast_len, characters_len, episodes_len])

examples/clue_solver.ds

@@ -51,3 +51,4 @@ take_turn(cards 'Conservatory' 'Kitchen')
 take_turn(cards 'White' 'Kitchen')
 take_turn(cards 'Green' 'Kitchen')
 take_turn(cards 'Knife' 'Kitchen')
+

examples/download.ds

@@ -1,10 +1,9 @@
-raw_data = download("https://api.sampleapis.com/futurama/cast")
+cast = (download "https://api.sampleapis.com/futurama/cast")
-cast_data = from_json(raw_data)
+characters = (download "https://api.sampleapis.com/futurama/characters")	
+episodes = (download "https://api.sampleapis.com/futurama/episodes")
 
-names = []
+cast_len = (length (from_json cast))
+characters_len = (length (from_json characters))
+episodes_len = (length (from_json episodes))
 
-for cast_member in cast_data {
+(output [cast_len, characters_len, episodes_len])
-	names += cast_member:name
-}
-
-assert_equal("Billy West", names:0)

examples/fetch.ds

@@ -0,0 +1,10 @@
+raw_data = download("https://api.sampleapis.com/futurama/cast")
+cast_data = from_json(raw_data)
+
+names = []
+
+for cast_member in cast_data {
+	names += cast_member:name
+}
+
+assert_equal("Billy West", names:0)

examples/for_loop.ds

@@ -0,0 +1,6 @@
+list = [1 2 3]
+
+for i in list {
+	i += 1
+	output(i)
+}

examples/guessing_game.ds

@@ -1,26 +0,0 @@
-# This is a Dust version of an example from the Rust Book.
-#
-# https://doc.rust-lang.org/book/ch02-00-guessing-game-tutorial.html
-
-output("Guess the number.")
-
-secret_number = int:random_range(0..=100)
-
-loop {
-	output("Please input your guess.")
-
-	input = io:stdin():expect("Failed to read line.")
-	guess = int:parse(input)
-
-	output("You guessed: " + guess)
-
-	match cmp(guess, secret_number) {
-		Ordering::Less -> output("Too small!")
-		Ordering::Greater -> output("Too big!")
-		Ordering::Equal -> {
-			output("You win!")
-			break
-		}
-	}
-}
-

examples/jq_data.ds

@@ -1,8 +1,8 @@
-data = json:parse(fs:read_file('examples/assets/jq_data.json'))
+data = json:parse(fs:read('examples/assets/jq_data.json'))
 
 new_data = []
 
-for commit_data in data as collection {	
+for commit_data in data {	
 	new_data += {
 		message = commit_data:commit:message
 		name = commit_data:commit:committer:name

examples/list.ds

@@ -0,0 +1,9 @@
+numbers = [1, 2, 3]
+
+x = numbers:0
+y = numbers:1
+z = numbers:2
+
+assert_equal(x + y, z)
+
+numbers

examples/map.ds

@@ -0,0 +1,11 @@
+dictionary = {
+	dust = "awesome"
+	answer = 42
+}
+
+output( 
+	'Dust is '
+	+ dictionary:dust
+	+ '! The answer is ' 
+	+ dictionary:answer
+)

examples/match.ds

@@ -0,0 +1,12 @@
+foo_or_bar = match random:boolean() {
+	true => "foo"
+	false => "bar"
+}
+
+num = match random:integer() {
+	1 => "one",
+	2 => { "two" },
+	* => "neither",
+}
+
+[foo_or_bar, num]

examples/option.ds

@@ -0,0 +1,22 @@
+create_user = (fn email <str>, name <option(str)>) <map> {
+	{
+		email = email
+		username = (either_or name email)
+	}
+}
+
+(assert_equal
+	{
+		email = "bob@example.com"
+		username = "bob"
+	},
+	(create_user "bob@example.com" some("bob"))
+)
+
+(assert_equal
+	{
+		email = "sue@example.com"
+		username = "sue@example.com"
+	},
+	(create_user "sue@example.com" none)
+)

examples/sea_creatures.ds

@@ -1,4 +1,4 @@
-raw_data = fs:read_file('examples/assets/seaCreatures.json')
+raw_data = fs:read('examples/assets/seaCreatures.json')
 sea_creatures = json:parse(raw_data)
 
 data = {

examples/threads.ds

@@ -0,0 +1,3 @@
+handle = thread:spawn("my_thread", {
+	
+})

examples/variables.ds

@@ -0,0 +1,10 @@
+x = 1
+y = "hello dust!"
+z = 42.0
+list = [3, 2, x]
+big_list = [x, y, z, list]
+foo = {
+	x = "bar" 
+	y = 42
+	z = 0
+}

examples/while_loop.ds

@@ -0,0 +1,6 @@
+i = 0
+
+while i < 10 {
+	output(i)
+	i += 1
+}

examples/yield.ds

@@ -0,0 +1,13 @@
+add_one = (numbers <[int]>) <[int]> {
+	new_numbers = []
+	
+	for number in numbers {
+		new_numbers += number + 1
+	}
+
+	new_numbers
+}
+
+foo = [1, 2, 3] -> add_one
+
+assert_equal([2 3 4] foo)

scripts/bench.fish

@@ -11,7 +11,7 @@ hyperfine \
       --shell none \
       --parameter-list data_path examples/assets/seaCreatures.json \
       --warmup 3 \
-      "target/release/dust -c 'length(json:parse(fs:read_file(\"{data_path}\")))'" \
+      "dust -c 'length(json:parse(input))' -p {data_path}" \
       "jq 'length' {data_path}" \
       "node --eval \"require('node:fs').readFile('{data_path}', (err, data)=>{console.log(JSON.parse(data).length)})\"" \
       "nu -c 'open {data_path} | length'"
@@ -20,7 +20,7 @@ hyperfine \
       --shell none \
       --parameter-list data_path examples/assets/jq_data.json \
       --warmup 3 \
-      "target/release/dust -c 'length(json:parse(fs:read_file(\"{data_path}\")))'" \
+      "dust -c 'length(json:parse(input))' -p {data_path}" \
       "jq 'length' {data_path}" \
       "node --eval \"require('node:fs').readFile('{data_path}', (err, data)=>{console.log(JSON.parse(data).length)})\"" \
       "nu -c 'open {data_path} | length'"
@@ -29,7 +29,7 @@ hyperfine \
       --shell none \
       --parameter-list data_path dielectron.json \
       --warmup 3 \
-      "target/release/dust -c 'length(json:parse(fs:read_file(\"{data_path}\")))'" \
+      "dust -c 'length(json:parse(input))' -p {data_path}" \
       "jq 'length' {data_path}" \
       "node --eval \"require('node:fs').readFile('{data_path}', (err, data)=>{console.log(JSON.parse(data).length)})\"" \
       "nu -c 'open {data_path} | length'"

src/abstract_tree/as.rs

@@ -1,131 +0,0 @@
-use serde::{Deserialize, Serialize};
-use tree_sitter::Node;
-
-use crate::{
-    error::{RuntimeError, SyntaxError, ValidationError},
-    AbstractTree, Context, Expression, Format, List, SourcePosition, Type, Value,
-};
-
-#[derive(Debug, Clone, Serialize, Deserialize, Eq, PartialEq, PartialOrd, Ord)]
-pub struct As {
-    expression: Expression,
-    r#type: Type,
-    position: SourcePosition,
-}
-
-impl AbstractTree for As {
-    fn from_syntax(node: Node, source: &str, context: &Context) -> Result<Self, SyntaxError> {
-        SyntaxError::expect_syntax_node("as", node)?;
-
-        let expression_node = node.child(0).unwrap();
-        let expression = Expression::from_syntax(expression_node, source, context)?;
-
-        let type_node = node.child(2).unwrap();
-        let r#type = Type::from_syntax(type_node, source, context)?;
-
-        Ok(As {
-            expression,
-            r#type,
-            position: SourcePosition::from(node.range()),
-        })
-    }
-
-    fn expected_type(&self, _context: &Context) -> Result<Type, ValidationError> {
-        Ok(self.r#type.clone())
-    }
-
-    fn validate(&self, _source: &str, context: &Context) -> Result<(), ValidationError> {
-        let initial_type = self.expression.expected_type(context)?;
-
-        if self.r#type.accepts(&initial_type) {
-            return Ok(());
-        }
-
-        if let Type::ListOf(item_type) = &self.r#type {
-            match &initial_type {
-                Type::ListOf(expected_item_type) => {
-                    println!("{item_type} {expected_item_type}");
-
-                    if !item_type.accepts(&expected_item_type) {
-                        return Err(ValidationError::TypeCheck {
-                            expected: self.r#type.clone(),
-                            actual: initial_type.clone(),
-                            position: self.position,
-                        });
-                    }
-                }
-                Type::String => {
-                    if let Type::String = item_type.as_ref() {
-                    } else {
-                        return Err(ValidationError::ConversionImpossible {
-                            initial_type,
-                            target_type: self.r#type.clone(),
-                        });
-                    }
-                }
-
-                Type::Any => {
-                    // Do no validation when converting from "any" to a list.
-                    // This effectively defers to runtime behavior, potentially
-                    // causing a runtime error.
-                }
-                _ => {
-                    return Err(ValidationError::ConversionImpossible {
-                        initial_type,
-                        target_type: self.r#type.clone(),
-                    })
-                }
-            }
-        }
-
-        Ok(())
-    }
-
-    fn run(&self, source: &str, context: &Context) -> Result<Value, RuntimeError> {
-        let value = self.expression.run(source, context)?;
-        let converted_value = if self.r#type.accepts(&value.r#type()?) {
-            return Ok(value);
-        } else if let Type::ListOf(_) = self.r#type {
-            match value {
-                Value::List(list) => Value::List(list),
-                Value::String(string) => {
-                    let chars = string
-                        .chars()
-                        .map(|char| Value::String(char.to_string()))
-                        .collect();
-
-                    Value::List(List::with_items(chars))
-                }
-                _ => {
-                    return Err(RuntimeError::ConversionImpossible {
-                        from: value.r#type()?,
-                        to: self.r#type.clone(),
-                        position: self.position.clone(),
-                    });
-                }
-            }
-        } else if let Type::Integer = self.r#type {
-            match value {
-                Value::Integer(integer) => Value::Integer(integer),
-                Value::Float(float) => Value::Integer(float as i64),
-                _ => {
-                    return Err(RuntimeError::ConversionImpossible {
-                        from: value.r#type()?,
-                        to: self.r#type.clone(),
-                        position: self.position.clone(),
-                    })
-                }
-            }
-        } else {
-            todo!()
-        };
-
-        Ok(converted_value)
-    }
-}
-
-impl Format for As {
-    fn format(&self, _output: &mut String, _indent_level: u8) {
-        todo!()
-    }
-}

src/abstract_tree/assignment.rs

@@ -1,29 +1,23 @@
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    context::Context,
+    AbstractTree, AssignmentOperator, Error, Format, Identifier, Map, Result, Statement,
-    error::{RuntimeError, SyntaxError, ValidationError},
+    SyntaxNode, SyntaxPosition, Type, TypeSpecification, Value,
-    AbstractTree, AssignmentOperator, Format, Function, Identifier, SourcePosition, Statement,
-    SyntaxNode, Type, TypeSpecification, Value,
 };
 
-/// Variable assignment, including add-assign and subtract-assign operations.
 #[derive(Debug, Clone, Serialize, Deserialize, Eq, PartialEq, PartialOrd, Ord)]
 pub struct Assignment {
     identifier: Identifier,
     type_specification: Option<TypeSpecification>,
     operator: AssignmentOperator,
     statement: Statement,
-    syntax_position: SourcePosition,
+
+    syntax_position: SyntaxPosition,
 }
 
 impl AbstractTree for Assignment {
-    fn from_syntax(
+    fn from_syntax(syntax_node: SyntaxNode, source: &str, context: &Map) -> Result<Self> {
-        syntax_node: SyntaxNode,
+        Error::expect_syntax_node(source, "assignment", syntax_node)?;
-        source: &str,
-        context: &Context,
-    ) -> Result<Self, SyntaxError> {
-        SyntaxError::expect_syntax_node("assignment", syntax_node)?;
 
         let child_count = syntax_node.child_count();
 
@@ -43,6 +37,16 @@ impl AbstractTree for Assignment {
         let statement_node = syntax_node.child(child_count - 1).unwrap();
         let statement = Statement::from_syntax(statement_node, source, context)?;
 
+        if let AssignmentOperator::Equal = operator {
+            let r#type = if let Some(definition) = &type_specification {
+                definition.inner().clone()
+            } else {
+                statement.expected_type(context)?
+            };
+
+            context.set_type(identifier.inner().clone(), r#type)?;
+        }
+
         Ok(Assignment {
             identifier,
             type_specification,
@@ -52,55 +56,29 @@ impl AbstractTree for Assignment {
         })
     }
 
-    fn validate(&self, source: &str, context: &Context) -> Result<(), ValidationError> {
+    fn check_type(&self, source: &str, context: &Map) -> Result<()> {
-        if let AssignmentOperator::Equal = self.operator {
+        let actual_type = self.statement.expected_type(context)?;
-            let r#type = if let Some(definition) = &self.type_specification {
-                definition.inner().clone()
-            } else {
-                self.statement.expected_type(context)?
-            };
-
-            log::info!("Setting type: {} <{}>", self.identifier, r#type);
-
-            context.set_type(self.identifier.clone(), r#type)?;
-        }
 
         if let Some(type_specification) = &self.type_specification {
             match self.operator {
                 AssignmentOperator::Equal => {
-                    let expected = type_specification.inner();
+                    type_specification
-                    let actual = self.statement.expected_type(context)?;
+                        .inner()
-
+                        .check(&actual_type)
-                    if !expected.accepts(&actual) {
+                        .map_err(|error| error.at_source_position(source, self.syntax_position))?;
-                        return Err(ValidationError::TypeCheck {
-                            expected: expected.clone(),
-                            actual,
-                            position: self.syntax_position,
-                        });
-                    }
                 }
                 AssignmentOperator::PlusEqual => {
-                    if let Type::ListOf(expected) = type_specification.inner() {
+                    if let Type::List(item_type) = type_specification.inner() {
-                        let actual = self.identifier.expected_type(context)?;
+                        item_type.check(&actual_type).map_err(|error| {
-
+                            error.at_source_position(source, self.syntax_position)
-                        if !expected.accepts(&actual) {
+                        })?;
-                            return Err(ValidationError::TypeCheck {
-                                expected: expected.as_ref().clone(),
-                                actual,
-                                position: self.syntax_position,
-                            });
-                        }
                     } else {
-                        let expected = type_specification.inner();
+                        type_specification
-                        let actual = self.identifier.expected_type(context)?;
+                            .inner()
-
+                            .check(&self.identifier.expected_type(context)?)
-                        if !expected.accepts(&actual) {
+                            .map_err(|error| {
-                            return Err(ValidationError::TypeCheck {
+                                error.at_source_position(source, self.syntax_position)
-                                expected: expected.clone(),
+                            })?;
-                                actual,
-                                position: self.syntax_position,
-                            });
-                        }
                     }
                 }
                 AssignmentOperator::MinusEqual => todo!(),
@@ -109,62 +87,53 @@ impl AbstractTree for Assignment {
             match self.operator {
                 AssignmentOperator::Equal => {}
                 AssignmentOperator::PlusEqual => {
-                    if let Type::ListOf(expected) = self.identifier.expected_type(context)? {
+                    if let Type::List(item_type) = self.identifier.expected_type(context)? {
-                        let actual = self.statement.expected_type(context)?;
+                        item_type.check(&actual_type).map_err(|error| {
-
+                            error.at_source_position(source, self.syntax_position)
-                        if !expected.accepts(&actual) {
+                        })?;
-                            return Err(ValidationError::TypeCheck {
-                                expected: expected.as_ref().clone(),
-                                actual,
-                                position: self.syntax_position,
-                            });
-                        }
                     }
                 }
                 AssignmentOperator::MinusEqual => todo!(),
             }
         }
 
-        self.statement.validate(source, context)?;
+        self.statement
+            .check_type(source, context)
+            .map_err(|error| error.at_source_position(source, self.syntax_position))?;
 
         Ok(())
     }
 
-    fn run(&self, source: &str, context: &Context) -> Result<Value, RuntimeError> {
+    fn run(&self, source: &str, context: &Map) -> Result<Value> {
-        let right = self.statement.run(source, context)?;
+        let key = self.identifier.inner();
+        let value = self.statement.run(source, context)?;
 
         let new_value = match self.operator {
             AssignmentOperator::PlusEqual => {
-                let left = self.identifier.run(source, context)?;
+                if let Some((mut previous_value, _)) = context.variables()?.get(key).cloned() {
-
+                    previous_value += value;
-                left.add(right, self.syntax_position)?
+                    previous_value
+                } else {
+                    return Err(Error::VariableIdentifierNotFound(key.clone()));
+                }
             }
             AssignmentOperator::MinusEqual => {
-                if let Some(left) = context.get_value(&self.identifier)? {
+                if let Some((mut previous_value, _)) = context.variables()?.get(key).cloned() {
-                    left.subtract(right, self.syntax_position)?
+                    previous_value -= value;
+                    previous_value
                 } else {
-                    return Err(RuntimeError::ValidationFailure(
+                    return Err(Error::VariableIdentifierNotFound(key.clone()));
-                        ValidationError::VariableIdentifierNotFound(self.identifier.clone()),
-                    ));
                 }
             }
-            AssignmentOperator::Equal => right,
+            AssignmentOperator::Equal => value,
         };
 
-        if let Value::Function(Function::ContextDefined(function_node)) = &new_value {
+        context.set(key.clone(), new_value)?;
-            function_node
-                .context()
-                .set_value(self.identifier.clone(), new_value.clone())?;
-        }
-
-        log::info!("RUN assignment: {} = {}", self.identifier, new_value);
-
-        context.set_value(self.identifier.clone(), new_value)?;
 
         Ok(Value::none())
     }
 
-    fn expected_type(&self, _context: &Context) -> Result<Type, ValidationError> {
+    fn expected_type(&self, _context: &Map) -> Result<Type> {
         Ok(Type::None)
     }
 }

src/abstract_tree/assignment_operator.rs

@@ -1,11 +1,7 @@
 use serde::{Deserialize, Serialize};
 
-use crate::{
+use crate::{AbstractTree, Error, Format, Map, Result, SyntaxNode, Type, Value};
-    error::{RuntimeError, SyntaxError, ValidationError},
-    AbstractTree, Context, Format, SyntaxNode, Type, Value,
-};
 
-/// Operators that be used in an assignment statement.
 #[derive(Debug, Clone, Serialize, Deserialize, Eq, PartialEq, PartialOrd, Ord)]
 pub enum AssignmentOperator {
     Equal,
@@ -14,12 +10,8 @@ pub enum AssignmentOperator {
 }
 
 impl AbstractTree for AssignmentOperator {
-    fn from_syntax(
+    fn from_syntax(node: SyntaxNode, source: &str, _context: &crate::Map) -> Result<Self> {
-        node: SyntaxNode,
+        Error::expect_syntax_node(source, "assignment_operator", node)?;
-        _source: &str,
-        _context: &Context,
-    ) -> Result<Self, SyntaxError> {
-        SyntaxError::expect_syntax_node("assignment_operator", node)?;
 
         let operator_node = node.child(0).unwrap();
         let operator = match operator_node.kind() {
@@ -27,10 +19,11 @@ impl AbstractTree for AssignmentOperator {
             "+=" => AssignmentOperator::PlusEqual,
             "-=" => AssignmentOperator::MinusEqual,
             _ => {
-                return Err(SyntaxError::UnexpectedSyntaxNode {
+                return Err(Error::UnexpectedSyntaxNode {
                     expected: "=, += or -=".to_string(),
                     actual: operator_node.kind().to_string(),
-                    position: node.range().into(),
+                    location: operator_node.start_position(),
+                    relevant_source: source[operator_node.byte_range()].to_string(),
                 })
             }
         };
@@ -38,17 +31,13 @@ impl AbstractTree for AssignmentOperator {
         Ok(operator)
     }
 
-    fn run(&self, _source: &str, _context: &Context) -> Result<Value, RuntimeError> {
+    fn run(&self, _source: &str, _context: &Map) -> Result<Value> {
         Ok(Value::none())
     }
 
-    fn expected_type(&self, _context: &Context) -> Result<Type, ValidationError> {
+    fn expected_type(&self, _context: &Map) -> Result<Type> {
         Ok(Type::None)
     }
-
-    fn validate(&self, _source: &str, _context: &Context) -> Result<(), ValidationError> {
-        Ok(())
-    }
 }
 
 impl Format for AssignmentOperator {

src/abstract_tree/block.rs

@@ -1,15 +1,9 @@
-use std::{
+use std::sync::RwLock;
-    fmt::{self, Formatter},
-    sync::RwLock,
-};
 
 use rayon::prelude::*;
 use serde::{Deserialize, Serialize};
 
-use crate::{
+use crate::{AbstractTree, Error, Format, Map, Result, Statement, SyntaxNode, Type, Value};
-    error::{rw_lock_error::RwLockError, RuntimeError, SyntaxError, ValidationError},
-    AbstractTree, Context, Format, Statement, SyntaxNode, Type, Value,
-};
 
 /// Abstract representation of a block.
 ///
@@ -19,26 +13,18 @@ use crate::{
 /// results in an error. Note that this will be the first statement to encounter
 /// an error at runtime, not necessarilly the first statement as they are
 /// written.
-#[derive(Clone, Serialize, Deserialize, Eq, PartialEq, PartialOrd, Ord)]
+#[derive(Debug, Clone, Serialize, Deserialize, Eq, PartialEq, PartialOrd, Ord)]
 pub struct Block {
     is_async: bool,
-    contains_return: bool,
     statements: Vec<Statement>,
 }
 
-impl Block {
-    pub fn contains_return(&self) -> bool {
-        self.contains_return
-    }
-}
-
 impl AbstractTree for Block {
-    fn from_syntax(node: SyntaxNode, source: &str, context: &Context) -> Result<Self, SyntaxError> {
+    fn from_syntax(node: SyntaxNode, source: &str, context: &Map) -> Result<Self> {
-        SyntaxError::expect_syntax_node("block", node)?;
+        Error::expect_syntax_node(source, "block", node)?;
 
         let first_child = node.child(0).unwrap();
         let is_async = first_child.kind() == "async";
-        let mut contains_return = false;
 
         let statement_count = if is_async {
             node.child_count() - 3
@@ -46,17 +32,12 @@ impl AbstractTree for Block {
             node.child_count() - 2
         };
         let mut statements = Vec::with_capacity(statement_count);
-        let block_context = Context::with_variables_from(context)?;
 
         for index in 1..node.child_count() - 1 {
             let child_node = node.child(index).unwrap();
 
             if child_node.kind() == "statement" {
-                let statement = Statement::from_syntax(child_node, source, &block_context)?;
+                let statement = Statement::from_syntax(child_node, source, context)?;
-
-                if statement.is_return() {
-                    contains_return = true;
-                }
 
                 statements.push(statement);
             }
@@ -64,20 +45,23 @@ impl AbstractTree for Block {
 
         Ok(Block {
             is_async,
-            contains_return,
             statements,
         })
     }
 
-    fn validate(&self, _source: &str, _context: &Context) -> Result<(), ValidationError> {
+    fn check_type(&self, _source: &str, _context: &Map) -> Result<()> {
         for statement in &self.statements {
-            statement.validate(_source, _context)?;
+            if let Statement::Return(inner_statement) = statement {
+                return inner_statement.check_type(_source, _context);
+            } else {
+                statement.check_type(_source, _context)?;
+            }
         }
 
         Ok(())
     }
 
-    fn run(&self, _source: &str, _context: &Context) -> Result<Value, RuntimeError> {
+    fn run(&self, source: &str, context: &Map) -> Result<Value> {
         if self.is_async {
             let statements = &self.statements;
             let final_result = RwLock::new(Ok(Value::none()));
@@ -86,14 +70,17 @@ impl AbstractTree for Block {
                 .into_par_iter()
                 .enumerate()
                 .find_map_first(|(index, statement)| {
-                    let result = statement.run(_source, _context);
+                    let result = statement.run(source, context);
-                    let should_return = if self.contains_return {
+                    let is_last_statement = index == statements.len() - 1;
-                        statement.is_return()
+                    let is_return_statement = if let Statement::Return(_) = statement {
+                        true
                     } else {
-                        index == statements.len() - 1
+                        false
                     };
 
-                    if should_return {
+                    if is_return_statement || result.is_err() {
+                        Some(result)
+                    } else if is_last_statement {
                         let get_write_lock = final_result.write();
 
                         match get_write_lock {
@@ -101,42 +88,44 @@ impl AbstractTree for Block {
                                 *final_result = result;
                                 None
                             }
-                            Err(_error) => Some(Err(RuntimeError::RwLock(RwLockError))),
+                            Err(error) => Some(Err(error.into())),
                         }
                     } else {
                         None
                     }
                 })
-                .unwrap_or(final_result.into_inner().map_err(|_| RwLockError)?)
+                .unwrap_or(final_result.into_inner()?)
         } else {
-            for (index, statement) in self.statements.iter().enumerate() {
+            let mut prev_result = None;
-                if statement.is_return() {
+
-                    return statement.run(_source, _context);
+            for statement in &self.statements {
+                if let Statement::Return(inner_statement) = statement {
+                    return inner_statement.run(source, context);
                 }
 
-                if index == self.statements.len() - 1 {
+                prev_result = Some(statement.run(source, context));
-                    return statement.run(_source, _context);
+            }
+
+            prev_result.unwrap_or(Ok(Value::none()))
         }
     }
 
-            Ok(Value::none())
+    fn expected_type(&self, context: &Map) -> Result<Type> {
+        if let Some(statement) = self.statements.iter().find(|statement| {
+            if let Statement::Return(_) = statement {
+                true
+            } else {
+                false
             }
-    }
+        }) {
-
+            statement.expected_type(context)
-    fn expected_type(&self, _context: &Context) -> Result<Type, ValidationError> {
+        } else if let Some(statement) = self.statements.last() {
-        for (index, statement) in self.statements.iter().enumerate() {
+            statement.expected_type(context)
-            if statement.is_return() {
+        } else {
-                return statement.expected_type(_context);
-            }
-
-            if index == self.statements.len() - 1 {
-                return statement.expected_type(_context);
-            }
-        }
-
             Ok(Type::None)
         }
     }
+}
 
 impl Format for Block {
     fn format(&self, output: &mut String, indent_level: u8) {
@@ -159,12 +148,3 @@ impl Format for Block {
         output.push('}');
     }
 }
-
-impl fmt::Debug for Block {
-    fn fmt(&self, f: &mut Formatter) -> fmt::Result {
-        f.debug_struct("Block")
-            .field("is_async", &self.is_async)
-            .field("statements", &self.statements)
-            .finish()
-    }
-}

src/abstract_tree/built_in_value.rs

@@ -0,0 +1,163 @@
+use std::{collections::BTreeMap, env::args, sync::OnceLock};
+
+use enum_iterator::{all, Sequence};
+use serde::{Deserialize, Serialize};
+
+use crate::{
+    built_in_functions::string_functions, AbstractTree, BuiltInFunction, Format, Function, List,
+    Map, Result, SyntaxNode, Type, Value,
+};
+
+static ARGS: OnceLock<Value> = OnceLock::new();
+static FS: OnceLock<Value> = OnceLock::new();
+static JSON: OnceLock<Value> = OnceLock::new();
+static RANDOM: OnceLock<Value> = OnceLock::new();
+static STRING: OnceLock<Value> = OnceLock::new();
+
+pub fn built_in_values() -> impl Iterator<Item = BuiltInValue> {
+    all()
+}
+
+#[derive(Sequence, Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize)]
+pub enum BuiltInValue {
+    Args,
+    AssertEqual,
+    Fs,
+    Json,
+    Length,
+    Output,
+    Random,
+    String,
+}
+
+impl BuiltInValue {
+    pub fn name(&self) -> &'static str {
+        match self {
+            BuiltInValue::Args => "args",
+            BuiltInValue::AssertEqual => "assert_equal",
+            BuiltInValue::Fs => "fs",
+            BuiltInValue::Json => "json",
+            BuiltInValue::Length => "length",
+            BuiltInValue::Output => "output",
+            BuiltInValue::Random => "random",
+            BuiltInValue::String => "string",
+        }
+    }
+
+    pub fn r#type(&self) -> Type {
+        match self {
+            BuiltInValue::Args => Type::list(Type::String),
+            BuiltInValue::AssertEqual => BuiltInFunction::AssertEqual.r#type(),
+            BuiltInValue::Fs => Type::Map(None),
+            BuiltInValue::Json => Type::Map(None),
+            BuiltInValue::Length => BuiltInFunction::Length.r#type(),
+            BuiltInValue::Output => BuiltInFunction::Output.r#type(),
+            BuiltInValue::Random => Type::Map(None),
+            BuiltInValue::String => Type::Map(None),
+        }
+    }
+
+    pub fn get(&self) -> &Value {
+        match self {
+            BuiltInValue::Args => ARGS.get_or_init(|| {
+                let args = args().map(|arg| Value::string(arg.to_string())).collect();
+
+                Value::List(List::with_items(args))
+            }),
+            BuiltInValue::AssertEqual => {
+                &Value::Function(Function::BuiltIn(BuiltInFunction::AssertEqual))
+            }
+            BuiltInValue::Fs => FS.get_or_init(|| {
+                let fs_context = Map::new();
+
+                fs_context
+                    .set(
+                        "read".to_string(),
+                        Value::Function(Function::BuiltIn(BuiltInFunction::FsRead)),
+                    )
+                    .unwrap();
+
+                Value::Map(fs_context)
+            }),
+            BuiltInValue::Json => JSON.get_or_init(|| {
+                let json_context = Map::new();
+
+                json_context
+                    .set(
+                        BuiltInFunction::JsonParse.name().to_string(),
+                        Value::Function(Function::BuiltIn(BuiltInFunction::JsonParse)),
+                    )
+                    .unwrap();
+
+                Value::Map(json_context)
+            }),
+            BuiltInValue::Length => &Value::Function(Function::BuiltIn(BuiltInFunction::Length)),
+            BuiltInValue::Output => &Value::Function(Function::BuiltIn(BuiltInFunction::Output)),
+            BuiltInValue::Random => RANDOM.get_or_init(|| {
+                let mut random_context = BTreeMap::new();
+
+                for built_in_function in [
+                    BuiltInFunction::RandomBoolean,
+                    BuiltInFunction::RandomFloat,
+                    BuiltInFunction::RandomFrom,
+                    BuiltInFunction::RandomInteger,
+                ] {
+                    let key = built_in_function.name().to_string();
+                    let value = Value::Function(Function::BuiltIn(built_in_function));
+                    let r#type = built_in_function.r#type();
+
+                    random_context.insert(key, (value, r#type));
+                }
+
+                Value::Map(Map::with_variables(random_context))
+            }),
+            BuiltInValue::String => STRING.get_or_init(|| {
+                let mut string_context = BTreeMap::new();
+
+                for string_function in string_functions() {
+                    let key = string_function.name().to_string();
+                    let value = Value::Function(Function::BuiltIn(BuiltInFunction::String(
+                        string_function,
+                    )));
+                    let r#type = string_function.r#type();
+
+                    string_context.insert(key, (value, r#type));
+                }
+
+                Value::Map(Map::with_variables(string_context))
+            }),
+        }
+    }
+}
+
+impl AbstractTree for BuiltInValue {
+    fn from_syntax(node: SyntaxNode, _source: &str, _context: &Map) -> Result<Self> {
+        let built_in_value = match node.kind() {
+            "args" => BuiltInValue::Args,
+            "assert_equal" => BuiltInValue::AssertEqual,
+            "fs" => BuiltInValue::Fs,
+            "json" => BuiltInValue::Json,
+            "length" => BuiltInValue::Length,
+            "output" => BuiltInValue::Output,
+            "random" => BuiltInValue::Random,
+            "string" => BuiltInValue::String,
+            _ => todo!(),
+        };
+
+        Ok(built_in_value)
+    }
+
+    fn run(&self, _source: &str, _context: &Map) -> Result<Value> {
+        Ok(self.get().clone())
+    }
+
+    fn expected_type(&self, _context: &Map) -> Result<Type> {
+        Ok(self.r#type())
+    }
+}
+
+impl Format for BuiltInValue {
+    fn format(&self, output: &mut String, _indent_level: u8) {
+        output.push_str(&self.get().to_string());
+    }
+}

src/abstract_tree/command.rs

@@ -1,76 +0,0 @@
-use std::process::{self, Stdio};
-
-use serde::{Deserialize, Serialize};
-use tree_sitter::Node as SyntaxNode;
-
-use crate::{
-    error::{RuntimeError, SyntaxError, ValidationError},
-    AbstractTree, Context, Format, Type, Value,
-};
-
-/// An external program invokation.
-#[derive(Debug, Clone, Serialize, Deserialize, Eq, PartialEq, PartialOrd, Ord)]
-pub struct Command {
-    command_text: String,
-    command_arguments: Vec<String>,
-}
-
-impl AbstractTree for Command {
-    fn from_syntax(
-        node: SyntaxNode,
-        source: &str,
-        _context: &Context,
-    ) -> Result<Self, SyntaxError> {
-        SyntaxError::expect_syntax_node("command", node)?;
-
-        let command_text_node = node.child(1).unwrap();
-        let command_text = source[command_text_node.byte_range()].to_string();
-
-        let mut command_arguments = Vec::new();
-
-        for index in 2..node.child_count() {
-            let text_node = node.child(index).unwrap();
-            let mut text = source[text_node.byte_range()].to_string();
-
-            if (text.starts_with('\'') && text.ends_with('\''))
-                || (text.starts_with('"') && text.ends_with('"'))
-                || (text.starts_with('`') && text.ends_with('`'))
-            {
-                text = text[1..text.len() - 1].to_string();
-            }
-
-            command_arguments.push(text);
-        }
-
-        Ok(Command {
-            command_text,
-            command_arguments,
-        })
-    }
-
-    fn expected_type(&self, _context: &Context) -> Result<Type, ValidationError> {
-        Ok(Type::String)
-    }
-
-    fn validate(&self, _source: &str, _context: &Context) -> Result<(), ValidationError> {
-        Ok(())
-    }
-
-    fn run(&self, _source: &str, _context: &Context) -> Result<Value, RuntimeError> {
-        let output = process::Command::new(&self.command_text)
-            .args(&self.command_arguments)
-            .stdout(Stdio::piped())
-            .stderr(Stdio::inherit())
-            .spawn()?
-            .wait_with_output()?
-            .stdout;
-
-        Ok(Value::String(String::from_utf8(output)?))
-    }
-}
-
-impl Format for Command {
-    fn format(&self, _output: &mut String, _indent_level: u8) {
-        todo!()
-    }
-}

src/abstract_tree/enum_defintion.rs

@@ -1,92 +0,0 @@
-use serde::{Deserialize, Serialize};
-use tree_sitter::Node as SyntaxNode;
-
-use crate::{
-    error::{RuntimeError, SyntaxError, ValidationError},
-    AbstractTree, Context, EnumInstance, Format, Identifier, Type, TypeDefinition, Value,
-};
-
-#[derive(Debug, Clone, Serialize, Deserialize, Eq, PartialEq, PartialOrd, Ord)]
-pub struct EnumDefinition {
-    identifier: Identifier,
-    variants: Vec<(Identifier, Vec<Type>)>,
-}
-
-impl EnumDefinition {
-    pub fn new(identifier: Identifier, variants: Vec<(Identifier, Vec<Type>)>) -> Self {
-        Self {
-            identifier,
-            variants,
-        }
-    }
-
-    pub fn instantiate(&self, variant: Identifier, content: Option<Value>) -> EnumInstance {
-        EnumInstance::new(self.identifier.clone(), variant, content)
-    }
-
-    pub fn identifier(&self) -> &Identifier {
-        &self.identifier
-    }
-
-    pub fn variants(&self) -> &Vec<(Identifier, Vec<Type>)> {
-        &self.variants
-    }
-}
-
-impl AbstractTree for EnumDefinition {
-    fn from_syntax(node: SyntaxNode, source: &str, context: &Context) -> Result<Self, SyntaxError> {
-        SyntaxError::expect_syntax_node("enum_definition", node)?;
-
-        let identifier_node = node.child(1).unwrap();
-        let identifier = Identifier::from_syntax(identifier_node, source, context)?;
-
-        let mut variants = Vec::new();
-        let mut current_identifier: Option<Identifier> = None;
-        let mut types = Vec::new();
-
-        for index in 3..node.child_count() - 1 {
-            let child = node.child(index).unwrap();
-
-            if child.kind() == "identifier" {
-                if let Some(identifier) = &current_identifier {
-                    variants.push((identifier.clone(), types));
-                }
-
-                current_identifier = Some(Identifier::from_syntax(child, source, context)?);
-                types = Vec::new();
-            }
-
-            if child.kind() == "type" {
-                let r#type = Type::from_syntax(child, source, context)?;
-
-                types.push(r#type);
-            }
-        }
-
-        Ok(EnumDefinition {
-            identifier,
-            variants,
-        })
-    }
-
-    fn expected_type(&self, _context: &Context) -> Result<Type, ValidationError> {
-        Ok(Type::None)
-    }
-
-    fn validate(&self, _source: &str, context: &Context) -> Result<(), ValidationError> {
-        context.set_definition(self.identifier.clone(), TypeDefinition::Enum(self.clone()))?;
-        self.identifier.validate(_source, context)?;
-
-        Ok(())
-    }
-
-    fn run(&self, _source: &str, _context: &Context) -> Result<Value, RuntimeError> {
-        Ok(Value::none())
-    }
-}
-
-impl Format for EnumDefinition {
-    fn format(&self, _output: &mut String, _indent_level: u8) {
-        todo!()
-    }
-}

src/abstract_tree/enum_pattern.rs

@@ -1,70 +0,0 @@
-use serde::{Deserialize, Serialize};
-use tree_sitter::Node as SyntaxNode;
-
-use crate::{
-    error::{RuntimeError, SyntaxError, ValidationError},
-    AbstractTree, Context, Format, Identifier, Type, Value,
-};
-
-#[derive(Debug, Clone, Serialize, Deserialize, Eq, PartialEq, PartialOrd, Ord)]
-pub struct EnumPattern {
-    name: Identifier,
-    variant: Identifier,
-    inner_identifier: Option<Identifier>,
-}
-
-impl EnumPattern {
-    pub fn name(&self) -> &Identifier {
-        &self.name
-    }
-
-    pub fn variant(&self) -> &Identifier {
-        &self.variant
-    }
-
-    pub fn inner_identifier(&self) -> &Option<Identifier> {
-        &self.inner_identifier
-    }
-}
-
-impl AbstractTree for EnumPattern {
-    fn from_syntax(node: SyntaxNode, source: &str, context: &Context) -> Result<Self, SyntaxError> {
-        SyntaxError::expect_syntax_node("enum_pattern", node)?;
-
-        let enum_name_node = node.child(0).unwrap();
-        let name = Identifier::from_syntax(enum_name_node, source, context)?;
-
-        let enum_variant_node = node.child(2).unwrap();
-        let variant = Identifier::from_syntax(enum_variant_node, source, context)?;
-
-        let inner_identifier = if let Some(child) = node.child(4) {
-            Some(Identifier::from_syntax(child, source, context)?)
-        } else {
-            None
-        };
-
-        Ok(EnumPattern {
-            name,
-            variant,
-            inner_identifier,
-        })
-    }
-
-    fn expected_type(&self, _context: &Context) -> Result<Type, ValidationError> {
-        Ok(Type::None)
-    }
-
-    fn validate(&self, _source: &str, _context: &Context) -> Result<(), ValidationError> {
-        Ok(())
-    }
-
-    fn run(&self, _source: &str, _context: &Context) -> Result<Value, RuntimeError> {
-        Ok(Value::none())
-    }
-}
-
-impl Format for EnumPattern {
-    fn format(&self, _output: &mut String, _indent_level: u8) {
-        todo!()
-    }
-}

src/abstract_tree/expression.rs

@@ -1,10 +1,8 @@
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    error::{RuntimeError, SyntaxError, ValidationError},
+    value_node::ValueNode, AbstractTree, Error, Format, FunctionCall, Identifier, Index, Logic,
-    value_node::ValueNode,
+    Map, Math, New, Result, SyntaxNode, Type, Value, Yield,
-    AbstractTree, As, Command, Context, Format, FunctionCall, Identifier, Index, Logic, Math,
-    SyntaxNode, Type, Value,
 };
 
 /// Abstract representation of an expression statement.
@@ -20,17 +18,13 @@ pub enum Expression {
     Math(Box<Math>),
     Logic(Box<Logic>),
     FunctionCall(Box<FunctionCall>),
-    Command(Command),
+    Yield(Box<Yield>),
-    As(Box<As>),
+    New(New),
 }
 
 impl AbstractTree for Expression {
-    fn from_syntax(
+    fn from_syntax(node: SyntaxNode, source: &str, _context: &Map) -> Result<Self> {
-        node: SyntaxNode,
+        Error::expect_syntax_node(source, "expression", node)?;
-        source: &str,
-        _context: &Context,
-    ) -> Result<Self, SyntaxError> {
-        SyntaxError::expect_syntax_node("expression", node)?;
 
         let child = if node.child(0).unwrap().is_named() {
             node.child(0).unwrap()
@@ -39,7 +33,6 @@ impl AbstractTree for Expression {
         };
 
         let expression = match child.kind() {
-            "as" => Expression::As(Box::new(As::from_syntax(child, source, _context)?)),
             "value" => Expression::Value(ValueNode::from_syntax(child, source, _context)?),
             "identifier" => {
                 Expression::Identifier(Identifier::from_syntax(child, source, _context)?)
@@ -50,13 +43,15 @@ impl AbstractTree for Expression {
             "function_call" => Expression::FunctionCall(Box::new(FunctionCall::from_syntax(
                 child, source, _context,
             )?)),
-            "command" => Expression::Command(Command::from_syntax(child, source, _context)?),
+            "yield" => Expression::Yield(Box::new(Yield::from_syntax(child, source, _context)?)),
+            "new" => Expression::New(New::from_syntax(child, source, _context)?),
             _ => {
-                return Err(SyntaxError::UnexpectedSyntaxNode {
+                return Err(Error::UnexpectedSyntaxNode {
-                    expected: "value, identifier, index, math, logic, function call, as or command"
+                    expected: "value, identifier, index, math, logic, function call, new or ->"
                         .to_string(),
                     actual: child.kind().to_string(),
-                    position: node.range().into(),
+                    location: child.start_position(),
+                    relevant_source: source[child.byte_range()].to_string(),
                 })
             }
         };
@@ -64,33 +59,20 @@ impl AbstractTree for Expression {
         Ok(expression)
     }
 
-    fn expected_type(&self, _context: &Context) -> Result<Type, ValidationError> {
+    fn check_type(&self, _source: &str, _context: &Map) -> Result<()> {
         match self {
-            Expression::Value(value_node) => value_node.expected_type(_context),
+            Expression::Value(value_node) => value_node.check_type(_source, _context),
-            Expression::Identifier(identifier) => identifier.expected_type(_context),
+            Expression::Identifier(identifier) => identifier.check_type(_source, _context),
-            Expression::Math(math) => math.expected_type(_context),
+            Expression::Math(math) => math.check_type(_source, _context),
-            Expression::Logic(logic) => logic.expected_type(_context),
+            Expression::Logic(logic) => logic.check_type(_source, _context),
-            Expression::FunctionCall(function_call) => function_call.expected_type(_context),
+            Expression::FunctionCall(function_call) => function_call.check_type(_source, _context),
-            Expression::Index(index) => index.expected_type(_context),
+            Expression::Index(index) => index.check_type(_source, _context),
-            Expression::Command(command) => command.expected_type(_context),
+            Expression::Yield(r#yield) => r#yield.check_type(_source, _context),
-            Expression::As(r#as) => r#as.expected_type(_context),
+            Expression::New(new) => new.check_type(_source, _context),
         }
     }
 
-    fn validate(&self, _source: &str, _context: &Context) -> Result<(), ValidationError> {
+    fn run(&self, _source: &str, _context: &Map) -> Result<Value> {
-        match self {
-            Expression::Value(value_node) => value_node.validate(_source, _context),
-            Expression::Identifier(identifier) => identifier.validate(_source, _context),
-            Expression::Math(math) => math.validate(_source, _context),
-            Expression::Logic(logic) => logic.validate(_source, _context),
-            Expression::FunctionCall(function_call) => function_call.validate(_source, _context),
-            Expression::Index(index) => index.validate(_source, _context),
-            Expression::Command(command) => command.validate(_source, _context),
-            Expression::As(r#as) => r#as.validate(_source, _context),
-        }
-    }
-
-    fn run(&self, _source: &str, _context: &Context) -> Result<Value, RuntimeError> {
         match self {
             Expression::Value(value_node) => value_node.run(_source, _context),
             Expression::Identifier(identifier) => identifier.run(_source, _context),
@@ -98,8 +80,21 @@ impl AbstractTree for Expression {
             Expression::Logic(logic) => logic.run(_source, _context),
             Expression::FunctionCall(function_call) => function_call.run(_source, _context),
             Expression::Index(index) => index.run(_source, _context),
-            Expression::Command(command) => command.run(_source, _context),
+            Expression::Yield(r#yield) => r#yield.run(_source, _context),
-            Expression::As(r#as) => r#as.run(_source, _context),
+            Expression::New(new) => new.run(_source, _context),
+        }
+    }
+
+    fn expected_type(&self, _context: &Map) -> Result<Type> {
+        match self {
+            Expression::Value(value_node) => value_node.expected_type(_context),
+            Expression::Identifier(identifier) => identifier.expected_type(_context),
+            Expression::Math(math) => math.expected_type(_context),
+            Expression::Logic(logic) => logic.expected_type(_context),
+            Expression::FunctionCall(function_call) => function_call.expected_type(_context),
+            Expression::Index(index) => index.expected_type(_context),
+            Expression::Yield(r#yield) => r#yield.expected_type(_context),
+            Expression::New(new) => new.expected_type(_context),
         }
     }
 }
@@ -113,8 +108,8 @@ impl Format for Expression {
             Expression::Logic(logic) => logic.format(_output, _indent_level),
             Expression::FunctionCall(function_call) => function_call.format(_output, _indent_level),
             Expression::Index(index) => index.format(_output, _indent_level),
-            Expression::Command(command) => command.format(_output, _indent_level),
+            Expression::Yield(r#yield) => r#yield.format(_output, _indent_level),
-            Expression::As(r#as) => r#as.format(_output, _indent_level),
+            Expression::New(new) => new.format(_output, _indent_level),
         }
     }
 }

src/abstract_tree/for.rs

@@ -2,8 +2,7 @@ use rayon::prelude::*;
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    error::{RuntimeError, SyntaxError, ValidationError},
+    AbstractTree, Block, Error, Expression, Format, Identifier, Map, Result, SyntaxNode, Type,
-    AbstractTree, Block, Context, Expression, Format, Identifier, SourcePosition, SyntaxNode, Type,
     Value,
 };
 
@@ -14,25 +13,22 @@ pub struct For {
     item_id: Identifier,
     collection: Expression,
     block: Block,
-    source_position: SourcePosition,
-
-    #[serde(skip)]
-    context: Context,
 }
 
 impl AbstractTree for For {
-    fn from_syntax(node: SyntaxNode, source: &str, context: &Context) -> Result<Self, SyntaxError> {
+    fn from_syntax(node: SyntaxNode, source: &str, context: &Map) -> Result<Self> {
-        SyntaxError::expect_syntax_node("for", node)?;
+        Error::expect_syntax_node(source, "for", node)?;
 
         let for_node = node.child(0).unwrap();
         let is_async = match for_node.kind() {
             "for" => false,
             "async for" => true,
             _ => {
-                return Err(SyntaxError::UnexpectedSyntaxNode {
+                return Err(Error::UnexpectedSyntaxNode {
                     expected: "for or async for".to_string(),
                     actual: for_node.kind().to_string(),
-                    position: node.range().into(),
+                    location: for_node.start_position(),
+                    relevant_source: source[for_node.byte_range()].to_string(),
                 })
             }
         };
@@ -43,97 +39,46 @@ impl AbstractTree for For {
         let expression_node = node.child(3).unwrap();
         let expression = Expression::from_syntax(expression_node, source, context)?;
 
-        let loop_context = Context::with_variables_from(context)?;
-
         let item_node = node.child(4).unwrap();
-        let item = Block::from_syntax(item_node, source, &loop_context)?;
+        let item = Block::from_syntax(item_node, source, context)?;
 
         Ok(For {
             is_async,
             item_id: identifier,
             collection: expression,
             block: item,
-            source_position: SourcePosition::from(node.range()),
-            context: loop_context,
         })
     }
 
-    fn expected_type(&self, _context: &Context) -> Result<Type, ValidationError> {
+    fn run(&self, source: &str, context: &Map) -> Result<Value> {
-        Ok(Type::None)
-    }
-
-    fn validate(&self, _source: &str, context: &Context) -> Result<(), ValidationError> {
-        self.collection.validate(_source, context)?;
-
-        let collection_type = self.collection.expected_type(context)?;
-        let item_type = match collection_type {
-            Type::Any => Type::Any,
-            Type::Collection => Type::Any,
-            Type::List => Type::Any,
-            Type::ListOf(_) => todo!(),
-            Type::ListExact(_) => todo!(),
-            Type::Map(_) => todo!(),
-            Type::String => todo!(),
-            Type::Range => todo!(),
-            _ => {
-                return Err(ValidationError::TypeCheck {
-                    expected: Type::Collection,
-                    actual: collection_type,
-                    position: self.source_position,
-                });
-            }
-        };
-        let key = self.item_id.clone();
-
-        self.context.inherit_all_from(context)?;
-        self.context.set_type(key, item_type)?;
-        self.item_id.validate(_source, &self.context)?;
-        self.block.validate(_source, &self.context)
-    }
-
-    fn run(&self, source: &str, context: &Context) -> Result<Value, RuntimeError> {
-        self.context.inherit_all_from(context)?;
-
         let expression_run = self.collection.run(source, context)?;
-        let key = &self.item_id;
+        let values = expression_run.as_list()?.items();
+        let key = self.item_id.inner();
 
-        if let Value::Range(range) = expression_run {
         if self.is_async {
-                range.into_par_iter().try_for_each(|integer| {
+            values.par_iter().try_for_each(|value| {
-                    self.context.add_allowance(key)?;
+                let iter_context = Map::clone_from(context)?;
-                    self.context
+
-                        .set_value(key.clone(), Value::Integer(integer))?;
+                iter_context.set(key.clone(), value.clone())?;
-                    self.block.run(source, &self.context).map(|_value| ())
+
+                self.block.run(source, &iter_context).map(|_value| ())
             })?;
         } else {
-                for i in range {
+            let loop_context = Map::clone_from(context)?;
-                    self.context.add_allowance(key)?;
-                    self.context.set_value(key.clone(), Value::Integer(i))?;
-                    self.block.run(source, &self.context)?;
-                }
-            }
 
-            return Ok(Value::none());
+            for value in values.iter() {
-        }
+                loop_context.set(key.clone(), value.clone())?;
 
-        if let Value::List(list) = &expression_run {
+                self.block.run(source, &loop_context)?;
-            if self.is_async {
-                list.items()?.par_iter().try_for_each(|value| {
-                    self.context.add_allowance(key)?;
-                    self.context.set_value(key.clone(), value.clone())?;
-                    self.block.run(source, &self.context).map(|_value| ())
-                })?;
-            } else {
-                for value in list.items()?.iter() {
-                    self.context.add_allowance(key)?;
-                    self.context.set_value(key.clone(), value.clone())?;
-                    self.block.run(source, &self.context)?;
-                }
             }
         }
 
         Ok(Value::none())
     }
+
+    fn expected_type(&self, _context: &Map) -> Result<Type> {
+        Ok(Type::None)
+    }
 }
 
 impl Format for For {

src/abstract_tree/function_call.rs

@@ -1,26 +1,22 @@
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    built_in_functions::Callable,
+    AbstractTree, Error, Expression, Format, FunctionExpression, Map, Result, SyntaxNode,
-    error::{RuntimeError, SyntaxError, ValidationError},
+    SyntaxPosition, Type, Value,
-    AbstractTree, Context, Expression, Format, Function, FunctionExpression, SourcePosition,
-    SyntaxNode, Type, Value,
 };
 
-/// A function being invoked and the arguments it is being passed.
 #[derive(Debug, Clone, Serialize, Deserialize, Eq, PartialEq, PartialOrd, Ord)]
 pub struct FunctionCall {
     function_expression: FunctionExpression,
     arguments: Vec<Expression>,
-    syntax_position: SourcePosition,
+    syntax_position: SyntaxPosition,
 }
 
 impl FunctionCall {
-    /// Returns a new FunctionCall.
     pub fn new(
         function_expression: FunctionExpression,
         arguments: Vec<Expression>,
-        syntax_position: SourcePosition,
+        syntax_position: SyntaxPosition,
     ) -> Self {
         Self {
             function_expression,
@@ -31,8 +27,8 @@ impl FunctionCall {
 }
 
 impl AbstractTree for FunctionCall {
-    fn from_syntax(node: SyntaxNode, source: &str, context: &Context) -> Result<Self, SyntaxError> {
+    fn from_syntax(node: SyntaxNode, source: &str, context: &Map) -> Result<Self> {
-        SyntaxError::expect_syntax_node("function_call", node)?;
+        Error::expect_syntax_node(source, "function_call", node)?;
 
         let function_node = node.child(0).unwrap();
         let function_expression = FunctionExpression::from_syntax(function_node, source, context)?;
@@ -56,7 +52,75 @@ impl AbstractTree for FunctionCall {
         })
     }
 
-    fn expected_type(&self, context: &Context) -> Result<Type, ValidationError> {
+    fn check_type(&self, source: &str, context: &Map) -> Result<()> {
+        let function_expression_type = self.function_expression.expected_type(context)?;
+
+        let parameter_types = match function_expression_type {
+            Type::Function {
+                parameter_types, ..
+            } => parameter_types,
+            Type::Any => return Ok(()),
+            _ => {
+                return Err(Error::TypeCheckExpectedFunction {
+                    actual: function_expression_type,
+                }
+                .at_source_position(source, self.syntax_position))
+            }
+        };
+
+        if self.arguments.len() != parameter_types.len() {
+            return Err(Error::ExpectedFunctionArgumentAmount {
+                expected: parameter_types.len(),
+                actual: self.arguments.len(),
+            }
+            .at_source_position(source, self.syntax_position));
+        }
+
+        for (index, expression) in self.arguments.iter().enumerate() {
+            if let Some(r#type) = parameter_types.get(index) {
+                r#type
+                    .check(&expression.expected_type(context)?)
+                    .map_err(|error| error.at_source_position(source, self.syntax_position))?;
+            }
+        }
+
+        Ok(())
+    }
+
+    fn run(&self, source: &str, context: &Map) -> Result<Value> {
+        let value = match &self.function_expression {
+            FunctionExpression::Identifier(identifier) => {
+                let key = identifier.inner();
+                let variables = context.variables()?;
+
+                if let Some((value, _)) = variables.get(key) {
+                    value.clone()
+                } else {
+                    return Err(Error::FunctionIdentifierNotFound(
+                        identifier.inner().clone(),
+                    ));
+                }
+            }
+            FunctionExpression::FunctionCall(function_call) => {
+                function_call.run(source, context)?
+            }
+            FunctionExpression::Value(value_node) => value_node.run(source, context)?,
+            FunctionExpression::Index(index) => index.run(source, context)?,
+            FunctionExpression::Yield(r#yield) => r#yield.run(source, context)?,
+        };
+
+        let mut arguments = Vec::with_capacity(self.arguments.len());
+
+        for expression in &self.arguments {
+            let value = expression.run(source, context)?;
+
+            arguments.push(value);
+        }
+
+        value.as_function()?.call(&arguments, source, context)
+    }
+
+    fn expected_type(&self, context: &Map) -> Result<Type> {
         match &self.function_expression {
             FunctionExpression::Identifier(identifier) => {
                 let identifier_type = identifier.expected_type(context)?;
@@ -81,109 +145,8 @@ impl AbstractTree for FunctionCall {
                     Ok(value_type)
                 }
             }
-            FunctionExpression::Index(index) => {
+            FunctionExpression::Index(index) => index.expected_type(context),
-                let index_type = index.expected_type(context)?;
+            FunctionExpression::Yield(r#yield) => r#yield.expected_type(context),
-
-                if let Type::Function { return_type, .. } = index_type {
-                    Ok(*return_type)
-                } else {
-                    Ok(index_type)
-                }
-            }
-        }
-    }
-
-    fn validate(&self, _source: &str, context: &Context) -> Result<(), ValidationError> {
-        self.function_expression.validate(_source, context)?;
-
-        let function_expression_type = self.function_expression.expected_type(context)?;
-
-        let parameter_types = if let Type::Function {
-            parameter_types, ..
-        } = function_expression_type
-        {
-            parameter_types
-        } else {
-            return Err(ValidationError::TypeCheckExpectedFunction {
-                actual: function_expression_type,
-                position: self.syntax_position,
-            });
-        };
-
-        if self.arguments.len() != parameter_types.len() {
-            return Err(ValidationError::ExpectedFunctionArgumentAmount {
-                expected: parameter_types.len(),
-                actual: self.arguments.len(),
-                position: self.syntax_position,
-            });
-        }
-
-        for (index, expression) in self.arguments.iter().enumerate() {
-            expression.validate(_source, context)?;
-
-            if let Some(expected) = parameter_types.get(index) {
-                let actual = expression.expected_type(context)?;
-
-                if !expected.accepts(&actual) {
-                    return Err(ValidationError::TypeCheck {
-                        expected: expected.clone(),
-                        actual,
-                        position: self.syntax_position,
-                    });
-                }
-            }
-        }
-
-        Ok(())
-    }
-
-    fn run(&self, source: &str, context: &Context) -> Result<Value, RuntimeError> {
-        let value = match &self.function_expression {
-            FunctionExpression::Identifier(identifier) => {
-                if let Some(value) = context.get_value(identifier)? {
-                    value.clone()
-                } else {
-                    return Err(RuntimeError::ValidationFailure(
-                        ValidationError::VariableIdentifierNotFound(identifier.clone()),
-                    ));
-                }
-            }
-            FunctionExpression::FunctionCall(function_call) => {
-                function_call.run(source, context)?
-            }
-            FunctionExpression::Value(value_node) => value_node.run(source, context)?,
-            FunctionExpression::Index(index) => index.run(source, context)?,
-        };
-        let function = value.as_function()?;
-
-        match function {
-            Function::BuiltIn(built_in_function) => {
-                let mut arguments = Vec::with_capacity(self.arguments.len());
-
-                for expression in &self.arguments {
-                    let value = expression.run(source, context)?;
-
-                    arguments.push(value);
-                }
-
-                built_in_function.call(&arguments, source, context)
-            }
-            Function::ContextDefined(function_node) => {
-                let call_context = Context::with_variables_from(function_node.context())?;
-
-                call_context.inherit_from(context)?;
-
-                let parameter_expression_pairs =
-                    function_node.parameters().iter().zip(self.arguments.iter());
-
-                for (identifier, expression) in parameter_expression_pairs {
-                    let value = expression.run(source, context)?;
-
-                    call_context.set_value(identifier.clone(), value)?;
-                }
-
-                function_node.body().run(source, &call_context)
-            }
         }
     }
 }

src/abstract_tree/function_expression.rs

@@ -1,9 +1,8 @@
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    error::{RuntimeError, SyntaxError, ValidationError},
+    AbstractTree, Error, Format, FunctionCall, Identifier, Index, Map, Result, SyntaxNode, Type,
-    AbstractTree, Context, Format, FunctionCall, Identifier, Index, SyntaxNode, Type, Value,
+    Value, ValueNode, Yield,
-    ValueNode,
 };
 
 #[derive(Debug, Clone, Serialize, Deserialize, Eq, PartialEq, PartialOrd, Ord)]
@@ -12,11 +11,12 @@ pub enum FunctionExpression {
     FunctionCall(Box<FunctionCall>),
     Value(ValueNode),
     Index(Index),
+    Yield(Box<Yield>),
 }
 
 impl AbstractTree for FunctionExpression {
-    fn from_syntax(node: SyntaxNode, source: &str, context: &Context) -> Result<Self, SyntaxError> {
+    fn from_syntax(node: SyntaxNode, source: &str, context: &Map) -> Result<Self> {
-        SyntaxError::expect_syntax_node("function_expression", node)?;
+        Error::expect_syntax_node(source, "function_expression", node)?;
 
         let first_child = node.child(0).unwrap();
         let child = if first_child.is_named() {
@@ -35,11 +35,15 @@ impl AbstractTree for FunctionExpression {
             )),
             "value" => FunctionExpression::Value(ValueNode::from_syntax(child, source, context)?),
             "index" => FunctionExpression::Index(Index::from_syntax(child, source, context)?),
+            "yield" => {
+                FunctionExpression::Yield(Box::new(Yield::from_syntax(child, source, context)?))
+            }
             _ => {
-                return Err(SyntaxError::UnexpectedSyntaxNode {
+                return Err(Error::UnexpectedSyntaxNode {
-                    expected: "identifier, function call, value or index".to_string(),
+                    expected: "identifier, function call, value, index or yield".to_string(),
                     actual: child.kind().to_string(),
-                    position: node.range().into(),
+                    location: child.start_position(),
+                    relevant_source: source[child.byte_range()].to_string(),
                 })
             }
         };
@@ -47,32 +51,23 @@ impl AbstractTree for FunctionExpression {
         Ok(function_expression)
     }
 
-    fn expected_type(&self, context: &Context) -> Result<Type, ValidationError> {
+    fn run(&self, source: &str, context: &Map) -> Result<Value> {
-        match self {
-            FunctionExpression::Identifier(identifier) => identifier.expected_type(context),
-            FunctionExpression::FunctionCall(function_call) => function_call.expected_type(context),
-            FunctionExpression::Value(value_node) => value_node.expected_type(context),
-            FunctionExpression::Index(index) => index.expected_type(context),
-        }
-    }
-
-    fn validate(&self, _source: &str, _context: &Context) -> Result<(), ValidationError> {
-        match self {
-            FunctionExpression::Identifier(identifier) => identifier.validate(_source, _context),
-            FunctionExpression::FunctionCall(function_call) => {
-                function_call.validate(_source, _context)
-            }
-            FunctionExpression::Value(value_node) => value_node.validate(_source, _context),
-            FunctionExpression::Index(index) => index.validate(_source, _context),
-        }
-    }
-
-    fn run(&self, source: &str, context: &Context) -> Result<Value, RuntimeError> {
         match self {
             FunctionExpression::Identifier(identifier) => identifier.run(source, context),
             FunctionExpression::FunctionCall(function_call) => function_call.run(source, context),
             FunctionExpression::Value(value_node) => value_node.run(source, context),
             FunctionExpression::Index(index) => index.run(source, context),
+            FunctionExpression::Yield(r#yield) => r#yield.run(source, context),
+        }
+    }
+
+    fn expected_type(&self, context: &Map) -> Result<Type> {
+        match self {
+            FunctionExpression::Identifier(identifier) => identifier.expected_type(context),
+            FunctionExpression::FunctionCall(function_call) => function_call.expected_type(context),
+            FunctionExpression::Value(value_node) => value_node.expected_type(context),
+            FunctionExpression::Index(index) => index.expected_type(context),
+            FunctionExpression::Yield(r#yield) => r#yield.expected_type(context),
         }
     }
 }
@@ -86,6 +81,7 @@ impl Format for FunctionExpression {
                 function_call.format(output, indent_level)
             }
             FunctionExpression::Index(index) => index.format(output, indent_level),
+            FunctionExpression::Yield(r#yield) => r#yield.format(output, indent_level),
         }
     }
 }

src/abstract_tree/function_node.rs

@@ -3,9 +3,8 @@ use std::fmt::{self, Display, Formatter};
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    error::{RuntimeError, SyntaxError, ValidationError},
+    AbstractTree, Block, Error, Format, Function, Identifier, Map, Result, SyntaxNode,
-    AbstractTree, Block, Context, Format, Function, Identifier, SourcePosition, SyntaxNode, Type,
+    SyntaxPosition, Type, TypeSpecification, Value,
-    TypeSpecification, Value,
 };
 
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord)]
@@ -13,13 +12,30 @@ pub struct FunctionNode {
     parameters: Vec<Identifier>,
     body: Block,
     r#type: Type,
-    syntax_position: SourcePosition,
+    syntax_position: SyntaxPosition,
-
+    context: Map,
-    #[serde(skip)]
-    context: Context,
 }
 
 impl FunctionNode {
+    pub fn new(
+        parameters: Vec<Identifier>,
+        body: Block,
+        r#type: Type,
+        syntax_position: SyntaxPosition,
+    ) -> Self {
+        Self {
+            parameters,
+            body,
+            r#type,
+            syntax_position,
+            context: Map::new(),
+        }
+    }
+
+    pub fn set(&self, key: String, value: Value) -> Result<Option<(Value, Type)>> {
+        self.context.set(key, value)
+    }
+
     pub fn parameters(&self) -> &Vec<Identifier> {
         &self.parameters
     }
@@ -32,14 +48,10 @@ impl FunctionNode {
         &self.r#type
     }
 
-    pub fn syntax_position(&self) -> &SourcePosition {
+    pub fn syntax_position(&self) -> &SyntaxPosition {
         &self.syntax_position
     }
 
-    pub fn context(&self) -> &Context {
-        &self.context
-    }
-
     pub fn return_type(&self) -> &Type {
         match &self.r#type {
             Type::Function {
@@ -49,11 +61,37 @@ impl FunctionNode {
             _ => &Type::None,
         }
     }
+
+    pub fn call(&self, arguments: &[Value], source: &str, outer_context: &Map) -> Result<Value> {
+        for (key, (value, r#type)) in outer_context.variables()?.iter() {
+            if let Value::Function(Function::ContextDefined(function_node)) = value {
+                if self == function_node {
+                    continue;
+                }
+            }
+
+            if r#type.is_function() {
+                self.context.set(key.clone(), value.clone())?;
+            }
+        }
+
+        let parameter_argument_pairs = self.parameters.iter().zip(arguments.iter());
+
+        for (identifier, value) in parameter_argument_pairs {
+            let key = identifier.inner().clone();
+
+            self.context.set(key, value.clone())?;
+        }
+
+        let return_value = self.body.run(source, &self.context)?;
+
+        Ok(return_value)
+    }
 }
 
 impl AbstractTree for FunctionNode {
-    fn from_syntax(node: SyntaxNode, source: &str, context: &Context) -> Result<Self, SyntaxError> {
+    fn from_syntax(node: SyntaxNode, source: &str, outer_context: &Map) -> Result<Self> {
-        SyntaxError::expect_syntax_node("function", node)?;
+        Error::expect_syntax_node(source, "function", node)?;
 
         let child_count = node.child_count();
         let mut parameters = Vec::new();
@@ -63,22 +101,33 @@ impl AbstractTree for FunctionNode {
             let child = node.child(index).unwrap();
 
             if child.kind() == "identifier" {
-                let identifier = Identifier::from_syntax(child, source, context)?;
+                let identifier = Identifier::from_syntax(child, source, outer_context)?;
 
                 parameters.push(identifier);
             }
 
             if child.kind() == "type_specification" {
-                let type_specification = TypeSpecification::from_syntax(child, source, context)?;
+                let type_specification =
+                    TypeSpecification::from_syntax(child, source, outer_context)?;
 
                 parameter_types.push(type_specification.take_inner());
             }
         }
 
         let return_type_node = node.child(child_count - 2).unwrap();
-        let return_type = TypeSpecification::from_syntax(return_type_node, source, context)?;
+        let return_type = TypeSpecification::from_syntax(return_type_node, source, outer_context)?;
 
-        let function_context = Context::with_variables_from(context)?;
+        let function_context = Map::new();
+
+        for (key, (_value, r#type)) in outer_context.variables()?.iter() {
+            if r#type.is_function() {
+                function_context.set_type(key.clone(), r#type.clone())?;
+            }
+        }
+
+        for (parameter, parameter_type) in parameters.iter().zip(parameter_types.iter()) {
+            function_context.set_type(parameter.inner().clone(), parameter_type.clone())?;
+        }
 
         let body_node = node.child(child_count - 1).unwrap();
         let body = Block::from_syntax(body_node, source, &function_context)?;
@@ -95,49 +144,21 @@ impl AbstractTree for FunctionNode {
         })
     }
 
-    fn expected_type(&self, _context: &Context) -> Result<Type, ValidationError> {
+    fn check_type(&self, source: &str, _context: &Map) -> Result<()> {
-        Ok(self.r#type().clone())
+        self.return_type()
-    }
+            .check(&self.body.expected_type(&self.context)?)
-
+            .map_err(|error| error.at_source_position(source, self.syntax_position))?;
-    fn validate(&self, source: &str, context: &Context) -> Result<(), ValidationError> {
+        self.body.check_type(source, &self.context)?;
-        if let Type::Function {
-            parameter_types,
-            return_type,
-        } = &self.r#type
-        {
-            self.context.inherit_from(context)?;
-
-            for (parameter, r#type) in self.parameters.iter().zip(parameter_types.iter()) {
-                self.context.set_type(parameter.clone(), r#type.clone())?;
-            }
-
-            let actual = self.body.expected_type(&self.context)?;
-
-            if !return_type.accepts(&actual) {
-                return Err(ValidationError::TypeCheck {
-                    expected: return_type.as_ref().clone(),
-                    actual,
-                    position: self.syntax_position,
-                });
-            }
-
-            self.body.validate(source, &self.context)?;
 
         Ok(())
-        } else {
-            Err(ValidationError::TypeCheckExpectedFunction {
-                actual: self.r#type.clone(),
-                position: self.syntax_position,
-            })
-        }
     }
 
-    fn run(&self, _source: &str, context: &Context) -> Result<Value, RuntimeError> {
+    fn run(&self, _source: &str, _context: &Map) -> Result<Value> {
-        self.context.inherit_from(context)?;
+        Ok(Value::Function(Function::ContextDefined(self.clone())))
+    }
 
-        let self_as_value = Value::Function(Function::ContextDefined(self.clone()));
+    fn expected_type(&self, _context: &Map) -> Result<Type> {
-
+        Ok(self.r#type().clone())
-        Ok(self_as_value)
     }
 }
 

src/abstract_tree/identifier.rs

@@ -1,110 +1,60 @@
-use std::{
+use std::fmt::{self, Display, Formatter};
-    fmt::{self, Display, Formatter},
-    sync::Arc,
-};
 
-use serde::{de::Visitor, Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
-use crate::{
+use crate::{AbstractTree, Error, Format, Map, Result, SyntaxNode, Type, Value};
-    built_in_identifiers::all_built_in_identifiers,
-    built_in_values::all_built_in_values,
-    error::{RuntimeError, SyntaxError, ValidationError},
-    AbstractTree, Context, Format, SyntaxNode, Type, Value,
-};
 
 /// A string by which a variable is known to a context.
 ///
 /// Every variable is a key-value pair. An identifier holds the key part of that
 /// pair. Its inner value can be used to retrieve a Value instance from a Map.
-#[derive(Debug, Clone, Eq, PartialEq, PartialOrd, Ord, Hash)]
+#[derive(Debug, Clone, Serialize, Deserialize, Eq, PartialEq, PartialOrd, Ord)]
-pub struct Identifier(Arc<String>);
+pub struct Identifier(String);
 
 impl Identifier {
-    pub fn new(key: &str) -> Self {
+    pub fn new<T: Into<String>>(inner: T) -> Self {
-        for built_in_identifier in all_built_in_identifiers() {
+        Identifier(inner.into())
-            let identifier = built_in_identifier.get();
-
-            if &key == identifier.inner().as_ref() {
-                return identifier.clone();
-            }
     }
 
-        Identifier(Arc::new(key.to_string()))
+    pub fn take_inner(self) -> String {
+        self.0
     }
 
-    pub fn from_raw_parts(arc: Arc<String>) -> Self {
+    pub fn inner(&self) -> &String {
-        Identifier(arc)
-    }
-
-    pub fn inner(&self) -> &Arc<String> {
         &self.0
     }
-
-    pub fn contains(&self, string: &str) -> bool {
-        self.0.as_ref() == string
-    }
 }
 
 impl AbstractTree for Identifier {
-    fn from_syntax(
+    fn from_syntax(node: SyntaxNode, source: &str, _context: &Map) -> Result<Self> {
-        node: SyntaxNode,
+        Error::expect_syntax_node(source, "identifier", node)?;
-        source: &str,
-        _context: &Context,
-    ) -> Result<Self, SyntaxError> {
-        SyntaxError::expect_syntax_node("identifier", node)?;
 
         let text = &source[node.byte_range()];
 
         debug_assert!(!text.is_empty());
 
-        Ok(Identifier::new(text))
+        Ok(Identifier(text.to_string()))
     }
 
-    fn validate(&self, _source: &str, context: &Context) -> Result<(), ValidationError> {
+    fn run(&self, _source: &str, context: &Map) -> Result<Value> {
-        let variable_exists = context.add_allowance(self)?;
+        if let Some((value, _)) = context.variables()?.get(&self.0) {
+            Ok(value.clone())
+        } else {
+            Err(Error::VariableIdentifierNotFound(self.0.clone()))
+        }
+    }
 
-        if variable_exists {
+    fn check_type(&self, _source: &str, _context: &Map) -> Result<()> {
         Ok(())
+    }
+
+    fn expected_type(&self, context: &Map) -> Result<Type> {
+        if let Some((_value, r#type)) = context.variables()?.get(&self.0) {
+            Ok(r#type.clone())
         } else {
-            for built_in_value in all_built_in_values() {
+            Err(Error::VariableIdentifierNotFound(self.0.clone()))
-                if built_in_value.name() == self.inner().as_ref() {
-                    return Ok(());
         }
     }
-
-            Err(ValidationError::VariableIdentifierNotFound(self.clone()))
-        }
-    }
-
-    fn expected_type(&self, context: &Context) -> Result<Type, ValidationError> {
-        if let Some(r#type) = context.get_type(self)? {
-            Ok(r#type)
-        } else {
-            for built_in_value in all_built_in_values() {
-                if built_in_value.name() == self.inner().as_ref() {
-                    return Ok(built_in_value.get().r#type()?);
-                }
-            }
-
-            Err(ValidationError::VariableIdentifierNotFound(self.clone()))
-        }
-    }
-
-    fn run(&self, _source: &str, context: &Context) -> Result<Value, RuntimeError> {
-        if let Some(value) = context.get_value(self)? {
-            return Ok(value);
-        } else {
-            for built_in_value in all_built_in_values() {
-                if built_in_value.name() == self.inner().as_ref() {
-                    return Ok(built_in_value.get().clone());
-                }
-            }
-        }
-
-        Err(RuntimeError::ValidationFailure(
-            ValidationError::VariableIdentifierNotFound(self.clone()),
-        ))
-    }
 }
 
 impl Format for Identifier {
@@ -113,55 +63,8 @@ impl Format for Identifier {
     }
 }
 
-impl From<String> for Identifier {
-    fn from(value: String) -> Self {
-        Identifier::from_raw_parts(Arc::new(value))
-    }
-}
-
-impl From<&str> for Identifier {
-    fn from(value: &str) -> Self {
-        Identifier::new(value)
-    }
-}
-
 impl Display for Identifier {
     fn fmt(&self, f: &mut Formatter) -> fmt::Result {
         write!(f, "{}", self.0)
     }
 }
-
-impl Serialize for Identifier {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: serde::Serializer,
-    {
-        serializer.serialize_str(self.0.as_ref())
-    }
-}
-
-impl<'de> Deserialize<'de> for Identifier {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-    where
-        D: serde::Deserializer<'de>,
-    {
-        deserializer.deserialize_string(IdentifierVisitor)
-    }
-}
-
-struct IdentifierVisitor;
-
-impl<'de> Visitor<'de> for IdentifierVisitor {
-    type Value = Identifier;
-
-    fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-        formatter.write_str("valid UFT-8 sequence")
-    }
-
-    fn visit_string<E>(self, v: String) -> Result<Self::Value, E>
-    where
-        E: serde::de::Error,
-    {
-        Ok(Identifier(Arc::new(v)))
-    }
-}

src/abstract_tree/if_else.rs

@@ -1,9 +1,6 @@
 use serde::{Deserialize, Serialize};
 
-use crate::{
+use crate::{AbstractTree, Block, Expression, Format, Map, Result, SyntaxNode, Type, Value};
-    error::{RuntimeError, SyntaxError, ValidationError},
-    AbstractTree, Block, Context, Expression, Format, SourcePosition, SyntaxNode, Type, Value,
-};
 
 #[derive(Debug, Clone, Serialize, Deserialize, Eq, PartialEq, PartialOrd, Ord)]
 pub struct IfElse {
@@ -12,11 +9,10 @@ pub struct IfElse {
     else_if_expressions: Vec<Expression>,
     else_if_blocks: Vec<Block>,
     else_block: Option<Block>,
-    source_position: SourcePosition,
 }
 
 impl AbstractTree for IfElse {
-    fn from_syntax(node: SyntaxNode, source: &str, context: &Context) -> Result<Self, SyntaxError> {
+    fn from_syntax(node: SyntaxNode, source: &str, context: &Map) -> Result<Self> {
         let if_expression_node = node.child(0).unwrap().child(1).unwrap();
         let if_expression = Expression::from_syntax(if_expression_node, source, context)?;
 
@@ -55,71 +51,23 @@ impl AbstractTree for IfElse {
             else_if_expressions,
             else_if_blocks,
             else_block,
-            source_position: SourcePosition::from(node.range()),
         })
     }
 
-    fn expected_type(&self, context: &Context) -> Result<Type, ValidationError> {
+    fn run(&self, source: &str, context: &Map) -> Result<Value> {
-        self.if_block.expected_type(context)
-    }
-
-    fn validate(&self, _source: &str, context: &Context) -> Result<(), ValidationError> {
-        self.if_expression.validate(_source, context)?;
-        self.if_block.validate(_source, context)?;
-
-        let expected = self.if_block.expected_type(context)?;
-        let else_ifs = self
-            .else_if_expressions
-            .iter()
-            .zip(self.else_if_blocks.iter());
-
-        for (expression, block) in else_ifs {
-            expression.validate(_source, context)?;
-            block.validate(_source, context)?;
-
-            let actual = block.expected_type(context)?;
-
-            if !expected.accepts(&actual) {
-                return Err(ValidationError::TypeCheck {
-                    expected,
-                    actual,
-                    position: self.source_position,
-                });
-            }
-        }
-
-        if let Some(block) = &self.else_block {
-            block.validate(_source, context)?;
-
-            let actual = block.expected_type(context)?;
-
-            if !expected.accepts(&actual) {
-                return Err(ValidationError::TypeCheck {
-                    expected,
-                    actual,
-                    position: self.source_position,
-                });
-            }
-        }
-
-        Ok(())
-    }
-
-    fn run(&self, source: &str, context: &Context) -> Result<Value, RuntimeError> {
         let if_boolean = self.if_expression.run(source, context)?.as_boolean()?;
 
         if if_boolean {
             self.if_block.run(source, context)
         } else {
-            let else_ifs = self
+            let expressions = &self.else_if_expressions;
-                .else_if_expressions
-                .iter()
-                .zip(self.else_if_blocks.iter());
 
-            for (expression, block) in else_ifs {
+            for (index, expression) in expressions.iter().enumerate() {
                 let if_boolean = expression.run(source, context)?.as_boolean()?;
 
                 if if_boolean {
+                    let block = self.else_if_blocks.get(index).unwrap();
+
                     return block.run(source, context);
                 }
             }
@@ -131,6 +79,10 @@ impl AbstractTree for IfElse {
             }
         }
     }
+
+    fn expected_type(&self, context: &Map) -> Result<Type> {
+        self.if_block.expected_type(context)
+    }
 }
 
 impl Format for IfElse {

src/abstract_tree/index.rs

@@ -1,9 +1,7 @@
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    error::{RuntimeError, SyntaxError, ValidationError},
+    AbstractTree, Error, Format, IndexExpression, List, Map, Result, SyntaxNode, Type, Value,
-    AbstractTree, Context, Format, Identifier, IndexExpression, SourcePosition, SyntaxNode, Type,
-    Value,
 };
 
 /// Abstract representation of an index expression.
@@ -13,12 +11,12 @@ use crate::{
 pub struct Index {
     pub collection: IndexExpression,
     pub index: IndexExpression,
-    source_position: SourcePosition,
+    pub index_end: Option<IndexExpression>,
 }
 
 impl AbstractTree for Index {
-    fn from_syntax(node: SyntaxNode, source: &str, context: &Context) -> Result<Self, SyntaxError> {
+    fn from_syntax(node: SyntaxNode, source: &str, context: &Map) -> Result<Self> {
-        SyntaxError::expect_syntax_node("index", node)?;
+        Error::expect_syntax_node(source, "index", node)?;
 
         let collection_node = node.child(0).unwrap();
         let collection = IndexExpression::from_syntax(collection_node, source, context)?;
@@ -26,91 +24,61 @@ impl AbstractTree for Index {
         let index_node = node.child(2).unwrap();
         let index = IndexExpression::from_syntax(index_node, source, context)?;
 
+        let index_end_node = node.child(4);
+        let index_end = if let Some(index_end_node) = index_end_node {
+            Some(IndexExpression::from_syntax(
+                index_end_node,
+                source,
+                context,
+            )?)
+        } else {
+            None
+        };
+
         Ok(Index {
             collection,
             index,
-            source_position: SourcePosition::from(node.range()),
+            index_end,
         })
     }
 
-    fn expected_type(&self, context: &Context) -> Result<Type, ValidationError> {
+    fn run(&self, source: &str, context: &Map) -> Result<Value> {
-        match self.collection.expected_type(context)? {
+        let collection = self.collection.run(source, context)?;
-            Type::ListOf(item_type) => Ok(*item_type.clone()),
-            Type::Map(map_types_option) => {
-                if let (Some(map_type), IndexExpression::Identifier(identifier)) =
-                    (map_types_option, &self.index)
-                {
-                    if let Some(r#type) = map_type.get(&identifier) {
-                        Ok(r#type.clone())
-                    } else {
-                        Ok(Type::Any)
-                    }
-                } else {
-                    Ok(Type::Any)
-                }
-            }
-            Type::None => Ok(Type::None),
-            r#type => Ok(r#type),
-        }
-    }
 
-    fn validate(&self, _source: &str, _context: &Context) -> Result<(), ValidationError> {
+        match collection {
-        self.collection.validate(_source, _context)?;
-
-        let collection_type = self.collection.expected_type(_context)?;
-
-        if let (Type::Map(type_map_option), IndexExpression::Identifier(identifier)) =
-            (collection_type, &self.index)
-        {
-            if let Some(type_map) = type_map_option {
-                if !type_map.contains_key(identifier) {
-                    return Err(ValidationError::VariableIdentifierNotFound(
-                        identifier.clone(),
-                    ));
-                }
-            }
-        } else {
-            self.index.validate(_source, _context)?;
-        }
-
-        Ok(())
-    }
-
-    fn run(&self, source: &str, context: &Context) -> Result<Value, RuntimeError> {
-        let value = self.collection.run(source, context)?;
-
-        match value {
             Value::List(list) => {
                 let index = self.index.run(source, context)?.as_integer()? as usize;
-                let item = list.items()?.get(index).cloned().unwrap_or_default();
+
+                let item = if let Some(index_end) = &self.index_end {
+                    let index_end = index_end.run(source, context)?.as_integer()? as usize;
+                    let sublist = list.items()[index..=index_end].to_vec();
+
+                    Value::List(List::with_items(sublist))
+                } else {
+                    list.items().get(index).cloned().unwrap_or_default()
+                };
 
                 Ok(item)
             }
             Value::Map(map) => {
-                let map = map.inner();
-
                 let value = if let IndexExpression::Identifier(identifier) = &self.index {
-                    if let Some(value) = map.get(identifier) {
+                    let key = identifier.inner();
-                        value
-                    } else {
-                        return Err(RuntimeError::ValidationFailure(
-                            ValidationError::VariableIdentifierNotFound(identifier.clone()),
-                        ));
-                    }
-                } else {
-                    let index_value = self.index.run(source, context)?;
-                    let identifier = Identifier::new(index_value.as_string()?);
 
-                    if let Some(value) = map.get(&identifier) {
+                    map.variables()?
-                        value
+                        .get(key)
+                        .map(|(value, _)| value.clone())
+                        .unwrap_or_default()
                 } else {
-                        return Err(RuntimeError::ValidationFailure(
+                    let value = self.index.run(source, context)?;
-                            ValidationError::VariableIdentifierNotFound(identifier.clone()),
+                    let key = value.as_string()?;
-                        ));
+
-                    }
+                    map.variables()?
+                        .get(key.as_str())
+                        .map(|(value, _)| value.clone())
+                        .unwrap_or_default()
                 };
 
-                Ok(value.clone())
+                Ok(value)
             }
             Value::String(string) => {
                 let index = self.index.run(source, context)?.as_integer()? as usize;
@@ -118,9 +86,16 @@ impl AbstractTree for Index {
 
                 Ok(Value::string(item.to_string()))
             }
-            _ => Err(RuntimeError::ValidationFailure(
+            _ => Err(Error::ExpectedCollection { actual: collection }),
-                ValidationError::ExpectedCollection { actual: value },
+        }
-            )),
+    }
+
+    fn expected_type(&self, context: &Map) -> Result<Type> {
+        match self.collection.expected_type(context)? {
+            Type::List(item_type) => Ok(*item_type.clone()),
+            Type::Map(_) => Ok(Type::Any),
+            Type::None => Ok(Type::None),
+            r#type => Ok(r#type),
         }
     }
 }
@@ -130,5 +105,10 @@ impl Format for Index {
         self.collection.format(output, indent_level);
         output.push(':');
         self.index.format(output, indent_level);
+
+        if let Some(expression) = &self.index_end {
+            output.push_str("..");
+            expression.format(output, indent_level);
+        }
     }
 }

src/abstract_tree/index_assignment.rs

@@ -1,9 +1,8 @@
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    error::{RuntimeError, SyntaxError, ValidationError},
+    AbstractTree, AssignmentOperator, Error, Format, Index, IndexExpression, Map, Result,
-    AbstractTree, AssignmentOperator, Context, Format, Identifier, Index, IndexExpression,
+    Statement, SyntaxNode, Type, Value,
-    SourcePosition, Statement, SyntaxNode, Type, Value,
 };
 
 #[derive(Debug, Clone, Serialize, Deserialize, Eq, PartialEq, PartialOrd, Ord)]
@@ -11,12 +10,11 @@ pub struct IndexAssignment {
     index: Index,
     operator: AssignmentOperator,
     statement: Statement,
-    position: SourcePosition,
 }
 
 impl AbstractTree for IndexAssignment {
-    fn from_syntax(node: SyntaxNode, source: &str, context: &Context) -> Result<Self, SyntaxError> {
+    fn from_syntax(node: SyntaxNode, source: &str, context: &Map) -> Result<Self> {
-        SyntaxError::expect_syntax_node("index_assignment", node)?;
+        Error::expect_syntax_node(source, "index_assignment", node)?;
 
         let index_node = node.child(0).unwrap();
         let index = Index::from_syntax(index_node, source, context)?;
@@ -31,29 +29,17 @@ impl AbstractTree for IndexAssignment {
             index,
             operator,
             statement,
-            position: node.range().into(),
         })
     }
 
-    fn expected_type(&self, _context: &Context) -> Result<Type, ValidationError> {
+    fn run(&self, source: &str, context: &Map) -> Result<Value> {
-        Ok(Type::None)
+        let index_collection = self.index.collection.run(source, context)?;
-    }
+        let index_context = index_collection.as_map().unwrap_or(context);
-
+        let index_key = if let IndexExpression::Identifier(identifier) = &self.index.index {
-    fn validate(&self, _source: &str, _context: &Context) -> Result<(), ValidationError> {
+            identifier.inner()
-        self.index.validate(_source, _context)?;
-        self.statement.validate(_source, _context)
-    }
-
-    fn run(&self, source: &str, context: &Context) -> Result<Value, RuntimeError> {
-        let _index_collection = self.index.collection.run(source, context)?;
-        let index_identifier = if let IndexExpression::Identifier(identifier) = &self.index.index {
-            identifier
         } else {
-            let index_run = self.index.index.run(source, context)?;
+            return Err(Error::VariableIdentifierNotFound(
-            let expected_identifier = Identifier::new(index_run.as_string()?);
+                self.index.index.run(source, context)?.to_string(),
-
-            return Err(RuntimeError::ValidationFailure(
-                ValidationError::VariableIdentifierNotFound(expected_identifier),
             ));
         };
 
@@ -61,17 +47,21 @@ impl AbstractTree for IndexAssignment {
 
         let new_value = match self.operator {
             AssignmentOperator::PlusEqual => {
-                if let Some(previous_value) = context.get_value(index_identifier)? {
+                if let Some((mut previous_value, _)) =
-                    previous_value.add(value, self.position)?
+                    index_context.variables()?.get(index_key).cloned()
+                {
+                    previous_value += value;
+                    previous_value
                 } else {
-                    return Err(RuntimeError::ValidationFailure(
+                    Value::none()
-                        ValidationError::VariableIdentifierNotFound(index_identifier.clone()),
-                    ));
                 }
             }
             AssignmentOperator::MinusEqual => {
-                if let Some(previous_value) = context.get_value(index_identifier)? {
+                if let Some((mut previous_value, _)) =
-                    previous_value.subtract(value, self.position)?
+                    index_context.variables()?.get(index_key).cloned()
+                {
+                    previous_value -= value;
+                    previous_value
                 } else {
                     Value::none()
                 }
@@ -79,10 +69,14 @@ impl AbstractTree for IndexAssignment {
             AssignmentOperator::Equal => value,
         };
 
-        context.set_value(index_identifier.clone(), new_value)?;
+        index_context.set(index_key.clone(), new_value)?;
 
         Ok(Value::none())
     }
+
+    fn expected_type(&self, _context: &Map) -> Result<Type> {
+        Ok(Type::None)
+    }
 }
 
 impl Format for IndexAssignment {

src/abstract_tree/index_expression.rs

@@ -1,9 +1,8 @@
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    error::{RuntimeError, SyntaxError, ValidationError},
+    value_node::ValueNode, AbstractTree, Error, Format, FunctionCall, Identifier, Index, Map,
-    value_node::ValueNode,
+    Result, SyntaxNode, Type, Value,
-    AbstractTree, Context, Format, FunctionCall, Identifier, Index, SyntaxNode, Type, Value,
 };
 
 #[derive(Debug, Clone, Serialize, Deserialize, Eq, PartialEq, PartialOrd, Ord)]
@@ -15,8 +14,8 @@ pub enum IndexExpression {
 }
 
 impl AbstractTree for IndexExpression {
-    fn from_syntax(node: SyntaxNode, source: &str, context: &Context) -> Result<Self, SyntaxError> {
+    fn from_syntax(node: SyntaxNode, source: &str, context: &Map) -> Result<Self> {
-        SyntaxError::expect_syntax_node("index_expression", node)?;
+        Error::expect_syntax_node(source, "index_expression", node)?;
 
         let first_child = node.child(0).unwrap();
         let child = if first_child.is_named() {
@@ -37,10 +36,11 @@ impl AbstractTree for IndexExpression {
                 child, source, context,
             )?)),
             _ => {
-                return Err(SyntaxError::UnexpectedSyntaxNode {
+                return Err(Error::UnexpectedSyntaxNode {
                     expected: "value, identifier, index or function call".to_string(),
                     actual: child.kind().to_string(),
-                    position: node.range().into(),
+                    location: child.start_position(),
+                    relevant_source: source[child.byte_range()].to_string(),
                 })
             }
         };
@@ -48,31 +48,7 @@ impl AbstractTree for IndexExpression {
         Ok(abstract_node)
     }
 
-    fn expected_type(&self, context: &Context) -> Result<Type, ValidationError> {
+    fn run(&self, source: &str, context: &Map) -> Result<Value> {
-        match self {
-            IndexExpression::Value(value_node) => value_node.expected_type(context),
-            IndexExpression::Identifier(identifier) => identifier.expected_type(context),
-            IndexExpression::Index(index) => index.expected_type(context),
-            IndexExpression::FunctionCall(function_call) => function_call.expected_type(context),
-        }
-    }
-
-    fn validate(&self, _source: &str, context: &Context) -> Result<(), ValidationError> {
-        match self {
-            IndexExpression::Value(value_node) => value_node.validate(_source, context),
-            IndexExpression::Identifier(identifier) => {
-                context.add_allowance(identifier)?;
-
-                Ok(())
-            }
-            IndexExpression::Index(index) => index.validate(_source, context),
-            IndexExpression::FunctionCall(function_call) => {
-                function_call.validate(_source, context)
-            }
-        }
-    }
-
-    fn run(&self, source: &str, context: &Context) -> Result<Value, RuntimeError> {
         match self {
             IndexExpression::Value(value_node) => value_node.run(source, context),
             IndexExpression::Identifier(identifier) => identifier.run(source, context),
@@ -80,14 +56,27 @@ impl AbstractTree for IndexExpression {
             IndexExpression::FunctionCall(function_call) => function_call.run(source, context),
         }
     }
+
+    fn expected_type(&self, context: &Map) -> Result<Type> {
+        match self {
+            IndexExpression::Value(value_node) => value_node.expected_type(context),
+            IndexExpression::Identifier(identifier) => identifier.expected_type(context),
+            IndexExpression::Index(index) => index.expected_type(context),
+            IndexExpression::FunctionCall(function_call) => function_call.expected_type(context),
+        }
+    }
 }
 
 impl Format for IndexExpression {
     fn format(&self, output: &mut String, indent_level: u8) {
         match self {
             IndexExpression::Value(value_node) => {
+                if let ValueNode::BuiltInValue(built_in_value) = value_node {
+                    output.push_str(built_in_value.name());
+                } else {
                     value_node.format(output, indent_level);
                 }
+            }
             IndexExpression::Identifier(identifier) => identifier.format(output, indent_level),
             IndexExpression::FunctionCall(function_call) => {
                 function_call.format(output, indent_level)

src/abstract_tree/logic.rs

@@ -1,8 +1,7 @@
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    error::{RuntimeError, SyntaxError, ValidationError},
+    AbstractTree, Error, Expression, Format, LogicOperator, Map, Result, SyntaxNode, Type, Value,
-    AbstractTree, Context, Expression, Format, LogicOperator, SyntaxNode, Type, Value,
 };
 
 /// Abstract representation of a logic expression.
@@ -14,8 +13,8 @@ pub struct Logic {
 }
 
 impl AbstractTree for Logic {
-    fn from_syntax(node: SyntaxNode, source: &str, context: &Context) -> Result<Self, SyntaxError> {
+    fn from_syntax(node: SyntaxNode, source: &str, context: &Map) -> Result<Self> {
-        SyntaxError::expect_syntax_node("logic", node)?;
+        Error::expect_syntax_node(source, "logic", node)?;
 
         let first_node = node.child(0).unwrap();
         let (left_node, operator_node, right_node) = {
@@ -40,23 +39,9 @@ impl AbstractTree for Logic {
         })
     }
 
-    fn expected_type(&self, _context: &Context) -> Result<Type, ValidationError> {
+    fn run(&self, source: &str, context: &Map) -> Result<Value> {
-        Ok(Type::Boolean)
-    }
-
-    fn validate(&self, _source: &str, _context: &Context) -> Result<(), ValidationError> {
-        log::info!("VALIDATE logic expression");
-
-        self.left.validate(_source, _context)?;
-        self.right.validate(_source, _context)
-    }
-
-    fn run(&self, source: &str, context: &Context) -> Result<Value, RuntimeError> {
         let left = self.left.run(source, context)?;
         let right = self.right.run(source, context)?;
-
-        log::info!("RUN logic expression: {left} {} {right}", self.operator);
-
         let result = match self.operator {
             LogicOperator::Equal => {
                 if let (Ok(left_num), Ok(right_num)) = (left.as_number(), right.as_number()) {
@@ -82,6 +67,10 @@ impl AbstractTree for Logic {
 
         Ok(Value::Boolean(result))
     }
+
+    fn expected_type(&self, _context: &Map) -> Result<Type> {
+        Ok(Type::Boolean)
+    }
 }
 
 impl Format for Logic {

src/abstract_tree/logic_operator.rs

@@ -1,11 +1,6 @@
-use std::fmt::{self, Display, Formatter};
-
 use serde::{Deserialize, Serialize};
 
-use crate::{
+use crate::{AbstractTree, Error, Format, Map, Result, SyntaxNode, Type, Value};
-    error::{RuntimeError, SyntaxError, ValidationError},
-    AbstractTree, Context, Format, SyntaxNode, Type, Value,
-};
 
 #[derive(Debug, Clone, Serialize, Deserialize, Eq, PartialEq, PartialOrd, Ord)]
 pub enum LogicOperator {
@@ -20,12 +15,8 @@ pub enum LogicOperator {
 }
 
 impl AbstractTree for LogicOperator {
-    fn from_syntax(
+    fn from_syntax(node: SyntaxNode, source: &str, _context: &Map) -> crate::Result<Self> {
-        node: SyntaxNode,
+        Error::expect_syntax_node(source, "logic_operator", node)?;
-        _source: &str,
-        _context: &Context,
-    ) -> Result<Self, SyntaxError> {
-        SyntaxError::expect_syntax_node("logic_operator", node)?;
 
         let operator_node = node.child(0).unwrap();
         let operator = match operator_node.kind() {
@@ -38,10 +29,11 @@ impl AbstractTree for LogicOperator {
             ">=" => LogicOperator::GreaterOrEqual,
             "<=" => LogicOperator::LessOrEqual,
             _ => {
-                return Err(SyntaxError::UnexpectedSyntaxNode {
+                return Err(Error::UnexpectedSyntaxNode {
                     expected: "==, !=, &&, ||, >, <, >= or <=".to_string(),
                     actual: operator_node.kind().to_string(),
-                    position: node.range().into(),
+                    location: operator_node.start_position(),
+                    relevant_source: source[operator_node.byte_range()].to_string(),
                 })
             }
         };
@@ -49,17 +41,13 @@ impl AbstractTree for LogicOperator {
         Ok(operator)
     }
 
-    fn expected_type(&self, _context: &Context) -> Result<Type, ValidationError> {
+    fn run(&self, _source: &str, _context: &Map) -> Result<Value> {
-        Ok(Type::None)
-    }
-
-    fn validate(&self, _source: &str, _context: &Context) -> Result<(), ValidationError> {
-        Ok(())
-    }
-
-    fn run(&self, _source: &str, _context: &Context) -> Result<Value, RuntimeError> {
         Ok(Value::none())
     }
+
+    fn expected_type(&self, _context: &Map) -> Result<Type> {
+        Ok(Type::None)
+    }
 }
 
 impl Format for LogicOperator {
@@ -76,18 +64,3 @@ impl Format for LogicOperator {
         }
     }
 }
-
-impl Display for LogicOperator {
-    fn fmt(&self, f: &mut Formatter) -> fmt::Result {
-        match self {
-            LogicOperator::Equal => write!(f, "="),
-            LogicOperator::NotEqual => write!(f, "!="),
-            LogicOperator::And => write!(f, "&&"),
-            LogicOperator::Or => write!(f, "||"),
-            LogicOperator::Greater => write!(f, ">"),
-            LogicOperator::Less => write!(f, "<"),
-            LogicOperator::GreaterOrEqual => write!(f, ">="),
-            LogicOperator::LessOrEqual => write!(f, "<="),
-        }
-    }
-}

src/abstract_tree/map_node.rs

@@ -1,117 +0,0 @@
-use std::collections::BTreeMap;
-
-use serde::{Deserialize, Serialize};
-use tree_sitter::Node as SyntaxNode;
-
-use crate::{
-    error::{RuntimeError, SyntaxError, ValidationError},
-    AbstractTree, Context, Format, Identifier, Map, SourcePosition, Statement, Type,
-    TypeSpecification, Value,
-};
-
-#[derive(Debug, Clone, Serialize, Deserialize, Eq, PartialEq, PartialOrd, Ord)]
-pub struct MapNode {
-    properties: BTreeMap<Identifier, (Statement, Option<Type>)>,
-    position: SourcePosition,
-}
-
-impl MapNode {
-    pub fn properties(&self) -> &BTreeMap<Identifier, (Statement, Option<Type>)> {
-        &self.properties
-    }
-}
-
-impl AbstractTree for MapNode {
-    fn from_syntax(node: SyntaxNode, source: &str, context: &Context) -> Result<Self, SyntaxError> {
-        SyntaxError::expect_syntax_node("map", node)?;
-
-        let mut properties = BTreeMap::new();
-        let mut current_identifier = None;
-        let mut current_type = None;
-
-        for index in 0..node.child_count() - 1 {
-            let child = node.child(index).unwrap();
-
-            if child.kind() == "identifier" {
-                current_identifier = Some(Identifier::from_syntax(child, source, context)?);
-                current_type = None;
-            }
-
-            if child.kind() == "type_specification" {
-                current_type =
-                    Some(TypeSpecification::from_syntax(child, source, context)?.take_inner());
-            }
-
-            if child.kind() == "statement" {
-                let statement = Statement::from_syntax(child, source, context)?;
-
-                if let Some(identifier) = &current_identifier {
-                    properties.insert(identifier.clone(), (statement, current_type.clone()));
-                }
-            }
-        }
-
-        Ok(MapNode {
-            properties,
-            position: SourcePosition::from(node.range()),
-        })
-    }
-
-    fn expected_type(&self, _context: &Context) -> Result<Type, ValidationError> {
-        if self.properties.is_empty() {
-            return Ok(Type::Map(None));
-        }
-
-        let mut type_map = BTreeMap::new();
-
-        for (identifier, (statement, r#type_option)) in &self.properties {
-            let r#type = if let Some(r#type) = type_option {
-                r#type.clone()
-            } else {
-                statement.expected_type(_context)?
-            };
-
-            type_map.insert(identifier.clone(), r#type);
-        }
-
-        Ok(Type::Map(Some(type_map)))
-    }
-
-    fn validate(&self, _source: &str, context: &Context) -> Result<(), ValidationError> {
-        for (_key, (statement, r#type)) in &self.properties {
-            statement.validate(_source, context)?;
-
-            if let Some(expected) = r#type {
-                let actual = statement.expected_type(context)?;
-
-                if !expected.accepts(&actual) {
-                    return Err(ValidationError::TypeCheck {
-                        expected: expected.clone(),
-                        actual,
-                        position: self.position.clone(),
-                    });
-                }
-            }
-        }
-
-        Ok(())
-    }
-
-    fn run(&self, _source: &str, _context: &Context) -> Result<Value, RuntimeError> {
-        let mut map = Map::new();
-
-        for (key, (statement, _)) in &self.properties {
-            let value = statement.run(_source, _context)?;
-
-            map.set(key.clone(), value);
-        }
-
-        Ok(Value::Map(map))
-    }
-}
-
-impl Format for MapNode {
-    fn format(&self, _output: &mut String, _indent_level: u8) {
-        todo!()
-    }
-}

src/abstract_tree/match.rs

@@ -3,41 +3,40 @@
 //! Note that this module is called "match" but is escaped as "r#match" because
 //! "match" is a keyword in Rust.
 use serde::{Deserialize, Serialize};
-use tree_sitter::Node as SyntaxNode;
 
 use crate::{
-    error::{RuntimeError, SyntaxError, ValidationError},
+    AbstractTree, Error, Expression, Format, Map, Result, Statement, SyntaxNode, Type, Value,
-    AbstractTree, Context, Expression, Format, MatchPattern, Statement, Type, Value,
 };
 
 /// Abstract representation of a match statement.
 #[derive(Debug, Clone, Serialize, Deserialize, Eq, PartialEq, PartialOrd, Ord)]
 pub struct Match {
     matcher: Expression,
-    options: Vec<(MatchPattern, Statement)>,
+    options: Vec<(Expression, Statement)>,
     fallback: Option<Box<Statement>>,
-
-    #[serde(skip)]
-    context: Context,
 }
 
 impl AbstractTree for Match {
-    fn from_syntax(node: SyntaxNode, source: &str, context: &Context) -> Result<Self, SyntaxError> {
+    fn from_syntax(node: SyntaxNode, source: &str, context: &Map) -> Result<Self> {
-        SyntaxError::expect_syntax_node("match", node)?;
+        Error::expect_syntax_node(source, "match", node)?;
 
         let matcher_node = node.child(1).unwrap();
         let matcher = Expression::from_syntax(matcher_node, source, context)?;
 
         let mut options = Vec::new();
-        let mut previous_pattern = None;
+        let mut previous_expression = None;
         let mut next_statement_is_fallback = false;
         let mut fallback = None;
 
         for index in 2..node.child_count() {
             let child = node.child(index).unwrap();
 
-            if child.kind() == "match_pattern" {
+            if child.kind() == "*" {
-                previous_pattern = Some(MatchPattern::from_syntax(child, source, context)?);
+                next_statement_is_fallback = true;
+            }
+
+            if child.kind() == "expression" {
+                previous_expression = Some(Expression::from_syntax(child, source, context)?);
             }
 
             if child.kind() == "statement" {
@@ -46,7 +45,7 @@ impl AbstractTree for Match {
                 if next_statement_is_fallback {
                     fallback = Some(Box::new(statement));
                     next_statement_is_fallback = false;
-                } else if let Some(expression) = &previous_pattern {
+                } else if let Some(expression) = &previous_expression {
                     options.push((expression.clone(), statement));
                 }
             }
@@ -56,61 +55,16 @@ impl AbstractTree for Match {
             matcher,
             options,
             fallback,
-            context: Context::default(),
         })
     }
 
-    fn expected_type(&self, context: &Context) -> Result<Type, ValidationError> {
+    fn run(&self, source: &str, context: &Map) -> Result<Value> {
-        let (_, first_statement) = self.options.first().unwrap();
-
-        first_statement.expected_type(context)
-    }
-
-    fn validate(&self, _source: &str, _context: &Context) -> Result<(), ValidationError> {
-        self.matcher.validate(_source, _context)?;
-
-        for (match_pattern, statement) in &self.options {
-            if let MatchPattern::EnumPattern(enum_pattern) = match_pattern {
-                if let Some(identifier) = enum_pattern.inner_identifier() {
-                    self.context.set_type(identifier.clone(), Type::Any)?;
-                }
-            }
-
-            match_pattern.validate(_source, _context)?;
-            statement.validate(_source, &self.context)?;
-        }
-
-        if let Some(statement) = &self.fallback {
-            statement.validate(_source, _context)?;
-        }
-
-        Ok(())
-    }
-
-    fn run(&self, source: &str, context: &Context) -> Result<Value, RuntimeError> {
         let matcher_value = self.matcher.run(source, context)?;
 
-        for (pattern, statement) in &self.options {
+        for (expression, statement) in &self.options {
-            if let (Value::Enum(enum_instance), MatchPattern::EnumPattern(enum_pattern)) =
+            let option_value = expression.run(source, context)?;
-                (&matcher_value, pattern)
-            {
-                if enum_instance.name() == enum_pattern.name()
-                    && enum_instance.variant() == enum_pattern.variant()
-                {
-                    let statement_context = Context::with_variables_from(context)?;
 
-                    if let (Some(identifier), Some(value)) =
+            if matcher_value == option_value {
-                        (enum_pattern.inner_identifier(), enum_instance.value())
-                    {
-                        statement_context.set_value(identifier.clone(), value.as_ref().clone())?;
-                    }
-
-                    return statement.run(source, &statement_context);
-                }
-            }
-            let pattern_value = pattern.run(source, context)?;
-
-            if matcher_value == pattern_value {
                 return statement.run(source, context);
             }
         }
@@ -121,6 +75,12 @@ impl AbstractTree for Match {
             Ok(Value::none())
         }
     }
+
+    fn expected_type(&self, context: &Map) -> Result<Type> {
+        let (_, first_statement) = self.options.first().unwrap();
+
+        first_statement.expected_type(context)
+    }
 }
 
 impl Format for Match {

src/abstract_tree/match_pattern.rs

@@ -1,64 +0,0 @@
-use serde::{Deserialize, Serialize};
-use tree_sitter::Node as SyntaxNode;
-
-use crate::{
-    error::{RuntimeError, SyntaxError, ValidationError},
-    AbstractTree, Context, EnumPattern, Format, Type, Value, ValueNode,
-};
-
-#[derive(Debug, Clone, Serialize, Deserialize, Eq, PartialEq, PartialOrd, Ord)]
-pub enum MatchPattern {
-    EnumPattern(EnumPattern),
-    Value(ValueNode),
-    Wildcard,
-}
-
-impl AbstractTree for MatchPattern {
-    fn from_syntax(node: SyntaxNode, source: &str, context: &Context) -> Result<Self, SyntaxError> {
-        SyntaxError::expect_syntax_node("match_pattern", node)?;
-
-        let child = node.child(0).unwrap();
-        let pattern = match child.kind() {
-            "enum_pattern" => {
-                MatchPattern::EnumPattern(EnumPattern::from_syntax(child, source, context)?)
-            }
-            "value" => MatchPattern::Value(ValueNode::from_syntax(child, source, context)?),
-            "*" => MatchPattern::Wildcard,
-            _ => {
-                return Err(SyntaxError::UnexpectedSyntaxNode {
-                    expected: "enum pattern or value".to_string(),
-                    actual: child.kind().to_string(),
-                    position: node.range().into(),
-                })
-            }
-        };
-
-        Ok(pattern)
-    }
-
-    fn expected_type(&self, _context: &Context) -> Result<Type, ValidationError> {
-        match self {
-            MatchPattern::EnumPattern(enum_pattern) => enum_pattern.expected_type(_context),
-            MatchPattern::Value(value_node) => value_node.expected_type(_context),
-            MatchPattern::Wildcard => todo!(),
-        }
-    }
-
-    fn validate(&self, _source: &str, _context: &Context) -> Result<(), ValidationError> {
-        Ok(())
-    }
-
-    fn run(&self, _source: &str, _context: &Context) -> Result<Value, RuntimeError> {
-        match self {
-            MatchPattern::EnumPattern(enum_pattern) => enum_pattern.run(_source, _context),
-            MatchPattern::Value(value_node) => value_node.run(_source, _context),
-            MatchPattern::Wildcard => todo!(),
-        }
-    }
-}
-
-impl Format for MatchPattern {
-    fn format(&self, _output: &mut String, _indent_level: u8) {
-        todo!()
-    }
-}

src/abstract_tree/math.rs

@@ -1,9 +1,7 @@
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    error::{RuntimeError, SyntaxError, ValidationError},
+    AbstractTree, Error, Expression, Format, Map, MathOperator, Result, SyntaxNode, Type, Value,
-    AbstractTree, Context, Expression, Format, MathOperator, SourcePosition, SyntaxNode, Type,
-    Value,
 };
 
 /// Abstract representation of a math operation.
@@ -15,12 +13,11 @@ pub struct Math {
     left: Expression,
     operator: MathOperator,
     right: Expression,
-    position: SourcePosition,
 }
 
 impl AbstractTree for Math {
-    fn from_syntax(node: SyntaxNode, source: &str, context: &Context) -> Result<Self, SyntaxError> {
+    fn from_syntax(node: SyntaxNode, source: &str, context: &Map) -> Result<Self> {
-        SyntaxError::expect_syntax_node("math", node)?;
+        Error::expect_syntax_node(source, "math", node)?;
 
         let left_node = node.child(0).unwrap();
         let left = Expression::from_syntax(left_node, source, context)?;
@@ -35,32 +32,26 @@ impl AbstractTree for Math {
             left,
             operator,
             right,
-            position: node.range().into(),
         })
     }
 
-    fn expected_type(&self, context: &Context) -> Result<Type, ValidationError> {
+    fn run(&self, source: &str, context: &Map) -> Result<Value> {
-        self.left.expected_type(context)
-    }
-
-    fn validate(&self, _source: &str, _context: &Context) -> Result<(), ValidationError> {
-        self.left.validate(_source, _context)?;
-        self.right.validate(_source, _context)
-    }
-
-    fn run(&self, source: &str, context: &Context) -> Result<Value, RuntimeError> {
         let left = self.left.run(source, context)?;
         let right = self.right.run(source, context)?;
         let value = match self.operator {
-            MathOperator::Add => left.add(right, self.position)?,
+            MathOperator::Add => left + right,
-            MathOperator::Subtract => left.subtract(right, self.position)?,
+            MathOperator::Subtract => left - right,
-            MathOperator::Multiply => left.multiply(right, self.position)?,
+            MathOperator::Multiply => left * right,
-            MathOperator::Divide => left.divide(right, self.position)?,
+            MathOperator::Divide => left / right,
-            MathOperator::Modulo => left.modulo(right, self.position)?,
+            MathOperator::Modulo => left % right,
-        };
+        }?;
 
         Ok(value)
     }
+
+    fn expected_type(&self, context: &Map) -> Result<Type> {
+        self.left.expected_type(context)
+    }
 }
 
 impl Format for Math {

src/abstract_tree/math_operator.rs

@@ -1,9 +1,6 @@
 use serde::{Deserialize, Serialize};
 
-use crate::{
+use crate::{AbstractTree, Error, Format, Map, Result, SyntaxNode, Type, Value};
-    error::{RuntimeError, SyntaxError, ValidationError},
-    AbstractTree, Context, Format, SyntaxNode, Type, Value,
-};
 
 #[derive(Debug, Clone, Serialize, Deserialize, Eq, PartialEq, PartialOrd, Ord)]
 pub enum MathOperator {
@@ -15,13 +12,7 @@ pub enum MathOperator {
 }
 
 impl AbstractTree for MathOperator {
-    fn from_syntax(
+    fn from_syntax(node: SyntaxNode, source: &str, _context: &Map) -> Result<Self> {
-        node: SyntaxNode,
-        _source: &str,
-        _context: &Context,
-    ) -> Result<Self, SyntaxError> {
-        SyntaxError::expect_syntax_node("math_operator", node)?;
-
         let operator_node = node.child(0).unwrap();
         let operator = match operator_node.kind() {
             "+" => MathOperator::Add,
@@ -30,10 +21,11 @@ impl AbstractTree for MathOperator {
             "/" => MathOperator::Divide,
             "%" => MathOperator::Modulo,
             _ => {
-                return Err(SyntaxError::UnexpectedSyntaxNode {
+                return Err(Error::UnexpectedSyntaxNode {
                     expected: "+, -, *, / or %".to_string(),
                     actual: operator_node.kind().to_string(),
-                    position: node.range().into(),
+                    location: operator_node.start_position(),
+                    relevant_source: source[operator_node.byte_range()].to_string(),
                 })
             }
         };
@@ -41,17 +33,13 @@ impl AbstractTree for MathOperator {
         Ok(operator)
     }
 
-    fn expected_type(&self, _context: &Context) -> Result<Type, ValidationError> {
+    fn run(&self, _source: &str, _context: &Map) -> Result<Value> {
-        Ok(Type::None)
-    }
-
-    fn validate(&self, _source: &str, _context: &Context) -> Result<(), ValidationError> {
-        Ok(())
-    }
-
-    fn run(&self, _source: &str, _context: &Context) -> Result<Value, RuntimeError> {
         Ok(Value::none())
     }
+
+    fn expected_type(&self, _context: &Map) -> Result<Type> {
+        Ok(Type::None)
+    }
 }
 
 impl Format for MathOperator {

src/abstract_tree/mod.rs

@@ -1,13 +1,15 @@
 //! Abstract, executable representations of corresponding items found in Dust
 //! source code. The types that implement [AbstractTree] are inteded to be
-//! created by an [Interpreter].
+//! created by an [Evaluator].
-pub mod r#as;
+//!
+//! When adding new lanugage features, first extend the grammar to recognize new
+//! syntax nodes. Then add a new AbstractTree type using the existing types as
+//! examples.
+
 pub mod assignment;
 pub mod assignment_operator;
 pub mod block;
-pub mod command;
+pub mod built_in_value;
-pub mod enum_defintion;
-pub mod enum_pattern;
 pub mod expression;
 pub mod r#for;
 pub mod function_call;
@@ -20,39 +22,31 @@ pub mod index_assignment;
 pub mod index_expression;
 pub mod logic;
 pub mod logic_operator;
-pub mod map_node;
 pub mod r#match;
-pub mod match_pattern;
 pub mod math;
 pub mod math_operator;
+pub mod new;
 pub mod statement;
-pub mod struct_definition;
 pub mod r#type;
-pub mod type_definition;
 pub mod type_specification;
 pub mod value_node;
 pub mod r#while;
+pub mod r#yield;
 
 pub use {
-    assignment::*, assignment_operator::*, block::*, command::*, enum_defintion::*,
+    assignment::*, assignment_operator::*, block::*, built_in_value::*, expression::*,
-    enum_pattern::*, expression::*, function_call::*, function_expression::*, function_node::*,
+    function_call::*, function_expression::*, function_node::*, identifier::*, if_else::*,
-    identifier::*, if_else::*, index::*, index_assignment::IndexAssignment, index_expression::*,
+    index::*, index_assignment::IndexAssignment, index_expression::*, logic::*, logic_operator::*,
-    logic::*, logic_operator::*, map_node::*, match_pattern::*, math::*, math_operator::*, r#as::*,
+    math::*, math_operator::*, new::*, r#for::*, r#match::*, r#type::*, r#while::*, r#yield::*,
-    r#for::*, r#match::*, r#type::*, r#while::*, statement::*, struct_definition::*,
+    statement::*, type_specification::*, value_node::*,
-    type_definition::*, type_specification::*, value_node::*,
 };
 
 use serde::{Deserialize, Serialize};
 
-use crate::{
+use crate::{Error, Map, Result, SyntaxNode, Value};
-    context::Context,
-    error::{RuntimeError, SyntaxError, ValidationError},
-    SyntaxNode, Value,
-};
 
-/// A detailed report of a position in the source code string.
 #[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize)]
-pub struct SourcePosition {
+pub struct SyntaxPosition {
     pub start_byte: usize,
     pub end_byte: usize,
     pub start_row: usize,
@@ -61,9 +55,9 @@ pub struct SourcePosition {
     pub end_column: usize,
 }
 
-impl From<tree_sitter::Range> for SourcePosition {
+impl From<tree_sitter::Range> for SyntaxPosition {
     fn from(range: tree_sitter::Range) -> Self {
-        SourcePosition {
+        SyntaxPosition {
             start_byte: range.start_byte,
             end_byte: range.end_byte,
             start_row: range.start_point.row + 1,
@@ -74,7 +68,6 @@ impl From<tree_sitter::Range> for SourcePosition {
     }
 }
 
-/// Abstraction that represents a whole, executable unit of dust code.
 #[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize)]
 pub struct Root {
     statements: Vec<Statement>,
@@ -84,8 +77,8 @@ pub struct Root {
 // instead of indexes. This will be more performant when there are a lot of
 // top-level statements in the tree.
 impl AbstractTree for Root {
-    fn from_syntax(node: SyntaxNode, source: &str, context: &Context) -> Result<Self, SyntaxError> {
+    fn from_syntax(node: SyntaxNode, source: &str, context: &Map) -> Result<Self> {
-        SyntaxError::expect_syntax_node("root", node)?;
+        Error::expect_syntax_node(source, "root", node)?;
 
         let statement_count = node.child_count();
         let mut statements = Vec::with_capacity(statement_count);
@@ -100,29 +93,33 @@ impl AbstractTree for Root {
         Ok(Root { statements })
     }
 
-    fn validate(&self, _source: &str, _context: &Context) -> Result<(), ValidationError> {
+    fn check_type(&self, _source: &str, _context: &Map) -> Result<()> {
         for statement in &self.statements {
-            statement.validate(_source, _context)?;
+            if let Statement::Return(inner_statement) = statement {
+                return inner_statement.check_type(_source, _context);
+            } else {
+                statement.check_type(_source, _context)?;
+            }
         }
 
         Ok(())
     }
 
-    fn run(&self, source: &str, context: &Context) -> Result<Value, RuntimeError> {
+    fn run(&self, source: &str, context: &Map) -> Result<Value> {
         let mut value = Value::none();
 
         for statement in &self.statements {
+            if let Statement::Return(inner_statement) = statement {
+                return inner_statement.run(source, context);
+            } else {
                 value = statement.run(source, context)?;
-
-            if statement.is_return() {
-                return Ok(value);
             }
         }
 
         Ok(value)
     }
 
-    fn expected_type(&self, context: &Context) -> Result<Type, ValidationError> {
+    fn expected_type(&self, context: &Map) -> Result<Type> {
         self.statements.last().unwrap().expected_type(context)
     }
 }
@@ -143,7 +140,6 @@ impl Format for Root {
 /// executable tree that resolves to a single value.
 pub trait AbstractTree: Sized + Format {
     /// Interpret the syntax tree at the given node and return the abstraction.
-    /// Returns a syntax error if the source is invalid.
     ///
     /// This function is used to convert nodes in the Tree Sitter concrete
     /// syntax tree into executable nodes in an abstract tree. This function is
@@ -152,19 +148,17 @@ pub trait AbstractTree: Sized + Format {
     ///
     /// If necessary, the source code can be accessed directly by getting the
     /// node's byte range.
-    fn from_syntax(node: SyntaxNode, source: &str, context: &Context) -> Result<Self, SyntaxError>;
+    fn from_syntax(node: SyntaxNode, source: &str, context: &Map) -> Result<Self>;
 
-    /// Return the type of the value that this abstract node will create when
+    /// Verify the type integrity of the node.
-    /// run. Returns a validation error if the tree is invalid.
+    fn check_type(&self, _source: &str, _context: &Map) -> Result<()> {
-    fn expected_type(&self, context: &Context) -> Result<Type, ValidationError>;
+        Ok(())
+    }
 
-    /// Verify the type integrity of the node. Returns a validation error if the
+    /// Execute dust code by traversing the tree.
-    /// tree is invalid.
+    fn run(&self, source: &str, context: &Map) -> Result<Value>;
-    fn validate(&self, source: &str, context: &Context) -> Result<(), ValidationError>;
 
-    /// Execute this node's logic and return a value. Returns a runtime error if
+    fn expected_type(&self, context: &Map) -> Result<Type>;
-    /// the node cannot resolve to a value.
-    fn run(&self, source: &str, context: &Context) -> Result<Value, RuntimeError>;
 }
 
 pub trait Format {

src/abstract_tree/new.rs

@@ -2,8 +2,7 @@ use serde::{Deserialize, Serialize};
 use tree_sitter::Node;
 
 use crate::{
-    error::{RuntimeError, SyntaxError, ValidationError},
+    AbstractTree, Format, Identifier, Map, Result, Type, TypeSpecification, Value, ValueNode,
-    AbstractTree, Context, Format, Identifier, Type, TypeSpecification, Value, ValueNode,
 };
 
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord)]
@@ -13,7 +12,7 @@ pub struct New {
 }
 
 impl AbstractTree for New {
-    fn from_syntax(node: Node, source: &str, context: &Context) -> Result<Self, SyntaxError> {
+    fn from_syntax(node: Node, source: &str, context: &Map) -> Result<Self> {
         let identifier_node = node.child(1).unwrap();
         let identifier = Identifier::from_syntax(identifier_node, source, context)?;
 
@@ -25,15 +24,11 @@ impl AbstractTree for New {
         })
     }
 
-    fn expected_type(&self, _context: &Context) -> Result<Type, ValidationError> {
+    fn run(&self, _source: &str, _context: &crate::Map) -> crate::Result<Value> {
         todo!()
     }
 
-    fn validate(&self, _source: &str, _context: &Context) -> Result<(), ValidationError> {
+    fn expected_type(&self, _context: &crate::Map) -> crate::Result<Type> {
-        todo!()
-    }
-
-    fn run(&self, _source: &str, _context: &Context) -> Result<Value, RuntimeError> {
         todo!()
     }
 }

src/abstract_tree/statement.rs

@@ -1,202 +1,131 @@
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    error::{RuntimeError, SyntaxError, ValidationError},
+    AbstractTree, Assignment, Block, Error, Expression, For, Format, IfElse, IndexAssignment, Map,
-    AbstractTree, Assignment, Block, Context, Expression, For, Format, IfElse, IndexAssignment,
+    Match, Result, SyntaxNode, Type, Value, While,
-    Match, SyntaxNode, Type, TypeDefinition, Value, While,
 };
 
 /// Abstract representation of a statement.
 #[derive(Debug, Clone, Serialize, Deserialize, Eq, PartialEq, PartialOrd, Ord)]
-pub struct Statement {
+pub enum Statement {
-    is_return: bool,
-    statement_kind: StatementKind,
-}
-
-impl Statement {
-    pub fn is_return(&self) -> bool {
-        self.is_return
-    }
-}
-
-impl AbstractTree for Statement {
-    fn from_syntax(
-        node: SyntaxNode,
-        source: &str,
-        _context: &Context,
-    ) -> Result<Self, SyntaxError> {
-        SyntaxError::expect_syntax_node("statement", node)?;
-
-        let first_child = node.child(0).unwrap();
-        let mut is_return = first_child.kind() == "return" || first_child.kind() == "break";
-        let child = if is_return {
-            node.child(1).unwrap()
-        } else {
-            first_child
-        };
-
-        let statement_kind = StatementKind::from_syntax(child, source, _context)?;
-
-        if let StatementKind::Block(block) = &statement_kind {
-            if block.contains_return() {
-                is_return = true;
-            }
-        };
-
-        Ok(Statement {
-            is_return,
-            statement_kind,
-        })
-    }
-
-    fn expected_type(&self, _context: &Context) -> Result<Type, ValidationError> {
-        self.statement_kind.expected_type(_context)
-    }
-
-    fn validate(&self, _source: &str, _context: &Context) -> Result<(), ValidationError> {
-        self.statement_kind.validate(_source, _context)
-    }
-
-    fn run(&self, _source: &str, _context: &Context) -> Result<Value, RuntimeError> {
-        self.statement_kind.run(_source, _context)
-    }
-}
-
-impl Format for Statement {
-    fn format(&self, _output: &mut String, _indent_level: u8) {
-        self.statement_kind.format(_output, _indent_level)
-    }
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, Eq, PartialEq, PartialOrd, Ord)]
-enum StatementKind {
     Assignment(Box<Assignment>),
     Expression(Expression),
     IfElse(Box<IfElse>),
     Match(Match),
     While(Box<While>),
     Block(Box<Block>),
+    Return(Box<Statement>),
     For(Box<For>),
     IndexAssignment(Box<IndexAssignment>),
-    TypeDefinition(TypeDefinition),
 }
 
-impl AbstractTree for StatementKind {
+impl AbstractTree for Statement {
-    fn from_syntax(node: SyntaxNode, source: &str, context: &Context) -> Result<Self, SyntaxError> {
+    fn from_syntax(node: SyntaxNode, source: &str, context: &Map) -> Result<Self> {
-        SyntaxError::expect_syntax_node("statement_kind", node)?;
+        Error::expect_syntax_node(source, "statement", node)?;
 
         let child = node.child(0).unwrap();
 
         match child.kind() {
-            "assignment" => Ok(StatementKind::Assignment(Box::new(
+            "assignment" => Ok(Statement::Assignment(Box::new(
                 Assignment::from_syntax(child, source, context)?,
             ))),
-            "expression" => Ok(StatementKind::Expression(Expression::from_syntax(
+            "expression" => Ok(Statement::Expression(Expression::from_syntax(
                 child, source, context,
             )?)),
-            "if_else" => Ok(StatementKind::IfElse(Box::new(IfElse::from_syntax(
+            "if_else" => Ok(Statement::IfElse(Box::new(IfElse::from_syntax(
                 child, source, context,
             )?))),
-            "while" => Ok(StatementKind::While(Box::new(While::from_syntax(
+            "while" => Ok(Statement::While(Box::new(While::from_syntax(
                 child, source, context,
             )?))),
-            "block" => Ok(StatementKind::Block(Box::new(Block::from_syntax(
+            "block" => Ok(Statement::Block(Box::new(Block::from_syntax(
                 child, source, context,
             )?))),
-            "for" => Ok(StatementKind::For(Box::new(For::from_syntax(
+            "for" => Ok(Statement::For(Box::new(For::from_syntax(
                 child, source, context,
             )?))),
-            "index_assignment" => Ok(StatementKind::IndexAssignment(Box::new(
+            "index_assignment" => Ok(Statement::IndexAssignment(Box::new(
                 IndexAssignment::from_syntax(child, source, context)?,
             ))),
-            "match" => Ok(StatementKind::Match(Match::from_syntax(
+            "match" => Ok(Statement::Match(Match::from_syntax(
                 child, source, context,
             )?)),
-            "type_definition" => Ok(StatementKind::TypeDefinition(TypeDefinition::from_syntax(
+            "return" => {
-                child, source, context
+                let statement_node = child.child(1).unwrap();
-            )?)),
+
-            _ => Err(SyntaxError::UnexpectedSyntaxNode {
+                Ok(Statement::Return(Box::new(Statement::from_syntax(statement_node, source, context)?)))
+            },
+            _ => Err(Error::UnexpectedSyntaxNode {
                 expected:
-                    "assignment, index assignment, expression, type_definition, block, return, if...else, while, for or match".to_string(),
+                    "assignment, index assignment, expression, block, return, if...else, while, for or match".to_string(),
                 actual: child.kind().to_string(),
-                position: node.range().into(),
+                location: child.start_position(),
+                relevant_source: source[child.byte_range()].to_string(),
             }),
         }
     }
 
-    fn expected_type(&self, _context: &Context) -> Result<Type, ValidationError> {
+    fn check_type(&self, _source: &str, _context: &Map) -> Result<()> {
         match self {
-            StatementKind::Assignment(assignment) => assignment.expected_type(_context),
+            Statement::Assignment(assignment) => assignment.check_type(_source, _context),
-            StatementKind::Expression(expression) => expression.expected_type(_context),
+            Statement::Expression(expression) => expression.check_type(_source, _context),
-            StatementKind::IfElse(if_else) => if_else.expected_type(_context),
+            Statement::IfElse(if_else) => if_else.check_type(_source, _context),
-            StatementKind::Match(r#match) => r#match.expected_type(_context),
+            Statement::Match(r#match) => r#match.check_type(_source, _context),
-            StatementKind::While(r#while) => r#while.expected_type(_context),
+            Statement::While(r#while) => r#while.check_type(_source, _context),
-            StatementKind::Block(block) => block.expected_type(_context),
+            Statement::Block(block) => block.check_type(_source, _context),
-            StatementKind::For(r#for) => r#for.expected_type(_context),
+            Statement::For(r#for) => r#for.check_type(_source, _context),
-            StatementKind::IndexAssignment(index_assignment) => {
+            Statement::IndexAssignment(index_assignment) => {
-                index_assignment.expected_type(_context)
+                index_assignment.check_type(_source, _context)
             }
-            StatementKind::TypeDefinition(type_definition) => {
+            Statement::Return(statement) => statement.check_type(_source, _context),
-                type_definition.expected_type(_context)
+        }
+    }
+
+    fn run(&self, source: &str, context: &Map) -> Result<Value> {
+        match self {
+            Statement::Assignment(assignment) => assignment.run(source, context),
+            Statement::Expression(expression) => expression.run(source, context),
+            Statement::IfElse(if_else) => if_else.run(source, context),
+            Statement::Match(r#match) => r#match.run(source, context),
+            Statement::While(r#while) => r#while.run(source, context),
+            Statement::Block(block) => block.run(source, context),
+            Statement::For(r#for) => r#for.run(source, context),
+            Statement::IndexAssignment(index_assignment) => index_assignment.run(source, context),
+            Statement::Return(statement) => statement.run(source, context),
+        }
+    }
+
+    fn expected_type(&self, context: &Map) -> Result<Type> {
+        match self {
+            Statement::Assignment(assignment) => assignment.expected_type(context),
+            Statement::Expression(expression) => expression.expected_type(context),
+            Statement::IfElse(if_else) => if_else.expected_type(context),
+            Statement::Match(r#match) => r#match.expected_type(context),
+            Statement::While(r#while) => r#while.expected_type(context),
+            Statement::Block(block) => block.expected_type(context),
+            Statement::For(r#for) => r#for.expected_type(context),
+            Statement::IndexAssignment(index_assignment) => index_assignment.expected_type(context),
+            Statement::Return(statement) => statement.expected_type(context),
         }
     }
 }
 
-    fn validate(&self, _source: &str, _context: &Context) -> Result<(), ValidationError> {
+impl Format for Statement {
-        match self {
-            StatementKind::Assignment(assignment) => assignment.validate(_source, _context),
-            StatementKind::Expression(expression) => expression.validate(_source, _context),
-            StatementKind::IfElse(if_else) => if_else.validate(_source, _context),
-            StatementKind::Match(r#match) => r#match.validate(_source, _context),
-            StatementKind::While(r#while) => r#while.validate(_source, _context),
-            StatementKind::Block(block) => block.validate(_source, _context),
-            StatementKind::For(r#for) => r#for.validate(_source, _context),
-            StatementKind::IndexAssignment(index_assignment) => {
-                index_assignment.validate(_source, _context)
-            }
-            StatementKind::TypeDefinition(type_definition) => {
-                type_definition.validate(_source, _context)
-            }
-        }
-    }
-
-    fn run(&self, _source: &str, _context: &Context) -> Result<Value, RuntimeError> {
-        match self {
-            StatementKind::Assignment(assignment) => assignment.run(_source, _context),
-            StatementKind::Expression(expression) => expression.run(_source, _context),
-            StatementKind::IfElse(if_else) => if_else.run(_source, _context),
-            StatementKind::Match(r#match) => r#match.run(_source, _context),
-            StatementKind::While(r#while) => r#while.run(_source, _context),
-            StatementKind::Block(block) => block.run(_source, _context),
-            StatementKind::For(r#for) => r#for.run(_source, _context),
-            StatementKind::IndexAssignment(index_assignment) => {
-                index_assignment.run(_source, _context)
-            }
-            StatementKind::TypeDefinition(type_definition) => {
-                type_definition.run(_source, _context)
-            }
-        }
-    }
-}
-
-impl Format for StatementKind {
     fn format(&self, output: &mut String, indent_level: u8) {
-        StatementKind::indent(output, indent_level);
+        Statement::indent(output, indent_level);
 
         match self {
-            StatementKind::Assignment(assignment) => assignment.format(output, indent_level),
+            Statement::Assignment(assignment) => assignment.format(output, indent_level),
-            StatementKind::Expression(expression) => expression.format(output, indent_level),
+            Statement::Expression(expression) => expression.format(output, indent_level),
-            StatementKind::IfElse(if_else) => if_else.format(output, indent_level),
+            Statement::IfElse(if_else) => if_else.format(output, indent_level),
-            StatementKind::Match(r#match) => r#match.format(output, indent_level),
+            Statement::Match(r#match) => r#match.format(output, indent_level),
-            StatementKind::While(r#while) => r#while.format(output, indent_level),
+            Statement::While(r#while) => r#while.format(output, indent_level),
-            StatementKind::Block(block) => block.format(output, indent_level),
+            Statement::Block(block) => block.format(output, indent_level),
-            StatementKind::For(r#for) => r#for.format(output, indent_level),
+            Statement::For(r#for) => r#for.format(output, indent_level),
-            StatementKind::IndexAssignment(index_assignment) => {
+            Statement::IndexAssignment(index_assignment) => {
                 index_assignment.format(output, indent_level)
             }
-            StatementKind::TypeDefinition(type_definition) => {
+            Statement::Return(statement) => statement.format(output, indent_level),
-                type_definition.format(output, indent_level)
-            }
         }
     }
 }

src/abstract_tree/struct_definition.rs

@@ -1,120 +0,0 @@
-use std::collections::BTreeMap;
-
-use serde::{Deserialize, Serialize};
-use tree_sitter::Node as SyntaxNode;
-
-use crate::{
-    error::{RuntimeError, SyntaxError, ValidationError},
-    AbstractTree, Context, Format, Identifier, Map, MapNode, Statement, StructInstance, Type,
-    TypeDefinition, TypeSpecification, Value,
-};
-
-#[derive(Debug, Clone, Serialize, Deserialize, Eq, PartialEq, PartialOrd, Ord)]
-pub struct StructDefinition {
-    name: Identifier,
-    properties: BTreeMap<Identifier, (Option<Statement>, Type)>,
-}
-
-impl StructDefinition {
-    pub fn instantiate(
-        &self,
-        new_properties: &MapNode,
-        source: &str,
-        context: &Context,
-    ) -> Result<StructInstance, RuntimeError> {
-        let mut all_properties = Map::new();
-
-        for (key, (statement_option, _)) in &self.properties {
-            if let Some(statement) = statement_option {
-                let value = statement.run(source, context)?;
-
-                all_properties.set(key.clone(), value);
-            }
-        }
-
-        for (key, (statement, _)) in new_properties.properties() {
-            let value = statement.run(source, context)?;
-
-            all_properties.set(key.clone(), value);
-        }
-
-        Ok(StructInstance::new(self.name.clone(), all_properties))
-    }
-}
-
-impl AbstractTree for StructDefinition {
-    fn from_syntax(node: SyntaxNode, source: &str, context: &Context) -> Result<Self, SyntaxError> {
-        SyntaxError::expect_syntax_node("struct_definition", node)?;
-
-        let name_node = node.child(1).unwrap();
-        let name = Identifier::from_syntax(name_node, source, context)?;
-
-        let mut properties = BTreeMap::new();
-        let mut current_identifier: Option<Identifier> = None;
-        let mut current_type: Option<Type> = None;
-        let mut current_statement = None;
-
-        for index in 2..node.child_count() - 1 {
-            let child_syntax_node = node.child(index).unwrap();
-
-            if child_syntax_node.kind() == "identifier" {
-                if current_statement.is_none() {
-                    if let (Some(identifier), Some(r#type)) = (&current_identifier, &current_type) {
-                        properties.insert(identifier.clone(), (None, r#type.clone()));
-                    }
-                }
-
-                current_type = None;
-                current_identifier =
-                    Some(Identifier::from_syntax(child_syntax_node, source, context)?);
-            }
-
-            if child_syntax_node.kind() == "type_specification" {
-                current_type = Some(
-                    TypeSpecification::from_syntax(child_syntax_node, source, context)?
-                        .take_inner(),
-                );
-            }
-
-            if child_syntax_node.kind() == "statement" {
-                current_statement =
-                    Some(Statement::from_syntax(child_syntax_node, source, context)?);
-
-                if let Some(identifier) = &current_identifier {
-                    let r#type = if let Some(r#type) = &current_type {
-                        r#type.clone()
-                    } else {
-                        Type::None
-                    };
-
-                    properties.insert(
-                        identifier.clone(),
-                        (current_statement.clone(), r#type.clone()),
-                    );
-                }
-            }
-        }
-
-        Ok(StructDefinition { name, properties })
-    }
-
-    fn expected_type(&self, _context: &Context) -> Result<Type, ValidationError> {
-        Ok(Type::None)
-    }
-
-    fn validate(&self, _source: &str, _context: &Context) -> Result<(), ValidationError> {
-        Ok(())
-    }
-
-    fn run(&self, _source: &str, context: &Context) -> Result<Value, RuntimeError> {
-        context.set_definition(self.name.clone(), TypeDefinition::Struct(self.clone()))?;
-
-        Ok(Value::none())
-    }
-}
-
-impl Format for StructDefinition {
-    fn format(&self, _output: &mut String, _indent_level: u8) {
-        todo!()
-    }
-}

src/abstract_tree/type.rs

@@ -1,53 +1,33 @@
-use std::{
+use std::fmt::{self, Display, Formatter};
-    collections::BTreeMap,
-    fmt::{self, Display, Formatter},
-};
 
 use serde::{Deserialize, Serialize};
-use tree_sitter::Node as SyntaxNode;
 
-use crate::{
+use crate::{AbstractTree, Error, Format, Identifier, Map, Result, Structure, SyntaxNode, Value};
-    built_in_types::BuiltInType,
-    error::{RuntimeError, SyntaxError, ValidationError},
-    AbstractTree, Context, Format, Identifier, TypeSpecification, Value,
-};
 
 #[derive(Debug, Clone, Serialize, Deserialize, Eq, PartialEq, PartialOrd, Ord)]
 pub enum Type {
     Any,
     Boolean,
     Collection,
-    Custom {
+    Custom(Identifier),
-        name: Identifier,
-        arguments: Vec<Type>,
-    },
     Float,
     Function {
         parameter_types: Vec<Type>,
         return_type: Box<Type>,
     },
     Integer,
-    List,
+    List(Box<Type>),
-    ListOf(Box<Type>),
+    Map(Option<Structure>),
-    ListExact(Vec<Type>),
-    Map(Option<BTreeMap<Identifier, Type>>),
     None,
     Number,
     String,
     Range,
+    Option(Box<Type>),
 }
 
 impl Type {
-    pub fn custom(name: Identifier, arguments: Vec<Type>) -> Self {
-        Type::Custom { name, arguments }
-    }
-
-    pub fn option(inner_type: Option<Type>) -> Self {
-        BuiltInType::Option(inner_type).get().clone()
-    }
-
     pub fn list(item_type: Type) -> Self {
-        Type::ListOf(Box::new(item_type))
+        Type::List(Box::new(item_type))
     }
 
     pub fn function(parameter_types: Vec<Type>, return_type: Type) -> Self {
@@ -57,11 +37,11 @@ impl Type {
         }
     }
 
-    /// Returns a boolean indicating whether is type is accepting of the other.
+    pub fn option(optional_type: Type) -> Self {
-    ///
+        Type::Option(Box::new(optional_type))
-    /// The types do not need to match exactly. For example, the Any variant matches all of the
+    }
-    /// others and the Number variant accepts Number, Integer and Float.
+
-    pub fn accepts(&self, other: &Type) -> bool {
+    pub fn check(&self, other: &Type) -> Result<()> {
         log::info!("Checking type {self} against {other}.");
 
         match (self, other) {
@@ -69,53 +49,56 @@ impl Type {
             | (_, Type::Any)
             | (Type::Boolean, Type::Boolean)
             | (Type::Collection, Type::Collection)
-            | (Type::Collection, Type::String)
+            | (Type::Collection, Type::List(_))
-            | (Type::Collection, Type::List)
+            | (Type::List(_), Type::Collection)
-            | (Type::List, Type::Collection)
-            | (Type::Collection, Type::ListExact(_))
-            | (Type::ListExact(_), Type::Collection)
-            | (Type::Collection, Type::ListOf(_))
-            | (Type::ListOf(_), Type::Collection)
             | (Type::Collection, Type::Map(_))
             | (Type::Map(_), Type::Collection)
+            | (Type::Collection, Type::String)
             | (Type::String, Type::Collection)
             | (Type::Float, Type::Float)
             | (Type::Integer, Type::Integer)
-            | (Type::List, Type::List)
+            | (Type::Map(_), Type::Map(_))
-            | (Type::Map(None), Type::Map(None))
             | (Type::Number, Type::Number)
             | (Type::Number, Type::Integer)
             | (Type::Number, Type::Float)
             | (Type::Integer, Type::Number)
             | (Type::Float, Type::Number)
-            | (Type::String, Type::String)
+            | (Type::None, Type::None)
-            | (Type::None, Type::None) => true,
+            | (Type::String, Type::String) => Ok(()),
-            (Type::Map(left_types), Type::Map(right_types)) => left_types == right_types,
+            (Type::Custom(left), Type::Custom(right)) => {
-            (
+                if left == right {
-                Type::Custom {
+                    Ok(())
-                    name: left_name,
+                } else {
-                    arguments: left_arguments,
+                    Err(Error::TypeCheck {
-                },
+                        expected: self.clone(),
-                Type::Custom {
+                        actual: other.clone(),
-                    name: right_name,
+                    })
-                    arguments: right_arguments,
-                },
-            ) => left_name == right_name && left_arguments == right_arguments,
-            (Type::ListOf(self_item_type), Type::ListOf(other_item_type)) => {
-                self_item_type.accepts(&other_item_type)
-            }
-            (Type::ListExact(self_types), Type::ListExact(other_types)) => {
-                for (left, right) in self_types.iter().zip(other_types.iter()) {
-                    if !left.accepts(right) {
-                        return false;
                 }
             }
-
+            (Type::Option(left), Type::Option(right)) => {
-                true
+                if left == right {
+                    Ok(())
+                } else if let Type::Any = left.as_ref() {
+                    Ok(())
+                } else if let Type::Any = right.as_ref() {
+                    Ok(())
+                } else {
+                    Err(Error::TypeCheck {
+                        expected: self.clone(),
+                        actual: other.clone(),
+                    })
+                }
+            }
+            (Type::Option(_), Type::None) | (Type::None, Type::Option(_)) => Ok(()),
+            (Type::List(self_item_type), Type::List(other_item_type)) => {
+                if self_item_type.check(other_item_type).is_err() {
+                    Err(Error::TypeCheck {
+                        expected: self.clone(),
+                        actual: other.clone(),
+                    })
+                } else {
+                    Ok(())
                 }
-            (Type::ListExact(exact_types), Type::ListOf(of_type))
-            | (Type::ListOf(of_type), Type::ListExact(exact_types)) => {
-                exact_types.iter().all(|r#type| r#type == of_type.as_ref())
             }
             (
                 Type::Function {
@@ -132,14 +115,27 @@ impl Type {
                     .zip(other_parameter_types.iter());
 
                 for (self_parameter_type, other_parameter_type) in parameter_type_pairs {
-                    if self_parameter_type == other_parameter_type {
+                    if self_parameter_type.check(other_parameter_type).is_err() {
-                        return false;
+                        return Err(Error::TypeCheck {
+                            expected: self.clone(),
+                            actual: other.clone(),
+                        });
                     }
                 }
 
-                self_return_type == other_return_type
+                if self_return_type.check(other_return_type).is_err() {
+                    Err(Error::TypeCheck {
+                        expected: self.clone(),
+                        actual: other.clone(),
+                    })
+                } else {
+                    Ok(())
                 }
-            _ => false,
+            }
+            _ => Err(Error::TypeCheck {
+                expected: self.clone(),
+                actual: other.clone(),
+            }),
         }
     }
 
@@ -148,7 +144,7 @@ impl Type {
     }
 
     pub fn is_list(&self) -> bool {
-        matches!(self, Type::ListOf(_))
+        matches!(self, Type::List(_))
     }
 
     pub fn is_map(&self) -> bool {
@@ -157,67 +153,17 @@ impl Type {
 }
 
 impl AbstractTree for Type {
-    fn from_syntax(
+    fn from_syntax(node: SyntaxNode, _source: &str, _context: &Map) -> Result<Self> {
-        node: SyntaxNode,
+        Error::expect_syntax_node(_source, "type", node)?;
-        _source: &str,
-        context: &Context,
-    ) -> Result<Self, SyntaxError> {
-        SyntaxError::expect_syntax_node("type", node)?;
 
         let type_node = node.child(0).unwrap();
 
         let r#type = match type_node.kind() {
-            "identifier" => {
-                let name = Identifier::from_syntax(type_node, _source, context)?;
-                let mut arguments = Vec::new();
-
-                for index in 2..node.child_count() - 1 {
-                    let child = node.child(index).unwrap();
-
-                    if child.is_named() {
-                        let r#type = Type::from_syntax(child, _source, context)?;
-
-                        arguments.push(r#type);
-                    }
-                }
-
-                Type::custom(name, arguments)
-            }
-            "{" => {
-                let mut type_map = BTreeMap::new();
-                let mut previous_identifier = None;
-
-                for index in 1..node.child_count() - 1 {
-                    let child = node.child(index).unwrap();
-
-                    if let Some(identifier) = previous_identifier {
-                        let type_specification =
-                            TypeSpecification::from_syntax(child, _source, context)?;
-
-                        type_map.insert(identifier, type_specification.take_inner());
-                        previous_identifier = None;
-                    } else {
-                        previous_identifier =
-                            Some(Identifier::from_syntax(child, _source, context)?)
-                    }
-                }
-
-                Type::Map(Some(type_map))
-            }
             "[" => {
                 let item_type_node = node.child(1).unwrap();
-                let item_type = Type::from_syntax(item_type_node, _source, context)?;
+                let item_type = Type::from_syntax(item_type_node, _source, _context)?;
 
-                Type::ListOf(Box::new(item_type))
+                Type::List(Box::new(item_type))
-            }
-            "list" => {
-                let item_type_node = node.child(1);
-
-                if let Some(child) = item_type_node {
-                    Type::ListOf(Box::new(Type::from_syntax(child, _source, context)?))
-                } else {
-                    Type::List
-                }
             }
             "any" => Type::Any,
             "bool" => Type::Boolean,
@@ -231,7 +177,7 @@ impl AbstractTree for Type {
                     let child = node.child(index).unwrap();
 
                     if child.is_named() {
-                        let parameter_type = Type::from_syntax(child, _source, context)?;
+                        let parameter_type = Type::from_syntax(child, _source, _context)?;
 
                         parameter_types.push(parameter_type);
                     }
@@ -239,9 +185,9 @@ impl AbstractTree for Type {
 
                 let final_node = node.child(child_count - 1).unwrap();
                 let return_type = if final_node.is_named() {
-                    Type::from_syntax(final_node, _source, context)?
+                    Type::from_syntax(final_node, _source, _context)?
                 } else {
-                    Type::option(None)
+                    Type::None
                 };
 
                 Type::Function {
@@ -254,12 +200,18 @@ impl AbstractTree for Type {
             "num" => Type::Number,
             "none" => Type::None,
             "str" => Type::String,
+            "option" => {
+                let inner_type_node = node.child(2).unwrap();
+                let inner_type = Type::from_syntax(inner_type_node, _source, _context)?;
+
+                Type::Option(Box::new(inner_type))
+            }
             _ => {
-                return Err(SyntaxError::UnexpectedSyntaxNode {
+                return Err(Error::UnexpectedSyntaxNode {
-                    expected: "any, bool, float, int, num, str, list, map, custom type, (, [ or {"
+                    expected: "any, bool, float, int, num, str, option, (, [ or {".to_string(),
-                        .to_string(),
                     actual: type_node.kind().to_string(),
-                    position: node.range().into(),
+                    location: type_node.start_position(),
+                    relevant_source: _source[type_node.byte_range()].to_string(),
                 })
             }
         };
@@ -267,17 +219,13 @@ impl AbstractTree for Type {
         Ok(r#type)
     }
 
-    fn expected_type(&self, _context: &Context) -> Result<Type, ValidationError> {
+    fn run(&self, _source: &str, _context: &Map) -> Result<Value> {
-        Ok(Type::None)
-    }
-
-    fn validate(&self, _source: &str, _context: &Context) -> Result<(), ValidationError> {
-        Ok(())
-    }
-
-    fn run(&self, _source: &str, _context: &Context) -> Result<Value, RuntimeError> {
         Ok(Value::none())
     }
+
+    fn expected_type(&self, _context: &Map) -> Result<Type> {
+        Ok(Type::None)
+    }
 }
 
 impl Format for Type {
@@ -286,10 +234,8 @@ impl Format for Type {
             Type::Any => output.push_str("any"),
             Type::Boolean => output.push_str("bool"),
             Type::Collection => output.push_str("collection"),
-            Type::Custom {
+
-                name: _,
+            Type::Custom(_) => todo!(),
-                arguments: _,
-            } => todo!(),
             Type::Float => output.push_str("float"),
             Type::Function {
                 parameter_types,
@@ -309,19 +255,26 @@ impl Format for Type {
                 return_type.format(output, indent_level);
             }
             Type::Integer => output.push_str("int"),
-            Type::List => todo!(),
+            Type::List(item_type) => {
-            Type::ListOf(item_type) => {
                 output.push('[');
                 item_type.format(output, indent_level);
                 output.push(']');
             }
-            Type::ListExact(_) => todo!(),
+            Type::Map(structure_option) => {
-            Type::Map(_) => {
+                if let Some(structure) = structure_option {
+                    output.push_str(&structure.to_string());
+                } else {
                     output.push_str("map");
                 }
-            Type::None => output.push_str("Option::None"),
+            }
+            Type::None => output.push_str("none"),
             Type::Number => output.push_str("num"),
             Type::String => output.push_str("str"),
+            Type::Option(optional_type) => {
+                output.push_str("option(");
+                optional_type.format(output, indent_level);
+                output.push(')');
+            }
             Type::Range => todo!(),
         }
     }
@@ -333,23 +286,7 @@ impl Display for Type {
             Type::Any => write!(f, "any"),
             Type::Boolean => write!(f, "bool"),
             Type::Collection => write!(f, "collection"),
-            Type::Custom { name, arguments } => {
+            Type::Custom(identifier) => write!(f, "{identifier}"),
-                if !arguments.is_empty() {
-                    write!(f, "<")?;
-
-                    for (index, r#type) in arguments.into_iter().enumerate() {
-                        if index == arguments.len() - 1 {
-                            write!(f, "{}", r#type)?;
-                        } else {
-                            write!(f, "{}, ", r#type)?;
-                        }
-                    }
-
-                    write!(f, ">")
-                } else {
-                    write!(f, "{name}")
-                }
-            }
             Type::Float => write!(f, "float"),
             Type::Function {
                 parameter_types,
@@ -369,25 +306,14 @@ impl Display for Type {
                 write!(f, " -> {return_type}")
             }
             Type::Integer => write!(f, "int"),
-            Type::List => write!(f, "list"),
+            Type::List(item_type) => write!(f, "[{item_type}]"),
-            Type::ListOf(item_type) => write!(f, "[{item_type}]"),
-            Type::ListExact(types) => {
-                write!(f, "[")?;
-
-                for (index, r#type) in types.into_iter().enumerate() {
-                    if index == types.len() - 1 {
-                        write!(f, "{}", r#type)?;
-                    } else {
-                        write!(f, "{}, ", r#type)?;
-                    }
-                }
-
-                write!(f, "]")
-            }
             Type::Map(_) => write!(f, "map"),
             Type::Number => write!(f, "num"),
             Type::None => write!(f, "none"),
             Type::String => write!(f, "str"),
+            Type::Option(inner_type) => {
+                write!(f, "option({})", inner_type)
+            }
             Type::Range => todo!(),
         }
     }

src/abstract_tree/type_definition.rs

@@ -1,73 +0,0 @@
-use serde::{Deserialize, Serialize};
-use tree_sitter::Node as SyntaxNode;
-
-use crate::{
-    error::{RuntimeError, SyntaxError, ValidationError},
-    AbstractTree, Context, EnumDefinition, Format, Identifier, StructDefinition, Type, Value,
-};
-
-#[derive(Debug, Clone, Serialize, Deserialize, Eq, PartialEq, PartialOrd, Ord)]
-pub enum TypeDefinition {
-    Enum(EnumDefinition),
-    Struct(StructDefinition),
-}
-
-impl TypeDefinition {
-    pub fn identifier(&self) -> &Identifier {
-        match self {
-            TypeDefinition::Enum(enum_definition) => enum_definition.identifier(),
-            TypeDefinition::Struct(_) => todo!(),
-        }
-    }
-}
-
-impl AbstractTree for TypeDefinition {
-    fn from_syntax(node: SyntaxNode, source: &str, context: &Context) -> Result<Self, SyntaxError> {
-        SyntaxError::expect_syntax_node("type_definition", node)?;
-
-        let child = node.child(0).unwrap();
-
-        match child.kind() {
-            "enum_definition" => Ok(TypeDefinition::Enum(EnumDefinition::from_syntax(
-                child, source, context,
-            )?)),
-            "struct_definition" => Ok(TypeDefinition::Struct(StructDefinition::from_syntax(
-                child, source, context,
-            )?)),
-            _ => Err(SyntaxError::UnexpectedSyntaxNode {
-                expected: "enum or struct definition".to_string(),
-                actual: child.kind().to_string(),
-                position: node.range().into(),
-            }),
-        }
-    }
-
-    fn expected_type(&self, _context: &Context) -> Result<Type, ValidationError> {
-        match self {
-            TypeDefinition::Enum(enum_definition) => enum_definition.expected_type(_context),
-            TypeDefinition::Struct(struct_definition) => struct_definition.expected_type(_context),
-        }
-    }
-
-    fn validate(&self, _source: &str, _context: &Context) -> Result<(), ValidationError> {
-        match self {
-            TypeDefinition::Enum(enum_definition) => enum_definition.validate(_source, _context),
-            TypeDefinition::Struct(struct_definition) => {
-                struct_definition.validate(_source, _context)
-            }
-        }
-    }
-
-    fn run(&self, _source: &str, _context: &Context) -> Result<Value, RuntimeError> {
-        match self {
-            TypeDefinition::Enum(enum_definition) => enum_definition.run(_source, _context),
-            TypeDefinition::Struct(struct_definition) => struct_definition.run(_source, _context),
-        }
-    }
-}
-
-impl Format for TypeDefinition {
-    fn format(&self, _output: &mut String, _indent_level: u8) {
-        todo!()
-    }
-}

src/abstract_tree/type_specification.rs

@@ -1,9 +1,6 @@
 use serde::{Deserialize, Serialize};
 
-use crate::{
+use crate::{AbstractTree, Error, Format, Map, Result, SyntaxNode, Type, Value};
-    error::{RuntimeError, SyntaxError, ValidationError},
-    AbstractTree, Context, Format, SyntaxNode, Type, Value,
-};
 
 #[derive(Debug, Clone, Serialize, Deserialize, Eq, PartialEq, PartialOrd, Ord)]
 pub struct TypeSpecification {
@@ -25,8 +22,8 @@ impl TypeSpecification {
 }
 
 impl AbstractTree for TypeSpecification {
-    fn from_syntax(node: SyntaxNode, source: &str, context: &Context) -> Result<Self, SyntaxError> {
+    fn from_syntax(node: SyntaxNode, source: &str, context: &Map) -> Result<Self> {
-        SyntaxError::expect_syntax_node("type_specification", node)?;
+        Error::expect_syntax_node(source, "type_specification", node)?;
 
         let type_node = node.child(1).unwrap();
         let r#type = Type::from_syntax(type_node, source, context)?;
@@ -34,17 +31,13 @@ impl AbstractTree for TypeSpecification {
         Ok(TypeSpecification { r#type })
     }
 
-    fn expected_type(&self, context: &Context) -> Result<Type, ValidationError> {
+    fn run(&self, source: &str, context: &Map) -> Result<Value> {
-        self.r#type.expected_type(context)
-    }
-
-    fn validate(&self, _source: &str, _context: &Context) -> Result<(), ValidationError> {
-        Ok(())
-    }
-
-    fn run(&self, source: &str, context: &Context) -> Result<Value, RuntimeError> {
         self.r#type.run(source, context)
     }
+
+    fn expected_type(&self, context: &Map) -> Result<Type> {
+        self.r#type.expected_type(context)
+    }
 }
 
 impl Format for TypeSpecification {

src/abstract_tree/value_node.rs

@@ -1,15 +1,14 @@
-use std::{cmp::Ordering, ops::RangeInclusive};
+use std::collections::BTreeMap;
 
 use serde::{Deserialize, Serialize};
-use tree_sitter::Node as SyntaxNode;
 
 use crate::{
-    error::{RuntimeError, SyntaxError, ValidationError},
+    AbstractTree, BuiltInValue, Error, Expression, Format, Function, FunctionNode, Identifier,
-    AbstractTree, Context, Expression, Format, Function, FunctionNode,
+    List, Map, Range, Result, Statement, Structure, SyntaxNode, Type, TypeDefintion,
-    Identifier, List, Type, Value, TypeDefinition, MapNode,
+    TypeSpecification, Value,
 };
 
-#[derive(Debug, Clone, Serialize, Deserialize, Eq, PartialEq)]
+#[derive(Debug, Clone, Serialize, Deserialize, Eq, PartialEq, PartialOrd, Ord)]
 pub enum ValueNode {
     Boolean(String),
     Float(String),
@@ -17,22 +16,16 @@ pub enum ValueNode {
     Integer(String),
     String(String),
     List(Vec<Expression>),
-    Map(MapNode),
+    Option(Option<Box<Expression>>),
-    Range(RangeInclusive<i64>),
+    Map(BTreeMap<String, (Statement, Option<Type>)>),
-    Struct {
+    BuiltInValue(BuiltInValue),
-        name: Identifier,
+    Structure(BTreeMap<String, (Option<Statement>, Type)>),
-        properties: MapNode,
+    Range(Range),
-    },
-    Enum {
-        name: Identifier,
-        variant: Identifier,
-        expression: Option<Box<Expression>>,
-    },
 }
 
 impl AbstractTree for ValueNode {
-    fn from_syntax(node: SyntaxNode, source: &str, context: &Context) -> Result<Self, SyntaxError> {
+    fn from_syntax(node: SyntaxNode, source: &str, context: &Map) -> Result<Self> {
-        SyntaxError::expect_syntax_node("value", node)?;
+        Error::expect_syntax_node(source, "value", node)?;
 
         let child = node.child(0).unwrap();
         let value_node = match child.kind() {
@@ -57,7 +50,6 @@ impl AbstractTree for ValueNode {
 
                     if current_node.is_named() {
                         let expression = Expression::from_syntax(current_node, source, context)?;
-
                         expressions.push(expression);
                     }
                 }
@@ -65,50 +57,129 @@ impl AbstractTree for ValueNode {
                 ValueNode::List(expressions)
             }
             "map" => {
-                ValueNode::Map(MapNode::from_syntax(child, source, context)?)
+                let mut child_nodes = BTreeMap::new();
+                let mut current_key = "".to_string();
+                let mut current_type = None;
+
+                for index in 0..child.child_count() - 1 {
+                    let child = child.child(index).unwrap();
+
+                    if child.kind() == "identifier" {
+                        current_key = Identifier::from_syntax(child, source, context)?.take_inner();
+                        current_type = None;
                     }
-            "range" => {
-                let mut split = source[child.byte_range()].split("..");
-                let start = split.next().unwrap().parse().unwrap();
-                let end = split.next().unwrap().parse().unwrap();
 
-                ValueNode::Range(start..=end)
+                    if child.kind() == "type_specification" {
+                        current_type = Some(
+                            TypeSpecification::from_syntax(child, source, context)?.take_inner(),
+                        );
                     }
-            "enum_instance" => {
-                let name_node = child.child(0).unwrap();
-                let name = Identifier::from_syntax(name_node, source, context)?;
 
-                let variant_node = child.child(2).unwrap();
+                    if child.kind() == "statement" {
-                let variant = Identifier::from_syntax(variant_node, source, context)?;
+                        let statement = Statement::from_syntax(child, source, context)?;
 
-                let expression = if let Some(expression_node) = child.child(4) {                
+                        if let Some(type_specification) = &current_type {
-                    Some(Box::new(Expression::from_syntax(expression_node, source, context)?))
+                            type_specification.check(&statement.expected_type(context)?)?;
+                        }
+
+                        child_nodes.insert(current_key.clone(), (statement, current_type.clone()));
+                    }
+                }
+
+                ValueNode::Map(child_nodes)
+            }
+            "option" => {
+                let first_grandchild = child.child(0).unwrap();
+
+                if first_grandchild.kind() == "none" {
+                    ValueNode::Option(None)
                 } else {
-                    None
+                    let expression_node = child.child(2).unwrap();
+                    let expression = Expression::from_syntax(expression_node, source, context)?;
+
+                    ValueNode::Option(Some(Box::new(expression)))
+                }
+            }
+            "built_in_value" => {
+                let built_in_value_node = child.child(0).unwrap();
+
+                ValueNode::BuiltInValue(BuiltInValue::from_syntax(
+                    built_in_value_node,
+                    source,
+                    context,
+                )?)
+            }
+            "structure" => {
+                let mut btree_map = BTreeMap::new();
+                let mut current_identifier: Option<Identifier> = None;
+                let mut current_type: Option<Type> = None;
+                let mut current_statement = None;
+
+                for index in 2..child.child_count() - 1 {
+                    let child_syntax_node = child.child(index).unwrap();
+
+                    if child_syntax_node.kind() == "identifier" {
+                        if current_statement.is_none() {
+                            if let (Some(identifier), Some(r#type)) =
+                                (&current_identifier, &current_type)
+                            {
+                                btree_map
+                                    .insert(identifier.inner().clone(), (None, r#type.clone()));
+                            }
+                        }
+
+                        current_type = None;
+                        current_identifier =
+                            Some(Identifier::from_syntax(child_syntax_node, source, context)?);
+                    }
+
+                    if child_syntax_node.kind() == "type_specification" {
+                        current_type = Some(
+                            TypeSpecification::from_syntax(child_syntax_node, source, context)?
+                                .take_inner(),
+                        );
+                    }
+
+                    if child_syntax_node.kind() == "statement" {
+                        current_statement =
+                            Some(Statement::from_syntax(child_syntax_node, source, context)?);
+
+                        if let Some(identifier) = &current_identifier {
+                            let r#type = if let Some(r#type) = &current_type {
+                                r#type.clone()
+                            } else if let Some(statement) = &current_statement {
+                                statement.expected_type(context)?
+                            } else {
+                                Type::None
                             };
 
-                ValueNode::Enum { name, variant , expression  }                
+                            btree_map.insert(
+                                identifier.inner().clone(),
+                                (current_statement.clone(), r#type.clone()),
+                            );
                         }
-            "struct_instance" => {
-                let name_node = child.child(0).unwrap();
-                let name = Identifier::from_syntax(name_node, source, context)?;
-
-                let properties_node = child.child(2).unwrap();
-                let properties = MapNode::from_syntax(properties_node, source, context)?;
-
-                ValueNode::Struct
-                {
-                    name,
-                    properties
                     }
                 }
+
+                ValueNode::Structure(btree_map)
+            }
+            "range" => {
+                let start_node = child.child(0).unwrap();
+                let end_node = child.child(2).unwrap();
+
+                let start = source[start_node.byte_range()].parse().unwrap();
+                let end = source[end_node.byte_range()].parse().unwrap();
+
+                ValueNode::Range(Range { start, end })
+            }
             _ => {
-                return Err(SyntaxError::UnexpectedSyntaxNode {
+                return Err(Error::UnexpectedSyntaxNode {
                     expected:
-                        "string, integer, float, boolean, range, list, map, option, function, struct or enum"
+                        "string, integer, float, boolean, range, list, map, option or structure"
                             .to_string(),
                     actual: child.kind().to_string(),
-                    position: node.range().into(),
+                    location: child.start_position(),
+                    relevant_source: source[child.byte_range()].to_string(),
                 })
             }
         };
@@ -116,90 +187,23 @@ impl AbstractTree for ValueNode {
         Ok(value_node)
     }
 
-    fn expected_type(&self, context: &Context) -> Result<Type, ValidationError> {
+    fn check_type(&self, _source: &str, _context: &Map) -> Result<()> {
-        let r#type = match self {
-            ValueNode::Boolean(_) => Type::Boolean,
-            ValueNode::Float(_) => Type::Float,
-            ValueNode::Function(function) => function.r#type(),
-            ValueNode::Integer(_) => Type::Integer,
-            ValueNode::String(_) => Type::String,
-            ValueNode::List(expressions) => {
-                let mut item_types = Vec::new();
-
-                for expression in expressions {
-                    let expression_type = expression.expected_type(context)?;
-
-                    item_types.push(expression_type);
-                }
-
-                Type::ListExact(item_types)
-            }
-            ValueNode::Map(map_node) => map_node.expected_type(context)?,
-            ValueNode::Struct { name, .. }  => {
-                Type::custom(name.clone(), Vec::with_capacity(0))
-            }
-            ValueNode::Range(_) => Type::Range,
-            ValueNode::Enum { name, variant, expression: _ } => {
-                let types: Vec<Type> = if let Some(type_definition) = context.get_definition(name)? {
-                    if let TypeDefinition::Enum(enum_definition) = type_definition {
-                        let types = enum_definition.variants().into_iter().find_map(|(identifier, types)| {
-                            if identifier == variant {
-                                Some(types.clone())
-                            } else {
-                                None
-                            }
-                        });
-
-                        if let Some(types) = types {
-                            types 
-                        } else {
-                            return Err(ValidationError::VariableIdentifierNotFound(variant.clone()));
-                        }
-                         
-                    } else {
-                        return Err(ValidationError::ExpectedEnumDefintion { actual: type_definition.clone() });
-                    }
-                } else {
-                     return Err(ValidationError::VariableIdentifierNotFound(name.clone()));
-                };
-
-                Type::custom(name.clone(), types.clone())
-                
-            },
-        };
-
-        Ok(r#type)
-    }
-
-    fn validate(&self, _source: &str, context: &Context) -> Result<(), ValidationError> {
         match self {
             ValueNode::Function(function) => {
                 if let Function::ContextDefined(function_node) = function {
-                    function_node.validate(_source, context)?;
+                    function_node.check_type(_source, _context)?;
                 }
             }
-            ValueNode::Map(map_node) => map_node.validate(_source, context)?,
+            _ => {}
-            ValueNode::Enum { name, expression, .. } => {
-                name.validate(_source, context)?;
-
-                if let Some(expression) = expression {
-                    expression.validate(_source, context)?;
-                }
-            }
-            _ => {},
         }
 
         Ok(())
     }
 
-    fn run(&self, source: &str, context: &Context) -> Result<Value, RuntimeError> {
+    fn run(&self, source: &str, context: &Map) -> Result<Value> {
         let value = match self {
             ValueNode::Boolean(value_source) => Value::Boolean(value_source.parse().unwrap()),
-            ValueNode::Float(value_source) => {
+            ValueNode::Float(value_source) => Value::Float(value_source.parse().unwrap()),
-                let float = value_source.parse()?;
-
-                Value::Float(float)
-            }
             ValueNode::Function(function) => Value::Function(function.clone()),
             ValueNode::Integer(value_source) => Value::Integer(value_source.parse().unwrap()),
             ValueNode::String(value_source) => Value::string(value_source.clone()),
@@ -214,52 +218,101 @@ impl AbstractTree for ValueNode {
 
                 Value::List(List::with_items(values))
             }
-            ValueNode::Map(map_node) => map_node.run(source, context)?,
+            ValueNode::Option(option) => {
-            ValueNode::Range(range) => Value::Range(range.clone()),
+                let option_value = if let Some(expression) = option {
-            ValueNode::Struct { name, properties } => {
+                    Some(Box::new(expression.run(source, context)?))
-                let instance = if let Some(definition) = context.get_definition(name)? {
-                    if let TypeDefinition::Struct(struct_definition) = definition {
-                        struct_definition.instantiate(properties, source, context)?
                 } else {
-                        return Err(RuntimeError::ValidationFailure(ValidationError::ExpectedStructDefintion { actual: definition.clone() }))
+                    None
-                    }
-                } else {
-                    return Err(RuntimeError::ValidationFailure(
-                        ValidationError::TypeDefinitionNotFound(name.clone())
-                    ));
                 };
 
-                Value::Struct(instance)
+                Value::Option(option_value)
+            }
+            ValueNode::Map(key_statement_pairs) => {
+                let map = Map::new();
 
+                {
+                    for (key, (statement, _)) in key_statement_pairs {
+                        let value = statement.run(source, context)?;
+
+                        map.set(key.clone(), value)?;
                     }
-            ValueNode::Enum { name, variant, expression } => {
-                let value = if let Some(expression) = expression {
-                    expression.run(source, context)?
-                } else {
-                    Value::none()
-                };
-                let instance = if let Some(definition) = context.get_definition(name)? {
-                    if let TypeDefinition::Enum(enum_defintion) = definition {
-                        enum_defintion.instantiate(variant.clone(), Some(value))
-                    } else {
-                        return Err(RuntimeError::ValidationFailure(
-                            ValidationError::ExpectedEnumDefintion {
-                                actual: definition.clone()
                 }
-                        ));
+
+                Value::Map(map)
             }
+            ValueNode::BuiltInValue(built_in_value) => built_in_value.run(source, context)?,
+            ValueNode::Structure(node_map) => {
+                let mut value_map = BTreeMap::new();
+
+                for (key, (statement_option, r#type)) in node_map {
+                    let value_option = if let Some(statement) = statement_option {
+                        Some(statement.run(source, context)?)
                     } else {
-                    return Err(RuntimeError::ValidationFailure(
+                        None
-                        ValidationError::TypeDefinitionNotFound(name.clone())
-                    ));
                     };
 
-                Value::Enum(instance)                
+                    value_map.insert(key.to_string(), (value_option, r#type.clone()));
-            },
+                }
+
+                Value::TypeDefinition(TypeDefintion::Structure(Structure::new(value_map)))
+            }
+            ValueNode::Range(range) => Value::Range(*range),
         };
 
         Ok(value)
     }
+
+    fn expected_type(&self, context: &Map) -> Result<Type> {
+        let r#type = match self {
+            ValueNode::Boolean(_) => Type::Boolean,
+            ValueNode::Float(_) => Type::Float,
+            ValueNode::Function(function) => function.r#type().clone(),
+            ValueNode::Integer(_) => Type::Integer,
+            ValueNode::String(_) => Type::String,
+            ValueNode::List(expressions) => {
+                let mut previous_type = None;
+
+                for expression in expressions {
+                    let expression_type = expression.expected_type(context)?;
+
+                    if let Some(previous) = previous_type {
+                        if expression_type != previous {
+                            return Ok(Type::List(Box::new(Type::Any)));
+                        }
+                    }
+
+                    previous_type = Some(expression_type);
+                }
+
+                if let Some(previous) = previous_type {
+                    Type::List(Box::new(previous))
+                } else {
+                    Type::List(Box::new(Type::Any))
+                }
+            }
+            ValueNode::Option(option) => {
+                if let Some(expression) = option {
+                    Type::Option(Box::new(expression.expected_type(context)?))
+                } else {
+                    Type::None
+                }
+            }
+            ValueNode::Map(_) => Type::Map(None),
+            ValueNode::BuiltInValue(built_in_value) => built_in_value.expected_type(context)?,
+            ValueNode::Structure(node_map) => {
+                let mut value_map = BTreeMap::new();
+
+                for (key, (_statement_option, r#type)) in node_map {
+                    value_map.insert(key.to_string(), (None, r#type.clone()));
+                }
+
+                Type::Map(Some(Structure::new(value_map)))
+            }
+            ValueNode::Range(_) => Type::Range,
+        };
+
+        Ok(r#type)
+    }
 }
 
 impl Format for ValueNode {
@@ -283,75 +336,63 @@ impl Format for ValueNode {
 
                 output.push(']');
             }
-            ValueNode::Map(map_node) => map_node.format(output, indent_level),
+            ValueNode::Option(option) => {
-            ValueNode::Struct { name, properties } => {
+                if let Some(expression) = option {
-                name.format(output, indent_level);
+                    output.push_str("some(");
-                properties.format(output, indent_level);
+                    expression.format(output, indent_level);
+                    output.push(')');
+                } else {
+                    output.push_str("none");
+                }
+            }
+            ValueNode::Map(nodes) => {
+                output.push_str("{\n");
+
+                for (key, (statement, type_option)) in nodes {
+                    if let Some(r#type) = type_option {
+                        ValueNode::indent(output, indent_level + 1);
+                        output.push_str(key);
+                        output.push_str(" <");
+                        r#type.format(output, 0);
+                        output.push_str("> = ");
+                        statement.format(output, 0);
+                    } else {
+                        ValueNode::indent(output, indent_level + 1);
+                        output.push_str(key);
+                        output.push_str(" = ");
+                        statement.format(output, 0);
+                    }
+
+                    output.push('\n');
+                }
+
+                ValueNode::indent(output, indent_level);
+                output.push('}');
+            }
+            ValueNode::BuiltInValue(built_in_value) => built_in_value.format(output, indent_level),
+            ValueNode::Structure(nodes) => {
+                output.push('{');
+
+                for (key, (value_option, r#type)) in nodes {
+                    if let Some(value) = value_option {
+                        output.push_str("    ");
+                        output.push_str(key);
+                        output.push_str(" <");
+                        r#type.format(output, indent_level);
+                        output.push_str("> = ");
+                        value.format(output, indent_level);
+                    } else {
+                        output.push_str("    ");
+                        output.push_str(key);
+                        output.push_str(" <");
+                        r#type.format(output, indent_level);
+                        output.push('>');
+                    }
+                }
+
+                output.push('}');
             }
             ValueNode::Range(_) => todo!(),
-            ValueNode::Enum { ..  } => todo!(),
         }
     }
 }
-
-impl Ord for ValueNode {
-    fn cmp(&self, other: &Self) -> std::cmp::Ordering {
-        match (self, other) {
-            (ValueNode::Boolean(left), ValueNode::Boolean(right)) => left.cmp(right),
-            (ValueNode::Boolean(_), _) => Ordering::Greater,
-            (ValueNode::Float(left), ValueNode::Float(right)) => left.cmp(right),
-            (ValueNode::Float(_), _) => Ordering::Greater,
-            (ValueNode::Function(left), ValueNode::Function(right)) => left.cmp(right),
-            (ValueNode::Function(_), _) => Ordering::Greater,
-            (ValueNode::Integer(left), ValueNode::Integer(right)) => left.cmp(right),
-            (ValueNode::Integer(_), _) => Ordering::Greater,
-            (ValueNode::String(left), ValueNode::String(right)) => left.cmp(right),
-            (ValueNode::String(_), _) => Ordering::Greater,
-            (ValueNode::List(left), ValueNode::List(right)) => left.cmp(right),
-            (ValueNode::List(_), _) => Ordering::Greater,
-            (ValueNode::Map(left), ValueNode::Map(right)) => left.cmp(right),
-            (ValueNode::Map(_), _) => Ordering::Greater,
-            (ValueNode::Struct{ name: left_name, properties: left_properties }, ValueNode::Struct {name: right_name, properties: right_properties} ) => {
-                let name_cmp = left_name.cmp(right_name);
-
-                if name_cmp.is_eq() {
-                    left_properties.cmp(right_properties)
-                } else {
-                    name_cmp
-                }
-            },
-            (ValueNode::Struct {..}, _) => Ordering::Greater,
-            (
-                ValueNode::Enum {
-                    name: left_name, variant: left_variant, expression: left_expression
-                },
-                ValueNode::Enum {
-                    name: right_name, variant: right_variant, expression: right_expression
-                }
-            ) => {
-                let name_cmp = left_name.cmp(right_name);
-
-                if name_cmp.is_eq() {
-                    let variant_cmp = left_variant.cmp(right_variant);
-
-                    if variant_cmp.is_eq() {
-                        left_expression.cmp(right_expression)
-                    } else {
-                        variant_cmp
-                    }
-                } else {
-                    name_cmp
-                }
-            },
-            (ValueNode::Enum { .. }, _) => Ordering::Greater,
-            (ValueNode::Range(left), ValueNode::Range(right)) => left.clone().cmp(right.clone()),
-            (ValueNode::Range(_), _) => Ordering::Less,
-        }
-    }
-}
-
-impl PartialOrd for ValueNode {
-    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        Some(self.cmp(other))
-    }
-}

src/abstract_tree/while.rs

@@ -1,9 +1,6 @@
 use serde::{Deserialize, Serialize};
 
-use crate::{
+use crate::{AbstractTree, Block, Error, Expression, Format, Map, Result, SyntaxNode, Type, Value};
-    error::{RuntimeError, SyntaxError, ValidationError},
-    AbstractTree, Block, Context, Expression, Format, SyntaxNode, Type, Value,
-};
 
 /// Abstract representation of a while loop.
 ///
@@ -15,8 +12,8 @@ pub struct While {
 }
 
 impl AbstractTree for While {
-    fn from_syntax(node: SyntaxNode, source: &str, context: &Context) -> Result<Self, SyntaxError> {
+    fn from_syntax(node: SyntaxNode, source: &str, context: &Map) -> crate::Result<Self> {
-        SyntaxError::expect_syntax_node("while", node)?;
+        Error::expect_syntax_node(source, "while", node)?;
 
         let expression_node = node.child(1).unwrap();
         let expression = Expression::from_syntax(expression_node, source, context)?;
@@ -27,28 +24,17 @@ impl AbstractTree for While {
         Ok(While { expression, block })
     }
 
-    fn expected_type(&self, context: &Context) -> Result<Type, ValidationError> {
+    fn run(&self, source: &str, context: &Map) -> Result<Value> {
-        self.block.expected_type(context)
-    }
-
-    fn validate(&self, _source: &str, context: &Context) -> Result<(), ValidationError> {
-        log::info!("VALIDATE while loop");
-
-        self.expression.validate(_source, context)?;
-        self.block.validate(_source, context)
-    }
-
-    fn run(&self, source: &str, context: &Context) -> Result<Value, RuntimeError> {
-        log::info!("RUN while loop start");
-
         while self.expression.run(source, context)?.as_boolean()? {
             self.block.run(source, context)?;
         }
 
-        log::info!("RUN while loop end");
-
         Ok(Value::none())
     }
+
+    fn expected_type(&self, context: &Map) -> Result<Type> {
+        self.block.expected_type(context)
+    }
 }
 
 impl Format for While {

src/abstract_tree/yield.rs

@@ -0,0 +1,58 @@
+use serde::{Deserialize, Serialize};
+
+use crate::{
+    function_expression::FunctionExpression, AbstractTree, Error, Expression, Format, FunctionCall,
+    Map, Result, SyntaxNode, Type, Value,
+};
+
+/// Abstract representation of a yield expression.
+///
+/// Yield is an alternate means of calling and passing values to a function.
+#[derive(Debug, Clone, Serialize, Deserialize, Eq, PartialEq, PartialOrd, Ord)]
+pub struct Yield {
+    call: FunctionCall,
+}
+
+impl AbstractTree for Yield {
+    fn from_syntax(node: SyntaxNode, source: &str, context: &Map) -> Result<Self> {
+        Error::expect_syntax_node(source, "yield", node)?;
+
+        let input_node = node.child(0).unwrap();
+        let input = Expression::from_syntax(input_node, source, context)?;
+
+        let function_node = node.child(2).unwrap();
+        let function_expression = FunctionExpression::from_syntax(function_node, source, context)?;
+
+        let mut arguments = Vec::new();
+
+        arguments.push(input);
+
+        for index in 3..node.child_count() - 1 {
+            let child = node.child(index).unwrap();
+
+            if child.is_named() {
+                let expression = Expression::from_syntax(child, source, context)?;
+
+                arguments.push(expression);
+            }
+        }
+
+        let call = FunctionCall::new(function_expression, arguments, node.range().into());
+
+        Ok(Yield { call })
+    }
+
+    fn run(&self, source: &str, context: &Map) -> Result<Value> {
+        self.call.run(source, context)
+    }
+
+    fn expected_type(&self, context: &Map) -> Result<Type> {
+        self.call.expected_type(context)
+    }
+}
+
+impl Format for Yield {
+    fn format(&self, output: &mut String, indent_level: u8) {
+        self.call.format(output, indent_level);
+    }
+}

src/built_in_functions/fs.rs

@@ -1,59 +0,0 @@
-use std::{fs::File, io::Read};
-
-use enum_iterator::{all, Sequence};
-use serde::{Deserialize, Serialize};
-
-use crate::{error::RuntimeError, Context, Type, Value};
-
-use super::Callable;
-
-pub fn fs_functions() -> impl Iterator<Item = Fs> {
-    all()
-}
-
-#[derive(Sequence, Debug, Copy, Clone, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord)]
-pub enum Fs {
-    ReadFile,
-}
-
-impl Callable for Fs {
-    fn name(&self) -> &'static str {
-        match self {
-            Fs::ReadFile => "read_file",
-        }
-    }
-
-    fn description(&self) -> &'static str {
-        match self {
-            Fs::ReadFile => "Read the contents of a file to a string.",
-        }
-    }
-
-    fn r#type(&self) -> Type {
-        match self {
-            Fs::ReadFile => Type::function(vec![Type::String], Type::String),
-        }
-    }
-
-    fn call(
-        &self,
-        arguments: &[Value],
-        _source: &str,
-        _outer_context: &Context,
-    ) -> Result<Value, RuntimeError> {
-        match self {
-            Fs::ReadFile => {
-                RuntimeError::expect_argument_amount(self.name(), 1, arguments.len())?;
-
-                let path = arguments.first().unwrap().as_string()?;
-                let mut file = File::open(path)?;
-                let file_size = file.metadata()?.len() as usize;
-                let mut file_content = String::with_capacity(file_size);
-
-                file.read_to_string(&mut file_content)?;
-
-                Ok(Value::string(file_content))
-            }
-        }
-    }
-}

src/built_in_functions/json.rs

@@ -1,77 +0,0 @@
-use enum_iterator::Sequence;
-use serde::{Deserialize, Serialize};
-
-use crate::{error::RuntimeError, Context, Type, Value};
-
-use super::Callable;
-
-pub fn json_functions() -> impl Iterator<Item = Json> {
-    enum_iterator::all()
-}
-
-#[derive(Sequence, Debug, Copy, Clone, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord)]
-pub enum Json {
-    Create,
-    CreatePretty,
-    Parse,
-}
-
-impl Callable for Json {
-    fn name(&self) -> &'static str {
-        match self {
-            Json::Create => "create",
-            Json::CreatePretty => "create_pretty",
-            Json::Parse => "parse",
-        }
-    }
-
-    fn description(&self) -> &'static str {
-        match self {
-            Json::Create => "Convert a value to a JSON string.",
-            Json::CreatePretty => "Convert a value to a formatted JSON string.",
-            Json::Parse => "Convert JSON to a value",
-        }
-    }
-
-    fn r#type(&self) -> Type {
-        match self {
-            Json::Create => Type::function(vec![Type::Any], Type::String),
-            Json::CreatePretty => Type::function(vec![Type::Any], Type::String),
-            Json::Parse => Type::function(vec![Type::String], Type::Any),
-        }
-    }
-
-    fn call(
-        &self,
-        arguments: &[Value],
-        _source: &str,
-        _outer_context: &Context,
-    ) -> Result<Value, RuntimeError> {
-        match self {
-            Json::Create => {
-                RuntimeError::expect_argument_amount(self.name(), 1, arguments.len())?;
-
-                let value = arguments.first().unwrap();
-                let json_string = serde_json::to_string(value)?;
-
-                Ok(Value::String(json_string))
-            }
-            Json::CreatePretty => {
-                RuntimeError::expect_argument_amount(self.name(), 1, arguments.len())?;
-
-                let value = arguments.first().unwrap();
-                let json_string = serde_json::to_string_pretty(value)?;
-
-                Ok(Value::String(json_string))
-            }
-            Json::Parse => {
-                RuntimeError::expect_argument_amount(self.name(), 1, arguments.len())?;
-
-                let json_string = arguments.first().unwrap().as_string()?;
-                let value = serde_json::from_str(json_string)?;
-
-                Ok(value)
-            }
-        }
-    }
-}

src/built_in_functions/mod.rs

@@ -1,51 +1,37 @@
-pub mod fs;
+mod string;
-pub mod json;
-pub mod str;
 
-use std::fmt::{self, Display, Formatter};
+use std::{
+    fmt::{self, Display, Formatter},
+    fs::read_to_string,
+};
 
 use rand::{random, thread_rng, Rng};
 use serde::{Deserialize, Serialize};
 
-use crate::{
+use crate::{Error, Format, Map, Result, Type, Value};
-    error::{RuntimeError, ValidationError},
-    Context, EnumInstance, Format, Identifier, Type, Value,
-};
 
-use self::{fs::Fs, json::Json, str::StrFunction};
+pub use string::{string_functions, StringFunction};
-
-pub trait Callable {
-    fn name(&self) -> &'static str;
-    fn description(&self) -> &'static str;
-    fn r#type(&self) -> Type;
-    fn call(
-        &self,
-        arguments: &[Value],
-        source: &str,
-        context: &Context,
-    ) -> Result<Value, RuntimeError>;
-}
 
 #[derive(Debug, Copy, Clone, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord)]
 pub enum BuiltInFunction {
     AssertEqual,
-    Fs(Fs),
+    FsRead,
-    Json(Json),
+    JsonParse,
     Length,
     Output,
     RandomBoolean,
     RandomFloat,
     RandomFrom,
     RandomInteger,
-    String(StrFunction),
+    String(StringFunction),
 }
 
-impl Callable for BuiltInFunction {
+impl BuiltInFunction {
-    fn name(&self) -> &'static str {
+    pub fn name(&self) -> &'static str {
         match self {
             BuiltInFunction::AssertEqual => "assert_equal",
-            BuiltInFunction::Fs(fs_function) => fs_function.name(),
+            BuiltInFunction::FsRead => "read",
-            BuiltInFunction::Json(json_function) => json_function.name(),
+            BuiltInFunction::JsonParse => "parse",
             BuiltInFunction::Length => "length",
             BuiltInFunction::Output => "output",
             BuiltInFunction::RandomBoolean => "boolean",
@@ -56,26 +42,11 @@ impl Callable for BuiltInFunction {
         }
     }
 
-    fn description(&self) -> &'static str {
+    pub fn r#type(&self) -> Type {
-        match self {
-            BuiltInFunction::AssertEqual => "assert_equal",
-            BuiltInFunction::Fs(fs_function) => fs_function.description(),
-            BuiltInFunction::Json(json_function) => json_function.description(),
-            BuiltInFunction::Length => "length",
-            BuiltInFunction::Output => "output",
-            BuiltInFunction::RandomBoolean => "boolean",
-            BuiltInFunction::RandomFloat => "float",
-            BuiltInFunction::RandomFrom => "from",
-            BuiltInFunction::RandomInteger => "integer",
-            BuiltInFunction::String(string_function) => string_function.description(),
-        }
-    }
-
-    fn r#type(&self) -> Type {
         match self {
             BuiltInFunction::AssertEqual => Type::function(vec![Type::Any, Type::Any], Type::None),
-            BuiltInFunction::Fs(fs_function) => fs_function.r#type(),
+            BuiltInFunction::FsRead => Type::function(vec![Type::String], Type::String),
-            BuiltInFunction::Json(json_function) => json_function.r#type(),
+            BuiltInFunction::JsonParse => Type::function(vec![Type::String], Type::Any),
             BuiltInFunction::Length => Type::function(vec![Type::Collection], Type::Integer),
             BuiltInFunction::Output => Type::function(vec![Type::Any], Type::None),
             BuiltInFunction::RandomBoolean => Type::function(vec![], Type::Boolean),
@@ -86,56 +57,52 @@ impl Callable for BuiltInFunction {
         }
     }
 
-    fn call(
+    pub fn call(&self, arguments: &[Value], _source: &str, _outer_context: &Map) -> Result<Value> {
-        &self,
-        arguments: &[Value],
-        _source: &str,
-        context: &Context,
-    ) -> Result<Value, RuntimeError> {
         match self {
             BuiltInFunction::AssertEqual => {
-                RuntimeError::expect_argument_amount(self.name(), 2, arguments.len())?;
+                Error::expect_argument_amount(self.name(), 2, arguments.len())?;
 
-                let left = arguments.get(0).unwrap();
+                let left = arguments.first().unwrap();
                 let right = arguments.get(1).unwrap();
 
-                if left == right {
+                Ok(Value::Boolean(left == right))
-                    Ok(Value::Enum(EnumInstance::new(
-                        Identifier::new("Result"),
-                        Identifier::new("Ok"),
-                        Some(Value::none()),
-                    )))
-                } else {
-                    Err(RuntimeError::AssertEqualFailed {
-                        left: left.clone(),
-                        right: right.clone(),
-                    })
             }
+            BuiltInFunction::FsRead => {
+                Error::expect_argument_amount(self.name(), 1, arguments.len())?;
+
+                let path = arguments.first().unwrap().as_string()?;
+                let file_content = read_to_string(path.as_str())?;
+
+                Ok(Value::string(file_content))
+            }
+            BuiltInFunction::JsonParse => {
+                Error::expect_argument_amount(self.name(), 1, arguments.len())?;
+
+                let string = arguments.first().unwrap().as_string()?;
+                let value = serde_json::from_str(string)?;
+
+                Ok(value)
             }
-            BuiltInFunction::Fs(fs_function) => fs_function.call(arguments, _source, context),
-            BuiltInFunction::Json(json_function) => json_function.call(arguments, _source, context),
             BuiltInFunction::Length => {
-                RuntimeError::expect_argument_amount(self.name(), 1, arguments.len())?;
+                Error::expect_argument_amount(self.name(), 1, arguments.len())?;
 
                 let value = arguments.first().unwrap();
                 let length = if let Ok(list) = value.as_list() {
-                    list.items()?.len()
+                    list.items().len()
                 } else if let Ok(map) = value.as_map() {
-                    map.inner().len()
+                    map.variables()?.len()
                 } else if let Ok(str) = value.as_string() {
                     str.chars().count()
                 } else {
-                    return Err(RuntimeError::ValidationFailure(
+                    return Err(Error::ExpectedCollection {
-                        ValidationError::ExpectedCollection {
                         actual: value.clone(),
-                        },
+                    });
-                    ));
                 };
 
                 Ok(Value::Integer(length as i64))
             }
             BuiltInFunction::Output => {
-                RuntimeError::expect_argument_amount(self.name(), 1, arguments.len())?;
+                Error::expect_argument_amount(self.name(), 1, arguments.len())?;
 
                 let value = arguments.first().unwrap();
 
@@ -144,22 +111,22 @@ impl Callable for BuiltInFunction {
                 Ok(Value::none())
             }
             BuiltInFunction::RandomBoolean => {
-                RuntimeError::expect_argument_amount(self.name(), 0, arguments.len())?;
+                Error::expect_argument_amount(self.name(), 0, arguments.len())?;
 
                 Ok(Value::Boolean(random()))
             }
             BuiltInFunction::RandomFloat => {
-                RuntimeError::expect_argument_amount(self.name(), 0, arguments.len())?;
+                Error::expect_argument_amount(self.name(), 0, arguments.len())?;
 
                 Ok(Value::Float(random()))
             }
             BuiltInFunction::RandomFrom => {
-                RuntimeError::expect_argument_amount(self.name(), 1, arguments.len())?;
+                Error::expect_argument_amount(self.name(), 1, arguments.len())?;
 
                 let value = arguments.first().unwrap();
 
                 if let Ok(list) = value.as_list() {
-                    let items = list.items()?;
+                    let items = list.items();
 
                     if items.len() == 0 {
                         Ok(Value::none())
@@ -174,12 +141,12 @@ impl Callable for BuiltInFunction {
                 }
             }
             BuiltInFunction::RandomInteger => {
-                RuntimeError::expect_argument_amount(self.name(), 0, arguments.len())?;
+                Error::expect_argument_amount(self.name(), 0, arguments.len())?;
 
                 Ok(Value::Integer(random()))
             }
             BuiltInFunction::String(string_function) => {
-                string_function.call(arguments, _source, context)
+                string_function.call(arguments, _source, _outer_context)
             }
         }
     }

src/built_in_functions/string.rs

@@ -1,16 +1,14 @@
-use enum_iterator::Sequence;
+use enum_iterator::{all, Sequence};
 use serde::{Deserialize, Serialize};
 
-use crate::{error::RuntimeError, Context, EnumInstance, Identifier, List, Type, Value};
+use crate::{Error, List, Map, Result, Type, Value};
 
-use super::Callable;
+pub fn string_functions() -> impl Iterator<Item = StringFunction> {
-
+    all()
-pub fn string_functions() -> impl Iterator<Item = StrFunction> {
-    enum_iterator::all()
 }
 
 #[derive(Sequence, Debug, Copy, Clone, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord)]
-pub enum StrFunction {
+pub enum StringFunction {
     AsBytes,
     EndsWith,
     Find,
@@ -43,171 +41,132 @@ pub enum StrFunction {
     Truncate,
 }
 
-impl Callable for StrFunction {
+impl StringFunction {
-    fn name(&self) -> &'static str {
+    pub fn name(&self) -> &'static str {
         match self {
-            StrFunction::AsBytes => "as_bytes",
+            StringFunction::AsBytes => "as_bytes",
-            StrFunction::EndsWith => "ends_with",
+            StringFunction::EndsWith => "ends_with",
-            StrFunction::Find => "find",
+            StringFunction::Find => "find",
-            StrFunction::Insert => "insert",
+            StringFunction::Insert => "insert",
-            StrFunction::IsAscii => "is_ascii",
+            StringFunction::IsAscii => "is_ascii",
-            StrFunction::IsEmpty => "is_empty",
+            StringFunction::IsEmpty => "is_empty",
-            StrFunction::Lines => "lines",
+            StringFunction::Lines => "lines",
-            StrFunction::Matches => "matches",
+            StringFunction::Matches => "matches",
-            StrFunction::Parse => "parse",
+            StringFunction::Parse => "parse",
-            StrFunction::Remove => "remove",
+            StringFunction::Remove => "remove",
-            StrFunction::ReplaceRange => "replace_range",
+            StringFunction::ReplaceRange => "replace_range",
-            StrFunction::Retain => "retain",
+            StringFunction::Retain => "retain",
-            StrFunction::Split => "split",
+            StringFunction::Split => "split",
-            StrFunction::SplitAt => "split_at",
+            StringFunction::SplitAt => "split_at",
-            StrFunction::SplitInclusive => "split_inclusive",
+            StringFunction::SplitInclusive => "split_inclusive",
-            StrFunction::SplitN => "split_n",
+            StringFunction::SplitN => "split_n",
-            StrFunction::SplitOnce => "split_once",
+            StringFunction::SplitOnce => "split_once",
-            StrFunction::SplitTerminator => "split_terminator",
+            StringFunction::SplitTerminator => "split_terminator",
-            StrFunction::SplitWhitespace => "split_whitespace",
+            StringFunction::SplitWhitespace => "split_whitespace",
-            StrFunction::StartsWith => "starts_with",
+            StringFunction::StartsWith => "starts_with",
-            StrFunction::StripPrefix => "strip_prefix",
+            StringFunction::StripPrefix => "strip_prefix",
-            StrFunction::ToLowercase => "to_lowercase",
+            StringFunction::ToLowercase => "to_lowercase",
-            StrFunction::ToUppercase => "to_uppercase",
+            StringFunction::ToUppercase => "to_uppercase",
-            StrFunction::Trim => "trim",
+            StringFunction::Trim => "trim",
-            StrFunction::TrimEnd => "trim_end",
+            StringFunction::TrimEnd => "trim_end",
-            StrFunction::TrimEndMatches => "trim_end_matches",
+            StringFunction::TrimEndMatches => "trim_end_matches",
-            StrFunction::TrimMatches => "trim_matches",
+            StringFunction::TrimMatches => "trim_matches",
-            StrFunction::TrimStart => "trim_start",
+            StringFunction::TrimStart => "trim_start",
-            StrFunction::TrimStartMatches => "trim_start_matches",
+            StringFunction::TrimStartMatches => "trim_start_matches",
-            StrFunction::Truncate => "truncate",
+            StringFunction::Truncate => "truncate",
         }
     }
 
-    fn description(&self) -> &'static str {
+    pub fn r#type(&self) -> Type {
         match self {
-            StrFunction::AsBytes => "TODO",
+            StringFunction::AsBytes => {
-            StrFunction::EndsWith => "TODO",
+                Type::function(vec![Type::String], Type::list(Type::Integer))
-            StrFunction::Find => "TODO",
-            StrFunction::Insert => "TODO",
-            StrFunction::IsAscii => "TODO",
-            StrFunction::IsEmpty => "TODO",
-            StrFunction::Lines => "TODO",
-            StrFunction::Matches => "TODO",
-            StrFunction::Parse => "TODO",
-            StrFunction::Remove => "TODO",
-            StrFunction::ReplaceRange => "TODO",
-            StrFunction::Retain => "TODO",
-            StrFunction::Split => "TODO",
-            StrFunction::SplitAt => "TODO",
-            StrFunction::SplitInclusive => "TODO",
-            StrFunction::SplitN => "TODO",
-            StrFunction::SplitOnce => "TODO",
-            StrFunction::SplitTerminator => "TODO",
-            StrFunction::SplitWhitespace => "TODO",
-            StrFunction::StartsWith => "TODO",
-            StrFunction::StripPrefix => "TODO",
-            StrFunction::ToLowercase => "TODO",
-            StrFunction::ToUppercase => "TODO",
-            StrFunction::Trim => "TODO",
-            StrFunction::TrimEnd => "TODO",
-            StrFunction::TrimEndMatches => "TODO",
-            StrFunction::TrimMatches => "TODO",
-            StrFunction::TrimStart => "TODO",
-            StrFunction::TrimStartMatches => "TODO",
-            StrFunction::Truncate => "TODO",
             }
-    }
+            StringFunction::EndsWith => {
-
-    fn r#type(&self) -> Type {
-        match self {
-            StrFunction::AsBytes => Type::function(vec![Type::String], Type::list(Type::Integer)),
-            StrFunction::EndsWith => {
                 Type::function(vec![Type::String, Type::String], Type::Boolean)
             }
-            StrFunction::Find => Type::function(
+            StringFunction::Find => Type::function(
                 vec![Type::String, Type::String],
-                Type::option(Some(Type::Integer)),
+                Type::option(Type::Integer),
             ),
-            StrFunction::Insert => Type::function(
+            StringFunction::Insert => Type::function(
                 vec![Type::String, Type::Integer, Type::String],
                 Type::String,
             ),
-            StrFunction::IsAscii => Type::function(vec![Type::String], Type::Boolean),
+            StringFunction::IsAscii => Type::function(vec![Type::String], Type::Boolean),
-            StrFunction::IsEmpty => Type::function(vec![Type::String], Type::Boolean),
+            StringFunction::IsEmpty => Type::function(vec![Type::String], Type::Boolean),
-            StrFunction::Lines => Type::function(vec![Type::String], Type::list(Type::String)),
+            StringFunction::Lines => Type::function(vec![Type::String], Type::list(Type::String)),
-            StrFunction::Matches => {
+            StringFunction::Matches => {
                 Type::function(vec![Type::String, Type::String], Type::list(Type::String))
             }
-            StrFunction::Parse => Type::function(vec![Type::String], Type::Any),
+            StringFunction::Parse => Type::function(vec![Type::String], Type::Any),
-            StrFunction::Remove => Type::function(
+            StringFunction::Remove => Type::function(
                 vec![Type::String, Type::Integer],
-                Type::option(Some(Type::String)),
+                Type::option(Type::String),
             ),
-            StrFunction::ReplaceRange => Type::function(
+            StringFunction::ReplaceRange => Type::function(
                 vec![Type::String, Type::list(Type::Integer), Type::String],
                 Type::String,
             ),
-            StrFunction::Retain => Type::function(
+            StringFunction::Retain => Type::function(
                 vec![
                     Type::String,
                     Type::function(vec![Type::String], Type::Boolean),
                 ],
                 Type::String,
             ),
-            StrFunction::Split => {
+            StringFunction::Split => {
                 Type::function(vec![Type::String, Type::String], Type::list(Type::String))
             }
-            StrFunction::SplitAt => {
+            StringFunction::SplitAt => {
                 Type::function(vec![Type::String, Type::Integer], Type::list(Type::String))
             }
-            StrFunction::SplitInclusive => {
+            StringFunction::SplitInclusive => {
                 Type::function(vec![Type::String, Type::String], Type::list(Type::String))
             }
-            StrFunction::SplitN => Type::function(
+            StringFunction::SplitN => Type::function(
                 vec![Type::String, Type::Integer, Type::String],
                 Type::list(Type::String),
             ),
-            StrFunction::SplitOnce => {
+            StringFunction::SplitOnce => {
                 Type::function(vec![Type::String, Type::String], Type::list(Type::String))
             }
-            StrFunction::SplitTerminator => {
+            StringFunction::SplitTerminator => {
                 Type::function(vec![Type::String, Type::String], Type::list(Type::String))
             }
-            StrFunction::SplitWhitespace => {
+            StringFunction::SplitWhitespace => {
                 Type::function(vec![Type::String], Type::list(Type::String))
             }
-            StrFunction::StartsWith => {
+            StringFunction::StartsWith => {
                 Type::function(vec![Type::String, Type::String], Type::Boolean)
             }
-            StrFunction::StripPrefix => Type::function(
+            StringFunction::StripPrefix => {
-                vec![Type::String, Type::String],
+                Type::function(vec![Type::String, Type::String], Type::option(Type::String))
-                Type::option(Some(Type::String)),
+            }
-            ),
+            StringFunction::ToLowercase => Type::function(vec![Type::String], Type::String),
-            StrFunction::ToLowercase => Type::function(vec![Type::String], Type::String),
+            StringFunction::ToUppercase => Type::function(vec![Type::String], Type::String),
-            StrFunction::ToUppercase => Type::function(vec![Type::String], Type::String),
+            StringFunction::Truncate => {
-            StrFunction::Truncate => {
                 Type::function(vec![Type::String, Type::Integer], Type::String)
             }
-            StrFunction::Trim => Type::function(vec![Type::String], Type::String),
+            StringFunction::Trim => Type::function(vec![Type::String], Type::String),
-            StrFunction::TrimEnd => Type::function(vec![Type::String], Type::String),
+            StringFunction::TrimEnd => Type::function(vec![Type::String], Type::String),
-            StrFunction::TrimEndMatches => {
+            StringFunction::TrimEndMatches => {
                 Type::function(vec![Type::String, Type::String], Type::String)
             }
-            StrFunction::TrimMatches => {
+            StringFunction::TrimMatches => {
                 Type::function(vec![Type::String, Type::String], Type::String)
             }
-            StrFunction::TrimStart => Type::function(vec![Type::String], Type::String),
+            StringFunction::TrimStart => Type::function(vec![Type::String], Type::String),
-            StrFunction::TrimStartMatches => {
+            StringFunction::TrimStartMatches => {
                 Type::function(vec![Type::String, Type::String], Type::String)
             }
         }
     }
 
-    fn call(
+    pub fn call(&self, arguments: &[Value], _source: &str, _outer_context: &Map) -> Result<Value> {
-        &self,
-        arguments: &[Value],
-        _source: &str,
-        _context: &Context,
-    ) -> Result<Value, RuntimeError> {
         let value = match self {
-            StrFunction::AsBytes => {
+            StringFunction::AsBytes => {
-                RuntimeError::expect_argument_amount(self.name(), 1, arguments.len())?;
+                Error::expect_argument_amount(self.name(), 1, arguments.len())?;
 
                 let string = arguments.first().unwrap().as_string()?;
                 let bytes = string
@@ -217,8 +176,8 @@ impl Callable for StrFunction {
 
                 Value::List(List::with_items(bytes))
             }
-            StrFunction::EndsWith => {
+            StringFunction::EndsWith => {
-                RuntimeError::expect_argument_amount(self.name(), 2, arguments.len())?;
+                Error::expect_argument_amount(self.name(), 2, arguments.len())?;
 
                 let string = arguments.first().unwrap().as_string()?;
                 let pattern_string = arguments.get(1).unwrap().as_string()?;
@@ -226,46 +185,34 @@ impl Callable for StrFunction {
 
                 Value::Boolean(string.ends_with(pattern))
             }
-            StrFunction::Find => {
+            StringFunction::Find => {
-                RuntimeError::expect_argument_amount(self.name(), 2, arguments.len())?;
+                Error::expect_argument_amount(self.name(), 2, arguments.len())?;
 
                 let string = arguments.first().unwrap().as_string()?;
                 let pattern_string = arguments.get(1).unwrap().as_string()?;
                 let pattern = pattern_string.as_str();
                 let find = string
                     .find(pattern)
-                    .map(|index| Value::Integer(index as i64));
+                    .map(|index| Box::new(Value::Integer(index as i64)));
 
-                if let Some(index) = find {
+                Value::Option(find)
-                    Value::Enum(EnumInstance::new(
-                        Identifier::new("Option"),
-                        Identifier::new("Some"),
-                        Some(index),
-                    ))
-                } else {
-                    Value::Enum(EnumInstance::new(
-                        Identifier::new("Option"),
-                        Identifier::new("None"),
-                        Some(Value::none()),
-                    ))
             }
-            }
+            StringFunction::IsAscii => {
-            StrFunction::IsAscii => {
+                Error::expect_argument_amount(self.name(), 1, arguments.len())?;
-                RuntimeError::expect_argument_amount(self.name(), 1, arguments.len())?;
 
                 let string = arguments.first().unwrap().as_string()?;
 
                 Value::Boolean(string.is_ascii())
             }
-            StrFunction::IsEmpty => {
+            StringFunction::IsEmpty => {
-                RuntimeError::expect_argument_amount(self.name(), 1, arguments.len())?;
+                Error::expect_argument_amount(self.name(), 1, arguments.len())?;
 
                 let string = arguments.first().unwrap().as_string()?;
 
                 Value::Boolean(string.is_empty())
             }
-            StrFunction::Insert => {
+            StringFunction::Insert => {
-                RuntimeError::expect_argument_amount(self.name(), 3, arguments.len())?;
+                Error::expect_argument_amount(self.name(), 3, arguments.len())?;
 
                 let mut string = arguments.first().unwrap().as_string()?.clone();
                 let index = arguments.get(1).unwrap().as_integer()? as usize;
@@ -275,8 +222,8 @@ impl Callable for StrFunction {
 
                 Value::String(string)
             }
-            StrFunction::Lines => {
+            StringFunction::Lines => {
-                RuntimeError::expect_argument_amount(self.name(), 1, arguments.len())?;
+                Error::expect_argument_amount(self.name(), 1, arguments.len())?;
 
                 let string = arguments.first().unwrap().as_string()?;
                 let lines = string
@@ -286,8 +233,8 @@ impl Callable for StrFunction {
 
                 Value::List(List::with_items(lines))
             }
-            StrFunction::Matches => {
+            StringFunction::Matches => {
-                RuntimeError::expect_argument_amount(self.name(), 2, arguments.len())?;
+                Error::expect_argument_amount(self.name(), 2, arguments.len())?;
 
                 let string = arguments.first().unwrap().as_string()?;
                 let pattern_string = arguments.get(1).unwrap().as_string()?;
@@ -299,21 +246,21 @@ impl Callable for StrFunction {
 
                 Value::List(List::with_items(matches))
             }
-            StrFunction::Parse => {
+            StringFunction::Parse => {
-                RuntimeError::expect_argument_amount(self.name(), 1, arguments.len())?;
+                Error::expect_argument_amount(self.name(), 1, arguments.len())?;
 
                 let string = arguments.first().unwrap().as_string()?;
 
                 if let Ok(integer) = string.parse::<i64>() {
-                    Value::Integer(integer)
+                    Value::option(Some(Value::Integer(integer)))
                 } else if let Ok(float) = string.parse::<f64>() {
-                    Value::Float(float)
+                    Value::option(Some(Value::Float(float)))
                 } else {
                     Value::none()
                 }
             }
-            StrFunction::Remove => {
+            StringFunction::Remove => {
-                RuntimeError::expect_argument_amount(self.name(), 2, arguments.len())?;
+                Error::expect_argument_amount(self.name(), 2, arguments.len())?;
 
                 let string = arguments.first().unwrap().as_string()?;
                 let index = arguments.get(1).unwrap().as_integer()? as usize;
@@ -330,39 +277,37 @@ impl Callable for StrFunction {
                     Value::none()
                 }
             }
-            StrFunction::ReplaceRange => {
+            StringFunction::ReplaceRange => {
-                RuntimeError::expect_argument_amount(self.name(), 3, arguments.len())?;
+                Error::expect_argument_amount(self.name(), 3, arguments.len())?;
 
                 let mut string = arguments.first().unwrap().as_string()?.clone();
-                let range = arguments.get(1).unwrap().as_list()?.items()?;
+                let range = arguments.get(1).unwrap().as_list()?.items();
-                let start = range[0].as_integer()? as usize;
+                let start = range.first().unwrap_or_default().as_integer()? as usize;
-                let end = range[1].as_integer()? as usize;
+                let end = range.get(1).unwrap_or_default().as_integer()? as usize;
                 let pattern = arguments.get(2).unwrap().as_string()?;
 
                 string.replace_range(start..end, pattern);
 
                 Value::String(string)
             }
-            StrFunction::Retain => {
+            StringFunction::Retain => {
-                RuntimeError::expect_argument_amount(self.name(), 2, arguments.len())?;
+                Error::expect_argument_amount(self.name(), 2, arguments.len())?;
 
-                todo!();
+                let mut string = arguments.first().unwrap().as_string()?.clone();
+                let predicate = arguments.get(1).unwrap().as_function()?;
 
-                // let mut string = arguments.first().unwrap().as_string()?.clone();
+                string.retain(|char| {
-                // let predicate = arguments.get(1).unwrap().as_function()?;
+                    predicate
+                        .call(&[Value::string(char)], _source, _outer_context)
+                        .unwrap()
+                        .as_boolean()
+                        .unwrap()
+                });
 
-                // string.retain(|char| {
+                Value::String(string)
-                //     predicate
-                //         .call(&[Value::string(char)], _source, _outer_context)
-                //         .unwrap()
-                //         .as_boolean()
-                //         .unwrap()
-                // });
-
-                // Value::String(string)
             }
-            StrFunction::Split => {
+            StringFunction::Split => {
-                RuntimeError::expect_argument_amount(self.name(), 2, arguments.len())?;
+                Error::expect_argument_amount(self.name(), 2, arguments.len())?;
 
                 let string = arguments.first().unwrap().as_string()?;
                 let pattern_string = arguments.get(1).unwrap().as_string()?;
@@ -374,8 +319,8 @@ impl Callable for StrFunction {
 
                 Value::List(List::with_items(sections))
             }
-            StrFunction::SplitAt => {
+            StringFunction::SplitAt => {
-                RuntimeError::expect_argument_amount(self.name(), 2, arguments.len())?;
+                Error::expect_argument_amount(self.name(), 2, arguments.len())?;
 
                 let string = arguments.first().unwrap().as_string()?;
                 let index = arguments.get(1).unwrap().as_integer()?;
@@ -386,8 +331,8 @@ impl Callable for StrFunction {
                     Value::string(right.to_string()),
                 ]))
             }
-            StrFunction::SplitInclusive => {
+            StringFunction::SplitInclusive => {
-                RuntimeError::expect_argument_amount(self.name(), 2, arguments.len())?;
+                Error::expect_argument_amount(self.name(), 2, arguments.len())?;
 
                 let string = arguments.first().unwrap().as_string()?;
                 let pattern_string = arguments.get(1).unwrap().as_string()?;
@@ -399,8 +344,8 @@ impl Callable for StrFunction {
 
                 Value::List(List::with_items(sections))
             }
-            StrFunction::SplitN => {
+            StringFunction::SplitN => {
-                RuntimeError::expect_argument_amount(self.name(), 3, arguments.len())?;
+                Error::expect_argument_amount(self.name(), 3, arguments.len())?;
 
                 let string = arguments.first().unwrap().as_string()?;
                 let count = arguments.get(1).unwrap().as_integer()?;
@@ -413,8 +358,8 @@ impl Callable for StrFunction {
 
                 Value::List(List::with_items(sections))
             }
-            StrFunction::SplitOnce => {
+            StringFunction::SplitOnce => {
-                RuntimeError::expect_argument_amount(self.name(), 2, arguments.len())?;
+                Error::expect_argument_amount(self.name(), 2, arguments.len())?;
 
                 let string = arguments.first().unwrap().as_string()?;
                 let pattern_string = arguments.get(1).unwrap().as_string()?;
@@ -426,14 +371,10 @@ impl Callable for StrFunction {
                     ]))
                 });
 
-                if let Some(sections) = sections {
+                Value::option(sections)
-                    Value::some(sections)
-                } else {
-                    Value::none()
             }
-            }
+            StringFunction::SplitTerminator => {
-            StrFunction::SplitTerminator => {
+                Error::expect_argument_amount(self.name(), 2, arguments.len())?;
-                RuntimeError::expect_argument_amount(self.name(), 2, arguments.len())?;
 
                 let string = arguments.first().unwrap().as_string()?;
                 let pattern_string = arguments.get(1).unwrap().as_string()?;
@@ -445,8 +386,8 @@ impl Callable for StrFunction {
 
                 Value::List(List::with_items(sections))
             }
-            StrFunction::SplitWhitespace => {
+            StringFunction::SplitWhitespace => {
-                RuntimeError::expect_argument_amount(self.name(), 1, arguments.len())?;
+                Error::expect_argument_amount(self.name(), 1, arguments.len())?;
 
                 let string = arguments.first().unwrap().as_string()?;
                 let sections = string
@@ -456,8 +397,8 @@ impl Callable for StrFunction {
 
                 Value::List(List::with_items(sections))
             }
-            StrFunction::StartsWith => {
+            StringFunction::StartsWith => {
-                RuntimeError::expect_argument_amount(self.name(), 2, arguments.len())?;
+                Error::expect_argument_amount(self.name(), 2, arguments.len())?;
 
                 let string = arguments.first().unwrap().as_string()?;
                 let pattern_string = arguments.get(1).unwrap().as_string()?;
@@ -465,8 +406,8 @@ impl Callable for StrFunction {
 
                 Value::Boolean(string.starts_with(pattern))
             }
-            StrFunction::StripPrefix => {
+            StringFunction::StripPrefix => {
-                RuntimeError::expect_argument_amount(self.name(), 2, arguments.len())?;
+                Error::expect_argument_amount(self.name(), 2, arguments.len())?;
 
                 let string = arguments.first().unwrap().as_string()?;
                 let prefix_string = arguments.get(1).unwrap().as_string()?;
@@ -475,41 +416,33 @@ impl Callable for StrFunction {
                     .strip_prefix(prefix)
                     .map(|remainder| Value::string(remainder.to_string()));
 
-                if let Some(value) = stripped {
+                Value::option(stripped)
-                    Value::Enum(EnumInstance::new(
-                        Identifier::new("Option"),
-                        Identifier::new("Some"),
-                        Some(value),
-                    ))
-                } else {
-                    Value::none()
             }
-            }
+            StringFunction::ToLowercase => {
-            StrFunction::ToLowercase => {
+                Error::expect_argument_amount(self.name(), 1, arguments.len())?;
-                RuntimeError::expect_argument_amount(self.name(), 1, arguments.len())?;
 
                 let string = arguments.first().unwrap().as_string()?;
                 let lowercase = string.to_lowercase();
 
                 Value::string(lowercase)
             }
-            StrFunction::ToUppercase => {
+            StringFunction::ToUppercase => {
-                RuntimeError::expect_argument_amount(self.name(), 1, arguments.len())?;
+                Error::expect_argument_amount(self.name(), 1, arguments.len())?;
 
                 let string = arguments.first().unwrap().as_string()?;
                 let uppercase = string.to_uppercase();
 
                 Value::string(uppercase)
             }
-            StrFunction::Trim => {
+            StringFunction::Trim => {
-                RuntimeError::expect_argument_amount(self.name(), 1, arguments.len())?;
+                Error::expect_argument_amount(self.name(), 1, arguments.len())?;
 
                 let trimmed = arguments.first().unwrap().as_string()?.trim().to_string();
 
                 Value::string(trimmed)
             }
-            StrFunction::TrimEnd => {
+            StringFunction::TrimEnd => {
-                RuntimeError::expect_argument_amount(self.name(), 1, arguments.len())?;
+                Error::expect_argument_amount(self.name(), 1, arguments.len())?;
 
                 let trimmed = arguments
                     .first()
@@ -520,8 +453,8 @@ impl Callable for StrFunction {
 
                 Value::string(trimmed)
             }
-            StrFunction::TrimEndMatches => {
+            StringFunction::TrimEndMatches => {
-                RuntimeError::expect_argument_amount(self.name(), 2, arguments.len())?;
+                Error::expect_argument_amount(self.name(), 2, arguments.len())?;
 
                 let string = arguments.first().unwrap().as_string()?;
                 let pattern_string = arguments.get(1).unwrap().as_string()?;
@@ -530,8 +463,8 @@ impl Callable for StrFunction {
 
                 Value::string(trimmed)
             }
-            StrFunction::TrimMatches => {
+            StringFunction::TrimMatches => {
-                RuntimeError::expect_argument_amount(self.name(), 2, arguments.len())?;
+                Error::expect_argument_amount(self.name(), 2, arguments.len())?;
 
                 let string = arguments.first().unwrap().as_string()?;
                 let pattern = arguments
@@ -544,8 +477,8 @@ impl Callable for StrFunction {
 
                 Value::string(trimmed)
             }
-            StrFunction::TrimStart => {
+            StringFunction::TrimStart => {
-                RuntimeError::expect_argument_amount(self.name(), 1, arguments.len())?;
+                Error::expect_argument_amount(self.name(), 1, arguments.len())?;
 
                 let trimmed = arguments
                     .first()
@@ -556,8 +489,8 @@ impl Callable for StrFunction {
 
                 Value::string(trimmed)
             }
-            StrFunction::TrimStartMatches => {
+            StringFunction::TrimStartMatches => {
-                RuntimeError::expect_argument_amount(self.name(), 2, arguments.len())?;
+                Error::expect_argument_amount(self.name(), 2, arguments.len())?;
 
                 let string = arguments.first().unwrap().as_string()?;
                 let pattern = arguments
@@ -570,8 +503,8 @@ impl Callable for StrFunction {
 
                 Value::string(trimmed)
             }
-            StrFunction::Truncate => {
+            StringFunction::Truncate => {
-                RuntimeError::expect_argument_amount(self.name(), 2, arguments.len())?;
+                Error::expect_argument_amount(self.name(), 2, arguments.len())?;
 
                 let input_string = arguments.first().unwrap().as_string()?;
                 let new_length = arguments.get(1).unwrap().as_integer()? as usize;

src/built_in_identifiers.rs

@@ -1,51 +0,0 @@
-use std::sync::{Arc, OnceLock};
-
-use enum_iterator::{all, Sequence};
-
-use crate::Identifier;
-
-pub fn all_built_in_identifiers() -> impl Iterator<Item = BuiltInIdentifier> {
-    all()
-}
-
-static OPTION: OnceLock<Identifier> = OnceLock::new();
-static NONE: OnceLock<Identifier> = OnceLock::new();
-static SOME: OnceLock<Identifier> = OnceLock::new();
-static RESULT: OnceLock<Identifier> = OnceLock::new();
-static OK: OnceLock<Identifier> = OnceLock::new();
-static ERROR: OnceLock<Identifier> = OnceLock::new();
-
-#[derive(Sequence, Debug)]
-pub enum BuiltInIdentifier {
-    Option,
-    None,
-    Some,
-    Result,
-    Ok,
-    Error,
-}
-
-impl BuiltInIdentifier {
-    pub fn get(&self) -> &Identifier {
-        match self {
-            BuiltInIdentifier::Option => {
-                OPTION.get_or_init(|| Identifier::from_raw_parts(Arc::new("Option".to_string())))
-            }
-            BuiltInIdentifier::None => {
-                NONE.get_or_init(|| Identifier::from_raw_parts(Arc::new("None".to_string())))
-            }
-            BuiltInIdentifier::Some => {
-                SOME.get_or_init(|| Identifier::from_raw_parts(Arc::new("Some".to_string())))
-            }
-            BuiltInIdentifier::Result => {
-                RESULT.get_or_init(|| Identifier::from_raw_parts(Arc::new("Result".to_string())))
-            }
-            BuiltInIdentifier::Ok => {
-                OK.get_or_init(|| Identifier::from_raw_parts(Arc::new("Ok".to_string())))
-            }
-            BuiltInIdentifier::Error => {
-                ERROR.get_or_init(|| Identifier::from_raw_parts(Arc::new("Error".to_string())))
-            }
-        }
-    }
-}

src/built_in_type_definitions.rs

@@ -1,56 +0,0 @@
-use std::sync::OnceLock;
-
-use enum_iterator::{all, Sequence};
-
-use crate::{
-    error::rw_lock_error::RwLockError, Context, EnumDefinition, Identifier, Type, TypeDefinition,
-};
-
-static OPTION: OnceLock<Result<TypeDefinition, RwLockError>> = OnceLock::new();
-static RESULT: OnceLock<Result<TypeDefinition, RwLockError>> = OnceLock::new();
-
-pub fn all_built_in_type_definitions() -> impl Iterator<Item = BuiltInTypeDefinition> {
-    all()
-}
-
-#[derive(Sequence)]
-pub enum BuiltInTypeDefinition {
-    Option,
-    Result,
-}
-
-impl BuiltInTypeDefinition {
-    pub fn name(&self) -> &'static str {
-        match self {
-            BuiltInTypeDefinition::Option => "Option",
-            BuiltInTypeDefinition::Result => "Result",
-        }
-    }
-
-    pub fn get(&self, _context: &Context) -> &Result<TypeDefinition, RwLockError> {
-        match self {
-            BuiltInTypeDefinition::Option => OPTION.get_or_init(|| {
-                let definition = TypeDefinition::Enum(EnumDefinition::new(
-                    Identifier::new(self.name()),
-                    vec![
-                        (Identifier::new("Some"), vec![Type::Any]),
-                        (Identifier::new("None"), Vec::with_capacity(0)),
-                    ],
-                ));
-
-                Ok(definition)
-            }),
-            BuiltInTypeDefinition::Result => RESULT.get_or_init(|| {
-                let definition = TypeDefinition::Enum(EnumDefinition::new(
-                    Identifier::new(self.name()),
-                    vec![
-                        (Identifier::new("Ok"), vec![Type::Any]),
-                        (Identifier::new("Error"), vec![Type::Any]),
-                    ],
-                ));
-
-                Ok(definition)
-            }),
-        }
-    }
-}

src/built_in_types.rs

@@ -1,29 +0,0 @@
-use std::sync::OnceLock;
-
-use crate::{Identifier, Type};
-
-static OPTION: OnceLock<Type> = OnceLock::new();
-
-pub enum BuiltInType {
-    Option(Option<Type>),
-}
-
-impl BuiltInType {
-    pub fn name(&self) -> &'static str {
-        match self {
-            BuiltInType::Option(_) => "Option",
-        }
-    }
-
-    pub fn get(&self) -> &Type {
-        match self {
-            BuiltInType::Option(content_type) => OPTION.get_or_init(|| {
-                if let Some(content_type) = content_type {
-                    Type::custom(Identifier::new("Option"), vec![content_type.clone()])
-                } else {
-                    Type::custom(Identifier::new("Option"), Vec::with_capacity(0))
-                }
-            }),
-        }
-    }
-}

src/built_in_values.rs

@@ -1,180 +0,0 @@
-use std::{env::args, sync::OnceLock};
-
-use enum_iterator::{all, Sequence};
-use serde::{Deserialize, Serialize};
-
-use crate::{
-    built_in_functions::{fs::fs_functions, json::json_functions, str::string_functions, Callable},
-    BuiltInFunction, EnumInstance, Function, Identifier, List, Map, Value,
-};
-
-static ARGS: OnceLock<Value> = OnceLock::new();
-static FS: OnceLock<Value> = OnceLock::new();
-static JSON: OnceLock<Value> = OnceLock::new();
-static NONE: OnceLock<Value> = OnceLock::new();
-static RANDOM: OnceLock<Value> = OnceLock::new();
-static STR: OnceLock<Value> = OnceLock::new();
-
-/// Returns the entire built-in value API.
-pub fn all_built_in_values() -> impl Iterator<Item = BuiltInValue> {
-    all()
-}
-
-/// A variable with a hard-coded key that is globally available.
-#[derive(Sequence, Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize)]
-pub enum BuiltInValue {
-    /// The arguments used to launch the current program.
-    Args,
-
-    /// Create an error if two values are not equal.
-    AssertEqual,
-
-    /// File system tools.
-    Fs,
-
-    /// JSON format tools.
-    Json,
-
-    /// Get the length of a collection.
-    Length,
-
-    /// The absence of a value.
-    None,
-
-    /// Print a value to stdout.
-    Output,
-
-    /// Random value generators.
-    Random,
-
-    /// String utilities.
-    Str,
-}
-
-impl BuiltInValue {
-    /// Returns the hard-coded key used to identify the value.
-    pub fn name(&self) -> &'static str {
-        match self {
-            BuiltInValue::Args => "args",
-            BuiltInValue::AssertEqual => "assert_equal",
-            BuiltInValue::Fs => "fs",
-            BuiltInValue::Json => "json",
-            BuiltInValue::Length => BuiltInFunction::Length.name(),
-            BuiltInValue::None => "None",
-            BuiltInValue::Output => "output",
-            BuiltInValue::Random => "random",
-            BuiltInValue::Str => "str",
-        }
-    }
-
-    /// Returns a brief description of the value's features.
-    ///
-    /// This is used by the shell when suggesting completions.
-    pub fn description(&self) -> &'static str {
-        match self {
-            BuiltInValue::Args => "The command line arguments sent to this program.",
-            BuiltInValue::AssertEqual => "Error if the two values are not equal.",
-            BuiltInValue::Fs => "File and directory tools.",
-            BuiltInValue::Json => "JSON formatting tools.",
-            BuiltInValue::Length => BuiltInFunction::Length.description(),
-            BuiltInValue::None => "The absence of a value.",
-            BuiltInValue::Output => "output",
-            BuiltInValue::Random => "random",
-            BuiltInValue::Str => "string",
-        }
-    }
-
-    /// Returns the value by creating it or, if it has already been accessed, retrieving it from its
-    /// [OnceLock][].
-    pub fn get(&self) -> Value {
-        match self {
-            BuiltInValue::Args => ARGS
-                .get_or_init(|| {
-                    let args = args().map(|arg| Value::string(arg.to_string())).collect();
-
-                    Value::List(List::with_items(args))
-                })
-                .clone(),
-            BuiltInValue::AssertEqual => {
-                Value::Function(Function::BuiltIn(BuiltInFunction::AssertEqual))
-            }
-            BuiltInValue::Fs => FS
-                .get_or_init(|| {
-                    let mut fs_map = Map::new();
-
-                    for fs_function in fs_functions() {
-                        let key = fs_function.name();
-                        let value =
-                            Value::Function(Function::BuiltIn(BuiltInFunction::Fs(fs_function)));
-
-                        fs_map.set(Identifier::new(key), value);
-                    }
-
-                    Value::Map(fs_map)
-                })
-                .clone(),
-            BuiltInValue::Json => JSON
-                .get_or_init(|| {
-                    let mut json_map = Map::new();
-
-                    for json_function in json_functions() {
-                        let key = json_function.name();
-                        let value = Value::Function(Function::BuiltIn(BuiltInFunction::Json(
-                            json_function,
-                        )));
-
-                        json_map.set(Identifier::new(key), value);
-                    }
-
-                    Value::Map(json_map)
-                })
-                .clone(),
-            BuiltInValue::Length => Value::Function(Function::BuiltIn(BuiltInFunction::Length)),
-            BuiltInValue::None => NONE
-                .get_or_init(|| {
-                    Value::Enum(EnumInstance::new(
-                        Identifier::new("Option"),
-                        Identifier::new("None"),
-                        None,
-                    ))
-                })
-                .clone(),
-            BuiltInValue::Output => Value::Function(Function::BuiltIn(BuiltInFunction::Output)),
-            BuiltInValue::Random => RANDOM
-                .get_or_init(|| {
-                    let mut random_map = Map::new();
-
-                    for built_in_function in [
-                        BuiltInFunction::RandomBoolean,
-                        BuiltInFunction::RandomFloat,
-                        BuiltInFunction::RandomFrom,
-                        BuiltInFunction::RandomInteger,
-                    ] {
-                        let identifier = Identifier::new(built_in_function.name());
-                        let value = Value::Function(Function::BuiltIn(built_in_function));
-
-                        random_map.set(identifier, value);
-                    }
-
-                    Value::Map(random_map)
-                })
-                .clone(),
-            BuiltInValue::Str => STR
-                .get_or_init(|| {
-                    let mut str_map = Map::new();
-
-                    for string_function in string_functions() {
-                        let identifier = Identifier::new(string_function.name());
-                        let value = Value::Function(Function::BuiltIn(BuiltInFunction::String(
-                            string_function,
-                        )));
-
-                        str_map.set(identifier, value);
-                    }
-
-                    Value::Map(str_map)
-                })
-                .clone(),
-        }
-    }
-}

src/context/mod.rs

@@ -1,395 +0,0 @@
-//! A garbage-collecting execution context that stores variables and type data
-//! during the [Interpreter][crate::Interpreter]'s abstraction and execution
-//! process.
-//!
-//! ## Setting values
-//!
-//! When data is stored in a context, it can be accessed by dust source code.
-//! This allows you to insert values and type definitions before any code is
-//! interpreted.
-//!
-//! ```
-//! # use dust_lang::*;
-//! let context = Context::default();
-//!
-//! context.set_value(
-//!     "foobar".into(),
-//!     Value::String("FOOBAR".to_string())
-//! ).unwrap();
-//!
-//! interpret_with_context("output foobar", context);
-//!
-//! // Stdout: "FOOBAR"
-//! ```
-//!
-//! ## Built-in values and type definitions
-//!
-//! When looking up values and definitions, the Context will try to use one that
-//! has been explicitly set. If nothing is found, it will then check the built-
-//! in values and type definitions for a match. This means that the user can
-//! override the built-ins.
-//!
-//! ## Garbage Collection
-//!
-//! To disable garbage collection, run a Context in AllowGarbage mode.
-//!
-//! ```
-//! # use dust_lang::*;
-//! let context = Context::new(ContextMode::AllowGarbage);   
-//! ```
-//!
-//!
-//! Every item stored in a Context has a counter attached to it. You must use
-//! [Context::add_allowance][] to let the Context know not to drop the value.
-//! Every time you use [Context::get_value][] it checks the number of times it
-//! has been used and compares it to the number of allowances. If the limit
-//! has been reached, the value will be removed from the context and can no
-//! longer be found.
-mod usage_counter;
-mod value_data;
-
-pub use usage_counter::UsageCounter;
-pub use value_data::ValueData;
-
-use std::{
-    cmp::Ordering,
-    collections::BTreeMap,
-    fmt::Display,
-    sync::{Arc, RwLock, RwLockReadGuard},
-};
-
-use crate::{
-    built_in_type_definitions::all_built_in_type_definitions, built_in_values::all_built_in_values,
-    error::rw_lock_error::RwLockError, Identifier, Type, TypeDefinition, Value,
-};
-
-#[derive(Clone, Debug, PartialEq)]
-pub enum ContextMode {
-    AllowGarbage,
-    RemoveGarbage,
-}
-
-/// An execution context stores that variable and type data during the
-/// [Interpreter]'s abstraction and execution process.
-///
-/// See the [module-level docs][self] for more info.
-#[derive(Clone, Debug)]
-pub struct Context {
-    mode: ContextMode,
-    inner: Arc<RwLock<BTreeMap<Identifier, (ValueData, UsageCounter)>>>,
-}
-
-impl Context {
-    /// Return a new, empty Context.
-    pub fn new(mode: ContextMode) -> Self {
-        Self {
-            mode,
-            inner: Arc::new(RwLock::new(BTreeMap::new())),
-        }
-    }
-
-    /// Return a lock guard to the inner BTreeMap.
-    pub fn inner(
-        &self,
-    ) -> Result<RwLockReadGuard<BTreeMap<Identifier, (ValueData, UsageCounter)>>, RwLockError> {
-        Ok(self.inner.read()?)
-    }
-
-    /// Create a new context with all of the data from an existing context.
-    pub fn with_variables_from(other: &Context) -> Result<Context, RwLockError> {
-        let mut new_variables = BTreeMap::new();
-
-        for (identifier, (value_data, counter)) in other.inner.read()?.iter() {
-            let (allowances, _runtime_uses) = counter.get_counts()?;
-            let new_counter = UsageCounter::with_counts(allowances, 0);
-
-            new_variables.insert(identifier.clone(), (value_data.clone(), new_counter));
-        }
-
-        Ok(Context {
-            mode: other.mode.clone(),
-            inner: Arc::new(RwLock::new(new_variables)),
-        })
-    }
-
-    /// Modify a context to take the functions and type definitions of another.
-    ///
-    /// In the case of the conflict, the inherited value will override the previous
-    /// value.
-    pub fn inherit_from(&self, other: &Context) -> Result<(), RwLockError> {
-        let mut self_variables = self.inner.write()?;
-
-        for (identifier, (value_data, counter)) in other.inner.read()?.iter() {
-            let (allowances, _runtime_uses) = counter.get_counts()?;
-            let new_counter = UsageCounter::with_counts(allowances, 0);
-
-            if let ValueData::Value(value) = value_data {
-                if value.is_function() {
-                    self_variables.insert(identifier.clone(), (value_data.clone(), new_counter));
-                }
-            } else if let ValueData::TypeHint(r#type) = value_data {
-                if r#type.is_function() {
-                    self_variables.insert(identifier.clone(), (value_data.clone(), new_counter));
-                }
-            } else if let ValueData::TypeDefinition(_) = value_data {
-                self_variables.insert(identifier.clone(), (value_data.clone(), new_counter));
-            }
-        }
-
-        Ok(())
-    }
-
-    /// Modify a context to take all the information of another.
-    ///
-    /// In the case of the conflict, the inherited value will override the previous
-    /// value.
-    ///
-    /// ```
-    /// # use dust_lang::*;
-    /// let first_context = Context::default();
-    /// let second_context = Context::default();
-    ///
-    /// second_context.set_value(
-    ///     "Foo".into(),
-    ///     Value::String("Bar".to_string())
-    /// );
-    ///
-    /// first_context.inherit_all_from(&second_context).unwrap();
-    ///
-    /// assert_eq!(first_context, second_context);
-    /// ```
-    pub fn inherit_all_from(&self, other: &Context) -> Result<(), RwLockError> {
-        let mut self_variables = self.inner.write()?;
-
-        for (identifier, (value_data, _counter)) in other.inner.read()?.iter() {
-            self_variables.insert(
-                identifier.clone(),
-                (value_data.clone(), UsageCounter::new()),
-            );
-        }
-
-        Ok(())
-    }
-
-    /// Increment the number of allowances a variable has. Return a boolean
-    /// representing whether or not the variable was found.
-    pub fn add_allowance(&self, identifier: &Identifier) -> Result<bool, RwLockError> {
-        if let Some((_value_data, counter)) = self.inner.read()?.get(identifier) {
-            log::debug!("Adding allowance for {identifier}.");
-
-            counter.add_allowance()?;
-
-            Ok(true)
-        } else {
-            Ok(false)
-        }
-    }
-
-    /// Get a [Value] from the context.
-    pub fn get_value(&self, identifier: &Identifier) -> Result<Option<Value>, RwLockError> {
-        let (value, counter) =
-            if let Some((value_data, counter)) = self.inner.read()?.get(identifier) {
-                if let ValueData::Value(value) = value_data {
-                    (value.clone(), counter.clone())
-                } else {
-                    return Ok(None);
-                }
-            } else {
-                for built_in_value in all_built_in_values() {
-                    if built_in_value.name() == identifier.inner().as_ref() {
-                        return Ok(Some(built_in_value.get().clone()));
-                    }
-                }
-
-                return Ok(None);
-            };
-
-        counter.add_runtime_use()?;
-
-        log::debug!("Adding runtime use for {identifier}.");
-
-        let (allowances, runtime_uses) = counter.get_counts()?;
-
-        if self.mode == ContextMode::RemoveGarbage && allowances == runtime_uses {
-            self.unset(identifier)?;
-        }
-
-        Ok(Some(value))
-    }
-
-    /// Get a [Type] from the context.
-    ///
-    /// If the key matches a stored [Value], its type will be returned. It if
-    /// matches a type hint, the type hint will be returned.
-    pub fn get_type(&self, identifier: &Identifier) -> Result<Option<Type>, RwLockError> {
-        if let Some((value_data, _counter)) = self.inner.read()?.get(identifier) {
-            match value_data {
-                ValueData::Value(value) => return Ok(Some(value.r#type()?)),
-                ValueData::TypeHint(r#type) => return Ok(Some(r#type.clone())),
-                ValueData::TypeDefinition(_) => todo!(),
-            }
-        }
-
-        for built_in_value in all_built_in_values() {
-            if built_in_value.name() == identifier.inner().as_ref() {
-                return Ok(Some(built_in_value.get().r#type()?));
-            }
-        }
-
-        Ok(None)
-    }
-
-    /// Get a [TypeDefinition] from the context.
-    ///
-    /// This will also return a built-in type definition if one matches the key.
-    /// See the [module-level docs][self] for more info.
-    pub fn get_definition(
-        &self,
-        identifier: &Identifier,
-    ) -> Result<Option<TypeDefinition>, RwLockError> {
-        if let Some((value_data, _counter)) = self.inner.read()?.get(identifier) {
-            if let ValueData::TypeDefinition(definition) = value_data {
-                return Ok(Some(definition.clone()));
-            }
-        }
-
-        for built_in_definition in all_built_in_type_definitions() {
-            if built_in_definition.name() == identifier.inner().as_ref() {
-                return Ok(Some(built_in_definition.get(self).clone()?));
-            }
-        }
-
-        Ok(None)
-    }
-
-    /// Set a value to a key.
-    pub fn set_value(&self, key: Identifier, value: Value) -> Result<(), RwLockError> {
-        let mut map = self.inner.write()?;
-        let old_data = map.remove(&key);
-
-        if let Some((_, old_counter)) = old_data {
-            map.insert(key, (ValueData::Value(value), old_counter));
-        } else {
-            map.insert(key, (ValueData::Value(value), UsageCounter::new()));
-        }
-
-        Ok(())
-    }
-
-    /// Set a type hint.
-    ///
-    /// This allows the interpreter to check a value's type before the value
-    /// actually exists by predicting what the abstract tree will produce.
-    pub fn set_type(&self, key: Identifier, r#type: Type) -> Result<(), RwLockError> {
-        self.inner
-            .write()?
-            .insert(key, (ValueData::TypeHint(r#type), UsageCounter::new()));
-
-        Ok(())
-    }
-
-    /// Set a type definition.
-    ///
-    /// This allows defined types (i.e. structs and enums) to be instantiated
-    /// later while running the interpreter using this context.
-    pub fn set_definition(
-        &self,
-        key: Identifier,
-        definition: TypeDefinition,
-    ) -> Result<(), RwLockError> {
-        self.inner.write()?.insert(
-            key,
-            (ValueData::TypeDefinition(definition), UsageCounter::new()),
-        );
-
-        Ok(())
-    }
-
-    /// Remove a key-value pair.
-    pub fn unset(&self, key: &Identifier) -> Result<(), RwLockError> {
-        log::debug!("Dropping variable {key}.");
-
-        self.inner.write()?.remove(key);
-
-        Ok(())
-    }
-}
-
-impl Default for Context {
-    fn default() -> Self {
-        Context::new(ContextMode::RemoveGarbage)
-    }
-}
-
-impl Eq for Context {}
-
-impl PartialEq for Context {
-    fn eq(&self, other: &Self) -> bool {
-        let self_variables = self.inner().unwrap();
-        let other_variables = other.inner().unwrap();
-
-        if self_variables.len() != other_variables.len() {
-            return false;
-        }
-
-        for ((left_key, left_value_data), (right_key, right_value_data)) in
-            self_variables.iter().zip(other_variables.iter())
-        {
-            if left_key != right_key || left_value_data != right_value_data {
-                return false;
-            }
-        }
-
-        true
-    }
-}
-
-impl PartialOrd for Context {
-    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        Some(self.cmp(other))
-    }
-}
-
-impl Ord for Context {
-    fn cmp(&self, other: &Self) -> Ordering {
-        let left = self.inner().unwrap();
-        let right = other.inner().unwrap();
-
-        left.cmp(&right)
-    }
-}
-
-impl Display for Context {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        writeln!(f, "{{")?;
-
-        for (identifier, value_data) in self.inner.read().unwrap().iter() {
-            writeln!(f, "{identifier} {value_data:?}")?;
-        }
-
-        writeln!(f, "}}")
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::*;
-
-    #[test]
-    fn drops_variables() {
-        let context = Context::default();
-
-        interpret_with_context(
-            "
-                x = 1
-                y = 2
-
-                z = x + y
-            ",
-            context.clone(),
-        )
-        .unwrap();
-
-        assert_eq!(context.inner.read().unwrap().len(), 1);
-    }
-}

src/context/usage_counter.rs

@@ -1,74 +0,0 @@
-use std::{
-    cmp::Ordering,
-    sync::{Arc, RwLock},
-};
-
-use crate::error::rw_lock_error::RwLockError;
-
-#[derive(Clone, Debug)]
-pub struct UsageCounter(Arc<RwLock<UsageCounterInner>>);
-
-impl UsageCounter {
-    pub fn new() -> UsageCounter {
-        UsageCounter(Arc::new(RwLock::new(UsageCounterInner {
-            allowances: 0,
-            runtime_uses: 0,
-        })))
-    }
-
-    pub fn with_counts(allowances: usize, runtime_uses: usize) -> UsageCounter {
-        UsageCounter(Arc::new(RwLock::new(UsageCounterInner {
-            allowances,
-            runtime_uses,
-        })))
-    }
-
-    pub fn get_counts(&self) -> Result<(usize, usize), RwLockError> {
-        let inner = self.0.read()?;
-        Ok((inner.allowances, inner.runtime_uses))
-    }
-
-    pub fn add_allowance(&self) -> Result<(), RwLockError> {
-        self.0.write()?.allowances += 1;
-
-        Ok(())
-    }
-
-    pub fn add_runtime_use(&self) -> Result<(), RwLockError> {
-        self.0.write()?.runtime_uses += 1;
-
-        Ok(())
-    }
-}
-
-impl Eq for UsageCounter {}
-
-impl PartialEq for UsageCounter {
-    fn eq(&self, other: &Self) -> bool {
-        let left = self.0.read().unwrap();
-        let right = other.0.read().unwrap();
-
-        *left == *right
-    }
-}
-
-impl PartialOrd for UsageCounter {
-    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        Some(self.cmp(other))
-    }
-}
-
-impl Ord for UsageCounter {
-    fn cmp(&self, other: &Self) -> Ordering {
-        let left = self.0.read().unwrap();
-        let right = other.0.read().unwrap();
-
-        left.cmp(&right)
-    }
-}
-
-#[derive(Clone, Debug, Eq, PartialEq, PartialOrd, Ord)]
-struct UsageCounterInner {
-    pub allowances: usize,
-    pub runtime_uses: usize,
-}

src/context/value_data.rs

@@ -1,8 +0,0 @@
-use crate::{Type, TypeDefinition, Value};
-
-#[derive(Clone, Debug, Eq, PartialEq, PartialOrd, Ord)]
-pub enum ValueData {
-    Value(Value),
-    TypeHint(Type),
-    TypeDefinition(TypeDefinition),
-}

src/error.rs

@@ -0,0 +1,458 @@
+//! Error and Result types.
+//!
+//! To deal with errors from dependencies, either create a new error variant
+//! or use the ToolFailure variant if the error can only occur inside a tool.
+
+use serde::{Deserialize, Serialize};
+use tree_sitter::{LanguageError, Node, Point};
+
+use crate::{value::Value, SyntaxPosition, Type};
+
+use std::{
+    fmt::{self, Formatter},
+    io,
+    num::ParseFloatError,
+    string::FromUtf8Error,
+    sync::PoisonError,
+    time,
+};
+
+pub type Result<T> = std::result::Result<T, Error>;
+
+#[derive(Clone, PartialEq, Serialize, Deserialize)]
+pub enum Error {
+    AtSourcePosition {
+        error: Box<Error>,
+        source: String,
+        start_row: usize,
+        start_column: usize,
+        end_row: usize,
+        end_column: usize,
+    },
+
+    UnexpectedSyntaxNode {
+        expected: String,
+        actual: String,
+        #[serde(skip)]
+        location: Point,
+        relevant_source: String,
+    },
+
+    TypeCheck {
+        expected: Type,
+        actual: Type,
+    },
+
+    TypeCheckExpectedFunction {
+        actual: Type,
+    },
+
+    /// The 'assert' macro did not resolve successfully.
+    AssertEqualFailed {
+        expected: Value,
+        actual: Value,
+    },
+
+    /// The 'assert' macro did not resolve successfully.
+    AssertFailed,
+
+    /// A row was inserted to a table with the wrong amount of values.
+    WrongColumnAmount {
+        expected: usize,
+        actual: usize,
+    },
+
+    /// An operator was called with the wrong amount of arguments.
+    ExpectedOperatorArgumentAmount {
+        expected: usize,
+        actual: usize,
+    },
+
+    /// A function was called with the wrong amount of arguments.
+    ExpectedBuiltInFunctionArgumentAmount {
+        function_name: String,
+        expected: usize,
+        actual: usize,
+    },
+
+    /// A function was called with the wrong amount of arguments.
+    ExpectedFunctionArgumentAmount {
+        expected: usize,
+        actual: usize,
+    },
+
+    /// A function was called with the wrong amount of arguments.
+    ExpectedFunctionArgumentMinimum {
+        source: String,
+        minumum_expected: usize,
+        actual: usize,
+    },
+
+    ExpectedFunctionType {
+        actual: Type,
+    },
+
+    ExpectedString {
+        actual: Value,
+    },
+
+    ExpectedInteger {
+        actual: Value,
+    },
+
+    ExpectedFloat {
+        actual: Value,
+    },
+
+    /// An integer, floating point or value was expected.
+    ExpectedNumber {
+        actual: Value,
+    },
+
+    /// An integer, floating point or string value was expected.
+    ExpectedNumberOrString {
+        actual: Value,
+    },
+
+    ExpectedBoolean {
+        actual: Value,
+    },
+
+    ExpectedList {
+        actual: Value,
+    },
+
+    ExpectedMinLengthList {
+        minimum_len: usize,
+        actual_len: usize,
+    },
+
+    ExpectedFixedLenList {
+        expected_len: usize,
+        actual: Value,
+    },
+
+    ExpectedNone {
+        actual: Value,
+    },
+
+    ExpectedMap {
+        actual: Value,
+    },
+
+    ExpectedTable {
+        actual: Value,
+    },
+
+    ExpectedFunction {
+        actual: Value,
+    },
+
+    ExpectedOption {
+        actual: Value,
+    },
+
+    /// A string, list, map or table value was expected.
+    ExpectedCollection {
+        actual: Value,
+    },
+
+    /// Failed to find a variable with a value for this key.
+    VariableIdentifierNotFound(String),
+
+    /// Failed to find a variable with a function value for this key.
+    FunctionIdentifierNotFound(String),
+
+    /// The function failed due to an external error.
+    External(String),
+
+    /// A custom error explained by its message.
+    CustomMessage(String),
+
+    /// Invalid user input.
+    Syntax {
+        source: String,
+        #[serde(skip)]
+        location: Point,
+    },
+
+    SerdeJson(String),
+
+    ParserCancelled,
+}
+
+impl Error {
+    pub fn at_source_position(self, source: &str, position: SyntaxPosition) -> Self {
+        let byte_range = position.start_byte..position.end_byte;
+
+        Error::AtSourcePosition {
+            error: Box::new(self),
+            source: source[byte_range].to_string(),
+            start_row: position.start_row,
+            start_column: position.start_column,
+            end_row: position.end_row,
+            end_column: position.end_column,
+        }
+    }
+
+    pub fn expect_syntax_node(source: &str, expected: &str, actual: Node) -> Result<()> {
+        log::info!("Converting {} to abstract node", actual.kind());
+
+        if expected == actual.kind() {
+            Ok(())
+        } else if actual.is_error() {
+            Err(Error::Syntax {
+                source: source[actual.byte_range()].to_string(),
+                location: actual.start_position(),
+            })
+        } else {
+            Err(Error::UnexpectedSyntaxNode {
+                expected: expected.to_string(),
+                actual: actual.kind().to_string(),
+                location: actual.start_position(),
+                relevant_source: source[actual.byte_range()].to_string(),
+            })
+        }
+    }
+
+    pub fn expect_argument_amount(
+        function_name: &str,
+        expected: usize,
+        actual: usize,
+    ) -> Result<()> {
+        if expected == actual {
+            Ok(())
+        } else {
+            Err(Error::ExpectedBuiltInFunctionArgumentAmount {
+                function_name: function_name.to_string(),
+                expected,
+                actual,
+            })
+        }
+    }
+
+    pub fn is_error(&self, other: &Error) -> bool {
+        match self {
+            Error::AtSourcePosition { error, .. } => error.as_ref() == other,
+            _ => self == other,
+        }
+    }
+}
+
+impl From<LanguageError> for Error {
+    fn from(value: LanguageError) -> Self {
+        Error::External(value.to_string())
+    }
+}
+
+impl<T> From<PoisonError<T>> for Error {
+    fn from(value: PoisonError<T>) -> Self {
+        Error::External(value.to_string())
+    }
+}
+
+impl From<FromUtf8Error> for Error {
+    fn from(value: FromUtf8Error) -> Self {
+        Error::External(value.to_string())
+    }
+}
+
+impl From<ParseFloatError> for Error {
+    fn from(value: ParseFloatError) -> Self {
+        Error::External(value.to_string())
+    }
+}
+
+impl From<csv::Error> for Error {
+    fn from(value: csv::Error) -> Self {
+        Error::External(value.to_string())
+    }
+}
+
+impl From<io::Error> for Error {
+    fn from(value: std::io::Error) -> Self {
+        Error::External(value.to_string())
+    }
+}
+
+impl From<reqwest::Error> for Error {
+    fn from(value: reqwest::Error) -> Self {
+        Error::External(value.to_string())
+    }
+}
+
+impl From<serde_json::Error> for Error {
+    fn from(value: serde_json::Error) -> Self {
+        Error::SerdeJson(value.to_string())
+    }
+}
+
+impl From<time::SystemTimeError> for Error {
+    fn from(value: time::SystemTimeError) -> Self {
+        Error::External(value.to_string())
+    }
+}
+
+impl From<toml::de::Error> for Error {
+    fn from(value: toml::de::Error) -> Self {
+        Error::External(value.to_string())
+    }
+}
+
+impl std::error::Error for Error {}
+
+impl fmt::Debug for Error {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{self}")
+    }
+}
+
+impl fmt::Display for Error {
+    fn fmt(&self, f: &mut Formatter) -> fmt::Result {
+        use Error::*;
+
+        match self {
+            AssertEqualFailed { expected, actual } => {
+                write!(
+                    f,
+                    "Equality assertion failed. {expected} does not equal {actual}."
+                )
+            }
+            AssertFailed => write!(
+                f,
+                "Assertion failed. A false value was passed to \"assert\"."
+            ),
+            ExpectedOperatorArgumentAmount { expected, actual } => write!(
+                f,
+                "An operator expected {} arguments, but got {}.",
+                expected, actual
+            ),
+            ExpectedBuiltInFunctionArgumentAmount {
+                function_name: tool_name,
+                expected,
+                actual,
+            } => write!(
+                f,
+                "{tool_name} expected {expected} arguments, but got {actual}.",
+            ),
+            ExpectedFunctionArgumentAmount { expected, actual } => {
+                write!(f, "Expected {expected} arguments, but got {actual}.",)
+            }
+            ExpectedFunctionArgumentMinimum {
+                source,
+                minumum_expected,
+                actual,
+            } => {
+                write!(
+                    f,
+                    "{source} expected at least {minumum_expected} arguments, but got {actual}."
+                )
+            }
+            ExpectedString { actual } => {
+                write!(f, "Expected a string but got {actual}.")
+            }
+            ExpectedInteger { actual } => write!(f, "Expected an integer, but got {actual}."),
+            ExpectedFloat { actual } => write!(f, "Expected a float, but got {actual}."),
+            ExpectedNumber { actual } => {
+                write!(f, "Expected a float or integer but got {actual}.",)
+            }
+            ExpectedNumberOrString { actual } => {
+                write!(f, "Expected a number or string, but got {actual}.")
+            }
+            ExpectedBoolean { actual } => {
+                write!(f, "Expected a boolean, but got {actual}.")
+            }
+            ExpectedList { actual } => write!(f, "Expected a list, but got {actual}."),
+            ExpectedMinLengthList {
+                minimum_len,
+                actual_len,
+            } => write!(
+                f,
+                "Expected a list of at least {minimum_len} values, but got one with {actual_len}.",
+            ),
+            ExpectedFixedLenList {
+                expected_len,
+                actual,
+            } => write!(
+                f,
+                "Expected a list of len {}, but got {:?}.",
+                expected_len, actual
+            ),
+            ExpectedNone { actual } => write!(f, "Expected an empty value, but got {actual}."),
+            ExpectedMap { actual } => write!(f, "Expected a map, but got {actual}."),
+            ExpectedTable { actual } => write!(f, "Expected a table, but got {actual}."),
+            ExpectedFunction { actual } => {
+                write!(f, "Expected function, but got {actual}.")
+            }
+            ExpectedOption { actual } => write!(f, "Expected option, but got {actual}."),
+            ExpectedCollection { actual } => {
+                write!(
+                    f,
+                    "Expected a string, list, map or table, but got {actual}.",
+                )
+            }
+            VariableIdentifierNotFound(key) => write!(
+                f,
+                "Variable identifier is not bound to anything by context: {key}.",
+            ),
+            FunctionIdentifierNotFound(key) => write!(
+                f,
+                "Function identifier is not bound to anything by context: {key}."
+            ),
+            UnexpectedSyntaxNode {
+                expected,
+                actual,
+                location,
+                relevant_source,
+            } => {
+                let location = get_position(location);
+
+                write!(
+                    f,
+                    "Expected {expected}, but got {actual} at {location}. Code: {relevant_source} ",
+                )
+            }
+            WrongColumnAmount { expected, actual } => write!(
+                f,
+                "Wrong column amount. Expected {expected} but got {actual}."
+            ),
+            External(message) => write!(f, "External error: {message}"),
+            CustomMessage(message) => write!(f, "{message}"),
+            Syntax { source, location } => {
+                let location = get_position(location);
+
+                write!(f, "Syntax error at {location}: {source}")
+            }
+            TypeCheck { expected, actual } => write!(
+                f,
+                "Type check error. Expected type {expected} but got type {actual}."
+            ),
+            TypeCheckExpectedFunction { actual } => {
+                write!(f, "Type check error. Expected a function but got {actual}.")
+            }
+            AtSourcePosition {
+                error,
+                source,
+                start_row,
+                start_column,
+                end_row,
+                end_column,
+            } => {
+                write!(
+                    f,
+                    "{error} Occured at ({start_row}, {start_column}) to ({end_row}, {end_column}). Source: {source}"
+                )
+            }
+            SerdeJson(message) => write!(f, "JSON processing error: {message}"),
+            ParserCancelled => write!(
+                f,
+                "Parsing was cancelled either manually or because it took too long."
+            ),
+            ExpectedFunctionType { actual } => write!(f, "Expected a function but got {actual}."),
+        }
+    }
+}
+
+fn get_position(position: &Point) -> String {
+    format!("column {}, row {}", position.row + 1, position.column)
+}

src/error/mod.rs

@@ -1,110 +0,0 @@
-//! Error and Result types.
-//!
-//! To deal with errors from dependencies, either create a new error variant
-//! or use the ToolFailure variant if the error can only occur inside a tool.
-mod runtime_error;
-pub(crate) mod rw_lock_error;
-mod syntax_error;
-mod validation_error;
-
-use colored::Colorize;
-pub use runtime_error::RuntimeError;
-pub use syntax_error::SyntaxError;
-pub use validation_error::ValidationError;
-
-use tree_sitter::LanguageError;
-
-use std::fmt::{self, Formatter};
-
-#[derive(Debug, PartialEq)]
-pub enum Error {
-    Syntax(SyntaxError),
-
-    Validation(ValidationError),
-
-    Runtime(RuntimeError),
-
-    ParserCancelled,
-
-    Language(LanguageError),
-}
-
-impl Error {
-    /// Create a pretty error report with `lyneate`.
-    ///
-    /// The `source` argument should be the full source code document that was
-    /// used to create this error.
-    pub fn create_report(&self, source: &str) -> String {
-        match self {
-            Error::Syntax(syntax_error) => {
-                let report = syntax_error.create_report(source);
-
-                format!(
-                    "{}\n{}\n{report}",
-                    "Syntax Error".bold().yellow().underline(),
-                    "Dust does not recognize this syntax.".dimmed()
-                )
-            }
-            Error::Validation(validation_error) => {
-                let report = validation_error.create_report(source);
-
-                format!(
-                    "{}\n{}\n{report}",
-                    "Validation Error".bold().yellow().underline(),
-                    "Dust prevented the program from running.".dimmed()
-                )
-            }
-            Error::Runtime(runtime_error) => {
-                let report = runtime_error.create_report(source);
-
-                format!(
-                    "{}\n{}\n{report}",
-                    "Runtime Error".bold().red().underline(),
-                    "This error occured while the program was running.".dimmed()
-                )
-            }
-            Error::ParserCancelled => todo!(),
-            Error::Language(_) => todo!(),
-        }
-    }
-}
-
-impl From<SyntaxError> for Error {
-    fn from(error: SyntaxError) -> Self {
-        Error::Syntax(error)
-    }
-}
-
-impl From<ValidationError> for Error {
-    fn from(error: ValidationError) -> Self {
-        Error::Validation(error)
-    }
-}
-
-impl From<RuntimeError> for Error {
-    fn from(error: RuntimeError) -> Self {
-        Error::Runtime(error)
-    }
-}
-
-impl From<LanguageError> for Error {
-    fn from(error: LanguageError) -> Self {
-        Error::Language(error)
-    }
-}
-
-impl std::error::Error for Error {}
-
-impl fmt::Display for Error {
-    fn fmt(&self, f: &mut Formatter) -> fmt::Result {
-        use Error::*;
-
-        match self {
-            Syntax(error) => write!(f, "{error}"),
-            Validation(error) => write!(f, "{error}"),
-            Runtime(error) => write!(f, "{error}"),
-            ParserCancelled => write!(f, "Parsing was cancelled because the parser took too long."),
-            Language(_error) => write!(f, "Parser failed to load language grammar."),
-        }
-    }
-}

src/error/runtime_error.rs

@@ -1,193 +0,0 @@
-use std::{
-    fmt::{self, Debug, Display, Formatter},
-    io,
-    num::ParseFloatError,
-    string::FromUtf8Error,
-    sync::PoisonError,
-    time,
-};
-
-use lyneate::Report;
-
-use crate::{SourcePosition, Type, Value};
-
-use super::{rw_lock_error::RwLockError, ValidationError};
-
-#[derive(Debug, PartialEq)]
-pub enum RuntimeError {
-    /// The 'assert' macro did not resolve successfully.
-    AssertEqualFailed {
-        left: Value,
-        right: Value,
-    },
-
-    /// The 'assert' macro did not resolve successfully.
-    AssertFailed {
-        assertion: Value,
-    },
-
-    /// The attempted conversion is impossible.
-    ConversionImpossible {
-        from: Type,
-        to: Type,
-        position: SourcePosition,
-    },
-
-    Csv(String),
-
-    Io(String),
-
-    Reqwest(String),
-
-    Json(String),
-
-    SystemTime(String),
-
-    Toml(toml::de::Error),
-
-    /// Failed to read or write a map.
-    ///
-    /// See the [MapError] docs for more info.
-    RwLock(RwLockError),
-
-    ParseFloat(ParseFloatError),
-
-    Utf8(FromUtf8Error),
-
-    /// A built-in function was called with the wrong amount of arguments.
-    ExpectedBuiltInFunctionArgumentAmount {
-        function_name: String,
-        expected: usize,
-        actual: usize,
-    },
-
-    ValidationFailure(ValidationError),
-}
-
-impl RuntimeError {
-    pub fn create_report(&self, source: &str) -> String {
-        let messages = match self {
-            RuntimeError::AssertEqualFailed {
-                left: expected,
-                right: actual,
-            } => {
-                vec![(
-                    0..source.len(),
-                    format!("\"assert_equal\" failed. {} != {}", expected, actual),
-                    (200, 0, 0),
-                )]
-            }
-            RuntimeError::AssertFailed { assertion: _ } => todo!(),
-            RuntimeError::ConversionImpossible { from, to, position } => vec![(
-                position.start_byte..position.end_byte,
-                format!("Cannot convert from {from} to {to}."),
-                (255, 64, 112),
-            )],
-            RuntimeError::Csv(_) => todo!(),
-            RuntimeError::Io(_) => todo!(),
-            RuntimeError::Reqwest(_) => todo!(),
-            RuntimeError::Json(_) => todo!(),
-            RuntimeError::SystemTime(_) => todo!(),
-            RuntimeError::Toml(_) => todo!(),
-            RuntimeError::RwLock(_) => todo!(),
-            RuntimeError::ParseFloat(_) => todo!(),
-            RuntimeError::Utf8(_) => todo!(),
-            RuntimeError::ExpectedBuiltInFunctionArgumentAmount {
-                function_name: _,
-                expected: _,
-                actual: _,
-            } => todo!(),
-            RuntimeError::ValidationFailure(_) => todo!(),
-        };
-
-        Report::new_byte_spanned(source, messages).display_str()
-    }
-
-    pub fn expect_argument_amount(
-        function_name: &str,
-        expected: usize,
-        actual: usize,
-    ) -> Result<(), Self> {
-        if expected == actual {
-            Ok(())
-        } else {
-            Err(RuntimeError::ExpectedBuiltInFunctionArgumentAmount {
-                function_name: function_name.to_string(),
-                expected,
-                actual,
-            })
-        }
-    }
-}
-
-impl From<ValidationError> for RuntimeError {
-    fn from(error: ValidationError) -> Self {
-        RuntimeError::ValidationFailure(error)
-    }
-}
-
-impl From<csv::Error> for RuntimeError {
-    fn from(error: csv::Error) -> Self {
-        RuntimeError::Csv(error.to_string())
-    }
-}
-
-impl From<io::Error> for RuntimeError {
-    fn from(error: std::io::Error) -> Self {
-        RuntimeError::Io(error.to_string())
-    }
-}
-
-impl From<reqwest::Error> for RuntimeError {
-    fn from(error: reqwest::Error) -> Self {
-        RuntimeError::Reqwest(error.to_string())
-    }
-}
-
-impl From<serde_json::Error> for RuntimeError {
-    fn from(error: serde_json::Error) -> Self {
-        RuntimeError::Json(error.to_string())
-    }
-}
-
-impl From<time::SystemTimeError> for RuntimeError {
-    fn from(error: time::SystemTimeError) -> Self {
-        RuntimeError::SystemTime(error.to_string())
-    }
-}
-
-impl From<toml::de::Error> for RuntimeError {
-    fn from(error: toml::de::Error) -> Self {
-        RuntimeError::Toml(error)
-    }
-}
-
-impl From<ParseFloatError> for RuntimeError {
-    fn from(error: ParseFloatError) -> Self {
-        RuntimeError::ParseFloat(error)
-    }
-}
-
-impl From<FromUtf8Error> for RuntimeError {
-    fn from(error: FromUtf8Error) -> Self {
-        RuntimeError::Utf8(error)
-    }
-}
-
-impl From<RwLockError> for RuntimeError {
-    fn from(error: RwLockError) -> Self {
-        RuntimeError::RwLock(error)
-    }
-}
-
-impl<T> From<PoisonError<T>> for RuntimeError {
-    fn from(_: PoisonError<T>) -> Self {
-        RuntimeError::RwLock(RwLockError)
-    }
-}
-
-impl Display for RuntimeError {
-    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
-        write!(f, "{self:?}")
-    }
-}

src/error/rw_lock_error.rs

@@ -1,30 +0,0 @@
-use std::{
-    fmt::{self, Debug, Display, Formatter},
-    sync::PoisonError,
-};
-
-use serde::{Deserialize, Serialize};
-
-#[derive(Clone, PartialEq, Serialize, Deserialize)]
-pub struct RwLockError;
-
-impl Display for RwLockError {
-    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
-        write!(
-            f,
-            "Map error: failed to acquire a read/write lock because another thread has panicked."
-        )
-    }
-}
-
-impl Debug for RwLockError {
-    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
-        write!(f, "{self}")
-    }
-}
-
-impl<T> From<PoisonError<T>> for RwLockError {
-    fn from(_: PoisonError<T>) -> Self {
-        RwLockError
-    }
-}

src/error/syntax_error.rs

@@ -1,126 +0,0 @@
-use std::fmt::{self, Display, Formatter};
-
-use colored::Colorize;
-use lyneate::Report;
-use serde::{Deserialize, Serialize};
-use tree_sitter::Node as SyntaxNode;
-
-use crate::SourcePosition;
-
-use super::rw_lock_error::RwLockError;
-
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-pub enum SyntaxError {
-    /// Invalid user input.
-    InvalidSource {
-        expected: String,
-        actual: String,
-        position: SourcePosition,
-    },
-
-    RwLock(RwLockError),
-
-    UnexpectedSyntaxNode {
-        expected: String,
-        actual: String,
-        position: SourcePosition,
-    },
-}
-
-impl SyntaxError {
-    pub fn create_report(&self, source: &str) -> String {
-        let messages = match self {
-            SyntaxError::InvalidSource { position, .. } => self
-                .to_string()
-                .split_inclusive(".")
-                .map(|message_part| {
-                    (
-                        position.start_byte..position.end_byte,
-                        message_part.to_string(),
-                        (255, 200, 100),
-                    )
-                })
-                .collect(),
-            SyntaxError::RwLock(_) => todo!(),
-            SyntaxError::UnexpectedSyntaxNode { position, .. } => {
-                vec![(
-                    position.start_byte..position.end_byte,
-                    self.to_string(),
-                    (255, 200, 100),
-                )]
-            }
-        };
-
-        Report::new_byte_spanned(source, messages).display_str()
-    }
-
-    pub fn expect_syntax_node(expected: &str, actual: SyntaxNode) -> Result<(), SyntaxError> {
-        log::trace!("Converting {} to abstract node", actual.kind());
-
-        if expected == actual.kind() {
-            Ok(())
-        } else if actual.is_error() {
-            Err(SyntaxError::InvalidSource {
-                expected: expected.to_owned(),
-                actual: actual.kind().to_string(),
-                position: SourcePosition::from(actual.range()),
-            })
-        } else {
-            Err(SyntaxError::UnexpectedSyntaxNode {
-                expected: expected.to_string(),
-                actual: actual.kind().to_string(),
-                position: SourcePosition::from(actual.range()),
-            })
-        }
-    }
-}
-
-impl From<RwLockError> for SyntaxError {
-    fn from(error: RwLockError) -> Self {
-        SyntaxError::RwLock(error)
-    }
-}
-
-impl Display for SyntaxError {
-    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
-        match self {
-            SyntaxError::InvalidSource {
-                expected,
-                actual,
-                position,
-            } => {
-                let actual = if actual == "ERROR" {
-                    "unrecognized characters"
-                } else {
-                    actual
-                };
-
-                write!(
-                    f,
-                    "Invalid syntax from ({}, {}) to ({}, {}). Exected {} but found {}.",
-                    position.start_row,
-                    position.start_column,
-                    position.end_row,
-                    position.end_column,
-                    expected.bold().green(),
-                    actual.bold().red(),
-                )
-            }
-            SyntaxError::RwLock(_) => todo!(),
-            SyntaxError::UnexpectedSyntaxNode {
-                expected,
-                actual,
-                position,
-            } => {
-                write!(
-                        f,
-                        "Interpreter Error. Tried to parse {actual} as {expected} from ({}, {}) to ({}, {}).",
-                        position.start_row,
-                        position.start_column,
-                        position.end_row,
-                        position.end_column,
-                    )
-            }
-        }
-    }
-}

src/error/validation_error.rs

@@ -1,274 +0,0 @@
-use std::fmt::{self, Display, Formatter};
-
-use colored::Colorize;
-use lyneate::Report;
-use serde::{Deserialize, Serialize};
-
-use crate::{Identifier, SourcePosition, Type, TypeDefinition, Value};
-
-use super::rw_lock_error::RwLockError;
-
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-pub enum ValidationError {
-    /// Two value are incompatible for addition.
-    CannotAdd {
-        left: Value,
-        right: Value,
-        position: SourcePosition,
-    },
-
-    /// Two value are incompatible for subtraction.
-    CannotSubtract {
-        left: Value,
-        right: Value,
-        position: SourcePosition,
-    },
-
-    /// Two value are incompatible for multiplication.
-    CannotMultiply {
-        left: Value,
-        right: Value,
-        position: SourcePosition,
-    },
-
-    /// Two value are incompatible for dividing.
-    CannotDivide {
-        left: Value,
-        right: Value,
-        position: SourcePosition,
-    },
-
-    /// The attempted conversion is impossible.
-    ConversionImpossible {
-        initial_type: Type,
-        target_type: Type,
-    },
-
-    ExpectedString {
-        actual: Value,
-    },
-
-    ExpectedInteger {
-        actual: Value,
-    },
-
-    ExpectedFloat {
-        actual: Value,
-    },
-
-    /// An integer, floating point or value was expected.
-    ExpectedNumber {
-        actual: Value,
-    },
-
-    /// An integer, floating point or string value was expected.
-    ExpectedNumberOrString {
-        actual: Value,
-    },
-
-    ExpectedBoolean {
-        actual: Value,
-    },
-
-    ExpectedList {
-        actual: Value,
-    },
-
-    ExpectedMinLengthList {
-        minimum_len: usize,
-        actual_len: usize,
-    },
-
-    ExpectedFixedLenList {
-        expected_len: usize,
-        actual: Value,
-    },
-
-    ExpectedMap {
-        actual: Value,
-    },
-
-    ExpectedFunction {
-        actual: Value,
-    },
-
-    /// A string, list, map or table value was expected.
-    ExpectedCollection {
-        actual: Value,
-    },
-
-    /// A built-in function was called with the wrong amount of arguments.
-    ExpectedBuiltInFunctionArgumentAmount {
-        function_name: String,
-        expected: usize,
-        actual: usize,
-    },
-
-    /// A function was called with the wrong amount of arguments.
-    ExpectedFunctionArgumentAmount {
-        expected: usize,
-        actual: usize,
-        position: SourcePosition,
-    },
-
-    /// A function was called with the wrong amount of arguments.
-    ExpectedFunctionArgumentMinimum {
-        minumum_expected: usize,
-        actual: usize,
-        position: SourcePosition,
-    },
-
-    /// Failed to read or write a map.
-    ///
-    /// See the [MapError] docs for more info.
-    RwLock(RwLockError),
-
-    TypeCheck {
-        expected: Type,
-        actual: Type,
-        position: SourcePosition,
-    },
-
-    TypeCheckExpectedFunction {
-        actual: Type,
-        position: SourcePosition,
-    },
-
-    /// Failed to find a value with this key.
-    VariableIdentifierNotFound(Identifier),
-
-    /// Failed to find a type definition with this key.
-    TypeDefinitionNotFound(Identifier),
-
-    /// Failed to find an enum definition with this key.
-    ExpectedEnumDefintion {
-        actual: TypeDefinition,
-    },
-
-    /// Failed to find a struct definition with this key.
-    ExpectedStructDefintion {
-        actual: TypeDefinition,
-    },
-}
-
-impl ValidationError {
-    pub fn create_report(&self, source: &str) -> String {
-        let messages = match self {
-            ValidationError::CannotAdd {
-                left: _,
-                right: _,
-                position,
-            } => vec![
-                ((
-                    position.start_byte..position.end_byte,
-                    format!(""),
-                    (255, 159, 64),
-                )),
-            ],
-            ValidationError::CannotSubtract {
-                left: _,
-                right: _,
-                position: _,
-            } => todo!(),
-            ValidationError::CannotMultiply {
-                left: _,
-                right: _,
-                position: _,
-            } => todo!(),
-            ValidationError::CannotDivide {
-                left: _,
-                right: _,
-                position: _,
-            } => todo!(),
-            ValidationError::ConversionImpossible {
-                initial_type: _,
-                target_type: _,
-            } => todo!(),
-            ValidationError::ExpectedString { actual: _ } => todo!(),
-            ValidationError::ExpectedInteger { actual: _ } => todo!(),
-            ValidationError::ExpectedFloat { actual: _ } => todo!(),
-            ValidationError::ExpectedNumber { actual: _ } => todo!(),
-            ValidationError::ExpectedNumberOrString { actual: _ } => todo!(),
-            ValidationError::ExpectedBoolean { actual: _ } => todo!(),
-            ValidationError::ExpectedList { actual: _ } => todo!(),
-            ValidationError::ExpectedMinLengthList {
-                minimum_len: _,
-                actual_len: _,
-            } => todo!(),
-            ValidationError::ExpectedFixedLenList {
-                expected_len: _,
-                actual: _,
-            } => todo!(),
-            ValidationError::ExpectedMap { actual: _ } => todo!(),
-            ValidationError::ExpectedFunction { actual: _ } => todo!(),
-            ValidationError::ExpectedCollection { actual: _ } => todo!(),
-            ValidationError::ExpectedBuiltInFunctionArgumentAmount {
-                function_name: _,
-                expected: _,
-                actual: _,
-            } => todo!(),
-            ValidationError::ExpectedFunctionArgumentAmount {
-                expected: _,
-                actual: _,
-                position: _,
-            } => todo!(),
-            ValidationError::ExpectedFunctionArgumentMinimum {
-                minumum_expected: _,
-                actual: _,
-                position: _,
-            } => todo!(),
-            ValidationError::RwLock(_) => todo!(),
-            ValidationError::TypeCheck {
-                expected,
-                actual,
-                position,
-            } => vec![(
-                position.start_byte..position.end_byte,
-                format!(
-                    "Type {} is incompatible with {}.",
-                    actual.to_string().bold().red(),
-                    expected.to_string().bold().green()
-                ),
-                (200, 200, 200),
-            )],
-            ValidationError::TypeCheckExpectedFunction {
-                actual: _,
-                position: _,
-            } => todo!(),
-            ValidationError::VariableIdentifierNotFound(_) => todo!(),
-            ValidationError::TypeDefinitionNotFound(_) => todo!(),
-            ValidationError::ExpectedEnumDefintion { actual: _ } => todo!(),
-            ValidationError::ExpectedStructDefintion { actual: _ } => todo!(),
-        };
-
-        Report::new_byte_spanned(source, messages).display_str()
-    }
-
-    pub fn expect_argument_amount(
-        function_name: &str,
-        expected: usize,
-        actual: usize,
-    ) -> Result<(), Self> {
-        if expected == actual {
-            Ok(())
-        } else {
-            Err(ValidationError::ExpectedBuiltInFunctionArgumentAmount {
-                function_name: function_name.to_string(),
-                expected,
-                actual,
-            })
-        }
-    }
-}
-
-impl From<RwLockError> for ValidationError {
-    fn from(_error: RwLockError) -> Self {
-        ValidationError::RwLock(RwLockError)
-    }
-}
-
-impl Display for ValidationError {
-    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
-        write!(f, "{self:?}")
-    }
-}

src/interpret.rs

@@ -1,56 +1,46 @@
-//! Tools to interpret dust source code.
+//! The top level of Dust's API with functions to interpret Dust code.
 //!
-//! This module has three tools to run Dust code.
+//! You can use this library externally by calling either of the "eval"
-//!
+//! functions or by constructing your own Evaluator.
-//! - [interpret] is the simplest way to run Dust code inside of an application or library
+use tree_sitter::{Parser, Tree as TSTree, TreeCursor};
-//! - [interpret_with_context] allows you to set variables on the execution context
-//! - [Interpreter] is an advanced tool that can parse, validate, run and format Dust code
-//!
-//! # Examples
-//!
-//! Run some Dust and get the result.
-//!
-//! ```rust
-//! # use dust_lang::*;
-//! assert_eq!(
-//!     interpret("1 + 2 + 3"),
-//!     Ok(Value::Integer(6))
-//! );
-//! ```
-//!
-//! Create a custom context with variables you can use in your code.
-//!
-//! ```rust
-//! # use dust_lang::*;
-//! let context = Context::default();
-//!
-//! context.set_value("one".into(), 1.into()).unwrap();
-//! context.set_value("two".into(), 2.into()).unwrap();
-//! context.set_value("three".into(), 3.into()).unwrap();
-//!
-//! let dust_code = "four = 4; one + two + three + four";
-//!
-//! assert_eq!(
-//!     interpret_with_context(dust_code, context),
-//!     Ok(Value::Integer(10))
-//! );
-//! ```
-use tree_sitter::{Parser, Tree as SyntaxTree};
 
-use crate::{language, AbstractTree, Context, ContextMode, Error, Format, Root, Value};
+use crate::{language, AbstractTree, Error, Format, Map, Result, Root, SyntaxNode, Value};
 
-/// Interpret the given source code. Returns the value of last statement or the
+/// Interpret the given source code.
-/// first error encountered.
 ///
-/// See the [module-level docs][self] for more info.
+/// Returns a vector of results from evaluating the source code. Each comment
-pub fn interpret(source: &str) -> Result<Value, Error> {
+/// and statemtent will have its own result.
-    interpret_with_context(source, Context::new(ContextMode::RemoveGarbage))
+///
+/// # Examples
+///
+/// ```rust
+/// # use dust_lang::*;
+/// assert_eq!(interpret("1 + 2 + 3"), Ok(Value::Integer(6)));
+/// ```
+pub fn interpret(source: &str) -> Result<Value> {
+    interpret_with_context(source, Map::new())
 }
 
 /// Interpret the given source code with the given context.
 ///
-/// See the [module-level docs][self] for more info.
+/// # Examples
-pub fn interpret_with_context(source: &str, context: Context) -> Result<Value, Error> {
+///
+/// ```rust
+/// # use dust_lang::*;
+/// let context = Map::new();
+///
+/// context.set("one".into(), 1.into());
+/// context.set("two".into(), 2.into());
+/// context.set("three".into(), 3.into());
+///
+/// let dust_code = "four = 4 one + two + three + four";
+///
+/// assert_eq!(
+///     interpret_with_context(dust_code, context),
+///     Ok(Value::Integer(10))
+/// );
+/// ```
+pub fn interpret_with_context(source: &str, context: Map) -> Result<Value> {
     let mut interpreter = Interpreter::new(context);
     let value = interpreter.run(source)?;
 
@@ -58,100 +48,103 @@ pub fn interpret_with_context(source: &str, context: Context) -> Result<Value, E
 }
 
 /// A source code interpreter for the Dust language.
-///
-/// The interpreter's most important functions are used to parse dust source
-/// code, verify it is safe and run it. They are written in a way that forces
-/// them to be used safely: each step in this process contains the prior
-/// steps, meaning that the same code is always used to create the syntax tree,
-/// abstract tree and final evaluation. This avoids a critical logic error.
-///
-/// ```
-/// # use dust_lang::*;
-/// let context = Context::default();
-/// let mut interpreter = Interpreter::new(context);
-/// let result = interpreter.run("2 + 2");
-///
-/// assert_eq!(result, Ok(Value::Integer(4)));
-/// ```
 pub struct Interpreter {
     parser: Parser,
-    context: Context,
+    context: Map,
+    syntax_tree: Option<TSTree>,
+    abstract_tree: Option<Root>,
 }
 
 impl Interpreter {
-    /// Create a new interpreter with the given context.
+    pub fn new(context: Map) -> Self {
-    pub fn new(context: Context) -> Self {
         let mut parser = Parser::new();
 
         parser
             .set_language(language())
             .expect("Language version is incompatible with tree sitter version.");
 
-        parser.set_logger(Some(Box::new(|_log_type, message| {
+        Interpreter {
-            log::trace!("{}", message)
+            parser,
-        })));
+            context,
-
+            syntax_tree: None,
-        Interpreter { parser, context }
+            abstract_tree: None,
+        }
     }
 
-    /// Generate a syntax tree from the source. Returns an error if the the
+    pub fn parse(&mut self, source: &str) -> Result<()> {
-    /// parser is cancelled for taking too long. The syntax tree may contain
+        fn check_for_error(node: SyntaxNode, source: &str, cursor: &mut TreeCursor) -> Result<()> {
-    /// error nodes, which represent syntax errors.
+            if node.is_error() {
-    ///
+                Err(Error::Syntax {
-    /// Tree sitter is designed to be run on every keystroke, so this is
+                    source: source[node.byte_range()].to_string(),
-    /// generally a lightweight function to call.
+                    location: node.start_position(),
-    pub fn parse(&mut self, source: &str) -> Result<SyntaxTree, Error> {
+                })
-        if let Some(tree) = self.parser.parse(source, None) {
+            } else {
-            Ok(tree)
+                for child in node.children(&mut cursor.clone()) {
+                    check_for_error(child, source, cursor)?;
+                }
+
+                Ok(())
+            }
+        }
+
+        let syntax_tree = self.parser.parse(source, None);
+
+        if let Some(tree) = &syntax_tree {
+            let root = tree.root_node();
+            let mut cursor = root.walk();
+
+            check_for_error(root, source, &mut cursor)?;
+        }
+
+        self.syntax_tree = syntax_tree;
+
+        Ok(())
+    }
+
+    pub fn run(&mut self, source: &str) -> Result<Value> {
+        self.parse(source)?;
+
+        self.abstract_tree = if let Some(syntax_tree) = &self.syntax_tree {
+            Some(Root::from_syntax(
+                syntax_tree.root_node(),
+                source,
+                &self.context,
+            )?)
+        } else {
+            return Err(Error::ParserCancelled);
+        };
+
+        if let Some(abstract_tree) = &self.abstract_tree {
+            abstract_tree.check_type(source, &self.context)?;
+            abstract_tree.run(source, &self.context)
+        } else {
+            Ok(Value::none())
+        }
+    }
+
+    pub fn syntax_tree(&self) -> Result<String> {
+        if let Some(syntax_tree) = &self.syntax_tree {
+            Ok(syntax_tree.root_node().to_sexp())
         } else {
             Err(Error::ParserCancelled)
         }
     }
 
-    /// Check the source for errors and generate an abstract tree.
+    pub fn format(&self) -> String {
-    ///
+        if let Some(root_node) = &self.abstract_tree {
-    /// The order in which this function works is:
+            let mut formatted_source = String::new();
-    ///
-    /// - parse the source into a syntax tree
-    /// - generate an abstract tree from the source and syntax tree
-    /// - check the abstract tree for errors
-    pub fn validate(&mut self, source: &str) -> Result<Root, Error> {
-        let syntax_tree = self.parse(source)?;
-        let abstract_tree = Root::from_syntax(syntax_tree.root_node(), source, &self.context)?;
 
-        abstract_tree.validate(source, &self.context)?;
+            root_node.format(&mut formatted_source, 0);
 
-        Ok(abstract_tree)
+            formatted_source
+        } else {
+            String::with_capacity(0)
         }
-
-    /// Run the source, returning the final statement's value or first error.
-    ///
-    /// This function [parses][Self::parse], [validates][Self::validate] and
-    /// [runs][Root::run] using the same source code.
-    pub fn run(&mut self, source: &str) -> Result<Value, Error> {
-        let final_value = self.validate(source)?.run(source, &self.context)?;
-
-        Ok(final_value)
-    }
-
-    /// Return an s-expression displaying a syntax tree of the source or an
-    /// error.
-    pub fn syntax_tree(&mut self, source: &str) -> Result<String, Error> {
-        Ok(self.parse(source)?.root_node().to_sexp())
-    }
-
-    /// Return a formatted version of the source.
-    pub fn format(&mut self, source: &str) -> Result<String, Error> {
-        let mut formatted_output = String::new();
-
-        self.validate(source)?.format(&mut formatted_output, 0);
-
-        Ok(formatted_output)
     }
 }
 
 impl Default for Interpreter {
     fn default() -> Self {
-        Interpreter::new(Context::default())
+        Interpreter::new(Map::new())
     }
 }

src/lib.rs

@@ -1,26 +1,19 @@
-//! The Dust library is used to parse, format and run dust source code.
+//! The Dust library is used to implement the Dust language, `src/main.rs` implements the command
+//! line binary.
 //!
-//! See the [interpret] module for more information.
+//! Using this library is simple and straightforward, see the [inferface] module for instructions on
-//!
+//! interpreting Dust code. Most of the language's features are implemented in the [tools] module.
-//! You can use this library externally by calling either of the "interpret"
-//! functions or by constructing your own Interpreter.
 pub use crate::{
-    abstract_tree::*, built_in_functions::BuiltInFunction, context::*, error::Error, interpret::*,
+    abstract_tree::*, built_in_functions::BuiltInFunction, error::*, interpret::*, value::*,
-    value::*,
 };
 
 pub use tree_sitter::Node as SyntaxNode;
 
-pub mod abstract_tree;
+mod abstract_tree;
 pub mod built_in_functions;
-pub mod built_in_identifiers;
+mod error;
-pub mod built_in_type_definitions;
+mod interpret;
-pub mod built_in_types;
+mod value;
-pub mod built_in_values;
-pub mod context;
-pub mod error;
-pub mod interpret;
-pub mod value;
 
 use tree_sitter::Language;
 
@@ -35,6 +28,18 @@ pub fn language() -> Language {
     unsafe { tree_sitter_dust() }
 }
 
+/// The content of the [`node-types.json`][] file for this grammar.
+///
+/// [`node-types.json`]: https://tree-sitter.github.io/tree-sitter/using-parsers#static-node-types
+pub const NODE_TYPES: &str = include_str!("../tree-sitter-dust/src/node-types.json");
+
+// Uncomment these to include any queries that this grammar contains
+
+// pub const HIGHLIGHTS_QUERY: &'static str = include_str!("../../queries/highlights.scm");
+// pub const INJECTIONS_QUERY: &'static str = include_str!("../../queries/injections.scm");
+// pub const LOCALS_QUERY: &'static str = include_str!("../../queries/locals.scm");
+// pub const TAGS_QUERY: &'static str = include_str!("../../queries/tags.scm");
+
 #[cfg(test)]
 mod tests {
     #[test]

src/main.rs

@@ -1,20 +1,19 @@
 //! Command line interface for the dust programming language.
 
 use clap::{Parser, Subcommand};
-use colored::Colorize;
+use rustyline::{
-use crossterm::event::{KeyCode, KeyModifiers};
+    completion::FilenameCompleter,
-use nu_ansi_term::{Color, Style};
+    config::Builder,
-use reedline::{
+    error::ReadlineError,
-    default_emacs_keybindings, ColumnarMenu, Completer, DefaultHinter, EditCommand, Emacs, Prompt,
+    highlight::Highlighter,
-    Reedline, ReedlineEvent, ReedlineMenu, Signal, Span, SqliteBackedHistory, Suggestion,
+    hint::{Hint, Hinter, HistoryHinter},
+    history::DefaultHistory,
+    ColorMode, Completer, CompletionType, Context, Editor, Helper, Validator,
 };
 
-use std::{borrow::Cow, fs::read_to_string, io::Write, path::PathBuf, process::Command};
+use std::{borrow::Cow, fs::read_to_string};
 
-use dust_lang::{
+use dust_lang::{built_in_values, Interpreter, Map, Value};
-    built_in_values::all_built_in_values, Context, ContextMode, Error, Interpreter, Value,
-    ValueData,
-};
 
 /// Command-line arguments to be parsed.
 #[derive(Parser, Debug)]
@@ -24,6 +23,14 @@ struct Args {
     #[arg(short, long)]
     command: Option<String>,
 
+    /// Data to assign to the "input" variable.
+    #[arg(short, long)]
+    input: Option<String>,
+
+    /// File whose contents will be assigned to the "input" variable.
+    #[arg(short = 'p', long)]
+    input_path: Option<String>,
+
     /// Command for alternate functionality besides running the source.
     #[command(subcommand)]
     cli_command: Option<CliCommand>,
@@ -38,32 +45,31 @@ pub enum CliCommand {
     Format,
 
     /// Output a concrete syntax tree of the input.
-    Syntax { path: String },
+    Syntax,
 }
 
 fn main() {
-    env_logger::Builder::from_env("DUST_LOG")
+    env_logger::init();
-        .format(|buffer, record| {
-            let args = record.args();
-            let log_level = record.level().to_string().bold();
-            let timestamp = buffer.timestamp_seconds().to_string().dimmed();
-
-            writeln!(buffer, "[{log_level} {timestamp}] {args}")
-        })
-        .init();
 
     let args = Args::parse();
-    let context = Context::new(ContextMode::AllowGarbage);
+    let context = Map::new();
 
-    if args.path.is_none() && args.command.is_none() {
+    if let Some(input) = args.input {
-        let run_shell_result = run_shell(context);
+        context
-
+            .set("input".to_string(), Value::string(input))
-        match run_shell_result {
+            .unwrap();
-            Ok(_) => {}
-            Err(error) => eprintln!("{error}"),
     }
 
-        return;
+    if let Some(path) = args.input_path {
+        let file_contents = read_to_string(path).unwrap();
+
+        context
+            .set("input".to_string(), Value::string(file_contents))
+            .unwrap();
+    }
+
+    if args.path.is_none() && args.command.is_none() {
+        return run_cli_shell(context);
     }
 
     let source = if let Some(path) = &args.path {
@@ -76,19 +82,16 @@ fn main() {
 
     let mut interpreter = Interpreter::new(context);
 
-    if let Some(CliCommand::Syntax { path }) = args.cli_command {
+    if let Some(CliCommand::Syntax) = args.cli_command {
-        let source = read_to_string(path).unwrap();
+        interpreter.parse(&source).unwrap();
-        let syntax_tree_sexp = interpreter.syntax_tree(&source).unwrap();
 
-        println!("{syntax_tree_sexp}");
+        println!("{}", interpreter.syntax_tree().unwrap());
 
         return;
     }
 
     if let Some(CliCommand::Format) = args.cli_command {
-        let formatted = interpreter.format(&source).unwrap();
+        println!("{}", interpreter.format());
-
-        println!("{formatted}");
 
         return;
     }
@@ -101,307 +104,161 @@ fn main() {
                 println!("{value}")
             }
         }
-        Err(error) => eprintln!("{}", error.create_report(&source)),
+        Err(error) => eprintln!("{error}"),
     }
 }
 
-// struct DustHighlighter {
+#[derive(Helper, Completer, Validator)]
-//     context: Context,
+struct DustReadline {
-// }
+    #[rustyline(Completer)]
+    completer: FilenameCompleter,
 
-// impl DustHighlighter {
+    hints: Vec<ToolHint>,
-//     fn new(context: Context) -> Self {
-//         Self { context }
-//     }
-// }
 
-// const HIGHLIGHT_TERMINATORS: [char; 8] = [' ', ':', '(', ')', '{', '}', '[', ']'];
+    #[rustyline(Hinter)]
-
+    _hinter: HistoryHinter,
-// impl Highlighter for DustHighlighter {
-//     fn highlight(&self, line: &str, _cursor: usize) -> reedline::StyledText {
-//         let mut styled = StyledText::new();
-
-//         for word in line.split_inclusive(&HIGHLIGHT_TERMINATORS) {
-//             let mut word_is_highlighted = false;
-
-//             for key in self.context.inner().unwrap().keys() {
-//                 if key == &word {
-//                     styled.push((Style::new().bold(), word.to_string()));
-//                 }
-
-//                 word_is_highlighted = true;
-//             }
-
-//             for built_in_value in built_in_values() {
-//                 if built_in_value.name() == word {
-//                     styled.push((Style::new().bold(), word.to_string()));
-//                 }
-
-//                 word_is_highlighted = true;
-//             }
-
-//             if word_is_highlighted {
-//                 let final_char = word.chars().last().unwrap();
-
-//                 if HIGHLIGHT_TERMINATORS.contains(&final_char) {
-//                     let mut terminator_style = Style::new();
-
-//                     terminator_style.foreground = Some(Color::Cyan);
-
-//                     styled.push((terminator_style, final_char.to_string()));
-//                 }
-//             } else {
-//                 styled.push((Style::new(), word.to_string()));
-//             }
-//         }
-
-//         styled
-//     }
-// }
-
-struct StarshipPrompt {
-    left: String,
-    right: String,
 }
 
-impl StarshipPrompt {
+impl DustReadline {
     fn new() -> Self {
+        let mut hints = Vec::new();
+
+        for built_in_value in built_in_values() {
+            let mut display = built_in_value.name().to_string();
+
+            if built_in_value.r#type().is_function() {
+                display.push_str("()");
+            }
+
+            if built_in_value.r#type().is_map() {
+                let value = built_in_value.get();
+
+                if let Value::Map(map) = value {
+                    for (key, (value, _)) in map.variables().unwrap().iter() {
+                        let display = if value.is_function() {
+                            format!("{display}:{key}()")
+                        } else {
+                            format!("{display}:{key}")
+                        };
+
+                        hints.push(ToolHint {
+                            complete_to: display.len(),
+                            display,
+                        })
+                    }
+                }
+            }
+
+            hints.push(ToolHint {
+                complete_to: display.len(),
+                display,
+            })
+        }
+
+        hints.push(ToolHint {
+            display: "output".to_string(),
+            complete_to: 0,
+        });
+
         Self {
-            left: String::new(),
+            completer: FilenameCompleter::new(),
-            right: String::new(),
+            _hinter: HistoryHinter {},
+            hints,
+        }
     }
 }
 
-    fn reload(&mut self) {
+struct ToolHint {
-        let run_starship_left = Command::new("starship").arg("prompt").output();
+    display: String,
-        let run_starship_right = Command::new("starship")
+    complete_to: usize,
-            .args(["prompt", "--right"])
+}
-            .output();
+
-        let left_prompt = if let Ok(output) = &run_starship_left {
+impl Hint for ToolHint {
-            String::from_utf8_lossy(&output.stdout).trim().to_string()
+    fn display(&self) -> &str {
+        &self.display
+    }
+
+    fn completion(&self) -> Option<&str> {
+        if self.complete_to > 0 {
+            Some(&self.display[..self.complete_to])
         } else {
-            ">".to_string()
+            None
-        };
+        }
-        let right_prompt = if let Ok(output) = &run_starship_right {
+    }
-            String::from_utf8_lossy(&output.stdout).trim().to_string()
+}
+
+impl ToolHint {
+    fn suffix(&self, strip_chars: usize) -> ToolHint {
+        ToolHint {
+            display: self.display[strip_chars..].to_string(),
+            complete_to: self.complete_to.saturating_sub(strip_chars),
+        }
+    }
+}
+
+impl Hinter for DustReadline {
+    type Hint = ToolHint;
+
+    fn hint(&self, line: &str, pos: usize, _ctx: &Context) -> Option<Self::Hint> {
+        if line.is_empty() || pos < line.len() {
+            return None;
+        }
+
+        self.hints.iter().find_map(|tool_hint| {
+            if tool_hint.display.starts_with(line) {
+                Some(tool_hint.suffix(pos))
             } else {
-            "".to_string()
+                None
-        };
+            }
-
+        })
-        self.left = left_prompt;
-        self.right = right_prompt;
     }
 }
 
-impl Prompt for StarshipPrompt {
+impl Highlighter for DustReadline {
-    fn render_prompt_left(&self) -> Cow<str> {
+    fn highlight_hint<'h>(&self, hint: &'h str) -> Cow<'h, str> {
-        Cow::Borrowed(&self.left)
+        let highlighted = ansi_term::Colour::Yellow.paint(hint).to_string();
-    }
 
-    fn render_prompt_right(&self) -> Cow<str> {
+        Cow::Owned(highlighted)
-        Cow::Borrowed(&self.right)
-    }
-
-    fn render_prompt_indicator(&self, _prompt_mode: reedline::PromptEditMode) -> Cow<str> {
-        Cow::Borrowed(" ")
-    }
-
-    fn render_prompt_multiline_indicator(&self) -> Cow<str> {
-        Cow::Borrowed("")
-    }
-
-    fn render_prompt_history_search_indicator(
-        &self,
-        _history_search: reedline::PromptHistorySearch,
-    ) -> Cow<str> {
-        Cow::Borrowed("")
     }
 }
 
-pub struct DustCompleter {
+fn run_cli_shell(context: Map) {
-    context: Context,
+    let mut interpreter = Interpreter::new(context);
-}
+    let config = Builder::new()
+        .color_mode(ColorMode::Enabled)
+        .completion_type(CompletionType::List)
+        .build();
+    let mut rl: Editor<DustReadline, DefaultHistory> =
+        Editor::with_config(config).expect("Line editor could not be configured properly.");
 
-impl DustCompleter {
+    rl.set_helper(Some(DustReadline::new()));
-    fn new(context: Context) -> Self {
-        DustCompleter { context }
-    }
-}
 
-impl Completer for DustCompleter {
+    if rl.load_history("target/history.txt").is_err() {
-    fn complete(&mut self, line: &str, pos: usize) -> Vec<Suggestion> {
+        println!("No previous history.");
-        let mut suggestions = Vec::new();
-        let last_word = if let Some(word) = line.rsplit([' ', ':']).next() {
-            word
-        } else {
-            line
-        };
-
-        if let Ok(path) = PathBuf::try_from(last_word) {
-            if let Ok(read_dir) = path.read_dir() {
-                for entry in read_dir {
-                    if let Ok(entry) = entry {
-                        let description = if let Ok(file_type) = entry.file_type() {
-                            if file_type.is_dir() {
-                                "directory"
-                            } else if file_type.is_file() {
-                                "file"
-                            } else if file_type.is_symlink() {
-                                "symlink"
-                            } else {
-                                "unknown"
     }
-                        } else {
-                            "unknown"
-                        };
-
-                        suggestions.push(Suggestion {
-                            value: entry.path().to_string_lossy().to_string(),
-                            description: Some(description.to_string()),
-                            extra: None,
-                            span: Span::new(pos - last_word.len(), pos),
-                            append_whitespace: false,
-                        });
-                    }
-                }
-            }
-        }
-
-        for built_in_value in all_built_in_values() {
-            let name = built_in_value.name();
-            let description = built_in_value.description();
-
-            if built_in_value.name().contains(last_word) {
-                suggestions.push(Suggestion {
-                    value: name.to_string(),
-                    description: Some(description.to_string()),
-                    extra: None,
-                    span: Span::new(pos - last_word.len(), pos),
-                    append_whitespace: false,
-                });
-            }
-
-            if let Value::Map(map) = built_in_value.get() {
-                for (key, value) in map.inner() {
-                    if key.contains(last_word) {
-                        suggestions.push(Suggestion {
-                            value: format!("{name}:{key}"),
-                            description: Some(value.to_string()),
-                            extra: None,
-                            span: Span::new(pos - last_word.len(), pos),
-                            append_whitespace: false,
-                        });
-                    }
-                }
-            }
-        }
-
-        for (key, (value_data, _counter)) in self.context.inner().unwrap().iter() {
-            let value = match value_data {
-                ValueData::Value(value) => value,
-                ValueData::TypeHint(_) => continue,
-                ValueData::TypeDefinition(_) => continue,
-            };
-
-            if key.contains(last_word) {
-                suggestions.push(Suggestion {
-                    value: key.to_string(),
-                    description: Some(value.to_string()),
-                    extra: None,
-                    span: Span::new(pos - last_word.len(), pos),
-                    append_whitespace: false,
-                });
-            }
-        }
-
-        suggestions
-    }
-}
-
-fn run_shell(context: Context) -> Result<(), Error> {
-    let mut interpreter = Interpreter::new(context.clone());
-    let mut keybindings = default_emacs_keybindings();
-
-    keybindings.add_binding(
-        KeyModifiers::CONTROL,
-        KeyCode::Char(' '),
-        ReedlineEvent::Edit(vec![EditCommand::InsertNewline]),
-    );
-    keybindings.add_binding(
-        KeyModifiers::NONE,
-        KeyCode::Enter,
-        ReedlineEvent::SubmitOrNewline,
-    );
-    keybindings.add_binding(
-        KeyModifiers::NONE,
-        KeyCode::Tab,
-        ReedlineEvent::Edit(vec![EditCommand::InsertString("    ".to_string())]),
-    );
-    keybindings.add_binding(
-        KeyModifiers::NONE,
-        KeyCode::Tab,
-        ReedlineEvent::Multiple(vec![
-            ReedlineEvent::Menu("context menu".to_string()),
-            ReedlineEvent::MenuNext,
-        ]),
-    );
-
-    let edit_mode = Box::new(Emacs::new(keybindings));
-    let history = Box::new(
-        SqliteBackedHistory::with_file(PathBuf::from("target/history"), None, None)
-            .expect("Error loading history."),
-    );
-    let hinter = Box::new(DefaultHinter::default().with_style(Style::new().dimmed()));
-    let completer = DustCompleter::new(context.clone());
-
-    let mut line_editor = Reedline::create()
-        .with_edit_mode(edit_mode)
-        .with_history(history)
-        .with_hinter(hinter)
-        .use_kitty_keyboard_enhancement(true)
-        .with_completer(Box::new(completer))
-        .with_menu(ReedlineMenu::EngineCompleter(Box::new(
-            ColumnarMenu::default()
-                .with_name("context menu")
-                .with_text_style(Style::new().fg(Color::White))
-                .with_columns(1)
-                .with_column_padding(10),
-        )));
-    let mut prompt = StarshipPrompt::new();
-
-    prompt.reload();
 
     loop {
-        let sig = line_editor.read_line(&prompt);
+        let readline = rl.readline("* ");
+        match readline {
+            Ok(line) => {
+                let input = line.to_string();
 
-        match sig {
+                rl.add_history_entry(line).unwrap();
-            Ok(Signal::Success(buffer)) => {
-                if buffer.trim().is_empty() {
-                    continue;
-                }
 
-                let run_result = interpreter.run(&buffer);
+                let eval_result = interpreter.run(&input);
 
-                match run_result {
+                match eval_result {
-                    Ok(value) => {
+                    Ok(value) => println!("{value}"),
-                        if !value.is_none() {
+                    Err(error) => {
-                            println!("{value}")
+                        eprintln!("{error}")
                     }
                 }
-                    Err(error) => println!("{error}"),
-                }
-
-                prompt.reload();
-            }
-            Ok(Signal::CtrlD) | Ok(Signal::CtrlC) => {
-                println!("\nLeaving the Dust shell.");
-                break;
-            }
-            x => {
-                println!("Unknown event: {:?}", x);
             }
+            Err(ReadlineError::Interrupted) => break,
+            Err(ReadlineError::Eof) => break,
+            Err(error) => eprintln!("{error}"),
         }
     }
 
-    Ok(())
+    rl.save_history("target/history.txt").unwrap();
 }

src/value/enum_instance.rs

@@ -1,40 +0,0 @@
-use std::fmt::{self, Display, Formatter};
-
-use serde::{Deserialize, Serialize};
-
-use crate::{Identifier, Value};
-
-#[derive(Debug, Clone, Eq, PartialEq, PartialOrd, Ord, Serialize, Deserialize)]
-pub struct EnumInstance {
-    name: Identifier,
-    variant: Identifier,
-    value: Option<Box<Value>>,
-}
-
-impl EnumInstance {
-    pub fn new(name: Identifier, variant_name: Identifier, value: Option<Value>) -> Self {
-        Self {
-            name,
-            variant: variant_name,
-            value: value.map(|value| Box::new(value)),
-        }
-    }
-
-    pub fn name(&self) -> &Identifier {
-        &self.name
-    }
-
-    pub fn variant(&self) -> &Identifier {
-        &self.variant
-    }
-
-    pub fn value(&self) -> &Option<Box<Value>> {
-        &self.value
-    }
-}
-
-impl Display for EnumInstance {
-    fn fmt(&self, f: &mut Formatter) -> fmt::Result {
-        write!(f, "{}::{}({:?})", self.name, self.variant, self.value)
-    }
-}

src/value/function.rs

@@ -2,17 +2,36 @@ use std::fmt::{self, Display, Formatter};
 
 use serde::{Deserialize, Serialize};
 
-use crate::{
+use crate::{BuiltInFunction, Format, FunctionNode, Map, Result, Type, Value};
-    built_in_functions::Callable, BuiltInFunction, Format, FunctionNode, Identifier, Type,
-};
 
-#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord)]
 pub enum Function {
     BuiltIn(BuiltInFunction),
     ContextDefined(FunctionNode),
 }
 
 impl Function {
+    pub fn call(&self, arguments: &[Value], source: &str, outer_context: &Map) -> Result<Value> {
+        match self {
+            Function::BuiltIn(built_in_function) => {
+                built_in_function.call(arguments, source, outer_context)
+            }
+            Function::ContextDefined(function_node) => {
+                function_node.set(
+                    "self".to_string(),
+                    Value::Function(Function::ContextDefined(FunctionNode::new(
+                        function_node.parameters().clone(),
+                        function_node.body().clone(),
+                        function_node.r#type().clone(),
+                        *function_node.syntax_position(),
+                    ))),
+                )?;
+
+                function_node.call(arguments, source, outer_context)
+            }
+        }
+    }
+
     pub fn r#type(&self) -> Type {
         match self {
             Function::BuiltIn(built_in_function) => built_in_function.r#type(),
@@ -21,14 +40,6 @@ impl Function {
             }
         }
     }
-
-    pub fn parameters(&self) -> Option<&Vec<Identifier>> {
-        if let Function::ContextDefined(function) = self {
-            Some(function.parameters())
-        } else {
-            None
-        }
-    }
 }
 
 impl Format for Function {

src/value/list.rs

@@ -4,13 +4,7 @@ use std::{
     sync::{Arc, RwLock, RwLockReadGuard, RwLockWriteGuard},
 };
 
-use stanza::{
+use crate::Value;
-    renderer::{console::Console, Renderer},
-    style::Styles,
-    table::{Cell, Content, Row, Table},
-};
-
-use crate::{error::rw_lock_error::RwLockError, Value};
 
 #[derive(Debug, Clone)]
 pub struct List(Arc<RwLock<Vec<Value>>>);
@@ -34,51 +28,12 @@ impl List {
         List(Arc::new(RwLock::new(items)))
     }
 
-    pub fn items(&self) -> Result<RwLockReadGuard<Vec<Value>>, RwLockError> {
+    pub fn items(&self) -> RwLockReadGuard<'_, Vec<Value>> {
-        Ok(self.0.read()?)
+        self.0.read().unwrap()
     }
 
-    pub fn items_mut(&self) -> Result<RwLockWriteGuard<Vec<Value>>, RwLockError> {
+    pub fn items_mut(&self) -> RwLockWriteGuard<'_, Vec<Value>> {
-        Ok(self.0.write()?)
+        self.0.write().unwrap()
-    }
-
-    pub fn as_text_table(&self) -> Table {
-        let cells: Vec<Cell> = self
-            .items()
-            .unwrap()
-            .iter()
-            .map(|value| {
-                if let Value::List(list) = value {
-                    Cell::new(Styles::default(), Content::Nested(list.as_text_table()))
-                } else if let Value::Map(map) = value {
-                    Cell::new(Styles::default(), Content::Nested(map.as_text_table()))
-                } else {
-                    Cell::new(Styles::default(), Content::Label(value.to_string()))
-                }
-            })
-            .collect();
-
-        let row = if cells.is_empty() {
-            Row::new(
-                Styles::default(),
-                vec![Cell::new(
-                    Styles::default(),
-                    Content::Label("empty list".to_string()),
-                )],
-            )
-        } else {
-            Row::new(Styles::default(), cells)
-        };
-
-        Table::default().with_row(row)
-    }
-}
-
-impl Display for List {
-    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
-        let renderer = Console::default();
-
-        f.write_str(&renderer.render(&self.as_text_table()))
     }
 }
 
@@ -86,34 +41,42 @@ impl Eq for List {}
 
 impl PartialEq for List {
     fn eq(&self, other: &Self) -> bool {
-        if let (Ok(left), Ok(right)) = (self.items(), other.items()) {
+        let left = self.0.read().unwrap().clone().into_iter();
-            if left.len() != right.len() {
+        let right = other.0.read().unwrap().clone().into_iter();
-                return false;
-            } else {
-                for (i, j) in left.iter().zip(right.iter()) {
-                    if i != j {
-                        return false;
-                    }
-                }
-            }
-        }
 
-        true
+        left.eq(right)
-    }
-}
-
-impl PartialOrd for List {
-    fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
-        Some(self.cmp(other))
     }
 }
 
 impl Ord for List {
     fn cmp(&self, other: &Self) -> Ordering {
-        if let (Ok(left), Ok(right)) = (self.items(), other.items()) {
+        let left = self.0.read().unwrap().clone().into_iter();
-            left.cmp(&right)
+        let right = other.0.read().unwrap().clone().into_iter();
-        } else {
+
-            Ordering::Equal
+        left.cmp(right)
     }
 }
+
+impl PartialOrd for List {
+    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
+        Some(self.cmp(other))
+    }
+}
+
+impl Display for List {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        let items = self.items();
+
+        write!(f, "[")?;
+
+        for (index, value) in items.iter().enumerate() {
+            write!(f, "{value}")?;
+
+            if index != items.len() - 1 {
+                write!(f, ", ")?;
+            }
+        }
+
+        write!(f, "]")
+    }
 }

src/value/map.rs

@@ -1,77 +1,98 @@
-use serde::{Deserialize, Serialize};
+use serde::{
-use stanza::{
+    de::{MapAccess, Visitor},
-    renderer::{console::Console, Renderer},
+    ser::SerializeMap,
-    style::{HAlign, Styles},
+    Deserialize, Serialize,
-    table::{Row, Table},
 };
 use std::{
+    cmp::Ordering,
     collections::BTreeMap,
     fmt::{self, Display, Formatter},
+    marker::PhantomData,
+    sync::{Arc, RwLock, RwLockReadGuard},
 };
 
-use crate::{Identifier, Value};
+use crate::{value::Value, Result, Structure, Type};
 
 /// A collection dust variables comprised of key-value pairs.
 ///
 /// The inner value is a BTreeMap in order to allow VariableMap instances to be sorted and compared
 /// to one another.
-#[derive(Clone, Debug, Serialize, Deserialize, Eq, PartialEq, PartialOrd, Ord)]
+#[derive(Clone, Debug)]
 pub struct Map {
-    inner: BTreeMap<Identifier, Value>,
+    variables: Arc<RwLock<BTreeMap<String, (Value, Type)>>>,
+    structure: Option<Structure>,
 }
 
 impl Map {
     /// Creates a new instace.
     pub fn new() -> Self {
         Map {
-            inner: BTreeMap::new(),
+            variables: Arc::new(RwLock::new(BTreeMap::new())),
+            structure: None,
         }
     }
 
-    pub fn with_values(variables: BTreeMap<Identifier, Value>) -> Self {
+    pub fn from_structure(structure: Structure) -> Self {
-        Map { inner: variables }
+        let mut variables = BTreeMap::new();
+
+        for (key, (value_option, r#type)) in structure.inner() {
+            variables.insert(
+                key.clone(),
+                (
+                    value_option.clone().unwrap_or(Value::none()),
+                    r#type.clone(),
+                ),
+            );
         }
 
-    pub fn inner(&self) -> &BTreeMap<Identifier, Value> {
+        Map {
-        &self.inner
+            variables: Arc::new(RwLock::new(variables)),
+            structure: Some(structure),
+        }
     }
 
-    pub fn get(&self, key: &Identifier) -> Option<&Value> {
+    pub fn with_variables(variables: BTreeMap<String, (Value, Type)>) -> Self {
-        self.inner.get(key)
+        Map {
+            variables: Arc::new(RwLock::new(variables)),
+            structure: None,
+        }
     }
 
-    pub fn set(&mut self, key: Identifier, value: Value) {
+    pub fn clone_from(other: &Self) -> Result<Self> {
-        self.inner.insert(key, value);
+        let mut new_map = BTreeMap::new();
+
+        for (key, (value, r#type)) in other.variables()?.iter() {
+            new_map.insert(key.clone(), (value.clone(), r#type.clone()));
         }
 
-    pub fn as_text_table(&self) -> Table {
+        Ok(Map {
-        let mut table = Table::with_styles(Styles::default().with(HAlign::Centred));
+            variables: Arc::new(RwLock::new(new_map)),
-
+            structure: other.structure.clone(),
-        for (key, value) in &self.inner {
+        })
-            if let Value::Map(map) = value {
-                table.push_row(Row::new(
-                    Styles::default(),
-                    vec![
-                        key.into(),
-                        map.as_text_table().into(),
-                        "".to_string().into(),
-                    ],
-                ));
-            } else if let Value::List(list) = value {
-                table.push_row(Row::new(
-                    Styles::default(),
-                    vec![key.into(), list.as_text_table().into()],
-                ));
-            } else {
-                table.push_row([key.to_string(), value.to_string()]);
-            };
     }
 
-        if table.is_empty() {
+    pub fn variables(&self) -> Result<RwLockReadGuard<BTreeMap<String, (Value, Type)>>> {
-            table.push_row(vec!["", "empty map", ""])
+        Ok(self.variables.read()?)
     }
 
-        table
+    pub fn set(&self, key: String, value: Value) -> Result<Option<(Value, Type)>> {
+        log::info!("Setting variable {key} = {value}");
+
+        let value_type = value.r#type();
+        let previous = self
+            .variables
+            .write()?
+            .insert(key, (value, value_type.clone()));
+
+        Ok(previous)
+    }
+
+    pub fn set_type(&self, key: String, r#type: Type) -> Result<Option<(Value, Type)>> {
+        log::info!("Setting type {key} = {}", r#type);
+
+        let previous = self.variables.write()?.insert(key, (Value::none(), r#type));
+
+        Ok(previous)
     }
 }
 
@@ -81,10 +102,101 @@ impl Default for Map {
     }
 }
 
+impl Eq for Map {}
+
+impl PartialEq for Map {
+    fn eq(&self, other: &Self) -> bool {
+        let left = self.variables.read().unwrap().clone().into_iter();
+        let right = other.variables.read().unwrap().clone().into_iter();
+
+        left.eq(right)
+    }
+}
+
+impl Ord for Map {
+    fn cmp(&self, other: &Self) -> Ordering {
+        let left = self.variables.read().unwrap().clone().into_iter();
+        let right = other.variables.read().unwrap().clone().into_iter();
+
+        left.cmp(right)
+    }
+}
+
+impl PartialOrd for Map {
+    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
+        Some(self.cmp(other))
+    }
+}
+
 impl Display for Map {
     fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
-        let renderer = Console::default();
+        writeln!(f, "{{")?;
 
-        f.write_str(&renderer.render(&self.as_text_table()))
+        let variables = self.variables.read().unwrap().clone().into_iter();
+
+        for (key, (value, value_type)) in variables {
+            writeln!(f, "    {key} <{value_type}> = {value}")?;
+        }
+        write!(f, "}}")
+    }
+}
+
+impl Serialize for Map {
+    fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        let variables = self.variables.read().unwrap();
+        let mut map = serializer.serialize_map(Some(variables.len()))?;
+
+        for (key, (value, _type)) in variables.iter() {
+            map.serialize_entry(key, value)?;
+        }
+
+        map.end()
+    }
+}
+
+struct MapVisitor {
+    marker: PhantomData<fn() -> Map>,
+}
+
+impl MapVisitor {
+    fn new() -> Self {
+        MapVisitor {
+            marker: PhantomData,
+        }
+    }
+}
+
+impl<'de> Visitor<'de> for MapVisitor {
+    type Value = Map;
+
+    fn expecting(&self, formatter: &mut Formatter) -> fmt::Result {
+        formatter.write_str("Any valid whale data.")
+    }
+
+    fn visit_map<M>(self, mut access: M) -> std::result::Result<Map, M::Error>
+    where
+        M: MapAccess<'de>,
+    {
+        let map = Map::new();
+
+        {
+            while let Some((key, value)) = access.next_entry::<String, Value>()? {
+                map.set(key, value).unwrap();
+            }
+        }
+
+        Ok(map)
+    }
+}
+
+impl<'de> Deserialize<'de> for Map {
+    fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        deserializer.deserialize_any(MapVisitor::new())
     }
 }

src/value/mod.rs

@@ -1,35 +1,34 @@
 //! Types that represent runtime values.
 use crate::{
-    built_in_values::BuiltInValue,
+    error::{Error, Result},
-    error::{rw_lock_error::RwLockError, RuntimeError, ValidationError},
+    Identifier, Type, TypeSpecification,
-    Identifier, SourcePosition, Type,
 };
 
 use serde::{
     de::{MapAccess, SeqAccess, Visitor},
-    ser::{SerializeMap, SerializeTuple},
+    ser::SerializeTuple,
     Deserialize, Serialize, Serializer,
 };
 
 use std::{
     cmp::Ordering,
-    collections::BTreeMap,
     convert::TryFrom,
     fmt::{self, Display, Formatter},
     marker::PhantomData,
-    ops::RangeInclusive,
+    ops::{Add, AddAssign, Div, Mul, Rem, Sub, SubAssign},
 };
 
 pub use self::{
-    enum_instance::EnumInstance, function::Function, list::List, map::Map,
+    function::Function, list::List, map::Map, range::Range, structure::Structure,
-    struct_instance::StructInstance,
+    type_definition::TypeDefintion,
 };
 
-pub mod enum_instance;
 pub mod function;
 pub mod list;
 pub mod map;
-pub mod struct_instance;
+pub mod range;
+pub mod structure;
+pub mod type_definition;
 
 /// Dust value representation.
 ///
@@ -38,87 +37,95 @@ pub mod struct_instance;
 /// value that can be treated as any other.
 #[derive(Debug, Clone)]
 pub enum Value {
-    Boolean(bool),
-    Enum(EnumInstance),
-    Float(f64),
-    Function(Function),
-    Integer(i64),
     List(List),
     Map(Map),
-    Range(RangeInclusive<i64>),
+    Function(Function),
     String(String),
-    Struct(StructInstance),
+    Float(f64),
+    Integer(i64),
+    Boolean(bool),
+    Range(Range),
+    Option(Option<Box<Value>>),
+    TypeDefinition(TypeDefintion),
+}
+
+impl Default for Value {
+    fn default() -> Self {
+        Value::none()
+    }
 }
 
 impl Value {
-    pub fn none() -> Self {
-        BuiltInValue::None.get().clone()
-    }
-
-    pub fn some(value: Value) -> Value {
-        Value::Enum(EnumInstance::new(
-            Identifier::new("Option"),
-            Identifier::new("Some"),
-            Some(value),
-        ))
-    }
-
     pub fn string<T: Into<String>>(string: T) -> Self {
         Value::String(string.into())
     }
 
     pub fn range(start: i64, end: i64) -> Self {
-        Value::Range(start..=end)
+        Value::Range(Range { start, end })
     }
 
-    pub fn r#type(&self) -> Result<Type, RwLockError> {
+    pub fn r#type(&self) -> Type {
-        let r#type = match self {
+        match self {
             Value::List(list) => {
-                let mut item_types = Vec::new();
+                let mut previous_type = None;
 
-                for value in list.items()?.iter() {
+                for value in list.items().iter() {
-                    let r#type = value.r#type()?;
+                    let value_type = value.r#type();
 
-                    item_types.push(r#type);
+                    if let Some(previous) = &previous_type {
+                        if &value_type != previous {
+                            return Type::List(Box::new(Type::Any));
+                        }
                     }
 
-                Type::ListExact(item_types)
+                    previous_type = Some(value_type);
+                }
+
+                if let Some(previous) = previous_type {
+                    Type::List(Box::new(previous))
+                } else {
+                    Type::List(Box::new(Type::Any))
+                }
             }
             Value::Map(map) => {
-                if map.inner().is_empty() {
+                let mut identifier_types = Vec::new();
+
+                for (key, (value, _)) in map.variables().unwrap().iter() {
+                    identifier_types.push((
+                        Identifier::new(key.clone()),
+                        TypeSpecification::new(value.r#type()),
+                    ));
+                }
+
                 Type::Map(None)
-                } else {
-                    let mut type_map = BTreeMap::new();
-
-                    for (identifier, value) in map.inner() {
-                        type_map.insert(identifier.clone(), value.r#type()?);
-                    }
-
-                    Type::Map(Some(type_map))
-                }
             }
             Value::Function(function) => function.r#type().clone(),
             Value::String(_) => Type::String,
             Value::Float(_) => Type::Float,
             Value::Integer(_) => Type::Integer,
             Value::Boolean(_) => Type::Boolean,
-            Value::Range(_) => todo!(),
+            Value::Option(option) => {
-            Value::Struct(_) => todo!(),
+                if let Some(value) = option {
-            Value::Enum(enum_instance) => {
+                    Type::Option(Box::new(value.r#type()))
-                let arguments = if let Some(value) = enum_instance.value() {
-                    vec![value.r#type()?]
                 } else {
-                    Vec::with_capacity(0)
+                    Type::None
-                };
+                }
-
+            }
-                Type::Custom {
+            Value::TypeDefinition(_) => todo!(),
-                    name: enum_instance.name().clone(),
+            Value::Range(_) => todo!(),
-                    arguments,
         }
     }
-        };
 
-        Ok(r#type)
+    pub fn none() -> Self {
+        Value::Option(None)
+    }
+
+    pub fn some(value: Value) -> Self {
+        Value::Option(Some(Box::new(value)))
+    }
+
+    pub fn option(option: Option<Value>) -> Self {
+        Value::Option(option.map(Box::new))
     }
 
     pub fn is_string(&self) -> bool {
@@ -145,6 +152,14 @@ impl Value {
         matches!(self, Value::List(_))
     }
 
+    pub fn is_option(&self) -> bool {
+        matches!(self, Value::Option(_))
+    }
+
+    pub fn is_none(&self) -> bool {
+        matches!(self, Value::Option(None))
+    }
+
     pub fn is_map(&self) -> bool {
         matches!(self, Value::Map(_))
     }
@@ -153,97 +168,83 @@ impl Value {
         matches!(self, Value::Function(_))
     }
 
-    pub fn is_none(&self) -> bool {
+    /// Borrows the value stored in `self` as `&String`, or returns `Err` if `self` is not a `Value::String`.
-        self == &Value::none()
+    pub fn as_string(&self) -> Result<&String> {
-    }
-
-    /// Borrows the value stored in `self` as `&String`, or returns `Err` if
-    /// `self` is not a `Value::String`.
-    pub fn as_string(&self) -> Result<&String, ValidationError> {
         match self {
             Value::String(string) => Ok(string),
-            value => Err(ValidationError::ExpectedString {
+            value => Err(Error::ExpectedString {
                 actual: value.clone(),
             }),
         }
     }
 
-    /// Copies the value stored in `self` as `i64`, or returns `Err` if `self`
+    /// Copies the value stored in `self` as `i64`, or returns `Err` if `self` is not a `Value::Int`
-    /// is not a `Value::Int`
+    pub fn as_integer(&self) -> Result<i64> {
-    pub fn as_integer(&self) -> Result<i64, ValidationError> {
         match self {
             Value::Integer(i) => Ok(*i),
-            value => Err(ValidationError::ExpectedInteger {
+            value => Err(Error::ExpectedInteger {
                 actual: value.clone(),
             }),
         }
     }
 
-    /// Copies the value stored in  `self` as `f64`, or returns `Err` if `self`
+    /// Copies the value stored in  `self` as `f64`, or returns `Err` if `self` is not a `Primitive::Float`.
-    /// is not a `Primitive::Float`.
+    pub fn as_float(&self) -> Result<f64> {
-    pub fn as_float(&self) -> Result<f64, ValidationError> {
         match self {
             Value::Float(f) => Ok(*f),
-            value => Err(ValidationError::ExpectedFloat {
+            value => Err(Error::ExpectedFloat {
                 actual: value.clone(),
             }),
         }
     }
 
-    /// Copies the value stored in  `self` as `f64`, or returns `Err` if `self`
+    /// Copies the value stored in  `self` as `f64`, or returns `Err` if `self` is not a `Primitive::Float` or `Value::Int`.
-    /// is not a `Primitive::Float` or `Value::Int`.
+    /// Note that this method silently converts `i64` to `f64`, if `self` is a `Value::Int`.
-    ///
+    pub fn as_number(&self) -> Result<f64> {
-    /// Note that this method silently converts `i64` to `f64`, if `self` is
-    /// a `Value::Int`.
-    pub fn as_number(&self) -> Result<f64, ValidationError> {
         match self {
             Value::Float(f) => Ok(*f),
             Value::Integer(i) => Ok(*i as f64),
-            value => Err(ValidationError::ExpectedNumber {
+            value => Err(Error::ExpectedNumber {
                 actual: value.clone(),
             }),
         }
     }
 
-    /// Copies the value stored in  `self` as `bool`, or returns `Err` if `self`
+    /// Copies the value stored in  `self` as `bool`, or returns `Err` if `self` is not a `Primitive::Boolean`.
-    /// is not a `Primitive::Boolean`.
+    pub fn as_boolean(&self) -> Result<bool> {
-    pub fn as_boolean(&self) -> Result<bool, ValidationError> {
         match self {
             Value::Boolean(boolean) => Ok(*boolean),
-            value => Err(ValidationError::ExpectedBoolean {
+            value => Err(Error::ExpectedBoolean {
                 actual: value.clone(),
             }),
         }
     }
 
-    /// Borrows the value stored in `self` as `Vec<Value>`, or returns `Err` if
+    /// Borrows the value stored in `self` as `Vec<Value>`, or returns `Err` if `self` is not a `Value::List`.
-    /// `self` is not a `Value::List`.
+    pub fn as_list(&self) -> Result<&List> {
-    pub fn as_list(&self) -> Result<&List, ValidationError> {
         match self {
             Value::List(list) => Ok(list),
-            value => Err(ValidationError::ExpectedList {
+            value => Err(Error::ExpectedList {
                 actual: value.clone(),
             }),
         }
     }
 
-    /// Takes ownership of the value stored in `self` as `Vec<Value>`, or
+    /// Takes ownership of the value stored in `self` as `Vec<Value>`, or returns `Err` if `self` is not a `Value::List`.
-    /// returns `Err` if `self` is not a `Value::List`.
+    pub fn into_inner_list(self) -> Result<List> {
-    pub fn into_inner_list(self) -> Result<List, ValidationError> {
         match self {
             Value::List(list) => Ok(list),
-            value => Err(ValidationError::ExpectedList {
+            value => Err(Error::ExpectedList {
                 actual: value.clone(),
             }),
         }
     }
 
-    /// Borrows the value stored in `self` as `Vec<Value>`, or returns `Err` if
+    /// Borrows the value stored in `self` as `Vec<Value>`, or returns `Err` if `self` is not a `Value::Map`.
-    /// `self` is not a `Value::Map`.
+    pub fn as_map(&self) -> Result<&Map> {
-    pub fn as_map(&self) -> Result<&Map, ValidationError> {
         match self {
             Value::Map(map) => Ok(map),
-            value => Err(ValidationError::ExpectedMap {
+            value => Err(Error::ExpectedMap {
                 actual: value.clone(),
             }),
         }
@@ -251,104 +252,181 @@ impl Value {
 
     /// Borrows the value stored in `self` as `Function`, or returns `Err` if
     /// `self` is not a `Value::Function`.
-    pub fn as_function(&self) -> Result<&Function, ValidationError> {
+    pub fn as_function(&self) -> Result<&Function> {
         match self {
             Value::Function(function) => Ok(function),
-            value => Err(ValidationError::ExpectedFunction {
+            value => Err(Error::ExpectedFunction {
                 actual: value.clone(),
             }),
         }
     }
 
-    /// Return the sum of `self` and `other`.
+    /// Returns `Option`, or returns `Err` if `self` is not a `Value::Option`.
-    pub fn add(self, other: Self, position: SourcePosition) -> Result<Value, ValidationError> {
+    pub fn as_option(&self) -> Result<&Option<Box<Value>>> {
-        match (self, other) {
+        match self {
-            (Value::Float(left), Value::Float(right)) => Ok(Value::Float(left + right)),
+            Value::Option(option) => Ok(option),
-            (Value::Float(left), Value::Integer(right)) => Ok(Value::Float(left + right as f64)),
+            value => Err(Error::ExpectedOption {
-            (Value::Integer(left), Value::Float(right)) => Ok(Value::Float((left as f64) + right)),
+                actual: value.clone(),
-            (Value::Integer(left), Value::Integer(right)) => {
-                Ok(Value::Integer(left.saturating_add(right)))
-            }
-            (Value::List(list), value) | (value, Value::List(list)) => {
-                list.items_mut()?.push(value);
-
-                Ok(Value::List(list))
-            }
-            (Value::String(left), Value::String(right)) => Ok(Value::String(left + &right)),
-            (left, right) => Err(ValidationError::CannotAdd {
-                left,
-                right,
-                position,
             }),
         }
     }
 
-    /// Return the difference of `self` and `other`.
+    /// Returns `()`, or returns `Err` if `self` is not a `Value::none()`.
-    pub fn subtract(self, other: Self, position: SourcePosition) -> Result<Value, ValidationError> {
+    pub fn as_none(&self) -> Result<()> {
-        match (self, other) {
+        match self {
-            (Value::Float(left), Value::Float(right)) => Ok(Value::Float(left - right)),
+            Value::Option(option) => {
-            (Value::Float(left), Value::Integer(right)) => Ok(Value::Float(left - right as f64)),
+                if option.is_none() {
-            (Value::Integer(left), Value::Float(right)) => Ok(Value::Float(left as f64 - right)),
+                    Ok(())
-            (Value::Integer(left), Value::Integer(right)) => {
+                } else {
-                Ok(Value::Integer(left.saturating_sub(right)))
+                    Err(Error::ExpectedNone {
-            }
+                        actual: self.clone(),
-            (left, right) => Err(ValidationError::CannotSubtract {
+                    })
-                left,
-                right,
-                position,
-            }),
                 }
             }
-
+            value => Err(Error::ExpectedNone {
-    /// Return the product of `self` and `other`.
+                actual: value.clone(),
-    pub fn multiply(self, other: Self, position: SourcePosition) -> Result<Value, ValidationError> {
-        match (self, other) {
-            (Value::Float(left), Value::Float(right)) => Ok(Value::Float(left * right)),
-            (Value::Float(left), Value::Integer(right)) => Ok(Value::Float(left * right as f64)),
-            (Value::Integer(left), Value::Float(right)) => Ok(Value::Float(left as f64 * right)),
-            (Value::Integer(left), Value::Integer(right)) => Ok(Value::Integer(left * right)),
-            (left, right) => Err(ValidationError::CannotMultiply {
-                left,
-                right,
-                position,
-            }),
-        }
-    }
-
-    /// Return the quotient of `self` and `other`.
-    pub fn divide(self, other: Self, position: SourcePosition) -> Result<Value, ValidationError> {
-        match (self, other) {
-            (Value::Float(left), Value::Float(right)) => Ok(Value::Float(left / right)),
-            (Value::Float(left), Value::Integer(right)) => Ok(Value::Float(left / right as f64)),
-            (Value::Integer(left), Value::Float(right)) => Ok(Value::Float(left as f64 / right)),
-            (Value::Integer(left), Value::Integer(right)) => Ok(Value::Integer(left / right)),
-            (left, right) => Err(ValidationError::CannotDivide {
-                left,
-                right,
-                position,
-            }),
-        }
-    }
-
-    /// Return the remainder after diving `self` and `other`.
-    pub fn modulo(self, other: Self, position: SourcePosition) -> Result<Value, ValidationError> {
-        match (self, other) {
-            (Value::Float(left), Value::Float(right)) => Ok(Value::Float(left % right)),
-            (Value::Float(left), Value::Integer(right)) => Ok(Value::Float(left % right as f64)),
-            (Value::Integer(left), Value::Float(right)) => Ok(Value::Float(left as f64 % right)),
-            (Value::Integer(left), Value::Integer(right)) => Ok(Value::Integer(left % right)),
-            (left, right) => Err(ValidationError::CannotDivide {
-                left,
-                right,
-                position,
             }),
         }
     }
 }
 
-impl Default for Value {
+impl Default for &Value {
     fn default() -> Self {
-        Value::none()
+        &Value::Option(None)
+    }
+}
+
+impl Add for Value {
+    type Output = Result<Value>;
+
+    fn add(self, other: Self) -> Self::Output {
+        if let (Ok(left), Ok(right)) = (self.as_integer(), other.as_integer()) {
+            return Ok(Value::Integer(left + right));
+        }
+
+        if let (Ok(left), Ok(right)) = (self.as_number(), other.as_number()) {
+            return Ok(Value::Float(left + right));
+        }
+
+        if let (Ok(left), Ok(right)) = (self.as_string(), other.as_string()) {
+            return Ok(Value::string(left.to_string() + right.as_str()));
+        }
+
+        if self.is_string() || other.is_string() {
+            return Ok(Value::string(self.to_string() + &other.to_string()));
+        }
+
+        let non_number_or_string = if !self.is_number() == !self.is_string() {
+            self
+        } else {
+            other
+        };
+
+        Err(Error::ExpectedNumberOrString {
+            actual: non_number_or_string,
+        })
+    }
+}
+
+impl Sub for Value {
+    type Output = Result<Self>;
+
+    fn sub(self, other: Self) -> Self::Output {
+        if let (Ok(left), Ok(right)) = (self.as_integer(), other.as_integer()) {
+            return Ok(Value::Integer(left - right));
+        }
+
+        if let (Ok(left), Ok(right)) = (self.as_number(), other.as_number()) {
+            return Ok(Value::Float(left - right));
+        }
+
+        let non_number = if !self.is_number() { self } else { other };
+
+        Err(Error::ExpectedNumber { actual: non_number })
+    }
+}
+
+impl Mul for Value {
+    type Output = Result<Self>;
+
+    fn mul(self, other: Self) -> Self::Output {
+        if let (Ok(left), Ok(right)) = (self.as_integer(), other.as_integer()) {
+            Ok(Value::Integer(left.saturating_mul(right)))
+        } else if let (Ok(left), Ok(right)) = (self.as_number(), other.as_number()) {
+            Ok(Value::Float(left * right))
+        } else {
+            let non_number = if !self.is_number() { self } else { other };
+
+            Err(Error::ExpectedNumber { actual: non_number })
+        }
+    }
+}
+
+impl Div for Value {
+    type Output = Result<Self>;
+
+    fn div(self, other: Self) -> Self::Output {
+        if let (Ok(left), Ok(right)) = (self.as_number(), other.as_number()) {
+            let divided = left / right;
+            let is_even = divided % 2.0 == 0.0;
+
+            if self.is_integer() && other.is_integer() && is_even {
+                Ok(Value::Integer(divided as i64))
+            } else {
+                Ok(Value::Float(divided))
+            }
+        } else {
+            let non_number = if !self.is_number() { self } else { other };
+
+            Err(Error::ExpectedNumber { actual: non_number })
+        }
+    }
+}
+
+impl Rem for Value {
+    type Output = Result<Self>;
+
+    fn rem(self, other: Self) -> Self::Output {
+        let left = self.as_integer()?;
+        let right = other.as_integer()?;
+        let result = left % right;
+
+        Ok(Value::Integer(result))
+    }
+}
+
+impl AddAssign for Value {
+    fn add_assign(&mut self, other: Self) {
+        match (self, other) {
+            (Value::Integer(left), Value::Integer(right)) => *left += right,
+            (Value::Float(left), Value::Float(right)) => *left += right,
+            (Value::Float(left), Value::Integer(right)) => *left += right as f64,
+            (Value::String(left), Value::String(right)) => *left += &right,
+            (Value::List(list), value) => list.items_mut().push(value),
+            _ => {}
+        }
+    }
+}
+
+impl SubAssign for Value {
+    fn sub_assign(&mut self, other: Self) {
+        match (self, other) {
+            (Value::Integer(left), Value::Integer(right)) => *left -= right,
+            (Value::Float(left), Value::Float(right)) => *left -= right,
+            (Value::Float(left), Value::Integer(right)) => *left -= right as f64,
+            (Value::List(list), value) => {
+                let index_to_remove = list
+                    .items()
+                    .iter()
+                    .enumerate()
+                    .find_map(|(i, list_value)| if list_value == &value { Some(i) } else { None });
+
+                if let Some(index) = index_to_remove {
+                    list.items_mut().remove(index);
+                }
+            }
+            _ => {}
+        }
     }
 }
 
@@ -364,9 +442,9 @@ impl PartialEq for Value {
             (Value::List(left), Value::List(right)) => left == right,
             (Value::Map(left), Value::Map(right)) => left == right,
             (Value::Function(left), Value::Function(right)) => left == right,
+            (Value::Option(left), Value::Option(right)) => left == right,
+            (Value::TypeDefinition(left), Value::TypeDefinition(right)) => left == right,
             (Value::Range(left), Value::Range(right)) => left == right,
-            (Value::Struct(left), Value::Struct(right)) => left == right,
-            (Value::Enum(left), Value::Enum(right)) => left == right,
             _ => false,
         }
     }
@@ -403,17 +481,12 @@ impl Ord for Value {
             (Value::Map(_), _) => Ordering::Greater,
             (Value::Function(left), Value::Function(right)) => left.cmp(right),
             (Value::Function(_), _) => Ordering::Greater,
-            (Value::Struct(left), Value::Struct(right)) => left.cmp(right),
+            (Value::TypeDefinition(left), Value::TypeDefinition(right)) => left.cmp(right),
-            (Value::Struct(_), _) => Ordering::Greater,
+            (Value::TypeDefinition(_), _) => Ordering::Greater,
-            (Value::Enum(left), Value::Enum(right)) => left.cmp(right),
+            (Value::Range(left), Value::Range(right)) => left.cmp(right),
-            (Value::Enum(_), _) => Ordering::Greater,
+            (Value::Range(_), _) => Ordering::Greater,
-            (Value::Range(left), Value::Range(right)) => {
+            (Value::Option(left), Value::Option(right)) => left.cmp(right),
-                let left_len = left.end() - left.start();
+            (Value::Option(_), _) => Ordering::Less,
-                let right_len = right.end() - right.start();
-
-                left_len.cmp(&right_len)
-            }
-            (Value::Range(_), _) => Ordering::Less,
         }
     }
 }
@@ -429,12 +502,7 @@ impl Serialize for Value {
             Value::Integer(inner) => serializer.serialize_i64(*inner),
             Value::Boolean(inner) => serializer.serialize_bool(*inner),
             Value::List(inner) => {
-                let items = if let Ok(items) = inner.items() {
+                let items = inner.items();
-                    items
-                } else {
-                    return Err(serde::ser::Error::custom("failed to obtain a read lock"));
-                };
-
                 let mut list = serializer.serialize_tuple(items.len())?;
 
                 for value in items.iter() {
@@ -443,20 +511,11 @@ impl Serialize for Value {
 
                 list.end()
             }
-            Value::Map(map) => {
+            Value::Option(inner) => inner.serialize(serializer),
-                let entries = map.inner();
+            Value::Map(inner) => inner.serialize(serializer),
-                let mut map = serializer.serialize_map(Some(entries.len()))?;
-
-                for (key, value) in entries.iter() {
-                    map.serialize_entry(key, value)?;
-                }
-
-                map.end()
-            }
             Value::Function(inner) => inner.serialize(serializer),
-            Value::Struct(inner) => inner.serialize(serializer),
+            Value::TypeDefinition(inner) => inner.serialize(serializer),
             Value::Range(range) => range.serialize(serializer),
-            Value::Enum(_) => todo!(),
         }
     }
 }
@@ -468,12 +527,18 @@ impl Display for Value {
             Value::Float(float) => write!(f, "{float}"),
             Value::Integer(int) => write!(f, "{int}"),
             Value::Boolean(boolean) => write!(f, "{boolean}"),
+            Value::Option(option) => {
+                if let Some(value) = option {
+                    write!(f, "some({})", value)
+                } else {
+                    write!(f, "none")
+                }
+            }
             Value::List(list) => write!(f, "{list}"),
             Value::Map(map) => write!(f, "{map}"),
             Value::Function(function) => write!(f, "{function}"),
-            Value::Struct(structure) => write!(f, "{structure}"),
+            Value::TypeDefinition(structure) => write!(f, "{structure}"),
-            Value::Range(range) => write!(f, "{}..{}", range.start(), range.end()),
+            Value::Range(range) => write!(f, "{range}"),
-            Value::Enum(enum_instance) => write!(f, "{enum_instance}"),
         }
     }
 }
@@ -514,7 +579,7 @@ impl From<Vec<Value>> for Value {
     }
 }
 
-impl From<Value> for Result<Value, RuntimeError> {
+impl From<Value> for Result<Value> {
     fn from(value: Value) -> Self {
         Ok(value)
     }
@@ -527,57 +592,49 @@ impl From<()> for Value {
 }
 
 impl TryFrom<Value> for String {
-    type Error = RuntimeError;
+    type Error = Error;
 
     fn try_from(value: Value) -> std::result::Result<Self, Self::Error> {
         if let Value::String(string) = value {
             Ok(string)
         } else {
-            Err(RuntimeError::ValidationFailure(
+            Err(Error::ExpectedString { actual: value })
-                ValidationError::ExpectedString { actual: value },
-            ))
         }
     }
 }
 
 impl TryFrom<Value> for f64 {
-    type Error = RuntimeError;
+    type Error = Error;
 
     fn try_from(value: Value) -> std::result::Result<Self, Self::Error> {
         if let Value::Float(value) = value {
             Ok(value)
         } else {
-            Err(RuntimeError::ValidationFailure(
+            Err(Error::ExpectedFloat { actual: value })
-                ValidationError::ExpectedFloat { actual: value },
-            ))
         }
     }
 }
 
 impl TryFrom<Value> for i64 {
-    type Error = RuntimeError;
+    type Error = Error;
 
     fn try_from(value: Value) -> std::result::Result<Self, Self::Error> {
         if let Value::Integer(value) = value {
             Ok(value)
         } else {
-            Err(RuntimeError::ValidationFailure(
+            Err(Error::ExpectedInteger { actual: value })
-                ValidationError::ExpectedInteger { actual: value },
-            ))
         }
     }
 }
 
 impl TryFrom<Value> for bool {
-    type Error = RuntimeError;
+    type Error = Error;
 
     fn try_from(value: Value) -> std::result::Result<Self, Self::Error> {
         if let Value::Boolean(value) = value {
             Ok(value)
         } else {
-            Err(RuntimeError::ValidationFailure(
+            Err(Error::ExpectedBoolean { actual: value })
-                ValidationError::ExpectedBoolean { actual: value },
-            ))
         }
     }
 }
@@ -760,7 +817,9 @@ impl<'de> Visitor<'de> for ValueVisitor {
     where
         D: serde::Deserializer<'de>,
     {
-        Ok(Value::Enum(EnumInstance::deserialize(deserializer)?))
+        Ok(Value::Option(Some(Box::new(Value::deserialize(
+            deserializer,
+        )?))))
     }
 
     fn visit_unit<E>(self) -> std::result::Result<Self::Value, E>
@@ -798,12 +857,10 @@ impl<'de> Visitor<'de> for ValueVisitor {
     where
         M: MapAccess<'de>,
     {
-        let mut map = Map::new();
+        let map = Map::new();
 
         while let Some((key, value)) = access.next_entry::<String, Value>()? {
-            let identifier = Identifier::new(&key);
+            map.set(key, value).unwrap();
-
-            map.set(identifier, value);
         }
 
         Ok(Value::Map(map))

src/value/range.rs

@@ -0,0 +1,15 @@
+use std::fmt::{self, Display, Formatter};
+
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize)]
+pub struct Range {
+    pub start: i64,
+    pub end: i64,
+}
+
+impl Display for Range {
+    fn fmt(&self, f: &mut Formatter) -> fmt::Result {
+        write!(f, "{}..{}", self.start, self.end)
+    }
+}

src/value/struct_instance.rs

@@ -1,45 +0,0 @@
-use std::fmt::{self, Display, Formatter};
-
-use serde::{ser::SerializeMap, Serialize, Serializer};
-
-use crate::{Identifier, Map};
-
-#[derive(Clone, Debug, Eq, PartialEq, PartialOrd, Ord)]
-pub struct StructInstance {
-    name: Identifier,
-    map: Map,
-}
-
-impl StructInstance {
-    pub fn new(name: Identifier, map: Map) -> Self {
-        StructInstance { name, map }
-    }
-}
-
-impl Display for StructInstance {
-    fn fmt(&self, f: &mut Formatter) -> fmt::Result {
-        writeln!(f, "{{")?;
-
-        for (key, value) in self.map.inner() {
-            writeln!(f, "  {key} <{}> = {value}", value.r#type().unwrap())?;
-        }
-
-        write!(f, "}}")
-    }
-}
-
-impl Serialize for StructInstance {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        let map = self.map.inner();
-        let mut serde_map = serializer.serialize_map(Some(map.len()))?;
-
-        for (key, value) in map.iter() {
-            serde_map.serialize_entry(key, value)?;
-        }
-
-        serde_map.end()
-    }
-}

src/value/structure.rs

@@ -0,0 +1,37 @@
+use std::{
+    collections::BTreeMap,
+    fmt::{self, Display, Formatter},
+    sync::Arc,
+};
+
+use serde::{Deserialize, Serialize};
+
+use crate::{Type, Value};
+
+#[derive(Clone, Debug, Eq, PartialEq, PartialOrd, Ord, Serialize, Deserialize)]
+pub struct Structure(Arc<BTreeMap<String, (Option<Value>, Type)>>);
+
+impl Structure {
+    pub fn new(map: BTreeMap<String, (Option<Value>, Type)>) -> Self {
+        Structure(Arc::new(map))
+    }
+
+    pub fn inner(&self) -> &BTreeMap<String, (Option<Value>, Type)> {
+        &self.0
+    }
+}
+
+impl Display for Structure {
+    fn fmt(&self, f: &mut Formatter) -> fmt::Result {
+        writeln!(f, "{{")?;
+
+        for (key, (value_option, r#type)) in self.0.as_ref() {
+            if let Some(value) = value_option {
+                writeln!(f, "  {key} <{}> = {value}", r#type)?;
+            } else {
+                writeln!(f, "  {key} <{}>", r#type)?;
+            }
+        }
+        write!(f, "}}")
+    }
+}

src/value/type_definition.rs

@@ -0,0 +1,18 @@
+use std::fmt::{self, Display, Formatter};
+
+use serde::{Deserialize, Serialize};
+
+use crate::Structure;
+
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize)]
+pub enum TypeDefintion {
+    Structure(Structure),
+}
+
+impl Display for TypeDefintion {
+    fn fmt(&self, f: &mut Formatter) -> fmt::Result {
+        match self {
+            TypeDefintion::Structure(structure) => write!(f, "{structure}"),
+        }
+    }
+}

tests/as.rs

@@ -1,53 +0,0 @@
-use dust_lang::{
-    error::{RuntimeError, ValidationError},
-    *,
-};
-
-#[test]
-fn string_as_string_list() {
-    assert_eq!(
-        interpret("'foobar' as [str]"),
-        Ok(Value::List(List::with_items(vec![
-            Value::String("f".to_string()),
-            Value::String("o".to_string()),
-            Value::String("o".to_string()),
-            Value::String("b".to_string()),
-            Value::String("a".to_string()),
-            Value::String("r".to_string()),
-        ])))
-    )
-}
-
-#[test]
-fn string_as_list_error() {
-    assert_eq!(
-        interpret("'foobar' as [float]"),
-        Err(Error::Validation(ValidationError::ConversionImpossible {
-            initial_type: Type::String,
-            target_type: Type::ListOf(Box::new(Type::Float))
-        }))
-    )
-}
-
-const JSON: &str = "{ \"x\": 1 }";
-
-#[test]
-fn conversion_runtime_error() {
-    let json_value = interpret(&format!("json:parse('{JSON}')")).unwrap();
-
-    assert_eq!(
-        interpret(&format!("json:parse('{JSON}') as [map]")),
-        Err(Error::Runtime(RuntimeError::ConversionImpossible {
-            from: json_value.r#type().unwrap(),
-            to: Type::ListOf(Box::new(Type::Map(None))),
-            position: SourcePosition {
-                start_byte: 0,
-                end_byte: 33,
-                start_row: 1,
-                start_column: 0,
-                end_row: 1,
-                end_column: 33,
-            }
-        }))
-    )
-}

tests/assignment.rs

@@ -1,4 +1,4 @@
-use dust_lang::{error::ValidationError, *};
+use dust_lang::*;
 
 #[test]
 fn simple_assignment() {
@@ -39,19 +39,8 @@ fn list_add_wrong_type() {
             ",
     );
 
-    assert_eq!(
+    assert!(result.unwrap_err().is_error(&Error::TypeCheck {
-        Err(Error::Validation(ValidationError::TypeCheck {
         expected: Type::String,
-            actual: Type::Integer,
+        actual: Type::Integer
-            position: SourcePosition {
+    }))
-                start_byte: 40,
-                end_byte: 46,
-                start_row: 3,
-                start_column: 12,
-                end_row: 3,
-                end_column: 18
-            }
-        })),
-        result
-    );
 }

tests/block.rs

@@ -30,3 +30,17 @@ fn async_with_return() {
         Ok(Value::Integer(1))
     );
 }
+
+#[test]
+fn root_returns_like_block() {
+    assert_eq!(
+        interpret(
+            "
+                return 1
+                1 + 1
+                3
+                "
+        ),
+        Ok(Value::Integer(1))
+    );
+}

tests/built_in_string_functions.rs

@@ -1,49 +0,0 @@
-use dust_lang::{interpret, List, Value};
-
-#[test]
-fn as_bytes() {
-    let result = interpret("str:as_bytes('123')");
-
-    assert_eq!(
-        result,
-        Ok(Value::List(List::with_items(vec![
-            Value::Integer(49),
-            Value::Integer(50),
-            Value::Integer(51),
-        ])))
-    );
-}
-
-#[test]
-fn ends_with() {
-    let result = interpret("str:ends_with('abc', 'c')");
-
-    assert_eq!(result, Ok(Value::Boolean(true)));
-
-    let result = interpret("str:ends_with('abc', 'b')");
-
-    assert_eq!(result, Ok(Value::Boolean(false)));
-}
-
-#[test]
-fn find() {
-    let result = interpret("str:find('abc', 'a')");
-
-    assert_eq!(result, Ok(Value::some(Value::Integer(0))));
-
-    let result = interpret("str:find('foobar', 'b')");
-
-    assert_eq!(result, Ok(Value::some(Value::Integer(3))));
-}
-
-#[test]
-fn insert() {
-    assert_eq!(
-        interpret("str:insert('ac', 1, 'b')"),
-        Ok(Value::String("abc".to_string()))
-    );
-    assert_eq!(
-        interpret("str:insert('foo', 3, 'bar')"),
-        Ok(Value::String("foobar".to_string()))
-    );
-}

tests/built_in_type_definitions.rs

@@ -1,71 +0,0 @@
-use dust_lang::*;
-
-#[test]
-fn override_built_ins() {
-    assert_eq!(
-        interpret(
-            "
-            enum Option {
-                Some<str>
-                None
-            }
-            
-            my_option <Option> = Option::Some('foo')
-            my_option
-            "
-        ),
-        Ok(Value::Enum(EnumInstance::new(
-            Identifier::new("Option"),
-            Identifier::new("Some"),
-            Some(Value::String("foo".to_string())),
-        )))
-    );
-}
-
-#[test]
-fn option() {
-    assert_eq!(
-        interpret("Option::None"),
-        Ok(Value::Enum(EnumInstance::new(
-            Identifier::new("Option"),
-            Identifier::new("None"),
-            Some(Value::none()),
-        )))
-    );
-    assert_eq!(
-        interpret(
-            "
-            Option::Some(1)
-            "
-        ),
-        Ok(Value::Enum(EnumInstance::new(
-            Identifier::new("Option"),
-            Identifier::new("Some"),
-            Some(Value::Integer(1)),
-        )))
-    );
-}
-
-#[test]
-fn result() {
-    assert_eq!(
-        interpret("Result::Ok(1)"),
-        Ok(Value::Enum(EnumInstance::new(
-            Identifier::new("Result"),
-            Identifier::new("Ok"),
-            Some(Value::Integer(1)),
-        )))
-    );
-    assert_eq!(
-        interpret(
-            "
-            Result::Error('uh-oh!')
-            "
-        ),
-        Ok(Value::Enum(EnumInstance::new(
-            Identifier::new("Result"),
-            Identifier::new("Error"),
-            Some(Value::String("uh-oh!".to_string())),
-        )))
-    );
-}

tests/built_in_values.rs

@@ -1,31 +1,6 @@
-use dust_lang::{error::RuntimeError, *};
+use dust_lang::*;
 
 #[test]
 fn args() {
     assert!(interpret("args").is_ok_and(|value| value.is_list()));
 }
-
-#[test]
-fn assert_equal() {
-    assert_eq!(
-        interpret("assert_equal"),
-        Ok(Value::Function(Function::BuiltIn(
-            BuiltInFunction::AssertEqual
-        )))
-    );
-    assert_eq!(
-        interpret("assert_equal(false, false)"),
-        Ok(Value::Enum(EnumInstance::new(
-            Identifier::new("Result"),
-            Identifier::new("Ok"),
-            Some(Value::none()),
-        )))
-    );
-    assert_eq!(
-        interpret("assert_equal(true, false)"),
-        Err(Error::Runtime(RuntimeError::AssertEqualFailed {
-            left: true.into(),
-            right: false.into()
-        }))
-    );
-}

tests/commands.rs

@@ -1,14 +0,0 @@
-use dust_lang::{interpret, Value};
-
-#[test]
-fn simple_command() {
-    assert_eq!(interpret("^echo hi"), Ok(Value::String("hi\n".to_string())))
-}
-
-#[test]
-fn assign_command_output() {
-    assert_eq!(
-        interpret("x = ^ls; length(str:lines(x))"),
-        Ok(Value::Integer(11))
-    );
-}

tests/dust_examples.rs

@@ -9,13 +9,6 @@ fn r#async() {
     interpret(&file_contents).unwrap();
 }
 
-#[test]
-fn async_commands() {
-    let file_contents = read_to_string("examples/async_commands.ds").unwrap();
-
-    interpret(&file_contents).unwrap();
-}
-
 #[test]
 #[ignore]
 fn async_download() {
@@ -25,6 +18,7 @@ fn async_download() {
 }
 
 #[test]
+#[ignore]
 fn clue_solver() {
     let file_contents = read_to_string("examples/clue_solver.ds").unwrap();
 
@@ -33,13 +27,14 @@ fn clue_solver() {
 
 #[test]
 #[ignore]
-fn download() {
+fn fetch() {
-    let file_contents = read_to_string("examples/download.ds").unwrap();
+    let file_contents = read_to_string("examples/fetch.ds").unwrap();
 
     interpret(&file_contents).unwrap();
 }
 
 #[test]
+#[ignore]
 fn fibonacci() {
     let file_contents = read_to_string("examples/fibonacci.ds").unwrap();
 
@@ -53,6 +48,13 @@ fn fizzbuzz() {
     interpret(&file_contents).unwrap();
 }
 
+#[test]
+fn for_loop() {
+    let file_contents = read_to_string("examples/for_loop.ds").unwrap();
+
+    interpret(&file_contents).unwrap();
+}
+
 #[test]
 fn hello_world() {
     let file_contents = read_to_string("examples/hello_world.ds").unwrap();
@@ -66,6 +68,28 @@ fn jq_data() {
 
     interpret(&file_contents).unwrap();
 }
+
+#[test]
+fn list() {
+    let file_contents = read_to_string("examples/list.ds").unwrap();
+
+    interpret(&file_contents).unwrap();
+}
+
+#[test]
+fn map() {
+    let file_contents = read_to_string("examples/map.ds").unwrap();
+
+    interpret(&file_contents).unwrap();
+}
+
+#[test]
+fn r#match() {
+    let file_contents = read_to_string("examples/match.ds").unwrap();
+
+    interpret(&file_contents).unwrap();
+}
+
 #[test]
 fn random() {
     let file_contents = read_to_string("examples/random.ds").unwrap();
@@ -79,3 +103,24 @@ fn sea_creatures() {
 
     interpret(&file_contents).unwrap();
 }
+
+#[test]
+fn variables() {
+    let file_contents = read_to_string("examples/variables.ds").unwrap();
+
+    interpret(&file_contents).unwrap();
+}
+
+#[test]
+fn while_loop() {
+    let file_contents = read_to_string("examples/while_loop.ds").unwrap();
+
+    interpret(&file_contents).unwrap();
+}
+
+#[test]
+fn r#yield() {
+    let file_contents = read_to_string("examples/yield.ds").unwrap();
+
+    interpret(&file_contents).unwrap();
+}