From dc2e62bbdb728d5e48a061c1a960f3585cdba8f0 Mon Sep 17 00:00:00 2001
From: William Bell <epicugric@gmail.com>
Date: Mon, 19 Jun 2023 11:59:59 +0100
Subject: [PATCH] fix operations being ignored as syntax error when multiple
 minuses

---
 {modules => argon_modules}/csv/init.ar |  0
 {modules => argon_modules}/this.ar     |  0
 {modules => argon_modules}/welcome.ar  |  0
 src/import.go                          | 14 ++++++++------
 src/operations.go                      |  9 ++++++---
 5 files changed, 14 insertions(+), 9 deletions(-)
 rename {modules => argon_modules}/csv/init.ar (100%)
 rename {modules => argon_modules}/this.ar (100%)
 rename {modules => argon_modules}/welcome.ar (100%)

diff --git a/modules/csv/init.ar b/argon_modules/csv/init.ar
similarity index 100%
rename from modules/csv/init.ar
rename to argon_modules/csv/init.ar
diff --git a/modules/this.ar b/argon_modules/this.ar
similarity index 100%
rename from modules/this.ar
rename to argon_modules/this.ar
diff --git a/modules/welcome.ar b/argon_modules/welcome.ar
similarity index 100%
rename from modules/welcome.ar
rename to argon_modules/welcome.ar
diff --git a/src/import.go b/src/import.go
index e3a34e1..d7d6fd2 100644
--- a/src/import.go
+++ b/src/import.go
@@ -11,6 +11,8 @@ import (
 var imported = make(map[string]ArObject)
 var importing = make(map[string]bool)
 
+var modules_folder = "argon_modules"
+
 func FileExists(filename string) bool {
 	if _, err := os.Stat(filename); err == nil {
 		return true
@@ -73,13 +75,13 @@ func importMod(realpath string, origin string, main bool, global ArObject) (ArOb
 		pathsToTest = []string{
 			filepath.Join(origin, realpath, "init.ar"),
 			filepath.Join(origin, path),
-			filepath.Join(origin, "modules", path),
-			filepath.Join(origin, "modules", realpath, "init.ar"),
+			filepath.Join(origin, modules_folder, path),
+			filepath.Join(origin, modules_folder, realpath, "init.ar"),
 			filepath.Join(ex, path),
-			filepath.Join(ex, "modules", realpath, "init.ar"),
-			filepath.Join(ex, "modules", path),
-			filepath.Join(executable, "modules", realpath, "init.ar"),
-			filepath.Join(executable, "modules", path),
+			filepath.Join(ex, modules_folder, realpath, "init.ar"),
+			filepath.Join(ex, modules_folder, path),
+			filepath.Join(executable, modules_folder, realpath, "init.ar"),
+			filepath.Join(executable, modules_folder, path),
 		}
 	}
 
diff --git a/src/operations.go b/src/operations.go
index 79153f6..f7c19a1 100644
--- a/src/operations.go
+++ b/src/operations.go
@@ -66,9 +66,6 @@ func parseOperations(code UNPARSEcode, index int, codelines []UNPARSEcode) (oper
 				continue
 			}
 			for k := 0; k < len(split)-1; k++ {
-				if len(strings.TrimSpace(split[k])) == 0 || len(strings.TrimSpace(split[k+1])) == 0 {
-					break
-				}
 				val1, worked, err, step1 := translateVal(UNPARSEcode{
 					code:     strings.Join(split[:k+1], operations[i][j]),
 					realcode: code.realcode,
@@ -79,6 +76,9 @@ func parseOperations(code UNPARSEcode, index int, codelines []UNPARSEcode) (oper
 					if k == len(split)-1 {
 						return operationType{}, false, err, 0
 					} else {
+						if len(strings.TrimSpace(split[k])) == 0 || len(strings.TrimSpace(split[k+1])) == 0 {
+							break
+						}
 						continue
 					}
 				}
@@ -93,6 +93,9 @@ func parseOperations(code UNPARSEcode, index int, codelines []UNPARSEcode) (oper
 					if k == len(split)-1 {
 						return operationType{}, false, err, 0
 					} else {
+						if len(strings.TrimSpace(split[k])) == 0 || len(strings.TrimSpace(split[k+1])) == 0 {
+							break
+						}
 						continue
 					}
 				}