From 33fd1f0d50f0347149d47aa4fb591d760dd3869c Mon Sep 17 00:00:00 2001
From: Robert-M-Lucas <robert-m-lucas@example.com>
Date: Fri, 26 Jul 2024 00:53:24 +0100
Subject: [PATCH] Markers

---
 .../shelved.patch                             |  82 ++++++++++++++++++
 .idea/workspace.xml                           |  31 ++++---
 build/out.asm                                 |  11 ++-
 build/out.o                                   | Bin 592 -> 624 bytes
 build/out.out                                 | Bin 16480 -> 16480 bytes
 main.why                                      |  25 ++++--
 src/root/compiler/compile_function.rs         |   3 +
 src/root/parser/parse_arguments.rs            |   5 +-
 src/root/parser/parse_blocks.rs               |  16 +++-
 src/root/parser/parse_function.rs             |   1 +
 src/root/parser/parse_function/parse_line.rs  |   6 ++
 .../parser/parse_function/parse_marker.rs     |  40 +++++++++
 .../parse_function/parse_struct_init.rs       |   6 +-
 13 files changed, 197 insertions(+), 29 deletions(-)
 create mode 100644 .idea/shelf/Uncommitted_changes_before_Update_at_25_07_2024,_16_23_[Changes]/shelved.patch
 create mode 100644 src/root/parser/parse_function/parse_marker.rs

