fix the compiler not erroring when you try to push an array/structure value inside a structure

MESYETI · MESYETI · commit eaf409810301 · 2025-04-25T15:30:40.000+01:00
diff --git a/source/backends/arm64.d b/source/backends/arm64.d
@@ -571,6 +571,10 @@ class BackendARM64 : CompilerBackend {
 			string name    = node.name[0 .. node.name.countUntil(".")];
 			auto structVar = GetStructVariable(node, node.name);
 
+			if (structVar.structure) {
+				Error(node.error, "Can't push the value of an array or structure");
+			}
+
 			if (GlobalExists(name)) {
 				auto var = GetGlobal(name);
 				PushGlobalValue(node, var, structVar.size, structVar.offset, true, var.type.ptr);
@@ -1283,6 +1287,10 @@ class BackendARM64 : CompilerBackend {
 			string name    = node.var[0 .. node.var.countUntil(".")];
 			auto structVar = GetStructVariable(node, node.var);
 
+			if (structVar.structure) {
+				Error(node.error, "Can't push the value of an array or structure");
+			}
+
 			if (VariableExists(name)) {
 				auto var = GetVariable(name);
 				SetVariable(node, var, structVar.size, structVar.offset, true, var.type.ptr);
diff --git a/source/backends/lua.d b/source/backends/lua.d
@@ -292,6 +292,10 @@ class BackendLua : CompilerBackend {
 			string name    = node.name[0 .. node.name.countUntil(".")];
 			auto structVar = GetStructVariable(node, node.name);
 
+			if (structVar.structure) {
+				Error(node.error, "Can't push the value of an array or structure");
+			}
+
 			if (GlobalExists(name)) {
 				auto var = GetGlobal(name);
 
@@ -957,6 +961,10 @@ class BackendLua : CompilerBackend {
 			string name    = node.var[0 .. node.var.countUntil(".")];
 			auto structVar = GetStructVariable(node, node.var);
 
+			if (structVar.structure) {
+				Error(node.error, "Can't push the value of an array or structure");
+			}
+
 			if (VariableExists(name)) {
 				auto var = GetVariable(name);
 
diff --git a/source/backends/rm86.d b/source/backends/rm86.d
@@ -386,6 +386,10 @@ class BackendRM86 : CompilerBackend {
 			string name    = node.name[0 .. node.name.countUntil(".")];
 			auto structVar = GetStructVariable(node, node.name);
 
+			if (structVar.structure) {
+				Error(node.error, "Can't push the value of an array or structure");
+			}
+
 			if (GlobalExists(name)) {
 				auto var = GetGlobal(name);
 
@@ -1094,6 +1098,10 @@ class BackendRM86 : CompilerBackend {
 			string name    = node.var[0 .. node.var.countUntil(".")];
 			auto structVar = GetStructVariable(node, node.var);
 
+			if (structVar.structure) {
+				Error(node.error, "Can't push the value of an array or structure");
+			}
+
 			if (VariableExists(name)) {
 				auto var = GetVariable(name);
 
diff --git a/source/backends/uxn.d b/source/backends/uxn.d
@@ -4,6 +4,7 @@ import std.conv;
 import std.stdio;
 import std.range;
 import std.format;
+import std.string;
 import std.algorithm;
 import callisto.util;
 import callisto.error;
@@ -29,6 +30,7 @@ class BackendUXN : CompilerBackend {
 	bool             inWhile;
 	uint             currentLoop;
 	uint             tempLabelNum;
+	string           assembler = "uxnasm";
 
 	this() {
 		output = new Output();
@@ -87,7 +89,7 @@ class BackendUXN : CompilerBackend {
 
 	override string[] FinalCommands() => [
 		format("mv %s %s.tal", compiler.outFile, compiler.outFile),
-		format("uxnasm %s.tal %s", compiler.outFile, compiler.outFile),
+		format("%s %s.tal %s", assembler, compiler.outFile, compiler.outFile),
 		keepAssembly? "" : format("rm %s.tal", compiler.outFile)
 	];
 
@@ -108,7 +110,23 @@ class BackendUXN : CompilerBackend {
 		|c0 @DateTime &year $2 &month $1 &day $1 &hour $1 &minute $1 &second $1 &dotw $1 &doty $2 &isdst $1
 	";
 
-	override bool HandleOption(string opt, ref string[] versions, Preprocessor preproc) => false;
+	override bool HandleOption(string opt, ref string[] versions, Preprocessor preproc) {
+		if (opt.canFind('=')) {
+			string key = opt[0 .. opt.indexOf('=')];
+			string val = opt[opt.indexOf('=') + 1 .. $];
+
+			switch (key) {
+				case "asm": {
+					assembler = val;
+					return true;
+				}
+				default: return false;
+			}
+		}
+		else {
+			return false;
+		}
+	}
 
 	override void NewConst(string name, long value, ErrorInfo error = ErrorInfo.init) {
 		consts[name] = Constant(new IntegerNode(error, value));
@@ -371,6 +389,10 @@ class BackendUXN : CompilerBackend {
 			string name    = node.name[0 .. node.name.countUntil(".")];
 			auto structVar = GetStructVariable(node, node.name);
 
+			if (structVar.structure) {
+				Error(node.error, "Can't push the value of an array or structure");
+			}
+
 			if (GlobalExists(name)) {
 				auto var = GetGlobal(name);
 
@@ -1040,6 +1062,10 @@ class BackendUXN : CompilerBackend {
 			string name    = node.var[0 .. node.var.countUntil(".")];
 			auto structVar = GetStructVariable(node, node.var);
 
+			if (structVar.structure) {
+				Error(node.error, "Can't push the value of an array or structure");
+			}
+
 			if (VariableExists(name)) {
 				auto var = GetVariable(name);
 
diff --git a/source/backends/x86_64.d b/source/backends/x86_64.d
@@ -759,6 +759,10 @@ class BackendX86_64 : CompilerBackend {
 			string name    = node.name[0 .. node.name.countUntil(".")];
 			auto structVar = GetStructVariable(node, node.name);
 
+			if (structVar.structure) {
+				Error(node.error, "Can't push the value of an array or structure");
+			}
+
 			if (GlobalExists(name)) {
 				auto var = GetGlobal(name);
 
@@ -1561,6 +1565,10 @@ class BackendX86_64 : CompilerBackend {
 			string name    = node.var[0 .. node.var.countUntil(".")];
 			auto structVar = GetStructVariable(node, node.var);
 
+			if (structVar.structure) {
+				Error(node.error, "Can't push the value of an array or structure");
+			}
+
 			if (VariableExists(name)) {
 				auto var = GetVariable(name);
 
diff --git a/source/compiler.d b/source/compiler.d
@@ -19,13 +19,16 @@ struct StructEntry {
 	UsedType type;
 	string   name;
 	bool     array;
-	size_t   size;
+	private size_t size;
 	size_t   offset;
+
+	size_t Size() => array? size * type.Size() : type.Size();
 }
 
 struct StructVariable {
 	size_t size;
 	size_t offset; // Relative to root struct, unlike StructEntry
+	bool   structure; // includes defined structs and arrays
 }
 
 struct Type {
@@ -188,7 +191,7 @@ class CompilerBackend {
 			memberType.ptr = member.type.ptr;
 
 			auto newMember = StructEntry(
-				memberType, member.name, member.array, memberType.Size(), offset
+				memberType, member.name, member.array, member.size, offset
 			);
 			entries    ~= newMember;
 			members    ~= member.name;
@@ -197,8 +200,7 @@ class CompilerBackend {
 				copiesOfMe ~= &entries[$ - 1].type;
 			}
 
-			offset += newMember.array?
-				newMember.type.Size() * newMember.size : newMember.type.Size();
+			offset += newMember.Size();
 		}
 
 		foreach (ref member ; entries) {
@@ -398,7 +400,9 @@ class CompilerBackend {
 		offset += structure[index].offset;
 		size_t size = structure[index].type.Size();
 
-		return StructVariable(size, offset);
+		return StructVariable(
+			size, offset, structure[index].array || structure[index].type.isStruct
+		);
 	}
 
 	final size_t GetStackSize() {
