whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Give better error message when using unsupported lookbehinds in QRegExp 

Merge-request: 1456
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit e0383c9b8bd6f4e3d445d69690f84209cad42bb5)
Change-Id: Ie0383c9b8bd6f4e3d445d69690f84209cad42bb5
bb10
Kjell Rune Skaaraas 2011-11-07 16:18:33 +01:00 committed by Qt by Nokia
parent 6329cb8856
commit 5ec3ddc0ec
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/tools/qregexp.cpp
View File

@ -66,6 +66,7 @@ int qFindString(const QChar *haystack, int haystackLen, int from,
#define RXERR_DISABLED QT_TRANSLATE_NOOP("QRegExp", "disabled feature used")
#define RXERR_CHARCLASS QT_TRANSLATE_NOOP("QRegExp", "bad char class syntax")
#define RXERR_LOOKAHEAD QT_TRANSLATE_NOOP("QRegExp", "bad lookahead syntax")
#define RXERR_LOOKBEHIND QT_TRANSLATE_NOOP("QRegExp", "lookbehinds not supported, see QTBUG-2371")
#define RXERR_REPETITION QT_TRANSLATE_NOOP("QRegExp", "bad repetition syntax")
#define RXERR_OCTAL QT_TRANSLATE_NOOP("QRegExp", "invalid octal value")
#define RXERR_LEFTDELIM QT_TRANSLATE_NOOP("QRegExp", "missing left delim")
@ -3365,6 +3366,9 @@ int QRegExpEngine::getToken()
#endif
case ':':
return Tok_MagicLeftParen;
case '<':
error(RXERR_LOOKBEHIND);
return Tok_MagicLeftParen;
default:
error(RXERR_LOOKAHEAD);
return Tok_MagicLeftParen;