diff --git a/.idea/shelf/Uncommitted_changes_before_Update_at_25_07_2024,_16_23_[Changes]/shelved.patch b/.idea/shelf/Uncommitted_changes_before_Update_at_25_07_2024,_16_23_[Changes]/shelved.patch
new file mode 100644
index 0000000..eade7fb
--- /dev/null
+++ b/.idea/shelf/Uncommitted_changes_before_Update_at_25_07_2024,_16_23_[Changes]/shelved.patch
@@ -0,0 +1,82 @@
+Index: .idea/workspace.xml
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
+<+><?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<project version=\"4\">\n  <component name=\"AutoImportSettings\">\n    <option name=\"autoReloadType\" value=\"ALL\" />\n  </component>\n  <component name=\"CargoProjects\">\n    <cargoProject FILE=\"$PROJECT_DIR$/Cargo.toml\" />\n  </component>\n  <component name=\"ChangeListManager\">\n    <list default=\"true\" id=\"6ca282eb-dc8c-4af0-945c-cd77d70c6194\" name=\"Changes\" comment=\"Changes\">\n      <change beforePath=\"$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_18_06_2024_18_11_[Changes]/out.o\" beforeDir=\"false\" />\n      <change beforePath=\"$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_18_06_2024_18_11_[Changes]/shelved.patch\" beforeDir=\"false\" />\n      <change beforePath=\"$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_18_06_2024_18_11__Changes_.xml\" beforeDir=\"false\" />\n      <change beforePath=\"$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_19_06_2024_14_57_[Changes]/shelved.patch\" beforeDir=\"false\" />\n      <change beforePath=\"$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_19_06_2024_14_57__Changes_.xml\" beforeDir=\"false\" />\n      <change beforePath=\"$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_20_06_2024_23_15_[Changes]/shelved.patch\" beforeDir=\"false\" />\n      <change beforePath=\"$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_20_06_2024_23_15__Changes_.xml\" beforeDir=\"false\" />\n      <change beforePath=\"$PROJECT_DIR$/.idea/workspace.xml\" beforeDir=\"false\" afterPath=\"$PROJECT_DIR$/.idea/workspace.xml\" afterDir=\"false\" />\n      <change beforePath=\"$PROJECT_DIR$/build/out.out\" beforeDir=\"false\" afterPath=\"$PROJECT_DIR$/build/out.out\" afterDir=\"false\" />\n    </list>\n    <option name=\"SHOW_DIALOG\" value=\"false\" />\n    <option name=\"HIGHLIGHT_CONFLICTS\" value=\"true\" />\n    <option name=\"HIGHLIGHT_NON_ACTIVE_CHANGELIST\" value=\"false\" />\n    <option name=\"LAST_RESOLUTION\" value=\"IGNORE\" />\n  </component>\n  <component name=\"FileTemplateManagerImpl\">\n    <option name=\"RECENT_TEMPLATES\">\n      <list>\n        <option value=\"Rust File\" />\n      </list>\n    </option>\n  </component>\n  <component name=\"Git.Settings\">\n    <option name=\"RECENT_GIT_ROOT_PATH\" value=\"$PROJECT_DIR$\" />\n  </component>\n  <component name=\"GitHubPullRequestSearchHistory\">{\n  &quot;lastFilter&quot;: {\n    &quot;state&quot;: &quot;OPEN&quot;,\n    &quot;assignee&quot;: &quot;Robert-M-Lucas&quot;\n  }\n}</component>\n  <component name=\"GitToolBoxStore\">\n    <option name=\"projectConfigVersion\" value=\"5\" />\n  </component>\n  <component name=\"GithubPullRequestsUISettings\">{\n  &quot;selectedUrlAndAccountId&quot;: {\n    &quot;url&quot;: &quot;https://github.com/Robert-M-Lucas/whython-8.git&quot;,\n    &quot;accountId&quot;: &quot;dcb8df19-0b39-47e1-9073-4a54f7034be8&quot;\n  }\n}</component>\n  <component name=\"MacroExpansionManager\">\n    <option name=\"directoryName\" value=\"u41t3cql\" />\n  </component>\n  <component name=\"MarkdownSettingsMigration\">\n    <option name=\"stateVersion\" value=\"1\" />\n  </component>\n  <component name=\"ProjectColorInfo\">{\n  &quot;customColor&quot;: &quot;&quot;,\n  &quot;associatedIndex&quot;: 4\n}</component>\n  <component name=\"ProjectId\" id=\"2fc6i4TePml2Qz8qTHaDmtI2SGg\" />\n  <component name=\"ProjectViewState\">\n    <option name=\"hideEmptyMiddlePackages\" value=\"true\" />\n    <option name=\"showLibraryContents\" value=\"true\" />\n  </component>\n  <component name=\"PropertiesComponent\">{\n  &quot;keyToString&quot;: {\n    &quot;Cargo.Run whython-8.executor&quot;: &quot;Run&quot;,\n    &quot;Cargo.Test whython-8.executor&quot;: &quot;Run&quot;,\n    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,\n    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,\n    &quot;RunOnceActivity.rust.reset.selective.auto.import&quot;: &quot;true&quot;,\n    &quot;Shell Script.Test Asm.executor&quot;: &quot;Run&quot;,\n    &quot;git-widget-placeholder&quot;: &quot;master&quot;,\n    &quot;ignore.virus.scanning.warn.message&quot;: &quot;true&quot;,\n    &quot;last_opened_file_path&quot;: &quot;/home/robertlucas/RustroverProjects/trace&quot;,\n    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,\n    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,\n    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,\n    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,\n    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,\n    &quot;org.rust.cargo.project.model.PROJECT_DISCOVERY&quot;: &quot;true&quot;,\n    &quot;org.rust.cargo.project.model.impl.CargoExternalSystemProjectAware.subscribe.first.balloon&quot;: &quot;&quot;,\n    &quot;org.rust.first.attach.projects&quot;: &quot;true&quot;,\n    &quot;settings.editor.selected.configurable&quot;: &quot;preferences.keymap&quot;,\n    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;\n  },\n  &quot;keyToStringList&quot;: {\n    &quot;com.intellij.ide.scratch.ScratchImplUtil$2/New Scratch File&quot;: [\n      &quot;Rust&quot;\n    ]\n  }\n}</component>\n  <component name=\"RecentsManager\">\n    <key name=\"CopyFile.RECENT_KEYS\">\n      <recent name=\"$PROJECT_DIR$/src/root/builtin/types/int\" />\n      <recent name=\"$PROJECT_DIR$/src/root/builtin/types/bool\" />\n      <recent name=\"$PROJECT_DIR$/src/root/builtin/types\" />\n      <recent name=\"$PROJECT_DIR$/src/root/builtin/int\" />\n    </key>\n    <key name=\"MoveFile.RECENT_KEYS\">\n      <recent name=\"$PROJECT_DIR$/src/root/builtin/types/int\" />\n      <recent name=\"$PROJECT_DIR$/src/root/builtin/types\" />\n      <recent name=\"$PROJECT_DIR$/src/root/builtin/int\" />\n      <recent name=\"$PROJECT_DIR$/reference\" />\n    </key>\n  </component>\n  <component name=\"RunManager\" selected=\"Cargo.Run whython-8\">\n    <configuration name=\"Run whython-8\" type=\"CargoCommandRunConfiguration\" factoryName=\"Cargo Command\">\n      <option name=\"command\" value=\"run --package whython-8 --bin whython-8\" />\n      <option name=\"workingDirectory\" value=\"file://$PROJECT_DIR$\" />\n      <envs />\n      <option name=\"emulateTerminal\" value=\"true\" />\n      <option name=\"channel\" value=\"DEFAULT\" />\n      <option name=\"requiredFeatures\" value=\"true\" />\n      <option name=\"allFeatures\" value=\"false\" />\n      <option name=\"withSudo\" value=\"false\" />\n      <option name=\"buildTarget\" value=\"REMOTE\" />\n      <option name=\"backtrace\" value=\"SHORT\" />\n      <option name=\"isRedirectInput\" value=\"false\" />\n      <option name=\"redirectInputPath\" value=\"\" />\n      <method v=\"2\">\n        <option name=\"CARGO.BUILD_TASK_PROVIDER\" enabled=\"true\" />\n      </method>\n    </configuration>\n    <configuration name=\"Test whython-8\" type=\"CargoCommandRunConfiguration\" factoryName=\"Cargo Command\">\n      <option name=\"command\" value=\"test --workspace\" />\n      <option name=\"workingDirectory\" value=\"file://$PROJECT_DIR$\" />\n      <envs />\n      <option name=\"emulateTerminal\" value=\"true\" />\n      <option name=\"channel\" value=\"DEFAULT\" />\n      <option name=\"requiredFeatures\" value=\"true\" />\n      <option name=\"allFeatures\" value=\"false\" />\n      <option name=\"withSudo\" value=\"false\" />\n      <option name=\"buildTarget\" value=\"REMOTE\" />\n      <option name=\"backtrace\" value=\"SHORT\" />\n      <option name=\"isRedirectInput\" value=\"false\" />\n      <option name=\"redirectInputPath\" value=\"\" />\n      <method v=\"2\">\n        <option name=\"CARGO.BUILD_TASK_PROVIDER\" enabled=\"true\" />\n      </method>\n    </configuration>\n    <configuration name=\"Test Asm\" type=\"ShConfigurationType\">\n      <option name=\"SCRIPT_TEXT\" value=\"nasm -f elf64 test/test.asm &amp;&amp; gcc test/test.o -o test/test.out &amp;&amp; test/test.out\" />\n      <option name=\"INDEPENDENT_SCRIPT_PATH\" value=\"true\" />\n      <option name=\"SCRIPT_PATH\" value=\"\" />\n      <option name=\"SCRIPT_OPTIONS\" value=\"\" />\n      <option name=\"INDEPENDENT_SCRIPT_WORKING_DIRECTORY\" value=\"true\" />\n      <option name=\"SCRIPT_WORKING_DIRECTORY\" value=\"$PROJECT_DIR$\" />\n      <option name=\"INDEPENDENT_INTERPRETER_PATH\" value=\"true\" />\n      <option name=\"INTERPRETER_PATH\" value=\"/usr/bin/zsh\" />\n      <option name=\"INTERPRETER_OPTIONS\" value=\"\" />\n      <option name=\"EXECUTE_IN_TERMINAL\" value=\"false\" />\n      <option name=\"EXECUTE_SCRIPT_FILE\" value=\"false\" />\n      <envs />\n      <method v=\"2\" />\n    </configuration>\n    <list>\n      <item itemvalue=\"Cargo.Run whython-8\" />\n      <item itemvalue=\"Cargo.Test whython-8\" />\n      <item itemvalue=\"Shell Script.Test Asm\" />\n    </list>\n  </component>\n  <component name=\"RustProjectSettings\">\n    <option name=\"toolchainHomeDirectory\" value=\"$USER_HOME$/.cargo/bin\" />\n  </component>\n  <component name=\"SpellCheckerSettings\" RuntimeDictionaries=\"0\" Folders=\"0\" CustomDictionaries=\"0\" DefaultDictionary=\"application-level\" UseSingleDictionary=\"true\" transferred=\"true\" />\n  <component name=\"TaskManager\">\n    <task active=\"true\" id=\"Default\" summary=\"Default task\">\n      <changelist id=\"6ca282eb-dc8c-4af0-945c-cd77d70c6194\" name=\"Changes\" comment=\"\" />\n      <created>1714088144106</created>\n      <option name=\"number\" value=\"Default\" />\n      <option name=\"presentableId\" value=\"Default\" />\n      <updated>1714088144106</updated>\n      <workItem from=\"1714088146134\" duration=\"1644000\" />\n      <workItem from=\"1714146213417\" duration=\"17000\" />\n      <workItem from=\"1714715008037\" duration=\"595000\" />\n      <workItem from=\"1717343732407\" duration=\"809000\" />\n      <workItem from=\"1717345545230\" duration=\"11015000\" />\n      <workItem from=\"1717415115440\" duration=\"945000\" />\n      <workItem from=\"1717421826021\" duration=\"5123000\" />\n      <workItem from=\"1717433176938\" duration=\"1267000\" />\n      <workItem from=\"1717440462404\" duration=\"599000\" />\n      <workItem from=\"1717451075678\" duration=\"2900000\" />\n      <workItem from=\"1717458053238\" duration=\"62000\" />\n      <workItem from=\"1717458137866\" duration=\"79000\" />\n      <workItem from=\"1717465660507\" duration=\"7712000\" />\n      <workItem from=\"1717529235686\" duration=\"1411000\" />\n      <workItem from=\"1717561847985\" duration=\"16546000\" />\n      <workItem from=\"1717596741505\" duration=\"3353000\" />\n      <workItem from=\"1717612974234\" duration=\"7780000\" />\n      <workItem from=\"1717700319820\" duration=\"6405000\" />\n      <workItem from=\"1717708148220\" duration=\"3853000\" />\n      <workItem from=\"1717713109026\" duration=\"2727000\" />\n      <workItem from=\"1717718007731\" duration=\"134000\" />\n      <workItem from=\"1717718549578\" duration=\"18000\" />\n      <workItem from=\"1717763561634\" duration=\"6367000\" />\n      <workItem from=\"1717781715695\" duration=\"1569000\" />\n      <workItem from=\"1717788640969\" duration=\"6195000\" />\n      <workItem from=\"1717811944344\" duration=\"129000\" />\n      <workItem from=\"1717812080182\" duration=\"5000\" />\n      <workItem from=\"1717812091297\" duration=\"298000\" />\n      <workItem from=\"1717819026667\" duration=\"340000\" />\n      <workItem from=\"1717823326339\" duration=\"27000\" />\n      <workItem from=\"1717823358306\" duration=\"20000\" />\n      <workItem from=\"1717823384677\" duration=\"3880000\" />\n      <workItem from=\"1717830463295\" duration=\"1441000\" />\n      <workItem from=\"1718550169655\" duration=\"8186000\" />\n      <workItem from=\"1718634915504\" duration=\"4156000\" />\n      <workItem from=\"1718662583156\" duration=\"76000\" />\n      <workItem from=\"1718662664188\" duration=\"1506000\" />\n      <workItem from=\"1718712543316\" duration=\"2954000\" />\n      <workItem from=\"1718795303825\" duration=\"753000\" />\n      <workItem from=\"1718796063772\" duration=\"209000\" />\n      <workItem from=\"1718796277728\" duration=\"3728000\" />\n      <workItem from=\"1718803029458\" duration=\"2272000\" />\n      <workItem from=\"1718841921107\" duration=\"532000\" />\n      <workItem from=\"1718888025480\" duration=\"2180000\" />\n      <workItem from=\"1718895344843\" duration=\"25000\" />\n      <workItem from=\"1718896726550\" duration=\"3145000\" />\n      <workItem from=\"1718964347320\" duration=\"4834000\" />\n      <workItem from=\"1719321580670\" duration=\"3574000\" />\n      <workItem from=\"1719376828623\" duration=\"624000\" />\n      <workItem from=\"1721727285249\" duration=\"13000\" />\n      <workItem from=\"1721815931964\" duration=\"45000\" />\n      <workItem from=\"1721903661101\" duration=\"7000\" />\n    </task>\n    <task id=\"LOCAL-00001\" summary=\"Changes\">\n      <option name=\"closed\" value=\"true\" />\n      <created>1714089790504</created>\n      <option name=\"number\" value=\"00001\" />\n      <option name=\"presentableId\" value=\"LOCAL-00001\" />\n      <option name=\"project\" value=\"LOCAL\" />\n      <updated>1714089790504</updated>\n    </task>\n    <task id=\"LOCAL-00002\" summary=\"Improved name system\">\n      <option name=\"closed\" value=\"true\" />\n      <created>1717349672242</created>\n      <option name=\"number\" value=\"00002\" />\n      <option name=\"presentableId\" value=\"LOCAL-00002\" />\n      <option name=\"project\" value=\"LOCAL\" />\n      <updated>1717349672242</updated>\n    </task>\n    <task id=\"LOCAL-00003\" summary=\"Improved name system\">\n      <option name=\"closed\" value=\"true\" />\n      <created>1717355914137</created>\n      <option name=\"number\" value=\"00003\" />\n      <option name=\"presentableId\" value=\"LOCAL-00003\" />\n      <option name=\"project\" value=\"LOCAL\" />\n      <updated>1717355914137</updated>\n    </task>\n    <task id=\"LOCAL-00004\" summary=\"Improved name system\">\n      <option name=\"closed\" value=\"true\" />\n      <created>1717432257327</created>\n      <option name=\"number\" value=\"00004\" />\n      <option name=\"presentableId\" value=\"LOCAL-00004\" />\n      <option name=\"project\" value=\"LOCAL\" />\n      <updated>1717432257327</updated>\n    </task>\n    <task id=\"LOCAL-00005\" summary=\"Improved name system\">\n      <option name=\"closed\" value=\"true\" />\n      <created>1717432916642</created>\n      <option name=\"number\" value=\"00005\" />\n      <option name=\"presentableId\" value=\"LOCAL-00005\" />\n      <option name=\"project\" value=\"LOCAL\" />\n      <updated>1717432916642</updated>\n    </task>\n    <task id=\"LOCAL-00006\" summary=\"Improved name system\">\n      <option name=\"closed\" value=\"true\" />\n      <created>1717434442792</created>\n      <option name=\"number\" value=\"00006\" />\n      <option name=\"presentableId\" value=\"LOCAL-00006\" />\n      <option name=\"project\" value=\"LOCAL\" />\n      <updated>1717434442792</updated>\n    </task>\n    <task id=\"LOCAL-00007\" summary=\"Began adding error system\">\n      <option name=\"closed\" value=\"true\" />\n      <created>1717469659146</created>\n      <option name=\"number\" value=\"00007\" />\n      <option name=\"presentableId\" value=\"LOCAL-00007\" />\n      <option name=\"project\" value=\"LOCAL\" />\n      <updated>1717469659146</updated>\n    </task>\n    <task id=\"LOCAL-00008\" summary=\"Improved error handling\">\n      <option name=\"closed\" value=\"true\" />\n      <created>1717473113692</created>\n      <option name=\"number\" value=\"00008\" />\n      <option name=\"presentableId\" value=\"LOCAL-00008\" />\n      <option name=\"project\" value=\"LOCAL\" />\n      <updated>1717473113692</updated>\n    </task>\n    <task id=\"LOCAL-00009\" summary=\"Improved error handling\">\n      <option name=\"closed\" value=\"true\" />\n      <created>1717473365560</created>\n      <option name=\"number\" value=\"00009\" />\n      <option name=\"presentableId\" value=\"LOCAL-00009\" />\n      <option name=\"project\" value=\"LOCAL\" />\n      <updated>1717473365560</updated>\n    </task>\n    <task id=\"LOCAL-00010\" summary=\"Improved error handling\">\n      <option name=\"closed\" value=\"true\" />\n      <created>1717562697947</created>\n      <option name=\"number\" value=\"00010\" />\n      <option name=\"presentableId\" value=\"LOCAL-00010\" />\n      <option name=\"project\" value=\"LOCAL\" />\n      <updated>1717562697947</updated>\n    </task>\n    <task id=\"LOCAL-00011\" summary=\"Improved name evaluation\">\n      <option name=\"closed\" value=\"true\" />\n      <created>1717570846946</created>\n      <option name=\"number\" value=\"00011\" />\n      <option name=\"presentableId\" value=\"LOCAL-00011\" />\n      <option name=\"project\" value=\"LOCAL\" />\n      <updated>1717570846946</updated>\n    </task>\n    <task id=\"LOCAL-00012\" summary=\"Improved name evaluation\">\n      <option name=\"closed\" value=\"true\" />\n      <created>1717572031837</created>\n      <option name=\"number\" value=\"00012\" />\n      <option name=\"presentableId\" value=\"LOCAL-00012\" />\n      <option name=\"project\" value=\"LOCAL\" />\n      <updated>1717572031837</updated>\n    </task>\n    <task id=\"LOCAL-00013\" summary=\"Improved name evaluation\">\n      <option name=\"closed\" value=\"true\" />\n      <created>1717578308406</created>\n      <option name=\"number\" value=\"00013\" />\n      <option name=\"presentableId\" value=\"LOCAL-00013\" />\n      <option name=\"project\" value=\"LOCAL\" />\n      <updated>1717578308406</updated>\n    </task>\n    <task id=\"LOCAL-00014\" summary=\"Laid out full evaluable framework\">\n      <option name=\"closed\" value=\"true\" />\n      <created>1717598684770</created>\n      <option name=\"number\" value=\"00014\" />\n      <option name=\"presentableId\" value=\"LOCAL-00014\" />\n      <option name=\"project\" value=\"LOCAL\" />\n      <updated>1717598684770</updated>\n    </task>\n    <task id=\"LOCAL-00015\" summary=\"Began working on evaluation system\">\n      <option name=\"closed\" value=\"true\" />\n      <created>1717599815108</created>\n      <option name=\"number\" value=\"00015\" />\n      <option name=\"presentableId\" value=\"LOCAL-00015\" />\n      <option name=\"project\" value=\"LOCAL\" />\n      <updated>1717599815108</updated>\n    </task>\n    <task id=\"LOCAL-00016\" summary=\"Improved errors\">\n      <option name=\"closed\" value=\"true\" />\n      <created>1717614243407</created>\n      <option name=\"number\" value=\"00016\" />\n      <option name=\"presentableId\" value=\"LOCAL-00016\" />\n      <option name=\"project\" value=\"LOCAL\" />\n      <updated>1717614243407</updated>\n    </task>\n    <task id=\"LOCAL-00017\" summary=\"Continued compiler work\">\n      <option name=\"closed\" value=\"true\" />\n      <created>1717614696137</created>\n      <option name=\"number\" value=\"00017\" />\n      <option name=\"presentableId\" value=\"LOCAL-00017\" />\n      <option name=\"project\" value=\"LOCAL\" />\n      <updated>1717614696137</updated>\n    </task>\n    <task id=\"LOCAL-00018\" summary=\"Started adding support for inline functions\">\n      <option name=\"closed\" value=\"true\" />\n      <created>1717677552390</created>\n      <option name=\"number\" value=\"00018\" />\n      <option name=\"presentableId\" value=\"LOCAL-00018\" />\n      <option name=\"project\" value=\"LOCAL\" />\n      <updated>1717677552390</updated>\n    </task>\n    <task id=\"LOCAL-00019\" summary=\"Added first inline function\">\n      <option name=\"closed\" value=\"true\" />\n      <created>1717684897421</created>\n      <option name=\"number\" value=\"00019\" />\n      <option name=\"presentableId\" value=\"LOCAL-00019\" />\n      <option name=\"project\" value=\"LOCAL\" />\n      <updated>1717684897422</updated>\n    </task>\n    <task id=\"LOCAL-00020\" summary=\"Added ability for first inline function to run\">\n      <option name=\"closed\" value=\"true\" />\n      <created>1717705529640</created>\n      <option name=\"number\" value=\"00020\" />\n      <option name=\"presentableId\" value=\"LOCAL-00020\" />\n      <option name=\"project\" value=\"LOCAL\" />\n      <updated>1717705529640</updated>\n    </task>\n    <task id=\"LOCAL-00021\" summary=\"Improved function call code\">\n      <option name=\"closed\" value=\"true\" />\n      <created>1717769943602</created>\n      <option name=\"number\" value=\"00021\" />\n      <option name=\"presentableId\" value=\"LOCAL-00021\" />\n      <option name=\"project\" value=\"LOCAL\" />\n      <updated>1717769943602</updated>\n    </task>\n    <task id=\"LOCAL-00022\" summary=\"Got functions working (maybe)\">\n      <option name=\"closed\" value=\"true\" />\n      <created>1717794101530</created>\n      <option name=\"number\" value=\"00022\" />\n      <option name=\"presentableId\" value=\"LOCAL-00022\" />\n      <option name=\"project\" value=\"LOCAL\" />\n      <updated>1717794101530</updated>\n    </task>\n    <task id=\"LOCAL-00023\" summary=\"Testing\">\n      <option name=\"closed\" value=\"true\" />\n      <created>1717794233364</created>\n      <option name=\"number\" value=\"00023\" />\n      <option name=\"presentableId\" value=\"LOCAL-00023\" />\n      <option name=\"project\" value=\"LOCAL\" />\n      <updated>1717794233364</updated>\n    </task>\n    <task id=\"LOCAL-00024\" summary=\"Testing\">\n      <option name=\"closed\" value=\"true\" />\n      <created>1717794747334</created>\n      <option name=\"number\" value=\"00024\" />\n      <option name=\"presentableId\" value=\"LOCAL-00024\" />\n      <option name=\"project\" value=\"LOCAL\" />\n      <updated>1717794747334</updated>\n    </task>\n    <task id=\"LOCAL-00025\" summary=\"Todo\">\n      <option name=\"closed\" value=\"true\" />\n      <created>1717819316020</created>\n      <option name=\"number\" value=\"00025\" />\n      <option name=\"presentableId\" value=\"LOCAL-00025\" />\n      <option name=\"project\" value=\"LOCAL\" />\n      <updated>1717819316020</updated>\n    </task>\n    <task id=\"LOCAL-00026\" summary=\"Improved operator support\">\n      <option name=\"closed\" value=\"true\" />\n      <created>1717826853448</created>\n      <option name=\"number\" value=\"00026\" />\n      <option name=\"presentableId\" value=\"LOCAL-00026\" />\n      <option name=\"project\" value=\"LOCAL\" />\n      <updated>1717826853448</updated>\n    </task>\n    <task id=\"LOCAL-00027\" summary=\"Printing and function calls\">\n      <option name=\"closed\" value=\"true\" />\n      <created>1718558711741</created>\n      <option name=\"number\" value=\"00027\" />\n      <option name=\"presentableId\" value=\"LOCAL-00027\" />\n      <option name=\"project\" value=\"LOCAL\" />\n      <updated>1718558711741</updated>\n    </task>\n    <task id=\"LOCAL-00028\" summary=\"Testing\">\n      <option name=\"closed\" value=\"true\" />\n      <created>1718558898901</created>\n      <option name=\"number\" value=\"00028\" />\n      <option name=\"presentableId\" value=\"LOCAL-00028\" />\n      <option name=\"project\" value=\"LOCAL\" />\n      <updated>1718558898901</updated>\n    </task>\n    <task id=\"LOCAL-00029\" summary=\"Added exit functions\">\n      <option name=\"closed\" value=\"true\" />\n      <created>1718636633009</created>\n      <option name=\"number\" value=\"00029\" />\n      <option name=\"presentableId\" value=\"LOCAL-00029\" />\n      <option name=\"project\" value=\"LOCAL\" />\n      <updated>1718636633009</updated>\n    </task>\n    <task id=\"LOCAL-00030\" summary=\"More operators\">\n      <option name=\"closed\" value=\"true\" />\n      <created>1718798005819</created>\n      <option name=\"number\" value=\"00030\" />\n      <option name=\"presentableId\" value=\"LOCAL-00030\" />\n      <option name=\"project\" value=\"LOCAL\" />\n      <updated>1718798005819</updated>\n    </task>\n    <task id=\"LOCAL-00031\" summary=\"Cargo fix\">\n      <option name=\"closed\" value=\"true\" />\n      <created>1718798188305</created>\n      <option name=\"number\" value=\"00031\" />\n      <option name=\"presentableId\" value=\"LOCAL-00031\" />\n      <option name=\"project\" value=\"LOCAL\" />\n      <updated>1718798188305</updated>\n    </task>\n    <task id=\"LOCAL-00032\" summary=\"Cargo clippy\">\n      <option name=\"closed\" value=\"true\" />\n      <created>1718799244388</created>\n      <option name=\"number\" value=\"00032\" />\n      <option name=\"presentableId\" value=\"LOCAL-00032\" />\n      <option name=\"project\" value=\"LOCAL\" />\n      <updated>1718799244388</updated>\n    </task>\n    <task id=\"LOCAL-00033\" summary=\"Boolean improvements\">\n      <option name=\"closed\" value=\"true\" />\n      <created>1718803787262</created>\n      <option name=\"number\" value=\"00033\" />\n      <option name=\"presentableId\" value=\"LOCAL-00033\" />\n      <option name=\"project\" value=\"LOCAL\" />\n      <updated>1718803787262</updated>\n    </task>\n    <task id=\"LOCAL-00034\" summary=\"More boolean operations\">\n      <option name=\"closed\" value=\"true\" />\n      <created>1718805301324</created>\n      <option name=\"number\" value=\"00034\" />\n      <option name=\"presentableId\" value=\"LOCAL-00034\" />\n      <option name=\"project\" value=\"LOCAL\" />\n      <updated>1718805301324</updated>\n    </task>\n    <task id=\"LOCAL-00035\" summary=\"Int comparators\">\n      <option name=\"closed\" value=\"true\" />\n      <created>1718888868217</created>\n      <option name=\"number\" value=\"00035\" />\n      <option name=\"presentableId\" value=\"LOCAL-00035\" />\n      <option name=\"project\" value=\"LOCAL\" />\n      <updated>1718888868217</updated>\n    </task>\n    <task id=\"LOCAL-00036\" summary=\"Boolean comparators\">\n      <option name=\"closed\" value=\"true\" />\n      <created>1718889832262</created>\n      <option name=\"number\" value=\"00036\" />\n      <option name=\"presentableId\" value=\"LOCAL-00036\" />\n      <option name=\"project\" value=\"LOCAL\" />\n      <updated>1718889832262</updated>\n    </task>\n    <task id=\"LOCAL-00037\" summary=\"Simplified code\">\n      <option name=\"closed\" value=\"true\" />\n      <created>1718895358320</created>\n      <option name=\"number\" value=\"00037\" />\n      <option name=\"presentableId\" value=\"LOCAL-00037\" />\n      <option name=\"project\" value=\"LOCAL\" />\n      <updated>1718895358320</updated>\n    </task>\n    <task id=\"LOCAL-00038\" summary=\"Improvements\">\n      <option name=\"closed\" value=\"true\" />\n      <created>1718928037028</created>\n      <option name=\"number\" value=\"00038\" />\n      <option name=\"presentableId\" value=\"LOCAL-00038\" />\n      <option name=\"project\" value=\"LOCAL\" />\n      <updated>1718928037028</updated>\n    </task>\n    <task id=\"LOCAL-00039\" summary=\"Improvements\">\n      <option name=\"closed\" value=\"true\" />\n      <created>1718928163157</created>\n      <option name=\"number\" value=\"00039\" />\n      <option name=\"presentableId\" value=\"LOCAL-00039\" />\n      <option name=\"project\" value=\"LOCAL\" />\n      <updated>1718928163157</updated>\n    </task>\n    <task id=\"LOCAL-00040\" summary=\"Improved function code\">\n      <option name=\"closed\" value=\"true\" />\n      <created>1718963722966</created>\n      <option name=\"number\" value=\"00040\" />\n      <option name=\"presentableId\" value=\"LOCAL-00040\" />\n      <option name=\"project\" value=\"LOCAL\" />\n      <updated>1718963722967</updated>\n    </task>\n    <task id=\"LOCAL-00041\" summary=\"Tests\">\n      <option name=\"closed\" value=\"true\" />\n      <created>1718964303334</created>\n      <option name=\"number\" value=\"00041\" />\n      <option name=\"presentableId\" value=\"LOCAL-00041\" />\n      <option name=\"project\" value=\"LOCAL\" />\n      <updated>1718964303334</updated>\n    </task>\n    <task id=\"LOCAL-00042\" summary=\"Deref and assign\">\n      <option name=\"closed\" value=\"true\" />\n      <created>1718968546046</created>\n      <option name=\"number\" value=\"00042\" />\n      <option name=\"presentableId\" value=\"LOCAL-00042\" />\n      <option name=\"project\" value=\"LOCAL\" />\n      <updated>1718968546046</updated>\n    </task>\n    <task id=\"LOCAL-00043\" summary=\"Comments up to (inlcuding) errors folder\">\n      <option name=\"closed\" value=\"true\" />\n      <created>1719323220161</created>\n      <option name=\"number\" value=\"00043\" />\n      <option name=\"presentableId\" value=\"LOCAL-00043\" />\n      <option name=\"project\" value=\"LOCAL\" />\n      <updated>1719323220162</updated>\n    </task>\n    <task id=\"LOCAL-00044\" summary=\"Fixes\">\n      <option name=\"closed\" value=\"true\" />\n      <created>1719323378191</created>\n      <option name=\"number\" value=\"00044\" />\n      <option name=\"presentableId\" value=\"LOCAL-00044\" />\n      <option name=\"project\" value=\"LOCAL\" />\n      <updated>1719323378191</updated>\n    </task>\n    <task id=\"LOCAL-00045\" summary=\"Full comments\">\n      <option name=\"closed\" value=\"true\" />\n      <created>1719324580280</created>\n      <option name=\"number\" value=\"00045\" />\n      <option name=\"presentableId\" value=\"LOCAL-00045\" />\n      <option name=\"project\" value=\"LOCAL\" />\n      <updated>1719324580280</updated>\n    </task>\n    <task id=\"LOCAL-00046\" summary=\"Made assembly deterministic in debug mode\">\n      <option name=\"closed\" value=\"true\" />\n      <created>1719324945974</created>\n      <option name=\"number\" value=\"00046\" />\n      <option name=\"presentableId\" value=\"LOCAL-00046\" />\n      <option name=\"project\" value=\"LOCAL\" />\n      <updated>1719324945974</updated>\n    </task>\n    <task id=\"LOCAL-00047\" summary=\"Changes\">\n      <option name=\"closed\" value=\"true\" />\n      <created>1719325143424</created>\n      <option name=\"number\" value=\"00047\" />\n      <option name=\"presentableId\" value=\"LOCAL-00047\" />\n      <option name=\"project\" value=\"LOCAL\" />\n      <updated>1719325143424</updated>\n    </task>\n    <option name=\"localTasksCounter\" value=\"48\" />\n    <servers />\n  </component>\n  <component name=\"TypeScriptGeneratedFilesManager\">\n    <option name=\"version\" value=\"3\" />\n  </component>\n  <component name=\"Vcs.Log.Tabs.Properties\">\n    <option name=\"TAB_STATES\">\n      <map>\n        <entry key=\"MAIN\">\n          <value>\n            <State />\n          </value>\n        </entry>\n      </map>\n    </option>\n  </component>\n  <component name=\"VcsManagerConfiguration\">\n    <MESSAGE value=\"Added ability for first inline function to run\" />\n    <MESSAGE value=\"Improved function call code\" />\n    <MESSAGE value=\"Got functions working (maybe)\" />\n    <MESSAGE value=\"Todo\" />\n    <MESSAGE value=\"Improved operator support\" />\n    <MESSAGE value=\"Printing and function calls\" />\n    <MESSAGE value=\"Testing\" />\n    <MESSAGE value=\"Added exit functions\" />\n    <MESSAGE value=\"More operators\" />\n    <MESSAGE value=\"Cargo fix\" />\n    <MESSAGE value=\"Cargo clippy\" />\n    <MESSAGE value=\"Boolean improvements\" />\n    <MESSAGE value=\"More boolean operations\" />\n    <MESSAGE value=\"Int comparators\" />\n    <MESSAGE value=\"Boolean comparators\" />\n    <MESSAGE value=\"Simplified code\" />\n    <MESSAGE value=\"Improvements\" />\n    <MESSAGE value=\"Improved function code\" />\n    <MESSAGE value=\"Tests\" />\n    <MESSAGE value=\"Deref and assign\" />\n    <MESSAGE value=\"Comments up to (inlcuding) errors folder\" />\n    <MESSAGE value=\"Fixes\" />\n    <MESSAGE value=\"Full comments\" />\n    <MESSAGE value=\"Made assembly deterministic in debug mode\" />\n    <MESSAGE value=\"Changes\" />\n    <option name=\"LAST_COMMIT_MESSAGE\" value=\"Changes\" />\n  </component>\n  <component name=\"XSLT-Support.FileAssociations.UIState\">\n    <expand />\n    <select />\n  </component>\n</project>
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/.idea/workspace.xml b/.idea/workspace.xml
+--- a/.idea/workspace.xml	(revision 68a28d719d1170416b82f57ac205cdacf10ff409)
++++ b/.idea/workspace.xml	(date 1721921020000)
+@@ -7,17 +7,7 @@
+     <cargoProject FILE="$PROJECT_DIR$/Cargo.toml" />
+   </component>
+   <component name="ChangeListManager">
+-    <list default="true" id="6ca282eb-dc8c-4af0-945c-cd77d70c6194" name="Changes" comment="Changes">
+-      <change beforePath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_18_06_2024_18_11_[Changes]/out.o" beforeDir="false" />
+-      <change beforePath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_18_06_2024_18_11_[Changes]/shelved.patch" beforeDir="false" />
+-      <change beforePath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_18_06_2024_18_11__Changes_.xml" beforeDir="false" />
+-      <change beforePath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_19_06_2024_14_57_[Changes]/shelved.patch" beforeDir="false" />
+-      <change beforePath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_19_06_2024_14_57__Changes_.xml" beforeDir="false" />
+-      <change beforePath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_20_06_2024_23_15_[Changes]/shelved.patch" beforeDir="false" />
+-      <change beforePath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_20_06_2024_23_15__Changes_.xml" beforeDir="false" />
+-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+-      <change beforePath="$PROJECT_DIR$/build/out.out" beforeDir="false" afterPath="$PROJECT_DIR$/build/out.out" afterDir="false" />
+-    </list>
++    <list default="true" id="6ca282eb-dc8c-4af0-945c-cd77d70c6194" name="Changes" comment="Nice circular reference errors" />
+     <option name="SHOW_DIALOG" value="false" />
+     <option name="HIGHLIGHT_CONFLICTS" value="true" />
+     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+@@ -224,6 +214,7 @@
+       <workItem from="1721727285249" duration="13000" />
+       <workItem from="1721815931964" duration="45000" />
+       <workItem from="1721903661101" duration="7000" />
++      <workItem from="1721909337415" duration="7185000" />
+     </task>
+     <task id="LOCAL-00001" summary="Changes">
+       <option name="closed" value="true" />
+@@ -601,7 +592,23 @@
+       <option name="project" value="LOCAL" />
+       <updated>1719325143424</updated>
+     </task>
+-    <option name="localTasksCounter" value="48" />
++    <task id="LOCAL-00048" summary="Added struct initialisers">
++      <option name="closed" value="true" />
++      <created>1721915067389</created>
++      <option name="number" value="00048" />
++      <option name="presentableId" value="LOCAL-00048" />
++      <option name="project" value="LOCAL" />
++      <updated>1721915067389</updated>
++    </task>
++    <task id="LOCAL-00049" summary="Nice circular reference errors">
++      <option name="closed" value="true" />
++      <created>1721916444578</created>
++      <option name="number" value="00049" />
++      <option name="presentableId" value="LOCAL-00049" />
++      <option name="project" value="LOCAL" />
++      <updated>1721916444578</updated>
++    </task>
++    <option name="localTasksCounter" value="50" />
+     <servers />
+   </component>
+   <component name="TypeScriptGeneratedFilesManager">
+@@ -619,8 +626,6 @@
+     </option>
+   </component>
+   <component name="VcsManagerConfiguration">
+-    <MESSAGE value="Added ability for first inline function to run" />
+-    <MESSAGE value="Improved function call code" />
+     <MESSAGE value="Got functions working (maybe)" />
+     <MESSAGE value="Todo" />
+     <MESSAGE value="Improved operator support" />
+@@ -644,7 +649,9 @@
+     <MESSAGE value="Full comments" />
+     <MESSAGE value="Made assembly deterministic in debug mode" />
+     <MESSAGE value="Changes" />
+-    <option name="LAST_COMMIT_MESSAGE" value="Changes" />
++    <MESSAGE value="Added struct initialisers" />
++    <MESSAGE value="Nice circular reference errors" />
++    <option name="LAST_COMMIT_MESSAGE" value="Nice circular reference errors" />
+   </component>
+   <component name="XSLT-Support.FileAssociations.UIState">
+     <expand />
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 0c1960d..1b712e7 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,16 +7,19 @@
     <cargoProject FILE="$PROJECT_DIR$/Cargo.toml" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="6ca282eb-dc8c-4af0-945c-cd77d70c6194" name="Changes" comment="Improvements">
