Add ctor_f and dtor_f

neuronsimulator · Nov 25, 2024 · 86ed556 · 86ed556
1 parent d30948a
commit 86ed556
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 33 deletions.
diff --git a/cmake/NeuronFileLists.cmake b/cmake/NeuronFileLists.cmake
@@ -36,7 +36,6 @@ set(HEADER_FILES_TO_INSTALL
     nrnoc/section_fwd.hpp
     nrnoc/treeset.h
     oc/hoc.h
-    oc/hoc_membf.h
     oc/hocassrt.h
     oc/hocdec.h
     oc/hocgetsym.h

diff --git a/src/nrnoc/init.cpp b/src/nrnoc/init.cpp
@@ -1021,8 +1021,8 @@ int point_reg_helper(Symbol* s2) {
 }
 
 extern void class2oc_base(const char*,
-                          void* (*cons)(Object*),
-                          void (*destruct)(void*),
+                          ctor_f* cons,
+                          dtor_f* destruct,
                           Member_func*,
                           Member_ret_obj_func*,
                           Member_ret_str_func*);

diff --git a/src/nrnoc/nrniv_mf.h b/src/nrnoc/nrniv_mf.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "hoc_membf.h"
+#include "classreg.h"
 #include "hocdec.h"
 #include "membfunc.h"
 
@@ -51,8 +51,8 @@ int point_register_mech(const char**,
                         nrn_init_t,
                         int,
                         int,
-                        void* (*) (Object*),
-                        void (*)(void*),
+                        ctor_f*,
+                        dtor_f*,
                         Member_func*);
 extern int nrn_get_mechtype(const char*);
 extern void nrn_writes_conc(int, int);

diff --git a/src/oc/classreg.h b/src/oc/classreg.h
@@ -1,11 +1,27 @@
 #pragma once
 
-#include <hocdec.h>
-#include <hoc_membf.h>
+struct Object;
 
+using ctor_f = void*(Object*);
+using dtor_f = void(void*);
+
+struct Member_func {
+    const char* name;
+    double (*member)(void*);
+};
+
+struct Member_ret_obj_func {
+    const char* name;
+    struct Object** (*member)(void*);
+};
+
+struct Member_ret_str_func {
+    const char* name;
+    const char** (*member)(void*);
+};
 void class2oc(const char*,
-              void* (*cons)(Object*),
-              void (*destruct)(void*),
+              ctor_f* cons,
+              dtor_f* destruct,
               Member_func*,
               Member_ret_obj_func*,
               Member_ret_str_func*);
diff --git a/src/oc/hoc_membf.h b/src/oc/hoc_membf.h
diff --git a/src/oc/hoc_oop.cpp b/src/oc/hoc_oop.cpp
@@ -1581,8 +1581,8 @@ void hoc_endtemplate(Symbol* t) {
 }
 
 void class2oc_base(const char* name,
-                   void* (*cons)(Object*),
-                   void (*destruct)(void*),
+                   ctor_f* cons,
+                   dtor_f* destruct,
                    Member_func* m,
                    Member_ret_obj_func* mobjret,
                    Member_ret_str_func* strret) {
@@ -1629,8 +1629,8 @@ void class2oc_base(const char* name,
 
 
 void class2oc(const char* name,
-              void* (*cons)(Object*),
-              void (*destruct)(void*),
+              ctor_f* cons,
+              dtor_f* destruct,
               Member_func* m,
               Member_ret_obj_func* mobjret,
               Member_ret_str_func* strret) {

diff --git a/test/unit_tests/oc/hoc_interpreter.cpp b/test/unit_tests/oc/hoc_interpreter.cpp
@@ -5,7 +5,7 @@
 #include "classreg.h"
 #include "code.h"
 #include "hocdec.h"
-#include "hoc_membf.h"
+#include "classreg.h"
 #include "ocfunc.h"
 
 #include <sstream>