class: Class instantiation callback

flamingo/call.h

@@ -225,6 +225,13 @@ static int call(
 		(*rv)->inst.data = NULL;
 		(*rv)->inst.free_data = NULL;
 
+		// XXX A small quirk to note regarding this: an instance won't be created if it isn't assigned to anything.
+		// That means that the class instantiation callback will never be called either, even if the constructor code itself is.
+
+		if (flamingo->class_inst_cb != NULL && flamingo->class_inst_cb(flamingo, *rv, flamingo->class_inst_cb_data, args) < 0) {
+			return -1;
+		}
+
 		goto done;
 	}
 

flamingo/flamingo.c

@@ -216,11 +216,16 @@ void flamingo_register_external_fn_cb(flamingo_t* flamingo, flamingo_external_fn
 	flamingo->external_fn_cb_data = data;
 }
 
-void flamingo_register_class_decl_cb(flamingo_t* flamingo, flamingo_class_declaration_cb_t cb, void* data) {
+void flamingo_register_class_decl_cb(flamingo_t* flamingo, flamingo_class_decl_cb_t cb, void* data) {
 	flamingo->class_decl_cb = cb;
 	flamingo->class_decl_cb_data = data;
 }
 
+void flamingo_register_class_inst_cb(flamingo_t* flamingo, flamingo_class_inst_cb_t cb, void* data) {
+	flamingo->class_inst_cb = cb;
+	flamingo->class_inst_cb_data = data;
+}
+
 void flamingo_add_import_path(flamingo_t* flamingo, char* path) {
 	char* const duped = strdup(path);
 	assert(duped != NULL);

flamingo/flamingo.h

@@ -15,9 +15,33 @@ typedef struct flamingo_scope_t flamingo_scope_t;
 typedef struct flamingo_env_t flamingo_env_t;
 typedef struct flamingo_arg_list_t flamingo_arg_list_t;
 
-typedef int (*flamingo_external_fn_cb_t)(flamingo_t* flamingo, flamingo_val_t* callable, void* data, flamingo_arg_list_t* args, flamingo_val_t** rv);
-typedef int (*flamingo_class_declaration_cb_t)(flamingo_t* flamingo, flamingo_val_t* class, void* data);
-typedef int (*flamingo_ptm_cb_t)(flamingo_t* flamingo, flamingo_val_t* self, flamingo_arg_list_t* args, flamingo_val_t** rv);
+typedef int (*flamingo_external_fn_cb_t)(
+	flamingo_t* flamingo,
+	flamingo_val_t* callable,
+	void* data,
+	flamingo_arg_list_t* args,
+	flamingo_val_t** rv
+);
+
+typedef int (*flamingo_class_decl_cb_t)(
+	flamingo_t* flamingo,
+	flamingo_val_t* class,
+	void* data
+);
+
+typedef int (*flamingo_class_inst_cb_t)(
+	flamingo_t* flamingo,
+	flamingo_val_t* instance,
+	void* data,
+	flamingo_arg_list_t* args
+);
+
+typedef int (*flamingo_ptm_cb_t)(
+	flamingo_t* flamingo,
+	flamingo_val_t* self,
+	flamingo_arg_list_t* args,
+	flamingo_val_t** rv
+);
 
 typedef enum {
 	FLAMINGO_VAL_KIND_NONE,
@@ -160,9 +184,12 @@ struct flamingo_t {
 	flamingo_external_fn_cb_t external_fn_cb;
 	void* external_fn_cb_data;
 
-	flamingo_class_declaration_cb_t class_decl_cb;
+	flamingo_class_decl_cb_t class_decl_cb;
 	void* class_decl_cb_data;
 
+	flamingo_class_inst_cb_t class_inst_cb;
+	void* class_inst_cb_data;
+
 	// Runtime stuff.
 
 	bool inherited_env;
@@ -204,8 +231,11 @@ int flamingo_create(flamingo_t* flamingo, char const* progname, char* src, size_
 void flamingo_destroy(flamingo_t* flamingo);
 
 char* flamingo_err(flamingo_t* flamingo);
+
 void flamingo_register_external_fn_cb(flamingo_t* flamingo, flamingo_external_fn_cb_t cb, void* data);
-void flamingo_register_class_decl_cb(flamingo_t* flamingo, flamingo_class_declaration_cb_t cb, void* data);
+void flamingo_register_class_decl_cb(flamingo_t* flamingo, flamingo_class_decl_cb_t cb, void* data);
+void flamingo_register_class_inst_cb(flamingo_t* flamingo, flamingo_class_inst_cb_t cb, void* data);
+
 void flamingo_add_import_path(flamingo_t* flamingo, char* path);
 int flamingo_inherit_env(flamingo_t* flamingo, flamingo_env_t* env);
 int flamingo_run(flamingo_t* flamingo);

flamingo/grammar/import.h

@@ -67,6 +67,7 @@ static int import(flamingo_t* flamingo, char* path) {
 
 	flamingo_register_external_fn_cb(imported_flamingo, flamingo->external_fn_cb, flamingo->external_fn_cb_data);
 	flamingo_register_class_decl_cb(imported_flamingo, flamingo->class_decl_cb, flamingo->class_decl_cb_data);
+	flamingo_register_class_inst_cb(imported_flamingo, flamingo->class_inst_cb, flamingo->class_inst_cb_data);
 
 	// Set the scope stack for the imported flamingo instance to be the same as ours.