+    <list default="true" id="6ca282eb-dc8c-4af0-945c-cd77d70c6194" name="Changes" comment="Improved block parsing">
+      <change afterPath="$PROJECT_DIR$/src/root/parser/parse_function/parse_marker.rs" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/build/out.asm" beforeDir="false" afterPath="$PROJECT_DIR$/build/out.asm" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/build/out.o" beforeDir="false" afterPath="$PROJECT_DIR$/build/out.o" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/build/out.out" beforeDir="false" afterPath="$PROJECT_DIR$/build/out.out" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/main.why" beforeDir="false" afterPath="$PROJECT_DIR$/main.why" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/root/parser/parse_arguments.rs" beforeDir="false" afterPath="$PROJECT_DIR$/src/root/parser/parse_arguments.rs" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/root/parser/parse_blocks.rs" beforeDir="false" afterPath="$PROJECT_DIR$/src/root/parser/parse_blocks.rs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/root/parser/parse_comments.rs" beforeDir="false" afterPath="$PROJECT_DIR$/src/root/parser/parse_comments.rs" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/root/parser/parse_function.rs" beforeDir="false" afterPath="$PROJECT_DIR$/src/root/parser/parse_function.rs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/root/parser/parse_function/parse_evaluable.rs" beforeDir="false" afterPath="$PROJECT_DIR$/src/root/parser/parse_function/parse_evaluable.rs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/root/parser/parse_function/parse_if.rs" beforeDir="false" afterPath="$PROJECT_DIR$/src/root/parser/parse_function/parse_if.rs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/root/parser/parse_function/parse_line.rs" beforeDir="false" afterPath="$PROJECT_DIR$/src/root/parser/parse_function/parse_line.rs" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/root/parser/parse_function/parse_struct_init.rs" beforeDir="false" afterPath="$PROJECT_DIR$/src/root/parser/parse_function/parse_struct_init.rs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/root/parser/parse_function/parse_while.rs" beforeDir="false" afterPath="$PROJECT_DIR$/src/root/parser/parse_function/parse_while.rs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/root/parser/parse_impl.rs" beforeDir="false" afterPath="$PROJECT_DIR$/src/root/parser/parse_impl.rs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/root/parser/parse_struct.rs" beforeDir="false" afterPath="$PROJECT_DIR$/src/root/parser/parse_struct.rs" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -226,7 +229,7 @@
       <workItem from="1721815931964" duration="45000" />
       <workItem from="1721903661101" duration="7000" />
       <workItem from="1721931974685" duration="644000" />
