# HG changeset patch # User Masataka Kohagura # Date 1425311079 -32400 # Node ID ead0a307449e8f6af6de345dd96131e5880cc3f1 # Parent cdb4fd81c31f393d016bbfc488656af2159e08e1 add regex.cc diff -r cdb4fd81c31f -r ead0a307449e regex/Regex.h --- a/regex/Regex.h Mon Mar 02 23:59:24 2015 +0900 +++ b/regex/Regex.h Tue Mar 03 00:44:39 2015 +0900 @@ -11,3 +11,12 @@ char* searchWord; int searchWordLen; } BMData, *BMDataPtr; + +typedef struct regexData { + char* readText; + int readTextLen; + char* searchWord; + int searchWordLen; + char** matchLinesHeads; + char* matchLineNum; +} RegexData, *RegexDataPtr; diff -r cdb4fd81c31f -r ead0a307449e regex/bmsearch.cc --- a/regex/bmsearch.cc Mon Mar 02 23:59:24 2015 +0900 +++ b/regex/bmsearch.cc Tue Mar 03 00:44:39 2015 +0900 @@ -48,4 +48,3 @@ result->matchNum = matchCounter; return result; } - diff -r cdb4fd81c31f -r ead0a307449e regex/main.cc --- a/regex/main.cc Mon Mar 02 23:59:24 2015 +0900 +++ b/regex/main.cc Tue Mar 03 00:44:39 2015 +0900 @@ -13,6 +13,7 @@ const char *usr_help_mode = "Please add -bm or -regex"; extern int *createBMskiptable(BMDataPtr); extern void *BMmethod(BMDataPtr,ResultPtr); +extern void *regex(RegexDataPtr); int main(int argc, char* argv[]) { @@ -82,7 +83,12 @@ free(result); free(bmdata); }else if (regexFlag == true) { - + RegexDataPtr regexD = (RegexDataPtr)malloc(sizeof(RegexData)); + regexD->readText = textfile; + regexD->readTextLen = sb.st_size; + regexD->searchWord = searchWord; + regexD->searchWordLen = strlen((const char*)regexD->searchWord); + regex(regexD); }else{ puts(usr_help_mode); exit(1); diff -r cdb4fd81c31f -r ead0a307449e regex/regex.cc --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/regex/regex.cc Tue Mar 03 00:44:39 2015 +0900 @@ -0,0 +1,18 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "regex.h" + +void* regex(RegexDataPtr regexD) +{ + char* readText = regexD->readText; + int readTextLen = regexD->readTextLen; + char* searchWord = regexD->searchWord; + int searchWordLen = regexD->searchWordLen; +}