Fix last function in the wltr file not executing

.github/workflows/rust.yml

@@ -2,27 +2,26 @@ name: Rust
 
 on:
   push:
-    branches: [ "main" ]
+    branches: ["main"]
   pull_request:
-    branches: [ "main" ]
+    branches: ["main"]
 
 env:
   CARGO_TERM_COLOR: always
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+      - uses: actions/checkout@v3
 
-    - name: Install Rust toolchain
-      uses: actions-rs/toolchain@v1
-      with:
-        toolchain: 1.56
+      - name: Install Rust toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: 1.60
 
-    - name: Build
-      run: cargo +1.56 build --verbose
-    - name: Run tests
-      run: cargo + 1.56 test --verbose
+      - name: Build
+        run: cargo +1.60 build --verbose
+      - name: Run tests
+        run: cargo + 1.60 test --verbose

Cargo.toml

@@ -1,14 +1,14 @@
 [package]
 name = "walterlang"
-version = "0.2.0"
+version = "0.2.1"
 authors = ["ElectricS01<[email protected]>"]
 edition = "2021"
-rust-version = "1.56"
+rust-version = "1.60"
 description = "WalterLang, an interpreted typeless language built with Rust"
 repository = "https://github.com/ElectricS01/WalterLang"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-home = "0.5.9"
+home = "0.4.2"
 regex = "1.7.3"

example.wltr

@@ -28,5 +28,13 @@ Um print Print 1 Ok Um print Print 2 Ok
 Um print 6. Ok
 Set MultilineVar to This is a
 multiline variable Ok
-Um print MultilineVar
+Um print MultilineVar Ok
+
+// Test functions
+Um print 7. Ok
+Set TestFunction to
+Um print This is a function Ok
+Ok
+
+TestFunction
 

src/main.rs

@@ -1,6 +1,6 @@
 // main.rs
 // Created 12/2/2024
-// Modified 26/3/2024
+// Modified 9/4/2024
 // Created by ElectricS01
 
 use home::home_dir;
@@ -9,8 +9,7 @@ use std::collections::HashMap;
 use std::env;
 use std::fs;
 use std::fs::OpenOptions;
-use std::io;
-use std::io::Write;
+use std::io::{self, Write};
 use std::path::Path;
 
 fn main() {
@@ -120,12 +119,7 @@ fn execute(debug: bool, contents: String, vars: &mut HashMap<String, String>) {
         for _i in 0..line.len() {
             if line[0].trim().is_empty() {
                 break;
-            } else if "Um" == &*line[0] || "Set" == &*line[0] {
-                if function == "Um" {
-                    um(read_buffer.split(' ').collect(), vars);
-                } else if function == "Set" {
-                    set(read_buffer.split(' ').collect(), vars);
-                }
+            } else if ("Um" == &*line[0] || "Set" == &*line[0]) && function == String::new() {
                 read_buffer = String::new();
                 function = line[0].to_string();
             } else if "Ok" == &*line[0] && function != "" {
@@ -152,6 +146,12 @@ fn execute(debug: bool, contents: String, vars: &mut HashMap<String, String>) {
             read_buffer += "\n"
         }
     }
+
+    if function == "Um" {
+        um(read_buffer.split(' ').collect(), vars);
+    } else if function == "Set" {
+        set(read_buffer.split(' ').collect(), vars);
+    }
 }
 
 fn set(line: Vec<&str>, vars: &mut HashMap<String, String>) {