-      <workItem from="1721947402861" duration="2271000" />
+      <workItem from="1721947402861" duration="3729000" />
     </task>
     <task id="LOCAL-00001" summary="Changes">
       <option name="closed" value="true" />
@@ -604,7 +607,15 @@
       <option name="project" value="LOCAL" />
       <updated>1719325143424</updated>
     </task>
-    <option name="localTasksCounter" value="48" />
+    <task id="LOCAL-00048" summary="Improved block parsing">
+      <option name="closed" value="true" />
+      <created>1721950132807</created>
+      <option name="number" value="00048" />
+      <option name="presentableId" value="LOCAL-00048" />
+      <option name="project" value="LOCAL" />
+      <updated>1721950132807</updated>
+    </task>
+    <option name="localTasksCounter" value="49" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -622,7 +633,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="Added ability for first inline function to run" />
     <MESSAGE value="Improved function call code" />
     <MESSAGE value="Got functions working (maybe)" />
     <MESSAGE value="Todo" />
@@ -647,7 +657,8 @@
     <MESSAGE value="Full comments" />
     <MESSAGE value="Made assembly deterministic in debug mode" />
     <MESSAGE value="Changes" />
-    <option name="LAST_COMMIT_MESSAGE" value="Changes" />
+    <MESSAGE value="Improved block parsing" />
+    <option name="LAST_COMMIT_MESSAGE" value="Improved block parsing" />
   </component>
   <component name="XSLT-Support.FileAssociations.UIState">
     <expand />
