Fix class instance not storing the class value

vladimirdabic · Nov 19, 2023 · e8e9f96 · e8e9f96
1 parent ac609d6
commit e8e9f96
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/Blaze Compiler/Parser/Parser.cs b/Blaze Compiler/Parser/Parser.cs
@@ -126,7 +126,7 @@ private Statement ParseTopDef()
         private Statement.TopClassDef ParseClass(TokenType visibility)
         {
             Token name = Consume(TokenType.IDENTIFIER, "Expected class name after 'class'");
-            string parentName = Match(TokenType.COLON) ? (string)Consume(TokenType.IDENTIFIER, "Expected base class name").Value : null
+            string parentName = Match(TokenType.COLON) ? (string)Consume(TokenType.IDENTIFIER, "Expected base class name").Value : null;
 
             Consume(TokenType.OPEN_BRACE, "Expected class body");
 

diff --git a/Blaze Core/Interpreter/Interpreter.cs b/Blaze Core/Interpreter/Interpreter.cs
@@ -243,7 +243,7 @@ private void Execute()
 
                             List<IValue> args = new List<IValue>();
 
-                            var instance = new ClassInstanceValue();
+                            var instance = new ClassInstanceValue(null);
                             //Stack.Push(instance);
 
                             for (int i = 0; i < oparg; ++i)

diff --git a/Blaze Core/Interpreter/Types/ClassInstanceValue.cs b/Blaze Core/Interpreter/Types/ClassInstanceValue.cs
@@ -12,6 +12,11 @@ public class ClassInstanceValue : IValue, IValueProperties
         public ClassValue Type;
         public ClassEnv Properties;
 
+        public ClassInstanceValue(ClassValue classType)
+        {
+            Type = classType;
+        }
+
         public bool AsBoolean()
         {
             return true;

diff --git a/Blaze Core/Interpreter/Types/ClassValue.cs b/Blaze Core/Interpreter/Types/ClassValue.cs
@@ -43,10 +43,13 @@ public string AsString()
 
         public void New(Interpreter interpreter, IValue instance, List<IValue> args)
         {
-            // do some base class initialization probably
-
+            // do some base class initialization in the future
             var env = new ClassEnv(Closure, instance);
-            ((ClassInstanceValue)instance).Properties = env;
+
+            // Guaranteed to be a class instance value
+            var cls_instance = (ClassInstanceValue)instance;
+            cls_instance.Properties = env;
+            cls_instance.Type = this;
 
             foreach (var member in InstanceMembers)
                 env.Members[member] = new ClassEnv.Variable(Interpreter.NullInstance);