Commit 76807c13 authored by Marco Bubke's avatar Marco Bubke Committed by Tim Jenssen

Clang: Merge FilePathView and NativeFilePathView

Change-Id: Ib07b16bf60c56027814cc5f0d7be1cacd15e96bb
Reviewed-by: Ivan Donchevskii's avatarIvan Donchevskii <ivan.donchevskii@qt.io>
Reviewed-by: Tim Jenssen's avatarTim Jenssen <tim.jenssen@qt.io>
parent ba57ea9f
......@@ -197,7 +197,6 @@ HEADERS += \
$$PWD/filepathcaching.h \
$$PWD/filepathcachingfwd.h \
$$PWD/baseserverproxy.h \
$$PWD/nativefilepathview.h \
$$PWD/filepath.h \
$$PWD/nativefilepath.h \
$$PWD/filepathview.h
......
......@@ -28,7 +28,7 @@
#include "clangsupport_global.h"
#include "filepathview.h"
#include "nativefilepathview.h"
#include "filepathview.h"
#include <utils/hostosinfo.h>
#include <utils/smallstringio.h>
......
......@@ -28,7 +28,7 @@
#include "filepathexceptions.h"
#include "filepathid.h"
#include "filepath.h"
#include "nativefilepathview.h"
#include "filepathview.h"
#include "stringcache.h"
#include <algorithm>
......
......@@ -25,21 +25,24 @@
#pragma once
#include <utils/hostosinfo.h>
#include <utils/smallstringview.h>
#include <algorithm>
namespace ClangBackEnd {
class FilePathView : protected Utils::SmallStringView
template <char WindowsSlash>
class AbstractFilePathView : protected Utils::SmallStringView
{
public:
explicit FilePathView(const char *const string, const size_type size) noexcept
explicit AbstractFilePathView(const char *const string, const size_type size) noexcept
: Utils::SmallStringView(string, size),
m_slashIndex(lastSlashIndex(*this))
{
}
explicit FilePathView(Utils::SmallStringView filePath)
explicit AbstractFilePathView(Utils::SmallStringView filePath)
: Utils::SmallStringView(filePath),
m_slashIndex(lastSlashIndex(filePath))
{
......@@ -47,14 +50,14 @@ public:
template <typename String,
typename = std::enable_if_t<std::is_lvalue_reference<String>::value>>
explicit FilePathView(String &&filePath)
: FilePathView(filePath.data(), filePath.size())
explicit AbstractFilePathView(String &&filePath)
: AbstractFilePathView(filePath.data(), filePath.size())
{
}
template<size_type Size>
FilePathView(const char(&string)[Size]) noexcept
: FilePathView(string, Size - 1)
AbstractFilePathView(const char(&string)[Size]) noexcept
: AbstractFilePathView(string, Size - 1)
{
static_assert(Size >= 1, "Invalid string literal! Length is zero!");
}
......@@ -83,14 +86,15 @@ public:
static
std::ptrdiff_t lastSlashIndex(Utils::SmallStringView filePath)
{
auto foundReverse = std::find(filePath.rbegin(), filePath.rend(), '/');
constexpr char separator = Utils::HostOsInfo::isWindowsHost() ? WindowsSlash : '/';
auto foundReverse = std::find(filePath.rbegin(), filePath.rend(), separator);
auto found = foundReverse.base();
--found;
return std::distance(filePath.begin(), found);
}
friend bool operator==(const FilePathView &first, const FilePathView &second)
friend bool operator==(const AbstractFilePathView &first, const AbstractFilePathView &second)
{
return first.toStringView() == second.toStringView();
}
......@@ -99,4 +103,6 @@ private:
std::ptrdiff_t m_slashIndex = -1;
};
using FilePathView = AbstractFilePathView<'/'>;
using NativeFilePathView = AbstractFilePathView<'\\'>;
}
......@@ -26,7 +26,7 @@
#pragma once
#include "filepathview.h"
#include "nativefilepathview.h"
#include "filepathview.h"
#include <utils/hostosinfo.h>
#include <utils/smallstringio.h>
......
/****************************************************************************
**
** Copyright (C) 2017 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of Qt Creator.
**
** 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 General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 3 as published by the Free Software
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** 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-3.0.html.
**
****************************************************************************/
#pragma once
#include <utils/hostosinfo.h>
#include <utils/smallstringview.h>
namespace ClangBackEnd {
class NativeFilePathView : protected Utils::SmallStringView
{
public:
explicit NativeFilePathView(const char *const string, const size_type size) noexcept
: Utils::SmallStringView(string, size),
m_slashIndex(lastSlashIndex(*this))
{
}
explicit NativeFilePathView(Utils::SmallStringView filePath)
: Utils::SmallStringView(filePath),
m_slashIndex(lastSlashIndex(filePath))
{
}
template <typename String,
typename = std::enable_if_t<std::is_lvalue_reference<String>::value>>
explicit NativeFilePathView(String &&filePath)
: NativeFilePathView(filePath.data(), filePath.size())
{
}
template<size_type Size>
NativeFilePathView(const char(&string)[Size]) noexcept
: NativeFilePathView(string, Size - 1)
{
static_assert(Size >= 1, "Invalid string literal! Length is zero!");
}
Utils::SmallStringView toStringView() const
{
return *this;
}
std::ptrdiff_t slashIndex() const
{
return m_slashIndex;
}
Utils::SmallStringView directory() const noexcept
{
return mid(0, std::size_t(std::max(std::ptrdiff_t(0), m_slashIndex)));
}
Utils::SmallStringView name() const noexcept
{
return mid(std::size_t(m_slashIndex + 1),
std::size_t(std::ptrdiff_t(size()) - m_slashIndex - std::ptrdiff_t(1)));
}
static
std::ptrdiff_t lastSlashIndex(Utils::SmallStringView filePath)
{
const char separator = Utils::HostOsInfo::isWindowsHost() ? '\\' : '/';
auto foundReverse = std::find(filePath.rbegin(), filePath.rend(), separator);
auto found = foundReverse.base();
--found;
return std::distance(filePath.begin(), found);
}
friend bool operator==(const NativeFilePathView &first, const NativeFilePathView &second)
{
return first.toStringView() == second.toStringView();
}
private:
std::ptrdiff_t m_slashIndex = -1;
};
}
......@@ -25,7 +25,7 @@
#include "googletest.h"
#include <nativefilepathview.h>
#include <filepathview.h>
#include <utils/hostosinfo.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment