Page MenuHomePhabricator (Chris)
Files F126699

No OneTemporary
Actions

Authored By
Unknown
Size
2 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/util/regex.cpp b/util/regex.cpp
index 4fb30fb2..84dabd78 100644
--- a/util/regex.cpp
+++ b/util/regex.cpp
@@ -1,54 +1,78 @@
#include <string>
+#include <string.h>
/* gnu/posix's regex header */
// #include <regex.h>
#include "trex/trex.h"
/* our regex header */
#include "regex.h"
using namespace std;
/* http://www.gnu.org/s/libc/manual/html_node/Regular-Expressions.html */
bool Util::matchRegex(const string & str, const string & pattern){
TRex * regex;
regex = trex_compile(pattern.c_str(), NULL);
if (regex == NULL){
return false;
}
bool matched = trex_match(regex, str.c_str());
trex_free(regex);
return matched;
/*
regex_t regex;
if (regcomp(&regex, pattern.c_str(), REG_EXTENDED) != 0){
return false;
}
bool matched = regexec(&regex, str.c_str(), 0, NULL, 0) == 0;
regfree(&regex);
return matched;
*/
}
string Util::captureRegex(const string & str, const string & pattern, int capture){
+ TRex * regex;
+ regex = trex_compile(pattern.c_str(), NULL);
+ if (regex == NULL){
+ return "";
+ }
+
+ string out = "";
+ bool matched = trex_match(regex, str.c_str());
+ if (matched){
+ TRexMatch match;
+ /* match 0 is the full string matched */
+ if (trex_getsubexp(regex, capture + 1, &match)){
+ /* WARNING: hack.. */
+ static char tmp[2048];
+ memset(tmp, 0, sizeof(tmp));
+ strncpy(tmp, match.begin, match.len < (int) sizeof(tmp) ? match.len : sizeof(tmp));
+ out = tmp;
+ }
+ }
+
+ trex_free(regex);
+ return out;
+
/* FIXME */
/*
regex_t regex;
regmatch_t matches[20];
if (regcomp(&regex, pattern.c_str(), REG_EXTENDED) != 0){
return "";
}
bool matched = regexec(&regex, str.c_str(), 20, matches, 0) == 0;
regfree(&regex);
if (matched){
if (matches[capture+1].rm_so != -1){
int start = matches[capture+1].rm_so;
int end = matches[capture+1].rm_eo;
return str.substr(start, end - start);
}
}
return "";
*/
}

File Metadata

Mime Type
text/x-diff
Expires
Thu, Jun 11, 12:36 PM (3 w, 4 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
69062
Default Alt Text
(2 KB)

Event Timeline