diff --git a/build/out.asm b/build/out.asm
index d0dc577..5816433 100644
--- a/build/out.asm
+++ b/build/out.asm
@@ -5,10 +5,15 @@ section .text
 main:
     push rbp
     mov rbp, rsp
-    mov qword [rbp-8], 3
+    mov qword [rbp-8], 13
+    ; Test Start
+    mov qword [rbp-32], 3
+    mov qword [rbp-24], 5
+    mov qword [rbp-16], 4
+    ; Test End
     mov rax, qword [rbp-8]
-    mov qword [rbp-16], rax
-    mov rax, qword [rbp-16]
+    mov qword [rbp-40], rax
+    mov rax, qword [rbp-40]
     leave
     ret
 
diff --git a/build/out.o b/build/out.o
index f141baa1891fa8a270e77f1c5d1d04d3dc832799..a1996c688a7ce0b26f949d09a601065c9831c838 100644
GIT binary patch
delta 83
zcmcb>@_}W-0!E{W3(Xl1OuT8&_+hdnqdjB5<VZ$+BVGmu29M*e511kJ3swmIfdxc&
YyZ-R#biDzjZ=5^~6aa(CvlzDl0E$K$rT_o{

delta 51
zcmeysa)D*S0!FEc3(Xl9OuT8&cww?6qdlX+<VZ$+A!Y^!29IvnA0C~qAAt0SlZPko
HV%!D*+;9_=

diff --git a/build/out.out b/build/out.out
index 25f56e7fc3c206075265a4bbf6b409b260b8ce70..067af02ee9eb217c248a8068c10a2b54a7a89a11 100755
GIT binary patch
delta 206
zcmaFR!1$nnaRUb<XCNa37zAz>WDI8#5xX+sMEr$EKN${NFj*_g$DV(->+I$l<~h6?
zyg+3h$6X&VL+BT*5c&fPi0*d%;nC@O14!T4tRZ-SZ<9g+AEV3WLcRUWoGyY6KqU+e
zK9d`bq$h_Msc<?$MVvq)sJzJsj8wRNpz?u&4wE-BDQ*@pe!&Pd?WYMlJEPKMMjL&&
LnJ$|xZPZx+;5s*<

delta 187
zcmaFR!1$nnaRUb<rzIl;7+7u=WDI8#S-wU2o}|{+1~HbdF5_#HJ#H?T5WBgCc@D1t
zGf<gFx9bm&PS+1W`om@i!2^7g4=_t@W>U!GW7OGPsJEY)Q%BGNY@EsDMkDFTAx0{k
zT2K)!kO(So@&O|iZWE}yrJ%#)jZBK01&m)X0!{mA!p_dfHJQ;yA8w}3W=k7&767Ow
BFaH1l

diff --git a/main.why b/main.why
index 6fd114f..4cb5186 100644
--- a/main.why
+++ b/main.why
@@ -1,16 +1,27 @@
 struct StructA {
-    a: StructB
+    a: int,
+    b: StructB
 }
 
 struct StructB {
-    a: StructC
-}
-
-struct StructC {
-    a: StructB
+    a: int,
+    b: int
 }
 
 fn main() -> int {
-    let y: int = 3;
+    let y: int = 13;
+
+    @ Test Start
+
+    let x: StructA = StructA {
+        a: 3,
+        b: StructB {
+            a: 5,
+            b: 4
+        }
+    };
+
+    @ Test End
+
     return y;
 }
diff --git a/src/root/compiler/compile_function.rs b/src/root/compiler/compile_function.rs
index d2088d2..1b5b899 100644
--- a/src/root/compiler/compile_function.rs
+++ b/src/root/compiler/compile_function.rs
@@ -191,6 +191,9 @@ fn recursively_compile_lines(fid: FunctionID, lines: &[LineTokens], return_varia
             LineTokens::NoOp(et) => {
                 contents.other(&compile_evaluable_reference(fid, et, local_variables, global_table, global_tracker)?.0);
             }
+            LineTokens::Marker(value) => {
+                contents.line(&format!(";{}", value.value()));
+            }
         }
     }
 
