Started a test setup

[AXE.git] / src / regex.cpp

diff --git a/src/regex.cpp b/src/regex.cpp
index e3b4311..2ec3132 100644 (file)
--- a/src/regex.cpp
+++ b/src/regex.cpp
@@ -5,7 +5,7 @@
 ***********************
 **      FILE NAME      : regex.cpp
 **      SYSTEM NAME    : Andromeda X-Windows Encapsulation
-**      VERSION NUMBER : $Revision: 1.1 $
+**      VERSION NUMBER : $Revision: 1.3 $
 **
 **  DESCRIPTION      :  regex class implementation.
 **
@@ -17,18 +17,25 @@
 ********************************
 **      ORIGINAL AUTHOR : Arjen Baart - arjen@andromeda.nl
 **      CREATION DATE   : Feb 23, 2001
-**      LAST UPDATE     : Feb 23, 2001
+**      LAST UPDATE     : Mar 31, 2010
 **      MODIFICATIONS   : 
 **************************************************************************/
 
 /*****************************
    $Log: regex.cpp,v $
-   Revision 1.1  2002-07-25 08:01:27  arjen
+   Revision 1.3  2007/05/04 13:56:05  arjen
+   Added a copy contructor to the regex class. This prevents multiple frees in the destructor.
+
+   Revision 1.2  2002/09/28 06:45:51  arjen
+   New feature: subtring selection by regular expression.
+   Bugfix: use the std: namespace for STL classes istream and ostream
+
+   Revision 1.1  2002/07/25 08:01:27  arjen
    First checkin, AXE release 0.2
 
 *****************************/
 
-static const char RCSID[] = "$Id: regex.cpp,v 1.1 2002-07-25 08:01:27 arjen Exp $";
+static const char RCSID[] = "$Id: regex.cpp,v 1.3 2007/05/04 13:56:05 arjen Exp $";
 
 #include <stdio.h>
 #include <ctype.h>
@@ -38,12 +45,20 @@ static const char RCSID[] = "$Id: regex.cpp,v 1.1 2002-07-25 08:01:27 arjen Exp
 
 regex::regex(const String &reg)
 {
-   regcomp (&expression, reg.p->s, REG_EXTENDED);
+   original = reg;
+   int error = regcomp (&expression, reg.p->s, REG_EXTENDED);
 }
 
 regex::regex(const char *reg)
 {
-   regcomp (&expression, reg, REG_EXTENDED);
+   original = reg;
+   int error = regcomp (&expression, reg, REG_EXTENDED);
+}
+
+regex::regex(const regex & reg)
+{
+   original = reg.original;
+   int error = regcomp (&expression, reg.original, REG_EXTENDED);
 }
 
 regex::~regex()
@@ -51,6 +66,13 @@ regex::~regex()
    regfree(&expression);
 }
 
+regex& regex::operator=(const regex& x)
+{
+   original = x.original;
+   int error = regcomp (&expression, x.original, REG_EXTENDED);
+
+   return *this;
+}
 
 bool operator == (const String &s, const regex &r)
 {
@@ -60,3 +82,22 @@ bool operator == (const regex &r, const String &s)
 {
    return regexec(&r.expression, s.p->s, 0, 0, 0) == 0;
 }
+
+substring String::operator()(const regex &r)
+{
+   substring sub;
+   regmatch_t  match;
+
+   sub.str = this;
+   sub.start = 0;
+   sub.len   = 0;
+
+   if (regexec(&r.expression, p->s, 1, &match, 0) == 0)
+   {
+      sub.start = match.rm_so;
+      sub.len   = match.rm_eo - match.rm_so;
+   }
+
+   return sub;
+}
+