X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fgdb_regex.h;h=311cb3fd89dc1704f6dcf876dad3261765d2a082;hb=refs%2Fheads%2Fconcurrent-displaced-stepping-2020-04-01;hp=2a3a10a5b186dc7c36dfe849f91cf3499ea8155e;hpb=9b254dd1ce46c19dde1dde5b8d1e22e862dfacce;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/gdb_regex.h b/gdb/gdb_regex.h
index 2a3a10a5b1..311cb3fd89 100644
--- a/gdb/gdb_regex.h
+++ b/gdb/gdb_regex.h
@@ -1,5 +1,5 @@
 /* Portable <regex.h>.
-   Copyright (C) 2000, 2001, 2003, 2007, 2008 Free Software Foundation, Inc.
+   Copyright (C) 2000-2020 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -27,4 +27,37 @@
 # include <regex.h>
 #endif
 
+/* A compiled regex.  This is mainly a wrapper around regex_t.  The
+   the constructor throws on regcomp error and the destructor is
+   responsible for calling regfree.  The former means that it's not
+   possible to create an instance of compiled_regex that isn't
+   compiled, hence the name.  */
+class compiled_regex
+{
+public:
+  /* Compile a regexp and throw an exception on error, including
+     MESSAGE.  REGEX and MESSAGE must not be NULL.  */
+  compiled_regex (const char *regex, int cflags,
+		  const char *message)
+    ATTRIBUTE_NONNULL (2) ATTRIBUTE_NONNULL (4);
+
+  ~compiled_regex ();
+
+  DISABLE_COPY_AND_ASSIGN (compiled_regex);
+
+  /* Wrapper around ::regexec.  */
+  int exec (const char *string,
+	    size_t nmatch, regmatch_t pmatch[],
+	    int eflags) const;
+
+  /* Wrapper around ::re_search.  (Not const because re_search's
+     regex_t parameter isn't either.)  */
+  int search (const char *string, int size, int startpos,
+	      int range, struct re_registers *regs);
+
+private:
+  /* The compiled pattern.  */
+  regex_t m_pattern;
+};
+
 #endif /* not GDB_REGEX_H */