diff --git a/src/root/parser/parse_arguments.rs b/src/root/parser/parse_arguments.rs
index 6d7168b..ad0f82e 100644
--- a/src/root/parser/parse_arguments.rs
+++ b/src/root/parser/parse_arguments.rs
@@ -1,6 +1,7 @@
 use nom::bytes::complete::take_until;
 use nom::InputTake;
 use crate::root::parser::parse::{ErrorTree, ParseResult, Span};
+use crate::root::parser::parse_blocks::take_until_discard_smart;
 use crate::root::parser::parse_function::parse_evaluable::{EvaluableToken, EvaluableTokens, parse_evaluable};
 use crate::root::parser::parse_name::SimpleNameToken;
 
@@ -11,8 +12,8 @@ pub fn parse_arguments<'a, 'b>(s: Span<'a>, containing_class: Option<&'b SimpleN
 
     loop {
         // TODO: Account for brackets
-        let (ns, section) = if let Ok((ns, section)) = take_until::<_, _, ErrorTree>(",")(s) {
-            (ns.take_split(1).0, section)
+        let (ns, section) = if let Ok((ns, section)) = take_until_discard_smart(s, ",") {
+            (ns, section)
         }
         else {
             last = true;
diff --git a/src/root/parser/parse_blocks.rs b/src/root/parser/parse_blocks.rs
index d66e661..aba3422 100644
--- a/src/root/parser/parse_blocks.rs
+++ b/src/root/parser/parse_blocks.rs
@@ -105,11 +105,13 @@ pub fn parse_terminator<'a, 'b, 'c>(s: Span<'a>, terminator: &'b Terminator, all
     Err(nom::Err::Error(ErrorTree::from_char(s, terminator.closing)))
 }
 
-pub fn take_until_or_end_smart<'a>(s: Span<'a>, until: &str) -> ParseResult<'a> {
+pub fn take_until_or_end_discard_smart<'a>(s: Span<'a>, until: &str) -> ParseResult<'a> {
     let original = s.clone();
     let mut s = s;
+    let mut found = false;
     while !s.is_empty() {
         if let Ok((ns, _)) = tag::<&str, LocatedSpan<&str, &Rc<PathBuf>>, ErrorTree>(until)(s) {
+            found = true;
             s = ns;
             break;
         }
@@ -127,11 +129,15 @@ pub fn take_until_or_end_smart<'a>(s: Span<'a>, until: &str) -> ParseResult<'a>
     }
 
     let offset = original.offset(&s);
