fix inherited structures

callisto-lang · Dec 8, 2024 · afa5a17 · afa5a17
1 parent 79cf9d5
commit afa5a17
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/source/app.d b/source/app.d
@@ -18,7 +18,7 @@ import callisto.backends.rm86;
 import callisto.backends.arm64;
 import callisto.backends.x86_64;
 
-const static string appVersion = "Beta 0.12.3";
+const static string appVersion = "Beta 0.12.4";
 
 const static string usage = "
 Callisto Compiler

diff --git a/source/compiler.d b/source/compiler.d
@@ -148,6 +148,8 @@ class CompilerBackend {
 			foreach (ref member ; GetType(node.inheritsFrom).structure) {
 				members ~= member.name;
 			}
+
+			offset = GetType(node.inheritsFrom).size;
 		}
 
 		foreach (ref member ; node.members) {
@@ -162,7 +164,7 @@ class CompilerBackend {
 			memberType.ptr      = member.type.ptr;
 
 			auto newMember = StructEntry(
-				memberType, member.name, member.array, member.size, offset
+				memberType, member.name, member.array, memberType.Size(), offset
 			);
 			entries ~= newMember;
 			members ~= member.name;
@@ -177,6 +179,12 @@ class CompilerBackend {
 
 		NewConst(format("%s.sizeOf", node.name), offset);
 		types ~= Type(node.name, offset, true, entries);
+
+		if (node.name == "Vector") {
+			foreach (ref entry ; entries) {
+				writeln(entry);
+			}
+		}
 	}
 
 	void CompileEnum(EnumNode node) {