api-updates (#3411)

* Implemented reusable function to register func/object (e.g., used by both nrnmatlab and FInitializehandler for MATLAB session)

* Function to get pval for NEURON functionality in Matlab (ref, get_prop) -> needed to get and set Neuron properties

* Changed nrn_symbol_table_iterator_next's return value to Symbol* to avoid unnecessary name->symbol lookups

* Fixed: add missing semicolon in header file

* Removed nrn_pp_property_array_set (outdated function, included in nrn_property_array_set)

Author: noahsafar

src/nrniv/neuronapi.cpp

@@ -26,7 +26,7 @@ struct SectionListIterator {
 
 struct SymbolTableIterator {
     explicit SymbolTableIterator(Symlist*);
-    char const* next(void);
+    Symbol* next(void);
     int done(void) const;
 
   private:
@@ -196,6 +196,10 @@ int nrn_symbol_subtype(Symbol const* sym) {
     return sym->subtype;
 }
 
+double* nrn_symbol_dataptr(Symbol* sym) {
+    return sym->u.pval;
+}
+
 void nrn_symbol_push(Symbol* sym) {
     hoc_pushpx(sym->u.pval);
 }
@@ -355,8 +359,8 @@ int SectionListIterator::done(void) const {
 SymbolTableIterator::SymbolTableIterator(Symlist* list)
     : current(list->first) {}
 
-char const* SymbolTableIterator::next(void) {
-    auto result = current->name;
+Symbol* SymbolTableIterator::next(void) {
+    Symbol* result = current;
     current = current->next;
     return result;
 }
@@ -394,7 +398,7 @@ void nrn_symbol_table_iterator_free(SymbolTableIterator* st) {
     delete st;
 }
 
-char const* nrn_symbol_table_iterator_next(SymbolTableIterator* st) {
+Symbol* nrn_symbol_table_iterator_next(SymbolTableIterator* st) {
     return st->next();
 }
 
@@ -464,11 +468,6 @@ void nrn_property_array_set(Object* obj, const char* name, int i, double value)
     }
 }
 
-void nrn_pp_property_array_set(Object* pp, const char* name, int i, double value) {
-    int index = hoc_table_lookup(name, pp->ctemplate->symtable)->u.rng.index;
-    ob2pntproc_0(pp)->prop->param_legacy(index + i) = value;
-}
-
 void nrn_property_push(Object* obj, const char* name) {
     auto sym = hoc_table_lookup(name, obj->ctemplate->symtable);
     if (!obj->ctemplate->is_point_) {
@@ -511,4 +510,13 @@ Symlist* nrn_global_symbol_table(void) {
 Symlist* nrn_top_level_symbol_table(void) {
     return hoc_top_level_symlist;
 }
+
+// Function to register function/object in hoc
+void nrn_register_function(void (*proc)(), const char* func_name) {
+    Symbol* sym;
+    sym = hoc_install(func_name, FUNCTION, 0, &hoc_top_level_symlist);
+    sym->u.u_proc->defn.pf = proc;
+    sym->u.u_proc->nauto = 0;
+    sym->u.u_proc->nobjauto = 0;
+}
 }

src/nrniv/neuronapi.h

@@ -63,6 +63,7 @@ Symbol* nrn_symbol(const char* name);
 void nrn_symbol_push(Symbol* sym);
 int nrn_symbol_type(const Symbol* sym);
 int nrn_symbol_subtype(Symbol const* sym);
+double* nrn_symbol_dataptr(Symbol* sym);
 void nrn_double_push(double val);
 double nrn_double_pop(void);
 void nrn_double_ptr_push(double* addr);
@@ -96,7 +97,7 @@ Section* nrn_sectionlist_iterator_next(SectionListIterator* sl);
 int nrn_sectionlist_iterator_done(SectionListIterator* sl);
 SymbolTableIterator* nrn_symbol_table_iterator_new(Symlist* my_symbol_table);
 void nrn_symbol_table_iterator_free(SymbolTableIterator* st);
-char const* nrn_symbol_table_iterator_next(SymbolTableIterator* st);
+Symbol* nrn_symbol_table_iterator_next(SymbolTableIterator* st);
 int nrn_symbol_table_iterator_done(SymbolTableIterator* st);
 int nrn_vector_capacity(const Object* vec);
 double* nrn_vector_data(Object* vec);
@@ -110,6 +111,7 @@ char const* nrn_symbol_name(const Symbol* sym);
 Symlist* nrn_symbol_table(Symbol* sym);
 Symlist* nrn_global_symbol_table(void);
 Symlist* nrn_top_level_symbol_table(void);
+void nrn_register_function(void (*proc)(), const char* func_name);
 // TODO: need shapeplot information extraction
 
 #ifdef __cplusplus