+    let (end, mut inner) = original.take_split(offset);
+    if found {
+        inner = inner.take(inner.len() - until.len());
+    }
 
-    Ok(original.take_split(offset))
+    Ok((end, inner))
 }
 
-pub fn take_until_smart<'a>(s: Span<'a>, until: &str) -> ParseResult<'a> {
+pub fn take_until_discard_smart<'a>(s: Span<'a>, until: &str) -> ParseResult<'a> {
     let original = s.clone();
     let mut s = s;
     loop {
@@ -157,6 +163,8 @@ pub fn take_until_smart<'a>(s: Span<'a>, until: &str) -> ParseResult<'a> {
     }
 
     let offset = original.offset(&s);
+    let (end, inner) = original.take_split(offset);
+    let inner = inner.take(inner.len() - until.len());
 
-    Ok(original.take_split(offset))
+    Ok((end, inner))
 }
diff --git a/src/root/parser/parse_function.rs b/src/root/parser/parse_function.rs
index 0cb1e6a..ae10eaa 100644
--- a/src/root/parser/parse_function.rs
+++ b/src/root/parser/parse_function.rs
@@ -23,6 +23,7 @@ pub mod parse_operator;
 pub mod parse_return;
 pub mod parse_while;
 mod parse_struct_init;
+mod parse_marker;
 
 #[derive(Debug, Getters, Dissolve)]
 pub struct FunctionToken {
diff --git a/src/root/parser/parse_function/parse_line.rs b/src/root/parser/parse_function/parse_line.rs
index c1d1e41..0caac96 100644
--- a/src/root/parser/parse_function/parse_line.rs
+++ b/src/root/parser/parse_function/parse_line.rs
@@ -9,6 +9,8 @@ use crate::root::parser::parse_function::parse_return::{test_parse_return, Retur
 use crate::root::parser::parse_function::parse_while::{test_parse_while, WhileToken};
 use nom::branch::alt;
 use nom::Parser;
+#[cfg(debug_assertions)]
+use crate::root::parser::parse_function::parse_marker::{MarkerToken, test_parse_marker};
 use crate::root::parser::parse_name::SimpleNameToken;
 use crate::root::parser::parse_util::discard_ignored;
 
@@ -20,6 +22,8 @@ pub enum LineTokens {
     Return(ReturnToken),
     Break(BreakToken),
     NoOp(EvaluableToken),
+    #[cfg(debug_assertions)]
+    Marker(MarkerToken)
 }
 
 /// fn(line span, Option<class name>)
@@ -51,6 +55,8 @@ pub fn parse_line<'a, 'b>(s: Span<'a>, containing_class: Option<&'b SimpleNameTo
         test_parse_initialisation,
         test_parse_while,
         test_parse_if,
+        #[cfg(debug_assertions)]
+        test_parse_marker
         // test_parse_assignment,
     ))
     .parse(s)
diff --git a/src/root/parser/parse_function/parse_marker.rs b/src/root/parser/parse_function/parse_marker.rs
new file mode 100644
index 0000000..dbdb01f
--- /dev/null
+++ b/src/root/parser/parse_function/parse_marker.rs
@@ -0,0 +1,40 @@
+use derive_getters::Getters;
+use nom::bytes::complete::take_till;
+use nom::character::complete::char;
+use nom::sequence::Tuple;
+use nom_supreme::tag::complete::tag;
+use crate::root::parser::parse::{ErrorTree, Location, ParseResult, Span};
+use crate::root::parser::parse_function::parse_evaluable::{EvaluableToken, parse_evaluable};
+use crate::root::parser::parse_function::parse_line::{LineTestFn, LineTokens};
+use crate::root::parser::parse_name::SimpleNameToken;
+use crate::root::parser::parse_util::{discard_ignored, require_ignored};
+
+#[derive(Debug, Getters)]
+pub struct MarkerToken {
+    value: String,
+}
+
+#[cfg(debug_assertions)]
+pub fn test_parse_marker<'a, 'b>(s: Span<'a>) -> ParseResult<Span, LineTestFn<'a, 'b>> {
+    match (char('@'), require_ignored).parse(s) {
+        Ok(_) => Ok((s, |x, _| {
+            parse_marker(x).map(|(s, x)| (s, LineTokens::Marker(x)))
+        })),
+        Err(e) => Err(e),
+    }
+}
+
+#[cfg(debug_assertions)]
+pub fn parse_marker(s: Span) -> ParseResult<Span, MarkerToken> {
+    let (s, _) = char('@')(s)?;
+    let (s, value) = take_till(|c| c == '\n' || c == '\r')(s)?;
+
+    let (s, _) = discard_ignored(s)?;
+
+    Ok((
+        s,
+        MarkerToken {
+            value: value.fragment().to_string()
+        }
+    ))
+}
diff --git a/src/root/parser/parse_function/parse_struct_init.rs b/src/root/parser/parse_function/parse_struct_init.rs
index 56e712a..742486a 100644
--- a/src/root/parser/parse_function/parse_struct_init.rs
+++ b/src/root/parser/parse_function/parse_struct_init.rs
@@ -4,7 +4,7 @@ use nom::bytes::complete::{tag, take_till};
 use nom::bytes::streaming::take_until;
 use nom::character::streaming::char;
 use crate::root::parser::parse::{Location, ParseResult, Span};
-use crate::root::parser::parse_blocks::{BRACE_TERMINATOR, parse_terminator_default_set};
+use crate::root::parser::parse_blocks::{BRACE_TERMINATOR, parse_terminator_default_set, take_until_or_end_discard_smart};
 use crate::root::parser::parse_function::parse_evaluable::{EvaluableToken, EvaluableTokens, FullNameToken, FullNameWithIndirectionToken, parse_evaluable, parse_full_name};
 use crate::root::parser::parse_function::parse_literal::{LiteralToken, LiteralTokens};
 use crate::root::parser::parse_name::{parse_simple_name, SimpleNameToken};
@@ -40,8 +40,8 @@ pub fn parse_struct_init<'a, 'b>(s: Span<'a>, containing_class: Option<&'b Simpl
         let (ns, _) = char(':')(ns)?;
         let (ns, _) = discard_ignored(ns)?;
 
-        let (ns, to_eval) = take_till(|c| c == ',')(ns)?;
-        let ns = if ns.is_empty() { ns } else { char(',')(ns)?.0 };
+        let (ns, to_eval) = take_until_or_end_discard_smart(ns, ",")?;
+        println!("{:?} - {:?}", ns.fragment(), to_eval.fragment());
         let (_, eval) = parse_evaluable(to_eval, containing_class, false)?;
         contents.push((name, eval));
         s = ns;