Replace hoc_regexp_* by std::regex (#2694)

neuronsimulator · Jan 30, 2024 · a710366 · a710366
1 parent ed0b461
commit a710366
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 476 deletions.
diff --git a/cmake/NeuronFileLists.cmake b/cmake/NeuronFileLists.cmake
@@ -103,7 +103,6 @@ set(OC_FILE_LIST
     ocerf.cpp
     plot.cpp
     plt.cpp
-    regexp.cpp
     scoprand.cpp
     settext.cpp
     symbol.cpp

diff --git a/src/nrnoc/cabcode.cpp b/src/nrnoc/cabcode.cpp
@@ -1,10 +1,12 @@
 #include <../../nrnconf.h>
 /* /local/src/master/nrn/src/nrnoc/cabcode.cpp,v 1.37 1999/07/08 14:24:59 hines Exp */
 
-#define HOC_L_LIST 1
+#include <regex>
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
+
+#define HOC_L_LIST 1
 #include "section.h"
 #include "nrn_ansi.h"
 #include "nrniv_mf.h"
@@ -13,6 +15,36 @@
 #include "hocparse.h"
 #include "membdef.h"
 
+static char* escape_bracket(const char* s) {
+    static char* b;
+    const char* p1;
+    char* p2;
+    if (!b) {
+        b = new char[256];
+    }
+    for (p1 = s, p2 = b; *p1; ++p1, ++p2) {
+        switch (*p1) {
+        case '<':
+            *p2 = '[';
+            break;
+        case '>':
+            *p2 = ']';
+            break;
+        case '[':
+        case ']':
+            *p2 = '\\';
+            *(++p2) = *p1;
+            break;
+        default:
+            *p2 = *p1;
+            break;
+        }
+    }
+    *p2 = '\0';
+    return b;
+}
+
+
 extern int hoc_execerror_messages;
 #define symlist hoc_symlist
 
@@ -1979,8 +2011,8 @@ void forall_section(void) {
         Section* sec = hocSEC(qsec);
         qsec = qsec->next;
         if (buf[0]) {
-            hoc_regexp_compile(buf);
-            if (!hoc_regexp_search(secname(sec))) {
+            std::regex pattern(escape_bracket(buf));
+            if (!std::regex_match(secname(sec), pattern)) {
                 continue;
             }
         }
@@ -2011,17 +2043,17 @@ void hoc_ifsec(void) {
 
     s = hoc_strpop();
     Sprintf(buf, ".*%s.*", *s);
-    hoc_regexp_compile(buf);
-    if (hoc_regexp_search(secname(chk_access()))) {
+    std::regex pattern(escape_bracket(buf));
+    if (std::regex_match(secname(chk_access()), pattern)) {
         hoc_execute(relative(savepc));
     }
     if (!hoc_returning)
         pc = relative(savepc + 1);
 }
 
 void issection(void) { /* returns true if string is the access section */
-    hoc_regexp_compile(gargstr(1));
-    if (hoc_regexp_search(secname(chk_access()))) {
+    std::regex pattern(escape_bracket(gargstr(1)));
+    if (std::regex_match(secname(chk_access()), pattern)) {
         hoc_retpushx(1.);
     } else {
         hoc_retpushx(0.);

diff --git a/src/oc/oc_ansi.h b/src/oc/oc_ansi.h
@@ -358,8 +358,6 @@ int is_vector_arg(int);
 char* vector_get_label(IvocVect*);
 void vector_set_label(IvocVect*, char*);
 
-void hoc_regexp_compile(const char*);
-int hoc_regexp_search(const char*);
 Symbol* hoc_install_var(const char*, double*);
 void hoc_class_registration();
 void hoc_spinit();