CLI error handling

Reviewed-on: #14

.gitea/workflows/build.yml

@@ -4,6 +4,7 @@ name: CI/CD Pipeline
 on:
   push:
     branches: ["master"]
+    tags: ["*.*.*"]
   pull_request:
     branches: ["master"]
 
@@ -57,6 +58,10 @@ jobs:
             slang-builder \
             ./build.sh
 
+      - name: Zip Workshop Folder
+        run: |
+          zip -r release/workshop.zip release/workshop/
+
       # 3. Fix Permissions
       # Docker writes files as root. We need to own them to upload them.
       - name: Fix Permissions
@@ -65,7 +70,36 @@ jobs:
 
       # 4. Upload to GitHub
       - name: Upload Release Artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: StationeersSlang-Release
           path: release/
+
+  release:
+    needs: build
+    runs-on: self-hosted
+    # ONLY run this job if we pushed a tag (e.g., v1.0.1)
+    if: startsWith(github.ref, 'refs/tags/')
+    steps:
+      - uses: actions/checkout@v4
+
+      # We download the artifact from the previous 'build' job
+      - name: Download Build Artifacts
+        uses: actions/download-artifact@v3
+        with:
+          name: StationeersSlang-Release
+          path: ./release-files
+
+      - name: Create Gitea Release
+        uses: https://gitea.com/actions/gitea-release-action@v1
+        with:
+          files: |
+            ./release-files/workshop.zip
+            ./release-files/slang
+            ./release-files/slang.exe
+          name: ${{ github.ref_name }}
+          tag_name: ${{ github.ref_name }}
+          draft: false
+          prerelease: false
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/copilot-instructions.md

@@ -0,0 +1,239 @@
+# Slang Language Compiler - AI Agent Instructions
+
+## Project Overview
+
+**Slang** is a high-level programming language that compiles to IC10 assembly for the game Stationeers. The compiler is a multi-stage Rust system with a C# BepInEx mod integration layer.
+
+**Key Goal:** Reduce manual IC10 assembly writing by providing C-like syntax with automatic register allocation and device abstraction.
+
+## Architecture Overview
+
+### Compilation Pipeline
+
+The compiler follows a strict 4-stage pipeline (in [rust_compiler/libs/compiler/src/v1.rs](rust_compiler/libs/compiler/src/v1.rs)):
+
+1. **Tokenizer** (libs/tokenizer/src/lib.rs) - Lexical analysis using `logos` crate
+
+   - Converts source text into tokens
+   - Tracks line/span information for error reporting
+   - Supports temperature literals (c/f/k suffixes)
+
+2. **Parser** (libs/parser/src/lib.rs) - AST construction
+
+   - Recursive descent parser producing `Expression` tree
+   - Validates syntax, handles device declarations, function definitions
+   - Output: `Expression` enum containing tree nodes
+
+3. **Compiler (v1)** (libs/compiler/src/v1.rs) - Semantic analysis & code generation
+
+   - Variable scope management and register allocation via `VariableManager`
+   - Emits IL instructions to `il::Instructions`
+   - Error types use `lsp_types::Diagnostic` for editor integration
+
+4. **Optimizer** (libs/optimizer/src/lib.rs) - Post-generation optimization
+   - Currently optimizes leaf functions
+   - Optional pass before final output
+
+### Cross-Language Integration
+
+- **Rust Library** (`slang.dll`/`.so`): Core compiler logic via `safer-ffi` C FFI bindings
+- **C# Mod** (`StationeersSlang.dll`): BepInEx plugin integrating with game UI
+- **Generated Headers** (via `generate-headers` binary): Auto-generated C# bindings from Rust
+
+### Key Types & Data Flow
+
+- `Expression` tree (parser) → `v1::Compiler` processes → `il::Instructions` output
+- `InstructionNode` wraps IC10 assembly with optional source span for debugging
+- `VariableManager` tracks scopes, tracks const/device/let distinctions
+- `Operand` enum represents register/literal/device-property values
+
+## Critical Workflows
+
+### Building
+
+```bash
+cd rust_compiler
+# Build for both Linux and Windows targets
+cargo build --release --target=x86_64-unknown-linux-gnu
+cargo build --release --target=x86_64-pc-windows-gnu
+
+# Generate C# FFI headers (requires "headers" feature)
+cargo run --features headers --bin generate-headers
+
+# Full build (run from root)
+./build.sh
+```
+
+### Testing
+
+```bash
+cd rust_compiler
+# Run all tests
+cargo test --package compiler --lib
+
+# Run specific test file
+cargo test --package compiler --lib tuple_literals
+
+# Run single test
+cargo test --package compiler --lib -- test::tuple_literals::test::test_tuple_literal_size_mismatch --exact --nocapture
+```
+
+### Quick Compilation
+
+!IMPORTANT: make sure you use these commands instead of creating temporary files.
+
+```bash
+cd rust_compiler
+# Compile Slang code to IC10 using current compiler changes
+echo 'let x = 5;' | cargo run --bin slang
+# Compile Slang code to IC10 with optimization
+echo 'let x = 5;' | cargo run --bin slang -z
+# Or from file
+cargo run --bin slang -- input.slang -o output.ic10
+# Optimize the output with -z flag
+cargo run --bin slang -- input.slang -o output.ic10 -z
+```
+
+## Codebase Patterns
+
+### Test Structure
+
+Tests follow a macro pattern in [libs/compiler/src/test/mod.rs](rust_compiler/libs/compiler/src/test/mod.rs):
+
+```rust
+#[test]
+fn test_name() -> Result<()> {
+    let output = compile!(debug "slang code here");
+    assert_eq!(
+      output,
+      indoc! {
+         "Expected IC10 output here"
+      }
+      );
+    Ok(())
+}
+```
+
+- `compile!()` macro: full pipeline from source to IC10
+- `compile!(result ...)` for error checking
+- `compile!(debug ...)` for intermediate IR inspection
+- Test files organize by feature: `binary_expression.rs`, `syscall.rs`, `tuple_literals.rs`, etc.
+
+### Error Handling
+
+All stages return custom Error types implementing `From<lsp_types::Diagnostic>`:
+
+- `tokenizer::Error` - Lexical errors
+- `parser::Error<'a>` - Syntax errors
+- `compiler::Error<'a>` - Semantic errors (unknown identifier, type mismatch)
+- Device assignment prevention: `DeviceAssignment` error if reassigning device const
+
+### Variable Scope Management
+
+[variable_manager.rs](rust_compiler/libs/compiler/src/variable_manager.rs) handles:
+
+- Tracking const vs mutable (let) distinction
+- Device declarations as special scope items
+- Function-local scopes with parameter handling
+- Register allocation via `VariableLocation`
+
+### LSP Integration
+
+Error types implement conversion to `lsp_types::Diagnostic` for IDE feedback:
+
+```rust
+impl<'a> From<Error<'a>> for lsp_types::Diagnostic { ... }
+```
+
+This enables real-time error reporting in the Stationeers IC10 Editor mod.
+
+## Project-Specific Conventions
+
+### Tuple Destructuring
+
+The compiler supports tuple returns and multi-assignment:
+
+```rust
+let (x, y) = func();  // TupleDeclarationExpression
+(x, y) = another_func();  // TupleAssignmentExpression
+```
+
+Compiler validates size matching with `TupleSizeMismatch` error.
+
+### Device Property Access
+
+Devices are first-class with property access:
+
+```rust
+device ac = "d0";
+ac.On = true;
+ac.Temperature > 20c;
+```
+
+Parsed as `MemberAccessExpression`, compiled to device I/O syscalls.
+
+### Temperature Literals
+
+Unique language feature - automatic unit conversion at compile time:
+
+```rust
+20c → 293.15k  // Celsius to Kelvin
+68f → 293.15k  // Fahrenheit to Kelvin
+```
+
+Tokenizer produces `Literal::Number(Number(decimal, Some(Unit::Celsius)))`.
+
+### Constants are Immutable
+
+Once declared with `const`, reassignment is a compile error. Device assignment prevention is critical (prevents game logic bugs).
+
+## Integration Points
+
+### C# FFI (`csharp_mod/FfiGlue.cs`)
+
+- Calls Rust compiler via marshaled FFI
+- Passes source code, receives IC10 output
+- Marshals errors as `Diagnostic` objects
+
+### BepInEx Plugin Lifecycle
+
+[csharp_mod/Plugin.cs](csharp_mod/Plugin.cs):
+
+- Harmony patches for IC10 Editor integration
+- Cleanup code for live-reload support (mod destruction)
+- Logger integration for debug output
+
+### CI/Build Target Matrix
+
+- Linux: `x86_64-unknown-linux-gnu`
+- Windows: `x86_64-pc-windows-gnu` (cross-compile from Linux)
+- Both produce dynamic libraries + CLI binary
+
+## Debugging Tips
+
+1. **Print source spans:** `Span` type tracks line/column for error reporting
+2. **IL inspection:** Use `compile!(debug source)` to view intermediate instructions
+3. **Register allocation:** `VariableManager` logs scope changes; check for conflicts
+4. **Syscall validation:** [parser/src/sys_call.rs](rust_compiler/libs/parser/src/sys_call.rs) lists all valid syscalls
+5. **Tokenizer issues:** Check [tokenizer/src/token.rs](rust_compiler/libs/tokenizer/src/token.rs) for supported keywords/symbols
+
+## Key Files for Common Tasks
+
+| Task                 | File                                                                                                                                      |
+| -------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- |
+| Add language feature | [libs/parser/src/lib.rs](rust_compiler/libs/parser/src/lib.rs) + test in [libs/compiler/src/test/](rust_compiler/libs/compiler/src/test/) |
+| Fix codegen bug      | [libs/compiler/src/v1.rs](rust_compiler/libs/compiler/src/v1.rs) (~3500 lines)                                                            |
+| Add syscall          | [libs/parser/src/sys_call.rs](rust_compiler/libs/parser/src/sys_call.rs)                                                                  |
+| Optimize output      | [libs/optimizer/src/lib.rs](rust_compiler/libs/optimizer/src/lib.rs)                                                                      |
+| Mod integration      | [csharp_mod/](csharp_mod/)                                                                                                                |
+| Language docs        | [docs/language-reference.md](docs/language-reference.md)                                                                                  |
+
+## Dependencies to Know
+
+- `logos` - Tokenizer with derive macros
+- `rust_decimal` - Precise decimal arithmetic for temperature conversion
+- `safer-ffi` - Safe C FFI between Rust and C#
+- `lsp-types` - Standard for editor diagnostics
+- `thiserror` - Error type derivation
+- `clap` - CLI argument parsing
+- `anyhow` - Error handling in main binary

.gitignore

@@ -1,5 +1,6 @@
 target
 *.ic10
+*.snap.new
 release
 csharp_mod/bin
 obj

Changelog.md

@@ -1,5 +1,69 @@
 # Changelog
 
+[0.5.1]
+
+- Fixed optimizer bug where `StoreBatch` and `StoreBatchNamed` instructions
+  were not recognized as reading operands, causing incorrect elimination of
+  necessary device property loads
+- Added comprehensive register read tracking for `StoreSlot`, `JumpRelative`,
+  and `Alias` instructions in the optimizer
+
+[0.5.0]
+
+- Added full tuple support: declarations, assignments, and returns
+- Refactored optimizer into modular passes with improved code generation
+- Enhanced peephole optimizations and pattern recognition
+- Comprehensive test coverage for edge cases and error handling
+
+[0.4.7]
+
+- Added support for Windows CRLF endings
+
+[0.4.6]
+
+- Fixed bug in compiler where you were unable to assign a `const` value to
+  a `let` variable
+
+[0.4.5]
+
+- Fixed issue where after clicking "Cancel" on the IC10 Editor, the side-by-side
+  IC10 output would no longer update with highlighting or code updates.
+- Added ability to live-reload the mod while developing using the `ScriptEngine`
+  mod from BepInEx
+  - This required adding in cleanup code to cleanup references to the Rust DLL
+    before destroying the mod instance.
+- Added BepInEx debug logging. This will ONLY show if you have debug logs
+  enabled in the BepInEx configuration file.
+
+[0.4.4]
+
+- Added Stationpedia docs back after removing all harmony patches from the mod
+
+[0.4.3]
+
+- Removed references to the `Mod` class from SLP. This was the root of the multiplayer
+  connectivity issues. Multiplayer should now work with Slang installed.
+
+[0.4.2]
+
+- Removed all harmony patches as most functionality as been added into the
+  `IC10 Editor` mod
+- IC10 runtime errors will have been reverted back to showing as IC10 line
+  numbers instead of Slang line numbers.
+  - The IC10 line should be easily mapped to a Slang line via the side-by-side
+    IC10 compilation view.
+
+[0.4.1]
+
+- Update syscalls for `loadSlot` and `setSlot` to support expressions instead of
+  just variables for the slot index
+- Moved the main repository from GitHub to a self-hosted Gitea
+  - Restructured workflow files to support this change
+  - GitHub will still remain as a mirrored repository of the new
+    Gitea instance.
+  - This is in response to the new upcoming changes to the pricing model
+    for self-hosted GitHub action runners.
+
 [0.4.0]
 
 - First pass getting compiled IC10 to output along side the Slang source code

ModData/About/About.xml

@@ -2,11 +2,11 @@
 <ModMetadata xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <Name>Slang</Name>
   <Author>JoeDiertay</Author>
-  <Version>0.4.0</Version>
+  <Version>0.5.1</Version>
   <Description>
 [h1]Slang: High-Level Programming for Stationeers[/h1]
 
-Stop writing assembly. Start writing code.
+Iterate faster. Stop writing assembly. Start writing code.
 
 Slang (Stationeers Language) brings modern programming to Stationeers. It allows you to write scripts using a familiar C-style syntax (variables, functions, if/else, loops) directly in the in-game editor. When you hit confirm, Slang compiles your code into IC10 instantly.
 
@@ -15,7 +15,7 @@ Slang (Stationeers Language) brings modern programming to Stationeers. It allows
 [h2]Features[/h2]
 [list]
 [*] [b]In-Game Compilation:[/b] No external tools needed. Write Slang directly in the IC editor.
-[*] [b]No More Register Juggling:[/b] Define variables with let (e.g., let temp = 300). The compiler manages r0-r15 for you.
+[*] [b]No More Register Juggling:[/b] Define variables with let (e.g., let temp = 200c). The compiler manages r0-r15 for you.
 [*] [b]Control Flow:[/b] Write readable logic with if, else, while, loop, break, and continue.
 [*] [b]Functions:[/b] Create reusable code blocks with arguments.
 [*] [b]Smart Editor:[/b] Get real-time syntax highlighting and error checking (red text) as you type.
@@ -53,14 +53,13 @@ loop {
 [h2]Known Issues (Beta)[/h2]
 [list]
 [*] [b]Stack Access:[/b] Direct stack memory access is disabled to prevent conflicts with the compiler's internal memory management. A workaround is being planned.
-[*] [b]Documentation:[/b] In-game tooltips for syscalls (like load, set) are WIP. Check the "Slang" entry in the Stationpedia (F1) for help.
+[*] [b]Documentation:[/b] In-game tooltips for syscalls (like load, set) are WIP. Check the "Slang" entry in the Stationpedia (F1) for help, or checkout [url=https://github.com/dbidwell94/stationeers_lang/blob/master/docs/getting-started.md]The Docs[/url] for guides on how to get started.
 [/list]
 
 [h2]Planned Features[/h2]
 [list]
 [*] Enhanced LSP features (Autocomplete, Go to Definition).
 [*] Full feature parity with all IC10 instructions.
-[*] Tutorials and beginner script examples.
 [/list]
 
 [h2]FAQ[/h2]
@@ -70,10 +69,18 @@ A: The Slang compiler is built in Rust for performance and reliability. It is co
 [b]Q: Is this compatible with my current save?[/b]
 A: Yes! Slang does not modify any existing IC10 code, it is only a compiler. As a matter of fact: if you wish to stop using Slang at any time, your compiled IC10 will still exist on the chip. However: Slang adds a comment at the bottom of your compiled IC10 which is a GZIP and base64 encoded version of your Slang source code. This might break line limits with Slang not installed. If you wish to no longer use Slang, I recommend you remove this comment from the source code after uninstalling Slang.
 
+[b]Q: Does this modify the in-game scripting language[/b]
+A: No! Slang compiles directly to IC10. Any valid Slang file will produce valid IC10. The goal of this mod is twofold:
+[list]
+[*] Allow experienced users to quickly iterate on their scripts to get back into base upgrades faster
+[*] Allow newcomers who already know C-style languages (JS/C#/Java/Rust/C/etc) to see how it maps to IC10 so they can get to understand IC10 better
+[/list]
+
 [h2]Useful Links[/h2]
 [url=https://github.com/dbidwell94/stationeers_lang]Source Code on GitHub[/url]
 [url=https://discord.gg/stationeers]Stationeers Official Discord[/url]
 [url=https://discord.gg/M4sCfYMacs]Stationeers Modding Discord[/url]
+[url=https://github.com/dbidwell94/stationeers_lang/blob/master/docs/getting-started.md]Getting Started Guide[/url]
   </Description>
   <ChangeLog xsi:nil="true" />
   <WorkshopHandle>3619985558</WorkshopHandle>
@@ -86,7 +93,7 @@ A: Yes! Slang does not modify any existing IC10 code, it is only a compiler. As
     <Tag>Quality of Life</Tag>
   </Tags>
   <DependsOn WorkshopHandle="3592775931" />
-  <OrderBefore WorkshopHandle="3592775931" />
+  <OrderAfter WorkshopHandle="3592775931" />
   <InGameDescription><![CDATA[
         <size=30><color=#ffff00>Slang - High Level Language Compiler</color></size>
         A modern programming experience for Stationeers. Write C-style code that compiles to IC10 instantly.
@@ -116,5 +123,7 @@ A: Yes! Slang does not modify any existing IC10 code, it is only a compiler. As
         See: https://github.com/StationeersLaunchPad/StationeersLaunchPad
 
         Source Code: https://github.com/dbidwell94/stationeers_lang
+
+        Documentation: https://github.com/dbidwell94/stationeers_lang/blob/master/docs/getting-started.md
         ]]></InGameDescription>
 </ModMetadata>

README.md

@@ -1,30 +1,45 @@
-# Stationeers Language (slang)
+# Slang Language Documentation
 
-This is an ambitious attempt at creating:
+Slang is a high-level programming language that compiles to IC10 assembly for [Stationeers](https://store.steampowered.com/app/544550/Stationeers/).
+It provides a familiar C-like syntax while targeting the limited instruction set
+of in-game IC10.
 
-- A new programming language (slang)
-- A compiler to translate slang -> IC10
-- A mod to allow direct input of slang in the in-game script editor to
-  automatically compile to IC10 before running
+## Quick Links
 
-This project currently outputs 3 files:
+- [Getting Started](docs/getting-started.md) - Installation and first program
+- [Language Reference](docs/language-reference.md) - Complete syntax guide
+- [Built-in Functions](docs/builtins.md) - System calls and math functions
+- [Examples](docs/examples.md) - Real-world code samples
 
-- A Linux CLI
-- A Windows CLI
-- A Windows FFI dll
-  - Contains a single function: `compile_from_string`
+## Overview
 
-The aim of this project is to lower the amount of time it takes to code simple
-scripts in Stationeers so you can get back to engineering atmospherics or
-whatever you are working on. This project is NOT meant to fully replace IC10.
-Obviously hand-coded assembly written by an experienced programmer is more
-optimized and smaller than something that a C compiler will spit out. This is
-the same way. It WILL produce valid IC10, but for large complicated projects it
-might produce over the allowed limit of lines the in-game editor supports.
+Slang aims to reduce the time spent writing IC10 assembly by providing:
 
-Current Unknowns
+- **Familiar syntax** - C-like declarations, control flow, and expressions
+- **Device abstraction** - Named device bindings with property access
+- **Automatic register allocation** - No manual register management
+- **Built-in functions** - Math operations and device I/O as function calls
+- **Temperature literals** - Native support for Celsius, Fahrenheit, and Kelvin
 
-- Should I support a configurable script line length in-game to allow larger
-  scripts to be saved?
-- Should compilation be "behind the scenes" (in game editor will ALWAYS be what
-  you put in. IC10 will be IC10, slang will be slang)
+## Example
+
+```rust
+device gasSensor = "d0";
+device airCon = "d1";
+
+const TARGET_TEMP = 20c;
+
+loop {
+    yield();
+    airCon.On = gasSensor.Temperature > TARGET_TEMP;
+}
+```
+
+This compiles to IC10 that monitors temperature and controls an air
+conditioner.
+
+## Project Status
+
+Slang is under active development. It may produce suboptimal code for complex programs.
+It is not a replacement for IC10, for performance-critical or large scripts,
+hand-written IC10 may still be preferred.

csharp_mod/Formatter.cs

@@ -5,21 +5,37 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using ImGuiNET;
 using StationeersIC10Editor;
-using StationeersIC10Editor.IC10;
-using UnityEngine;
 
 public class SlangFormatter : ICodeFormatter
 {
+    public const string SLANG_SRC = "SLANG_SRC";
     private CancellationTokenSource? _lspCancellationToken;
     private object _tokenLock = new();
 
-    private IC10CodeFormatter iC10CodeFormatter = new IC10CodeFormatter();
+    protected Editor? __Ic10Editor = null;
+
+    protected Editor Ic10Editor
+    {
+        get
+        {
+            if (__Ic10Editor == null)
+            {
+                var tab = Editor.ParentTab;
+                tab.ClearExtraEditors();
+                __Ic10Editor = new Editor(Editor.KeyHandler);
+                Ic10Editor.IsReadOnly = true;
+                tab.AddEditor(__Ic10Editor);
+            }
+
+            return __Ic10Editor;
+        }
+    }
+
     private string ic10CompilationResult = "";
     private List<SourceMapEntry> ic10SourceMap = new();
 
-    // VS Code Dark Theme Palette
+    #region Colors
     public static readonly uint ColorControl = ColorFromHTML("#C586C0"); // Pink (if, return, loop)
     public static readonly uint ColorDeclaration = ColorFromHTML("#569CD6"); // Blue (let, device, fn)
     public static readonly uint ColorFunction = ColorFromHTML("#DCDCAA"); // Yellow (syscalls)
@@ -28,10 +44,8 @@ public class SlangFormatter : ICodeFormatter
     public static readonly uint ColorBoolean = ColorFromHTML("#569CD6"); // Blue (true/false)
     public static readonly uint ColorIdentifier = ColorFromHTML("#9CDCFE"); // Light Blue (variables)
     public static new readonly uint ColorDefault = ColorFromHTML("#D4D4D4"); // White (punctuation ; { } )
-
-    // Operators are often the same color as default text in VS Code Dark,
-    // but having a separate definition lets you tweak it (e.g. make them slightly darker or distinct)
     public static readonly uint ColorOperator = ColorFromHTML("#D4D4D4");
+    #endregion
 
     private HashSet<uint> _linesWithErrors = new();
     private int _lastLineCount = -1;
@@ -49,6 +63,11 @@ public class SlangFormatter : ICodeFormatter
         if (string.IsNullOrWhiteSpace(input))
             return 0d;
 
+        if (input.Contains(SLANG_SRC))
+        {
+            return 1.0;
+        }
+
         // Run the compiler to get diagnostics
         var diagnostics = Marshal.DiagnoseSource(input);
 
@@ -75,35 +94,28 @@ public class SlangFormatter : ICodeFormatter
 
     public override string Compile()
     {
-        return this.Lines.RawText;
+        if (!Marshal.CompileFromString(RawText, out var compilationResult, out var sourceMap))
+        {
+            return "# Compilation Error";
         }
 
-    public override void DrawLine(int lineIndex, TextRange selection, bool drawLineNumber = true)
+        return compilationResult + $"\n{EncodeSource(RawText, SLANG_SRC)}";
+    }
+
+    public override void ResetCode(string code)
     {
-        Vector2 cursorPos = ImGui.GetCursorScreenPos();
-        Vector2 space = ImGui.GetContentRegionAvail();
-        base.DrawLine(lineIndex, selection, drawLineNumber);
-
-        var charWidth = Settings.CharWidth;
-
-        var width = Mathf.Max(Lines.Width + 10.0f + LineNumberOffset * charWidth, space.x / 2);
-
-        ImGui
-            .GetWindowDrawList()
-            .AddLine(
-                new Vector2(cursorPos.x + width + 4.5f * charWidth, cursorPos.y),
-                new Vector2(
-                    cursorPos.x + width + 4.5f * charWidth,
-                    cursorPos.y + space.y + Settings.LineHeight
-                ),
-                ColorLineNumber,
-                1.0f
-            );
-
-        cursorPos.x += width;
-        ImGui.SetCursorScreenPos(cursorPos);
-        if (lineIndex < iC10CodeFormatter.Lines.Count)
-            iC10CodeFormatter.DrawLine(lineIndex, new TextRange(), true);
+        // for compatibility, we need to check for GlobalCode.SLANG_SRC
+        // `#SLANG_SRC:<code>`
+        // and replace with `# SLANG_SRC: <code>`
+        if (code.Contains(GlobalCode.SLANG_SRC))
+        {
+            code = code.Replace(GlobalCode.SLANG_SRC, $"# {SLANG_SRC}: ");
+        }
+        if (code.Contains(SLANG_SRC))
+        {
+            code = ExtractEncodedSource(code, SLANG_SRC);
+        }
+        base.ResetCode(code);
     }
 
     public override StyledLine ParseLine(string line)
@@ -122,6 +134,10 @@ public class SlangFormatter : ICodeFormatter
         return styledLine;
     }
 
+    /// <summary>
+    /// This handles calling the `HandleLsp` function by creating a new `CancellationToken` and
+    /// cancelling the current call if applicable.
+    /// </summary>
     private void HandleCodeChanged()
     {
         CancellationToken token;
@@ -137,6 +153,11 @@ public class SlangFormatter : ICodeFormatter
         _ = HandleLsp(inputSrc, token);
     }
 
+    /// <summary>
+    /// Takes a copy of the current source code and sends it to the Rust compiler in a background thread
+    /// to get diagnostic data. This also handles getting a compilation response of optimized IC10 for the
+    /// side-by-side IC10Editor to show with sourcemap highlighting.
+    /// </summary>
     private async Task HandleLsp(string inputSrc, CancellationToken cancellationToken)
     {
         try
@@ -169,8 +190,7 @@ public class SlangFormatter : ICodeFormatter
                 return;
             }
 
-            var (compilationSuccess, compiled, sourceMap) = await Task.Run(
-                () =>
+            var (compilationSuccess, compiled, sourceMap) = await Task.Run(() =>
             {
                 var successful = Marshal.CompileFromString(
                     inputSrc,
@@ -178,15 +198,13 @@ public class SlangFormatter : ICodeFormatter
                     out var sourceMap
                 );
                 return (successful, compiled, sourceMap);
-                },
-                cancellationToken
-            );
+            });
 
             if (compilationSuccess)
             {
                 ic10CompilationResult = compiled;
                 ic10SourceMap = sourceMap;
-                UpdateIc10Formatter();
+                UpdateIc10Content(Ic10Editor);
             }
         }
         catch (OperationCanceledException) { }
@@ -196,9 +214,24 @@ public class SlangFormatter : ICodeFormatter
         }
     }
 
+    /// <summary>
+    /// Updates the underlying code in the IC10 Editor, after which will call `UpdateIc10Formatter` to
+    /// update highlighting of relavent fields.
+    /// </summary>
+    private void UpdateIc10Content(Editor editor)
+    {
+        editor.ResetCode(ic10CompilationResult);
+        UpdateIc10Formatter();
+    }
+
+    // This runs on the main thread. This function ONLY updates the highlighting of the IC10 code.
+    // If you need to update the code in the editor itself, you should use `UpdateIc10Content`.
     private void UpdateIc10Formatter()
     {
-        iC10CodeFormatter.Editor = Editor;
+        // Bail if our backing field is null. We don't want to set the field in this function. It
+        // runs way too much and we might not even have source code to use.
+        if (__Ic10Editor == null)
+            return;
         var caretPos = Editor.CaretPos.Line;
 
         // get the slang sourceMap at the current editor line
@@ -206,44 +239,37 @@ public class SlangFormatter : ICodeFormatter
             entry.SlangSource.StartLine == caretPos || entry.SlangSource.EndLine == caretPos
         );
 
-        // extract the current "context" of the ic10 compilation. The current Slang source line
-        // should be directly next to the compiled IC10 source line, and we should highlight the
-        // IC10 code that directly represents the Slang source
-
-        iC10CodeFormatter.ResetCode(ic10CompilationResult);
+        Ic10Editor.ResetCode(ic10CompilationResult);
 
         if (lines.Count() < 1)
         {
+            Ic10Editor.Selection = new TextRange
+            {
+                End = new TextPosition { Col = 0, Line = 0 },
+                Start = new TextPosition { Col = 0, Line = 0 },
+            };
             return;
         }
         // get the total range of the IC10 source for the selected Slang line
         var max = lines.Max(line => line.Ic10Line);
         var min = lines.Min(line => line.Ic10Line);
 
+        Ic10Editor.CaretPos = new TextPosition { Col = 0, Line = (int)max };
+
         // highlight all the IC10 lines that are within the specified range
-        foreach (var index in Enumerable.Range((int)min, (int)(max - min) + 1))
+        Ic10Editor.Selection.Start = new TextPosition { Col = 0, Line = (int)min };
+        Ic10Editor.Selection.End = new TextPosition
         {
-            var lineText = iC10CodeFormatter.Lines[index].Text;
-
-            var newLine = new StyledLine(
-                lineText,
-                [
-                    new SemanticToken
-                    {
-                        Column = 0,
-                        Length = lineText.Length,
-                        Line = index,
-                        Background = ColorIdentifier,
-                        Color = ColorFromHTML("black"),
-                    },
-                ]
-            );
-
-            iC10CodeFormatter.Lines[index] = newLine;
-        }
+            Col = Ic10Editor.Lines[(int)max].Text.Length,
+            Line = (int)max,
+        };
     }
 
-    // This runs on the Main Thread
+    /// <summary>
+    /// Takes diagnostics from the Rust FFI compiler and applies it as semantic tokens to the
+    /// source in this editor.
+    /// This runs on the Main Thread
+    /// </summary>
     private void ApplyDiagnostics(Dictionary<uint, IGrouping<uint, Diagnostic>> dict)
     {
         HashSet<uint> linesToRefresh;

csharp_mod/GlobalCode.cs

@@ -1,30 +1,24 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
-using System.IO.Compression;
-using System.Text;
 
 namespace Slang;
 
 public static class GlobalCode
 {
-    public const string SLANG_REF = "#SLANG_REF:";
+    /// <summary>
+    /// This is the OLD way of handling saving / loading. This has been replaced with a native
+    /// save / load from IC10 Editor. However; this needs to remain for compatibility with
+    /// previous versions of code not compiled with 0.4.2 or later.
+    /// </summary>
     public const string SLANG_SRC = "#SLANG_SRC:";
 
-    // This is a Dictionary of ENCODED source code, compressed
-    // so that save file data is smaller
-    private static Dictionary<Guid, string> codeDict = new();
-
-    // This Dictionary stores the source maps for the given SLANG_REF, where
-    // the key is the IC10 line, and the value is a List of Slang ranges where that
-    // line would have come from
+    /// <summary>
+    /// This Dictionary stores the source maps for the given SLANG_REF, where
+    /// the key is the IC10 line, and the value is a List of Slang ranges where that
+    /// line would have come from
+    /// </summary>
     private static Dictionary<Guid, Dictionary<uint, List<Range>>> sourceMaps = new();
 
-    public static void ClearCache()
-    {
-        codeDict.Clear();
-    }
-
     public static void SetSourceMap(Guid reference, List<SourceMapEntry> sourceMapEntries)
     {
         var builtDictionary = new Dictionary<uint, List<Range>>();
@@ -72,81 +66,4 @@ public static class GlobalCode
         slangSpan = foundRange[0];
         return true;
     }
-
-    public static string GetSource(Guid reference)
-    {
-        if (!codeDict.ContainsKey(reference))
-        {
-            return string.Empty;
-        }
-
-        return DecodeSource(codeDict[reference]);
-    }
-
-    public static void SetSource(Guid reference, string source)
-    {
-        codeDict[reference] = EncodeSource(source);
-    }
-
-    public static string? GetEncoded(Guid reference)
-    {
-        if (!codeDict.ContainsKey(reference))
-            return null;
-
-        return codeDict[reference];
-    }
-
-    public static void SetEncoded(Guid reference, string encodedSource)
-    {
-        if (codeDict.ContainsKey(reference))
-        {
-            codeDict[reference] = encodedSource;
-        }
-        else
-        {
-            codeDict.Add(reference, encodedSource);
-        }
-    }
-
-    private static string EncodeSource(string source)
-    {
-        if (string.IsNullOrEmpty(source))
-        {
-            return "";
-        }
-
-        byte[] bytes = Encoding.UTF8.GetBytes(source);
-
-        using (var memoryStream = new MemoryStream())
-        {
-            using (var gzipStream = new GZipStream(memoryStream, CompressionMode.Compress))
-            {
-                gzipStream.Write(bytes, 0, bytes.Length);
-            }
-            return Convert.ToBase64String(memoryStream.ToArray());
-        }
-    }
-
-    private static string DecodeSource(string source)
-    {
-        if (string.IsNullOrEmpty(source))
-        {
-            return "";
-        }
-
-        byte[] compressedBytes = Convert.FromBase64String(source);
-
-        using (var memoryStream = new MemoryStream(compressedBytes))
-        {
-            using (var gzipStream = new GZipStream(memoryStream, CompressionMode.Decompress))
-            {
-                using (var outputStream = new MemoryStream())
-                {
-                    gzipStream.CopyTo(outputStream);
-
-                    return Encoding.UTF8.GetString(outputStream.ToArray());
-                }
-            }
-        }
-    }
 }

csharp_mod/Marshal.cs

@@ -67,7 +67,9 @@ public static class Marshal
         try
         {
             _libraryHandle = LoadLibrary(ExtractNativeLibrary(Ffi.RustLib));
+            L.Debug("Rust DLL loaded successfully. Enjoy native speed compilations!");
             CodeFormatters.RegisterFormatter("Slang", typeof(SlangFormatter), true);
+
             return true;
         }
         catch (Exception ex)
@@ -91,8 +93,13 @@ public static class Marshal
 
         try
         {
-            FreeLibrary(_libraryHandle);
+            CodeFormatters.RegisterFormatter("Slang", typeof(PlainTextFormatter), true);
+            if (!FreeLibrary(_libraryHandle))
+            {
+                L.Warning("Unable to free Rust library");
+            }
             _libraryHandle = IntPtr.Zero;
+            L.Debug("Rust DLL library freed");
             return true;
         }
         catch (Exception ex)
@@ -191,9 +198,9 @@ public static class Marshal
 
         Assembly assembly = Assembly.GetExecutingAssembly();
 
-        using (Stream stream = assembly.GetManifestResourceStream(libName))
+        using (Stream resourceStream = assembly.GetManifestResourceStream(libName))
         {
-            if (stream == null)
+            if (resourceStream == null)
             {
                 L.Error(
                     $"{libName} not found. This means it was not embedded in the mod. Please contact the mod author!"
@@ -201,18 +208,85 @@ public static class Marshal
                 return "";
             }
 
+            // Check if file exists and contents are identical to avoid overwriting locked files
+            if (File.Exists(destinationPath))
+            {
+                try
+                {
+                    using (
+                        FileStream fileStream = new FileStream(
+                            destinationPath,
+                            FileMode.Open,
+                            FileAccess.Read,
+                            FileShare.ReadWrite
+                        )
+                    )
+                    {
+                        if (resourceStream.Length == fileStream.Length)
+                        {
+                            if (StreamsContentsAreEqual(resourceStream, fileStream))
+                            {
+                                L.Debug(
+                                    $"DLL {libName} already exists and matches. Skipping extraction."
+                                );
+                                return destinationPath;
+                            }
+                        }
+                    }
+                }
+                catch (IOException ex)
+                {
+                    L.Warning(
+                        $"Could not verify existing {libName}, attempting overwrite. {ex.Message}"
+                    );
+                }
+            }
+
+            resourceStream.Position = 0;
+
+            // Attempt to overwrite if missing or different
             try
             {
                 using (FileStream fileStream = new FileStream(destinationPath, FileMode.Create))
                 {
-                    stream.CopyTo(fileStream);
+                    resourceStream.CopyTo(fileStream);
                 }
                 return destinationPath;
             }
             catch (IOException e)
             {
-                L.Warning($"Could not overwrite {libName} (it might be in use): {e.Message}");
-                return "";
+                // If we fail here, the file is likely locked.
+                // However, if we are here, it means the file is DIFFERENT or we couldn't read it.
+                // As a fallback for live-reload, we can try returning the path anyway
+                // assuming the existing locked file might still work.
+                L.Warning(
+                    $"Could not overwrite {libName} (it might be in use): {e.Message}. Attempting to use existing file."
+                );
+                return destinationPath;
+            }
+        }
+    }
+
+    private static bool StreamsContentsAreEqual(Stream stream1, Stream stream2)
+    {
+        const int bufferSize = 4096;
+        byte[] buffer1 = new byte[bufferSize];
+        byte[] buffer2 = new byte[bufferSize];
+
+        while (true)
+        {
+            int count1 = stream1.Read(buffer1, 0, bufferSize);
+            int count2 = stream2.Read(buffer2, 0, bufferSize);
+
+            if (count1 != count2)
+                return false;
+            if (count1 == 0)
+                return true;
+
+            for (int i = 0; i < count1; i++)
+            {
+                if (buffer1[i] != buffer2[i])
+                    return false;
             }
         }
     }

csharp_mod/Patches.cs

@@ -1,355 +1,11 @@
 namespace Slang;
 
-using System;
-using System.Runtime.CompilerServices;
-using Assets.Scripts.Objects;
-using Assets.Scripts.Objects.Electrical;
-using Assets.Scripts.Objects.Motherboards;
 using Assets.Scripts.UI;
 using HarmonyLib;
 
-class LineErrorData
-{
-    public AsciiString SourceRef;
-    public uint IC10ErrorSource;
-    public string SlangErrorReference;
-    public Range SlangErrorSpan;
-
-    public LineErrorData(
-        AsciiString sourceRef,
-        uint ic10ErrorSource,
-        string slangErrorRef,
-        Range slangErrorSpan
-    )
-    {
-        this.SourceRef = sourceRef;
-        this.IC10ErrorSource = ic10ErrorSource;
-        this.SlangErrorReference = slangErrorRef;
-        this.SlangErrorSpan = slangErrorSpan;
-    }
-}
-
 [HarmonyPatch]
 public static class SlangPatches
 {
-    private static ProgrammableChipMotherboard? _currentlyEditingMotherboard;
-    private static AsciiString? _motherboardCachedCode;
-    private static Guid? _currentlyEditingGuid;
-
-    private static ConditionalWeakTable<ProgrammableChip, LineErrorData> _errorReferenceTable =
-        new();
-
-    [HarmonyPatch(
-        typeof(ProgrammableChipMotherboard),
-        nameof(ProgrammableChipMotherboard.InputFinished)
-    )]
-    [HarmonyPrefix]
-    public static void pgmb_InputFinished(ref string result)
-    {
-        _currentlyEditingMotherboard = null;
-        _motherboardCachedCode = null;
-        // guard to ensure we have valid IC10 before continuing
-        if (
-            !SlangPlugin.IsSlangSource(ref result)
-            || !Marshal.CompileFromString(result, out var compiled, out var sourceMap)
-            || string.IsNullOrEmpty(compiled)
-        )
-        {
-            return;
-        }
-
-        var thisRef = _currentlyEditingGuid ?? Guid.NewGuid();
-
-        // Ensure we cache this compiled code for later retreival.
-        GlobalCode.SetSource(thisRef, result);
-        GlobalCode.SetSourceMap(thisRef, sourceMap);
-
-        _currentlyEditingGuid = null;
-
-        // Append REF to the bottom
-        compiled += $"\n{GlobalCode.SLANG_REF}{thisRef}";
-        result = compiled;
-    }
-
-    [HarmonyPatch(typeof(ProgrammableChipMotherboard), nameof(ProgrammableChipMotherboard.OnEdit))]
-    [HarmonyPrefix]
-    public static void isc_OnEdit(ProgrammableChipMotherboard __instance)
-    {
-        _currentlyEditingMotherboard = __instance;
-        _motherboardCachedCode = __instance.GetSourceCode();
-        var sourceCode = System.Text.Encoding.UTF8.GetString(
-            System.Text.Encoding.ASCII.GetBytes(__instance.GetSourceCode())
-        );
-
-        if (string.IsNullOrEmpty(sourceCode))
-        {
-            return;
-        }
-
-        // Look for REF at the bottom
-        var tagIndex = sourceCode.LastIndexOf(GlobalCode.SLANG_REF);
-
-        if (tagIndex == -1)
-        {
-            // this is not slang managed code
-            return;
-        }
-
-        if (
-            !Guid.TryParse(
-                sourceCode.Substring(tagIndex + GlobalCode.SLANG_REF.Length).Trim(),
-                out Guid sourceRef
-            )
-        )
-        {
-            // not a valid Guid, not managed by slang
-            return;
-        }
-
-        _currentlyEditingGuid = sourceRef;
-        var slangSource = GlobalCode.GetSource(sourceRef);
-
-        if (string.IsNullOrEmpty(slangSource))
-        {
-            // Didn't find that source ref in the global code manager.
-            return;
-        }
-
-        __instance.SetSourceCode(slangSource);
-    }
-
-    private static void HandleSerialization(ref string sourceCode)
-    {
-        if (string.IsNullOrEmpty(sourceCode))
-            return;
-
-        // Check if the file ends with the Reference Tag
-        var tagIndex = sourceCode.LastIndexOf(GlobalCode.SLANG_REF);
-
-        if (tagIndex == -1)
-            return;
-
-        string guidString = sourceCode.Substring(tagIndex + GlobalCode.SLANG_REF.Length).Trim();
-
-        if (!Guid.TryParse(guidString, out Guid slangRefGuid))
-        {
-            L.Warning($"Found SLANG_REF but failed to parse GUID: {guidString}");
-            return;
-        }
-
-        var slangEncoded = GlobalCode.GetEncoded(slangRefGuid);
-
-        if (string.IsNullOrEmpty(slangEncoded))
-        {
-            L.Warning(
-                $"Could not find encoded source for ref {slangRefGuid}. Save will contain compiled IC10 only."
-            );
-            return;
-        }
-
-        // Extract the clean IC10 code (everything before the tag)
-        var cleanIc10 = sourceCode.Substring(0, tagIndex).TrimEnd();
-
-        // Append the encoded source tag to the bottom
-        sourceCode = $"{cleanIc10}\n{GlobalCode.SLANG_SRC}{slangEncoded}";
-    }
-
-    [HarmonyPatch(typeof(ProgrammableChip), nameof(ProgrammableChip.SerializeSave))]
-    [HarmonyPostfix]
-    public static void pgc_SerializeSave(ProgrammableChip __instance, ref ThingSaveData __result)
-    {
-        if (__result is not ProgrammableChipSaveData chipData)
-            return;
-
-        string code = chipData.SourceCode;
-        HandleSerialization(ref code);
-        chipData.SourceCode = code;
-    }
-
-    [HarmonyPatch(
-        typeof(ProgrammableChip),
-        nameof(ProgrammableChip.ErrorLineNumberString),
-        MethodType.Getter
-    )]
-    [HarmonyPostfix]
-    public static void pgc_ErrorLineNumberString(ProgrammableChip __instance, ref string __result)
-    {
-        if (
-            String.IsNullOrEmpty(__result)
-            || !uint.TryParse(__result.Trim(), out var ic10ErrorLineNumber)
-        )
-        {
-            return;
-        }
-
-        var sourceAscii = __instance.GetSourceCode();
-
-        if (_errorReferenceTable.TryGetValue(__instance, out var cache))
-        {
-            if (cache.SourceRef.Equals(sourceAscii) && cache.IC10ErrorSource == ic10ErrorLineNumber)
-            {
-                __result = cache.SlangErrorReference;
-                return;
-            }
-        }
-
-        var source = System.Text.Encoding.UTF8.GetString(
-            System.Text.Encoding.ASCII.GetBytes(__instance.GetSourceCode())
-        );
-
-        var slangIndex = source.LastIndexOf(GlobalCode.SLANG_REF);
-
-        if (
-            slangIndex < 0
-            || !Guid.TryParse(
-                source
-                    .Substring(
-                        source.LastIndexOf(GlobalCode.SLANG_REF) + GlobalCode.SLANG_REF.Length
-                    )
-                    .Trim(),
-                out var slangGuid
-            )
-            || !GlobalCode.GetSlangErrorLineFromICError(
-                slangGuid,
-                ic10ErrorLineNumber,
-                out var slangErrorLineNumber,
-                out var slangSpan
-            )
-        )
-        {
-            return;
-        }
-
-        L.Warning($"IC error at: {__result} -- Slang source error line: {slangErrorLineNumber}");
-        __result = slangErrorLineNumber.ToString();
-        _errorReferenceTable.Remove(__instance);
-        _errorReferenceTable.Add(
-            __instance,
-            new LineErrorData(
-                sourceAscii,
-                ic10ErrorLineNumber,
-                slangErrorLineNumber.ToString(),
-                slangSpan
-            )
-        );
-    }
-
-    [HarmonyPatch(
-        typeof(ProgrammableChip),
-        nameof(ProgrammableChip.SetSourceCode),
-        new Type[] { typeof(string) }
-    )]
-    [HarmonyPostfix]
-    public static void pgc_SetSourceCode_string(ProgrammableChip __instance, string sourceCode)
-    {
-        _errorReferenceTable.Remove(__instance);
-    }
-
-    [HarmonyPatch(
-        typeof(ProgrammableChip),
-        nameof(ProgrammableChip.SetSourceCode),
-        new Type[] { typeof(string), typeof(ICircuitHolder) }
-    )]
-    [HarmonyPostfix]
-    public static void pgc_SetSourceCode_string_parent(
-        ProgrammableChip __instance,
-        string sourceCode,
-        ICircuitHolder parent
-    )
-    {
-        _errorReferenceTable.Remove(__instance);
-    }
-
-    [HarmonyPatch(
-        typeof(ProgrammableChipMotherboard),
-        nameof(ProgrammableChipMotherboard.SerializeSave)
-    )]
-    [HarmonyPostfix]
-    public static void pgmb_SerializeSave(
-        ProgrammableChipMotherboard __instance,
-        ref ThingSaveData __result
-    )
-    {
-        if (__result is not ProgrammableChipMotherboardSaveData chipData)
-            return;
-
-        string code = chipData.SourceCode;
-        HandleSerialization(ref code);
-        chipData.SourceCode = code;
-    }
-
-    private static void HandleDeserialization(ref string sourceCode)
-    {
-        // Safety check for null/empty code
-        if (string.IsNullOrEmpty(sourceCode))
-            return;
-
-        // Check for the #SLANG_SRC: footer
-        int tagIndex = sourceCode.LastIndexOf(GlobalCode.SLANG_SRC);
-
-        // If the tag is missing, this is just a normal IC10 script. Do nothing.
-        if (tagIndex == -1)
-            return;
-
-        // Extract the Encoded Source (Base64)
-        string encodedSource = sourceCode.Substring(tagIndex + GlobalCode.SLANG_SRC.Length).Trim();
-
-        // Extract the IC10 Code (strip off the tag and the newline before it)
-        string ic10Code = sourceCode.Substring(0, tagIndex).TrimEnd();
-
-        // Generate a new Runtime GUID for this session
-        Guid runtimeGuid = Guid.NewGuid();
-
-        // Hydrate the Cache
-        GlobalCode.SetEncoded(runtimeGuid, encodedSource);
-
-        // Rewrite the SourceCode to the "Runtime" format (REF at bottom)
-        sourceCode = $"{ic10Code}\n{GlobalCode.SLANG_REF}{runtimeGuid}";
-    }
-
-    [HarmonyPatch(typeof(ProgrammableChip), nameof(ProgrammableChip.DeserializeSave))]
-    [HarmonyPrefix]
-    public static void pgc_DeserializeSave(ref ThingSaveData savedData)
-    {
-        if (savedData is not ProgrammableChipSaveData pcSaveData)
-            return;
-
-        string code = pcSaveData.SourceCode;
-        HandleDeserialization(ref code);
-        pcSaveData.SourceCode = code;
-    }
-
-    [HarmonyPatch(
-        typeof(ProgrammableChipMotherboard),
-        nameof(ProgrammableChipMotherboard.DeserializeSave)
-    )]
-    [HarmonyPrefix]
-    public static void pgmb_DeserializeSave(ref ThingSaveData savedData)
-    {
-        if (savedData is not ProgrammableChipMotherboardSaveData pcSaveData)
-            return;
-
-        string code = pcSaveData.SourceCode;
-        HandleDeserialization(ref code);
-        pcSaveData.SourceCode = code;
-    }
-
-    [HarmonyPatch(typeof(InputSourceCode), nameof(InputSourceCode.ButtonInputCancel))]
-    [HarmonyPrefix]
-    public static void isc_ButtonInputCancel()
-    {
-        if (_currentlyEditingMotherboard is null || _motherboardCachedCode is null)
-        {
-            return;
-        }
-
-        _currentlyEditingMotherboard.SetSourceCode(_motherboardCachedCode);
-
-        _currentlyEditingMotherboard = null;
-        _motherboardCachedCode = null;
-        _currentlyEditingGuid = null;
-    }
-
     [HarmonyPatch(typeof(Stationpedia), nameof(Stationpedia.Regenerate))]
     [HarmonyPostfix]
     public static void Stationpedia_Regenerate()

csharp_mod/Plugin.cs

@@ -1,7 +1,5 @@
-using System.Text.RegularExpressions;
 using BepInEx;
 using HarmonyLib;
-using LaunchPadBooster;
 
 namespace Slang
 {
@@ -41,45 +39,32 @@ namespace Slang
     {
         public const string PluginGuid = "com.biddydev.slang";
         public const string PluginName = "Slang";
-        public const string PluginVersion = "0.4.0";
+        public const string PluginVersion = "0.5.1";
 
-        public static Mod MOD = new Mod(PluginName, PluginVersion);
+        private static Harmony? _harmony;
 
-        private Harmony? _harmony;
-
-        private static Regex? _slangSourceCheck = null;
-
-        private static Regex SlangSourceCheck
-        {
-            get
-            {
-                if (_slangSourceCheck is null)
-                {
-                    _slangSourceCheck = new Regex(@"[;{}()]|\b(let|fn|device)\b|\/\/");
-                }
-
-                return _slangSourceCheck;
-            }
-        }
-
-        public static bool IsSlangSource(ref string input)
-        {
-            return SlangSourceCheck.IsMatch(input);
-        }
-
-        private void Awake()
+        public void Awake()
         {
             L.SetLogger(Logger);
-            this._harmony = new Harmony(PluginGuid);
+            _harmony = new Harmony(PluginGuid);
 
             // If we failed to load the compiler, bail from the rest of the patches. It won't matter,
             // as the compiler itself has failed to load.
             if (!Marshal.Init())
             {
+                L.Error("Marshal failed to init");
                 return;
             }
 
-            this._harmony.PatchAll();
+            _harmony.PatchAll();
+            L.Debug("Ran Harmony patches");
+        }
+
+        public void OnDestroy()
+        {
+            Marshal.Destroy();
+            _harmony?.UnpatchSelf();
+            L.Debug("Cleaned up Harmony patches");
         }
     }
 }

csharp_mod/TmpFormatter.cs

@@ -1,59 +1,73 @@
+using System;
 using System.Text.RegularExpressions;
 
 namespace Slang;
 
 public static class TextMeshProFormatter
 {
-    private const string CODE_COLOR = "#FFD700";
+    private const string CODE_COLOR = "#FFD700";           // Gold
+    private const string LINK_COLOR = "#0099FF";           // Blue
+    private const string QUOTE_COLOR = "#90EE90";          // Light Green
 
     public static string FromMarkdown(string markdown)
     {
         if (string.IsNullOrEmpty(markdown))
             return "";
 
-        // 1. Normalize Line Endings
+        // Normalize Line Endings
         string text = markdown.Replace("\r\n", "\n");
 
-        // 2. Handle Code Blocks (```)
+        // Process code blocks FIRST (``` ... ```)
         text = Regex.Replace(
             text,
-            @"```\s*(.*?)\s*```",
+            @"```[^\n]*\n(.*?)\n```",
             match =>
             {
                 var codeContent = match.Groups[1].Value;
-                return $"<color={CODE_COLOR}>{codeContent}</color>"; // Gold color for code
+                return $"<color={CODE_COLOR}>{codeContent}</color>";
             },
             RegexOptions.Singleline
         );
 
+        // Process headers - check for 1-6 hashes
+        text = Regex.Replace(text, @"^#{1}\s+(.+)$", "<size=120%><b>$1</b></size>", RegexOptions.Multiline);
+        text = Regex.Replace(text, @"^#{2}\s+(.+)$", "<size=110%><b>$1</b></size>", RegexOptions.Multiline);
+        text = Regex.Replace(text, @"^#{3}\s+(.+)$", "<size=100%><b>$1</b></size>", RegexOptions.Multiline);
+        text = Regex.Replace(text, @"^#{4}\s+(.+)$", "<size=90%><b>$1</b></size>", RegexOptions.Multiline);
+        text = Regex.Replace(text, @"^#{5}\s+(.+)$", "<size=80%><b>$1</b></size>", RegexOptions.Multiline);
+        text = Regex.Replace(text, @"^#{6}\s+(.+)$", "<size=70%><b>$1</b></size>", RegexOptions.Multiline);
+
+        // Process markdown links [text](url)
         text = Regex.Replace(
             text,
-            @"^\s*##\s+(.+)$",
-            "<size=110%><color=#ffffff><b>$1</b></color></size>",
-            RegexOptions.Multiline
+            @"\[([^\]]+)\]\(([^\)]+)\)",
+            $"<color={LINK_COLOR}><u>$1</u></color>"
         );
 
-        // 3. Handle # Headers SECOND (General)
-        text = Regex.Replace(
-            text,
-            @"^\s*#\s+(.+)$",
-            "<size=120%><color=#ffffff><b>$1</b></color></size>",
-            RegexOptions.Multiline
-        );
-
-        // 4. Handle Inline Code (`code`)
+        // Process inline code (`code`)
         text = Regex.Replace(text, @"`([^`]+)`", $"<color={CODE_COLOR}>$1</color>");
 
-        // 5. Handle Bold (**text**)
+        // Process bold (**text**)
         text = Regex.Replace(text, @"\*\*(.+?)\*\*", "<b>$1</b>");
 
-        // 6. Handle Italics (*text*)
-        text = Regex.Replace(text, @"\*(.+?)\*", "<i>$1</i>");
+        // Process italics (*text*)
+        text = Regex.Replace(text, @"(?<!\*)\*(?!\*)(.+?)(?<!\*)\*(?!\*)", "<i>$1</i>");
 
-        // 7. Convert Newlines to TMP Line Breaks
-        // Stationpedia needs <br> or explicit newlines.
-        // Often just ensuring \n is preserved is enough, but <br> is safer for HTML-like parsers.
-        text = text.Replace("\n", "<br>");
+        // Process block quotes (> text)
+        text = Regex.Replace(
+            text,
+            @"^>\s+(.+)$",
+            $"<color={QUOTE_COLOR}><i>$1</i></color>",
+            RegexOptions.Multiline
+        );
+
+        // Process unordered lists (- items)
+        text = Regex.Replace(
+            text,
+            @"^-\s+(.+)$",
+            "  • $1",
+            RegexOptions.Multiline
+        );
 
         return text;
     }

csharp_mod/stationeersSlang.csproj

@@ -5,7 +5,7 @@
     <Nullable>enable</Nullable>
     <AssemblyName>StationeersSlang</AssemblyName>
     <Description>Slang Compiler Bridge</Description>
-    <Version>0.4.0</Version>
+    <Version>0.5.1</Version>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>

docs/builtins.md

@@ -0,0 +1,302 @@
+# Built-in Functions
+
+<!--toc:start-->
+
+- [Built-in Functions](#built-in-functions)
+  - [System Functions](#system-functions)
+    - [`yield()`](#yield)
+    - [`sleep(ticks)`](#sleepticks)
+    - [`hash(prefabName)`](#hashprefabname)
+  - [Device I/O Functions](#device-io-functions)
+    - [Reading from Devices](#reading-from-devices)
+      - [Load from device](#load-from-device)
+      - [Load From Device Batched](#load-from-device-batched)
+      - [Load From Device Batched Named](#load-from-device-batched-named)
+      - [Load Slot](#load-slot)
+      - [Load Reagent](#load-reagent)
+    - [Writing to Devices](#writing-to-devices)
+      - [Set On Device](#set-on-device)
+      - [Set On Device Batched](#set-on-device-batched)
+      - [Set On Device Batched Named](#set-on-device-batched-named)
+      - [Set Slot](#set-slot)
+  - [Math Functions](#math-functions)
+    - [Trigonometric Functions](#trigonometric-functions)
+      - [Trig Example](#trig-example)
+    - [Rounding Functions](#rounding-functions)
+      - [Rounding Example](#rounding-example)
+    - [Other Math Functions](#other-math-functions)
+      - [Math Example](#math-example)
+  - [See Also](#see-also)
+  <!--toc:end-->
+
+Slang provides built-in functions for device I/O and mathematical operations.
+These map directly to IC10 instructions.
+
+## System Functions
+
+### `yield()`
+
+Pauses execution for exactly one game tick.
+
+```rust
+yield();
+```
+
+**IC10:** `yield`
+
+---
+
+### `sleep(ticks)`
+
+Pauses execution for the specified number of ticks.
+
+```rust
+sleep(10);  // Sleep for 10 ticks
+```
+
+**IC10:** `sleep ticks`
+
+---
+
+### `hash(prefabName)`
+
+Computes the in-game hash for a prefab name. The hash is computed at compile
+time and no runtime code is generated.
+
+```rust
+const AC_HASH = hash("StructureAirConditioner");
+```
+
+**Note:** This is different from IC10's `hash` instruction, which computes the
+hash at runtime.
+
+```rust
+setBatched(AC_HASH, "On", 0);
+```
+
+**IC10:** `sb -2087593337 On 0` (no hash computation at runtime)
+
+---
+
+## Device I/O Functions
+
+### Reading from Devices
+
+#### Load from device
+
+`load(device, property)` / `l(device, property)`
+
+Loads a property value from a device:
+
+```rust
+let temp = load(sensor, "Temperature");
+let temp = l(sensor, "Temperature");
+
+// Preferred: use dot notation
+let temp = sensor.Temperature;
+```
+
+**IC10:** `l r? d? var`
+
+---
+
+#### Load From Device Batched
+
+`loadBatched(deviceHash, property, batchMode)` / `lb(...)`
+
+Loads a property from all devices matching a hash, aggregated by batch mode:
+
+```rust
+const SENSOR = hash("StructureGasSensor");
+let avgTemp = loadBatched(SENSOR, "Temperature", "Average");
+let maxTemp = lb(SENSOR, "Temperature", "Maximum");
+```
+
+**Batch Modes:** `"Average"`, `"Sum"`, `"Minimum"`, `"Maximum"`
+
+**IC10:** `lb r? deviceHash logicType batchMode`
+
+---
+
+#### Load From Device Batched Named
+
+`loadBatchedNamed(deviceHash, nameHash, property, batchMode)` / `lbn(...)`
+
+Loads a property from devices matching both device hash and name hash:
+
+```rust
+const SENSOR_HASH = hash("StructureGasSensor");
+const SENSOR_NAME_HASH = hash("Outdoor Gas Sensor");
+let avgTemp = loadBatchedNamed(SENSOR_HASH, SENSOR_NAME_HASH, "Temperature", "Average");
+let maxTemp = lbn(SENSOR_HASH, SENSOR_NAME_HASH, "Temperature", "Maximum");
+```
+
+**IC10:** `lbn r? deviceHash nameHash logicType batchMode`
+
+**Note:** This function is useful when a script interfaces with a lot of
+devices, as it allows for arbitrary device access without limited to the 6 `dx` pins.
+
+---
+
+#### Load Slot
+
+`loadSlot(device, slotIndex, property)` / `ls(...)`
+
+Loads a slot property from a device:
+
+```rust
+let occupied = loadSlot(sorter, 0, "Occupied");
+let occupied = ls(sorter, 0, "Occupied");
+```
+
+**IC10:** `ls r? d? slotIndex logicSlotType`
+
+---
+
+#### Load Reagent
+
+`loadReagent(device, reagentMode, reagentHash)` / `lr(...)`
+
+Loads reagent information from a device:
+
+```rust
+let amount = loadReagent(furnace, "Contents", reagentHash);
+let amount = lr(furnace, "Contents", reagentHash);
+```
+
+**IC10:** `lr r? d? reagentMode reagentHash`
+
+---
+
+### Writing to Devices
+
+#### Set On Device
+
+`set(device, property, value)` / `s(...)`
+
+Sets a property on a device:
+
+```rust
+set(valve, "On", true);
+s(valve, "On", true);
+
+// Preferred: use dot notation
+valve.On = true;
+```
+
+**IC10:** `s d? logicType r?`
+
+---
+
+#### Set On Device Batched
+
+`setBatched(deviceHash, property, value)` / `sb(...)`
+
+Sets a property on all devices matching a hash:
+
+```rust
+const LIGHT_HASH = hash("StructureWallLight");
+setBatched(LIGHT_HASH, "On", true);
+sb(LIGHT_HASH, "On", true);
+```
+
+**IC10:** `sb deviceHash logicType r?`
+
+**Note:** This function is useful when a script interfaces with a lot of devices,
+as it allows for arbitrary device access without limited to the 6 `dx` pins.
+
+---
+
+#### Set On Device Batched Named
+
+`setBatchedNamed(deviceHash, nameHash, property, value)` / `sbn(...)`
+
+Sets a property on devices matching both device hash and name hash:
+
+```rust
+const SENSOR_HASH = hash("StructureGasSensor");
+const SENSOR_NAME_HASH = hash("Outdoor Gas Sensor");
+setBatchedNamed(SENSOR_HASH, SENSOR_NAME_HASH, "On", true);
+sbn(SENSOR_HASH, SENSOR_NAME_HASH, "On", true);
+```
+
+**IC10:** `sbn deviceHash nameHash logicType r?`
+
+---
+
+#### Set Slot
+
+`setSlot(device, slotIndex, property, value)` / `ss(...)`
+
+Sets a slot property on a device:
+
+```rust
+setSlot(sorter, 0, "Open", true);
+ss(sorter, 0, "Open", true);
+```
+
+**IC10:** `ss d? slotIndex logicSlotType r?`
+
+---
+
+## Math Functions
+
+All math functions accept numbers, variables, or expressions as arguments.
+
+### Trigonometric Functions
+
+| Function      | Description                  | IC10    |
+| ------------- | ---------------------------- | ------- |
+| `sin(x)`      | Sine of angle in radians     | `sin`   |
+| `cos(x)`      | Cosine of angle in radians   | `cos`   |
+| `tan(x)`      | Tangent of angle in radians  | `tan`   |
+| `asin(x)`     | Arc sine, returns radians    | `asin`  |
+| `acos(x)`     | Arc cosine, returns radians  | `acos`  |
+| `atan(x)`     | Arc tangent, returns radians | `atan`  |
+| `atan2(y, x)` | Two-argument arc tangent     | `atan2` |
+
+#### Trig Example
+
+```rust
+let angle = atan2(y, x);
+let sineValue = sin(angle);
+```
+
+### Rounding Functions
+
+| Function   | Description                   | IC10    |
+| ---------- | ----------------------------- | ------- |
+| `ceil(x)`  | Round up to nearest integer   | `ceil`  |
+| `floor(x)` | Round down to nearest integer | `floor` |
+| `trunc(x)` | Remove decimal portion        | `trunc` |
+| `abs(x)`   | Absolute value                | `abs`   |
+
+#### Rounding Example
+
+```rust
+let rounded = floor(3.7);  // 3
+let positive = abs(-5);    // 5
+```
+
+### Other Math Functions
+
+| Function    | Description                   | IC10   |
+| ----------- | ----------------------------- | ------ |
+| `sqrt(x)`   | Square root                   | `sqrt` |
+| `log(x)`    | Natural logarithm             | `log`  |
+| `max(a, b)` | Maximum of two values         | `max`  |
+| `min(a, b)` | Minimum of two values         | `min`  |
+| `rand()`    | Random number between 0 and 1 | `rand` |
+
+#### Math Example
+
+```rust
+let root = sqrt(16);        // 4
+let bigger = max(a, b);
+let randomVal = rand();
+```
+
+## See Also
+
+- [Language Reference](language-reference.md) — Complete syntax guide
+- [Examples](examples.md) — Real-world code samples

docs/examples.md

@@ -0,0 +1,254 @@
+# Examples
+
+Real-world Slang programs demonstrating common patterns.
+
+## Temperature Control
+
+Basic thermostat that controls an air conditioner based on room temperature:
+
+```rust
+device ac = "db";
+device roomGasSensor = "d0";
+
+const TARGET_TEMP = 22c;
+const HYSTERESIS = 1;
+
+loop {
+    yield();
+    let temp = roomGasSensor.Temperature;
+
+    if (temp > TARGET_TEMP + HYSTERESIS) {
+        ac.On = true;
+    } else if (temp < TARGET_TEMP - HYSTERESIS) {
+        ac.On = false;
+    }
+}
+```
+
+**Note:** The IC10 chip is assumed to be inserted in the air conditioner's IC slot.
+
+---
+
+## Two-Axis Solar Panel Tracking
+
+Handles two-axis solar panel tracking based on the sun's position:
+
+```rust
+device sensor = "d0";
+
+const H_PANELS = hash("StructureSolarPanelDual");
+
+loop {
+    setBatched(H_PANELS, "Horizontal", sensor.Horizontal);
+    setBatched(H_PANELS, "Vertical", sensor.Vertical + 90);
+    yield();
+}
+```
+
+**Note:** Assumes the daylight sensor is mounted with its port looking 90
+degrees east of the solar panel's data port, an offset can be added on the
+horizontal angle if needed.
+
+---
+
+## Day/Night Lighting
+
+Controls grow lights during the day and ambient lights at night:
+
+```rust
+device greenhouseSensor = "d0";
+
+const daylightSensor = hash("StructureDaylightSensor");
+const growLight = hash("StructureGrowLight");
+const wallLight = hash("StructureLightLong");
+
+loop {
+    yield();
+    let solarAngle = lb(daylightSensor, "SolarAngle", "Average");
+    let isDaylight = solarAngle < 90;
+
+    sb(growLight, "On", isDaylight);
+    sb(wallLight, "On", !isDaylight);
+}
+```
+
+---
+
+## Pressure Relief Valve
+
+Controls a volume pump based on pressure readings for emergency pressure relief:
+
+```rust
+device volumePump = "d0";
+device pipeSensor = "d1";
+
+const MAX_PRESSURE = 10_000;
+const R = 8.314;
+
+loop {
+    yield();
+
+    let pressure = pipeSensor.Pressure;
+
+    if (pressure > MAX_PRESSURE) {
+        // Use PV=nRT to calculate the amount of mols we need to move
+        // n = PV / RT
+        let molsToMove = (pressure - MAX_PRESSURE) *
+          pipeSensor.Volume / (R * pipeSensor.Temperature);
+
+        // V = nRT / P
+        let setting = molsToMove * R * pipeSensor.Temperature / pressure;
+        volumePump.Setting = setting;
+        volumePump.On = true;
+    } else {
+        volumePump.On = false;
+    }
+}
+```
+
+---
+
+## Greenhouse Environment Controller
+
+Complete greenhouse control with pressure, temperature, and lighting:
+
+```rust
+device self = "db";
+device emergencyRelief = "d0";
+device greenhouseSensor = "d1";
+device recycleValve = "d2";
+
+const MAX_INTERIOR_PRESSURE = 80;
+const MAX_INTERIOR_TEMP = 28c;
+const MIN_INTERIOR_PRESSURE = 75;
+const MIN_INTERIOR_TEMP = 25c;
+const daylightSensor = 1076425094;
+const growLight = hash("StructureGrowLight");
+const wallLight = hash("StructureLightLong");
+const lightRound = hash("StructureLightRound");
+
+let shouldPurge = false;
+
+loop {
+    yield();
+    let interiorPress = greenhouseSensor.Pressure;
+    let interiorTemp = greenhouseSensor.Temperature;
+
+    shouldPurge = (
+        interiorPress > MAX_INTERIOR_PRESSURE ||
+        interiorTemp > MAX_INTERIOR_TEMP
+    ) || shouldPurge;
+
+    emergencyRelief.On = shouldPurge;
+    recycleValve.On = !shouldPurge;
+
+    if (
+        shouldPurge && (
+          interiorPress < MIN_INTERIOR_PRESSURE &&
+          interiorTemp < MIN_INTERIOR_TEMP
+          )
+        ) {
+        shouldPurge = false;
+    }
+
+    let solarAngle = lb(daylightSensor, "SolarAngle", "Average");
+    let isDaylight = solarAngle < 90;
+
+    sb(growLight, "On", isDaylight);
+    sb(wallLight, "On", !isDaylight);
+    sb(lightRound, "On", !isDaylight);
+}
+```
+
+---
+
+## Advanced Furnace Pressure Control
+
+Automates multi-furnace pump control based on dial setting for pressure target:
+
+```rust
+const FURNACE1 = 1234;
+const DIAL1 = 1123;
+const ANALYZER1 = 1223;
+
+const FURNACE2 = 1235;
+const DIAL2 = 1124;
+const ANALYZER2 = 1224;
+
+const FURNACE3 = 1236;
+const DIAL3 = 1124;
+const ANALYZER3 = 1225;
+
+const R = 8.314;
+
+fn handleFurnace(furnace, dial, analyzer) {
+    let pressure = furnace.Pressure;
+    let targetPressure = max(dial.Setting, 0.1) * 1000;
+
+    if (abs(targetPressure - pressure) <= 0.1) {
+        furnace.On = false;
+        return;
+    }
+
+    let molsToMove = max(furnace.TotalMoles, 1) * (
+      (targetPressure / pressure) - 1
+    );
+
+    // V = nRT / P
+    if (molsToMove > 0) {
+        // Calculate volume required
+        if (analyzer.Pressure == 0) {
+            // No more gas to add
+            furnace.On = false;
+            return;
+        }
+        let volume = molsToMove * R * analyzer.Temperature / analyzer.Pressure;
+
+        furnace.On = true;
+        furnace.SettingOutput = 0;
+        furnace.SettingInput = volume;
+
+        return;
+    }
+
+    // Calculate volume required
+    let volume = (-molsToMove) * R * furnace.Temperature / pressure;
+
+    furnace.On = true;
+    furnace.SettingInput = 0;
+    furnace.SettingOutput = volume;
+
+    return;
+}
+
+loop {
+    yield();
+
+    handleFurnace(FURNACE1, DIAL1, ANALYZER1);
+    handleFurnace(FURNACE2, DIAL2, ANALYZER2);
+    handleFurnace(FURNACE3, DIAL3, ANALYZER3);
+}
+```
+
+**Note:** This example does not handle edge cases such as insufficient gas in
+the input network or overfilling the furnace/pipe network.
+
+---
+
+## Common Patterns
+
+### Waiting for a Condition
+
+```rust
+fn waitForDeviceToTurnOff(device) {
+    while (device.On) {
+        yield();
+    }
+}
+```
+
+## See Also
+
+- [Getting Started](getting-started.md) — First steps with Slang
+- [Language Reference](language-reference.md) — Complete syntax guide
+- [Built-in Functions](builtins.md) — System calls and math functions

docs/getting-started.md

@@ -0,0 +1,99 @@
+# Getting Started
+
+<!--toc:start-->
+
+- [Getting Started](#getting-started)
+  - [Program Structure](#program-structure)
+  - [The `yield()` Function](#the-yield-function)
+  - [Your First Program](#your-first-program)
+    - [Explanation](#explanation)
+  - [Comments](#comments)
+  - [See Also](#see-also)
+  <!--toc:end-->
+
+This guide covers the basics of writing your first Slang program.
+
+## Program Structure
+
+A Slang program consists of top-level declarations and a main loop:
+
+```rust
+// Device declarations
+device self = "db";
+device sensor = "d0";
+
+// Constants
+const THRESHOLD = 100;
+
+// Variables
+let counter = 0;
+
+// Main program loop
+loop {
+    yield();
+    // Your logic here
+}
+```
+
+## The `yield()` Function
+
+IC10 programs run continuously. The `yield()` function pauses execution for one
+game tick, preventing the script from consuming excessive resources.
+
+**Important:** You should always include `yield()` in your main loop unless you
+know what you're doing.
+
+```rust
+loop {
+    yield(); // Recommended!
+    // ...
+}
+```
+
+## Your First Program
+
+Here's a simple program that turns on a light when a gas sensor detects low
+pressure:
+
+```rust
+device gasSensor = "d0";
+device light = "d1";
+
+const LOW_PRESSURE = 50;
+
+loop {
+    yield();
+    light.On = gasSensor.Pressure < LOW_PRESSURE;
+}
+```
+
+### Explanation
+
+1. `device gasSensor = "d0"` — Binds the device at port `d0` to the name
+   `gasSensor`
+2. `device light = "d1"` — Binds the device at port `d1` to the name `light`
+3. `const LOW_PRESSURE = 50` — Defines a compile-time constant
+4. `loop { ... }` — Creates an infinite loop
+5. `yield()` — Pauses for one tick
+6. `light.On = gasSensor.Pressure < LOW_PRESSURE` — Reads the pressure and sets
+   the light state
+
+## Comments
+
+Slang supports single-line comments and documentation comments:
+
+```rust
+// This is a regular comment
+
+/// This is a documentation comment
+/// It can span multiple lines
+fn myFunction() {
+    // ...
+}
+```
+
+## See Also
+
+- [Language Reference](language-reference.md) — Complete syntax guide
+- [Built-in Functions](builtins.md) — Available system calls
+- [Examples](examples.md) — Real-world programs and patterns

docs/language-reference.md

@@ -0,0 +1,339 @@
+# Language Reference
+
+<!--toc:start-->
+
+- [Language Reference](#language-reference)
+  - [Literals](#literals)
+    - [Numbers](#numbers)
+    - [Temperature Literals](#temperature-literals)
+    - [Booleans](#booleans)
+    - [Strings](#strings)
+  - [Variables](#variables)
+    - [`let` - Mutable Variables](#let-mutable-variables)
+    - [`const` - Constants](#const-constants)
+  - [Device Declarations](#device-declarations)
+    - [Device Property Access](#device-property-access)
+    - [Device Property Assignment](#device-property-assignment)
+  - [Operators](#operators)
+    - [Arithmetic Operators](#arithmetic-operators)
+    - [Comparison Operators](#comparison-operators)
+    - [Logical Operators](#logical-operators)
+    - [Ternary Operator](#ternary-operator)
+    - [Operator Precedence](#operator-precedence)
+  - [Control Flow](#control-flow)
+    - [`if` / `else`](#if-and-else)
+    - [`loop`](#loop)
+    - [`while`](#while)
+    - [`break`](#break)
+    - [`continue`](#continue)
+  - [Functions](#functions)
+    - [Declaration](#declaration)
+    - [Invocation](#invocation)
+    - [Return Values](#return-values)
+  - [Parentheses for Grouping](#parentheses-for-grouping)
+  - [See Also](#see-also)
+  <!--toc:end-->
+
+Complete syntax reference for the Slang programming language.
+
+## Literals
+
+### Numbers
+
+Numbers can be integers or decimals. Underscores are allowed as visual
+separators:
+
+```rust
+const integer = 42;                 // Integer
+const decimal = 3.14;               // Decimal
+const million = 1_000_000;          // Integer with separators
+const decimalSeparators = 5_000.50; // Decimal with separators
+```
+
+### Temperature Literals
+
+Append a unit suffix to specify temperature. Values are automatically converted
+to Kelvin at compile time:
+
+| Suffix | Unit       | Example |
+| ------ | ---------- | ------- |
+| `c`    | Celsius    | `20c`   |
+| `f`    | Fahrenheit | `68f`   |
+| `k`    | Kelvin     | `293k`  |
+
+```rust
+const ROOM_TEMP = 20c;       // Converts to 293.15 Kelvin
+const FREEZING  = 32f;       // Converts to 273.15 Kelvin
+const ABSOLUTE1 = 0k;        // Already in Kelvin
+const ABSOLUTE2 = 0;         // Assumed to be in Kelvin
+```
+
+### Booleans
+
+Booleans compile to integer values `1` and `0` in IC10.
+
+```rust
+device ac = "d0";
+
+ac.Mode = false;
+ac.On = true;
+```
+
+### Strings
+
+Strings use double or single quotes. They are primarily used for prefab and
+name hashes.
+
+```rust
+const AC_HASH = hash("StructureAirConditioner");
+const AC_NAME_HASH = hash("Greenhouse Air Conditioner");
+```
+
+## Variables
+
+### `let` Mutable Variables
+
+Declares a variable that can be reassigned:
+
+```rust
+let counter = 0;
+// ...
+counter = counter + 1;
+```
+
+### `const` Constants
+
+Declares a compile-time constant. Constants are inlined and do not consume
+registers:
+
+```rust
+const MAX_PRESSURE = 10_000;
+const DOOR_HASH = hash("StructureCompositeDoor");
+```
+
+Constants support the `hash()` function for compile-time hash computation.
+
+## Device Declarations
+
+The `device` keyword binds a device port or reference ID to a named variable:
+
+```rust
+device self = "db";   // IC housing, or device the IC is plugged into (eg. an AC)
+device sensor = "d0"; // Device at port d0
+device valve = "d1";  // Device at port d1
+device ac1 = "$3FC";  // Device with reference ID $3FC (hexadecimal 1020)
+device ac2 = "1020";  // Device with reference ID 1020 (decimal)
+```
+
+**Note:** Reference IDs can be found in-game using the Configuration cartridge.
+
+### Device Property Access
+
+Read device properties using dot notation:
+
+```rust
+let temp = sensor.Temperature;
+let pressure = sensor.Pressure;
+let isOn = valve.On;
+```
+
+### Device Property Assignment
+
+Write to device properties using dot notation:
+
+```rust
+valve.On = true;
+valve.Setting = 100;
+```
+
+## Operators
+
+### Arithmetic Operators
+
+| Operator | Description    | Example  |
+| -------- | -------------- | -------- |
+| `+`      | Addition       | `a + b`  |
+| `-`      | Subtraction    | `a - b`  |
+| `*`      | Multiplication | `a * b`  |
+| `/`      | Division       | `a / b`  |
+| `%`      | Modulo         | `a % b`  |
+| `**`     | Exponentiation | `a ** b` |
+| `-`      | Negation       | `-a`     |
+
+### Comparison Operators
+
+| Operator | Description           | Example  |
+| -------- | --------------------- | -------- |
+| `==`     | Equal                 | `a == b` |
+| `!=`     | Not equal             | `a != b` |
+| `<`      | Less than             | `a < b`  |
+| `>`      | Greater than          | `a > b`  |
+| `<=`     | Less than or equal    | `a <= b` |
+| `>=`     | Greater than or equal | `a >= b` |
+
+### Logical Operators
+
+| Operator | Description | Example    |
+| -------- | ----------- | ---------- |
+| `&&`     | Logical AND | `a && b`   |
+| `\|\|`   | Logical OR  | `a \|\| b` |
+| `!`      | Logical NOT | `!a`       |
+
+### Ternary Operator
+
+Conditional expressions using `?` and `:`:
+
+```rust
+let result = condition ? valueIfTrue : valueIfFalse;
+```
+
+### Operator Precedence
+
+Operators are evaluated in the following order, from highest to lowest
+precedence:
+
+| Precedence | Operator(s)       | Description                      |
+| ---------- | ----------------- | -------------------------------- |
+| 1          | `()` `.`          | Grouping, Property access        |
+| 2          | `!` `-`           | Logical NOT, Negation            |
+| 3          | `**`              | Exponentiation                   |
+| 4          | `*` `/` `%`       | Multiplication, Division, Modulo |
+| 5          | `+` `-`           | Addition, Subtraction            |
+| 6          | `<` `<=` `>` `>=` | Comparison                       |
+| 7          | `==` `!=`         | Equality                         |
+| 8          | `&&`              | Logical AND                      |
+| 9          | `\|\|`            | Logical OR                       |
+| 10         | `?:`              | Ternary conditional              |
+| 11         | `=`               | Assignment                       |
+
+Use parentheses to override precedence:
+
+```rust
+let result = (20 + 10) * 5;
+```
+
+## Control Flow
+
+### if and else
+
+Conditional branching:
+
+```rust
+if (tank.Temperature > 30c) {
+    ac.On = true;
+} else {
+    ac.On = false;
+}
+```
+
+### `loop`
+
+Infinite loop that runs until `break`:
+
+```rust
+loop {
+    yield();
+    // Loop body
+    if (condition) {
+        break;  // Exit the loop
+    }
+}
+```
+
+### `while`
+
+Conditional loop that runs while the condition is true:
+
+```rust
+while (counter < 100) {
+    counter = counter + 1;
+    yield();
+}
+```
+
+### `break`
+
+Exits the current loop:
+
+```rust
+loop {
+    yield();
+    // ...
+    if (done) {
+        break;
+    }
+}
+```
+
+### `continue`
+
+Skips to the next iteration of the current loop:
+
+```rust
+loop {
+    yield();
+    if (shouldSkip) {
+        continue;
+    }
+    // This code is skipped when shouldSkip is true
+    // ...
+}
+```
+
+## Functions
+
+**Warning:** Functions are currently experimental and may produce suboptimal code.
+
+### Declaration
+
+```rust
+fn functionName(arg1, arg2) {
+    // Function body
+    return arg1 + arg2;
+}
+```
+
+### Invocation
+
+```rust
+let result = functionName(10, 20);
+```
+
+### Return Values
+
+Use `return` to exit a function and optionally return a value:
+
+```rust
+fn calculate(x) {
+    if (x < 0) {
+        return 0;  // Early return
+    }
+
+    return x * 2;
+}
+
+fn doWork() {
+    // No return value
+    return;
+}
+```
+
+## Parentheses for Grouping
+
+Use parentheses to control operator precedence:
+
+```rust
+let result = (a + b) * c;
+
+let complex = (
+    temp > 0c &&
+    stress < 50 &&
+    (pressure < 10_000 || temp > 20c)
+);
+```
+
+## See Also
+
+- [Getting Started](getting-started.md) — First steps with Slang
+- [Built-in Functions](builtins.md) — System calls and math functions
+- [Examples](examples.md) — Real-world code samples

rust_compiler/Cargo.lock

@@ -23,7 +23,7 @@ version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9"
 dependencies = [
- "getrandom",
+ "getrandom 0.2.16",
  "once_cell",
  "version_check",
 ]
@@ -73,7 +73,7 @@ version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc"
 dependencies = [
- "windows-sys",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -84,7 +84,7 @@ checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d"
 dependencies = [
  "anstyle",
  "once_cell_polyfill",
- "windows-sys",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -135,6 +135,12 @@ version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
+[[package]]
+name = "bitflags"
+version = "2.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3"
+
 [[package]]
 name = "bitvec"
 version = "1.0.1"
@@ -278,6 +284,18 @@ dependencies = [
  "tokenizer",
 ]
 
+[[package]]
+name = "console"
+version = "0.15.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "054ccb5b10f9f2cbf51eb355ca1d05c2d279ce1804688d0db74b4733a5aeafd8"
+dependencies = [
+ "encode_unicode",
+ "libc",
+ "once_cell",
+ "windows-sys 0.59.0",
+]
+
 [[package]]
 name = "crc32fast"
 version = "1.5.0"
@@ -293,12 +311,28 @@ version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
 
+[[package]]
+name = "encode_unicode"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0"
+
 [[package]]
 name = "equivalent"
 version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
 
+[[package]]
+name = "errno"
+version = "0.3.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
+dependencies = [
+ "libc",
+ "windows-sys 0.61.2",
+]
+
 [[package]]
 name = "ext-trait"
 version = "1.0.1"
@@ -334,13 +368,19 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "320bea982e85d42441eb25c49b41218e7eaa2657e8f90bc4eca7437376751e23"
 
+[[package]]
+name = "fastrand"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
+
 [[package]]
 name = "fluent-uri"
 version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "17c704e9dbe1ddd863da1e6ff3567795087b1eb201ce80d8fa81162e1516500d"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
 ]
 
 [[package]]
@@ -366,6 +406,18 @@ dependencies = [
  "wasi",
 ]
 
+[[package]]
+name = "getrandom"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "r-efi",
+ "wasip2",
+]
+
 [[package]]
 name = "gimli"
 version = "0.32.3"
@@ -428,6 +480,32 @@ dependencies = [
  "rustversion",
 ]
 
+[[package]]
+name = "insta"
+version = "1.45.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "983e3b24350c84ab8a65151f537d67afbbf7153bb9f1110e03e9fa9b07f67a5c"
+dependencies = [
+ "console",
+ "once_cell",
+ "similar",
+ "tempfile",
+]
+
+[[package]]
+name = "integration_tests"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "compiler",
+ "il",
+ "indoc",
+ "insta",
+ "optimizer",
+ "parser",
+ "tokenizer",
+]
+
 [[package]]
 name = "inventory"
 version = "0.3.21"
@@ -465,6 +543,12 @@ version = "0.2.178"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "37c93d8daa9d8a012fd8ab92f088405fb202ea0b6ab73ee2482ae66af4f42091"
 
+[[package]]
+name = "linux-raw-sys"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039"
+
 [[package]]
 name = "logos"
 version = "0.16.0"
@@ -505,7 +589,7 @@ version = "0.97.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "53353550a17c04ac46c585feb189c2db82154fc84b79c7a66c96c2c644f66071"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "fluent-uri",
  "serde",
  "serde_json",
@@ -678,6 +762,12 @@ dependencies = [
  "proc-macro2",
 ]
 
+[[package]]
+name = "r-efi"
+version = "5.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
+
 [[package]]
 name = "radium"
 version = "0.7.0"
@@ -711,7 +801,7 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom",
+ "getrandom 0.2.16",
 ]
 
 [[package]]
@@ -800,6 +890,19 @@ dependencies = [
  "semver",
 ]
 
+[[package]]
+name = "rustix"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "146c9e247ccc180c1f61615433868c99f3de3ae256a30a43b49f67c2d9171f34"
+dependencies = [
+ "bitflags 2.10.0",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys 0.61.2",
+]
+
 [[package]]
 name = "rustversion"
 version = "1.0.22"
@@ -928,9 +1031,15 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e"
 
+[[package]]
+name = "similar"
+version = "2.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbbb5d9659141646ae647b42fe094daf6c6192d1620870b449d9557f748b2daa"
+
 [[package]]
 name = "slang"
-version = "0.4.0"
+version = "0.5.1"
 dependencies = [
  "anyhow",
  "clap",
@@ -1014,6 +1123,19 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
+[[package]]
+name = "tempfile"
+version = "3.24.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "655da9c7eb6305c55742045d5a8d2037996d61d8de95806335c7c86ce0f82e9c"
+dependencies = [
+ "fastrand",
+ "getrandom 0.3.4",
+ "once_cell",
+ "rustix",
+ "windows-sys 0.61.2",
+]
+
 [[package]]
 name = "thiserror"
 version = "2.0.17"
@@ -1140,6 +1262,15 @@ version = "0.11.1+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
 
+[[package]]
+name = "wasip2"
+version = "1.0.1+wasi-0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7"
+dependencies = [
+ "wit-bindgen",
+]
+
 [[package]]
 name = "wasm-bindgen"
 version = "0.2.106"
@@ -1191,6 +1322,15 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
 
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets",
+]
+
 [[package]]
 name = "windows-sys"
 version = "0.61.2"
@@ -1200,6 +1340,70 @@ dependencies = [
  "windows-link",
 ]
 
+[[package]]
+name = "windows-targets"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+
 [[package]]
 name = "winnow"
 version = "0.7.14"
@@ -1209,6 +1413,12 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "wit-bindgen"
+version = "0.46.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59"
+
 [[package]]
 name = "with_builtin_macros"
 version = "0.0.3"

rust_compiler/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "slang"
-version = "0.4.0"
+version = "0.5.1"
 edition = "2021"
 
 [workspace]

rust_compiler/libs/compiler/src/test/binary_expression.rs

@@ -1,19 +1,24 @@
-use crate::compile;
 use anyhow::Result;
 use indoc::indoc;
 use pretty_assertions::assert_eq;
 
 #[test]
 fn simple_binary_expression() -> Result<()> {
-    let compiled = compile! {
-        debug
+    let result = compile! {
+        check
         "
         let i = 1 + 2;
         "
     };
 
+    assert!(
+        result.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        result.errors
+    );
+
     assert_eq!(
-        compiled,
+        result.output,
         indoc! {
             "
             j main
@@ -28,8 +33,8 @@ fn simple_binary_expression() -> Result<()> {
 
 #[test]
 fn nested_binary_expressions() -> Result<()> {
-    let compiled = compile! {
-        debug
+    let result = compile! {
+        check
         "
         fn calculateArgs(arg1, arg2, arg3) {
             return (arg1 + arg2) * arg3;
@@ -39,8 +44,14 @@ fn nested_binary_expressions() -> Result<()> {
         "
     };
 
+    assert!(
+        result.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        result.errors
+    );
+
     assert_eq!(
-        compiled,
+        result.output,
         indoc! {
             "
             j main
@@ -48,6 +59,7 @@ fn nested_binary_expressions() -> Result<()> {
             pop r8
             pop r9
             pop r10
+            push sp
             push ra
             add r1 r10 r9
             mul r2 r1 r8
@@ -55,6 +67,7 @@ fn nested_binary_expressions() -> Result<()> {
             j __internal_L1
             __internal_L1:
             pop ra
+            pop sp
             j ra
             main:
             push 10
@@ -73,15 +86,21 @@ fn nested_binary_expressions() -> Result<()> {
 
 #[test]
 fn stress_test_constant_folding() -> Result<()> {
-    let compiled = compile! {
-        debug
+    let result = compile! {
+        check
         "
         let negationHell = (-1 + -2) * (-3 + (-4 * (-5 + -6)));
         "
     };
 
+    assert!(
+        result.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        result.errors
+    );
+
     assert_eq!(
-        compiled,
+        result.output,
         indoc! {
             "
             j main
@@ -96,16 +115,22 @@ fn stress_test_constant_folding() -> Result<()> {
 
 #[test]
 fn test_constant_folding_with_variables_mixed_in() -> Result<()> {
-    let compiled = compile! {
-        debug
+    let result = compile! {
+        check
         r#"
         device self = "db";
         let i = 1 - 3 * (1 + 123.4) * self.Setting + 245c;
         "#
     };
 
+    assert!(
+        result.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        result.errors
+    );
+
     assert_eq!(
-        compiled,
+        result.output,
         indoc! {
             "
             j main
@@ -124,15 +149,21 @@ fn test_constant_folding_with_variables_mixed_in() -> Result<()> {
 
 #[test]
 fn test_ternary_expression() -> Result<()> {
-    let compiled = compile! {
-        debug
+    let result = compile! {
+        check
         r#"
         let i = 1 > 2 ? 15 : 20;
         "#
     };
 
+    assert!(
+        result.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        result.errors
+    );
+
     assert_eq!(
-        compiled,
+        result.output,
         indoc! {
             "
             j main
@@ -149,16 +180,22 @@ fn test_ternary_expression() -> Result<()> {
 
 #[test]
 fn test_ternary_expression_assignment() -> Result<()> {
-    let compiled = compile! {
-        debug
+    let result = compile! {
+        check
         r#"
         let i = 0;
         i = 1 > 2 ? 15 : 20;
         "#
     };
 
+    assert!(
+        result.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        result.errors
+    );
+
     assert_eq!(
-        compiled,
+        result.output,
         indoc! {
             "
             j main
@@ -176,15 +213,21 @@ fn test_ternary_expression_assignment() -> Result<()> {
 
 #[test]
 fn test_negative_literals() -> Result<()> {
-    let compiled = compile!(
-    debug
+    let result = compile!(
+    check
     r#"
         let item = -10c - 20c;
     "#
     );
 
+    assert!(
+        result.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        result.errors
+    );
+
     assert_eq!(
-        compiled,
+        result.output,
         indoc! {
             "
             j main
@@ -199,16 +242,22 @@ fn test_negative_literals() -> Result<()> {
 
 #[test]
 fn test_mismatched_temperature_literals() -> Result<()> {
-    let compiled = compile!(
-    debug
+    let result = compile!(
+    check
     r#"
         let item = -10c - 100k;
         let item2 = item + 500c;
     "#
     );
 
+    assert!(
+        result.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        result.errors
+    );
+
     assert_eq!(
-        compiled,
+        result.output,
         indoc! {
             "
             j main

rust_compiler/libs/compiler/src/test/branching.rs

@@ -1,11 +1,10 @@
-use crate::compile;
 use indoc::indoc;
 use pretty_assertions::assert_eq;
 
 #[test]
 fn test_if_statement() -> anyhow::Result<()> {
-    let compiled = compile! {
-        debug
+    let result = compile! {
+        check
         "
         let a = 10;
         if (a > 5) {
@@ -14,8 +13,14 @@ fn test_if_statement() -> anyhow::Result<()> {
         "
     };
 
+    assert!(
+        result.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        result.errors
+    );
+
     assert_eq!(
-        compiled,
+        result.output,
         indoc! {
             "
             j main
@@ -34,8 +39,8 @@ fn test_if_statement() -> anyhow::Result<()> {
 
 #[test]
 fn test_if_else_statement() -> anyhow::Result<()> {
-    let compiled = compile! {
-        debug
+    let result = compile! {
+        check
         "
         let a = 0;
         if (10 > 5) {
@@ -46,8 +51,14 @@ fn test_if_else_statement() -> anyhow::Result<()> {
         "
     };
 
+    assert!(
+        result.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        result.errors
+    );
+
     assert_eq!(
-        compiled,
+        result.output,
         indoc! {
             "
             j main
@@ -69,8 +80,8 @@ fn test_if_else_statement() -> anyhow::Result<()> {
 
 #[test]
 fn test_if_else_if_statement() -> anyhow::Result<()> {
-    let compiled = compile! {
-        debug
+    let result = compile! {
+        check
         "
         let a = 0;
         if (a == 1) {
@@ -83,8 +94,14 @@ fn test_if_else_if_statement() -> anyhow::Result<()> {
         "
     };
 
+    assert!(
+        result.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        result.errors
+    );
+
     assert_eq!(
-        compiled,
+        result.output,
         indoc! {
             "
             j main
@@ -112,8 +129,8 @@ fn test_if_else_if_statement() -> anyhow::Result<()> {
 
 #[test]
 fn test_spilled_variable_update_in_branch() -> anyhow::Result<()> {
-    let compiled = compile! {
-        debug
+    let result = compile! {
+        check
         "
         let a = 1;
         let b = 2;
@@ -130,8 +147,14 @@ fn test_spilled_variable_update_in_branch() -> anyhow::Result<()> {
         "
     };
 
+    assert!(
+        result.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        result.errors
+    );
+
     assert_eq!(
-        compiled,
+        result.output,
         indoc! {
             "
             j main

rust_compiler/libs/compiler/src/test/declaration_function_invocation.rs

@@ -1,24 +1,31 @@
-use crate::compile;
 use indoc::indoc;
 use pretty_assertions::assert_eq;
 
 #[test]
 fn no_arguments() -> anyhow::Result<()> {
-    let compiled = compile! {
-        debug
+    let result = compile! {
+        check
         "
         fn doSomething() {};
         let i = doSomething();
         "
     };
 
+    assert!(
+        result.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        result.errors
+    );
+
     let to_test = indoc! {
         "
         j main
         doSomething:
+        push sp
         push ra
         __internal_L1:
         pop ra
+        pop sp
         j ra
         main:
         jal doSomething
@@ -26,15 +33,15 @@ fn no_arguments() -> anyhow::Result<()> {
         "
     };
 
-    assert_eq!(compiled, to_test);
+    assert_eq!(result.output, to_test);
 
     Ok(())
 }
 
 #[test]
 fn let_var_args() -> anyhow::Result<()> {
-    let compiled = compile! {
-        debug
+    let result = compile! {
+        check
         "
         fn mul2(arg1) {
             return arg1 * 2;
@@ -47,19 +54,27 @@ fn let_var_args() -> anyhow::Result<()> {
         "
     };
 
+    assert!(
+        result.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        result.errors
+    );
+
     assert_eq!(
-        compiled,
+        result.output,
         indoc! {
             "
             j main
             mul2:
             pop r8
+            push sp
             push ra
             mul r1 r8 2
             move r15 r1
             j __internal_L1
             __internal_L1:
             pop ra
+            pop sp
             j ra
             main:
             __internal_L2:
@@ -100,8 +115,8 @@ fn incorrect_args_count() -> anyhow::Result<()> {
 
 #[test]
 fn inline_literal_args() -> anyhow::Result<()> {
-    let compiled = compile! {
-        debug
+    let result = compile! {
+        check
         "
         fn doSomething(arg1, arg2) {
             return 5;
@@ -111,19 +126,27 @@ fn inline_literal_args() -> anyhow::Result<()> {
         "
     };
 
+    assert!(
+        result.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        result.errors
+    );
+
     assert_eq!(
-        compiled,
+        result.output,
         indoc! {
             "
             j main
             doSomething:
             pop r8
             pop r9
+            push sp
             push ra
             move r15 5
             j __internal_L1
             __internal_L1:
             pop ra
+            pop sp
             j ra
             main:
             move r8 123
@@ -142,8 +165,8 @@ fn inline_literal_args() -> anyhow::Result<()> {
 
 #[test]
 fn mixed_args() -> anyhow::Result<()> {
-    let compiled = compile! {
-        debug
+    let result = compile! {
+        check
         "
         let arg1 = 123;
         let returnValue = doSomething(arg1, 456);
@@ -151,17 +174,25 @@ fn mixed_args() -> anyhow::Result<()> {
         "
     };
 
+    assert!(
+        result.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        result.errors
+    );
+
     assert_eq!(
-        compiled,
+        result.output,
         indoc! {
             "
             j main
             doSomething:
             pop r8
             pop r9
+            push sp
             push ra
             __internal_L1:
             pop ra
+            pop sp
             j ra
             main:
             move r8 123
@@ -180,8 +211,8 @@ fn mixed_args() -> anyhow::Result<()> {
 
 #[test]
 fn with_return_statement() -> anyhow::Result<()> {
-    let compiled = compile! {
-        debug
+    let result = compile! {
+        check
         "
         fn doSomething(arg1) {
             return 456;
@@ -191,18 +222,26 @@ fn with_return_statement() -> anyhow::Result<()> {
         "
     };
 
+    assert!(
+        result.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        result.errors
+    );
+
     assert_eq!(
-        compiled,
+        result.output,
         indoc! {
             "
             j main
             doSomething:
             pop r8
+            push sp
             push ra
             move r15 456
             j __internal_L1
             __internal_L1:
             pop ra
+            pop sp
             j ra
             main:
             push 123
@@ -217,8 +256,8 @@ fn with_return_statement() -> anyhow::Result<()> {
 
 #[test]
 fn with_negative_return_literal() -> anyhow::Result<()> {
-    let compiled = compile! {
-        debug
+    let result = compile! {
+        check
         "
         fn doSomething() {
             return -1;
@@ -227,16 +266,24 @@ fn with_negative_return_literal() -> anyhow::Result<()> {
         "
     };
 
+    assert!(
+        result.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        result.errors
+    );
+
     assert_eq!(
-        compiled,
+        result.output,
         indoc! {
             "
             j main
             doSomething:
+            push sp
             push ra
             move r15 -1
             __internal_L1:
             pop ra
+            pop sp
             j ra
             main:
             jal doSomething

rust_compiler/libs/compiler/src/test/declaration_literal.rs

@@ -4,13 +4,19 @@ use pretty_assertions::assert_eq;
 #[test]
 fn variable_declaration_numeric_literal() -> anyhow::Result<()> {
     let compiled = crate::compile! {
-        debug r#"
+        check r#"
             let i = 20c;
         "#
     };
 
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
     assert_eq!(
-        compiled,
+        compiled.output,
         indoc! {
             "
             j main
@@ -26,7 +32,7 @@ fn variable_declaration_numeric_literal() -> anyhow::Result<()> {
 #[test]
 fn variable_declaration_numeric_literal_stack_spillover() -> anyhow::Result<()> {
     let compiled = compile! {
-        debug
+        check
         r#"
         let a = 0;
         let b = 1;
@@ -40,8 +46,14 @@ fn variable_declaration_numeric_literal_stack_spillover() -> anyhow::Result<()>
         let j = 9;
     "#};
 
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
     assert_eq!(
-        compiled,
+        compiled.output,
         indoc! {
             "
             j main
@@ -67,14 +79,20 @@ fn variable_declaration_numeric_literal_stack_spillover() -> anyhow::Result<()>
 #[test]
 fn variable_declaration_negative() -> anyhow::Result<()> {
     let compiled = compile! {
-        debug
+        check
         "
         let i = -1;
         "
     };
 
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
     assert_eq!(
-        compiled,
+        compiled.output,
         indoc! {
             "
             j main
@@ -90,15 +108,21 @@ fn variable_declaration_negative() -> anyhow::Result<()> {
 #[test]
 fn test_boolean_declaration() -> anyhow::Result<()> {
     let compiled = compile! {
-        debug
+        check
         "
         let t = true;
         let f = false;
         "
     };
 
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
     assert_eq!(
-        compiled,
+        compiled.output,
         indoc! {
             "
             j main
@@ -115,7 +139,7 @@ fn test_boolean_declaration() -> anyhow::Result<()> {
 #[test]
 fn test_boolean_return() -> anyhow::Result<()> {
     let compiled = compile! {
-        debug
+        check
         "
         fn getTrue() {
             return true;
@@ -125,17 +149,25 @@ fn test_boolean_return() -> anyhow::Result<()> {
         "
     };
 
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
     assert_eq!(
-        compiled,
+        compiled.output,
         indoc! {
             "
             j main
             getTrue:
+            push sp
             push ra
             move r15 1
             j __internal_L1
             __internal_L1:
             pop ra
+            pop sp
             j ra
             main:
             jal getTrue
@@ -149,15 +181,21 @@ fn test_boolean_return() -> anyhow::Result<()> {
 
 #[test]
 fn test_const_hash_expr() -> anyhow::Result<()> {
-    let compiled = compile!(debug r#"
+    let compiled = compile!(check r#"
         const nameHash = hash("AccessCard");
         device self = "db";
 
         self.Setting = nameHash;
     "#);
 
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
     assert_eq!(
-        compiled,
+        compiled.output,
         indoc! {
         "
             j main
@@ -168,3 +206,34 @@ fn test_const_hash_expr() -> anyhow::Result<()> {
     );
     Ok(())
 }
+
+#[test]
+fn test_declaration_is_const() -> anyhow::Result<()> {
+    let compiled = compile! {
+        check
+        r#"
+            const MAX = 100;
+
+            let max = MAX;
+        "#
+    };
+
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
+    assert_eq!(
+        compiled.output,
+        indoc! {
+            "
+            j main
+            main:
+            move r8 100
+            "
+        }
+    );
+
+    Ok(())
+}

rust_compiler/libs/compiler/src/test/device_access.rs

@@ -0,0 +1,379 @@
+use indoc::indoc;
+use pretty_assertions::assert_eq;
+
+#[test]
+fn device_declaration() -> anyhow::Result<()> {
+    let compiled = compile! {
+        check "
+            device d0 = \"d0\";
+        "
+    };
+
+    // Declaration only emits the jump label header
+    assert_eq!(compiled.output, "j main\n");
+
+    Ok(())
+}
+
+#[test]
+fn device_property_read() -> anyhow::Result<()> {
+    let compiled = compile! {
+        check "
+            device ac = \"d0\";
+            let temp = ac.Temperature;
+        "
+    };
+
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
+    assert_eq!(
+        compiled.output,
+        indoc! {
+            "
+            j main
+            main:
+            l r1 d0 Temperature
+            move r8 r1
+            "
+        }
+    );
+
+    Ok(())
+}
+
+#[test]
+fn device_property_write() -> anyhow::Result<()> {
+    let compiled = compile! {
+        check "
+            device ac = \"d0\";
+            ac.On = 1;
+        "
+    };
+
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
+    assert_eq!(
+        compiled.output,
+        indoc! {
+            "
+            j main
+            main:
+            s d0 On 1
+            "
+        }
+    );
+
+    Ok(())
+}
+
+#[test]
+fn multiple_device_declarations() -> anyhow::Result<()> {
+    let compiled = compile! {
+        check "
+            device d0 = \"d0\";
+            device d1 = \"d1\";
+            device d2 = \"d2\";
+        "
+    };
+
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
+    // Declarations only emit the header when unused
+    assert_eq!(compiled.output, "j main\n");
+
+    Ok(())
+}
+
+#[test]
+fn device_with_variable_interaction() -> anyhow::Result<()> {
+    let compiled = compile! {
+        check "
+            device sensor = \"d0\";
+            let reading = sensor.Temperature;
+            let threshold = 373.15;
+            let alert = reading > threshold;
+        "
+    };
+
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
+    assert_eq!(
+        compiled.output,
+        indoc! {
+            "
+            j main
+            main:
+            l r1 d0 Temperature
+            move r8 r1
+            move r9 373.15
+            sgt r2 r8 r9
+            move r10 r2
+            "
+        }
+    );
+
+    Ok(())
+}
+
+#[test]
+fn device_property_in_arithmetic() -> anyhow::Result<()> {
+    let compiled = compile! {
+        check "
+            device d0 = \"d0\";
+            let result = d0.Temperature + 100;
+        "
+    };
+
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
+    // Verify that we load property, add 100, and move to result
+    assert_eq!(
+        compiled.output,
+        indoc! {
+            "
+            j main
+            main:
+            l r1 d0 Temperature
+            add r2 r1 100
+            move r8 r2
+            "
+        }
+    );
+
+    Ok(())
+}
+
+#[test]
+fn device_used_in_function() -> anyhow::Result<()> {
+    let compiled = compile! {
+        check "
+            device d0 = \"d0\";
+            
+            fn check_power() {
+                return d0.On;
+            };
+            
+            let powered = check_power();
+        "
+    };
+
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
+    assert_eq!(
+        compiled.output,
+        indoc! {
+            "
+            j main
+            check_power:
+            push sp
+            push ra
+            l r1 d0 On
+            move r15 r1
+            j __internal_L1
+            __internal_L1:
+            pop ra
+            pop sp
+            j ra
+            main:
+            jal check_power
+            move r8 r15
+            "
+        }
+    );
+
+    Ok(())
+}
+
+#[test]
+fn device_in_conditional() -> anyhow::Result<()> {
+    let compiled = compile! {
+        check "
+            device d0 = \"d0\";
+            
+            if (d0.On) {
+                let x = 1;
+            }
+        "
+    };
+
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
+    assert_eq!(
+        compiled.output,
+        indoc! {
+            "
+            j main
+            main:
+            l r1 d0 On
+            beqz r1 __internal_L1
+            move r8 1
+            __internal_L1:
+            "
+        }
+    );
+
+    Ok(())
+}
+
+#[test]
+fn device_property_with_underscore_name() -> anyhow::Result<()> {
+    let compiled = compile! {
+        check "
+            device cool_device = \"d0\";
+            let value = cool_device.SomeProperty;
+        "
+    };
+
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
+    assert_eq!(
+        compiled.output,
+        indoc! {
+            "
+            j main
+            main:
+            l r1 d0 SomeProperty
+            move r8 r1
+            "
+        }
+    );
+
+    Ok(())
+}
+
+#[test]
+fn device_index_read() -> anyhow::Result<()> {
+    let compiled = compile! {
+        check "
+            device printer = \"d0\";
+            let value = printer[255];
+        "
+    };
+
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
+    assert_eq!(
+        compiled.output,
+        indoc! {
+            "
+            j main
+            main:
+            get r1 d0 255
+            move r8 r1
+            "
+        }
+    );
+
+    Ok(())
+}
+
+#[test]
+fn device_index_write() -> anyhow::Result<()> {
+    let compiled = compile! {
+        check "
+            device printer = \"d0\";
+            printer[255] = 42;
+        "
+    };
+
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
+    assert_eq!(
+        compiled.output,
+        indoc! {
+            "
+            j main
+            main:
+            put d0 255 42
+            "
+        }
+    );
+
+    Ok(())
+}
+
+#[test]
+fn device_index_db_not_allowed() -> anyhow::Result<()> {
+    let compiled = compile! {
+        check "
+            device stack = \"db\";
+            let x = stack[10];
+        "
+    };
+
+    assert!(
+        !compiled.errors.is_empty(),
+        "Expected error for db indexing"
+    );
+    assert!(
+        compiled.errors[0]
+            .to_string()
+            .contains("Direct stack access on 'db' is not yet supported"),
+        "Expected db restriction error"
+    );
+
+    Ok(())
+}
+
+#[test]
+fn device_index_db_write_not_allowed() -> anyhow::Result<()> {
+    let compiled = compile! {
+        check "
+            device stack = \"db\";
+            stack[10] = 42;
+        "
+    };
+
+    assert!(
+        !compiled.errors.is_empty(),
+        "Expected error for db indexing"
+    );
+    assert!(
+        compiled.errors[0]
+            .to_string()
+            .contains("Direct stack access on 'db' is not yet supported"),
+        "Expected db restriction error"
+    );
+
+    Ok(())
+}

rust_compiler/libs/compiler/src/test/edge_cases.rs

@@ -0,0 +1,737 @@
+use indoc::indoc;
+use pretty_assertions::assert_eq;
+
+#[test]
+fn zero_value_handling() -> anyhow::Result<()> {
+    let result = compile! {
+        check "
+            let x = 0;
+            let y = x + 0;
+            let z = x * 100;
+        "
+    };
+
+    assert!(
+        result.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        result.errors
+    );
+
+    assert_eq!(
+        result.output,
+        indoc! {
+            "
+            j main
+            main:
+            move r8 0
+            add r1 r8 0
+            move r9 r1
+            mul r2 r8 100
+            move r10 r2
+            "
+        }
+    );
+
+    Ok(())
+}
+
+#[test]
+fn negative_number_handling() -> anyhow::Result<()> {
+    let result = compile! {
+        check "
+            let x = -100;
+            let y = -x;
+            let z = -(-50);
+        "
+    };
+
+    assert!(
+        result.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        result.errors
+    );
+
+    assert_eq!(
+        result.output,
+        indoc! {
+            "
+            j main
+            main:
+            move r8 -100
+            sub r1 0 r8
+            move r9 r1
+            move r10 50
+            "
+        }
+    );
+
+    Ok(())
+}
+
+#[test]
+fn large_number_constants() -> anyhow::Result<()> {
+    let result = compile! {
+        check "
+            let x = 999999999;
+            let y = x + 1;
+        "
+    };
+
+    assert!(
+        result.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        result.errors
+    );
+
+    assert_eq!(
+        result.output,
+        indoc! {
+            "
+            j main
+            main:
+            move r8 999999999
+            add r1 r8 1
+            move r9 r1
+            "
+        }
+    );
+
+    Ok(())
+}
+
+#[test]
+fn floating_point_precision() -> anyhow::Result<()> {
+    let result = compile! {
+        check "
+            let pi = 3.14159265;
+            let e = 2.71828182;
+            let sum = pi + e;
+        "
+    };
+
+    assert!(
+        result.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        result.errors
+    );
+
+    assert_eq!(
+        result.output,
+        indoc! {
+            "
+            j main
+            main:
+            move r8 3.14159265
+            move r9 2.71828182
+            add r1 r8 r9
+            move r10 r1
+            "
+        }
+    );
+
+    Ok(())
+}
+
+#[test]
+fn temperature_unit_conversion() -> anyhow::Result<()> {
+    let result = compile! {
+        check "
+            let celsius = 20c;
+            let fahrenheit = 68f;
+            let kelvin = 293.15k;
+        "
+    };
+
+    assert!(
+        result.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        result.errors
+    );
+
+    assert_eq!(
+        result.output,
+        indoc! {
+            "
+            j main
+            main:
+            move r8 293.15
+            move r9 293.15
+            move r10 293.15
+            "
+        }
+    );
+
+    Ok(())
+}
+
+#[test]
+fn mixed_temperature_units() -> anyhow::Result<()> {
+    let compiled = compile! {
+        check "
+            let c = 0c;
+            let f = 32f;
+            let k = 273.15k;
+        "
+    };
+
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
+    assert_eq!(
+        compiled.output,
+        indoc! {
+            "
+            j main
+            main:
+            move r8 273.15
+            move r9 273.15
+            move r10 273.15
+            "
+        }
+    );
+
+    Ok(())
+}
+
+#[test]
+fn boolean_constant_folding() -> anyhow::Result<()> {
+    let compiled = compile! {
+        check "
+            let x = true;
+            let y = false;
+            let z = true && true;
+        "
+    };
+
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
+    assert_eq!(
+        compiled.output,
+        indoc! {
+            "
+            j main
+            main:
+            move r8 1
+            move r9 0
+            and r1 1 1
+            move r10 r1
+            "
+        }
+    );
+
+    Ok(())
+}
+
+#[test]
+fn empty_block() -> anyhow::Result<()> {
+    let compiled = compile! {
+        check "
+            let x = 5;
+            {
+            }
+            let y = x;
+        "
+    };
+
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
+    assert_eq!(
+        compiled.output,
+        indoc! {
+            "
+            j main
+            main:
+            move r8 5
+            move r9 r8
+            "
+        }
+    );
+
+    Ok(())
+}
+
+#[test]
+fn multiple_statements_same_line() -> anyhow::Result<()> {
+    let compiled = compile! {
+        check "
+            let x = 1; let y = 2; let z = 3;
+        "
+    };
+
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
+    assert_eq!(
+        compiled.output,
+        indoc! {
+            "
+            j main
+            main:
+            move r8 1
+            move r9 2
+            move r10 3
+            "
+        }
+    );
+
+    Ok(())
+}
+
+#[test]
+fn function_with_no_return() -> anyhow::Result<()> {
+    let compiled = compile! {
+        check "
+            fn no_return() {
+                let x = 5;
+            };
+            
+            no_return();
+        "
+    };
+
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
+    assert_eq!(
+        compiled.output,
+        indoc! {
+            "
+            j main
+            no_return:
+            push sp
+            push ra
+            move r8 5
+            __internal_L1:
+            pop ra
+            pop sp
+            j ra
+            main:
+            jal no_return
+            move r1 r15
+            "
+        }
+    );
+
+    Ok(())
+}
+
+#[test]
+fn deeply_nested_expressions() -> anyhow::Result<()> {
+    let compiled = compile! {
+        check "
+            let x = ((((((((1 + 2) + 3) + 4) + 5) + 6) + 7) + 8) + 9);
+        "
+    };
+
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
+    assert_eq!(
+        compiled.output,
+        indoc! {
+            "
+            j main
+            main:
+            move r8 45
+            "
+        }
+    );
+
+    Ok(())
+}
+
+#[test]
+fn constant_folding_with_operations() -> anyhow::Result<()> {
+    let compiled = compile! {
+        check "
+            let x = 10 * 5 + 3 - 2;
+        "
+    };
+
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
+    assert_eq!(
+        compiled.output,
+        indoc! {
+            "
+            j main
+            main:
+            move r8 51
+            "
+        }
+    );
+
+    Ok(())
+}
+
+#[test]
+fn constant_folding_with_division() -> anyhow::Result<()> {
+    let compiled = compile! {
+        check "
+            let x = 100 / 2 / 5;
+        "
+    };
+
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
+    assert_eq!(
+        compiled.output,
+        indoc! {
+            "
+            j main
+            main:
+            move r8 10
+            "
+        }
+    );
+
+    Ok(())
+}
+
+#[test]
+fn modulo_operation() -> anyhow::Result<()> {
+    let compiled = compile! {
+        check "
+            let x = 17 % 5;
+            let y = 10 % 3;
+        "
+    };
+
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+    assert_eq!(
+        compiled.output,
+        indoc! {
+            "
+            j main
+            main:
+            move r8 2
+            move r9 1
+            "
+        }
+    );
+
+    Ok(())
+}
+
+#[test]
+fn exponentiation() -> anyhow::Result<()> {
+    let compiled = compile! {
+        check "
+            let x = 2 ** 8;
+            let y = 3 ** 3;
+        "
+    };
+
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
+    assert_eq!(
+        compiled.output,
+        indoc! {
+            "
+            j main
+            main:
+            pow r1 2 8
+            move r8 r1
+            pow r2 3 3
+            move r9 r2
+            "
+        }
+    );
+
+    Ok(())
+}
+
+#[test]
+fn comparison_with_zero() -> anyhow::Result<()> {
+    let compiled = compile! {
+        check "
+            let x = 0 == 0;
+            let y = 0 < 1;
+            let z = 0 > -1;
+        "
+    };
+
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
+    assert_eq!(
+        compiled.output,
+        indoc! {
+            "
+            j main
+            main:
+            seq r1 0 0
+            move r8 r1
+            slt r2 0 1
+            move r9 r2
+            sgt r3 0 -1
+            move r10 r3
+            "
+        }
+    );
+
+    Ok(())
+}
+
+#[test]
+fn boolean_negation_edge_cases() -> anyhow::Result<()> {
+    let compiled = compile! {
+        check "
+            let x = !0;
+            let y = !1;
+            let z = !100;
+        "
+    };
+
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
+    assert_eq!(
+        compiled.output,
+        indoc! {
+            "
+            j main
+            main:
+            seq r1 0 0
+            move r8 r1
+            seq r2 1 0
+            move r9 r2
+            seq r3 100 0
+            move r10 r3
+            "
+        }
+    );
+
+    Ok(())
+}
+
+#[test]
+fn function_with_many_parameters() -> anyhow::Result<()> {
+    let compiled = compile! {
+        check "
+            fn many_params(a, b, c, d, e, f, g, h) {
+                return a + b + c + d + e + f + g + h;
+            };
+            
+            let result = many_params(1, 2, 3, 4, 5, 6, 7, 8);
+        "
+    };
+
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
+    assert_eq!(
+        compiled.output,
+        indoc! {
+            "
+            j main
+            many_params:
+            pop r8
+            pop r9
+            pop r10
+            pop r11
+            pop r12
+            pop r13
+            pop r14
+            push sp
+            push ra
+            sub r0 sp 3
+            get r1 db r0
+            add r2 r1 r14
+            add r3 r2 r13
+            add r4 r3 r12
+            add r5 r4 r11
+            add r6 r5 r10
+            add r7 r6 r9
+            add r1 r7 r8
+            move r15 r1
+            j __internal_L1
+            __internal_L1:
+            pop ra
+            pop sp
+            j ra
+            main:
+            push 1
+            push 2
+            push 3
+            push 4
+            push 5
+            push 6
+            push 7
+            push 8
+            jal many_params
+            move r8 r15
+            "
+        }
+    );
+
+    Ok(())
+}
+
+#[test]
+fn tuple_declaration_with_functions() -> anyhow::Result<()> {
+    let compiled = compile! {
+        check
+        r#"
+            device self = "db";
+            fn doSomething() {
+                return (self.Setting, self.Temperature);
+            }
+
+            let (setting, temperature) = doSomething();
+        "#
+    };
+
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
+    assert_eq!(
+        compiled.output,
+        indoc! {"
+            j main
+            doSomething:
+            push sp
+            push ra
+            l r1 db Setting
+            push r1
+            l r2 db Temperature
+            push r2
+            sub r0 sp 4
+            get r0 db r0
+            move r15 r0
+            j __internal_L1
+            __internal_L1:
+            sub r0 sp 3
+            get ra db r0
+            j ra
+            main:
+            jal doSomething
+            pop r9
+            pop r8
+            move sp r15
+        "}
+    );
+
+    Ok(())
+}
+
+#[test]
+fn tuple_from_simple_function() -> anyhow::Result<()> {
+    let compiled = compile! {
+        check "
+            fn get_pair() {
+                return (1, 2);
+            }
+
+            let (a, b) = get_pair();
+        "
+    };
+
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
+    assert_eq!(
+        compiled.output,
+        indoc! {"
+            j main
+            get_pair:
+            push sp
+            push ra
+            push 1
+            push 2
+            sub r0 sp 4
+            get r0 db r0
+            move r15 r0
+            j __internal_L1
+            __internal_L1:
+            sub r0 sp 3
+            get ra db r0
+            j ra
+            main:
+            jal get_pair
+            pop r9
+            pop r8
+            move sp r15
+        "}
+    );
+
+    Ok(())
+}
+
+#[test]
+fn tuple_from_expression_not_function() -> anyhow::Result<()> {
+    let compiled = compile! {
+        check "
+            let (a, b) = (5 + 3, 10 * 2);
+        "
+    };
+
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
+    assert_eq!(
+        compiled.output,
+        indoc! {"
+            j main
+            main:
+            move r8 8
+            move r9 20
+        "}
+    );
+
+    Ok(())
+}

rust_compiler/libs/compiler/src/test/error_handling.rs

@@ -0,0 +1,197 @@
+use crate::Error;
+use crate::variable_manager::Error as ScopeError;
+
+#[test]
+fn unknown_identifier_error() {
+    let errors = compile! {
+        result "let x = unknown_var;"
+    };
+
+    assert_eq!(errors.len(), 1);
+    match &errors[0] {
+        Error::UnknownIdentifier(name, _) => {
+            assert_eq!(name.as_ref(), "unknown_var");
+        }
+        _ => panic!("Expected UnknownIdentifier error, got {:?}", errors[0]),
+    }
+}
+
+#[test]
+fn duplicate_identifier_error() {
+    let errors = compile! {
+        result "
+            let x = 5;
+            let x = 10;
+        "
+    };
+
+    assert_eq!(errors.len(), 1);
+    match &errors[0] {
+        Error::Scope(ScopeError::DuplicateVariable(name, _)) => {
+            assert_eq!(name.as_ref(), "x");
+        }
+        _ => panic!("Expected DuplicateIdentifier error, got {:?}", errors[0]),
+    }
+}
+
+#[test]
+fn const_reassignment_error() {
+    let errors = compile! {
+        result "
+            const PI = 3.14;
+            PI = 2.71;
+        "
+    };
+
+    assert_eq!(errors.len(), 1);
+    match &errors[0] {
+        Error::ConstAssignment(name, _) => {
+            assert_eq!(name.as_ref(), "PI");
+        }
+        _ => panic!("Expected ConstAssignment error, got {:?}", errors[0]),
+    }
+}
+
+#[test]
+fn unknown_function_call_error() {
+    let errors = compile! {
+        result "
+            let result = unknown_function();
+        "
+    };
+
+    assert_eq!(errors.len(), 1);
+    match &errors[0] {
+        Error::UnknownIdentifier(name, _) => {
+            assert_eq!(name.as_ref(), "unknown_function");
+        }
+        _ => panic!("Expected UnknownIdentifier error, got {:?}", errors[0]),
+    }
+}
+
+#[test]
+fn argument_mismatch_error() {
+    let errors = compile! {
+        result "
+            fn add(a, b) {
+                return a + b;
+            };
+            
+            let result = add(1);
+        "
+    };
+
+    // The error should be an AgrumentMismatch
+    assert!(
+        errors
+            .iter()
+            .any(|e| matches!(e, Error::AgrumentMismatch(_, _)))
+    );
+}
+
+#[test]
+fn tuple_size_mismatch_error() {
+    let errors = compile! {
+        result "
+            fn pair() {
+                return (1, 2);
+            };
+            
+            let (x, y, z) = pair();
+        "
+    };
+
+    assert!(
+        errors
+            .iter()
+            .any(|e| matches!(e, Error::TupleSizeMismatch(2, 3, _)))
+    );
+}
+
+#[test]
+fn multiple_errors_reported() {
+    let errors = compile! {
+        result "
+            let x = unknown1;
+            let x = 5;
+            let y = unknown2;
+        "
+    };
+
+    // Should have at least 3 errors
+    assert!(
+        errors.len() >= 2,
+        "Expected at least 2 errors, got {}",
+        errors.len()
+    );
+}
+
+#[test]
+fn return_outside_function_error() {
+    let errors = compile! {
+        result "
+            let x = 5;
+            return x;
+        "
+    };
+
+    // Should have an error about return outside function
+    assert!(
+        !errors.is_empty(),
+        "Expected error for return outside function"
+    );
+}
+
+#[test]
+fn break_outside_loop_error() {
+    let errors = compile! {
+        result "
+            break;
+        "
+    };
+
+    assert!(!errors.is_empty(), "Expected error for break outside loop");
+}
+
+#[test]
+fn continue_outside_loop_error() {
+    let errors = compile! {
+        result "
+            continue;
+        "
+    };
+
+    assert!(
+        !errors.is_empty(),
+        "Expected error for continue outside loop"
+    );
+}
+
+#[test]
+fn device_reassignment_error() {
+    let errors = compile! {
+        result "
+            device d0 = \"d0\";
+            device d0 = \"d1\";
+        "
+    };
+
+    assert!(
+        errors
+            .iter()
+            .any(|e| matches!(e, Error::DuplicateIdentifier(_, _)))
+    );
+}
+
+#[test]
+fn invalid_device_error() {
+    let errors = compile! {
+        result "
+            device d0 = \"d0\";
+            d0 = \"d1\";
+        "
+    };
+
+    // Device reassignment should fail
+    assert!(!errors.is_empty(), "Expected error for device reassignment");
+}

rust_compiler/libs/compiler/src/test/function_declaration.rs

@@ -3,7 +3,7 @@ use pretty_assertions::assert_eq;
 
 #[test]
 fn test_function_declaration_with_spillover_params() -> anyhow::Result<()> {
-    let compiled = compile!(debug r#"
+    let compiled = compile!(check r#"
         // we need more than 4 params to 'spill' into a stack var
         fn doSomething(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9) {
             return arg1 + arg2 + arg3 + arg4 + arg5 + arg6 + arg7 + arg8 + arg9;
@@ -13,8 +13,14 @@ fn test_function_declaration_with_spillover_params() -> anyhow::Result<()> {
         let returned = doSomething(item1, 2, 3, 4, 5, 6, 7, 8, 9);
     "#);
 
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
     assert_eq!(
-        compiled,
+        compiled.output,
         indoc! {"
             j main
             doSomething:
@@ -25,10 +31,11 @@ fn test_function_declaration_with_spillover_params() -> anyhow::Result<()> {
             pop r12
             pop r13
             pop r14
+            push sp
             push ra
-            sub r0 sp 3
+            sub r0 sp 4
             get r1 db r0
-            sub r0 sp 2
+            sub r0 sp 3
             get r2 db r0
             add r3 r1 r2
             add r4 r3 r14
@@ -42,7 +49,7 @@ fn test_function_declaration_with_spillover_params() -> anyhow::Result<()> {
             j __internal_L1
             __internal_L1:
             pop ra
-            sub sp sp 2
+            pop sp
             j ra
             main:
             move r8 1
@@ -67,7 +74,7 @@ fn test_function_declaration_with_spillover_params() -> anyhow::Result<()> {
 
 #[test]
 fn test_early_return() -> anyhow::Result<()> {
-    let compiled = compile!(debug r#"
+    let compiled = compile!(check r#"
         // This is a test function declaration with no body
         fn doSomething() {
             if (1 == 1) {
@@ -79,12 +86,19 @@ fn test_early_return() -> anyhow::Result<()> {
         doSomething();
     "#);
 
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
     assert_eq!(
-        compiled,
+        compiled.output,
         indoc! {
             "
             j main
             doSomething:
+            push sp
             push ra
             seq r1 1 1
             beqz r1 __internal_L2
@@ -94,6 +108,7 @@ fn test_early_return() -> anyhow::Result<()> {
             j __internal_L1
             __internal_L1:
             pop ra
+            pop sp
             j ra
             main:
             jal doSomething
@@ -107,22 +122,30 @@ fn test_early_return() -> anyhow::Result<()> {
 
 #[test]
 fn test_function_declaration_with_register_params() -> anyhow::Result<()> {
-    let compiled = compile!(debug r#"
+    let compiled = compile!(check r#"
         // This is a test function declaration with no body
         fn doSomething(arg1, arg2) {
         };
     "#);
 
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
     assert_eq!(
-        compiled,
+        compiled.output,
         indoc! {"
             j main
             doSomething:
             pop r8
             pop r9
+            push sp
             push ra
             __internal_L1:
             pop ra
+            pop sp
             j ra
         "}
     );

rust_compiler/libs/compiler/src/test/logic_expression.rs

@@ -1,11 +1,10 @@
-use crate::compile;
 use indoc::indoc;
 use pretty_assertions::assert_eq;
 
 #[test]
 fn test_comparison_expressions() -> anyhow::Result<()> {
-    let compiled = compile! {
-        debug
+    let result = compile! {
+        check
         "
         let isGreater = 10 > 5;
         let isLess = 5 < 10;
@@ -16,8 +15,14 @@ fn test_comparison_expressions() -> anyhow::Result<()> {
         "
     };
 
+    assert!(
+        result.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        result.errors
+    );
+
     assert_eq!(
-        compiled,
+        result.output,
         indoc! {
             "
             j main
@@ -43,8 +48,8 @@ fn test_comparison_expressions() -> anyhow::Result<()> {
 
 #[test]
 fn test_logical_and_or_not() -> anyhow::Result<()> {
-    let compiled = compile! {
-        debug
+    let result = compile! {
+        check
         "
         let logic1 = 1 && 1;
         let logic2 = 1 || 0;
@@ -52,8 +57,14 @@ fn test_logical_and_or_not() -> anyhow::Result<()> {
         "
     };
 
+    assert!(
+        result.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        result.errors
+    );
+
     assert_eq!(
-        compiled,
+        result.output,
         indoc! {
             "
             j main
@@ -73,15 +84,21 @@ fn test_logical_and_or_not() -> anyhow::Result<()> {
 
 #[test]
 fn test_complex_logic() -> anyhow::Result<()> {
-    let compiled = compile! {
-        debug
+    let result = compile! {
+        check
         "
         let logic = (10 > 5) && (5 < 10);
         "
     };
 
+    assert!(
+        result.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        result.errors
+    );
+
     assert_eq!(
-        compiled,
+        result.output,
         indoc! {
             "
             j main
@@ -99,15 +116,21 @@ fn test_complex_logic() -> anyhow::Result<()> {
 
 #[test]
 fn test_math_with_logic() -> anyhow::Result<()> {
-    let compiled = compile! {
-        debug
+    let result = compile! {
+        check
         "
         let logic = (1 + 2) > 1;
         "
     };
 
+    assert!(
+        result.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        result.errors
+    );
+
     assert_eq!(
-        compiled,
+        result.output,
         indoc! {
             "
             j main
@@ -123,15 +146,21 @@ fn test_math_with_logic() -> anyhow::Result<()> {
 
 #[test]
 fn test_boolean_in_logic() -> anyhow::Result<()> {
-    let compiled = compile! {
-        debug
+    let result = compile! {
+        check
         "
         let res = true && false;
         "
     };
 
+    assert!(
+        result.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        result.errors
+    );
+
     assert_eq!(
-        compiled,
+        result.output,
         indoc! {
             "
             j main
@@ -147,8 +176,8 @@ fn test_boolean_in_logic() -> anyhow::Result<()> {
 
 #[test]
 fn test_invert_a_boolean() -> anyhow::Result<()> {
-    let compiled = compile! {
-        debug
+    let result = compile! {
+        check
         "
         let i = true;
         let y = !i;
@@ -157,8 +186,14 @@ fn test_invert_a_boolean() -> anyhow::Result<()> {
         "
     };
 
+    assert!(
+        result.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        result.errors
+    );
+
     assert_eq!(
-        compiled,
+        result.output,
         indoc! {
             "
             j main

rust_compiler/libs/compiler/src/test/loops.rs

@@ -1,11 +1,10 @@
-use crate::compile;
 use indoc::indoc;
 use pretty_assertions::assert_eq;
 
 #[test]
 fn test_infinite_loop() -> anyhow::Result<()> {
-    let compiled = compile! {
-        debug
+    let result = compile! {
+        check
         "
         let a = 0;
         loop {
@@ -14,9 +13,15 @@ fn test_infinite_loop() -> anyhow::Result<()> {
         "
     };
 
+    assert!(
+        result.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        result.errors
+    );
+
     // __internal_Labels: L1 (start), L2 (end)
     assert_eq!(
-        compiled,
+        result.output,
         indoc! {
             "
             j main
@@ -36,8 +41,8 @@ fn test_infinite_loop() -> anyhow::Result<()> {
 
 #[test]
 fn test_loop_break() -> anyhow::Result<()> {
-    let compiled = compile! {
-        debug
+    let result = compile! {
+        check
         "
         let a = 0;
         loop {
@@ -49,9 +54,15 @@ fn test_loop_break() -> anyhow::Result<()> {
         "
     };
 
+    assert!(
+        result.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        result.errors
+    );
+
     // __internal_Labels: L1 (start), L2 (end), L3 (if end - implicit else label)
     assert_eq!(
-        compiled,
+        result.output,
         indoc! {
             "
             j main
@@ -75,8 +86,8 @@ fn test_loop_break() -> anyhow::Result<()> {
 
 #[test]
 fn test_while_loop() -> anyhow::Result<()> {
-    let compiled = compile! {
-        debug
+    let result = compile! {
+        check
         "
         let a = 0;
         while (a < 10) {
@@ -85,9 +96,15 @@ fn test_while_loop() -> anyhow::Result<()> {
         "
     };
 
+    assert!(
+        result.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        result.errors
+    );
+
     // __internal_Labels: L1 (start), L2 (end)
     assert_eq!(
-        compiled,
+        result.output,
         indoc! {
             "
             j main
@@ -109,8 +126,8 @@ fn test_while_loop() -> anyhow::Result<()> {
 
 #[test]
 fn test_loop_continue() -> anyhow::Result<()> {
-    let compiled = compile! {
-        debug
+    let result = compile! {
+        check
         r#"
         let a = 0;
         loop {
@@ -123,9 +140,15 @@ fn test_loop_continue() -> anyhow::Result<()> {
         "#
     };
 
+    assert!(
+        result.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        result.errors
+    );
+
     // __internal_Labels: L1 (start), L2 (end), L3 (if end)
     assert_eq!(
-        compiled,
+        result.output,
         indoc! {
             "
             j main

rust_compiler/libs/compiler/src/test/math_syscall.rs

@@ -1,4 +1,3 @@
-use crate::compile;
 use anyhow::Result;
 use indoc::indoc;
 use pretty_assertions::assert_eq;
@@ -6,14 +5,20 @@ use pretty_assertions::assert_eq;
 #[test]
 fn test_acos() -> Result<()> {
     let compiled = compile! {
-        debug
+        check
         "
         let i = acos(123);
         "
     };
 
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
     assert_eq!(
-        compiled,
+        compiled.output,
         indoc! {
             "
             j main
@@ -30,14 +35,20 @@ fn test_acos() -> Result<()> {
 #[test]
 fn test_asin() -> Result<()> {
     let compiled = compile! {
-        debug
+        check
         "
         let i = asin(123);
         "
     };
 
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
     assert_eq!(
-        compiled,
+        compiled.output,
         indoc! {
             "
             j main
@@ -54,14 +65,20 @@ fn test_asin() -> Result<()> {
 #[test]
 fn test_atan() -> Result<()> {
     let compiled = compile! {
-        debug
+        check
         "
         let i = atan(123);
         "
     };
 
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
     assert_eq!(
-        compiled,
+        compiled.output,
         indoc! {
             "
             j main
@@ -78,14 +95,20 @@ fn test_atan() -> Result<()> {
 #[test]
 fn test_atan2() -> Result<()> {
     let compiled = compile! {
-        debug
+        check
         "
         let i = atan2(123, 456);
         "
     };
 
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
     assert_eq!(
-        compiled,
+        compiled.output,
         indoc! {
             "
             j main
@@ -102,14 +125,20 @@ fn test_atan2() -> Result<()> {
 #[test]
 fn test_abs() -> Result<()> {
     let compiled = compile! {
-        debug
+        check
         "
         let i = abs(-123);
         "
     };
 
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
     assert_eq!(
-        compiled,
+        compiled.output,
         indoc! {
             "
             j main
@@ -126,14 +155,20 @@ fn test_abs() -> Result<()> {
 #[test]
 fn test_ceil() -> Result<()> {
     let compiled = compile! {
-        debug
+        check
         "
         let i = ceil(123.90);
         "
     };
 
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
     assert_eq!(
-        compiled,
+        compiled.output,
         indoc! {
             "
             j main
@@ -150,14 +185,20 @@ fn test_ceil() -> Result<()> {
 #[test]
 fn test_cos() -> Result<()> {
     let compiled = compile! {
-        debug
+        check
         "
         let i = cos(123);
         "
     };
 
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
     assert_eq!(
-        compiled,
+        compiled.output,
         indoc! {
             "
             j main
@@ -174,14 +215,20 @@ fn test_cos() -> Result<()> {
 #[test]
 fn test_floor() -> Result<()> {
     let compiled = compile! {
-        debug
+        check
         "
         let i = floor(123);
         "
     };
 
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
     assert_eq!(
-        compiled,
+        compiled.output,
         indoc! {
             "
             j main
@@ -198,14 +245,20 @@ fn test_floor() -> Result<()> {
 #[test]
 fn test_log() -> Result<()> {
     let compiled = compile! {
-        debug
+        check
         "
         let i = log(123);
         "
     };
 
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
     assert_eq!(
-        compiled,
+        compiled.output,
         indoc! {
             "
             j main
@@ -222,14 +275,20 @@ fn test_log() -> Result<()> {
 #[test]
 fn test_max() -> Result<()> {
     let compiled = compile! {
-        debug
+        check
         "
         let i = max(123, 456);
         "
     };
 
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
     assert_eq!(
-        compiled,
+        compiled.output,
         indoc! {
             "
             j main
@@ -246,15 +305,21 @@ fn test_max() -> Result<()> {
 #[test]
 fn test_max_from_game() -> Result<()> {
     let compiled = compile! {
-        debug
+        check
         r#"
         let item = 0;
         item = max(1 + 2, 2);
         "#
     };
 
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
     assert_eq!(
-        compiled,
+        compiled.output,
         indoc! {
             "
             j main
@@ -272,14 +337,20 @@ fn test_max_from_game() -> Result<()> {
 #[test]
 fn test_min() -> Result<()> {
     let compiled = compile! {
-        debug
+        check
         "
         let i = min(123, 456);
         "
     };
 
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
     assert_eq!(
-        compiled,
+        compiled.output,
         indoc! {
             "
             j main
@@ -296,14 +367,20 @@ fn test_min() -> Result<()> {
 #[test]
 fn test_rand() -> Result<()> {
     let compiled = compile! {
-        debug
+        check
         "
         let i = rand();
         "
     };
 
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
     assert_eq!(
-        compiled,
+        compiled.output,
         indoc! {
             "
             j main
@@ -320,14 +397,20 @@ fn test_rand() -> Result<()> {
 #[test]
 fn test_sin() -> Result<()> {
     let compiled = compile! {
-        debug
+        check
         "
         let i = sin(3);
         "
     };
 
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
     assert_eq!(
-        compiled,
+        compiled.output,
         indoc! {
             "
             j main
@@ -344,14 +427,20 @@ fn test_sin() -> Result<()> {
 #[test]
 fn test_sqrt() -> Result<()> {
     let compiled = compile! {
-        debug
+        check
         "
         let i = sqrt(3);
         "
     };
 
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
     assert_eq!(
-        compiled,
+        compiled.output,
         indoc! {
             "
             j main
@@ -368,14 +457,20 @@ fn test_sqrt() -> Result<()> {
 #[test]
 fn test_tan() -> Result<()> {
     let compiled = compile! {
-        debug
+        check
         "
         let i = tan(3);
         "
     };
 
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
     assert_eq!(
-        compiled,
+        compiled.output,
         indoc! {
             "
             j main
@@ -392,14 +487,20 @@ fn test_tan() -> Result<()> {
 #[test]
 fn test_trunc() -> Result<()> {
     let compiled = compile! {
-        debug
+        check
         "
         let i = trunc(3.234);
         "
     };
 
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
     assert_eq!(
-        compiled,
+        compiled.output,
         indoc! {
             "
             j main

rust_compiler/libs/compiler/src/test/mod.rs

@@ -6,6 +6,12 @@ macro_rules! output {
     };
 }
 
+/// Represents both compilation errors and compiled output
+pub struct CompilationCheckResult {
+    pub errors: Vec<crate::Error<'static>>,
+    pub output: String,
+}
+
 #[cfg_attr(test, macro_export)]
 macro_rules! compile {
     ($source:expr) => {{
@@ -27,7 +33,7 @@ macro_rules! compile {
         compiler.compile().errors
     }};
 
-    (debug $source:expr) => {{
+    (check $source:expr) => {{
         let mut writer = std::io::BufWriter::new(Vec::new());
         let compiler = crate::Compiler::new(
             parser::Parser::new(tokenizer::Tokenizer::from($source)),
@@ -35,15 +41,25 @@ macro_rules! compile {
         );
         let res = compiler.compile();
         res.instructions.write(&mut writer)?;
-        output!(writer)
+        let output = output!(writer);
+        crate::test::CompilationCheckResult {
+            errors: res.errors,
+            output,
+        }
     }};
 }
 mod binary_expression;
 mod branching;
 mod declaration_function_invocation;
 mod declaration_literal;
+mod device_access;
+mod edge_cases;
+mod error_handling;
 mod function_declaration;
 mod logic_expression;
 mod loops;
 mod math_syscall;
+mod negation_priority;
+mod scoping;
 mod syscall;
+mod tuple_literals;

rust_compiler/libs/compiler/src/test/negation_priority.rs

@@ -0,0 +1,388 @@
+use indoc::indoc;
+use pretty_assertions::assert_eq;
+
+#[test]
+fn simple_negation() -> anyhow::Result<()> {
+    let compiled = compile! {
+        check "
+            let x = -5;
+        "
+    };
+
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
+    assert_eq!(
+        compiled.output,
+        indoc! {
+            "
+            j main
+            main:
+            move r8 -5
+            "
+        }
+    );
+
+    Ok(())
+}
+
+#[test]
+fn negation_of_variable() -> anyhow::Result<()> {
+    let compiled = compile! {
+        check "
+            let x = 10;
+            let y = -x;
+        "
+    };
+
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
+    assert_eq!(
+        compiled.output,
+        indoc! {
+            "
+            j main
+            main:
+            move r8 10
+            sub r1 0 r8
+            move r9 r1
+            "
+        }
+    );
+
+    Ok(())
+}
+
+#[test]
+fn double_negation() -> anyhow::Result<()> {
+    let compiled = compile! {
+        check "
+            let x = -(-5);
+        "
+    };
+
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
+    assert_eq!(
+        compiled.output,
+        indoc! {
+            "
+            j main
+            main:
+            move r8 5
+            "
+        }
+    );
+
+    Ok(())
+}
+
+#[test]
+fn negation_in_expression() -> anyhow::Result<()> {
+    let compiled = compile! {
+        check "
+            let x = 10 + (-5);
+        "
+    };
+
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
+    assert_eq!(
+        compiled.output,
+        indoc! {
+            "
+            j main
+            main:
+            move r8 5
+            "
+        }
+    );
+
+    Ok(())
+}
+
+#[test]
+fn negation_with_multiplication() -> anyhow::Result<()> {
+    let compiled = compile! {
+        check "
+            let x = -3 * 4;
+        "
+    };
+
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
+    assert_eq!(
+        compiled.output,
+        indoc! {
+            "
+            j main
+            main:
+            move r8 -12
+            "
+        }
+    );
+
+    Ok(())
+}
+
+#[test]
+fn parentheses_priority() -> anyhow::Result<()> {
+    let compiled = compile! {
+        check "
+            let x = (2 + 3) * 4;
+        "
+    };
+
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
+    assert_eq!(
+        compiled.output,
+        indoc! {
+            "
+            j main
+            main:
+            move r8 20
+            "
+        }
+    );
+
+    Ok(())
+}
+
+#[test]
+fn nested_parentheses() -> anyhow::Result<()> {
+    let compiled = compile! {
+        check "
+            let x = ((2 + 3) * (4 - 1));
+        "
+    };
+
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
+    assert_eq!(
+        compiled.output,
+        indoc! {
+            "
+            j main
+            main:
+            move r8 15
+            "
+        }
+    );
+
+    Ok(())
+}
+
+#[test]
+fn parentheses_with_variables() -> anyhow::Result<()> {
+    let compiled = compile! {
+        check "
+            let a = 5;
+            let b = 10;
+            let c = (a + b) * 2;
+        "
+    };
+
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
+    // Should calculate (5 + 10) * 2 = 30
+    assert_eq!(
+        compiled.output,
+        indoc! {
+            "
+            j main
+            main:
+            move r8 5
+            move r9 10
+            add r1 r8 r9
+            mul r2 r1 2
+            move r10 r2
+            "
+        }
+    );
+
+    Ok(())
+}
+
+#[test]
+fn priority_affects_result() -> anyhow::Result<()> {
+    let compiled = compile! {
+        check "
+            let with_priority = (2 + 3) * 4;
+            let without_priority = 2 + 3 * 4;
+        "
+    };
+
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
+    // with_priority should be 20, without_priority should be 14
+    assert_eq!(
+        compiled.output,
+        indoc! {
+            "
+            j main
+            main:
+            move r8 20
+            move r9 14
+            "
+        }
+    );
+
+    Ok(())
+}
+
+#[test]
+fn negation_of_expression() -> anyhow::Result<()> {
+    let compiled = compile! {
+        check "
+            let x = -(2 + 3);
+        "
+    };
+
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
+    // Should be -5 (constant folded)
+    assert_eq!(
+        compiled.output,
+        indoc! {
+            "
+            j main
+            main:
+            sub r1 0 5
+            move r8 r1
+            "
+        }
+    );
+
+    Ok(())
+}
+
+#[test]
+fn complex_negation_and_priority() -> anyhow::Result<()> {
+    let compiled = compile! {
+        check "
+            let x = -((10 - 5) * 2);
+        "
+    };
+
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
+    // Should be -(5 * 2) = -10 (folded to constant)
+    assert_eq!(
+        compiled.output,
+        indoc! {
+            "
+            j main
+            main:
+            sub r1 0 10
+            move r8 r1
+            "
+        }
+    );
+
+    Ok(())
+}
+
+#[test]
+fn negation_in_logical_expression() -> anyhow::Result<()> {
+    let compiled = compile! {
+        check "
+            let x = !(-5);
+        "
+    };
+
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
+    // -5 is truthy, so !(-5) should be 0
+    assert_eq!(
+        compiled.output,
+        indoc! {
+            "
+            j main
+            main:
+            sub r1 0 5
+            seq r2 r1 0
+            move r8 r2
+            "
+        }
+    );
+
+    Ok(())
+}
+
+#[test]
+fn parentheses_in_comparison() -> anyhow::Result<()> {
+    let compiled = compile! {
+        check "
+            let x = (10 + 5) > (3 * 4);
+        "
+    };
+
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
+    // (10 + 5) = 15 > (3 * 4) = 12, so true (1)
+    assert_eq!(
+        compiled.output,
+        indoc! {
+            "
+            j main
+            main:
+            sgt r1 15 12
+            move r8 r1
+            "
+        }
+    );
+
+    Ok(())
+}

rust_compiler/libs/compiler/src/test/scoping.rs

@@ -0,0 +1,462 @@
+use indoc::indoc;
+use pretty_assertions::assert_eq;
+
+#[test]
+fn block_scope() -> anyhow::Result<()> {
+    let compiled = compile! {
+        check "
+            let x = 10;
+            {
+                let y = 20;
+                let z = x + y;
+            }
+        "
+    };
+
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
+    assert_eq!(
+        compiled.output,
+        indoc! {
+            "
+            j main
+            main:
+            move r8 10
+            move r9 20
+            add r1 r8 r9
+            move r10 r1
+            "
+        }
+    );
+
+    Ok(())
+}
+
+#[test]
+fn variable_scope_isolation() -> anyhow::Result<()> {
+    let compiled = compile! {
+        check "
+            let x = 10;
+            {
+                let x = 20;
+                let y = x;
+            }
+        "
+    };
+
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
+    assert_eq!(
+        compiled.output,
+        indoc! {
+            "
+            j main
+            main:
+            move r8 10
+            move r9 20
+            move r10 r9
+            "
+        }
+    );
+
+    Ok(())
+}
+
+#[test]
+fn function_parameter_scope() -> anyhow::Result<()> {
+    let compiled = compile! {
+        check "
+            fn double(x) {
+                return x * 2;
+            };
+            
+            let result = double(5);
+        "
+    };
+
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
+    assert_eq!(
+        compiled.output,
+        indoc! {
+            "
+            j main
+            double:
+            pop r8
+            push sp
+            push ra
+            mul r1 r8 2
+            move r15 r1
+            j __internal_L1
+            __internal_L1:
+            pop ra
+            pop sp
+            j ra
+            main:
+            push 5
+            jal double
+            move r8 r15
+            "
+        }
+    );
+
+    Ok(())
+}
+
+#[test]
+fn nested_block_scopes() -> anyhow::Result<()> {
+    let compiled = compile! {
+        check "
+            let x = 1;
+            {
+                let x = 2;
+                {
+                    let x = 3;
+                    let y = x;
+                }
+                let z = x;
+            }
+            let w = x;
+        "
+    };
+
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
+    assert_eq!(
+        compiled.output,
+        indoc! {
+            "
+            j main
+            main:
+            move r8 1
+            move r9 2
+            move r10 3
+            move r11 r10
+            move r10 r9
+            move r9 r8
+            "
+        }
+    );
+
+    Ok(())
+}
+
+#[test]
+fn variable_shadowing_in_conditional() -> anyhow::Result<()> {
+    let compiled = compile! {
+        check "
+            let x = 10;
+            
+            if (true) {
+                let x = 20;
+            }
+            
+            let y = x;
+        "
+    };
+
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
+    assert_eq!(
+        compiled.output,
+        indoc! {
+            "
+            j main
+            main:
+            move r8 10
+            beqz 1 __internal_L1
+            move r9 20
+            __internal_L1:
+            move r9 r8
+            "
+        }
+    );
+
+    Ok(())
+}
+
+#[test]
+fn variable_shadowing_in_loop() -> anyhow::Result<()> {
+    let compiled = compile! {
+        check "
+            let x = 0;
+            
+            loop {
+                let x = x + 1;
+                if (x > 5) {
+                    break;
+                }
+            }
+        "
+    };
+
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
+    assert_eq!(
+        compiled.output,
+        indoc! {
+            "
+            j main
+            main:
+            move r8 0
+            __internal_L1:
+            add r1 r8 1
+            move r9 r1
+            sgt r2 r9 5
+            beqz r2 __internal_L3
+            j __internal_L2
+            __internal_L3:
+            j __internal_L1
+            __internal_L2:
+            "
+        }
+    );
+
+    Ok(())
+}
+
+#[test]
+fn const_scope() -> anyhow::Result<()> {
+    let compiled = compile! {
+        check "
+            const PI = 3.14;
+            
+            {
+                const PI = 2.71;
+                let x = PI;
+            }
+        "
+    };
+
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
+    assert_eq!(
+        compiled.output,
+        indoc! {
+            "
+            j main
+            main:
+            move r8 2.71
+            "
+        }
+    );
+
+    Ok(())
+}
+
+#[test]
+fn device_in_scope() -> anyhow::Result<()> {
+    let compiled = compile! {
+        check "
+            device d0 = \"d0\";
+            
+            {
+                let value = d0.Temperature;
+            }
+        "
+    };
+
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
+    assert_eq!(
+        compiled.output,
+        indoc! {
+            "
+            j main
+            main:
+            l r1 d0 Temperature
+            move r8 r1
+            "
+        }
+    );
+
+    Ok(())
+}
+
+#[test]
+fn function_scope_isolation() -> anyhow::Result<()> {
+    let compiled = compile! {
+        check "
+            fn func1() {
+                let x = 10;
+                return x;
+            };
+            
+            fn func2() {
+                let x = 20;
+                return x;
+            };
+            
+            let a = func1();
+            let b = func2();
+        "
+    };
+
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
+    assert_eq!(
+        compiled.output,
+        indoc! {
+            "
+            j main
+            func1:
+            push sp
+            push ra
+            move r8 10
+            move r15 r8
+            j __internal_L1
+            __internal_L1:
+            pop ra
+            pop sp
+            j ra
+            func2:
+            push sp
+            push ra
+            move r8 20
+            move r15 r8
+            j __internal_L2
+            __internal_L2:
+            pop ra
+            pop sp
+            j ra
+            main:
+            jal func1
+            move r8 r15
+            push r8
+            jal func2
+            pop r8
+            move r9 r15
+            "
+        }
+    );
+
+    Ok(())
+}
+
+#[test]
+fn tuple_unpacking_scope() -> anyhow::Result<()> {
+    let compiled = compile! {
+        check "
+            fn pair() {
+                return (1, 2);
+            };
+            
+            {
+                let (x, y) = pair();
+                let z = x + y;
+            }
+        "
+    };
+
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
+    assert_eq!(
+        compiled.output,
+        indoc! {
+            "
+            j main
+            pair:
+            push sp
+            push ra
+            push 1
+            push 2
+            sub r0 sp 4
+            get r0 db r0
+            move r15 r0
+            j __internal_L1
+            __internal_L1:
+            sub r0 sp 3
+            get ra db r0
+            j ra
+            main:
+            jal pair
+            pop r9
+            pop r8
+            move sp r15
+            add r1 r8 r9
+            move r10 r1
+            "
+        }
+    );
+
+    Ok(())
+}
+
+#[test]
+fn shadowing_doesnt_affect_outer() -> anyhow::Result<()> {
+    let compiled = compile! {
+        check "
+            let x = 5;
+            let y = x;
+            {
+                let x = 10;
+                let z = x;
+            }
+            let w = x + y;
+        "
+    };
+
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
+    assert_eq!(
+        compiled.output,
+        indoc! {
+            "
+            j main
+            main:
+            move r8 5
+            move r9 r8
+            move r10 10
+            move r11 r10
+            add r1 r8 r9
+            move r10 r1
+            "
+        }
+    );
+
+    Ok(())
+}

rust_compiler/libs/compiler/src/test/syscall.rs

@@ -1,18 +1,23 @@
-use crate::compile;
 use indoc::indoc;
 use pretty_assertions::assert_eq;
 
 #[test]
 fn test_yield() -> anyhow::Result<()> {
     let compiled = compile! {
-        debug
+        check
         "
         yield();
         "
     };
 
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
     assert_eq!(
-        compiled,
+        compiled.output,
         indoc! {
             "
             j main
@@ -28,7 +33,7 @@ fn test_yield() -> anyhow::Result<()> {
 #[test]
 fn test_sleep() -> anyhow::Result<()> {
     let compiled = compile! {
-        debug
+        check
         "
         sleep(3);
         let sleepAmount = 15;
@@ -37,8 +42,14 @@ fn test_sleep() -> anyhow::Result<()> {
         "
     };
 
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
     assert_eq!(
-        compiled,
+        compiled.output,
         indoc! {
             "
             j main
@@ -58,7 +69,7 @@ fn test_sleep() -> anyhow::Result<()> {
 #[test]
 fn test_set_on_device() -> anyhow::Result<()> {
     let compiled = compile! {
-        debug
+        check
         r#"
             device airConditioner = "d0";
             let internalTemp = 20c;
@@ -67,8 +78,14 @@ fn test_set_on_device() -> anyhow::Result<()> {
         "#
     };
 
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
     assert_eq!(
-        compiled,
+        compiled.output,
         indoc! {
             "
             j main
@@ -86,15 +103,21 @@ fn test_set_on_device() -> anyhow::Result<()> {
 #[test]
 fn test_set_on_device_batched() -> anyhow::Result<()> {
     let compiled = compile! {
-        debug
+        check
         r#"
         const doorHash = hash("Door");
         setBatched(doorHash, "Lock", true);
         "#
     };
 
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
     assert_eq!(
-        compiled,
+        compiled.output,
         indoc! {
             r#"
             j main
@@ -109,7 +132,7 @@ fn test_set_on_device_batched() -> anyhow::Result<()> {
 #[test]
 fn test_set_on_device_batched_named() -> anyhow::Result<()> {
     let compiled = compile! {
-        debug
+        check
         r#"
         device dev = "d0";
         const devName = hash("test");
@@ -118,8 +141,14 @@ fn test_set_on_device_batched_named() -> anyhow::Result<()> {
         "#
     };
 
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
     assert_eq!(
-        compiled,
+        compiled.output,
         indoc! {
             "
             j main
@@ -135,7 +164,7 @@ fn test_set_on_device_batched_named() -> anyhow::Result<()> {
 #[test]
 fn test_load_from_device() -> anyhow::Result<()> {
     let compiled = compile! {
-        debug
+        check
         r#"
         device airCon = "d0";
 
@@ -143,8 +172,14 @@ fn test_load_from_device() -> anyhow::Result<()> {
         "#
     };
 
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
     assert_eq!(
-        compiled,
+        compiled.output,
         indoc! {
             "
             j main
@@ -161,7 +196,7 @@ fn test_load_from_device() -> anyhow::Result<()> {
 #[test]
 fn test_load_from_slot() -> anyhow::Result<()> {
     let compiled = compile! {
-        debug
+        check
         r#"
         device airCon = "d0";
 
@@ -169,8 +204,14 @@ fn test_load_from_slot() -> anyhow::Result<()> {
         "#
     };
 
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
     assert_eq!(
-        compiled,
+        compiled.output,
         indoc! {
             "
             j main
@@ -187,7 +228,7 @@ fn test_load_from_slot() -> anyhow::Result<()> {
 #[test]
 fn test_set_slot() -> anyhow::Result<()> {
     let compiled = compile! {
-        debug
+        check
         r#"
         device airCon = "d0";
 
@@ -195,8 +236,14 @@ fn test_set_slot() -> anyhow::Result<()> {
         "#
     };
 
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
     assert_eq!(
-        compiled,
+        compiled.output,
         indoc! {
             "
             j main
@@ -212,7 +259,7 @@ fn test_set_slot() -> anyhow::Result<()> {
 #[test]
 fn test_load_reagent() -> anyhow::Result<()> {
     let compiled = compile! {
-        debug
+        check
         r#"
         device thingy = "d0";
 
@@ -220,8 +267,14 @@ fn test_load_reagent() -> anyhow::Result<()> {
         "#
     };
 
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
     assert_eq!(
-        compiled,
+        compiled.output,
         indoc! {
             "
             j main
@@ -234,3 +287,68 @@ fn test_load_reagent() -> anyhow::Result<()> {
 
     Ok(())
 }
+#[test]
+fn test_clr() -> anyhow::Result<()> {
+    let compiled = compile! {
+        check
+        "
+        device stackDevice = \"d0\";
+        clr(stackDevice);
+        let deviceRef = 5;
+        clr(deviceRef);
+        "
+    };
+
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
+    assert_eq!(
+        compiled.output,
+        indoc! {
+            "
+            j main
+            main:
+            clr d0
+            move r8 5
+            clr r8
+            "
+        }
+    );
+
+    Ok(())
+}
+#[test]
+fn test_rmap() -> anyhow::Result<()> {
+    let compiled = compile! {
+        check
+        "
+        device printer = \"d0\";
+        let reagentHash = 12345;
+        let itemHash = rmap(printer, reagentHash);
+        "
+    };
+
+    assert!(
+        compiled.errors.is_empty(),
+        "Expected no errors, got: {:?}",
+        compiled.errors
+    );
+
+    assert_eq!(
+        compiled.output,
+        indoc! {
+            "
+            j main
+            main:
+            move r8 12345
+            rmap r15 d0 r8
+            move r9 r15
+            "
+        }
+    );
+
+    Ok(())
+}

rust_compiler/libs/helpers/src/helper_funcs.rs

@@ -1,4 +1,5 @@
 use crc32fast::hash as crc32_hash;
+
 /// This function takes an input which is meant to be hashed via the CRC32 algorithm, but it then
 /// converts the generated UNSIGNED number into it's SIGNED counterpart.
 pub fn crc_hash_signed(input: &str) -> i128 {
@@ -9,3 +10,38 @@ pub fn crc_hash_signed(input: &str) -> i128 {
 
     hash_value_i32 as i128
 }
+
+/// Removes common leading whitespace from all lines in a string (dedent).
+/// This is useful for cleaning up documentation strings that have uniform indentation.
+pub fn dedent(text: &str) -> String {
+    let lines: Vec<&str> = text.lines().collect();
+
+    // Find minimum indentation (excluding empty lines)
+    let mut min_indent = usize::MAX;
+    for line in &lines {
+        if !line.trim().is_empty() {
+            let indent = line.len() - line.trim_start().len();
+            min_indent = min_indent.min(indent);
+        }
+    }
+
+    // If no lines or all empty, return as-is
+    if min_indent == usize::MAX {
+        return text.to_string();
+    }
+
+    // Remove the common indentation
+    lines
+        .iter()
+        .map(|line| {
+            if line.trim().is_empty() {
+                ""
+            } else if line.len() >= min_indent {
+                &line[min_indent..]
+            } else {
+                line
+            }
+        })
+        .collect::<Vec<_>>()
+        .join("\n")
+}

rust_compiler/libs/helpers/src/lib.rs

@@ -1,4 +1,5 @@
 mod helper_funcs;
+pub use helper_funcs::dedent;
 mod macros;
 mod syscall;
 

rust_compiler/libs/helpers/src/macros.rs

@@ -99,12 +99,12 @@ macro_rules! documented {
                                 ),*
                             ];
 
-                            doc_lines.iter()
+                            let combined = doc_lines.iter()
                                 .filter_map(|&d| d)
                                 .collect::<Vec<_>>()
-                                .join("\n")
-                                .trim()
-                                .to_string()
+                                .join("\n");
+
+                            $crate::dedent(&combined).trim().to_string()
                         }
                     )*
                 }
@@ -122,12 +122,13 @@ macro_rules! documented {
                                         documented!(@doc_filter #[ $($variant_attr)* ])
                                     ),*
                                 ];
-                                doc_lines.iter()
+
+                                let combined = doc_lines.iter()
                                     .filter_map(|&d| d)
                                     .collect::<Vec<_>>()
-                                    .join("\n")
-                                    .trim()
-                                    .to_string()
+                                    .join("\n");
+
+                                $crate::dedent(&combined).trim().to_string()
                             }
                         )
                     ),*
@@ -136,4 +137,3 @@ macro_rules! documented {
         }
     };
 }
-

rust_compiler/libs/helpers/src/syscall.rs

@@ -5,12 +5,14 @@ macro_rules! with_syscalls {
             // Big names
             "yield",
             "sleep",
+            "clr",
             "hash",
             "load",
             "loadBatched",
             "loadBatchedNamed",
             "loadSlot",
             "loadReagent",
+            "rmap",
             "set",
             "setBatched",
             "setBatchedNamed",

rust_compiler/libs/il/src/lib.rs

@@ -61,6 +61,7 @@ impl<'a> std::fmt::Display for Instructions<'a> {
     }
 }
 
+#[derive(Clone)]
 pub struct InstructionNode<'a> {
     pub instruction: Instruction<'a>,
     pub span: Option<Span>,
@@ -194,6 +195,9 @@ pub enum Instruction<'a> {
     /// `lr register device reagentMode int`
     LoadReagent(Operand<'a>, Operand<'a>, Operand<'a>, Operand<'a>),
 
+    /// `rmap register device reagentHash` - Resolve Reagent to Item Hash
+    Rmap(Operand<'a>, Operand<'a>, Operand<'a>),
+
     /// `j label` - Unconditional Jump
     Jump(Operand<'a>),
     /// `jal label` - Jump and Link (Function Call)
@@ -231,12 +235,22 @@ pub enum Instruction<'a> {
     /// `sle dst a b` - Set if Less or Equal
     SetLe(Operand<'a>, Operand<'a>, Operand<'a>),
 
-    /// `and dst a b` - Logical AND
+    /// `and dst a b` - Bitwise AND
     And(Operand<'a>, Operand<'a>, Operand<'a>),
-    /// `or dst a b` - Logical OR
+    /// `or dst a b` - Bitwise OR
     Or(Operand<'a>, Operand<'a>, Operand<'a>),
-    /// `xor dst a b` - Logical XOR
+    /// `xor dst a b` - Bitwise XOR
     Xor(Operand<'a>, Operand<'a>, Operand<'a>),
+    /// `nor dst a b` - Bitwise NOR
+    Nor(Operand<'a>, Operand<'a>, Operand<'a>),
+    /// `not dst a` - Bitwise NOT
+    Not(Operand<'a>, Operand<'a>),
+    /// `sll dst a b` - Logical Left Shift
+    Sll(Operand<'a>, Operand<'a>, Operand<'a>),
+    /// `sra dst a b` - Arithmetic Right Shift
+    Sra(Operand<'a>, Operand<'a>, Operand<'a>),
+    /// `srl dst a b` - Logical Right Shift
+    Srl(Operand<'a>, Operand<'a>, Operand<'a>),
 
     /// `push val` - Push to Stack
     Push(Operand<'a>),
@@ -256,6 +270,8 @@ pub enum Instruction<'a> {
     Yield,
     /// `sleep val` - Sleep for seconds
     Sleep(Operand<'a>),
+    /// `clr val` - Clear stack memory on device
+    Clr(Operand<'a>),
 
     /// `alias name target` - Define Alias (Usually handled by compiler, but good for IR)
     Alias(Cow<'a, str>, Operand<'a>),
@@ -317,6 +333,9 @@ impl<'a> fmt::Display for Instruction<'a> {
             Instruction::LoadReagent(reg, device, reagent_mode, reagent_hash) => {
                 write!(f, "lr {} {} {} {}", reg, device, reagent_mode, reagent_hash)
             }
+            Instruction::Rmap(reg, device, reagent_hash) => {
+                write!(f, "rmap {} {} {}", reg, device, reagent_hash)
+            }
             Instruction::Jump(lbl) => write!(f, "j {}", lbl),
             Instruction::JumpAndLink(lbl) => write!(f, "jal {}", lbl),
             Instruction::JumpRelative(off) => write!(f, "jr {}", off),
@@ -337,6 +356,11 @@ impl<'a> fmt::Display for Instruction<'a> {
             Instruction::And(dst, a, b) => write!(f, "and {} {} {}", dst, a, b),
             Instruction::Or(dst, a, b) => write!(f, "or {} {} {}", dst, a, b),
             Instruction::Xor(dst, a, b) => write!(f, "xor {} {} {}", dst, a, b),
+            Instruction::Nor(dst, a, b) => write!(f, "nor {} {} {}", dst, a, b),
+            Instruction::Not(dst, a) => write!(f, "not {} {}", dst, a),
+            Instruction::Sll(dst, a, b) => write!(f, "sll {} {} {}", dst, a, b),
+            Instruction::Sra(dst, a, b) => write!(f, "sra {} {} {}", dst, a, b),
+            Instruction::Srl(dst, a, b) => write!(f, "srl {} {} {}", dst, a, b),
             Instruction::Push(val) => write!(f, "push {}", val),
             Instruction::Pop(dst) => write!(f, "pop {}", dst),
             Instruction::Peek(dst) => write!(f, "peek {}", dst),
@@ -347,6 +371,7 @@ impl<'a> fmt::Display for Instruction<'a> {
             }
             Instruction::Yield => write!(f, "yield"),
             Instruction::Sleep(val) => write!(f, "sleep {}", val),
+            Instruction::Clr(val) => write!(f, "clr {}", val),
             Instruction::Alias(name, target) => write!(f, "alias {} {}", name, target),
             Instruction::Define(name, val) => write!(f, "define {} {}", name, val),
             Instruction::LabelDef(lbl) => write!(f, "{}:", lbl),

rust_compiler/libs/integration_tests/.gitattributes

@@ -0,0 +1,2 @@
+# Treat snapshot files as text
+*.snap text

rust_compiler/libs/integration_tests/Cargo.toml

@@ -0,0 +1,19 @@
+[package]
+name = "integration_tests"
+version = "0.1.0"
+edition = "2024"
+publish = false
+
+[dependencies]
+compiler = { path = "../compiler" }
+parser = { path = "../parser" }
+tokenizer = { path = "../tokenizer" }
+optimizer = { path = "../optimizer" }
+il = { path = "../il" }
+anyhow = { workspace = true }
+indoc = "2"
+insta = "1.40"
+
+[lib]
+# This is a test-only crate
+path = "src/lib.rs"

rust_compiler/libs/integration_tests/README.md

@@ -0,0 +1,92 @@
+# Integration Tests for Slang Compiler with Optimizer
+
+This crate contains end-to-end integration tests for the Slang compiler that verify the complete compilation pipeline including all optimization passes.
+
+## Snapshot Testing with Insta
+
+These tests use [insta](https://insta.rs/) for snapshot testing, which captures the entire compiled output and stores it in snapshot files for comparison.
+
+### Running Tests
+
+```bash
+# Run all integration tests
+cargo test --package integration_tests
+
+# Run a specific test
+cargo test --package integration_tests test_simple_leaf_function
+```
+
+### Updating Snapshots
+
+When you make changes to the compiler or optimizer that affect the output:
+
+```bash
+# Update all snapshots automatically
+INSTA_UPDATE=always cargo test --package integration_tests
+
+# Or use cargo-insta for interactive review (install first: cargo install cargo-insta)
+cargo insta test --package integration_tests
+cargo insta review --package integration_tests
+```
+
+### Understanding Snapshots
+
+Snapshot files are stored in `src/snapshots/` and contain:
+
+- The full IC10 assembly output from compiling Slang source code
+- Metadata about which test generated them
+- The expression that produced the output
+
+Example snapshot structure:
+
+```
+---
+source: libs/integration_tests/src/lib.rs
+expression: output
+---
+j main
+move r8 10
+j ra
+```
+
+### What We Test
+
+1. **Leaf Function Optimization** - Removal of unnecessary `push sp/ra` and `pop ra/sp`
+2. **Function Calls** - Preservation of stack frame when calling functions
+3. **Constant Folding** - Compile-time evaluation of constant expressions
+4. **Algebraic Simplification** - Identity operations like `x * 1` → `x`
+5. **Strength Reduction** - Converting expensive operations like `x * 2` → `x + x`
+6. **Dead Code Elimination** - Removal of unused variables
+7. **Peephole Comparison Fusion** - Combining comparison + branch instructions
+8. **Select Optimization** - Converting if/else to single `select` instruction
+9. **Complex Arithmetic** - Multiple optimizations working together
+10. **Nested Function Calls** - Full program optimization
+
+### Adding New Tests
+
+To add a new integration test:
+
+1. Add a new `#[test]` function in `src/lib.rs`
+2. Call `compile_optimized()` with your Slang source code
+3. Use `insta::assert_snapshot!(output)` to capture the output
+4. Run with `INSTA_UPDATE=always` to create the initial snapshot
+5. Review the snapshot file to ensure it looks correct
+
+Example:
+
+```rust
+#[test]
+fn test_my_optimization() {
+    let source = "fn foo(x) { return x + 1; }";
+    let output = compile_optimized(source);
+    insta::assert_snapshot!(output);
+}
+```
+
+### Benefits of Snapshot Testing
+
+- **Full Output Verification**: Tests the entire compiled output, not just snippets
+- **Easy to Review**: Visual diffs show exactly what changed in the output
+- **Regression Detection**: Any change to output is immediately visible
+- **Living Documentation**: Snapshots serve as examples of compiler output
+- **Less Brittle**: No need to manually update expected strings when making intentional changes

rust_compiler/libs/integration_tests/src/bitwise_tests.rs

@@ -0,0 +1,112 @@
+#[cfg(test)]
+mod bitwise_tests {
+    use crate::common::compile_with_and_without_optimization;
+    use indoc::indoc;
+
+    #[test]
+    fn test_bitwise_operations() {
+        let source = indoc! {"
+            let a = 5;
+            let b = 3;
+            let and_result = a & b;
+            let or_result = a | b;
+            let xor_result = a ^ b;
+            let not_result = ~a;
+        "};
+        let output = compile_with_and_without_optimization(source);
+        insta::assert_snapshot!(output);
+    }
+
+    #[test]
+    fn test_bitwise_shifts() {
+        let source = indoc! {"
+            let x = 8;
+            let left_shift = x << 2;
+            let arithmetic_shift = x >> 1;
+            let logical_shift = x >>> 1;
+        "};
+        let output = compile_with_and_without_optimization(source);
+        insta::assert_snapshot!(output);
+    }
+
+    #[test]
+    fn test_bitwise_constant_folding() {
+        let source = indoc! {"
+            let packed = (1 << 16) & (255 << 8) & 2;
+            let mask = 0xFF & 0x0F;
+            let combined = (15 | 4096);
+        "};
+        let output = compile_with_and_without_optimization(source);
+        insta::assert_snapshot!(output);
+    }
+
+    #[test]
+    fn test_bitwise_with_variables() {
+        let source = indoc! {"
+            fn pack_bits(high, low) {
+                let packed = (high << 8) | low;
+                return packed;
+            }
+            fn extract_bits(value) {
+                let high = (value >> 8) & 0xFF;
+                let low = value & 0xFF;
+                return (high, low);
+            }
+        "};
+        let output = compile_with_and_without_optimization(source);
+        insta::assert_snapshot!(output);
+    }
+
+    #[test]
+    fn test_complex_bit_manipulation() {
+        let source = indoc! {"
+            fn encode_flags(enabled, mode, priority) {
+                let flag_byte = (enabled << 7) | (mode << 4) | priority;
+                return flag_byte;
+            }
+            fn decode_flags(byte) {
+                let enabled = (byte >> 7) & 1;
+                let mode = (byte >> 4) & 0x7;
+                let priority = byte & 0xF;
+                return (enabled, mode, priority);
+            }
+        "};
+        let output = compile_with_and_without_optimization(source);
+        insta::assert_snapshot!(output);
+    }
+
+    #[test]
+    fn test_sorter_bitwise_operations() {
+        let source = indoc! {r#"
+            device self = "db";
+            device sorter = "d0";
+
+            loop {
+                yield();
+                // allow Hay with an op_code of `1`
+                sorter[0] = (hash("ItemCropHay") << 8) | 1;
+            }
+        "#};
+        let output = compile_with_and_without_optimization(source);
+        insta::assert_snapshot!(output);
+    }
+
+    #[test]
+    fn test_bitwise_with_const() {
+        let source = indoc! {r#"
+        device sorterOutput = "d0";
+
+        const ingotSortClass = 19;
+        const equals = 0;
+
+        loop {
+            yield();
+            clr(sorterOutput);
+            sorterOutput[0] = (ingotSortClass << 16) | (equals << 8) | 3;
+        }
+        "#};
+
+        let output = compile_with_and_without_optimization(source);
+        insta::assert_snapshot!(output);
+    }
+}

rust_compiler/libs/integration_tests/src/common.rs

@@ -0,0 +1,46 @@
+use compiler::Compiler;
+use parser::Parser;
+use tokenizer::Tokenizer;
+
+/// Compile Slang source code and return both unoptimized and optimized output
+pub fn compile_with_and_without_optimization(source: &str) -> String {
+    // Compile for unoptimized output
+    let tokenizer = Tokenizer::from(source);
+    let parser = Parser::new(tokenizer);
+    let compiler = Compiler::new(parser, None);
+    let result = compiler.compile();
+
+    // Get unoptimized output
+    let mut unoptimized_writer = std::io::BufWriter::new(Vec::new());
+    result
+        .instructions
+        .write(&mut unoptimized_writer)
+        .expect("Failed to write unoptimized output");
+    let unoptimized_bytes = unoptimized_writer
+        .into_inner()
+        .expect("Failed to get bytes");
+    let unoptimized = String::from_utf8(unoptimized_bytes).expect("Invalid UTF-8");
+
+    // Compile again for optimized output
+    let tokenizer2 = Tokenizer::from(source);
+    let parser2 = Parser::new(tokenizer2);
+    let compiler2 = Compiler::new(parser2, None);
+    let result2 = compiler2.compile();
+
+    // Apply optimizations
+    let optimized_instructions = optimizer::optimize(result2.instructions);
+
+    // Get optimized output
+    let mut optimized_writer = std::io::BufWriter::new(Vec::new());
+    optimized_instructions
+        .write(&mut optimized_writer)
+        .expect("Failed to write optimized output");
+    let optimized_bytes = optimized_writer.into_inner().expect("Failed to get bytes");
+    let optimized = String::from_utf8(optimized_bytes).expect("Invalid UTF-8");
+
+    // Combine both outputs with clear separators
+    format!(
+        "## Unoptimized Output\n\n{}\n## Optimized Output\n\n{}",
+        unoptimized, optimized
+    )
+}

rust_compiler/libs/integration_tests/src/device_indexing_tests.rs

@@ -0,0 +1,107 @@
+#[cfg(test)]
+mod device_indexing_tests {
+    use crate::common::compile_with_and_without_optimization;
+    use indoc::indoc;
+
+    #[test]
+    fn test_device_indexing_with_hash_and_binary_literals() {
+        let source = indoc! {"
+            device printer = \"d0\";
+            
+            let item_type = hash(\"ItemIronIngot\");
+            let quality = 16;
+            let quantity = 7;
+            
+            // Pack into a single value using bitwise operations
+            // Format: (itemHash << 16) | (quality << 8) | quantity
+            let packed = (item_type << 16) | (quality << 8) | quantity;
+            
+            // Write to device stack at address 255
+            let addr = 255;
+            printer[addr] = packed;
+            
+            // Read it back
+            let result = printer[addr];
+        "};
+        let output = compile_with_and_without_optimization(source);
+        insta::assert_snapshot!(output);
+    }
+
+    #[test]
+    fn test_device_indexing_with_computed_index() {
+        let source = indoc! {"
+            device storage = \"d1\";
+            
+            let base_addr = 10;
+            let offset = 5;
+            let index = base_addr + offset;
+            
+            let value = 42;
+            storage[index] = value;
+            
+            let retrieved = storage[index];
+        "};
+        let output = compile_with_and_without_optimization(source);
+        insta::assert_snapshot!(output);
+    }
+
+    #[test]
+    fn test_device_indexing_with_binary_literals() {
+        let source = indoc! {"
+            device mem = \"d0\";
+            
+            // Binary literals for bitwise operations
+            let flags = 0b1010_0101;
+            let mask = 0b1111_0000;
+            let masked = flags & mask;
+            
+            // Write to device
+            mem[0] = masked;
+            
+            // Read back
+            let read_value = mem[0];
+        "};
+        let output = compile_with_and_without_optimization(source);
+        insta::assert_snapshot!(output);
+    }
+
+    #[test]
+    fn test_device_indexing_complex_expression() {
+        let source = indoc! {"
+            device db = \"d0\";
+            
+            let item = hash(\"ItemCopper\");
+            let quality = 5;
+            let quantity = 100;
+            
+            // Complex bitwise expression
+            let packed = (item << 16) | ((quality & 0xFF) << 8) | (quantity & 0xFF);
+            
+            // Index with computed address
+            let slot = 1;
+            let address = slot * 256 + 100;
+            db[address] = packed;
+            
+            // Read back with different computation
+            let read_addr = (slot + 0) * 256 + 100;
+            let stored_value = db[read_addr];
+        "};
+        let output = compile_with_and_without_optimization(source);
+        insta::assert_snapshot!(output);
+    }
+
+    #[test]
+    fn test_device_indexing_optimization_folds_constants() {
+        let source = indoc! {"
+            device cache = \"d0\";
+            
+            // This should optimize to a single constant
+            let packed_constant = (hash(\"ItemSilver\") << 16) | (10 << 8) | 50;
+            
+            cache[255] = packed_constant;
+            let result = cache[255];
+        "};
+        let output = compile_with_and_without_optimization(source);
+        insta::assert_snapshot!(output);
+    }
+}

rust_compiler/libs/integration_tests/src/function_tests.rs

@@ -0,0 +1,48 @@
+#[cfg(test)]
+mod function_tests {
+    use crate::common::compile_with_and_without_optimization;
+    use indoc::indoc;
+
+    #[test]
+    fn test_simple_leaf_function() {
+        let source = "fn test() { let x = 10; }";
+        let output = compile_with_and_without_optimization(source);
+        insta::assert_snapshot!(output);
+    }
+
+    #[test]
+    fn test_function_with_call() {
+        let source = indoc! {"
+            fn add(a, b) { return a + b; }
+            fn main() { let x = add(5, 10); }
+        "};
+        let output = compile_with_and_without_optimization(source);
+        insta::assert_snapshot!(output);
+    }
+
+    #[test]
+    fn test_leaf_function_no_stack_frame() {
+        let source = indoc! {"
+            fn increment(x) { 
+                x = x + 1;
+            }
+        "};
+        let output = compile_with_and_without_optimization(source);
+        insta::assert_snapshot!(output);
+    }
+
+    #[test]
+    fn test_nested_function_calls() {
+        let source = indoc! {"
+            fn add(a, b) { return a + b; }
+            fn multiply(x, y) { return x * 2; }
+            fn complex(a, b) {
+                let sum = add(a, b);
+                let doubled = multiply(sum, 2);
+                return doubled;
+            }
+        "};
+        let output = compile_with_and_without_optimization(source);
+        insta::assert_snapshot!(output);
+    }
+}

rust_compiler/libs/integration_tests/src/lib.rs

@@ -0,0 +1,86 @@
+//! Integration tests for the Slang compiler with optimizer
+//!
+//! These tests compile Slang source code and verify both the compilation
+//! and optimization passes work correctly together using snapshot testing.
+
+#[cfg(test)]
+mod bitwise_tests;
+#[cfg(test)]
+mod common;
+#[cfg(test)]
+mod device_indexing_tests;
+#[cfg(test)]
+mod function_tests;
+#[cfg(test)]
+mod number_literal_tests;
+#[cfg(test)]
+mod optimization_tests;
+
+#[cfg(test)]
+mod integration_tests {
+    use crate::common::compile_with_and_without_optimization;
+    use indoc::indoc;
+
+    #[test]
+    fn test_tuples() {
+        let source = indoc! {r#"
+            device self = "db";
+            device day  = "d0";
+
+            fn getSomethingElse(input) {
+                return input + 1;
+            }
+
+            fn getSensorData() {
+                return (
+                    day.Vertical,
+                    day.Horizontal,
+                    getSomethingElse(3)
+                );
+            }
+
+            loop {
+                yield();
+                
+                let (vertical, horizontal, _) = getSensorData();
+
+                (horizontal, _, _) = getSensorData();
+
+                self.Setting = horizontal;
+            }
+        "#};
+
+        let output = compile_with_and_without_optimization(source);
+        insta::assert_snapshot!(output);
+    }
+
+    #[test]
+    fn test_larre_script() {
+        let source = include_str!("./test_files/test_larre_script.stlg");
+        let output = compile_with_and_without_optimization(source);
+        insta::assert_snapshot!(output);
+    }
+
+    #[test]
+    fn test_reagent_processing() {
+        let source = include_str!("./test_files/reagent_processing.stlg");
+        let output = compile_with_and_without_optimization(source);
+        insta::assert_snapshot!(output);
+    }
+
+    #[test]
+    fn test_setbatched_with_member_access() {
+        let source = indoc! {r#"
+            const SENSOR = 20088;
+            const PANELS = hash("StructureSolarPanelDual");
+            
+            loop {
+              setBatched(PANELS, "Horizontal", SENSOR.Horizontal);
+              setBatched(PANELS, "Vertical", SENSOR.Vertical + 90);
+              yield();
+            }
+        "#};
+        let output = compile_with_and_without_optimization(source);
+        insta::assert_snapshot!(output);
+    }
+}

rust_compiler/libs/integration_tests/src/number_literal_tests.rs

@@ -0,0 +1,29 @@
+#[cfg(test)]
+mod number_literal_tests {
+    use crate::common::compile_with_and_without_optimization;
+    use indoc::indoc;
+
+    #[test]
+    fn test_binary_literals() {
+        let source = indoc! {"
+            let binary = 0b1010_1100;
+            let octal = 0o755;
+            let hex_upper = 0xDEAD_BEEF;
+            let hex_lower = 0xcafe;
+        "};
+        let output = compile_with_and_without_optimization(source);
+        insta::assert_snapshot!(output);
+    }
+
+    #[test]
+    fn test_number_literal_optimization() {
+        let source = indoc! {"
+            let decimal = 42_000;
+            let negative_hex = -0xFF;
+            let negative_binary = -0b1111_0000;
+            let temp_c = 100c;
+        "};
+        let output = compile_with_and_without_optimization(source);
+        insta::assert_snapshot!(output);
+    }
+}

rust_compiler/libs/integration_tests/src/optimization_tests.rs

@@ -0,0 +1,82 @@
+#[cfg(test)]
+mod optimization_tests {
+    use crate::common::compile_with_and_without_optimization;
+    use indoc::indoc;
+
+    #[test]
+    fn test_constant_folding() {
+        let source = "let x = 5 + 10;";
+        let output = compile_with_and_without_optimization(source);
+        insta::assert_snapshot!(output);
+    }
+
+    #[test]
+    fn test_algebraic_simplification() {
+        let source = "let x = 5; let y = x * 1;";
+        let output = compile_with_and_without_optimization(source);
+        insta::assert_snapshot!(output);
+    }
+
+    #[test]
+    fn test_strength_reduction() {
+        let source = "fn double(x) { return x * 2; }";
+        let output = compile_with_and_without_optimization(source);
+        insta::assert_snapshot!(output);
+    }
+
+    #[test]
+    fn test_dead_code_elimination() {
+        let source = indoc! {"
+            fn compute(x) {
+                let unused = 20;
+                return x + 1;
+            }
+        "};
+        let output = compile_with_and_without_optimization(source);
+        insta::assert_snapshot!(output);
+    }
+
+    #[test]
+    fn test_peephole_comparison_fusion() {
+        let source = indoc! {"
+            fn compare(x, y) {
+                if (x > y) {
+                    let z = 1;
+                }
+            }
+        "};
+        let output = compile_with_and_without_optimization(source);
+        insta::assert_snapshot!(output);
+    }
+
+    #[test]
+    fn test_select_optimization() {
+        let source = indoc! {"
+            fn ternary(cond) {
+                let result = 0;
+                if (cond) {
+                    result = 10;
+                } else {
+                    result = 20;
+                }
+                return result;
+            }
+        "};
+        let output = compile_with_and_without_optimization(source);
+        insta::assert_snapshot!(output);
+    }
+
+    #[test]
+    fn test_complex_arithmetic() {
+        let source = indoc! {"
+            fn compute(a, b, c) {
+                let x = a * 2;
+                let y = b + 0;
+                let z = c * 1;
+                return x + y + z;
+            }
+        "};
+        let output = compile_with_and_without_optimization(source);
+        insta::assert_snapshot!(output);
+    }
+}

rust_compiler/libs/integration_tests/src/snapshots/integration_tests__bitwise_tests__bitwise_tests__bitwise_constant_folding.snap

@@ -0,0 +1,18 @@
+---
+source: libs/integration_tests/src/bitwise_tests.rs
+assertion_line: 40
+expression: output
+---
+## Unoptimized Output
+
+j main
+main:
+move r8 0
+move r9 15
+move r10 4111
+
+## Optimized Output
+
+move r8 0
+move r9 15
+move r10 4111

rust_compiler/libs/integration_tests/src/snapshots/integration_tests__bitwise_tests__bitwise_tests__bitwise_operations.snap

@@ -0,0 +1,32 @@
+---
+source: libs/integration_tests/src/bitwise_tests.rs
+assertion_line: 17
+expression: output
+---
+## Unoptimized Output
+
+j main
+main:
+move r8 5
+move r9 3
+and r1 r8 r9
+move r10 r1
+or r2 r8 r9
+move r11 r2
+xor r3 r8 r9
+move r12 r3
+not r4 r8
+move r13 r4
+
+## Optimized Output
+
+move r8 5
+move r9 3
+move r1 1
+move r10 1
+move r2 7
+move r11 7
+move r3 6
+move r12 6
+not r4 r8
+move r13 r4

rust_compiler/libs/integration_tests/src/snapshots/integration_tests__bitwise_tests__bitwise_tests__bitwise_shifts.snap

@@ -0,0 +1,26 @@
+---
+source: libs/integration_tests/src/bitwise_tests.rs
+assertion_line: 29
+expression: output
+---
+## Unoptimized Output
+
+j main
+main:
+move r8 8
+sll r1 r8 2
+move r9 r1
+sra r2 r8 1
+move r10 r2
+srl r3 r8 1
+move r11 r3
+
+## Optimized Output
+
+move r8 8
+move r1 32
+move r9 32
+move r2 4
+move r10 4
+move r3 4
+move r11 4

rust_compiler/libs/integration_tests/src/snapshots/integration_tests__bitwise_tests__bitwise_tests__bitwise_with_const.snap

@@ -0,0 +1,21 @@
+---
+source: libs/integration_tests/src/bitwise_tests.rs
+expression: output
+---
+## Unoptimized Output
+
+j main
+main:
+__internal_L1:
+yield
+clr d0
+put d0 0 1245187
+j __internal_L1
+__internal_L2:
+
+## Optimized Output
+
+yield
+clr d0
+put d0 0 1245187
+j 0

rust_compiler/libs/integration_tests/src/snapshots/integration_tests__bitwise_tests__bitwise_tests__bitwise_with_variables.snap

@@ -0,0 +1,67 @@
+---
+source: libs/integration_tests/src/bitwise_tests.rs
+assertion_line: 57
+expression: output
+---
+## Unoptimized Output
+
+j main
+pack_bits:
+pop r8
+pop r9
+push sp
+push ra
+sll r1 r9 8
+or r2 r1 r8
+move r10 r2
+move r15 r10
+j __internal_L1
+__internal_L1:
+pop ra
+pop sp
+j ra
+extract_bits:
+pop r8
+push sp
+push ra
+sra r1 r8 8
+and r2 r1 255
+move r9 r2
+and r3 r8 255
+move r10 r3
+push r9
+push r10
+sub r0 sp 4
+get r0 db r0
+move r15 r0
+j __internal_L2
+__internal_L2:
+sub r0 sp 3
+get ra db r0
+j ra
+
+## Optimized Output
+
+j main
+pop r8
+pop r9
+push sp
+push ra
+sll r1 r9 8
+or r15 r1 r8
+pop ra
+pop sp
+j ra
+pop r8
+push sp
+push ra
+sra r1 r8 8
+and r9 r1 255
+and r10 r8 255
+push r9
+push r10
+sub r0 sp 4
+get r15 db r0
+sub r0 sp 3
+get ra db r0
+j ra

rust_compiler/libs/integration_tests/src/snapshots/integration_tests__bitwise_tests__bitwise_tests__complex_bit_manipulation.snap

@@ -0,0 +1,80 @@
+---
+source: libs/integration_tests/src/bitwise_tests.rs
+assertion_line: 75
+expression: output
+---
+## Unoptimized Output
+
+j main
+encode_flags:
+pop r8
+pop r9
+pop r10
+push sp
+push ra
+sll r1 r10 7
+sll r2 r9 4
+or r3 r1 r2
+or r4 r3 r8
+move r11 r4
+move r15 r11
+j __internal_L1
+__internal_L1:
+pop ra
+pop sp
+j ra
+decode_flags:
+pop r8
+push sp
+push ra
+sra r1 r8 7
+and r2 r1 1
+move r9 r2
+sra r3 r8 4
+and r4 r3 7
+move r10 r4
+and r5 r8 15
+move r11 r5
+push r9
+push r10
+push r11
+sub r0 sp 5
+get r0 db r0
+move r15 r0
+j __internal_L2
+__internal_L2:
+sub r0 sp 4
+get ra db r0
+j ra
+
+## Optimized Output
+
+j main
+pop r8
+pop r9
+pop r10
+push sp
+push ra
+sll r1 r10 7
+sll r2 r9 4
+or r3 r1 r2
+or r15 r3 r8
+pop ra
+pop sp
+j ra
+pop r8
+push sp
+push ra
+sra r1 r8 7
+and r9 r1 1
+sra r3 r8 4
+and r10 r3 7
+and r11 r8 15
+push r9
+push r10
+push r11
+sub r0 sp 5
+get r15 db r0
+sub r0 sp 4
+get ra db r0
+j ra

rust_compiler/libs/integration_tests/src/snapshots/integration_tests__bitwise_tests__bitwise_tests__sorter_bitwise_operations.snap

@@ -0,0 +1,20 @@
+---
+source: libs/integration_tests/src/bitwise_tests.rs
+assertion_line: 91
+expression: output
+---
+## Unoptimized Output
+
+j main
+main:
+__internal_L1:
+yield
+put d0 0 55164456193
+j __internal_L1
+__internal_L2:
+
+## Optimized Output
+
+yield
+put d0 0 55164456193
+j 0

rust_compiler/libs/integration_tests/src/snapshots/integration_tests__device_indexing_tests__device_indexing_tests__device_indexing_complex_expression.snap

@@ -0,0 +1,54 @@
+---
+source: libs/integration_tests/src/device_indexing_tests.rs
+assertion_line: 90
+expression: output
+---
+## Unoptimized Output
+
+j main
+main:
+move r8 r15
+move r9 5
+move r10 100
+sll r1 r8 16
+and r2 r9 255
+sll r3 r2 8
+or r4 r1 r3
+and r5 r10 255
+or r6 r4 r5
+move r11 r6
+move r12 1
+mul r7 r12 256
+add r2 r7 100
+move r13 r2
+put d0 r13 r11
+add r1 r12 0
+mul r3 r1 256
+add r4 r3 100
+move r14 r4
+get r5 d0 r14
+push r5
+sub sp sp 1
+
+## Optimized Output
+
+move r8 r15
+move r9 5
+move r10 100
+sll r1 r8 16
+move r3 1280
+or r4 r1 r3
+move r5 100
+or r11 r4 r5
+move r12 1
+move r7 256
+move r2 356
+move r13 356
+put d0 r13 r11
+move r1 1
+move r3 256
+move r4 356
+move r14 356
+get r5 d0 r14
+push r5
+sub sp sp 1

rust_compiler/libs/integration_tests/src/snapshots/integration_tests__device_indexing_tests__device_indexing_tests__device_indexing_optimization_folds_constants.snap

@@ -0,0 +1,19 @@
+---
+source: libs/integration_tests/src/device_indexing_tests.rs
+assertion_line: 105
+expression: output
+---
+## Unoptimized Output
+
+j main
+main:
+move r8 -62440604628430
+put d0 255 r8
+get r1 d0 255
+move r9 r1
+
+## Optimized Output
+
+move r8 -62440604628430
+put d0 255 r8
+get r9 d0 255

rust_compiler/libs/integration_tests/src/snapshots/integration_tests__device_indexing_tests__device_indexing_tests__device_indexing_with_binary_literals.snap

@@ -0,0 +1,25 @@
+---
+source: libs/integration_tests/src/device_indexing_tests.rs
+assertion_line: 65
+expression: output
+---
+## Unoptimized Output
+
+j main
+main:
+move r8 165
+move r9 240
+and r1 r8 r9
+move r10 r1
+put d0 0 r10
+get r2 d0 0
+move r11 r2
+
+## Optimized Output
+
+move r8 165
+move r9 240
+move r1 160
+move r10 160
+put d0 0 r10
+get r11 d0 0

rust_compiler/libs/integration_tests/src/snapshots/integration_tests__device_indexing_tests__device_indexing_tests__device_indexing_with_computed_index.snap

@@ -0,0 +1,27 @@
+---
+source: libs/integration_tests/src/device_indexing_tests.rs
+assertion_line: 45
+expression: output
+---
+## Unoptimized Output
+
+j main
+main:
+move r8 10
+move r9 5
+add r1 r8 r9
+move r10 r1
+move r11 42
+put d1 r10 r11
+get r2 d1 r10
+move r12 r2
+
+## Optimized Output
+
+move r8 10
+move r9 5
+move r1 15
+move r10 15
+move r11 42
+put d1 r10 r11
+get r12 d1 r10

rust_compiler/libs/integration_tests/src/snapshots/integration_tests__device_indexing_tests__device_indexing_tests__device_indexing_with_hash_and_binary_literals.snap

@@ -0,0 +1,34 @@
+---
+source: libs/integration_tests/src/device_indexing_tests.rs
+assertion_line: 27
+expression: output
+---
+## Unoptimized Output
+
+j main
+main:
+move r8 r15
+move r9 16
+move r10 7
+sll r1 r8 16
+sll r2 r9 8
+or r3 r1 r2
+or r4 r3 r10
+move r11 r4
+move r12 255
+put d0 r12 r11
+get r5 d0 r12
+move r13 r5
+
+## Optimized Output
+
+move r8 r15
+move r9 16
+move r10 7
+sll r1 r8 16
+move r2 4096
+or r3 r1 r2
+or r11 r3 r10
+move r12 255
+put d0 r12 r11
+get r13 d0 r12

rust_compiler/libs/integration_tests/src/snapshots/integration_tests__function_tests__function_tests__function_with_call.snap

@@ -0,0 +1,52 @@
+---
+source: libs/integration_tests/src/function_tests.rs
+assertion_line: 20
+expression: output
+---
+## Unoptimized Output
+
+j main
+add:
+pop r8
+pop r9
+push sp
+push ra
+add r1 r9 r8
+move r15 r1
+j __internal_L1
+__internal_L1:
+pop ra
+pop sp
+j ra
+main:
+push sp
+push ra
+push 5
+push 10
+jal add
+move r8 r15
+__internal_L2:
+pop ra
+pop sp
+j ra
+
+## Optimized Output
+
+j 9
+pop r8
+pop r9
+push sp
+push ra
+add r15 r9 r8
+pop ra
+pop sp
+j ra
+push sp
+push ra
+push 5
+push 10
+jal 1
+move r8 r15
+pop ra
+pop sp
+j ra

rust_compiler/libs/integration_tests/src/snapshots/integration_tests__function_tests__function_tests__leaf_function_no_stack_frame.snap

@@ -0,0 +1,30 @@
+---
+source: libs/integration_tests/src/function_tests.rs
+assertion_line: 31
+expression: output
+---
+## Unoptimized Output
+
+j main
+increment:
+pop r8
+push sp
+push ra
+add r1 r8 1
+move r8 r1
+__internal_L1:
+pop ra
+pop sp
+j ra
+
+## Optimized Output
+
+j main
+pop r8
+push sp
+push ra
+add r1 r8 1
+move r8 r1
+pop ra
+pop sp
+j ra

rust_compiler/libs/integration_tests/src/snapshots/integration_tests__function_tests__function_tests__nested_function_calls.snap

@@ -0,0 +1,107 @@
+---
+source: libs/integration_tests/src/function_tests.rs
+assertion_line: 46
+expression: output
+---
+## Unoptimized Output
+
+j main
+add:
+pop r8
+pop r9
+push sp
+push ra
+add r1 r9 r8
+move r15 r1
+j __internal_L1
+__internal_L1:
+pop ra
+pop sp
+j ra
+multiply:
+pop r8
+pop r9
+push sp
+push ra
+mul r1 r9 2
+move r15 r1
+j __internal_L2
+__internal_L2:
+pop ra
+pop sp
+j ra
+complex:
+pop r8
+pop r9
+push sp
+push ra
+push r8
+push r9
+push r9
+push r8
+jal add
+pop r9
+pop r8
+move r10 r15
+push r8
+push r9
+push r10
+push r10
+push 2
+jal multiply
+pop r10
+pop r9
+pop r8
+move r11 r15
+move r15 r11
+j __internal_L3
+__internal_L3:
+pop ra
+pop sp
+j ra
+
+## Optimized Output
+
+j main
+pop r8
+pop r9
+push sp
+push ra
+add r15 r9 r8
+pop ra
+pop sp
+j ra
+pop r8
+pop r9
+push sp
+push ra
+add r15 r9 r9
+pop ra
+pop sp
+j ra
+pop r8
+pop r9
+push sp
+push ra
+push r8
+push r9
+push r9
+push r8
+jal 1
+pop r9
+pop r8
+move r10 r15
+push r8
+push r9
+push r10
+push r10
+push 2
+jal 9
+pop r10
+pop r9
+pop r8
+move r11 r15
+move r15 r11
+pop ra
+pop sp
+j ra

rust_compiler/libs/integration_tests/src/snapshots/integration_tests__function_tests__function_tests__simple_leaf_function.snap

@@ -0,0 +1,26 @@
+---
+source: libs/integration_tests/src/function_tests.rs
+assertion_line: 10
+expression: output
+---
+## Unoptimized Output
+
+j main
+test:
+push sp
+push ra
+move r8 10
+__internal_L1:
+pop ra
+pop sp
+j ra
+
+## Optimized Output
+
+j main
+push sp
+push ra
+move r8 10
+pop ra
+pop sp
+j ra

rust_compiler/libs/integration_tests/src/snapshots/integration_tests__integration_tests__larre_script.snap

@@ -0,0 +1,224 @@
+---
+source: libs/integration_tests/src/lib.rs
+assertion_line: 54
+expression: output
+---
+## Unoptimized Output
+
+j main
+waitForIdle:
+push sp
+push ra
+yield
+__internal_L2:
+l r1 d0 Idle
+seq r2 r1 0
+beqz r2 __internal_L3
+yield
+j __internal_L2
+__internal_L3:
+__internal_L1:
+pop ra
+pop sp
+j ra
+deposit:
+push sp
+push ra
+s d0 Setting 1
+jal waitForIdle
+move r1 r15
+s d0 Activate 1
+jal waitForIdle
+move r2 r15
+s d1 Open 0
+__internal_L4:
+pop ra
+pop sp
+j ra
+checkAndHarvest:
+pop r8
+push sp
+push ra
+sle r1 r8 1
+ls r15 d0 255 Seeding
+slt r2 r15 1
+or r3 r1 r2
+beqz r3 __internal_L6
+j __internal_L5
+__internal_L6:
+__internal_L7:
+ls r15 d0 255 Mature
+beqz r15 __internal_L8
+yield
+s d0 Activate 1
+j __internal_L7
+__internal_L8:
+ls r15 d0 255 Occupied
+move r9 r15
+s d0 Setting 1
+push r8
+push r9
+jal waitForIdle
+pop r9
+pop r8
+move r4 r15
+push r8
+push r9
+jal deposit
+pop r9
+pop r8
+move r5 r15
+beqz r9 __internal_L9
+push r8
+push r9
+jal deposit
+pop r9
+pop r8
+move r6 r15
+__internal_L9:
+s d0 Setting r8
+push r8
+push r9
+jal waitForIdle
+pop r9
+pop r8
+move r6 r15
+ls r15 d0 0 Occupied
+beqz r15 __internal_L10
+s d0 Activate 1
+__internal_L10:
+push r8
+push r9
+jal waitForIdle
+pop r9
+pop r8
+move r7 r15
+__internal_L5:
+pop ra
+pop sp
+j ra
+main:
+move r8 0
+__internal_L11:
+yield
+l r1 d0 Idle
+seq r2 r1 0
+beqz r2 __internal_L13
+j __internal_L11
+__internal_L13:
+add r3 r8 1
+sgt r4 r3 19
+add r5 r8 1
+select r6 r4 2 r5
+move r9 r6
+push r8
+push r9
+push r8
+jal checkAndHarvest
+pop r9
+pop r8
+move r7 r15
+s d0 Setting r9
+move r8 r9
+j __internal_L11
+__internal_L12:
+
+## Optimized Output
+
+j 77
+push sp
+push ra
+yield
+l r1 d0 Idle
+bne r1 0 8
+yield
+j 4
+pop ra
+pop sp
+j ra
+push sp
+push ra
+s d0 Setting 1
+jal 1
+move r1 r15
+s d0 Activate 1
+jal 1
+move r2 r15
+s d1 Open 0
+pop ra
+pop sp
+j ra
+pop r8
+push sp
+push ra
+sle r1 r8 1
+ls r15 d0 255 Seeding
+slt r2 r15 1
+or r3 r1 r2
+beqz r3 32
+j 74
+ls r15 d0 255 Mature
+beqz r15 37
+yield
+s d0 Activate 1
+j 32
+ls r9 d0 255 Occupied
+s d0 Setting 1
+push r8
+push r9
+jal 1
+pop r9
+pop r8
+move r4 r15
+push r8
+push r9
+jal 11
+pop r9
+pop r8
+move r5 r15
+beqz r9 58
+push r8
+push r9
+jal 11
+pop r9
+pop r8
+move r6 r15
+s d0 Setting r8
+push r8
+push r9
+jal 1
+pop r9
+pop r8
+move r6 r15
+ls r15 d0 0 Occupied
+beqz r15 68
+s d0 Activate 1
+push r8
+push r9
+jal 1
+pop r9
+pop r8
+move r7 r15
+pop ra
+pop sp
+j ra
+move r8 0
+yield
+l r1 d0 Idle
+bne r1 0 82
+j 78
+add r3 r8 1
+sgt r4 r3 19
+add r5 r8 1
+select r6 r4 2 r5
+move r9 r6
+push r8
+push r9
+push r8
+jal 23
+pop r9
+pop r8
+move r7 r15
+s d0 Setting r9
+move r8 r9
+j 78

rust_compiler/libs/integration_tests/src/snapshots/integration_tests__integration_tests__reagent_processing.snap

@@ -0,0 +1,112 @@
+---
+source: libs/integration_tests/src/lib.rs
+assertion_line: 61
+expression: output
+---
+## Unoptimized Output
+
+j main
+main:
+s d2 Mode 1
+s d2 On 0
+move r8 0
+move r9 0
+__internal_L1:
+yield
+l r1 d0 Reagents
+move r10 r1
+sge r2 r10 100
+sge r3 r9 2
+or r4 r2 r3
+beqz r4 __internal_L3
+move r8 1
+__internal_L3:
+slt r5 r10 100
+ls r15 d0 0 Occupied
+seq r6 r15 0
+and r7 r5 r6
+add r1 r9 1
+select r2 r7 r1 0
+move r9 r2
+l r3 d0 Rpm
+slt r4 r3 1
+and r5 r8 r4
+beqz r5 __internal_L4
+s d0 Open 1
+seq r6 r10 0
+ls r15 d0 0 Occupied
+and r7 r6 r15
+seq r1 r7 0
+move r8 r1
+__internal_L4:
+seq r6 r8 0
+s d0 On r6
+ls r15 d1 0 Quantity
+move r11 r15
+l r7 d3 Pressure
+sgt r1 r7 200
+beqz r1 __internal_L5
+j __internal_L1
+__internal_L5:
+sgt r2 r11 0
+s d1 On r2
+sgt r3 r11 0
+s d1 Activate r3
+l r4 d3 Pressure
+sgt r5 r4 0
+l r6 d1 Activate
+or r7 r5 r6
+s d2 On r7
+l r1 d1 Activate
+s db Setting r1
+j __internal_L1
+__internal_L2:
+
+## Optimized Output
+
+s d2 Mode 1
+s d2 On 0
+move r8 0
+move r9 0
+yield
+l r10 d0 Reagents
+sge r2 r10 100
+sge r3 r9 2
+or r4 r2 r3
+beqz r4 11
+move r8 1
+slt r5 r10 100
+ls r15 d0 0 Occupied
+seq r6 r15 0
+and r7 r5 r6
+add r1 r9 1
+select r2 r7 r1 0
+move r9 r2
+l r3 d0 Rpm
+slt r4 r3 1
+and r5 r8 r4
+beqz r5 27
+s d0 Open 1
+seq r6 r10 0
+ls r15 d0 0 Occupied
+and r7 r6 r15
+seq r8 r7 0
+seq r6 r8 0
+s d0 On r6
+ls r15 d1 0 Quantity
+move r11 r15
+l r7 d3 Pressure
+ble r7 200 34
+j 4
+sgt r2 r11 0
+s d1 On r2
+sgt r3 r11 0
+s d1 Activate r3
+l r4 d3 Pressure
+sgt r5 r4 0
+l r6 d1 Activate
+or r7 r5 r6
+s d2 On r7
+l r1 d1 Activate
+s db Setting r1
+j 4

rust_compiler/libs/integration_tests/src/snapshots/integration_tests__integration_tests__setbatched_with_member_access.snap

@@ -0,0 +1,27 @@
+---
+source: libs/integration_tests/src/lib.rs
+expression: output
+---
+## Unoptimized Output
+
+j main
+main:
+__internal_L1:
+l r1 20088 Horizontal
+sb -539224550 Horizontal r1
+l r2 20088 Vertical
+add r3 r2 90
+sb -539224550 Vertical r3
+yield
+j __internal_L1
+__internal_L2:
+
+## Optimized Output
+
+l r1 20088 Horizontal
+sb -539224550 Horizontal r1
+l r2 20088 Vertical
+add r3 r2 90
+sb -539224550 Vertical r3
+yield
+j 0

rust_compiler/libs/integration_tests/src/snapshots/integration_tests__integration_tests__test_larre_script.snap

@@ -0,0 +1,223 @@
+---
+source: libs/integration_tests/src/lib.rs
+expression: output
+---
+## Unoptimized Output
+
+j main
+waitForIdle:
+push sp
+push ra
+yield
+__internal_L2:
+l r1 d0 Idle
+seq r2 r1 0
+beqz r2 __internal_L3
+yield
+j __internal_L2
+__internal_L3:
+__internal_L1:
+pop ra
+pop sp
+j ra
+deposit:
+push sp
+push ra
+s d0 Setting 1
+jal waitForIdle
+move r1 r15
+s d0 Activate 1
+jal waitForIdle
+move r2 r15
+s d1 Open 0
+__internal_L4:
+pop ra
+pop sp
+j ra
+checkAndHarvest:
+pop r8
+push sp
+push ra
+sle r1 r8 1
+ls r15 d0 255 Seeding
+slt r2 r15 1
+or r3 r1 r2
+beqz r3 __internal_L6
+j __internal_L5
+__internal_L6:
+__internal_L7:
+ls r15 d0 255 Mature
+beqz r15 __internal_L8
+yield
+s d0 Activate 1
+j __internal_L7
+__internal_L8:
+ls r15 d0 255 Occupied
+move r9 r15
+s d0 Setting 1
+push r8
+push r9
+jal waitForIdle
+pop r9
+pop r8
+move r4 r15
+push r8
+push r9
+jal deposit
+pop r9
+pop r8
+move r5 r15
+beqz r9 __internal_L9
+push r8
+push r9
+jal deposit
+pop r9
+pop r8
+move r6 r15
+__internal_L9:
+s d0 Setting r8
+push r8
+push r9
+jal waitForIdle
+pop r9
+pop r8
+move r6 r15
+ls r15 d0 0 Occupied
+beqz r15 __internal_L10
+s d0 Activate 1
+__internal_L10:
+push r8
+push r9
+jal waitForIdle
+pop r9
+pop r8
+move r7 r15
+__internal_L5:
+pop ra
+pop sp
+j ra
+main:
+move r8 0
+__internal_L11:
+yield
+l r1 d0 Idle
+seq r2 r1 0
+beqz r2 __internal_L13
+j __internal_L11
+__internal_L13:
+add r3 r8 1
+sgt r4 r3 19
+add r5 r8 1
+select r6 r4 2 r5
+move r9 r6
+push r8
+push r9
+push r8
+jal checkAndHarvest
+pop r9
+pop r8
+move r7 r15
+s d0 Setting r9
+move r8 r9
+j __internal_L11
+__internal_L12:
+
+## Optimized Output
+
+j 77
+push sp
+push ra
+yield
+l r1 d0 Idle
+bne r1 0 8
+yield
+j 4
+pop ra
+pop sp
+j ra
+push sp
+push ra
+s d0 Setting 1
+jal 1
+move r1 r15
+s d0 Activate 1
+jal 1
+move r2 r15
+s d1 Open 0
+pop ra
+pop sp
+j ra
+pop r8
+push sp
+push ra
+sle r1 r8 1
+ls r15 d0 255 Seeding
+slt r2 r15 1
+or r3 r1 r2
+beqz r3 32
+j 74
+ls r15 d0 255 Mature
+beqz r15 37
+yield
+s d0 Activate 1
+j 32
+ls r9 d0 255 Occupied
+s d0 Setting 1
+push r8
+push r9
+jal 1
+pop r9
+pop r8
+move r4 r15
+push r8
+push r9
+jal 11
+pop r9
+pop r8
+move r5 r15
+beqz r9 58
+push r8
+push r9
+jal 11
+pop r9
+pop r8
+move r6 r15
+s d0 Setting r8
+push r8
+push r9
+jal 1
+pop r9
+pop r8
+move r6 r15
+ls r15 d0 0 Occupied
+beqz r15 68
+s d0 Activate 1
+push r8
+push r9
+jal 1
+pop r9
+pop r8
+move r7 r15
+pop ra
+pop sp
+j ra
+move r8 0
+yield
+l r1 d0 Idle
+bne r1 0 82
+j 78
+add r3 r8 1
+sgt r4 r3 19
+add r5 r8 1
+select r6 r4 2 r5
+move r9 r6
+push r8
+push r9
+push r8
+jal 23
+pop r9
+pop r8
+move r7 r15
+s d0 Setting r9
+move r8 r9
+j 78

rust_compiler/libs/integration_tests/src/snapshots/integration_tests__integration_tests__test_reagent_processing.snap

@@ -0,0 +1,111 @@
+---
+source: libs/integration_tests/src/lib.rs
+expression: output
+---
+## Unoptimized Output
+
+j main
+main:
+s d2 Mode 1
+s d2 On 0
+move r8 0
+move r9 0
+__internal_L1:
+yield
+l r1 d0 Reagents
+move r10 r1
+sge r2 r10 100
+sge r3 r9 2
+or r4 r2 r3
+beqz r4 __internal_L3
+move r8 1
+__internal_L3:
+slt r5 r10 100
+ls r15 d0 0 Occupied
+seq r6 r15 0
+and r7 r5 r6
+add r1 r9 1
+select r2 r7 r1 0
+move r9 r2
+l r3 d0 Rpm
+slt r4 r3 1
+and r5 r8 r4
+beqz r5 __internal_L4
+s d0 Open 1
+seq r6 r10 0
+ls r15 d0 0 Occupied
+and r7 r6 r15
+seq r1 r7 0
+move r8 r1
+__internal_L4:
+seq r6 r8 0
+s d0 On r6
+ls r15 d1 0 Quantity
+move r11 r15
+l r7 d3 Pressure
+sgt r1 r7 200
+beqz r1 __internal_L5
+j __internal_L1
+__internal_L5:
+sgt r2 r11 0
+s d1 On r2
+sgt r3 r11 0
+s d1 Activate r3
+l r4 d3 Pressure
+sgt r5 r4 0
+l r6 d1 Activate
+or r7 r5 r6
+s d2 On r7
+l r1 d1 Activate
+s db Setting r1
+j __internal_L1
+__internal_L2:
+
+## Optimized Output
+
+s d2 Mode 1
+s d2 On 0
+move r8 0
+move r9 0
+yield
+l r10 d0 Reagents
+sge r2 r10 100
+sge r3 r9 2
+or r4 r2 r3
+beqz r4 11
+move r8 1
+slt r5 r10 100
+ls r15 d0 0 Occupied
+seq r6 r15 0
+and r7 r5 r6
+add r1 r9 1
+select r2 r7 r1 0
+move r9 r2
+l r3 d0 Rpm
+slt r4 r3 1
+and r5 r8 r4
+beqz r5 27
+s d0 Open 1
+seq r6 r10 0
+ls r15 d0 0 Occupied
+and r7 r6 r15
+seq r8 r7 0
+seq r6 r8 0
+s d0 On r6
+ls r15 d1 0 Quantity
+move r11 r15
+l r7 d3 Pressure
+ble r7 200 34
+j 4
+sgt r2 r11 0
+s d1 On r2
+sgt r3 r11 0
+s d1 Activate r3
+l r4 d3 Pressure
+sgt r5 r4 0
+l r6 d1 Activate
+or r7 r5 r6
+s d2 On r7
+l r1 d1 Activate
+s db Setting r1
+j 4

rust_compiler/libs/integration_tests/src/snapshots/integration_tests__integration_tests__test_tuples.snap

@@ -0,0 +1,93 @@
+---
+source: libs/integration_tests/src/lib.rs
+assertion_line: 206
+expression: output
+---
+## Unoptimized Output
+
+j main
+getSomethingElse:
+pop r8
+push sp
+push ra
+add r1 r8 1
+move r15 r1
+j __internal_L1
+__internal_L1:
+pop ra
+pop sp
+j ra
+getSensorData:
+push sp
+push ra
+l r1 d0 Vertical
+push r1
+l r2 d0 Horizontal
+push r2
+push 3
+jal getSomethingElse
+move r3 r15
+push r3
+sub r0 sp 5
+get r0 db r0
+move r15 r0
+j __internal_L2
+__internal_L2:
+sub r0 sp 4
+get ra db r0
+j ra
+main:
+__internal_L3:
+yield
+jal getSensorData
+pop r0
+pop r9
+pop r8
+move sp r15
+jal getSensorData
+pop r0
+pop r0
+pop r9
+move sp r15
+s db Setting r9
+j __internal_L3
+__internal_L4:
+
+## Optimized Output
+
+j 23
+pop r8
+push sp
+push ra
+add r15 r8 1
+pop ra
+pop sp
+j ra
+push sp
+push ra
+l r1 d0 Vertical
+push r1
+l r2 d0 Horizontal
+push r2
+push 3
+jal 1
+move r3 r15
+push r3
+sub r0 sp 5
+get r15 db r0
+sub r0 sp 4
+get ra db r0
+j ra
+yield
+jal 8
+pop r0
+pop r9
+pop r8
+move sp r15
+jal 8
+pop r0
+pop r0
+pop r9
+move sp r15
+s db Setting r9
+j 23

rust_compiler/libs/integration_tests/src/snapshots/integration_tests__integration_tests__tuples.snap

@@ -0,0 +1,93 @@
+---
+source: libs/integration_tests/src/lib.rs
+assertion_line: 47
+expression: output
+---
+## Unoptimized Output
+
+j main
+getSomethingElse:
+pop r8
+push sp
+push ra
+add r1 r8 1
+move r15 r1
+j __internal_L1
+__internal_L1:
+pop ra
+pop sp
+j ra
+getSensorData:
+push sp
+push ra
+l r1 d0 Vertical
+push r1
+l r2 d0 Horizontal
+push r2
+push 3
+jal getSomethingElse
+move r3 r15
+push r3
+sub r0 sp 5
+get r0 db r0
+move r15 r0
+j __internal_L2
+__internal_L2:
+sub r0 sp 4
+get ra db r0
+j ra
+main:
+__internal_L3:
+yield
+jal getSensorData
+pop r0
+pop r9
+pop r8
+move sp r15
+jal getSensorData
+pop r0
+pop r0
+pop r9
+move sp r15
+s db Setting r9
+j __internal_L3
+__internal_L4:
+
+## Optimized Output
+
+j 23
+pop r8
+push sp
+push ra
+add r15 r8 1
+pop ra
+pop sp
+j ra
+push sp
+push ra
+l r1 d0 Vertical
+push r1
+l r2 d0 Horizontal
+push r2
+push 3
+jal 1
+move r3 r15
+push r3
+sub r0 sp 5
+get r15 db r0
+sub r0 sp 4
+get ra db r0
+j ra
+yield
+jal 8
+pop r0
+pop r9
+pop r8
+move sp r15
+jal 8
+pop r0
+pop r0
+pop r9
+move sp r15
+s db Setting r9
+j 23

rust_compiler/libs/integration_tests/src/snapshots/integration_tests__number_literal_tests__number_literal_tests__binary_literals.snap

@@ -0,0 +1,20 @@
+---
+source: libs/integration_tests/src/number_literal_tests.rs
+assertion_line: 15
+expression: output
+---
+## Unoptimized Output
+
+j main
+main:
+move r8 172
+move r9 493
+move r10 3735928559
+move r11 51966
+
+## Optimized Output
+
+move r8 172
+move r9 493
+move r10 3735928559
+move r11 51966

rust_compiler/libs/integration_tests/src/snapshots/integration_tests__number_literal_tests__number_literal_tests__number_literal_optimization.snap

@@ -0,0 +1,20 @@
+---
+source: libs/integration_tests/src/number_literal_tests.rs
+assertion_line: 27
+expression: output
+---
+## Unoptimized Output
+
+j main
+main:
+move r8 42000
+move r9 -255
+move r10 -240
+move r11 373.15
+
+## Optimized Output
+
+move r8 42000
+move r9 -255
+move r10 -240
+move r11 373.15

rust_compiler/libs/integration_tests/src/snapshots/integration_tests__optimization_tests__optimization_tests__algebraic_simplification.snap

@@ -0,0 +1,18 @@
+---
+source: libs/integration_tests/src/optimization_tests.rs
+assertion_line: 17
+expression: output
+---
+## Unoptimized Output
+
+j main
+main:
+move r8 5
+mul r1 r8 1
+move r9 r1
+
+## Optimized Output
+
+move r8 5
+move r1 5
+move r9 5

rust_compiler/libs/integration_tests/src/snapshots/integration_tests__optimization_tests__optimization_tests__complex_arithmetic.snap

@@ -0,0 +1,45 @@
+---
+source: libs/integration_tests/src/optimization_tests.rs
+assertion_line: 80
+expression: output
+---
+## Unoptimized Output
+
+j main
+compute:
+pop r8
+pop r9
+pop r10
+push sp
+push ra
+mul r1 r10 2
+move r11 r1
+add r2 r9 0
+move r12 r2
+mul r3 r8 1
+move r13 r3
+add r4 r11 r12
+add r5 r4 r13
+move r15 r5
+j __internal_L1
+__internal_L1:
+pop ra
+pop sp
+j ra
+
+## Optimized Output
+
+j main
+pop r8
+pop r9
+pop r10
+push sp
+push ra
+add r11 r10 r10
+move r12 r9
+move r13 r8
+add r4 r11 r12
+add r15 r4 r13
+pop ra
+pop sp
+j ra

rust_compiler/libs/integration_tests/src/snapshots/integration_tests__optimization_tests__optimization_tests__constant_folding.snap

@@ -0,0 +1,14 @@
+---
+source: libs/integration_tests/src/optimization_tests.rs
+assertion_line: 10
+expression: output
+---
+## Unoptimized Output
+
+j main
+main:
+move r8 15
+
+## Optimized Output
+
+move r8 15

rust_compiler/libs/integration_tests/src/snapshots/integration_tests__optimization_tests__optimization_tests__dead_code_elimination.snap

@@ -0,0 +1,32 @@
+---
+source: libs/integration_tests/src/optimization_tests.rs
+assertion_line: 36
+expression: output
+---
+## Unoptimized Output
+
+j main
+compute:
+pop r8
+push sp
+push ra
+move r9 20
+add r1 r8 1
+move r15 r1
+j __internal_L1
+__internal_L1:
+pop ra
+pop sp
+j ra
+
+## Optimized Output
+
+j main
+pop r8
+push sp
+push ra
+move r9 20
+add r15 r8 1
+pop ra
+pop sp
+j ra

rust_compiler/libs/integration_tests/src/snapshots/integration_tests__optimization_tests__optimization_tests__peephole_comparison_fusion.snap

@@ -0,0 +1,34 @@
+---
+source: libs/integration_tests/src/optimization_tests.rs
+assertion_line: 49
+expression: output
+---
+## Unoptimized Output
+
+j main
+compare:
+pop r8
+pop r9
+push sp
+push ra
+sgt r1 r9 r8
+beqz r1 __internal_L2
+move r10 1
+__internal_L2:
+__internal_L1:
+pop ra
+pop sp
+j ra
+
+## Optimized Output
+
+j main
+pop r8
+pop r9
+push sp
+push ra
+ble r9 r8 7
+move r10 1
+pop ra
+pop sp
+j ra

rust_compiler/libs/integration_tests/src/snapshots/integration_tests__optimization_tests__optimization_tests__select_optimization.snap

@@ -0,0 +1,36 @@
+---
+source: libs/integration_tests/src/optimization_tests.rs
+assertion_line: 66
+expression: output
+---
+## Unoptimized Output
+
+j main
+ternary:
+pop r8
+push sp
+push ra
+move r9 0
+beqz r8 __internal_L3
+move r9 10
+j __internal_L2
+__internal_L3:
+move r9 20
+__internal_L2:
+move r15 r9
+j __internal_L1
+__internal_L1:
+pop ra
+pop sp
+j ra
+
+## Optimized Output
+
+j main
+pop r8
+push sp
+push ra
+select r15 r8 10 20
+pop ra
+pop sp
+j ra

rust_compiler/libs/integration_tests/src/snapshots/integration_tests__optimization_tests__optimization_tests__strength_reduction.snap

@@ -0,0 +1,30 @@
+---
+source: libs/integration_tests/src/optimization_tests.rs
+assertion_line: 24
+expression: output
+---
+## Unoptimized Output
+
+j main
+double:
+pop r8
+push sp
+push ra
+mul r1 r8 2
+move r15 r1
+j __internal_L1
+__internal_L1:
+pop ra
+pop sp
+j ra
+
+## Optimized Output
+
+j main
+pop r8
+push sp
+push ra
+add r15 r8 r8
+pop ra
+pop sp
+j ra

rust_compiler/libs/integration_tests/src/test_files/reagent_processing.stlg

@@ -0,0 +1,49 @@
+device combustion = "d0";
+device furnace = "d1";
+device vent = "d2";
+device gasSensor = "d3";
+device self = "db";
+
+const MAX_WAIT_ITER = 2;
+const STACK_SIZE = 100;
+
+vent.Mode = 1; // Vent inward into pipes
+vent.On = false;
+let ejecting = false;
+let combustionWaitIter = 0;
+
+loop {
+  yield();
+
+  let reagentCount = combustion.Reagents;
+  
+  if (reagentCount >= STACK_SIZE || combustionWaitIter >= MAX_WAIT_ITER) {
+    ejecting = true;
+  }
+
+  combustionWaitIter = (reagentCount < STACK_SIZE && !ls(combustion, 0, "Occupied"))
+    ? combustionWaitIter + 1
+    : 0;
+
+  if (ejecting && combustion.Rpm < 1) {
+    combustion.Open = true;
+    ejecting = !(reagentCount == 0 && ls(combustion, 0, "Occupied"));
+  }
+
+  combustion.On = !ejecting;
+  
+  let furnaceAmt = ls(furnace, 0, "Quantity");
+
+  if (gasSensor.Pressure > 200) {
+    // safety: don't turn this on if we have gas still to process
+    // This should prevent pipes from blowing. This will NOT hault
+    // The in-progress burn job, but it'll prevent new jobs from
+    // blowing the walls or pipes.
+    continue;
+  } 
+
+  furnace.On = furnaceAmt > 0;
+  furnace.Activate = furnaceAmt > 0;
+  vent.On = gasSensor.Pressure > 0 || furnace.Activate;
+  self.Setting = furnace.Activate;
+}

rust_compiler/libs/optimizer/src/algebraic_simplification.rs

@@ -0,0 +1,161 @@
+use il::{Instruction, InstructionNode, Operand};
+use rust_decimal::Decimal;
+
+/// Pass: Algebraic Simplification
+/// Simplifies mathematical identities like x+0, x*1, x*0, etc.
+pub fn algebraic_simplification<'a>(
+    input: Vec<InstructionNode<'a>>,
+) -> (Vec<InstructionNode<'a>>, bool) {
+    let mut output = Vec::with_capacity(input.len());
+    let mut changed = false;
+
+    for mut node in input {
+        let simplified = match &node.instruction {
+            // x + 0 = x
+            Instruction::Add(dst, a, Operand::Number(n)) if n.is_zero() => {
+                Some(Instruction::Move(dst.clone(), a.clone()))
+            }
+            Instruction::Add(dst, Operand::Number(n), b) if n.is_zero() => {
+                Some(Instruction::Move(dst.clone(), b.clone()))
+            }
+
+            // x - 0 = x
+            Instruction::Sub(dst, a, Operand::Number(n)) if n.is_zero() => {
+                Some(Instruction::Move(dst.clone(), a.clone()))
+            }
+
+            // x * 1 = x
+            Instruction::Mul(dst, a, Operand::Number(n)) if *n == Decimal::from(1) => {
+                Some(Instruction::Move(dst.clone(), a.clone()))
+            }
+            Instruction::Mul(dst, Operand::Number(n), b) if *n == Decimal::from(1) => {
+                Some(Instruction::Move(dst.clone(), b.clone()))
+            }
+
+            // x * 0 = 0
+            Instruction::Mul(dst, _, Operand::Number(n)) if n.is_zero() => {
+                Some(Instruction::Move(dst.clone(), Operand::Number(Decimal::ZERO)))
+            }
+            Instruction::Mul(dst, Operand::Number(n), _) if n.is_zero() => {
+                Some(Instruction::Move(dst.clone(), Operand::Number(Decimal::ZERO)))
+            }
+
+            // x / 1 = x
+            Instruction::Div(dst, a, Operand::Number(n)) if *n == Decimal::from(1) => {
+                Some(Instruction::Move(dst.clone(), a.clone()))
+            }
+
+            // 0 / x = 0 (if x != 0, but we can't check at compile time for non-literals)
+            Instruction::Div(dst, Operand::Number(n), _) if n.is_zero() => {
+                Some(Instruction::Move(dst.clone(), Operand::Number(Decimal::ZERO)))
+            }
+
+            // x % 1 = 0
+            Instruction::Mod(dst, _, Operand::Number(n)) if *n == Decimal::from(1) => {
+                Some(Instruction::Move(dst.clone(), Operand::Number(Decimal::ZERO)))
+            }
+
+            // 0 % x = 0
+            Instruction::Mod(dst, Operand::Number(n), _) if n.is_zero() => {
+                Some(Instruction::Move(dst.clone(), Operand::Number(Decimal::ZERO)))
+            }
+
+            // x AND 0 = 0
+            Instruction::And(dst, _, Operand::Number(n)) if n.is_zero() => {
+                Some(Instruction::Move(dst.clone(), Operand::Number(Decimal::ZERO)))
+            }
+            Instruction::And(dst, Operand::Number(n), _) if n.is_zero() => {
+                Some(Instruction::Move(dst.clone(), Operand::Number(Decimal::ZERO)))
+            }
+
+            // x OR 0 = x
+            Instruction::Or(dst, a, Operand::Number(n)) if n.is_zero() => {
+                Some(Instruction::Move(dst.clone(), a.clone()))
+            }
+            Instruction::Or(dst, Operand::Number(n), b) if n.is_zero() => {
+                Some(Instruction::Move(dst.clone(), b.clone()))
+            }
+
+            // x XOR 0 = x
+            Instruction::Xor(dst, a, Operand::Number(n)) if n.is_zero() => {
+                Some(Instruction::Move(dst.clone(), a.clone()))
+            }
+            Instruction::Xor(dst, Operand::Number(n), b) if n.is_zero() => {
+                Some(Instruction::Move(dst.clone(), b.clone()))
+            }
+
+            _ => None,
+        };
+
+        if let Some(new) = simplified {
+            node.instruction = new;
+            changed = true;
+        }
+
+        output.push(node);
+    }
+
+    (output, changed)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_add_zero() {
+        let input = vec![InstructionNode::new(
+            Instruction::Add(
+                Operand::Register(1),
+                Operand::Register(2),
+                Operand::Number(Decimal::ZERO),
+            ),
+            None,
+        )];
+
+        let (output, changed) = algebraic_simplification(input);
+        assert!(changed);
+        assert!(matches!(
+            output[0].instruction,
+            Instruction::Move(Operand::Register(1), Operand::Register(2))
+        ));
+    }
+
+    #[test]
+    fn test_mul_one() {
+        let input = vec![InstructionNode::new(
+            Instruction::Mul(
+                Operand::Register(3),
+                Operand::Register(4),
+                Operand::Number(Decimal::ONE),
+            ),
+            None,
+        )];
+
+        let (output, changed) = algebraic_simplification(input);
+        assert!(changed);
+        assert!(matches!(
+            output[0].instruction,
+            Instruction::Move(Operand::Register(3), Operand::Register(4))
+        ));
+    }
+
+    #[test]
+    fn test_mul_zero() {
+        let input = vec![InstructionNode::new(
+            Instruction::Mul(
+                Operand::Register(5),
+                Operand::Register(6),
+                Operand::Number(Decimal::ZERO),
+            ),
+            None,
+        )];
+
+        let (output, changed) = algebraic_simplification(input);
+        assert!(changed);
+        assert!(matches!(
+            output[0].instruction,
+            Instruction::Move(Operand::Register(5), Operand::Number(_))
+        ));
+    }
+}

rust_compiler/libs/optimizer/src/constant_propagation.rs

@@ -0,0 +1,213 @@
+use crate::helpers::get_destination_reg;
+use il::{Instruction, InstructionNode, Operand};
+use rust_decimal::Decimal;
+
+/// Pass: Constant Propagation
+/// Folds arithmetic operations when both operands are constant.
+/// Also tracks register values and propagates them forward.
+pub fn constant_propagation<'a>(
+    input: Vec<InstructionNode<'a>>,
+) -> (Vec<InstructionNode<'a>>, bool) {
+    let mut output = Vec::with_capacity(input.len());
+    let mut changed = false;
+    let mut registers: [Option<Decimal>; 16] = [None; 16];
+
+    for mut node in input {
+        // Invalidate register tracking on label/call boundaries
+        match &node.instruction {
+            Instruction::LabelDef(_) | Instruction::JumpAndLink(_) => registers = [None; 16],
+            _ => {}
+        }
+
+        let simplified = match &node.instruction {
+            Instruction::Move(dst, src) => resolve_value(src, &registers)
+                .map(|val| Instruction::Move(dst.clone(), Operand::Number(val))),
+            Instruction::Add(dst, a, b) => try_fold_math(dst, a, b, &registers, |x, y| x + y),
+            Instruction::Sub(dst, a, b) => try_fold_math(dst, a, b, &registers, |x, y| x - y),
+            Instruction::Mul(dst, a, b) => try_fold_math(dst, a, b, &registers, |x, y| x * y),
+            Instruction::Div(dst, a, b) => try_fold_math(dst, a, b, &registers, |x, y| {
+                if y.is_zero() { Decimal::ZERO } else { x / y }
+            }),
+            Instruction::Mod(dst, a, b) => try_fold_math(dst, a, b, &registers, |x, y| {
+                if y.is_zero() { Decimal::ZERO } else { x % y }
+            }),
+            Instruction::And(dst, a, b) => try_fold_bitwise(dst, a, b, &registers, |x, y| x & y),
+            Instruction::Or(dst, a, b) => try_fold_bitwise(dst, a, b, &registers, |x, y| x | y),
+            Instruction::Xor(dst, a, b) => try_fold_bitwise(dst, a, b, &registers, |x, y| x ^ y),
+            Instruction::Sll(dst, a, b) => try_fold_bitwise(dst, a, b, &registers, |x, y| {
+                if y >= 64 { 0 } else { x << y as u32 }
+            }),
+            Instruction::Sra(dst, a, b) => try_fold_bitwise(dst, a, b, &registers, |x, y| {
+                if y >= 64 {
+                    if x < 0 { -1 } else { 0 }
+                } else {
+                    x >> y as u32
+                }
+            }),
+            Instruction::Srl(dst, a, b) => try_fold_bitwise(dst, a, b, &registers, |x, y| {
+                if y >= 64 {
+                    0
+                } else {
+                    (x as u64 >> y as u32) as i64
+                }
+            }),
+            Instruction::BranchEq(a, b, l) => {
+                try_resolve_branch(a, b, l, &registers, |x, y| x == y)
+            }
+            Instruction::BranchNe(a, b, l) => {
+                try_resolve_branch(a, b, l, &registers, |x, y| x != y)
+            }
+            Instruction::BranchGt(a, b, l) => try_resolve_branch(a, b, l, &registers, |x, y| x > y),
+            Instruction::BranchLt(a, b, l) => try_resolve_branch(a, b, l, &registers, |x, y| x < y),
+            Instruction::BranchGe(a, b, l) => {
+                try_resolve_branch(a, b, l, &registers, |x, y| x >= y)
+            }
+            Instruction::BranchLe(a, b, l) => {
+                try_resolve_branch(a, b, l, &registers, |x, y| x <= y)
+            }
+            Instruction::BranchEqZero(a, l) => {
+                try_resolve_branch(a, &Operand::Number(0.into()), l, &registers, |x, y| x == y)
+            }
+            Instruction::BranchNeZero(a, l) => {
+                try_resolve_branch(a, &Operand::Number(0.into()), l, &registers, |x, y| x != y)
+            }
+            _ => None,
+        };
+
+        if let Some(new) = simplified {
+            node.instruction = new;
+            changed = true;
+        }
+
+        // Update register tracking
+        match &node.instruction {
+            Instruction::Move(Operand::Register(r), src) => {
+                registers[*r as usize] = resolve_value(src, &registers)
+            }
+            _ => {
+                if let Some(r) = get_destination_reg(&node.instruction) {
+                    registers[r as usize] = None;
+                }
+            }
+        }
+
+        // Filter out NOPs (empty labels from branch resolution)
+        if let Instruction::LabelDef(l) = &node.instruction
+            && l.is_empty()
+        {
+            changed = true;
+            continue;
+        }
+
+        output.push(node);
+    }
+    (output, changed)
+}
+
+fn resolve_value(op: &Operand, regs: &[Option<Decimal>; 16]) -> Option<Decimal> {
+    match op {
+        Operand::Number(n) => Some(*n),
+        Operand::Register(r) => regs[*r as usize],
+        _ => None,
+    }
+}
+
+fn try_fold_math<'a, F>(
+    dst: &Operand<'a>,
+    a: &Operand<'a>,
+    b: &Operand<'a>,
+    regs: &[Option<Decimal>; 16],
+    op: F,
+) -> Option<Instruction<'a>>
+where
+    F: Fn(Decimal, Decimal) -> Decimal,
+{
+    let val_a = resolve_value(a, regs)?;
+    let val_b = resolve_value(b, regs)?;
+    Some(Instruction::Move(
+        dst.clone(),
+        Operand::Number(op(val_a, val_b)),
+    ))
+}
+
+fn decimal_to_i64(d: Decimal) -> i64 {
+    // Convert decimal to i64, truncating if needed
+    if let Ok(int_val) = d.try_into() {
+        int_val
+    } else {
+        // For very large or very small values, use a default
+        if d.is_sign_negative() {
+            i64::MIN
+        } else {
+            i64::MAX
+        }
+    }
+}
+
+fn i64_to_decimal(i: i64) -> Decimal {
+    Decimal::from(i)
+}
+
+fn try_fold_bitwise<'a, F>(
+    dst: &Operand<'a>,
+    a: &Operand<'a>,
+    b: &Operand<'a>,
+    regs: &[Option<Decimal>; 16],
+    op: F,
+) -> Option<Instruction<'a>>
+where
+    F: Fn(i64, i64) -> i64,
+{
+    let val_a = resolve_value(a, regs)?;
+    let val_b = resolve_value(b, regs)?;
+    let result = op(decimal_to_i64(val_a), decimal_to_i64(val_b));
+    Some(Instruction::Move(
+        dst.clone(),
+        Operand::Number(i64_to_decimal(result)),
+    ))
+}
+
+fn try_resolve_branch<'a, F>(
+    a: &Operand<'a>,
+    b: &Operand<'a>,
+    label: &Operand<'a>,
+    regs: &[Option<Decimal>; 16],
+    check: F,
+) -> Option<Instruction<'a>>
+where
+    F: Fn(Decimal, Decimal) -> bool,
+{
+    let val_a = resolve_value(a, regs)?;
+    let val_b = resolve_value(b, regs)?;
+    if check(val_a, val_b) {
+        Some(Instruction::Jump(label.clone()))
+    } else {
+        Some(Instruction::LabelDef("".into())) // NOP
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use il::InstructionNode;
+
+    #[test]
+    fn test_fold_add() {
+        let input = vec![InstructionNode::new(
+            Instruction::Add(
+                Operand::Register(1),
+                Operand::Number(5.into()),
+                Operand::Number(3.into()),
+            ),
+            None,
+        )];
+
+        let (output, changed) = constant_propagation(input);
+        assert!(changed);
+        assert_eq!(output.len(), 1);
+        assert!(matches!(
+            output[0].instruction,
+            Instruction::Move(Operand::Register(1), Operand::Number(_))
+        ));
+    }
+}

rust_compiler/libs/optimizer/src/dead_code.rs

@@ -0,0 +1,148 @@
+use il::{Instruction, InstructionNode, Operand};
+
+/// Pass: Redundant Move Elimination  
+/// Removes moves where source and destination are the same: `move rx rx`
+pub fn remove_redundant_moves<'a>(
+    input: Vec<InstructionNode<'a>>,
+) -> (Vec<InstructionNode<'a>>, bool) {
+    let mut output = Vec::with_capacity(input.len());
+    let mut changed = false;
+    for node in input {
+        if let Instruction::Move(dst, src) = &node.instruction
+            && dst == src
+        {
+            changed = true;
+            continue;
+        }
+        output.push(node);
+    }
+    (output, changed)
+}
+
+/// Pass: Dead Code Elimination
+/// Removes unreachable code after unconditional jumps.
+pub fn remove_unreachable_code<'a>(
+    input: Vec<InstructionNode<'a>>,
+) -> (Vec<InstructionNode<'a>>, bool) {
+    let mut output = Vec::with_capacity(input.len());
+    let mut changed = false;
+    let mut dead = false;
+    for node in input {
+        if let Instruction::LabelDef(_) = node.instruction {
+            dead = false;
+        }
+        if dead {
+            changed = true;
+            continue;
+        }
+        if let Instruction::Jump(_) = node.instruction {
+            dead = true
+        }
+        output.push(node);
+    }
+    (output, changed)
+}
+
+/// Pass: Remove Redundant Jumps
+/// Removes jumps to the next instruction (after label resolution).
+/// Must run AFTER label resolution since it needs line numbers.
+/// This pass also adjusts all jump targets to account for removed instructions.
+pub fn remove_redundant_jumps<'a>(
+    input: Vec<InstructionNode<'a>>,
+) -> (Vec<InstructionNode<'a>>, bool) {
+    let mut output = Vec::with_capacity(input.len());
+    let mut changed = false;
+    let mut removed_lines = Vec::new();
+
+    // First pass: identify redundant jumps
+    for (i, node) in input.iter().enumerate() {
+        // Check if this is a jump to the next line number
+        if let Instruction::Jump(Operand::Number(target)) = &node.instruction {
+            // Current line number is i, next line number is i+1
+            // If jump target equals the next line, it's redundant
+            if target.to_string().parse::<usize>().ok() == Some(i + 1) {
+                changed = true;
+                removed_lines.push(i);
+                continue; // Skip this redundant jump
+            }
+        }
+        output.push(node.clone());
+    }
+
+    // Second pass: adjust all jump/branch targets to account for removed lines
+    if changed {
+        for node in &mut output {
+            // Helper to adjust a target line number
+            let adjust_target = |target_line: usize| -> usize {
+                // Count how many removed lines are before the target
+                let offset = removed_lines
+                    .iter()
+                    .filter(|&&removed| removed < target_line)
+                    .count();
+                target_line.saturating_sub(offset)
+            };
+
+            match &mut node.instruction {
+                Instruction::Jump(Operand::Number(target))
+                | Instruction::JumpAndLink(Operand::Number(target)) => {
+                    if let Ok(target_line) = target.to_string().parse::<usize>() {
+                        *target = rust_decimal::Decimal::from(adjust_target(target_line));
+                    }
+                }
+                Instruction::BranchEq(_, _, Operand::Number(target))
+                | Instruction::BranchNe(_, _, Operand::Number(target))
+                | Instruction::BranchGt(_, _, Operand::Number(target))
+                | Instruction::BranchLt(_, _, Operand::Number(target))
+                | Instruction::BranchGe(_, _, Operand::Number(target))
+                | Instruction::BranchLe(_, _, Operand::Number(target))
+                | Instruction::BranchEqZero(_, Operand::Number(target))
+                | Instruction::BranchNeZero(_, Operand::Number(target)) => {
+                    if let Ok(target_line) = target.to_string().parse::<usize>() {
+                        *target = rust_decimal::Decimal::from(adjust_target(target_line));
+                    }
+                }
+                _ => {}
+            }
+        }
+    }
+
+    (output, changed)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use il::{Instruction, InstructionNode, Operand};
+
+    #[test]
+    fn test_remove_redundant_move() {
+        let input = vec![InstructionNode::new(
+            Instruction::Move(Operand::Register(1), Operand::Register(1)),
+            None,
+        )];
+
+        let (output, changed) = remove_redundant_moves(input);
+        assert!(changed);
+        assert_eq!(output.len(), 0);
+    }
+
+    #[test]
+    fn test_remove_unreachable() {
+        let input = vec![
+            InstructionNode::new(Instruction::Jump(Operand::Label("main".into())), None),
+            InstructionNode::new(
+                Instruction::Add(
+                    Operand::Register(1),
+                    Operand::Number(1.into()),
+                    Operand::Number(2.into()),
+                ),
+                None,
+            ),
+            InstructionNode::new(Instruction::LabelDef("main".into()), None),
+        ];
+
+        let (output, changed) = remove_unreachable_code(input);
+        assert!(changed);
+        assert_eq!(output.len(), 2);
+    }
+}

rust_compiler/libs/optimizer/src/dead_store_elimination.rs

@@ -0,0 +1,126 @@
+use crate::helpers::get_destination_reg;
+use il::{Instruction, InstructionNode};
+use std::collections::HashMap;
+
+/// Pass: Dead Store Elimination
+/// Removes writes to registers that are never read before being overwritten.
+pub fn dead_store_elimination<'a>(
+    input: Vec<InstructionNode<'a>>,
+) -> (Vec<InstructionNode<'a>>, bool) {
+    // Forward pass: Remove writes that are immediately overwritten
+    let (input, forward_changed) = eliminate_overwritten_stores(input);
+
+    // Note: Backward pass disabled for now - it needs more work to handle all cases correctly
+    // The forward pass is sufficient for most common patterns
+    // (e.g., move r6 r15 immediately followed by move r6 r15 again)
+
+    (input, forward_changed)
+}
+
+/// Forward pass: Remove stores that are overwritten before being read
+fn eliminate_overwritten_stores<'a>(
+    input: Vec<InstructionNode<'a>>,
+) -> (Vec<InstructionNode<'a>>, bool) {
+    let mut last_write: HashMap<u8, usize> = HashMap::new();
+    let mut to_remove = Vec::new();
+
+    // Scan for dead writes
+    for (i, node) in input.iter().enumerate() {
+        // Never remove Pop instructions - they have critical side effects on the stack pointer
+        if matches!(node.instruction, Instruction::Pop(_)) {
+            continue;
+        }
+
+        if let Some(dest_reg) = get_destination_reg(&node.instruction) {
+            // If this register was written before and hasn't been read, previous write is dead
+            if let Some(&prev_idx) = last_write.get(&dest_reg) {
+                // Check if the value was ever used between prev_idx and current
+                let was_used = input[prev_idx + 1..i]
+                    .iter()
+                    .any(|n| reg_is_read_or_affects_control(&n.instruction, dest_reg))
+                    // Also check if current instruction reads the register before overwriting it
+                    || reg_is_read_or_affects_control(&node.instruction, dest_reg);
+
+                if !was_used {
+                    // Previous write was dead
+                    to_remove.push(prev_idx);
+                }
+            }
+
+            // Update last write location
+            last_write.insert(dest_reg, i);
+        }
+
+        // Handle control flow instructions
+        match &node.instruction {
+            // JumpAndLink (function calls) only clobbers the return register (r15)
+            // We can continue tracking other registers across function calls
+            Instruction::JumpAndLink(_) => {
+                last_write.remove(&15);
+            }
+            // Other control flow instructions create complexity - clear all tracking
+            Instruction::Jump(_)
+            | Instruction::LabelDef(_)
+            | Instruction::BranchEq(_, _, _)
+            | Instruction::BranchNe(_, _, _)
+            | Instruction::BranchGt(_, _, _)
+            | Instruction::BranchLt(_, _, _)
+            | Instruction::BranchGe(_, _, _)
+            | Instruction::BranchLe(_, _, _)
+            | Instruction::BranchEqZero(_, _)
+            | Instruction::BranchNeZero(_, _) => {
+                last_write.clear();
+            }
+            _ => {}
+        }
+    }
+
+    if !to_remove.is_empty() {
+        let output = input
+            .into_iter()
+            .enumerate()
+            .filter_map(|(i, node)| {
+                if to_remove.contains(&i) {
+                    None
+                } else {
+                    Some(node)
+                }
+            })
+            .collect();
+        (output, true)
+    } else {
+        (input, false)
+    }
+}
+
+/// Simplified check: Does this instruction read the register?
+fn reg_is_read_or_affects_control(instr: &Instruction, reg: u8) -> bool {
+    use crate::helpers::reg_is_read;
+
+    // If it reads the register, it's used
+    reg_is_read(instr, reg)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use il::Operand;
+
+    #[test]
+    fn test_dead_store() {
+        let input = vec![
+            InstructionNode::new(
+                Instruction::Move(Operand::Register(1), Operand::Number(5.into())),
+                None,
+            ),
+            InstructionNode::new(
+                Instruction::Move(Operand::Register(1), Operand::Number(10.into())),
+                None,
+            ),
+        ];
+
+        let (output, changed) = dead_store_elimination(input);
+        assert!(changed);
+        assert_eq!(output.len(), 1);
+    }
+}

rust_compiler/libs/optimizer/src/function_call_optimization.rs

@@ -0,0 +1,160 @@
+use crate::helpers::get_destination_reg;
+use il::{Instruction, InstructionNode, Operand};
+use rust_decimal::Decimal;
+use std::collections::{HashMap, HashSet};
+
+/// Analyzes which registers are written to by each function label.
+fn analyze_clobbers(instructions: &[InstructionNode]) -> HashMap<String, HashSet<u8>> {
+    let mut clobbers = HashMap::new();
+    let mut current_label = None;
+
+    for node in instructions {
+        if let Instruction::LabelDef(label) = &node.instruction {
+            current_label = Some(label.to_string());
+            clobbers.insert(label.to_string(), HashSet::new());
+        }
+
+        if let Some(label) = &current_label
+            && let Some(reg) = get_destination_reg(&node.instruction)
+            && let Some(set) = clobbers.get_mut(label)
+        {
+            set.insert(reg);
+        }
+    }
+    clobbers
+}
+
+/// Pass: Function Call Optimization
+/// Removes Push/Restore pairs surrounding a JAL if the target function does not clobber that register.
+pub fn optimize_function_calls<'a>(
+    input: Vec<InstructionNode<'a>>,
+) -> (Vec<InstructionNode<'a>>, bool) {
+    let clobbers = analyze_clobbers(&input);
+    let mut changed = false;
+    let mut to_remove = HashSet::new();
+    let mut stack_adjustments = HashMap::new();
+
+    let mut i = 0;
+    while i < input.len() {
+        if let Instruction::JumpAndLink(Operand::Label(target)) = &input[i].instruction {
+            let target_key = target.to_string();
+
+            if let Some(func_clobbers) = clobbers.get(&target_key) {
+                // 1. Identify Pushes immediately preceding the JAL
+                let mut pushes = Vec::new(); // (index, register)
+                let mut scan_back = i.saturating_sub(1);
+                while scan_back > 0 {
+                    if to_remove.contains(&scan_back) {
+                        scan_back -= 1;
+                        continue;
+                    }
+                    if let Instruction::Push(Operand::Register(r)) = &input[scan_back].instruction {
+                        pushes.push((scan_back, *r));
+                        scan_back -= 1;
+                    } else {
+                        break;
+                    }
+                }
+
+                // 2. Identify Restores immediately following the JAL
+                let mut restores = Vec::new(); // (index_of_get, register, index_of_sub)
+                let mut scan_fwd = i + 1;
+                while scan_fwd < input.len() {
+                    // Skip 'sub r0 sp X'
+                    if let Instruction::Sub(Operand::Register(0), Operand::StackPointer, _) =
+                        &input[scan_fwd].instruction
+                    {
+                        // Check next instruction for the Get
+                        if scan_fwd + 1 < input.len()
+                            && let Instruction::Get(Operand::Register(r), _, Operand::Register(0)) =
+                                &input[scan_fwd + 1].instruction
+                        {
+                            restores.push((scan_fwd + 1, *r, scan_fwd));
+                            scan_fwd += 2;
+                            continue;
+                        }
+                    }
+                    break;
+                }
+
+                // 3. Stack Cleanup
+                let cleanup_idx = scan_fwd;
+                let has_cleanup = if cleanup_idx < input.len() {
+                    matches!(
+                        input[cleanup_idx].instruction,
+                        Instruction::Sub(
+                            Operand::StackPointer,
+                            Operand::StackPointer,
+                            Operand::Number(_)
+                        )
+                    )
+                } else {
+                    false
+                };
+
+                // SAFEGUARD: Check Counts!
+                let mut push_counts = HashMap::new();
+                for (_, r) in &pushes {
+                    *push_counts.entry(*r).or_insert(0) += 1;
+                }
+
+                let mut restore_counts = HashMap::new();
+                for (_, r, _) in &restores {
+                    *restore_counts.entry(*r).or_insert(0) += 1;
+                }
+
+                let counts_match = push_counts
+                    .iter()
+                    .all(|(reg, count)| restore_counts.get(reg).unwrap_or(&0) == count);
+                let counts_match_reverse = restore_counts
+                    .iter()
+                    .all(|(reg, count)| push_counts.get(reg).unwrap_or(&0) == count);
+
+                // Clobber Check
+                let all_pushes_safe = pushes.iter().all(|(_, r)| !func_clobbers.contains(r));
+
+                if all_pushes_safe && has_cleanup && counts_match && counts_match_reverse {
+                    // Remove all pushes/restores
+                    for (p_idx, _) in pushes {
+                        to_remove.insert(p_idx);
+                    }
+                    for (g_idx, _, s_idx) in restores {
+                        to_remove.insert(g_idx);
+                        to_remove.insert(s_idx);
+                    }
+
+                    // Reduce stack cleanup amount
+                    let num_removed = push_counts.values().sum::<i32>() as i64;
+                    stack_adjustments.insert(cleanup_idx, num_removed);
+                    changed = true;
+                }
+            }
+        }
+        i += 1;
+    }
+
+    if changed {
+        let mut clean = Vec::with_capacity(input.len());
+        for (idx, mut node) in input.into_iter().enumerate() {
+            if to_remove.contains(&idx) {
+                continue;
+            }
+
+            // Apply stack adjustment
+            if let Some(reduction) = stack_adjustments.get(&idx)
+                && let Instruction::Sub(dst, a, Operand::Number(n)) = &node.instruction
+            {
+                let new_n = n - Decimal::from(*reduction);
+                if new_n.is_zero() {
+                    continue;
+                }
+                node.instruction = Instruction::Sub(dst.clone(), a.clone(), Operand::Number(new_n));
+            }
+
+            clean.push(node);
+        }
+        return (clean, changed);
+    }
+
+    (input, false)
+}

rust_compiler/libs/optimizer/src/helpers.rs

@@ -0,0 +1,180 @@
+use il::{Instruction, Operand};
+
+/// Returns the register number written to by an instruction, if any.
+pub fn get_destination_reg(instr: &Instruction) -> Option<u8> {
+    match instr {
+        Instruction::Move(Operand::Register(r), _)
+        | Instruction::Add(Operand::Register(r), _, _)
+        | Instruction::Sub(Operand::Register(r), _, _)
+        | Instruction::Mul(Operand::Register(r), _, _)
+        | Instruction::Div(Operand::Register(r), _, _)
+        | Instruction::Mod(Operand::Register(r), _, _)
+        | Instruction::Pow(Operand::Register(r), _, _)
+        | Instruction::Load(Operand::Register(r), _, _)
+        | Instruction::LoadSlot(Operand::Register(r), _, _, _)
+        | Instruction::LoadBatch(Operand::Register(r), _, _, _)
+        | Instruction::LoadBatchNamed(Operand::Register(r), _, _, _, _)
+        | Instruction::SetEq(Operand::Register(r), _, _)
+        | Instruction::SetNe(Operand::Register(r), _, _)
+        | Instruction::SetGt(Operand::Register(r), _, _)
+        | Instruction::SetLt(Operand::Register(r), _, _)
+        | Instruction::SetGe(Operand::Register(r), _, _)
+        | Instruction::SetLe(Operand::Register(r), _, _)
+        | Instruction::And(Operand::Register(r), _, _)
+        | Instruction::Or(Operand::Register(r), _, _)
+        | Instruction::Xor(Operand::Register(r), _, _)
+        | Instruction::Peek(Operand::Register(r))
+        | Instruction::Get(Operand::Register(r), _, _)
+        | Instruction::Select(Operand::Register(r), _, _, _)
+        | Instruction::Rand(Operand::Register(r))
+        | Instruction::Acos(Operand::Register(r), _)
+        | Instruction::Asin(Operand::Register(r), _)
+        | Instruction::Atan(Operand::Register(r), _)
+        | Instruction::Atan2(Operand::Register(r), _, _)
+        | Instruction::Abs(Operand::Register(r), _)
+        | Instruction::Ceil(Operand::Register(r), _)
+        | Instruction::Cos(Operand::Register(r), _)
+        | Instruction::Floor(Operand::Register(r), _)
+        | Instruction::Log(Operand::Register(r), _)
+        | Instruction::Max(Operand::Register(r), _, _)
+        | Instruction::Min(Operand::Register(r), _, _)
+        | Instruction::Sin(Operand::Register(r), _)
+        | Instruction::Sqrt(Operand::Register(r), _)
+        | Instruction::Tan(Operand::Register(r), _)
+        | Instruction::Trunc(Operand::Register(r), _)
+        | Instruction::LoadReagent(Operand::Register(r), _, _, _)
+        | Instruction::Rmap(Operand::Register(r), _, _)
+        | Instruction::Pop(Operand::Register(r)) => Some(*r),
+        _ => None,
+    }
+}
+
+/// Creates a new instruction with the destination register changed.
+pub fn set_destination_reg<'a>(instr: &Instruction<'a>, new_reg: u8) -> Option<Instruction<'a>> {
+    let r = Operand::Register(new_reg);
+    match instr {
+        Instruction::Move(_, b) => Some(Instruction::Move(r, b.clone())),
+        Instruction::Add(_, a, b) => Some(Instruction::Add(r, a.clone(), b.clone())),
+        Instruction::Sub(_, a, b) => Some(Instruction::Sub(r, a.clone(), b.clone())),
+        Instruction::Mul(_, a, b) => Some(Instruction::Mul(r, a.clone(), b.clone())),
+        Instruction::Div(_, a, b) => Some(Instruction::Div(r, a.clone(), b.clone())),
+        Instruction::Mod(_, a, b) => Some(Instruction::Mod(r, a.clone(), b.clone())),
+        Instruction::Pow(_, a, b) => Some(Instruction::Pow(r, a.clone(), b.clone())),
+        Instruction::Load(_, a, b) => Some(Instruction::Load(r, a.clone(), b.clone())),
+        Instruction::LoadSlot(_, a, b, c) => {
+            Some(Instruction::LoadSlot(r, a.clone(), b.clone(), c.clone()))
+        }
+        Instruction::LoadBatch(_, a, b, c) => {
+            Some(Instruction::LoadBatch(r, a.clone(), b.clone(), c.clone()))
+        }
+        Instruction::LoadBatchNamed(_, a, b, c, d) => Some(Instruction::LoadBatchNamed(
+            r,
+            a.clone(),
+            b.clone(),
+            c.clone(),
+            d.clone(),
+        )),
+        Instruction::LoadReagent(_, b, c, d) => {
+            Some(Instruction::LoadReagent(r, b.clone(), c.clone(), d.clone()))
+        }
+        Instruction::SetEq(_, a, b) => Some(Instruction::SetEq(r, a.clone(), b.clone())),
+        Instruction::SetNe(_, a, b) => Some(Instruction::SetNe(r, a.clone(), b.clone())),
+        Instruction::SetGt(_, a, b) => Some(Instruction::SetGt(r, a.clone(), b.clone())),
+        Instruction::SetLt(_, a, b) => Some(Instruction::SetLt(r, a.clone(), b.clone())),
+        Instruction::SetGe(_, a, b) => Some(Instruction::SetGe(r, a.clone(), b.clone())),
+        Instruction::SetLe(_, a, b) => Some(Instruction::SetLe(r, a.clone(), b.clone())),
+        Instruction::And(_, a, b) => Some(Instruction::And(r, a.clone(), b.clone())),
+        Instruction::Or(_, a, b) => Some(Instruction::Or(r, a.clone(), b.clone())),
+        Instruction::Xor(_, a, b) => Some(Instruction::Xor(r, a.clone(), b.clone())),
+        Instruction::Peek(_) => Some(Instruction::Peek(r)),
+        Instruction::Get(_, a, b) => Some(Instruction::Get(r, a.clone(), b.clone())),
+        Instruction::Select(_, a, b, c) => {
+            Some(Instruction::Select(r, a.clone(), b.clone(), c.clone()))
+        }
+        Instruction::Rand(_) => Some(Instruction::Rand(r)),
+        Instruction::Pop(_) => Some(Instruction::Pop(r)),
+        Instruction::Acos(_, a) => Some(Instruction::Acos(r, a.clone())),
+        Instruction::Asin(_, a) => Some(Instruction::Asin(r, a.clone())),
+        Instruction::Atan(_, a) => Some(Instruction::Atan(r, a.clone())),
+        Instruction::Atan2(_, a, b) => Some(Instruction::Atan2(r, a.clone(), b.clone())),
+        Instruction::Abs(_, a) => Some(Instruction::Abs(r, a.clone())),
+        Instruction::Ceil(_, a) => Some(Instruction::Ceil(r, a.clone())),
+        Instruction::Cos(_, a) => Some(Instruction::Cos(r, a.clone())),
+        Instruction::Floor(_, a) => Some(Instruction::Floor(r, a.clone())),
+        Instruction::Log(_, a) => Some(Instruction::Log(r, a.clone())),
+        Instruction::Max(_, a, b) => Some(Instruction::Max(r, a.clone(), b.clone())),
+        Instruction::Min(_, a, b) => Some(Instruction::Min(r, a.clone(), b.clone())),
+        Instruction::Sin(_, a) => Some(Instruction::Sin(r, a.clone())),
+        Instruction::Sqrt(_, a) => Some(Instruction::Sqrt(r, a.clone())),
+        Instruction::Tan(_, a) => Some(Instruction::Tan(r, a.clone())),
+        Instruction::Trunc(_, a) => Some(Instruction::Trunc(r, a.clone())),
+        Instruction::Rmap(_, a, b) => Some(Instruction::Rmap(r, a.clone(), b.clone())),
+        _ => None,
+    }
+}
+
+/// Checks if a register is read by an instruction.
+pub fn reg_is_read(instr: &Instruction, reg: u8) -> bool {
+    let check = |op: &Operand| matches!(op, Operand::Register(r) if *r == reg);
+
+    match instr {
+        Instruction::Move(_, a) => check(a),
+        Instruction::Add(_, a, b)
+        | Instruction::Sub(_, a, b)
+        | Instruction::Mul(_, a, b)
+        | Instruction::Div(_, a, b)
+        | Instruction::Mod(_, a, b)
+        | Instruction::Pow(_, a, b) => check(a) || check(b),
+        Instruction::Load(_, a, _) => check(a),
+        Instruction::Store(a, _, b) => check(a) || check(b),
+        Instruction::StoreBatch(a, _, b) => check(a) || check(b),
+        Instruction::StoreBatchNamed(a, b, _, c) => check(a) || check(b) || check(c),
+        Instruction::StoreSlot(a, b, _, c) => check(a) || check(b) || check(c),
+        Instruction::BranchEq(a, b, _)
+        | Instruction::BranchNe(a, b, _)
+        | Instruction::BranchGt(a, b, _)
+        | Instruction::BranchLt(a, b, _)
+        | Instruction::BranchGe(a, b, _)
+        | Instruction::BranchLe(a, b, _) => check(a) || check(b),
+        Instruction::BranchEqZero(a, _) | Instruction::BranchNeZero(a, _) => check(a),
+        Instruction::LoadReagent(_, device, _, item_hash) => check(device) || check(item_hash),
+        Instruction::Rmap(_, device, reagent_hash) => check(device) || check(reagent_hash),
+        Instruction::LoadSlot(_, dev, slot, _) => check(dev) || check(slot),
+        Instruction::LoadBatch(_, dev, _, mode) => check(dev) || check(mode),
+        Instruction::LoadBatchNamed(_, d_hash, n_hash, _, mode) => {
+            check(d_hash) || check(n_hash) || check(mode)
+        }
+        Instruction::SetEq(_, a, b)
+        | Instruction::SetNe(_, a, b)
+        | Instruction::SetGt(_, a, b)
+        | Instruction::SetLt(_, a, b)
+        | Instruction::SetGe(_, a, b)
+        | Instruction::SetLe(_, a, b)
+        | Instruction::And(_, a, b)
+        | Instruction::Or(_, a, b)
+        | Instruction::Xor(_, a, b) => check(a) || check(b),
+        Instruction::Push(a) => check(a),
+        Instruction::Get(_, a, b) => check(a) || check(b),
+        Instruction::Put(a, b, c) => check(a) || check(b) || check(c),
+        Instruction::Select(_, a, b, c) => check(a) || check(b) || check(c),
+        Instruction::Sleep(a) => check(a),
+        Instruction::Acos(_, a)
+        | Instruction::Asin(_, a)
+        | Instruction::Atan(_, a)
+        | Instruction::Abs(_, a)
+        | Instruction::Ceil(_, a)
+        | Instruction::Cos(_, a)
+        | Instruction::Floor(_, a)
+        | Instruction::Log(_, a)
+        | Instruction::Sin(_, a)
+        | Instruction::Sqrt(_, a)
+        | Instruction::Tan(_, a)
+        | Instruction::Trunc(_, a) => check(a),
+        Instruction::Atan2(_, a, b) | Instruction::Max(_, a, b) | Instruction::Min(_, a, b) => {
+            check(a) || check(b)
+        }
+        Instruction::JumpRelative(a) => check(a),
+        Instruction::Alias(_, a) => check(a),
+        _ => false,
+    }
+}

rust_compiler/libs/optimizer/src/label_resolution.rs

@@ -0,0 +1,70 @@
+use il::{Instruction, InstructionNode, Operand};
+use rust_decimal::Decimal;
+use std::collections::HashMap;
+
+/// Pass: Resolve Labels
+/// Converts all Jump/Branch labels to absolute line numbers and removes LabelDefs.
+pub fn resolve_labels<'a>(input: Vec<InstructionNode<'a>>) -> Vec<InstructionNode<'a>> {
+    let mut label_map: HashMap<String, usize> = HashMap::new();
+    let mut line_number = 0;
+
+    // Build Label Map (filtering out LabelDefs from the count)
+    for node in &input {
+        if let Instruction::LabelDef(name) = &node.instruction {
+            label_map.insert(name.to_string(), line_number);
+        } else {
+            line_number += 1;
+        }
+    }
+
+    let mut output = Vec::with_capacity(input.len());
+
+    // Rewrite Jumps and Filter Labels
+    for mut node in input {
+        // Helper to get line number as Decimal operand
+        let get_line = |lbl: &Operand| -> Option<Operand<'a>> {
+            if let Operand::Label(name) = lbl {
+                label_map
+                    .get(name.as_ref())
+                    .map(|&l| Operand::Number(Decimal::from(l)))
+            } else {
+                None
+            }
+        };
+
+        match &mut node.instruction {
+            Instruction::LabelDef(_) => continue, // Strip labels
+
+            // Jumps
+            Instruction::Jump(op) => {
+                if let Some(num) = get_line(op) {
+                    *op = num;
+                }
+            }
+            Instruction::JumpAndLink(op) => {
+                if let Some(num) = get_line(op) {
+                    *op = num;
+                }
+            }
+            Instruction::BranchEq(_, _, op)
+            | Instruction::BranchNe(_, _, op)
+            | Instruction::BranchGt(_, _, op)
+            | Instruction::BranchLt(_, _, op)
+            | Instruction::BranchGe(_, _, op)
+            | Instruction::BranchLe(_, _, op) => {
+                if let Some(num) = get_line(op) {
+                    *op = num;
+                }
+            }
+            Instruction::BranchEqZero(_, op) | Instruction::BranchNeZero(_, op) => {
+                if let Some(num) = get_line(op) {
+                    *op = num;
+                }
+            }
+            _ => {}
+        }
+        output.push(node);
+    }
+
+    output
+}

rust_compiler/libs/optimizer/src/leaf_function_optimization.rs

@@ -0,0 +1,41 @@
+use crate::leaf_function::find_leaf_functions;
+use il::InstructionNode;
+
+/// Pass: Leaf Function Optimization
+/// If a function makes no calls (is a leaf), it doesn't need to save/restore `ra`.
+///
+/// NOTE: This optimization is DISABLED due to correctness issues.
+/// The optimization was designed for a specific calling convention (GET/PUT for RA)
+/// but the compiler generates POP ra for return address restoration. Without proper
+/// tracking of both conventions and validation of balanced push/pop pairs, this
+/// optimization corrupts the stack frame by:
+///
+/// 1. Removing `push ra` but not `pop ra`, leaving unbalanced push/pop pairs
+/// 2. Not accounting for parameter pops that occur before `push sp`
+/// 3. Assuming all RA restoration uses GET instruction, but code uses POP
+///
+/// Example of broken optimization:
+/// ```
+/// Unoptimized:          Optimized (BROKEN):
+/// compare:              pop r8
+/// pop r8                pop r9
+/// pop r9                ble r9 r8 5
+/// push sp               move r10 1
+/// push ra               j ra
+/// sgt r1 r9 r8          ^ Missing stack frame!
+/// ...
+/// pop ra
+/// pop sp
+/// j ra
+/// ```
+///
+/// Future work: Fix by handling both POP and GET calling conventions, validating
+/// balanced push/pop pairs, and accounting for parameter pops.
+pub fn optimize_leaf_functions<'a>(
+    input: Vec<InstructionNode<'a>>,
+) -> (Vec<InstructionNode<'a>>, bool) {
+    // Optimization disabled - returns input unchanged
+    #[allow(unused)]
+    let _leaves = find_leaf_functions(&input);
+    (input, false)
+}

rust_compiler/libs/optimizer/src/lib.rs

@@ -1,9 +1,30 @@
-use il::{Instruction, InstructionNode, Instructions, Operand};
-use rust_decimal::Decimal;
-use std::collections::{HashMap, HashSet};
+use il::Instructions;
 
+// Optimization pass modules
+mod helpers;
 mod leaf_function;
-use leaf_function::find_leaf_functions;
+
+mod algebraic_simplification;
+mod constant_propagation;
+mod dead_code;
+mod dead_store_elimination;
+mod function_call_optimization;
+mod label_resolution;
+mod leaf_function_optimization;
+mod peephole_optimization;
+mod register_forwarding;
+mod strength_reduction;
+
+use algebraic_simplification::algebraic_simplification;
+use constant_propagation::constant_propagation;
+use dead_code::{remove_redundant_jumps, remove_redundant_moves, remove_unreachable_code};
+use dead_store_elimination::dead_store_elimination;
+use function_call_optimization::optimize_function_calls;
+use label_resolution::resolve_labels;
+use leaf_function_optimization::optimize_leaf_functions;
+use peephole_optimization::peephole_optimization;
+use register_forwarding::register_forwarding;
+use strength_reduction::strength_reduction;
 
 /// Entry point for the optimizer.
 pub fn optimize<'a>(instructions: Instructions<'a>) -> Instructions<'a> {
@@ -38,845 +59,42 @@ pub fn optimize<'a>(instructions: Instructions<'a>) -> Instructions<'a> {
         instructions = new_inst;
         changed |= c4;
 
-        // Pass 5: Redundant Move Elimination
-        let (new_inst, c5) = remove_redundant_moves(instructions);
+        // Pass 5: Algebraic Simplification (Identity operations)
+        let (new_inst, c5) = algebraic_simplification(instructions);
         instructions = new_inst;
         changed |= c5;
 
-        // Pass 6: Dead Code Elimination
-        let (new_inst, c6) = remove_unreachable_code(instructions);
+        // Pass 6: Strength Reduction (Replace expensive ops with cheaper ones)
+        let (new_inst, c6) = strength_reduction(instructions);
         instructions = new_inst;
         changed |= c6;
+
+        // Pass 7: Peephole Optimizations (Common patterns)
+        let (new_inst, c7) = peephole_optimization(instructions);
+        instructions = new_inst;
+        changed |= c7;
+
+        // Pass 8: Dead Store Elimination
+        let (new_inst, c8) = dead_store_elimination(instructions);
+        instructions = new_inst;
+        changed |= c8;
+
+        // Pass 9: Redundant Move Elimination
+        let (new_inst, c9) = remove_redundant_moves(instructions);
+        instructions = new_inst;
+        changed |= c9;
+
+        // Pass 10: Dead Code Elimination
+        let (new_inst, c10) = remove_unreachable_code(instructions);
+        instructions = new_inst;
+        changed |= c10;
     }
 
     // Final Pass: Resolve Labels to Line Numbers
-    Instructions::new(resolve_labels(instructions))
-}
-
-/// Helper: Check if a function body contains unsafe stack manipulation.
-/// Returns true if the function modifies SP in a way that makes static RA offset analysis unsafe.
-fn function_has_complex_stack_ops(
-    instructions: &[InstructionNode],
-    start_idx: usize,
-    end_idx: usize,
-) -> bool {
-    for instruction in instructions.iter().take(end_idx).skip(start_idx) {
-        match instruction.instruction {
-            Instruction::Push(_) | Instruction::Pop(_) => return true,
-            // Check for explicit SP modification
-            Instruction::Add(Operand::StackPointer, _, _)
-            | Instruction::Sub(Operand::StackPointer, _, _)
-            | Instruction::Mul(Operand::StackPointer, _, _)
-            | Instruction::Div(Operand::StackPointer, _, _)
-            | Instruction::Move(Operand::StackPointer, _) => return true,
-            _ => {}
-        }
-    }
-    false
-}
-
-/// Pass: Leaf Function Optimization
-/// If a function makes no calls (is a leaf), it doesn't need to save/restore `ra`.
-fn optimize_leaf_functions<'a>(
-    input: Vec<InstructionNode<'a>>,
-) -> (Vec<InstructionNode<'a>>, bool) {
-    let leaves = find_leaf_functions(&input);
-    if leaves.is_empty() {
-        return (input, false);
-    }
-
-    let mut changed = false;
-    let mut to_remove = HashSet::new();
-
-    // We map function names to the INDEX of the instruction that restores RA.
-    // We use this to validate the function body later.
-    let mut func_restore_indices = HashMap::new();
-    let mut func_ra_offsets = HashMap::new();
-
-    let mut current_function: Option<String> = None;
-    let mut function_start_indices = HashMap::new();
-
-    // First scan: Identify instructions to remove and capture RA offsets
-    for (i, node) in input.iter().enumerate() {
-        match &node.instruction {
-            Instruction::LabelDef(label) if !label.starts_with("__internal_L") => {
-                current_function = Some(label.to_string());
-                function_start_indices.insert(label.to_string(), i);
-            }
-            Instruction::Push(Operand::ReturnAddress) => {
-                if let Some(func) = &current_function
-                    && leaves.contains(func)
-                {
-                    to_remove.insert(i);
-                }
-            }
-            Instruction::Get(Operand::ReturnAddress, _, Operand::Register(_)) => {
-                // This is the restore instruction: `get ra db r0`
-                if let Some(func) = &current_function
-                    && leaves.contains(func)
-                {
-                    to_remove.insert(i);
-                    func_restore_indices.insert(func.clone(), i);
-
-                    // Look back for the address calc: `sub r0 sp OFFSET`
-                    if i > 0
-                        && let Instruction::Sub(_, Operand::StackPointer, Operand::Number(n)) =
-                            &input[i - 1].instruction
-                    {
-                        func_ra_offsets.insert(func.clone(), *n);
-                        to_remove.insert(i - 1);
-                    }
-                }
-            }
-            _ => {}
-        }
-    }
-
-    // Safety Check: Verify that functions marked for optimization don't have complex stack ops.
-    // If they do, unmark them.
-    let mut safe_functions = HashSet::new();
-
-    for (func, start_idx) in &function_start_indices {
-        if let Some(restore_idx) = func_restore_indices.get(func) {
-            // Check instructions between start and restore using the helper function.
-            // We need to skip the `push ra` we just marked for removal, otherwise the helper
-            // will flag it as a complex op (Push).
-            // `start_idx` is the LabelDef. `start_idx + 1` is typically `push ra`.
-
-            let check_start = if to_remove.contains(&(start_idx + 1)) {
-                start_idx + 2
-            } else {
-                start_idx + 1
-            };
-
-            // `restore_idx` points to the `get ra` instruction. The helper scans up to `end_idx` exclusive,
-            // so we don't need to worry about the restore instruction itself.
-            if !function_has_complex_stack_ops(&input, check_start, *restore_idx) {
-                safe_functions.insert(func.clone());
-                changed = true;
-            }
-        }
-    }
-
-    if !changed {
-        return (input, false);
-    }
-
-    // Second scan: Rebuild with adjustments, but only for SAFE functions
-    let mut output = Vec::with_capacity(input.len());
-    let mut processing_function: Option<String> = None;
-
-    for (i, mut node) in input.into_iter().enumerate() {
-        if to_remove.contains(&i)
-            && let Some(func) = &processing_function
-            && safe_functions.contains(func)
-        {
-            continue; // SKIP (Remove)
-        }
-
-        if let Instruction::LabelDef(l) = &node.instruction
-            && !l.starts_with("__internal_L")
-        {
-            processing_function = Some(l.to_string());
-        }
-
-        // Apply Stack Adjustments
-        if let Some(func) = &processing_function
-            && safe_functions.contains(func)
-            && let Some(ra_offset) = func_ra_offsets.get(func)
-        {
-            // 1. Stack Cleanup Adjustment
-            if let Instruction::Sub(
-                Operand::StackPointer,
-                Operand::StackPointer,
-                Operand::Number(n),
-            ) = &mut node.instruction
-            {
-                // Decrease cleanup amount by 1 (for the removed RA)
-                let new_n = *n - Decimal::from(1);
-                if new_n.is_zero() {
-                    continue;
-                }
-                *n = new_n;
-            }
-
-            // 2. Stack Variable Offset Adjustment
-            // Since we verified the function is "Simple" (no nested stack mods),
-            // we can safely assume offsets > ra_offset need shifting.
-            if let Instruction::Sub(_, Operand::StackPointer, Operand::Number(n)) =
-                &mut node.instruction
-                && *n > *ra_offset
-            {
-                *n -= Decimal::from(1);
-            }
-        }
-
-        output.push(node);
-    }
-
-    (output, true)
-}
-
-/// Analyzes which registers are written to by each function label.
-fn analyze_clobbers(instructions: &[InstructionNode]) -> HashMap<String, HashSet<u8>> {
-    let mut clobbers = HashMap::new();
-    let mut current_label = None;
-
-    for node in instructions {
-        if let Instruction::LabelDef(label) = &node.instruction {
-            current_label = Some(label.to_string());
-            clobbers.insert(label.to_string(), HashSet::new());
-        }
-
-        if let Some(label) = &current_label
-            && let Some(reg) = get_destination_reg(&node.instruction)
-            && let Some(set) = clobbers.get_mut(label)
-        {
-            set.insert(reg);
-        }
-    }
-    clobbers
-}
-
-/// Pass: Function Call Optimization
-/// Removes Push/Restore pairs surrounding a JAL if the target function does not clobber that register.
-fn optimize_function_calls<'a>(
-    input: Vec<InstructionNode<'a>>,
-) -> (Vec<InstructionNode<'a>>, bool) {
-    let clobbers = analyze_clobbers(&input);
-    let mut changed = false;
-    let mut to_remove = HashSet::new();
-    let mut stack_adjustments = HashMap::new();
-
-    let mut i = 0;
-    while i < input.len() {
-        if let Instruction::JumpAndLink(Operand::Label(target)) = &input[i].instruction {
-            let target_key = target.to_string();
-
-            if let Some(func_clobbers) = clobbers.get(&target_key) {
-                // 1. Identify Pushes immediately preceding the JAL
-                let mut pushes = Vec::new(); // (index, register)
-                let mut scan_back = i.saturating_sub(1);
-                while scan_back > 0 {
-                    if to_remove.contains(&scan_back) {
-                        scan_back -= 1;
-                        continue;
-                    }
-                    if let Instruction::Push(Operand::Register(r)) = &input[scan_back].instruction {
-                        pushes.push((scan_back, *r));
-                        scan_back -= 1;
-                    } else {
-                        break;
-                    }
-                }
-
-                // 2. Identify Restores immediately following the JAL
-                let mut restores = Vec::new(); // (index_of_get, register, index_of_sub)
-                let mut scan_fwd = i + 1;
-                while scan_fwd < input.len() {
-                    // Skip 'sub r0 sp X'
-                    if let Instruction::Sub(Operand::Register(0), Operand::StackPointer, _) =
-                        &input[scan_fwd].instruction
-                    {
-                        // Check next instruction for the Get
-                        if scan_fwd + 1 < input.len()
-                            && let Instruction::Get(Operand::Register(r), _, Operand::Register(0)) =
-                                &input[scan_fwd + 1].instruction
-                        {
-                            restores.push((scan_fwd + 1, *r, scan_fwd));
-                            scan_fwd += 2;
-                            continue;
-                        }
-                    }
-                    break;
-                }
-
-                // 3. Stack Cleanup
-                let cleanup_idx = scan_fwd;
-                let has_cleanup = if cleanup_idx < input.len() {
-                    matches!(
-                        input[cleanup_idx].instruction,
-                        Instruction::Sub(
-                            Operand::StackPointer,
-                            Operand::StackPointer,
-                            Operand::Number(_)
-                        )
-                    )
-                } else {
-                    false
-                };
-
-                // SAFEGUARD: Check Counts!
-                // If we pushed r8 twice but only restored it once, we have an argument.
-                // We must ensure the number of pushes for each register MATCHES the number of restores.
-                let mut push_counts = HashMap::new();
-                for (_, r) in &pushes {
-                    *push_counts.entry(*r).or_insert(0) += 1;
-                }
-
-                let mut restore_counts = HashMap::new();
-                for (_, r, _) in &restores {
-                    *restore_counts.entry(*r).or_insert(0) += 1;
-                }
-
-                let counts_match = push_counts
-                    .iter()
-                    .all(|(reg, count)| restore_counts.get(reg).unwrap_or(&0) == count);
-                // Also check reverse to ensure we didn't restore something we didn't push (unlikely but possible)
-                let counts_match_reverse = restore_counts
-                    .iter()
-                    .all(|(reg, count)| push_counts.get(reg).unwrap_or(&0) == count);
-
-                // Clobber Check
-                let all_pushes_safe = pushes.iter().all(|(_, r)| !func_clobbers.contains(r));
-
-                if all_pushes_safe && has_cleanup && counts_match && counts_match_reverse {
-                    // We can remove ALL found pushes/restores safely
-                    for (p_idx, _) in pushes {
-                        to_remove.insert(p_idx);
-                    }
-                    for (g_idx, _, s_idx) in restores {
-                        to_remove.insert(g_idx);
-                        to_remove.insert(s_idx);
-                    }
-
-                    // Reduce stack cleanup amount
-                    let num_removed = push_counts.values().sum::<i32>() as i64;
-                    stack_adjustments.insert(cleanup_idx, num_removed);
-                    changed = true;
-                }
-            }
-        }
-        i += 1;
-    }
-
-    if changed {
-        let mut clean = Vec::with_capacity(input.len());
-        for (idx, mut node) in input.into_iter().enumerate() {
-            if to_remove.contains(&idx) {
-                continue;
-            }
-
-            // Apply stack adjustment
-            if let Some(reduction) = stack_adjustments.get(&idx)
-                && let Instruction::Sub(dst, a, Operand::Number(n)) = &node.instruction
-            {
-                let new_n = n - Decimal::from(*reduction);
-                if new_n.is_zero() {
-                    continue; // Remove the sub entirely if 0
-                }
-                node.instruction = Instruction::Sub(dst.clone(), a.clone(), Operand::Number(new_n));
-            }
-
-            clean.push(node);
-        }
-        return (clean, changed);
-    }
-
-    (input, false)
-}
-
-/// Pass: Register Forwarding
-/// Eliminates intermediate moves by writing directly to the final destination.
-/// Example: `l r1 d0 T` + `move r9 r1` -> `l r9 d0 T`
-fn register_forwarding<'a>(
-    mut input: Vec<InstructionNode<'a>>,
-) -> (Vec<InstructionNode<'a>>, bool) {
-    let mut changed = false;
-    let mut i = 0;
-
-    // We use a while loop to manually control index so we can peek ahead
-    while i < input.len().saturating_sub(1) {
-        let next_idx = i + 1;
-
-        // Check if current instruction defines a register
-        // and the NEXT instruction is a move from that register.
-        let forward_candidate = if let Some(def_reg) = get_destination_reg(&input[i].instruction) {
-            if let Instruction::Move(Operand::Register(dest_reg), Operand::Register(src_reg)) =
-                &input[next_idx].instruction
-            {
-                if *src_reg == def_reg {
-                    // Candidate found: Instruction `i` defines `src_reg`, Instruction `i+1` moves `src_reg` to `dest_reg`.
-                    // We can optimize if `src_reg` (the temp) is NOT used after this move.
-                    Some((def_reg, *dest_reg))
-                } else {
-                    None
-                }
-            } else {
-                None
-            }
-        } else {
-            None
-        };
-
-        if let Some((temp_reg, final_reg)) = forward_candidate {
-            // Check liveness: Is temp_reg used after i+1?
-            // We scan from i+2 onwards.
-            let mut temp_is_dead = true;
-            for node in input.iter().skip(i + 2) {
-                if reg_is_read(&node.instruction, temp_reg) {
-                    temp_is_dead = false;
-                    break;
-                }
-                // If the temp is redefined, then the old value is dead, so we are safe.
-                if let Some(redef) = get_destination_reg(&node.instruction)
-                    && redef == temp_reg
-                {
-                    break;
-                }
-
-                // If we hit a label/jump, we assume liveness might leak (conservative safety)
-                if matches!(
-                    node.instruction,
-                    Instruction::LabelDef(_) | Instruction::Jump(_) | Instruction::JumpAndLink(_)
-                ) {
-                    temp_is_dead = false;
-                    break;
-                }
-            }
-
-            if temp_is_dead {
-                // Perform the swap
-                // 1. Rewrite input[i] to write to final_reg
-                if let Some(new_instr) = set_destination_reg(&input[i].instruction, final_reg) {
-                    input[i].instruction = new_instr;
-                    // 2. Remove input[i+1] (The Move)
-                    input.remove(next_idx);
-                    changed = true;
-                    // Don't increment i, re-evaluate current index (which is now a new neighbor)
-                    continue;
-                }
-            }
-        }
-
-        i += 1;
-    }
-
-    (input, changed)
-}
-
-/// Pass: Resolve Labels
-/// Converts all Jump/Branch labels to absolute line numbers and removes LabelDefs.
-fn resolve_labels<'a>(input: Vec<InstructionNode<'a>>) -> Vec<InstructionNode<'a>> {
-    let mut label_map: HashMap<String, usize> = HashMap::new();
-    let mut line_number = 0;
-
-    // 1. Build Label Map (filtering out LabelDefs from the count)
-    for node in &input {
-        if let Instruction::LabelDef(name) = &node.instruction {
-            label_map.insert(name.to_string(), line_number);
-        } else {
-            line_number += 1;
-        }
-    }
-
-    let mut output = Vec::with_capacity(input.len());
-
-    // 2. Rewrite Jumps and Filter Labels
-    for mut node in input {
-        // Helper to get line number as Decimal operand
-        let get_line = |lbl: &Operand| -> Option<Operand<'a>> {
-            if let Operand::Label(name) = lbl {
-                label_map
-                    .get(name.as_ref())
-                    .map(|&l| Operand::Number(Decimal::from(l)))
-            } else {
-                None
-            }
-        };
-
-        match &mut node.instruction {
-            Instruction::LabelDef(_) => continue, // Strip labels
-
-            // Jumps
-            Instruction::Jump(op) => {
-                if let Some(num) = get_line(op) {
-                    *op = num;
-                }
-            }
-            Instruction::JumpAndLink(op) => {
-                if let Some(num) = get_line(op) {
-                    *op = num;
-                }
-            }
-            Instruction::BranchEq(_, _, op)
-            | Instruction::BranchNe(_, _, op)
-            | Instruction::BranchGt(_, _, op)
-            | Instruction::BranchLt(_, _, op)
-            | Instruction::BranchGe(_, _, op)
-            | Instruction::BranchLe(_, _, op) => {
-                if let Some(num) = get_line(op) {
-                    *op = num;
-                }
-            }
-            Instruction::BranchEqZero(_, op) | Instruction::BranchNeZero(_, op) => {
-                if let Some(num) = get_line(op) {
-                    *op = num;
-                }
-            }
-            _ => {}
-        }
-        output.push(node);
-    }
-
-    output
-}
-
-// --- Helpers for Register Analysis ---
-
-fn get_destination_reg(instr: &Instruction) -> Option<u8> {
-    match instr {
-        Instruction::Move(Operand::Register(r), _)
-        | Instruction::Add(Operand::Register(r), _, _)
-        | Instruction::Sub(Operand::Register(r), _, _)
-        | Instruction::Mul(Operand::Register(r), _, _)
-        | Instruction::Div(Operand::Register(r), _, _)
-        | Instruction::Mod(Operand::Register(r), _, _)
-        | Instruction::Pow(Operand::Register(r), _, _)
-        | Instruction::Load(Operand::Register(r), _, _)
-        | Instruction::LoadSlot(Operand::Register(r), _, _, _)
-        | Instruction::LoadBatch(Operand::Register(r), _, _, _)
-        | Instruction::LoadBatchNamed(Operand::Register(r), _, _, _, _)
-        | Instruction::SetEq(Operand::Register(r), _, _)
-        | Instruction::SetNe(Operand::Register(r), _, _)
-        | Instruction::SetGt(Operand::Register(r), _, _)
-        | Instruction::SetLt(Operand::Register(r), _, _)
-        | Instruction::SetGe(Operand::Register(r), _, _)
-        | Instruction::SetLe(Operand::Register(r), _, _)
-        | Instruction::And(Operand::Register(r), _, _)
-        | Instruction::Or(Operand::Register(r), _, _)
-        | Instruction::Xor(Operand::Register(r), _, _)
-        | Instruction::Peek(Operand::Register(r))
-        | Instruction::Get(Operand::Register(r), _, _)
-        | Instruction::Select(Operand::Register(r), _, _, _)
-        | Instruction::Rand(Operand::Register(r))
-        | Instruction::Acos(Operand::Register(r), _)
-        | Instruction::Asin(Operand::Register(r), _)
-        | Instruction::Atan(Operand::Register(r), _)
-        | Instruction::Atan2(Operand::Register(r), _, _)
-        | Instruction::Abs(Operand::Register(r), _)
-        | Instruction::Ceil(Operand::Register(r), _)
-        | Instruction::Cos(Operand::Register(r), _)
-        | Instruction::Floor(Operand::Register(r), _)
-        | Instruction::Log(Operand::Register(r), _)
-        | Instruction::Max(Operand::Register(r), _, _)
-        | Instruction::Min(Operand::Register(r), _, _)
-        | Instruction::Sin(Operand::Register(r), _)
-        | Instruction::Sqrt(Operand::Register(r), _)
-        | Instruction::Tan(Operand::Register(r), _)
-        | Instruction::Trunc(Operand::Register(r), _)
-        | Instruction::LoadReagent(Operand::Register(r), _, _, _)
-        | Instruction::Pop(Operand::Register(r)) => Some(*r),
-        _ => None,
-    }
-}
-
-fn set_destination_reg<'a>(instr: &Instruction<'a>, new_reg: u8) -> Option<Instruction<'a>> {
-    // Helper to easily recreate instruction with new dest
-    let r = Operand::Register(new_reg);
-    match instr {
-        Instruction::Move(_, b) => Some(Instruction::Move(r, b.clone())),
-        Instruction::Add(_, a, b) => Some(Instruction::Add(r, a.clone(), b.clone())),
-        Instruction::Sub(_, a, b) => Some(Instruction::Sub(r, a.clone(), b.clone())),
-        Instruction::Mul(_, a, b) => Some(Instruction::Mul(r, a.clone(), b.clone())),
-        Instruction::Div(_, a, b) => Some(Instruction::Div(r, a.clone(), b.clone())),
-        Instruction::Mod(_, a, b) => Some(Instruction::Mod(r, a.clone(), b.clone())),
-        Instruction::Pow(_, a, b) => Some(Instruction::Pow(r, a.clone(), b.clone())),
-        Instruction::Load(_, a, b) => Some(Instruction::Load(r, a.clone(), b.clone())),
-        Instruction::LoadSlot(_, a, b, c) => {
-            Some(Instruction::LoadSlot(r, a.clone(), b.clone(), c.clone()))
-        }
-        Instruction::LoadBatch(_, a, b, c) => {
-            Some(Instruction::LoadBatch(r, a.clone(), b.clone(), c.clone()))
-        }
-        Instruction::LoadBatchNamed(_, a, b, c, d) => Some(Instruction::LoadBatchNamed(
-            r,
-            a.clone(),
-            b.clone(),
-            c.clone(),
-            d.clone(),
-        )),
-        Instruction::LoadReagent(_, b, c, d) => {
-            Some(Instruction::LoadReagent(r, b.clone(), c.clone(), d.clone()))
-        }
-        Instruction::SetEq(_, a, b) => Some(Instruction::SetEq(r, a.clone(), b.clone())),
-        Instruction::SetNe(_, a, b) => Some(Instruction::SetNe(r, a.clone(), b.clone())),
-        Instruction::SetGt(_, a, b) => Some(Instruction::SetGt(r, a.clone(), b.clone())),
-        Instruction::SetLt(_, a, b) => Some(Instruction::SetLt(r, a.clone(), b.clone())),
-        Instruction::SetGe(_, a, b) => Some(Instruction::SetGe(r, a.clone(), b.clone())),
-        Instruction::SetLe(_, a, b) => Some(Instruction::SetLe(r, a.clone(), b.clone())),
-        Instruction::And(_, a, b) => Some(Instruction::And(r, a.clone(), b.clone())),
-        Instruction::Or(_, a, b) => Some(Instruction::Or(r, a.clone(), b.clone())),
-        Instruction::Xor(_, a, b) => Some(Instruction::Xor(r, a.clone(), b.clone())),
-        Instruction::Peek(_) => Some(Instruction::Peek(r)),
-        Instruction::Get(_, a, b) => Some(Instruction::Get(r, a.clone(), b.clone())),
-        Instruction::Select(_, a, b, c) => {
-            Some(Instruction::Select(r, a.clone(), b.clone(), c.clone()))
-        }
-        Instruction::Rand(_) => Some(Instruction::Rand(r)),
-        Instruction::Pop(_) => Some(Instruction::Pop(r)),
-
-        // Math funcs
-        Instruction::Acos(_, a) => Some(Instruction::Acos(r, a.clone())),
-        Instruction::Asin(_, a) => Some(Instruction::Asin(r, a.clone())),
-        Instruction::Atan(_, a) => Some(Instruction::Atan(r, a.clone())),
-        Instruction::Atan2(_, a, b) => Some(Instruction::Atan2(r, a.clone(), b.clone())),
-        Instruction::Abs(_, a) => Some(Instruction::Abs(r, a.clone())),
-        Instruction::Ceil(_, a) => Some(Instruction::Ceil(r, a.clone())),
-        Instruction::Cos(_, a) => Some(Instruction::Cos(r, a.clone())),
-        Instruction::Floor(_, a) => Some(Instruction::Floor(r, a.clone())),
-        Instruction::Log(_, a) => Some(Instruction::Log(r, a.clone())),
-        Instruction::Max(_, a, b) => Some(Instruction::Max(r, a.clone(), b.clone())),
-        Instruction::Min(_, a, b) => Some(Instruction::Min(r, a.clone(), b.clone())),
-        Instruction::Sin(_, a) => Some(Instruction::Sin(r, a.clone())),
-        Instruction::Sqrt(_, a) => Some(Instruction::Sqrt(r, a.clone())),
-        Instruction::Tan(_, a) => Some(Instruction::Tan(r, a.clone())),
-        Instruction::Trunc(_, a) => Some(Instruction::Trunc(r, a.clone())),
-
-        _ => None,
-    }
-}
-
-fn reg_is_read(instr: &Instruction, reg: u8) -> bool {
-    let check = |op: &Operand| matches!(op, Operand::Register(r) if *r == reg);
-
-    match instr {
-        Instruction::Move(_, a) => check(a),
-        Instruction::Add(_, a, b)
-        | Instruction::Sub(_, a, b)
-        | Instruction::Mul(_, a, b)
-        | Instruction::Div(_, a, b)
-        | Instruction::Mod(_, a, b)
-        | Instruction::Pow(_, a, b) => check(a) || check(b),
-
-        Instruction::Load(_, a, _) => check(a), // Load reads device? Device can be reg? Yes.
-        Instruction::Store(a, _, b) => check(a) || check(b),
-
-        Instruction::BranchEq(a, b, _)
-        | Instruction::BranchNe(a, b, _)
-        | Instruction::BranchGt(a, b, _)
-        | Instruction::BranchLt(a, b, _)
-        | Instruction::BranchGe(a, b, _)
-        | Instruction::BranchLe(a, b, _) => check(a) || check(b),
-
-        Instruction::BranchEqZero(a, _) | Instruction::BranchNeZero(a, _) => check(a),
-
-        Instruction::LoadReagent(_, device, _, item_hash) => check(device) || check(item_hash),
-
-        Instruction::LoadSlot(_, dev, slot, _) => check(dev) || check(slot),
-        Instruction::LoadBatch(_, dev, _, mode) => check(dev) || check(mode),
-        Instruction::LoadBatchNamed(_, d_hash, n_hash, _, mode) => {
-            check(d_hash) || check(n_hash) || check(mode)
-        }
-
-        Instruction::SetEq(_, a, b)
-        | Instruction::SetNe(_, a, b)
-        | Instruction::SetGt(_, a, b)
-        | Instruction::SetLt(_, a, b)
-        | Instruction::SetGe(_, a, b)
-        | Instruction::SetLe(_, a, b)
-        | Instruction::And(_, a, b)
-        | Instruction::Or(_, a, b)
-        | Instruction::Xor(_, a, b) => check(a) || check(b),
-
-        Instruction::Push(a) => check(a),
-        Instruction::Get(_, a, b) => check(a) || check(b),
-        Instruction::Put(a, b, c) => check(a) || check(b) || check(c),
-
-        Instruction::Select(_, a, b, c) => check(a) || check(b) || check(c),
-        Instruction::Sleep(a) => check(a),
-
-        // Math single arg
-        Instruction::Acos(_, a)
-        | Instruction::Asin(_, a)
-        | Instruction::Atan(_, a)
-        | Instruction::Abs(_, a)
-        | Instruction::Ceil(_, a)
-        | Instruction::Cos(_, a)
-        | Instruction::Floor(_, a)
-        | Instruction::Log(_, a)
-        | Instruction::Sin(_, a)
-        | Instruction::Sqrt(_, a)
-        | Instruction::Tan(_, a)
-        | Instruction::Trunc(_, a) => check(a),
-
-        // Math double arg
-        Instruction::Atan2(_, a, b) | Instruction::Max(_, a, b) | Instruction::Min(_, a, b) => {
-            check(a) || check(b)
-        }
-
-        _ => false,
-    }
-}
-
-/// --- Constant Propagation & Dead Code ---
-fn constant_propagation<'a>(input: Vec<InstructionNode<'a>>) -> (Vec<InstructionNode<'a>>, bool) {
-    let mut output = Vec::with_capacity(input.len());
-    let mut changed = false;
-    let mut registers: [Option<Decimal>; 16] = [None; 16];
-
-    for mut node in input {
-        match &node.instruction {
-            Instruction::LabelDef(_) | Instruction::JumpAndLink(_) => registers = [None; 16],
-            _ => {}
-        }
-
-        let simplified = match &node.instruction {
-            Instruction::Move(dst, src) => resolve_value(src, &registers)
-                .map(|val| Instruction::Move(dst.clone(), Operand::Number(val))),
-            Instruction::Add(dst, a, b) => try_fold_math(dst, a, b, &registers, |x, y| x + y),
-            Instruction::Sub(dst, a, b) => try_fold_math(dst, a, b, &registers, |x, y| x - y),
-            Instruction::Mul(dst, a, b) => try_fold_math(dst, a, b, &registers, |x, y| x * y),
-            Instruction::Div(dst, a, b) => {
-                try_fold_math(
-                    dst,
-                    a,
-                    b,
-                    &registers,
-                    |x, y| if y.is_zero() { x } else { x / y },
-                )
-            }
-            Instruction::Mod(dst, a, b) => {
-                try_fold_math(
-                    dst,
-                    a,
-                    b,
-                    &registers,
-                    |x, y| if y.is_zero() { x } else { x % y },
-                )
-            }
-            Instruction::BranchEq(a, b, l) => {
-                try_resolve_branch(a, b, l, &registers, |x, y| x == y)
-            }
-            Instruction::BranchNe(a, b, l) => {
-                try_resolve_branch(a, b, l, &registers, |x, y| x != y)
-            }
-            Instruction::BranchGt(a, b, l) => try_resolve_branch(a, b, l, &registers, |x, y| x > y),
-            Instruction::BranchLt(a, b, l) => try_resolve_branch(a, b, l, &registers, |x, y| x < y),
-            Instruction::BranchGe(a, b, l) => {
-                try_resolve_branch(a, b, l, &registers, |x, y| x >= y)
-            }
-            Instruction::BranchLe(a, b, l) => {
-                try_resolve_branch(a, b, l, &registers, |x, y| x <= y)
-            }
-            Instruction::BranchEqZero(a, l) => {
-                try_resolve_branch(a, &Operand::Number(0.into()), l, &registers, |x, y| x == y)
-            }
-            Instruction::BranchNeZero(a, l) => {
-                try_resolve_branch(a, &Operand::Number(0.into()), l, &registers, |x, y| x != y)
-            }
-            _ => None,
-        };
-
-        if let Some(new) = simplified {
-            node.instruction = new;
-            changed = true;
-        }
-
-        // Update tracking
-        match &node.instruction {
-            Instruction::Move(Operand::Register(r), src) => {
-                registers[*r as usize] = resolve_value(src, &registers)
-            }
-            // Invalidate if destination is register
-            _ => {
-                if let Some(r) = get_destination_reg(&node.instruction) {
-                    registers[r as usize] = None;
-                }
-            }
-        }
-
-        // Filter out NOPs (Empty LabelDefs from branch resolution)
-        if let Instruction::LabelDef(l) = &node.instruction
-            && l.is_empty()
-        {
-            changed = true;
-            continue;
-        }
-
-        output.push(node);
-    }
-    (output, changed)
-}
-
-fn resolve_value(op: &Operand, regs: &[Option<Decimal>; 16]) -> Option<Decimal> {
-    match op {
-        Operand::Number(n) => Some(*n),
-        Operand::Register(r) => regs[*r as usize],
-        _ => None,
-    }
-}
-
-fn try_fold_math<'a, F>(
-    dst: &Operand<'a>,
-    a: &Operand<'a>,
-    b: &Operand<'a>,
-    regs: &[Option<Decimal>; 16],
-    op: F,
-) -> Option<Instruction<'a>>
-where
-    F: Fn(Decimal, Decimal) -> Decimal,
-{
-    let val_a = resolve_value(a, regs)?;
-    let val_b = resolve_value(b, regs)?;
-    Some(Instruction::Move(
-        dst.clone(),
-        Operand::Number(op(val_a, val_b)),
-    ))
-}
-
-fn try_resolve_branch<'a, F>(
-    a: &Operand<'a>,
-    b: &Operand<'a>,
-    label: &Operand<'a>,
-    regs: &[Option<Decimal>; 16],
-    check: F,
-) -> Option<Instruction<'a>>
-where
-    F: Fn(Decimal, Decimal) -> bool,
-{
-    let val_a = resolve_value(a, regs)?;
-    let val_b = resolve_value(b, regs)?;
-    if check(val_a, val_b) {
-        Some(Instruction::Jump(label.clone()))
-    } else {
-        Some(Instruction::LabelDef("".into())) // NOP
-    }
-}
-
-fn remove_redundant_moves<'a>(input: Vec<InstructionNode<'a>>) -> (Vec<InstructionNode<'a>>, bool) {
-    let mut output = Vec::with_capacity(input.len());
-    let mut changed = false;
-    for node in input {
-        if let Instruction::Move(dst, src) = &node.instruction
-            && dst == src
-        {
-            changed = true;
-            continue;
-        }
-        output.push(node);
-    }
-    (output, changed)
-}
-
-fn remove_unreachable_code<'a>(
-    input: Vec<InstructionNode<'a>>,
-) -> (Vec<InstructionNode<'a>>, bool) {
-    let mut output = Vec::with_capacity(input.len());
-    let mut changed = false;
-    let mut dead = false;
-    for node in input {
-        if let Instruction::LabelDef(_) = node.instruction {
-            dead = false;
-        }
-        if dead {
-            changed = true;
-            continue;
-        }
-        if let Instruction::Jump(_) = node.instruction {
-            dead = true
-        }
-        output.push(node);
-    }
-    (output, changed)
+    let instructions = resolve_labels(instructions);
+
+    // Post-resolution Pass: Remove redundant jumps (must run after label resolution)
+    let (instructions, _) = remove_redundant_jumps(instructions);
+
+    Instructions::new(instructions)
 }

rust_compiler/libs/optimizer/src/peephole_optimization.rs

@@ -0,0 +1,761 @@
+use il::{Instruction, InstructionNode, Operand};
+
+/// Pass: Peephole Optimization
+/// Recognizes and optimizes common instruction patterns.
+pub fn peephole_optimization<'a>(
+    input: Vec<InstructionNode<'a>>,
+) -> (Vec<InstructionNode<'a>>, bool) {
+    let mut output = Vec::with_capacity(input.len());
+    let mut changed = false;
+    let mut i = 0;
+
+    while i < input.len() {
+        // Pattern: push sp; push ra ... pop ra; pop sp (with no jal in between)
+        // If we push sp and ra and later pop them, but never call a function in between, remove all four
+        // and adjust any stack pointer offsets in between by -2
+        if i + 1 < input.len() {
+            if let (
+                Instruction::Push(Operand::StackPointer),
+                Instruction::Push(Operand::ReturnAddress),
+            ) = (&input[i].instruction, &input[i + 1].instruction)
+            {
+                // Look for matching pop ra; pop sp pattern
+                if let Some((ra_pop_idx, instructions_between)) =
+                    find_matching_ra_pop(&input[i + 1..])
+                {
+                    let absolute_ra_pop = i + 1 + ra_pop_idx;
+                    // Check if the next instruction is pop sp
+                    if absolute_ra_pop + 1 < input.len() {
+                        if let Instruction::Pop(Operand::StackPointer) =
+                            &input[absolute_ra_pop + 1].instruction
+                        {
+                            // Check if there's any jal between push and pop
+                            let has_call = instructions_between.iter().any(|node| {
+                                matches!(node.instruction, Instruction::JumpAndLink(_))
+                            });
+
+                            if !has_call {
+                                // Safe to remove all four: push sp, push ra, pop ra, pop sp
+                                // Also need to adjust stack pointer offsets in between by -2
+                                let absolute_sp_pop = absolute_ra_pop + 1;
+                                // Clear output since we're going to reprocess the entire input
+                                output.clear();
+                                for (idx, node) in input.iter().enumerate() {
+                                    if idx == i
+                                        || idx == i + 1
+                                        || idx == absolute_ra_pop
+                                        || idx == absolute_sp_pop
+                                    {
+                                        // Skip all four push/pop instructions
+                                        continue;
+                                    }
+
+                                    // If this instruction is between the pushes and pops, adjust its stack offsets
+                                    if idx > i + 1 && idx < absolute_ra_pop {
+                                        let adjusted_instruction =
+                                            adjust_stack_offset(node.instruction.clone(), 2);
+                                        output.push(InstructionNode::new(
+                                            adjusted_instruction,
+                                            node.span,
+                                        ));
+                                    } else {
+                                        output.push(node.clone());
+                                    }
+                                }
+                                changed = true;
+                                // We've processed the entire input, so break
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        // Pattern: push ra ... pop ra (with no jal in between)
+        // Fallback for when there's only ra push/pop without sp
+        if let Instruction::Push(Operand::ReturnAddress) = &input[i].instruction {
+            if let Some((pop_idx, instructions_between)) = find_matching_ra_pop(&input[i..]) {
+                // Check if there's any jal between push and pop
+                let has_call = instructions_between
+                    .iter()
+                    .any(|node| matches!(node.instruction, Instruction::JumpAndLink(_)));
+
+                if !has_call {
+                    // Safe to remove both push and pop
+                    // Also need to adjust stack pointer offsets in between
+                    let absolute_pop_idx = i + pop_idx;
+                    // Clear output since we're going to reprocess the entire input
+                    output.clear();
+                    for (idx, node) in input.iter().enumerate() {
+                        if idx == i || idx == absolute_pop_idx {
+                            // Skip the push and pop
+                            continue;
+                        }
+
+                        // If this instruction is between push and pop, adjust its stack offsets
+                        if idx > i && idx < absolute_pop_idx {
+                            let adjusted_instruction =
+                                adjust_stack_offset(node.instruction.clone(), 1);
+                            output.push(InstructionNode::new(adjusted_instruction, node.span));
+                        } else {
+                            output.push(node.clone());
+                        }
+                    }
+                    changed = true;
+                    // We've processed the entire input, so break
+                    break;
+                }
+            }
+        }
+
+        // Pattern: Branch-Move-Jump-Label-Move-Label -> Select
+        // beqz r1 else_label
+        // move r2 val1
+        // j end_label
+        // else_label:
+        // move r2 val2
+        // end_label:
+        // Converts to: select r2 r1 val1 val2
+        if i + 5 < input.len() {
+            let select_pattern = try_match_select_pattern(&input[i..i + 6]);
+            if let Some((dst, cond, true_val, false_val, skip_count)) = select_pattern {
+                output.push(InstructionNode::new(
+                    Instruction::Select(dst, cond, true_val, false_val),
+                    input[i].span,
+                ));
+                changed = true;
+                i += skip_count;
+                continue;
+            }
+        }
+
+        // Pattern: seq + beqz -> beq
+        if i + 1 < input.len() {
+            let pattern = match (&input[i].instruction, &input[i + 1].instruction) {
+                (
+                    Instruction::SetEq(Operand::Register(temp), a, b),
+                    Instruction::BranchEqZero(Operand::Register(cond), label),
+                ) if temp == cond => Some((a, b, label, BranchType::Eq, true)), // invert: beqz means "if NOT equal"
+
+                (
+                    Instruction::SetNe(Operand::Register(temp), a, b),
+                    Instruction::BranchEqZero(Operand::Register(cond), label),
+                ) if temp == cond => Some((a, b, label, BranchType::Ne, true)),
+
+                (
+                    Instruction::SetGt(Operand::Register(temp), a, b),
+                    Instruction::BranchEqZero(Operand::Register(cond), label),
+                ) if temp == cond => Some((a, b, label, BranchType::Gt, true)),
+
+                (
+                    Instruction::SetLt(Operand::Register(temp), a, b),
+                    Instruction::BranchEqZero(Operand::Register(cond), label),
+                ) if temp == cond => Some((a, b, label, BranchType::Lt, true)),
+
+                (
+                    Instruction::SetGe(Operand::Register(temp), a, b),
+                    Instruction::BranchEqZero(Operand::Register(cond), label),
+                ) if temp == cond => Some((a, b, label, BranchType::Ge, true)),
+
+                (
+                    Instruction::SetLe(Operand::Register(temp), a, b),
+                    Instruction::BranchEqZero(Operand::Register(cond), label),
+                ) if temp == cond => Some((a, b, label, BranchType::Le, true)),
+
+                // Pattern: seq + bnez -> bne
+                (
+                    Instruction::SetEq(Operand::Register(temp), a, b),
+                    Instruction::BranchNeZero(Operand::Register(cond), label),
+                ) if temp == cond => Some((a, b, label, BranchType::Eq, false)),
+
+                (
+                    Instruction::SetNe(Operand::Register(temp), a, b),
+                    Instruction::BranchNeZero(Operand::Register(cond), label),
+                ) if temp == cond => Some((a, b, label, BranchType::Ne, false)),
+
+                (
+                    Instruction::SetGt(Operand::Register(temp), a, b),
+                    Instruction::BranchNeZero(Operand::Register(cond), label),
+                ) if temp == cond => Some((a, b, label, BranchType::Gt, false)),
+
+                (
+                    Instruction::SetLt(Operand::Register(temp), a, b),
+                    Instruction::BranchNeZero(Operand::Register(cond), label),
+                ) if temp == cond => Some((a, b, label, BranchType::Lt, false)),
+
+                (
+                    Instruction::SetGe(Operand::Register(temp), a, b),
+                    Instruction::BranchNeZero(Operand::Register(cond), label),
+                ) if temp == cond => Some((a, b, label, BranchType::Ge, false)),
+
+                (
+                    Instruction::SetLe(Operand::Register(temp), a, b),
+                    Instruction::BranchNeZero(Operand::Register(cond), label),
+                ) if temp == cond => Some((a, b, label, BranchType::Le, false)),
+
+                _ => None,
+            };
+
+            if let Some((a, b, label, branch_type, invert)) = pattern {
+                // Create optimized branch instruction
+                let new_instr = if invert {
+                    // beqz after seq means "branch if NOT equal" -> bne
+                    match branch_type {
+                        BranchType::Eq => {
+                            Instruction::BranchNe(a.clone(), b.clone(), label.clone())
+                        }
+                        BranchType::Ne => {
+                            Instruction::BranchEq(a.clone(), b.clone(), label.clone())
+                        }
+                        BranchType::Gt => {
+                            Instruction::BranchLe(a.clone(), b.clone(), label.clone())
+                        }
+                        BranchType::Lt => {
+                            Instruction::BranchGe(a.clone(), b.clone(), label.clone())
+                        }
+                        BranchType::Ge => {
+                            Instruction::BranchLt(a.clone(), b.clone(), label.clone())
+                        }
+                        BranchType::Le => {
+                            Instruction::BranchGt(a.clone(), b.clone(), label.clone())
+                        }
+                    }
+                } else {
+                    // bnez after seq means "branch if equal" -> beq
+                    match branch_type {
+                        BranchType::Eq => {
+                            Instruction::BranchEq(a.clone(), b.clone(), label.clone())
+                        }
+                        BranchType::Ne => {
+                            Instruction::BranchNe(a.clone(), b.clone(), label.clone())
+                        }
+                        BranchType::Gt => {
+                            Instruction::BranchGt(a.clone(), b.clone(), label.clone())
+                        }
+                        BranchType::Lt => {
+                            Instruction::BranchLt(a.clone(), b.clone(), label.clone())
+                        }
+                        BranchType::Ge => {
+                            Instruction::BranchGe(a.clone(), b.clone(), label.clone())
+                        }
+                        BranchType::Le => {
+                            Instruction::BranchLe(a.clone(), b.clone(), label.clone())
+                        }
+                    }
+                };
+
+                output.push(InstructionNode::new(new_instr, input[i].span));
+                changed = true;
+                i += 2; // Skip both instructions
+                continue;
+            }
+        }
+
+        output.push(input[i].clone());
+        i += 1;
+    }
+
+    (output, changed)
+}
+
+/// Tries to match a select pattern in the instruction sequence.
+/// Pattern (6 instructions):
+///   beqz/bnez cond else_label   (i+0)
+///   move dst val1               (i+1)
+///   j end_label                 (i+2)
+///   else_label:                 (i+3)
+///   move dst val2               (i+4)
+///   end_label:                  (i+5)
+/// Returns: (dst, cond, true_val, false_val, instruction_count)
+fn try_match_select_pattern<'a>(
+    instructions: &[InstructionNode<'a>],
+) -> Option<(Operand<'a>, Operand<'a>, Operand<'a>, Operand<'a>, usize)> {
+    if instructions.len() < 6 {
+        return None;
+    }
+
+    // Check for beqz pattern
+    if let Instruction::BranchEqZero(cond, Operand::Label(else_label)) =
+        &instructions[0].instruction
+    {
+        if let Instruction::Move(dst1, val1) = &instructions[1].instruction {
+            if let Instruction::Jump(Operand::Label(end_label)) = &instructions[2].instruction {
+                if let Instruction::LabelDef(label3) = &instructions[3].instruction {
+                    if label3 == else_label {
+                        if let Instruction::Move(dst2, val2) = &instructions[4].instruction {
+                            if dst1 == dst2 {
+                                if let Instruction::LabelDef(label5) = &instructions[5].instruction
+                                {
+                                    if label5 == end_label {
+                                        // beqz means: if cond==0, goto else, so val1 is for true, val2 for false
+                                        // select dst cond true_val false_val
+                                        // When cond is non-zero (true), use val1, otherwise val2
+                                        return Some((
+                                            dst1.clone(),
+                                            cond.clone(),
+                                            val1.clone(),
+                                            val2.clone(),
+                                            6,
+                                        ));
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    // Check for bnez pattern
+    if let Instruction::BranchNeZero(cond, Operand::Label(then_label)) =
+        &instructions[0].instruction
+    {
+        if let Instruction::Move(dst1, val_false) = &instructions[1].instruction {
+            if let Instruction::Jump(Operand::Label(end_label)) = &instructions[2].instruction {
+                if let Instruction::LabelDef(label3) = &instructions[3].instruction {
+                    if label3 == then_label {
+                        if let Instruction::Move(dst2, val_true) = &instructions[4].instruction {
+                            if dst1 == dst2 {
+                                if let Instruction::LabelDef(label5) = &instructions[5].instruction
+                                {
+                                    if label5 == end_label {
+                                        // bnez means: if cond!=0, goto then, so val_true for true, val_false for false
+                                        return Some((
+                                            dst1.clone(),
+                                            cond.clone(),
+                                            val_true.clone(),
+                                            val_false.clone(),
+                                            6,
+                                        ));
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    None
+}
+
+/// Finds a matching `pop ra` for a `push ra` at the start of the slice.
+/// Returns the index of the pop and the instructions in between.
+fn find_matching_ra_pop<'a>(
+    instructions: &'a [InstructionNode<'a>],
+) -> Option<(usize, &'a [InstructionNode<'a>])> {
+    if instructions.is_empty() {
+        return None;
+    }
+
+    // Skip the push itself
+    for (idx, node) in instructions.iter().enumerate().skip(1) {
+        if let Instruction::Pop(Operand::ReturnAddress) = &node.instruction {
+            // Found matching pop
+            return Some((idx, &instructions[1..idx]));
+        }
+
+        // Stop searching if we hit a jump (different control flow) or a function label
+        // Labels are OK - they're just markers EXCEPT for user-defined function labels
+        // which indicate a function boundary
+        if matches!(
+            node.instruction,
+            Instruction::Jump(_) | Instruction::JumpRelative(_) | Instruction::LabelDef(_)
+        ) {
+            return None;
+        }
+    }
+
+    None
+}
+
+/// Checks if an instruction uses or modifies the stack pointer.
+#[allow(dead_code)]
+fn uses_stack_pointer(instruction: &Instruction) -> bool {
+    match instruction {
+        Instruction::Push(_) | Instruction::Pop(_) | Instruction::Peek(_) => true,
+        Instruction::Add(Operand::StackPointer, _, _)
+        | Instruction::Sub(Operand::StackPointer, _, _)
+        | Instruction::Mul(Operand::StackPointer, _, _)
+        | Instruction::Div(Operand::StackPointer, _, _)
+        | Instruction::Mod(Operand::StackPointer, _, _) => true,
+        Instruction::Add(_, Operand::StackPointer, _)
+        | Instruction::Sub(_, Operand::StackPointer, _)
+        | Instruction::Mul(_, Operand::StackPointer, _)
+        | Instruction::Div(_, Operand::StackPointer, _)
+        | Instruction::Mod(_, Operand::StackPointer, _) => true,
+        Instruction::Add(_, _, Operand::StackPointer)
+        | Instruction::Sub(_, _, Operand::StackPointer)
+        | Instruction::Mul(_, _, Operand::StackPointer)
+        | Instruction::Div(_, _, Operand::StackPointer)
+        | Instruction::Mod(_, _, Operand::StackPointer) => true,
+        Instruction::Move(Operand::StackPointer, _)
+        | Instruction::Move(_, Operand::StackPointer) => true,
+        _ => false,
+    }
+}
+
+/// Adjusts stack pointer offsets in an instruction by decrementing them by a given amount.
+/// This is necessary when removing push operations that would have increased the stack size.
+fn adjust_stack_offset<'a>(instruction: Instruction<'a>, decrement: i64) -> Instruction<'a> {
+    use rust_decimal::prelude::*;
+
+    match instruction {
+        // Adjust arithmetic operations on sp that use literal offsets
+        Instruction::Sub(dst, Operand::StackPointer, Operand::Number(n)) => {
+            let new_n = n - Decimal::from(decrement);
+            // If the result is 0 or negative, we may want to skip this entirely
+            // but for now, just adjust the value
+            Instruction::Sub(dst, Operand::StackPointer, Operand::Number(new_n))
+        }
+        Instruction::Add(dst, Operand::StackPointer, Operand::Number(n)) => {
+            let new_n = n - Decimal::from(decrement);
+            Instruction::Add(dst, Operand::StackPointer, Operand::Number(new_n))
+        }
+        // Return the instruction unchanged if it doesn't need adjustment
+        other => other,
+    }
+}
+
+#[derive(Debug, Clone, Copy)]
+enum BranchType {
+    Eq,
+    Ne,
+    Gt,
+    Lt,
+    Ge,
+    Le,
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_seq_beqz_to_bne() {
+        let input = vec![
+            InstructionNode::new(
+                Instruction::SetEq(
+                    Operand::Register(1),
+                    Operand::Register(2),
+                    Operand::Register(3),
+                ),
+                None,
+            ),
+            InstructionNode::new(
+                Instruction::BranchEqZero(Operand::Register(1), Operand::Label("target".into())),
+                None,
+            ),
+        ];
+
+        let (output, changed) = peephole_optimization(input);
+        assert!(changed);
+        assert_eq!(output.len(), 1);
+        assert!(matches!(
+            output[0].instruction,
+            Instruction::BranchNe(_, _, _)
+        ));
+    }
+
+    #[test]
+    fn test_sne_beqz_to_beq() {
+        let input = vec![
+            InstructionNode::new(
+                Instruction::SetNe(
+                    Operand::Register(1),
+                    Operand::Register(2),
+                    Operand::Register(3),
+                ),
+                None,
+            ),
+            InstructionNode::new(
+                Instruction::BranchEqZero(Operand::Register(1), Operand::Label("target".into())),
+                None,
+            ),
+        ];
+
+        let (output, changed) = peephole_optimization(input);
+        assert!(changed);
+        assert_eq!(output.len(), 1);
+        assert!(matches!(
+            output[0].instruction,
+            Instruction::BranchEq(_, _, _)
+        ));
+    }
+
+    #[test]
+    fn test_seq_bnez_to_beq() {
+        let input = vec![
+            InstructionNode::new(
+                Instruction::SetEq(
+                    Operand::Register(1),
+                    Operand::Register(2),
+                    Operand::Register(3),
+                ),
+                None,
+            ),
+            InstructionNode::new(
+                Instruction::BranchNeZero(Operand::Register(1), Operand::Label("target".into())),
+                None,
+            ),
+        ];
+
+        let (output, changed) = peephole_optimization(input);
+        assert!(changed);
+        assert_eq!(output.len(), 1);
+        assert!(matches!(
+            output[0].instruction,
+            Instruction::BranchEq(_, _, _)
+        ));
+    }
+
+    #[test]
+    fn test_sgt_beqz_to_ble() {
+        let input = vec![
+            InstructionNode::new(
+                Instruction::SetGt(
+                    Operand::Register(1),
+                    Operand::Register(2),
+                    Operand::Register(3),
+                ),
+                None,
+            ),
+            InstructionNode::new(
+                Instruction::BranchEqZero(Operand::Register(1), Operand::Label("target".into())),
+                None,
+            ),
+        ];
+
+        let (output, changed) = peephole_optimization(input);
+        assert!(changed);
+        assert_eq!(output.len(), 1);
+        assert!(matches!(
+            output[0].instruction,
+            Instruction::BranchLe(_, _, _)
+        ));
+    }
+
+    #[test]
+    fn test_branch_move_jump_to_select_beqz() {
+        // Pattern: beqz r1 else / move r2 10 / j end / else: / move r2 20 / end:
+        // Should convert to: select r2 r1 10 20
+        let input = vec![
+            InstructionNode::new(
+                Instruction::BranchEqZero(Operand::Register(1), Operand::Label("else".into())),
+                None,
+            ),
+            InstructionNode::new(
+                Instruction::Move(Operand::Register(2), Operand::Number(10.into())),
+                None,
+            ),
+            InstructionNode::new(Instruction::Jump(Operand::Label("end".into())), None),
+            InstructionNode::new(Instruction::LabelDef("else".into()), None),
+            InstructionNode::new(
+                Instruction::Move(Operand::Register(2), Operand::Number(20.into())),
+                None,
+            ),
+            InstructionNode::new(Instruction::LabelDef("end".into()), None),
+        ];
+
+        let (output, changed) = peephole_optimization(input);
+        assert!(changed);
+        assert_eq!(output.len(), 1);
+        if let Instruction::Select(dst, cond, true_val, false_val) = &output[0].instruction {
+            assert!(matches!(dst, Operand::Register(2)));
+            assert!(matches!(cond, Operand::Register(1)));
+            assert!(matches!(true_val, Operand::Number(_)));
+            assert!(matches!(false_val, Operand::Number(_)));
+        } else {
+            panic!("Expected Select instruction");
+        }
+    }
+
+    #[test]
+    fn test_branch_move_jump_to_select_bnez() {
+        // Pattern: bnez r1 then / move r2 20 / j end / then: / move r2 10 / end:
+        // Should convert to: select r2 r1 10 20
+        let input = vec![
+            InstructionNode::new(
+                Instruction::BranchNeZero(Operand::Register(1), Operand::Label("then".into())),
+                None,
+            ),
+            InstructionNode::new(
+                Instruction::Move(Operand::Register(2), Operand::Number(20.into())),
+                None,
+            ),
+            InstructionNode::new(Instruction::Jump(Operand::Label("end".into())), None),
+            InstructionNode::new(Instruction::LabelDef("then".into()), None),
+            InstructionNode::new(
+                Instruction::Move(Operand::Register(2), Operand::Number(10.into())),
+                None,
+            ),
+            InstructionNode::new(Instruction::LabelDef("end".into()), None),
+        ];
+
+        let (output, changed) = peephole_optimization(input);
+        assert!(changed);
+        assert_eq!(output.len(), 1);
+        if let Instruction::Select(dst, cond, true_val, false_val) = &output[0].instruction {
+            assert!(matches!(dst, Operand::Register(2)));
+            assert!(matches!(cond, Operand::Register(1)));
+            assert!(matches!(true_val, Operand::Number(_)));
+            assert!(matches!(false_val, Operand::Number(_)));
+        } else {
+            panic!("Expected Select instruction");
+        }
+    }
+
+    #[test]
+    fn test_remove_useless_ra_push_pop() {
+        // Pattern: push ra / add r1 r2 r3 / pop ra
+        // Should remove both push and pop since no jal in between
+        let input = vec![
+            InstructionNode::new(Instruction::Push(Operand::ReturnAddress), None),
+            InstructionNode::new(
+                Instruction::Add(
+                    Operand::Register(1),
+                    Operand::Register(2),
+                    Operand::Register(3),
+                ),
+                None,
+            ),
+            InstructionNode::new(Instruction::Pop(Operand::ReturnAddress), None),
+        ];
+
+        let (output, changed) = peephole_optimization(input);
+        assert!(changed);
+        assert_eq!(output.len(), 1);
+        assert!(matches!(output[0].instruction, Instruction::Add(_, _, _)));
+    }
+
+    #[test]
+    fn test_keep_ra_push_pop_with_jal() {
+        // Pattern: push ra / jal func / pop ra
+        // Should keep both since there's a jal in between
+        let input = vec![
+            InstructionNode::new(Instruction::Push(Operand::ReturnAddress), None),
+            InstructionNode::new(
+                Instruction::JumpAndLink(Operand::Label("func".into())),
+                None,
+            ),
+            InstructionNode::new(Instruction::Pop(Operand::ReturnAddress), None),
+        ];
+
+        let (output, changed) = peephole_optimization(input);
+        assert!(!changed);
+        assert_eq!(output.len(), 3);
+    }
+
+    #[test]
+    fn test_ra_push_pop_with_stack_offset_adjustment() {
+        // Pattern: push ra / sub r1 sp 2 / pop ra
+        // Should remove push/pop AND adjust the stack offset from 2 to 1
+        use rust_decimal::prelude::*;
+
+        let input = vec![
+            InstructionNode::new(Instruction::Push(Operand::ReturnAddress), None),
+            InstructionNode::new(
+                Instruction::Sub(
+                    Operand::Register(1),
+                    Operand::StackPointer,
+                    Operand::Number(Decimal::from(2)),
+                ),
+                None,
+            ),
+            InstructionNode::new(Instruction::Pop(Operand::ReturnAddress), None),
+        ];
+
+        let (output, changed) = peephole_optimization(input);
+        assert!(changed);
+        assert_eq!(output.len(), 1);
+
+        if let Instruction::Sub(dst, src, Operand::Number(offset)) = &output[0].instruction {
+            assert!(matches!(dst, Operand::Register(1)));
+            assert!(matches!(src, Operand::StackPointer));
+            assert_eq!(*offset, Decimal::from(1)); // Should be decremented from 2 to 1
+        } else {
+            panic!("Expected Sub instruction with adjusted offset");
+        }
+    }
+
+    #[test]
+    fn test_remove_sp_and_ra_push_pop() {
+        // Pattern: push sp / push ra / move r8 10 / pop ra / pop sp
+        // Should remove all four push/pop instructions since no jal in between
+        let input = vec![
+            InstructionNode::new(Instruction::Push(Operand::StackPointer), None),
+            InstructionNode::new(Instruction::Push(Operand::ReturnAddress), None),
+            InstructionNode::new(
+                Instruction::Move(Operand::Register(8), Operand::Number(10.into())),
+                None,
+            ),
+            InstructionNode::new(Instruction::Pop(Operand::ReturnAddress), None),
+            InstructionNode::new(Instruction::Pop(Operand::StackPointer), None),
+        ];
+
+        let (output, changed) = peephole_optimization(input);
+        assert!(changed);
+        assert_eq!(output.len(), 1);
+        assert!(matches!(
+            output[0].instruction,
+            Instruction::Move(Operand::Register(8), _)
+        ));
+    }
+
+    #[test]
+    fn test_keep_sp_and_ra_push_pop_with_jal() {
+        // Pattern: push sp / push ra / jal func / pop ra / pop sp
+        // Should keep all since there's a jal in between
+        let input = vec![
+            InstructionNode::new(Instruction::Push(Operand::StackPointer), None),
+            InstructionNode::new(Instruction::Push(Operand::ReturnAddress), None),
+            InstructionNode::new(
+                Instruction::JumpAndLink(Operand::Label("func".into())),
+                None,
+            ),
+            InstructionNode::new(Instruction::Pop(Operand::ReturnAddress), None),
+            InstructionNode::new(Instruction::Pop(Operand::StackPointer), None),
+        ];
+
+        let (output, changed) = peephole_optimization(input);
+        assert!(!changed);
+        assert_eq!(output.len(), 5);
+    }
+
+    #[test]
+    fn test_sp_and_ra_with_stack_offset_adjustment() {
+        // Pattern: push sp / push ra / sub r1 sp 3 / pop ra / pop sp
+        // Should remove all push/pop AND adjust the stack offset from 3 to 1 (decrement by 2)
+        use rust_decimal::prelude::*;
+
+        let input = vec![
+            InstructionNode::new(Instruction::Push(Operand::StackPointer), None),
+            InstructionNode::new(Instruction::Push(Operand::ReturnAddress), None),
+            InstructionNode::new(
+                Instruction::Sub(
+                    Operand::Register(1),
+                    Operand::StackPointer,
+                    Operand::Number(Decimal::from(3)),
+                ),
+                None,
+            ),
+            InstructionNode::new(Instruction::Pop(Operand::ReturnAddress), None),
+            InstructionNode::new(Instruction::Pop(Operand::StackPointer), None),
+        ];
+
+        let (output, changed) = peephole_optimization(input);
+        assert!(changed);
+        assert_eq!(output.len(), 1);
+
+        if let Instruction::Sub(dst, src, Operand::Number(offset)) = &output[0].instruction {
+            assert!(matches!(dst, Operand::Register(1)));
+            assert!(matches!(src, Operand::StackPointer));
+            assert_eq!(*offset, Decimal::from(1)); // Should be decremented from 3 to 1
+        } else {
+            panic!("Expected Sub instruction with adjusted offset");
+        }
+    }
+}

rust_compiler/libs/optimizer/src/register_forwarding.rs

@@ -0,0 +1,151 @@
+use crate::helpers::{get_destination_reg, reg_is_read, set_destination_reg};
+use il::{Instruction, InstructionNode, Operand};
+use std::collections::HashMap;
+
+/// Pass: Register Forwarding
+/// Eliminates intermediate moves by writing directly to the final destination.
+/// Example: `l r1 d0 Temperature` + `move r9 r1` -> `l r9 d0 Temperature`
+pub fn register_forwarding<'a>(
+    mut input: Vec<InstructionNode<'a>>,
+) -> (Vec<InstructionNode<'a>>, bool) {
+    let mut changed = false;
+    let mut i = 0;
+
+    // Build a map of label positions to detect backward jumps
+    // Use String keys to avoid lifetime issues with references into input
+    let label_positions: HashMap<String, usize> = input
+        .iter()
+        .enumerate()
+        .filter_map(|(idx, node)| {
+            if let Instruction::LabelDef(label) = &node.instruction {
+                Some((label.to_string(), idx))
+            } else {
+                None
+            }
+        })
+        .collect();
+
+    while i < input.len().saturating_sub(1) {
+        let next_idx = i + 1;
+
+        // Check if current instruction defines a register
+        // and the NEXT instruction is a move from that register.
+        let forward_candidate = if let Some(def_reg) = get_destination_reg(&input[i].instruction) {
+            if let Instruction::Move(
+                il::Operand::Register(dest_reg),
+                il::Operand::Register(src_reg),
+            ) = &input[next_idx].instruction
+            {
+                if *src_reg == def_reg {
+                    Some((def_reg, *dest_reg))
+                } else {
+                    None
+                }
+            } else {
+                None
+            }
+        } else {
+            None
+        };
+
+        if let Some((temp_reg, final_reg)) = forward_candidate {
+            // Check liveness: Is temp_reg used after i+1?
+            let mut temp_is_dead = true;
+            for node in input.iter().skip(i + 2) {
+                if reg_is_read(&node.instruction, temp_reg) {
+                    temp_is_dead = false;
+                    break;
+                }
+                // If the temp is redefined, then the old value is dead
+                if let Some(redef) = get_destination_reg(&node.instruction)
+                    && redef == temp_reg
+                {
+                    break;
+                }
+
+                // Function calls (jal) clobber the return register (r15)
+                // So if we're tracking r15 and hit a function call, the old value is dead
+                if matches!(node.instruction, Instruction::JumpAndLink(_)) && temp_reg == 15 {
+                    break;
+                }
+
+                // Labels are just markers - they don't affect register liveness
+                // But backward jumps create loops we need to analyze carefully
+                let jump_target = match &node.instruction {
+                    Instruction::Jump(Operand::Label(target)) => Some(target.as_ref()),
+                    Instruction::BranchEq(_, _, Operand::Label(target))
+                    | Instruction::BranchNe(_, _, Operand::Label(target))
+                    | Instruction::BranchGt(_, _, Operand::Label(target))
+                    | Instruction::BranchLt(_, _, Operand::Label(target))
+                    | Instruction::BranchGe(_, _, Operand::Label(target))
+                    | Instruction::BranchLe(_, _, Operand::Label(target))
+                    | Instruction::BranchEqZero(_, Operand::Label(target))
+                    | Instruction::BranchNeZero(_, Operand::Label(target)) => Some(target.as_ref()),
+                    _ => None,
+                };
+
+                if let Some(target) = jump_target {
+                    // Check if this is a backward jump (target appears before current position)
+                    if let Some(&target_pos) = label_positions.get(target) {
+                        if target_pos < i {
+                            // Backward jump - could loop back, register might be live
+                            temp_is_dead = false;
+                            break;
+                        }
+                        // Forward jump is OK - doesn't affect liveness before it
+                    }
+                }
+            }
+
+            if temp_is_dead {
+                // Safety check: ensure final_reg is not used as an operand in the current instruction.
+                // This prevents generating invalid instructions like `sub r5 r0 r5` (read and write same register).
+                if !reg_is_read(&input[i].instruction, final_reg) {
+                    // Rewrite to use final destination directly
+                    if let Some(new_instr) = set_destination_reg(&input[i].instruction, final_reg) {
+                        input[i].instruction = new_instr;
+                        input.remove(next_idx);
+                        changed = true;
+                        continue;
+                    }
+                }
+            }
+        }
+
+        i += 1;
+    }
+
+    (input, changed)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use il::{Instruction, InstructionNode, Operand};
+
+    #[test]
+    fn test_forward_simple_move() {
+        let input = vec![
+            InstructionNode::new(
+                Instruction::Add(
+                    Operand::Register(1),
+                    Operand::Register(2),
+                    Operand::Register(3),
+                ),
+                None,
+            ),
+            InstructionNode::new(
+                Instruction::Move(Operand::Register(5), Operand::Register(1)),
+                None,
+            ),
+        ];
+
+        let (output, changed) = register_forwarding(input);
+        assert!(changed);
+        assert_eq!(output.len(), 1);
+        assert!(matches!(
+            output[0].instruction,
+            Instruction::Add(Operand::Register(5), _, _)
+        ));
+    }
+}

rust_compiler/libs/optimizer/src/strength_reduction.rs

@@ -0,0 +1,63 @@
+use il::{Instruction, InstructionNode, Operand};
+use rust_decimal::Decimal;
+
+/// Pass: Strength Reduction
+/// Replaces expensive operations with cheaper equivalents.
+/// Example: x * 2 -> add x x x (addition is typically faster than multiplication)
+pub fn strength_reduction<'a>(
+    input: Vec<InstructionNode<'a>>,
+) -> (Vec<InstructionNode<'a>>, bool) {
+    let mut output = Vec::with_capacity(input.len());
+    let mut changed = false;
+
+    for mut node in input {
+        let reduced = match &node.instruction {
+            // x * 2 = x + x
+            Instruction::Mul(dst, a, Operand::Number(n)) if *n == Decimal::from(2) => {
+                Some(Instruction::Add(dst.clone(), a.clone(), a.clone()))
+            }
+            Instruction::Mul(dst, Operand::Number(n), b) if *n == Decimal::from(2) => {
+                Some(Instruction::Add(dst.clone(), b.clone(), b.clone()))
+            }
+
+            // Future: Could add power-of-2 optimizations using bit shifts if IC10 supports them
+            // x * 4 = (x + x) + (x + x) or x << 2
+            // x / 2 = x >> 1
+
+            _ => None,
+        };
+
+        if let Some(new) = reduced {
+            node.instruction = new;
+            changed = true;
+        }
+
+        output.push(node);
+    }
+
+    (output, changed)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_mul_two_to_add() {
+        let input = vec![InstructionNode::new(
+            Instruction::Mul(
+                Operand::Register(1),
+                Operand::Register(2),
+                Operand::Number(Decimal::from(2)),
+            ),
+            None,
+        )];
+
+        let (output, changed) = strength_reduction(input);
+        assert!(changed);
+        assert!(matches!(
+            output[0].instruction,
+            Instruction::Add(Operand::Register(1), Operand::Register(2), Operand::Register(2))
+        ));
+    }
+}