feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Clang: Simplify regex patterns

Browse Source 
...by removing pointless backslashes.

'/' is not meta character, therefore escaping it with a backslash is not
needed.

Change-Id: Ic0bd1f85b3eed721cad67f4b4d616352ea9e098a
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
This commit is contained in:
Nikolai Kosjar
2019-10-11 09:16:12 +02:00
parent 5165c037eb
commit 85b45920fb
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/cpptools/headerpathfilter.cpp
View File

@@ -123,14 +123,14 @@ QString clangIncludeDirectory(const QString &clangVersion, const QString &clangR
HeaderPaths::iterator resourceIterator(HeaderPaths &headerPaths, bool isMacOs) HeaderPaths::iterator resourceIterator(HeaderPaths &headerPaths, bool isMacOs)
{ {
// include/c++, include/g++, libc++\include and libc++abi\include // include/c++, include/g++, libc++\include and libc++abi\include
static const QString cppIncludes = R"((.*\/include\/.*(g\+\+|c\+\+).*))" static const QString cppIncludes = R"((.*/include/.*(g\+\+|c\+\+).*))"
R"(|(.*libc\+\+\/include))" R"(|(.*libc\+\+/include))"
R"(|(.*libc\+\+abi\/include))"; R"(|(.*libc\+\+abi/include))";
static const QRegularExpression includeRegExp("\\A(" + cppIncludes + ")\\z"); static const QRegularExpression includeRegExp("\\A(" + cppIncludes + ")\\z");
// The same as includeRegExp but also matches /usr/local/include // The same as includeRegExp but also matches /usr/local/include
static const QRegularExpression includeRegExpMac("\\A(" + cppIncludes static const QRegularExpression includeRegExpMac("\\A(" + cppIncludes
+ R"(|(\/usr\/local\/include))" + ")\\z"); + R"(|(/usr/local/include))" + ")\\z");
const QRegularExpression &includePathRegEx = isMacOs ? includeRegExpMac : includeRegExp; const QRegularExpression &includePathRegEx = isMacOs ? includeRegExpMac : includeRegExp;
@@ -148,7 +148,7 @@ bool isClangSystemHeaderPath(const HeaderPath &headerPath)
// For example GCC on macOS uses system clang include path which makes clang code model // For example GCC on macOS uses system clang include path which makes clang code model
// include incorrect system headers. // include incorrect system headers.
static const QRegularExpression clangIncludeDir( static const QRegularExpression clangIncludeDir(
R"(\A.*\/lib\d*\/clang\/\d+\.\d+(\.\d+)?\/include\z)"); R"(\A.*/lib\d*/clang/\d+\.\d+(\.\d+)?/include\z)");
return clangIncludeDir.match(headerPath.path).hasMatch(); return clangIncludeDir.match(headerPath.path).hasMatch();
} }