Make the C API higher level

CMakeLists.txt

@@ -585,7 +585,11 @@ endfunction()
 set(NRN_RUN_FROM_BUILD_DIR_ENV "NEURONHOME=${PROJECT_BINARY_DIR}/share/nrn"
                                "NRNHOME=${PROJECT_BINARY_DIR}")
 prepend_to_var(PATH "${PROJECT_BINARY_DIR}/bin")
-prepend_to_var(LD_LIBRARY_PATH "${PROJECT_BINARY_DIR}/lib")
+if(APPLE)
+  prepend_to_var(DYLD_LIBRARY_PATH "${PROJECT_BINARY_DIR}/lib")
+else()
+  prepend_to_var(LD_LIBRARY_PATH "${PROJECT_BINARY_DIR}/lib")
+endif()
 if(NRN_ENABLE_CORENEURON)
   list(APPEND NRN_RUN_FROM_BUILD_DIR_ENV "CORENRNHOME=${PROJECT_BINARY_DIR}")
 endif()

cmake/NeuronFileLists.cmake

@@ -11,6 +11,7 @@ set(STRUCTURED_HEADER_FILES_TO_INSTALL
 set(HEADER_FILES_TO_INSTALL
     nrniv/backtrace_utils.h
     nrniv/bbsavestate.h
+    nrniv/neuronapi.h
     nrnmpi/nrnmpidec.h
     nrnoc/cabvars.h
     nrnoc/md1redef.h
@@ -236,6 +237,7 @@ set(NRNIV_FILE_LIST
     ndatclas.cpp
     netpar.cpp
     nonlinz.cpp
+    neuronapi.cpp
     nrncore_write.cpp
     nrncore_write/callbacks/nrncore_callbacks.cpp
     nrncore_write/data/cell_group.cpp

src/ivoc/ocjump.cpp

@@ -131,6 +131,29 @@ bool OcJump::execute(const char* stmt, Object* ob) {
     }
 }
 
+void OcJump::execute_throw_on_exception(Object* obj, Symbol* sym, int narg) {
+    saved_state before{};
+    try_catch_depth_increment tell_children_we_will_catch{};
+    try {
+        hoc_call_ob_proc(obj, sym, narg);
+    } catch (...) {
+        before.restore();
+        throw;
+    }
+}
+
+void OcJump::execute_throw_on_exception(Symbol* sym, int narg) {
+    // NOTE: return value is left on the stack
+    saved_state before{};
+    try_catch_depth_increment tell_children_we_will_catch{};
+    try {
+        hoc_pushx(hoc_call_func(sym, narg));
+    } catch (...) {
+        before.restore();
+        throw;
+    }
+}
+
 void* OcJump::fpycall(void* (*f)(void*, void*), void* a, void* b) {
     saved_state before{};
     try_catch_depth_increment tell_children_we_will_catch{};

src/ivoc/ocjump.h

@@ -4,7 +4,8 @@ struct Object;
 union Objectdata;
 struct Symlist;
 
-/** @brief How many NEURON try { ... } catch(...) { ... } blocks are in the call stack.
+/** @brief How many NEURON try { ... } catch(...) { ... } blocks are in the call
+ * stack.
  *
  *  Errors inside NEURON are triggered using hoc_execerror, which ultimately
  *  throws an exception. To replicate the old logic, we sometimes need to insert
@@ -40,4 +41,6 @@ struct OcJump {
     static bool execute(Inst* p);
     static bool execute(const char*, Object* ob = NULL);
     static void* fpycall(void* (*) (void*, void*), void*, void*);
+    static void execute_throw_on_exception(Symbol* sym, int narg);
+    static void execute_throw_on_exception(Object* obj, Symbol* sym, int narg);
 };

src/neuron/container/soa_container.hpp

@@ -462,7 +462,7 @@ struct field_data<Tag, FieldImplementation::RuntimeVariable> {
      */
     template <may_cause_reallocation might_reallocate, typename Callable>
     Callable for_each_vector(Callable callable) {
-        for (auto i = 0; i < m_storage.size(); ++i) {
+        for (size_t i = 0; i < m_storage.size(); ++i) {
             callable(m_tag, m_storage[i], i, m_array_dims[i]);
         }
         if constexpr (might_reallocate == may_cause_reallocation::Yes) {
@@ -479,7 +479,7 @@ struct field_data<Tag, FieldImplementation::RuntimeVariable> {
      */
     template <typename Callable>
     Callable for_each_vector(Callable callable) const {
-        for (auto i = 0; i < m_storage.size(); ++i) {
+        for (size_t i = 0; i < m_storage.size(); ++i) {
             callable(m_tag, m_storage[i], i, m_array_dims[i]);
         }
 
@@ -491,11 +491,11 @@ struct field_data<Tag, FieldImplementation::RuntimeVariable> {
     [[nodiscard]] field_index translate_legacy_index(int legacy_index) const {
         int total{};
         auto const num_fields = m_tag.num_variables();
-        for (auto field = 0; field < num_fields; ++field) {
+        for (size_t field = 0; field < num_fields; ++field) {
             auto const array_dim = m_array_dims[field];
             if (legacy_index < total + array_dim) {
                 auto const array_index = legacy_index - total;
-                return {field, array_index};
+                return {static_cast<int>(field), array_index};
             }
             total += array_dim;
         }
@@ -594,8 +594,6 @@ class AccumulateMemoryUsage {
                     std::vector<detail::index_column_tag::type> const& vec,
                     int field_index,
                     int array_dim) {
-        auto element_size = sizeof(detail::index_column_tag::type);
-
         m_usage.stable_identifiers.size = vec.size() * (sizeof(vec[0]) + sizeof(size_t*));
         m_usage.stable_identifiers.capacity = m_usage.stable_identifiers.size +
                                               (vec.capacity() - vec.size()) * sizeof(vec[0]);

src/neuron/model_data.hpp

@@ -35,7 +35,7 @@ struct Model {
      */
     template <typename Callable>
     void apply_to_mechanisms(Callable const& callable) {
-        for (auto type = 0; type < m_mech_data.size(); ++type) {
+        for (size_t type = 0; type < m_mech_data.size(); ++type) {
             if (!m_mech_data[type]) {
                 continue;
             }
@@ -45,7 +45,7 @@ struct Model {
 
     template <typename Callable>
     void apply_to_mechanisms(Callable const& callable) const {
-        for (auto type = 0; type < m_mech_data.size(); ++type) {
+        for (size_t type = 0; type < m_mech_data.size(); ++type) {
             if (!m_mech_data[type]) {
                 continue;
             }

src/nrniv/CMakeLists.txt

@@ -287,6 +287,11 @@ set_property(
   APPEND
   PROPERTY COMPILE_DEFINITIONS OOP=1 HOC=1 INTERVIEWS=1)
 
+set_property(
+  SOURCE neuronapi.cpp
+  APPEND
+  PROPERTY COMPILE_OPTIONS -Wall)
+
 set_property(
   SOURCE ${NRN_IVOC_SRC_FILES}
   APPEND