QRegExp: fix \i \I \c \C \p \P escape sequences

Those escape sequences have a special meaning in the XML Schema 1.1
regular expressions, but not in Perl-compatible ones.

An escape sequence that has no special meaning should match the
escaped character itself; this patch fixes QRegExp's behaviour in
that regard (previously, it added a character class matching
nothing).

Change-Id: I983f923baa7c2ec19938b96353f3a205e6c06d58
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

1 files changed, 24 insertions, 0 deletions

diff --git a/tests/auto/corelib/tools/qregexp/tst_qregexp.cpp b/tests/auto/corelib/tools/qregexp/tst_qregexp.cpp
index a697e23270..2995c18dc9 100644
--- a/tests/auto/corelib/tools/qregexp/tst_qregexp.cpp
+++ b/tests/auto/corelib/tools/qregexp/tst_qregexp.cpp
@@ -81,6 +81,7 @@ private slots:
     void interval();
     void validityCheck_data();
     void validityCheck();
+    void escapeSequences();
 };
 
 // Testing get/set functions
@@ -1373,6 +1374,29 @@ void tst_QRegExp::validityCheck()
     QCOMPARE(rx2.cap(), QString(""));
 }
 
+void tst_QRegExp::escapeSequences()
+{
+    QString perlSyntaxSpecialChars("0123456789afnrtvbBdDwWsSx\\|[]{}()^$?+*");
+    QString w3cXmlSchema11SyntaxSpecialChars("cCiIpP"); // as well as the perl ones
+    for (int i = ' '; i <= 127; ++i) {
+        QLatin1Char c(i);
+        if (perlSyntaxSpecialChars.indexOf(c) == -1) {
+            QRegExp rx(QString("\\%1").arg(c), Qt::CaseSensitive, QRegExp::RegExp);
+            // we'll never have c == 'a' since it's a special character
+            QString s = QString("aaa%1aaa").arg(c);
+            QCOMPARE(rx.indexIn(s), 3);
+
+            rx.setPatternSyntax(QRegExp::RegExp2);
+            QCOMPARE(rx.indexIn(s), 3);
+
+            if (w3cXmlSchema11SyntaxSpecialChars.indexOf(c) == -1) {
+                rx.setPatternSyntax(QRegExp::W3CXmlSchema11);
+                QCOMPARE(rx.indexIn(s), 3);
+            }
+        }
+    }
+}
+
 
 QTEST_APPLESS_MAIN(tst_QRegExp)
 #include "tst_qregexp.moc"