chore: finish super calls and optimize them

Author: aymaneelmaini

src/chunk.h

@@ -35,6 +35,7 @@ typedef enum
     OP_LOOP,
     OP_CALL,
     OP_INVOKE,
+    OP_SUPER_INVOKE,
     OP_CLOSURE,
     OP_CLOSE_UPVALUE,
     OP_RETURN,

src/compiler.c

@@ -663,8 +663,18 @@ static void super_(bool can_assign)
     u8 name = identifier_constant(&parser.previous);
 
     named_variable(synthetic_token("this"), false);
-    named_variable(synthetic_token("super"), false);
-    emit_bytes(OP_GET_SUPER, name);
+    if (match(TOKEN_LEFT_PAREN))
+    {
+        u8 arg_count = arguments_list();
+        named_variable(synthetic_token("super"), false);
+        emit_bytes(OP_SUPER_INVOKE, name);
+        emit_byte(arg_count);
+    }
+    else
+    {
+        named_variable(synthetic_token("super"), false);
+        emit_bytes(OP_GET_SUPER, name);
+    }
 }
 
 static void this_(bool can_assign)

src/debug.c

@@ -62,6 +62,8 @@ int disassemble_instruction(Chunk* chunk, int offset)
         return constant_instruction("OP_GET_PROPERTY", chunk, offset);
     case OP_SET_PROPERTY:
         return constant_instruction("OP_SET_PROPERTY", chunk, offset);
+    case OP_GET_SUPER:
+        return constant_instruction("OP_GET_SUPER", chunk, offset);
     case OP_EQUAL:
         return simple_instruction("OP_EQUAL", offset);
     case OP_GREATER:
@@ -92,6 +94,8 @@ int disassemble_instruction(Chunk* chunk, int offset)
         return byte_instruction("OP_CALL", chunk, offset);
     case OP_INVOKE:
         return invoke_instruction("OP_INVOKE", chunk, offset);
+    case OP_SUPER_INVOKE:
+        return invoke_instruction("OP_SUPER_INVOKE", chunk, offset);
     case OP_CLOSURE:
     {
         u8 constant = chunk->code[++offset];

src/vm.c

@@ -436,6 +436,14 @@ static InterpretResult run()
             push(value);
             break;
         }
+        case OP_GET_SUPER:
+        {
+            ObjString* name = READ_STRING();
+            ObjClass*  super_class = AS_CLASS(pop());
+            if (!bind_method(super_class, name))
+                return INTERPRET_RUNTIME_ERROR;
+            break;
+        }
         case OP_EQUAL:
         {
             Value v2 = pop();
@@ -533,6 +541,18 @@ static InterpretResult run()
             frame = &vm.frames[vm.frame_count - 1];
             break;
         }
+        case OP_SUPER_INVOKE:
+        {
+            ObjString* method = READ_STRING();
+            int        arg_count = READ_BYTE();
+            ObjClass*  super_class = AS_CLASS(pop());
+
+            if (!invoke_from_class(super_class, method, arg_count))
+                return INTERPRET_RUNTIME_ERROR;
+
+            frame = &vm.frames[vm.frame_count - 1];
+            break;
+        }
         case OP_CLOSURE:
         {
             ObjFunction* function = AS_FUNCTION(READ_CONSTANT());
@@ -577,6 +597,7 @@ static InterpretResult run()
             push(OBJ_VAL(new_class(READ_STRING())));
             break;
         case OP_INHERIT:
+        {
             Value super_class = peek(1);
 
             if (!IS_CLASS(super_class))
@@ -588,6 +609,7 @@ static InterpretResult run()
             table_add_all(&AS_CLASS(super_class)->methods, &sub_class->methods);
             pop();  // sub_class
             break;
+        }
         case OP_METHOD:
             define_method(READ_STRING());
             break;