diff options
Diffstat (limited to 'src/corelib')
-rw-r--r-- | src/corelib/tools/qregularexpression.cpp | 118 | ||||
-rw-r--r-- | src/corelib/tools/qregularexpression.h | 1 | ||||
-rw-r--r-- | src/corelib/tools/qregularexpression_p.h | 70 | ||||
-rw-r--r-- | src/corelib/tools/tools.pri | 4 |
4 files changed, 192 insertions, 1 deletions
diff --git a/src/corelib/tools/qregularexpression.cpp b/src/corelib/tools/qregularexpression.cpp index 13eff07c04..29ad578013 100644 --- a/src/corelib/tools/qregularexpression.cpp +++ b/src/corelib/tools/qregularexpression.cpp @@ -798,6 +798,83 @@ Q_AUTOTEST_EXPORT unsigned int qt_qregularexpression_optimize_after_use_count = static const unsigned int qt_qregularexpression_optimize_after_use_count = 10; #endif // QT_BUILD_INTERNAL + +namespace QtPrivate { +/*! + internal +*/ +QString wildcardToRegularExpression(const QString &wildcardString) +{ + const int wclen = wildcardString.length(); + QString rx; + int i = 0; + bool hasNegativeBracket = false; + const QChar *wc = wildcardString.unicode(); + + while (i < wclen) { + const QChar c = wc[i++]; + switch (c.unicode()) { + case '*': + rx += QLatin1String(".*"); + break; + case '?': + rx += QLatin1Char('.'); + break; + case '$': + case '(': + case ')': + case '+': + case '.': + case '^': + case '{': + case '|': + case '}': + rx += QLatin1Char('\\'); + rx += c; + break; + case '[': + // Support for the [!abc] or [!a-c] syntax + // Implements a negative look-behind for one char. + if (wc[i] == QLatin1Char(']')) { + rx += c; + rx += wc[i++]; + } else if (wc[i] == QLatin1Char('!')) { + rx += QLatin1String(".(?<"); + rx += wc[i++]; + rx += c; + hasNegativeBracket = true; + } else { + rx += c; + } + + if (i < wclen) { + if (rx[i] == QLatin1Char(']')) + rx += wc[i++]; + while (i < wclen && wc[i] != QLatin1Char(']')) { + if (wc[i] == QLatin1Char('\\')) + rx += QLatin1Char('\\'); + rx += wc[i++]; + } + } + break; + case ']': + rx += c; + // Closes the negative look-behind expression. + if (hasNegativeBracket) { + rx += QLatin1Char(')'); + hasNegativeBracket = false; + } + break; + default: + rx += c; + break; + } + } + + return rx; +} +} + /*! \internal */ @@ -1554,6 +1631,47 @@ void QRegularExpression::setPattern(const QString &pattern) } /*! + \since 5.12 + + Sets the pattern string of the regular expression to \a wildcard pattern. + The pattern options are left unchanged. + + \warning Unlike QRegExp, this implementation follows closely the definition + of wildcard for glob patterns: + \table + \row \li \b{c} + \li Any character represents itself apart from those mentioned + below. Thus \b{c} matches the character \e c. + \row \li \b{?} + \li Matches any single character. It is the same as + \b{.} in full regexps. + \row \li \b{*} + \li Matches zero or more of any characters. It is the + same as \b{.*} in full regexps. + \row \li \b{[abc]} + \li Matches one character given in the bracket. + \row \li \b{[a-c]} + \li Matches one character from the range given in the bracket. + \row \li \b{[!abc]} + \li Matches one character that is not given in the bracket. + \row \li \b{[!a-c]} + \li matches one character that is not from the range given in the + bracket. + \endtable + + \note This function generates a regular expression that will act following + the wildcard pattern given. However the content of the regular expression + will not be the same as the one set. + + \sa pattern(), setPattern() +*/ +void QRegularExpression::setWildcardPattern(const QString &pattern) +{ + setPattern(QtPrivate::wildcardToRegularExpression(pattern)); +} + + +/*! Returns the pattern options for the regular expression. \sa setPatternOptions(), pattern() diff --git a/src/corelib/tools/qregularexpression.h b/src/corelib/tools/qregularexpression.h index 398fc9ec9c..f26f52d427 100644 --- a/src/corelib/tools/qregularexpression.h +++ b/src/corelib/tools/qregularexpression.h @@ -96,6 +96,7 @@ public: QString pattern() const; void setPattern(const QString &pattern); + void setWildcardPattern(const QString &pattern); bool isValid() const; int patternErrorOffset() const; diff --git a/src/corelib/tools/qregularexpression_p.h b/src/corelib/tools/qregularexpression_p.h new file mode 100644 index 0000000000..f5455de853 --- /dev/null +++ b/src/corelib/tools/qregularexpression_p.h @@ -0,0 +1,70 @@ +/**************************************************************************** +** +** Copyright (C) 2018 Samuel Gaist <samuel.gaist@edeltech.ch> +** Copyright (C) 2018 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtCore module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QREGULAREXPRESSION_P_H +#define QREGULAREXPRESSION_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include <private/qglobal_p.h> + +#include <qregularexpression.h> +#include <qstring.h> + +QT_REQUIRE_CONFIG(regularexpression); + +QT_BEGIN_NAMESPACE + +namespace QtPrivate { +QString wildcardToRegularExpression(const QString &expression); +} + +QT_END_NAMESPACE + +#endif diff --git a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri index 88708851d7..30f7edb5f2 100644 --- a/src/corelib/tools/tools.pri +++ b/src/corelib/tools/tools.pri @@ -181,7 +181,9 @@ qtConfig(datetimeparser) { qtConfig(regularexpression) { QMAKE_USE_PRIVATE += pcre2 - HEADERS += tools/qregularexpression.h + HEADERS += \ + tools/qregularexpression.h \ + tools/qregularexpression_p.h SOURCES += tools/qregularexpression.cpp } |