Fix errors

neuronsimulator · Jan 30, 2023 · 62ceafe · 62ceafe
1 parent 9009929
commit 62ceafe
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/ivoc/strfun.cpp b/src/ivoc/strfun.cpp
@@ -55,6 +55,7 @@ static double l_head(void*) {
         hoc_assign_str(head, buf.c_str());
     } else {
         hoc_assign_str(head, "");
+        i = -1;
     }
     hoc_return_type_code = 1;  // integer
     return double(i);
@@ -72,6 +73,7 @@ static double l_tail(void*) {
         hoc_assign_str(tail, buf.c_str());
     } else {
         hoc_assign_str(tail, "");
+        i = -1;
     }
     hoc_return_type_code = 1;  // integer
     return double(i);

diff --git a/src/nrncvode/netcvode.cpp b/src/nrncvode/netcvode.cpp
@@ -958,7 +958,7 @@ Object** NetCvode::netconlist() {
             try {
                 spost = std::regex(escape_bracket(s.data()));
             } catch (std::regex_error& e) {
-                hoc_execerror(gargstr(1), "not a valid regular expression");
+                hoc_execerror(gargstr(2), "not a valid regular expression");
             }
         }
     }
@@ -972,7 +972,7 @@ Object** NetCvode::netconlist() {
             try {
                 star = std::regex(escape_bracket(s.data()));
             } catch (std::regex_error& e) {
-                hoc_execerror(gargstr(1), "not a valid regular expression");
+                hoc_execerror(gargstr(3), "not a valid regular expression");
             }
         }
     }
@@ -988,15 +988,15 @@ Object** NetCvode::netconlist() {
                     b = precell == opre;
                 } else {
                     std::string s(hoc_object_name(precell));
-                    b = std::regex_match(s, spre);
+                    b = std::regex_search(s, spre);
                 }
             } else if (ps->osrc_) {
                 Object* presyn = ps->osrc_;
                 if (opre) {
                     b = presyn == opre;
                 } else {
                     std::string s(hoc_object_name(presyn));
-                    b = std::regex_match(s, spre);
+                    b = std::regex_search(s, spre);
                 }
             }
             if (b) {
@@ -1014,14 +1014,14 @@ Object** NetCvode::netconlist() {
                         b = postcell == opost;
                     } else {
                         std::string s(hoc_object_name(postcell));
-                        b = std::regex_match(s, spost);
+                        b = std::regex_search(s, spost);
                     }
                     if (b) {
                         if (otar) {
                             b = target == otar;
                         } else {
                             std::string s(hoc_object_name(target));
-                            b = std::regex_match(s, star);
+                            b = std::regex_search(s, star);
                         }
                         if (b) {
                             o->append(d->obj_);