diff options
Diffstat (limited to '')
-rw-r--r-- | src/regexp.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/regexp.cpp b/src/regexp.cpp index f79be97..4370667 100644 --- a/src/regexp.cpp +++ b/src/regexp.cpp | |||
@@ -1,6 +1,6 @@ | |||
1 | #include "regexp.h" | 1 | #include "regexp.h" |
2 | #include "build.h" // For BuildException | 2 | #include "build.h" // For BuildException |
3 | #include "staticstring.h" | 3 | #include "bu/fstring.h" |
4 | 4 | ||
5 | RegExp::RegExp() : | 5 | RegExp::RegExp() : |
6 | bCompiled( false ), | 6 | bCompiled( false ), |
@@ -39,9 +39,9 @@ void RegExp::compile( const char *sSrc ) | |||
39 | size_t length = regerror( nErr, &re, NULL, 0 ); | 39 | size_t length = regerror( nErr, &re, NULL, 0 ); |
40 | char *buffer = new char[length]; | 40 | char *buffer = new char[length]; |
41 | (void) regerror( nErr, &re, buffer, length ); | 41 | (void) regerror( nErr, &re, buffer, length ); |
42 | StaticString s( buffer ); | 42 | Bu::FString s( buffer ); |
43 | delete[] buffer; | 43 | delete[] buffer; |
44 | throw BuildException( s.getString() ); | 44 | throw BuildException( s.getStr() ); |
45 | } | 45 | } |
46 | bCompiled = true; | 46 | bCompiled = true; |
47 | this->sSrc = sSrc; | 47 | this->sSrc = sSrc; |
@@ -71,7 +71,7 @@ std::pair<int,int> RegExp::getSubStringRange( int nIndex ) | |||
71 | std::string RegExp::getSubString( int nIndex ) | 71 | std::string RegExp::getSubString( int nIndex ) |
72 | { | 72 | { |
73 | return std::string( | 73 | return std::string( |
74 | sTest.getString()+aSubStr[nIndex].rm_so, | 74 | sTest.getStr()+aSubStr[nIndex].rm_so, |
75 | aSubStr[nIndex].rm_eo - aSubStr[nIndex].rm_so | 75 | aSubStr[nIndex].rm_eo - aSubStr[nIndex].rm_so |
76 | ); | 76 | ); |
77 | } | 77 | } |