mirror of
https://github.com/wpilibsuite/allwpilib
synced 2026-06-19 00:41:43 +00:00
wpiutil: Replace LLVM Optional with C++17-compatible optional
Imported from https://github.com/akrzemi1/Optional with minor changes: - Compiler conditional simplifications (we only use recent versions) - Move from std::experimental to wpi namespace - Change tests to integrate with Google Test Update LLVM use cases.
This commit is contained in:
Peter Johnson
@@ -31,6 +31,8 @@ sigslot wpiutil/src/main/native/include/wpi/Signal.h
|
||||
wpiutil/src/test/native/cpp/sigslot/
|
||||
tcpsockets wpiutil/src/main/native/cpp/TCP{Stream,Connector,Acceptor}.cpp
|
||||
wpiutil/src/main/native/include/wpi/TCP*.h
|
||||
Optional wpiutil/src/main/native/include/wpi/optional.h
|
||||
wpiutil/src/test/native/cpp/test_optional.cpp
|
||||
|
||||
|
||||
==============================================================================
|
||||
@@ -212,3 +214,33 @@ distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
|
||||
|
||||
==============================================================================
|
||||
Optional License
|
||||
==============================================================================
|
||||
Copyright (C) 2011 - 2017 Andrzej Krzemienski.
|
||||
|
||||
Boost Software License - Version 1.0 - August 17th, 2003
|
||||
|
||||
Permission is hereby granted, free of charge, to any person or organization
|
||||
obtaining a copy of the software and accompanying documentation covered by
|
||||
this license (the "Software") to use, reproduce, display, distribute,
|
||||
execute, and transmit the Software, and to prepare derivative works of the
|
||||
Software, and to permit third-parties to whom the Software is furnished to
|
||||
do so, all subject to the following:
|
||||
|
||||
The copyright notices in the Software and this entire statement, including
|
||||
the above license grant, this restriction and the following disclaimer,
|
||||
must be included in all copies of the Software, in whole or in part, and
|
||||
all derivative works of the Software, unless such copies or derivative
|
||||
works are solely in the form of machine-executable object code generated by
|
||||
a source language processor.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
|
||||
SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
|
||||
FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
|
||||
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||
DEALINGS IN THE SOFTWARE.
|
||||
|
||||
@@ -26,8 +26,6 @@ generatedFileExclude {
|
||||
src/main/native/include/wpi/MapVector\.h$
|
||||
src/main/native/include/wpi/MathExtras\.h$
|
||||
src/main/native/include/wpi/NativeFormatting\.h$
|
||||
src/main/native/include/wpi/None\.h$
|
||||
src/main/native/include/wpi/LLVMOptional\.h$
|
||||
src/main/native/include/wpi/Path\.h$
|
||||
src/main/native/include/wpi/PointerLikeTypeTraits\.h$
|
||||
src/main/native/include/wpi/STLExtras\.h$
|
||||
@@ -53,6 +51,8 @@ generatedFileExclude {
|
||||
src/main/native/include/uv\.h$
|
||||
src/main/native/include/uv/
|
||||
src/main/native/libuv/
|
||||
src/main/native/include/wpi/optional\.h$
|
||||
src/test/native/cpp/test_optional\.cpp$
|
||||
}
|
||||
|
||||
licenseUpdateExclude {
|
||||
|
||||
@@ -132,10 +132,10 @@ void wpi::write_integer(raw_ostream &S, long long N, size_t MinDigits,
|
||||
}
|
||||
|
||||
void wpi::write_hex(raw_ostream &S, uint64_t N, HexPrintStyle Style,
|
||||
Optional<size_t> Width) {
|
||||
optional<size_t> Width) {
|
||||
const size_t kMaxWidth = 128u;
|
||||
|
||||
size_t W = std::min(kMaxWidth, Width.getValueOr(0u));
|
||||
size_t W = std::min(kMaxWidth, Width.value_or(0u));
|
||||
|
||||
unsigned Nibbles = (64 - countLeadingZeros(N) + 3) / 4;
|
||||
bool Prefix = (Style == HexPrintStyle::PrefixLower ||
|
||||
@@ -162,8 +162,8 @@ void wpi::write_hex(raw_ostream &S, uint64_t N, HexPrintStyle Style,
|
||||
}
|
||||
|
||||
void wpi::write_double(raw_ostream &S, double N, FloatStyle Style,
|
||||
Optional<size_t> Precision) {
|
||||
size_t Prec = Precision.getValueOr(getDefaultPrecision(Style));
|
||||
optional<size_t> Precision) {
|
||||
size_t Prec = Precision.value_or(getDefaultPrecision(Style));
|
||||
|
||||
if (std::isnan(N)) {
|
||||
S << "nan";
|
||||
|
||||
@@ -372,7 +372,7 @@ raw_ostream &raw_ostream::operator<<(const FormattedBytes &FB) {
|
||||
const size_t Size = Bytes.size();
|
||||
HexPrintStyle HPS = FB.Upper ? HexPrintStyle::Upper : HexPrintStyle::Lower;
|
||||
uint64_t OffsetWidth = 0;
|
||||
if (FB.FirstByteOffset.hasValue()) {
|
||||
if (FB.FirstByteOffset.has_value()) {
|
||||
// Figure out how many nibbles are needed to print the largest offset
|
||||
// represented by this data set, so that we can align the offset field
|
||||
// to the right width.
|
||||
@@ -392,8 +392,8 @@ raw_ostream &raw_ostream::operator<<(const FormattedBytes &FB) {
|
||||
while (!Bytes.empty()) {
|
||||
indent(FB.IndentLevel);
|
||||
|
||||
if (FB.FirstByteOffset.hasValue()) {
|
||||
uint64_t Offset = FB.FirstByteOffset.getValue();
|
||||
if (FB.FirstByteOffset.has_value()) {
|
||||
uint64_t Offset = FB.FirstByteOffset.value();
|
||||
wpi::write_hex(*this, Offset + LineIndex, HPS, OffsetWidth);
|
||||
*this << ": ";
|
||||
}
|
||||
|
||||
@@ -1,20 +0,0 @@
|
||||
/*----------------------------------------------------------------------------*/
|
||||
/* Copyright (c) 2016-2018 FIRST. All Rights Reserved. */
|
||||
/* Open Source Software - may be modified and shared by FRC teams. The code */
|
||||
/* must be accompanied by the FIRST BSD license file in the root directory of */
|
||||
/* the project. */
|
||||
/*----------------------------------------------------------------------------*/
|
||||
|
||||
#pragma once
|
||||
|
||||
// clang-format off
|
||||
#ifdef _MSC_VER
|
||||
#pragma message "warning: llvm/None.h is deprecated; include wpi/None.h instead"
|
||||
#else
|
||||
#warning "llvm/None.h is deprecated; include wpi/None.h instead"
|
||||
#endif
|
||||
// clang-format on
|
||||
|
||||
#include "wpi/None.h"
|
||||
|
||||
namespace llvm = wpi;
|
||||
@@ -11,7 +11,7 @@
|
||||
#define WPIUTIL_WPI_ARRAYREF_H
|
||||
|
||||
#include "wpi/Hashing.h"
|
||||
#include "wpi/None.h"
|
||||
#include "wpi/optional.h"
|
||||
#include "wpi/SmallVector.h"
|
||||
#include "wpi/STLExtras.h"
|
||||
#include "wpi/Compiler.h"
|
||||
@@ -60,8 +60,8 @@ namespace wpi {
|
||||
/// Construct an empty ArrayRef.
|
||||
/*implicit*/ ArrayRef() = default;
|
||||
|
||||
/// Construct an empty ArrayRef from None.
|
||||
/*implicit*/ ArrayRef(NoneType) {}
|
||||
/// Construct an empty ArrayRef from nullopt.
|
||||
/*implicit*/ ArrayRef(nullopt_t) {}
|
||||
|
||||
/// Construct an ArrayRef from a single element.
|
||||
/*implicit*/ ArrayRef(const T &OneElt)
|
||||
@@ -296,8 +296,8 @@ namespace wpi {
|
||||
/// Construct an empty MutableArrayRef.
|
||||
/*implicit*/ MutableArrayRef() = default;
|
||||
|
||||
/// Construct an empty MutableArrayRef from None.
|
||||
/*implicit*/ MutableArrayRef(NoneType) : ArrayRef<T>() {}
|
||||
/// Construct an empty MutableArrayRef from nullopt.
|
||||
/*implicit*/ MutableArrayRef(nullopt_t) : ArrayRef<T>() {}
|
||||
|
||||
/// Construct an MutableArrayRef from a single element.
|
||||
/*implicit*/ MutableArrayRef(T &OneElt) : ArrayRef<T>(OneElt) {}
|
||||
|
||||
@@ -222,8 +222,8 @@ inline FormattedNumber format_decimal(int64_t N, unsigned Width) {
|
||||
class FormattedBytes {
|
||||
ArrayRef<uint8_t> Bytes;
|
||||
|
||||
// If not None, display offsets for each line relative to starting value.
|
||||
Optional<uint64_t> FirstByteOffset;
|
||||
// If not nullopt, display offsets for each line relative to starting value.
|
||||
optional<uint64_t> FirstByteOffset;
|
||||
uint32_t IndentLevel; // Number of characters to indent each line.
|
||||
uint32_t NumPerLine; // Number of bytes to show per line.
|
||||
uint8_t ByteGroupSize; // How many hex bytes are grouped without spaces
|
||||
@@ -232,7 +232,7 @@ class FormattedBytes {
|
||||
friend class raw_ostream;
|
||||
|
||||
public:
|
||||
FormattedBytes(ArrayRef<uint8_t> B, uint32_t IL, Optional<uint64_t> O,
|
||||
FormattedBytes(ArrayRef<uint8_t> B, uint32_t IL, optional<uint64_t> O,
|
||||
uint32_t NPL, uint8_t BGS, bool U, bool A)
|
||||
: Bytes(B), FirstByteOffset(O), IndentLevel(IL), NumPerLine(NPL),
|
||||
ByteGroupSize(BGS), Upper(U), ASCII(A) {
|
||||
@@ -243,7 +243,7 @@ public:
|
||||
};
|
||||
|
||||
inline FormattedBytes
|
||||
format_bytes(ArrayRef<uint8_t> Bytes, Optional<uint64_t> FirstByteOffset = None,
|
||||
format_bytes(ArrayRef<uint8_t> Bytes, optional<uint64_t> FirstByteOffset = nullopt,
|
||||
uint32_t NumPerLine = 16, uint8_t ByteGroupSize = 4,
|
||||
uint32_t IndentLevel = 0, bool Upper = false) {
|
||||
return FormattedBytes(Bytes, IndentLevel, FirstByteOffset, NumPerLine,
|
||||
@@ -252,7 +252,7 @@ format_bytes(ArrayRef<uint8_t> Bytes, Optional<uint64_t> FirstByteOffset = None,
|
||||
|
||||
inline FormattedBytes
|
||||
format_bytes_with_ascii(ArrayRef<uint8_t> Bytes,
|
||||
Optional<uint64_t> FirstByteOffset = None,
|
||||
optional<uint64_t> FirstByteOffset = nullopt,
|
||||
uint32_t NumPerLine = 16, uint8_t ByteGroupSize = 4,
|
||||
uint32_t IndentLevel = 0, bool Upper = false) {
|
||||
return FormattedBytes(Bytes, IndentLevel, FirstByteOffset, NumPerLine,
|
||||
|
||||
@@ -1,346 +0,0 @@
|
||||
//===- Optional.h - Simple variant for passing optional values --*- C++ -*-===//
|
||||
//
|
||||
// The LLVM Compiler Infrastructure
|
||||
//
|
||||
// This file is distributed under the University of Illinois Open Source
|
||||
// License. See LICENSE.TXT for details.
|
||||
//
|
||||
//===----------------------------------------------------------------------===//
|
||||
//
|
||||
// This file provides Optional, a template class modeled in the spirit of
|
||||
// OCaml's 'opt' variant. The idea is to strongly type whether or not
|
||||
// a value can be optional.
|
||||
//
|
||||
//===----------------------------------------------------------------------===//
|
||||
|
||||
#ifndef WPIUTIL_WPI_OPTIONAL_H
|
||||
#define WPIUTIL_WPI_OPTIONAL_H
|
||||
|
||||
#include "wpi/None.h"
|
||||
#include "wpi/AlignOf.h"
|
||||
#include "wpi/Compiler.h"
|
||||
#include "wpi/type_traits.h"
|
||||
#include <algorithm>
|
||||
#include <cassert>
|
||||
#include <new>
|
||||
#include <utility>
|
||||
|
||||
namespace wpi {
|
||||
|
||||
namespace optional_detail {
|
||||
/// Storage for any type.
|
||||
template <typename T, bool IsPodLike> struct OptionalStorage {
|
||||
AlignedCharArrayUnion<T> storage;
|
||||
bool hasVal = false;
|
||||
|
||||
OptionalStorage() = default;
|
||||
|
||||
OptionalStorage(const T &y) : hasVal(true) { new (storage.buffer) T(y); }
|
||||
OptionalStorage(const OptionalStorage &O) : hasVal(O.hasVal) {
|
||||
if (hasVal)
|
||||
new (storage.buffer) T(*O.getPointer());
|
||||
}
|
||||
OptionalStorage(T &&y) : hasVal(true) {
|
||||
new (storage.buffer) T(std::forward<T>(y));
|
||||
}
|
||||
OptionalStorage(OptionalStorage &&O) : hasVal(O.hasVal) {
|
||||
if (O.hasVal) {
|
||||
new (storage.buffer) T(std::move(*O.getPointer()));
|
||||
}
|
||||
}
|
||||
|
||||
OptionalStorage &operator=(T &&y) {
|
||||
if (hasVal)
|
||||
*getPointer() = std::move(y);
|
||||
else {
|
||||
new (storage.buffer) T(std::move(y));
|
||||
hasVal = true;
|
||||
}
|
||||
return *this;
|
||||
}
|
||||
OptionalStorage &operator=(OptionalStorage &&O) {
|
||||
if (!O.hasVal)
|
||||
reset();
|
||||
else {
|
||||
*this = std::move(*O.getPointer());
|
||||
}
|
||||
return *this;
|
||||
}
|
||||
|
||||
// FIXME: these assignments (& the equivalent const T&/const Optional& ctors)
|
||||
// could be made more efficient by passing by value, possibly unifying them
|
||||
// with the rvalue versions above - but this could place a different set of
|
||||
// requirements (notably: the existence of a default ctor) when implemented
|
||||
// in that way. Careful SFINAE to avoid such pitfalls would be required.
|
||||
OptionalStorage &operator=(const T &y) {
|
||||
if (hasVal)
|
||||
*getPointer() = y;
|
||||
else {
|
||||
new (storage.buffer) T(y);
|
||||
hasVal = true;
|
||||
}
|
||||
return *this;
|
||||
}
|
||||
OptionalStorage &operator=(const OptionalStorage &O) {
|
||||
if (!O.hasVal)
|
||||
reset();
|
||||
else
|
||||
*this = *O.getPointer();
|
||||
return *this;
|
||||
}
|
||||
|
||||
~OptionalStorage() { reset(); }
|
||||
|
||||
void reset() {
|
||||
if (hasVal) {
|
||||
(*getPointer()).~T();
|
||||
hasVal = false;
|
||||
}
|
||||
}
|
||||
|
||||
T *getPointer() {
|
||||
assert(hasVal);
|
||||
return reinterpret_cast<T *>(storage.buffer);
|
||||
}
|
||||
const T *getPointer() const {
|
||||
assert(hasVal);
|
||||
return reinterpret_cast<const T *>(storage.buffer);
|
||||
}
|
||||
};
|
||||
|
||||
#if !defined(__GNUC__) || defined(__clang__) // GCC up to GCC7 miscompiles this.
|
||||
/// Storage for trivially copyable types only.
|
||||
template <typename T> struct OptionalStorage<T, true> {
|
||||
AlignedCharArrayUnion<T> storage;
|
||||
bool hasVal = false;
|
||||
|
||||
OptionalStorage() = default;
|
||||
|
||||
OptionalStorage(const T &y) : hasVal(true) { new (storage.buffer) T(y); }
|
||||
OptionalStorage &operator=(const T &y) {
|
||||
*reinterpret_cast<T *>(storage.buffer) = y;
|
||||
hasVal = true;
|
||||
return *this;
|
||||
}
|
||||
|
||||
void reset() { hasVal = false; }
|
||||
};
|
||||
#endif
|
||||
} // namespace optional_detail
|
||||
|
||||
template <typename T> class Optional {
|
||||
optional_detail::OptionalStorage<T, isPodLike<T>::value> Storage;
|
||||
|
||||
public:
|
||||
using value_type = T;
|
||||
|
||||
constexpr Optional() {}
|
||||
constexpr Optional(NoneType) {}
|
||||
|
||||
Optional(const T &y) : Storage(y) {}
|
||||
Optional(const Optional &O) = default;
|
||||
|
||||
Optional(T &&y) : Storage(std::forward<T>(y)) {}
|
||||
Optional(Optional &&O) = default;
|
||||
|
||||
Optional &operator=(T &&y) {
|
||||
Storage = std::move(y);
|
||||
return *this;
|
||||
}
|
||||
Optional &operator=(Optional &&O) = default;
|
||||
|
||||
/// Create a new object by constructing it in place with the given arguments.
|
||||
template <typename... ArgTypes> void emplace(ArgTypes &&... Args) {
|
||||
reset();
|
||||
Storage.hasVal = true;
|
||||
new (getPointer()) T(std::forward<ArgTypes>(Args)...);
|
||||
}
|
||||
|
||||
static inline Optional create(const T *y) {
|
||||
return y ? Optional(*y) : Optional();
|
||||
}
|
||||
|
||||
Optional &operator=(const T &y) {
|
||||
Storage = y;
|
||||
return *this;
|
||||
}
|
||||
Optional &operator=(const Optional &O) = default;
|
||||
|
||||
void reset() { Storage.reset(); }
|
||||
|
||||
const T *getPointer() const {
|
||||
assert(Storage.hasVal);
|
||||
return reinterpret_cast<const T *>(Storage.storage.buffer);
|
||||
}
|
||||
T *getPointer() {
|
||||
assert(Storage.hasVal);
|
||||
return reinterpret_cast<T *>(Storage.storage.buffer);
|
||||
}
|
||||
const T &getValue() const LLVM_LVALUE_FUNCTION { return *getPointer(); }
|
||||
T &getValue() LLVM_LVALUE_FUNCTION { return *getPointer(); }
|
||||
|
||||
explicit operator bool() const { return Storage.hasVal; }
|
||||
bool hasValue() const { return Storage.hasVal; }
|
||||
const T *operator->() const { return getPointer(); }
|
||||
T *operator->() { return getPointer(); }
|
||||
const T &operator*() const LLVM_LVALUE_FUNCTION { return *getPointer(); }
|
||||
T &operator*() LLVM_LVALUE_FUNCTION { return *getPointer(); }
|
||||
|
||||
template <typename U>
|
||||
constexpr T getValueOr(U &&value) const LLVM_LVALUE_FUNCTION {
|
||||
return hasValue() ? getValue() : std::forward<U>(value);
|
||||
}
|
||||
|
||||
#if LLVM_HAS_RVALUE_REFERENCE_THIS
|
||||
T &&getValue() && { return std::move(*getPointer()); }
|
||||
T &&operator*() && { return std::move(*getPointer()); }
|
||||
|
||||
template <typename U>
|
||||
T getValueOr(U &&value) && {
|
||||
return hasValue() ? std::move(getValue()) : std::forward<U>(value);
|
||||
}
|
||||
#endif
|
||||
};
|
||||
|
||||
template <typename T> struct isPodLike<Optional<T>> {
|
||||
// An Optional<T> is pod-like if T is.
|
||||
static const bool value = isPodLike<T>::value;
|
||||
};
|
||||
|
||||
template <typename T, typename U>
|
||||
bool operator==(const Optional<T> &X, const Optional<U> &Y) {
|
||||
if (X && Y)
|
||||
return *X == *Y;
|
||||
return X.hasValue() == Y.hasValue();
|
||||
}
|
||||
|
||||
template <typename T, typename U>
|
||||
bool operator!=(const Optional<T> &X, const Optional<U> &Y) {
|
||||
return !(X == Y);
|
||||
}
|
||||
|
||||
template <typename T, typename U>
|
||||
bool operator<(const Optional<T> &X, const Optional<U> &Y) {
|
||||
if (X && Y)
|
||||
return *X < *Y;
|
||||
return X.hasValue() < Y.hasValue();
|
||||
}
|
||||
|
||||
template <typename T, typename U>
|
||||
bool operator<=(const Optional<T> &X, const Optional<U> &Y) {
|
||||
return !(Y < X);
|
||||
}
|
||||
|
||||
template <typename T, typename U>
|
||||
bool operator>(const Optional<T> &X, const Optional<U> &Y) {
|
||||
return Y < X;
|
||||
}
|
||||
|
||||
template <typename T, typename U>
|
||||
bool operator>=(const Optional<T> &X, const Optional<U> &Y) {
|
||||
return !(X < Y);
|
||||
}
|
||||
|
||||
template<typename T>
|
||||
bool operator==(const Optional<T> &X, NoneType) {
|
||||
return !X;
|
||||
}
|
||||
|
||||
template<typename T>
|
||||
bool operator==(NoneType, const Optional<T> &X) {
|
||||
return X == None;
|
||||
}
|
||||
|
||||
template<typename T>
|
||||
bool operator!=(const Optional<T> &X, NoneType) {
|
||||
return !(X == None);
|
||||
}
|
||||
|
||||
template<typename T>
|
||||
bool operator!=(NoneType, const Optional<T> &X) {
|
||||
return X != None;
|
||||
}
|
||||
|
||||
template <typename T> bool operator<(const Optional<T> &X, NoneType) {
|
||||
return false;
|
||||
}
|
||||
|
||||
template <typename T> bool operator<(NoneType, const Optional<T> &X) {
|
||||
return X.hasValue();
|
||||
}
|
||||
|
||||
template <typename T> bool operator<=(const Optional<T> &X, NoneType) {
|
||||
return !(None < X);
|
||||
}
|
||||
|
||||
template <typename T> bool operator<=(NoneType, const Optional<T> &X) {
|
||||
return !(X < None);
|
||||
}
|
||||
|
||||
template <typename T> bool operator>(const Optional<T> &X, NoneType) {
|
||||
return None < X;
|
||||
}
|
||||
|
||||
template <typename T> bool operator>(NoneType, const Optional<T> &X) {
|
||||
return X < None;
|
||||
}
|
||||
|
||||
template <typename T> bool operator>=(const Optional<T> &X, NoneType) {
|
||||
return None <= X;
|
||||
}
|
||||
|
||||
template <typename T> bool operator>=(NoneType, const Optional<T> &X) {
|
||||
return X <= None;
|
||||
}
|
||||
|
||||
template <typename T> bool operator==(const Optional<T> &X, const T &Y) {
|
||||
return X && *X == Y;
|
||||
}
|
||||
|
||||
template <typename T> bool operator==(const T &X, const Optional<T> &Y) {
|
||||
return Y && X == *Y;
|
||||
}
|
||||
|
||||
template <typename T> bool operator!=(const Optional<T> &X, const T &Y) {
|
||||
return !(X == Y);
|
||||
}
|
||||
|
||||
template <typename T> bool operator!=(const T &X, const Optional<T> &Y) {
|
||||
return !(X == Y);
|
||||
}
|
||||
|
||||
template <typename T> bool operator<(const Optional<T> &X, const T &Y) {
|
||||
return !X || *X < Y;
|
||||
}
|
||||
|
||||
template <typename T> bool operator<(const T &X, const Optional<T> &Y) {
|
||||
return Y && X < *Y;
|
||||
}
|
||||
|
||||
template <typename T> bool operator<=(const Optional<T> &X, const T &Y) {
|
||||
return !(Y < X);
|
||||
}
|
||||
|
||||
template <typename T> bool operator<=(const T &X, const Optional<T> &Y) {
|
||||
return !(Y < X);
|
||||
}
|
||||
|
||||
template <typename T> bool operator>(const Optional<T> &X, const T &Y) {
|
||||
return Y < X;
|
||||
}
|
||||
|
||||
template <typename T> bool operator>(const T &X, const Optional<T> &Y) {
|
||||
return Y < X;
|
||||
}
|
||||
|
||||
template <typename T> bool operator>=(const Optional<T> &X, const T &Y) {
|
||||
return !(X < Y);
|
||||
}
|
||||
|
||||
template <typename T> bool operator>=(const T &X, const Optional<T> &Y) {
|
||||
return !(X < Y);
|
||||
}
|
||||
|
||||
} // end wpi namespace
|
||||
|
||||
#endif
|
||||
@@ -10,7 +10,7 @@
|
||||
#ifndef WPIUTIL_WPI_NATIVE_FORMATTING_H
|
||||
#define WPIUTIL_WPI_NATIVE_FORMATTING_H
|
||||
|
||||
#include "wpi/LLVMOptional.h"
|
||||
#include "wpi/optional.h"
|
||||
#include "wpi/raw_ostream.h"
|
||||
|
||||
#include <cstdint>
|
||||
@@ -40,9 +40,9 @@ void write_integer(raw_ostream &S, long long N, size_t MinDigits,
|
||||
IntegerStyle Style);
|
||||
|
||||
void write_hex(raw_ostream &S, uint64_t N, HexPrintStyle Style,
|
||||
Optional<size_t> Width = None);
|
||||
optional<size_t> Width = nullopt);
|
||||
void write_double(raw_ostream &S, double D, FloatStyle Style,
|
||||
Optional<size_t> Precision = None);
|
||||
optional<size_t> Precision = nullopt);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
@@ -1,27 +0,0 @@
|
||||
//===-- None.h - Simple null value for implicit construction ------*- C++ -*-=//
|
||||
//
|
||||
// The LLVM Compiler Infrastructure
|
||||
//
|
||||
// This file is distributed under the University of Illinois Open Source
|
||||
// License. See LICENSE.TXT for details.
|
||||
//
|
||||
//===----------------------------------------------------------------------===//
|
||||
//
|
||||
// This file provides None, an enumerator for use in implicit constructors
|
||||
// of various (usually templated) types to make such construction more
|
||||
// terse.
|
||||
//
|
||||
//===----------------------------------------------------------------------===//
|
||||
|
||||
#ifndef WPIUTIL_WPI_NONE_H
|
||||
#define WPIUTIL_WPI_NONE_H
|
||||
|
||||
namespace wpi {
|
||||
/// A simple null object to allow implicit construction of Optional<T>
|
||||
/// and similar types without having to spell out the specialization's name.
|
||||
// (constant value 1 in an attempt to workaround MSVC build issue... )
|
||||
enum class NoneType { None = 1 };
|
||||
const NoneType None = NoneType::None;
|
||||
}
|
||||
|
||||
#endif
|
||||
@@ -17,10 +17,10 @@
|
||||
#ifndef WPIUTIL_WPI_STLEXTRAS_H
|
||||
#define WPIUTIL_WPI_STLEXTRAS_H
|
||||
|
||||
#include "wpi/LLVMOptional.h"
|
||||
#include "wpi/SmallVector.h"
|
||||
#include "wpi/iterator.h"
|
||||
#include "wpi/iterator_range.h"
|
||||
#include "wpi/optional.h"
|
||||
#include <algorithm>
|
||||
#include <cassert>
|
||||
#include <cstddef>
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
#ifndef WPIUTIL_WPI_SMALLSET_H
|
||||
#define WPIUTIL_WPI_SMALLSET_H
|
||||
|
||||
#include "wpi/None.h"
|
||||
#include "wpi/optional.h"
|
||||
#include "wpi/SmallPtrSet.h"
|
||||
#include "wpi/SmallVector.h"
|
||||
#include "wpi/Compiler.h"
|
||||
@@ -78,16 +78,16 @@ public:
|
||||
/// concept.
|
||||
// FIXME: Add iterators that abstract over the small and large form, and then
|
||||
// return those here.
|
||||
std::pair<NoneType, bool> insert(const T &V) {
|
||||
std::pair<nullopt_t, bool> insert(const T &V) {
|
||||
if (!isSmall())
|
||||
return std::make_pair(None, Set.insert(V).second);
|
||||
return std::make_pair(nullopt, Set.insert(V).second);
|
||||
|
||||
VIterator I = vfind(V);
|
||||
if (I != Vector.end()) // Don't reinsert if it already exists.
|
||||
return std::make_pair(None, false);
|
||||
return std::make_pair(nullopt, false);
|
||||
if (Vector.size() < N) {
|
||||
Vector.push_back(V);
|
||||
return std::make_pair(None, true);
|
||||
return std::make_pair(nullopt, true);
|
||||
}
|
||||
|
||||
// Otherwise, grow from vector to set.
|
||||
@@ -96,7 +96,7 @@ public:
|
||||
Vector.pop_back();
|
||||
}
|
||||
Set.insert(V);
|
||||
return std::make_pair(None, true);
|
||||
return std::make_pair(nullopt, true);
|
||||
}
|
||||
|
||||
template <typename IterT>
|
||||
|
||||
913
wpiutil/src/main/native/include/wpi/optional.h
Normal file
913
wpiutil/src/main/native/include/wpi/optional.h
Normal file
@@ -0,0 +1,913 @@
|
||||
// Copyright (C) 2011 - 2012 Andrzej Krzemienski.
|
||||
//
|
||||
// Use, modification, and distribution is subject to the Boost Software
|
||||
// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
|
||||
// http://www.boost.org/LICENSE_1_0.txt)
|
||||
//
|
||||
// The idea and interface is based on Boost.Optional library
|
||||
// authored by Fernando Luis Cacciola Carballal
|
||||
|
||||
# ifndef WPIUTIL_WPI_OPTIONAL_H
|
||||
# define WPIUTIL_WPI_OPTIONAL_H
|
||||
|
||||
# include <utility>
|
||||
# include <type_traits>
|
||||
# include <initializer_list>
|
||||
# include <cassert>
|
||||
# include <functional>
|
||||
# include <string>
|
||||
# include <stdexcept>
|
||||
|
||||
# define TR2_OPTIONAL_REQUIRES(...) typename std::enable_if<__VA_ARGS__::value, bool>::type = false
|
||||
|
||||
# if defined __GNUC__ || (defined _MSC_VER) && (_MSC_VER >= 1910)
|
||||
# define OPTIONAL_HAS_CONSTEXPR_INIT_LIST 1
|
||||
# define OPTIONAL_CONSTEXPR_INIT_LIST constexpr
|
||||
# else
|
||||
# define OPTIONAL_HAS_CONSTEXPR_INIT_LIST 0
|
||||
# define OPTIONAL_CONSTEXPR_INIT_LIST
|
||||
# endif
|
||||
|
||||
# if defined __clang__ && (defined __cplusplus) && (__cplusplus != 201103L)
|
||||
# define OPTIONAL_HAS_MOVE_ACCESSORS 1
|
||||
# else
|
||||
# define OPTIONAL_HAS_MOVE_ACCESSORS 0
|
||||
# endif
|
||||
|
||||
namespace wpi{
|
||||
|
||||
// 20.5.4, optional for object types
|
||||
template <class T> class optional;
|
||||
|
||||
// 20.5.5, optional for lvalue reference types
|
||||
template <class T> class optional<T&>;
|
||||
|
||||
|
||||
// workaround: std utility functions aren't constexpr yet
|
||||
template <class T> inline constexpr T&& constexpr_forward(typename std::remove_reference<T>::type& t) noexcept
|
||||
{
|
||||
return static_cast<T&&>(t);
|
||||
}
|
||||
|
||||
template <class T> inline constexpr T&& constexpr_forward(typename std::remove_reference<T>::type&& t) noexcept
|
||||
{
|
||||
static_assert(!std::is_lvalue_reference<T>::value, "!!");
|
||||
return static_cast<T&&>(t);
|
||||
}
|
||||
|
||||
template <class T> inline constexpr typename std::remove_reference<T>::type&& constexpr_move(T&& t) noexcept
|
||||
{
|
||||
return static_cast<typename std::remove_reference<T>::type&&>(t);
|
||||
}
|
||||
|
||||
|
||||
#if defined NDEBUG
|
||||
# define TR2_OPTIONAL_ASSERTED_EXPRESSION(CHECK, EXPR) (EXPR)
|
||||
#else
|
||||
# define TR2_OPTIONAL_ASSERTED_EXPRESSION(CHECK, EXPR) ((CHECK) ? (EXPR) : ([]{assert(!#CHECK);}(), (EXPR)))
|
||||
#endif
|
||||
|
||||
|
||||
namespace detail_
|
||||
{
|
||||
|
||||
// static_addressof: a constexpr version of addressof
|
||||
template <typename T>
|
||||
struct has_overloaded_addressof
|
||||
{
|
||||
template <class X>
|
||||
constexpr static bool has_overload(...) { return false; }
|
||||
|
||||
template <class X, size_t S = sizeof(std::declval<X&>().operator&()) >
|
||||
constexpr static bool has_overload(bool) { return true; }
|
||||
|
||||
constexpr static bool value = has_overload<T>(true);
|
||||
};
|
||||
|
||||
template <typename T, TR2_OPTIONAL_REQUIRES(!has_overloaded_addressof<T>)>
|
||||
constexpr T* static_addressof(T& ref)
|
||||
{
|
||||
return &ref;
|
||||
}
|
||||
|
||||
template <typename T, TR2_OPTIONAL_REQUIRES(has_overloaded_addressof<T>)>
|
||||
T* static_addressof(T& ref)
|
||||
{
|
||||
return std::addressof(ref);
|
||||
}
|
||||
|
||||
|
||||
// the call to convert<A>(b) has return type A and converts b to type A iff b decltype(b) is implicitly convertible to A
|
||||
template <class U>
|
||||
constexpr U convert(U v) { return v; }
|
||||
|
||||
|
||||
namespace swap_ns
|
||||
{
|
||||
using std::swap;
|
||||
|
||||
template <class T>
|
||||
void adl_swap(T& t, T& u) noexcept(noexcept(swap(t, u)))
|
||||
{
|
||||
swap(t, u);
|
||||
}
|
||||
|
||||
} // namespace swap_ns
|
||||
|
||||
} // namespace detail
|
||||
|
||||
|
||||
constexpr struct trivial_init_t{} trivial_init{};
|
||||
|
||||
|
||||
// 20.5.6, In-place construction
|
||||
constexpr struct in_place_t{} in_place{};
|
||||
|
||||
|
||||
// 20.5.7, Disengaged state indicator
|
||||
struct nullopt_t
|
||||
{
|
||||
struct init{};
|
||||
constexpr explicit nullopt_t(init){}
|
||||
};
|
||||
constexpr nullopt_t nullopt{nullopt_t::init()};
|
||||
|
||||
|
||||
// 20.5.8, class bad_optional_access
|
||||
class bad_optional_access : public std::logic_error {
|
||||
public:
|
||||
explicit bad_optional_access(const std::string& what_arg) : logic_error{what_arg} {}
|
||||
explicit bad_optional_access(const char* what_arg) : logic_error{what_arg} {}
|
||||
};
|
||||
|
||||
|
||||
template <class T>
|
||||
union storage_t
|
||||
{
|
||||
unsigned char dummy_;
|
||||
T value_;
|
||||
|
||||
constexpr storage_t( trivial_init_t ) noexcept : dummy_() {};
|
||||
|
||||
template <class... Args>
|
||||
constexpr storage_t( Args&&... args ) : value_(constexpr_forward<Args>(args)...) {}
|
||||
|
||||
~storage_t(){}
|
||||
};
|
||||
|
||||
|
||||
template <class T>
|
||||
union constexpr_storage_t
|
||||
{
|
||||
unsigned char dummy_;
|
||||
T value_;
|
||||
|
||||
constexpr constexpr_storage_t( trivial_init_t ) noexcept : dummy_() {};
|
||||
|
||||
template <class... Args>
|
||||
constexpr constexpr_storage_t( Args&&... args ) : value_(constexpr_forward<Args>(args)...) {}
|
||||
|
||||
~constexpr_storage_t() = default;
|
||||
};
|
||||
|
||||
|
||||
template <class T>
|
||||
struct optional_base
|
||||
{
|
||||
bool init_;
|
||||
storage_t<T> storage_;
|
||||
|
||||
constexpr optional_base() noexcept : init_(false), storage_(trivial_init) {};
|
||||
|
||||
explicit constexpr optional_base(const T& v) : init_(true), storage_(v) {}
|
||||
|
||||
explicit constexpr optional_base(T&& v) : init_(true), storage_(constexpr_move(v)) {}
|
||||
|
||||
template <class... Args> explicit optional_base(in_place_t, Args&&... args)
|
||||
: init_(true), storage_(constexpr_forward<Args>(args)...) {}
|
||||
|
||||
template <class U, class... Args, TR2_OPTIONAL_REQUIRES(std::is_constructible<T, std::initializer_list<U>>)>
|
||||
explicit optional_base(in_place_t, std::initializer_list<U> il, Args&&... args)
|
||||
: init_(true), storage_(il, std::forward<Args>(args)...) {}
|
||||
|
||||
~optional_base() { if (init_) storage_.value_.T::~T(); }
|
||||
};
|
||||
|
||||
|
||||
template <class T>
|
||||
struct constexpr_optional_base
|
||||
{
|
||||
bool init_;
|
||||
constexpr_storage_t<T> storage_;
|
||||
|
||||
constexpr constexpr_optional_base() noexcept : init_(false), storage_(trivial_init) {};
|
||||
|
||||
explicit constexpr constexpr_optional_base(const T& v) : init_(true), storage_(v) {}
|
||||
|
||||
explicit constexpr constexpr_optional_base(T&& v) : init_(true), storage_(constexpr_move(v)) {}
|
||||
|
||||
template <class... Args> explicit constexpr constexpr_optional_base(in_place_t, Args&&... args)
|
||||
: init_(true), storage_(constexpr_forward<Args>(args)...) {}
|
||||
|
||||
template <class U, class... Args, TR2_OPTIONAL_REQUIRES(std::is_constructible<T, std::initializer_list<U>>)>
|
||||
OPTIONAL_CONSTEXPR_INIT_LIST explicit constexpr_optional_base(in_place_t, std::initializer_list<U> il, Args&&... args)
|
||||
: init_(true), storage_(il, std::forward<Args>(args)...) {}
|
||||
|
||||
~constexpr_optional_base() = default;
|
||||
};
|
||||
|
||||
template <class T>
|
||||
using OptionalBase = typename std::conditional<
|
||||
std::is_trivially_destructible<T>::value, // if possible
|
||||
constexpr_optional_base<typename std::remove_const<T>::type>, // use base with trivial destructor
|
||||
optional_base<typename std::remove_const<T>::type>
|
||||
>::type;
|
||||
|
||||
|
||||
|
||||
template <class T>
|
||||
class optional : private OptionalBase<T>
|
||||
{
|
||||
static_assert( !std::is_same<typename std::decay<T>::type, nullopt_t>::value, "bad T" );
|
||||
static_assert( !std::is_same<typename std::decay<T>::type, in_place_t>::value, "bad T" );
|
||||
|
||||
|
||||
constexpr bool initialized() const noexcept { return OptionalBase<T>::init_; }
|
||||
typename std::remove_const<T>::type* dataptr() { return std::addressof(OptionalBase<T>::storage_.value_); }
|
||||
constexpr const T* dataptr() const { return detail_::static_addressof(OptionalBase<T>::storage_.value_); }
|
||||
|
||||
constexpr const T& contained_val() const& { return OptionalBase<T>::storage_.value_; }
|
||||
# if OPTIONAL_HAS_MOVE_ACCESSORS == 1
|
||||
constexpr T&& contained_val() && { return std::move(OptionalBase<T>::storage_.value_); }
|
||||
constexpr T& contained_val() & { return OptionalBase<T>::storage_.value_; }
|
||||
# else
|
||||
T& contained_val() & { return OptionalBase<T>::storage_.value_; }
|
||||
T&& contained_val() && { return std::move(OptionalBase<T>::storage_.value_); }
|
||||
# endif
|
||||
|
||||
void clear() noexcept {
|
||||
if (initialized()) dataptr()->T::~T();
|
||||
OptionalBase<T>::init_ = false;
|
||||
}
|
||||
|
||||
template <class... Args>
|
||||
void initialize(Args&&... args) noexcept(noexcept(T(std::forward<Args>(args)...)))
|
||||
{
|
||||
assert(!OptionalBase<T>::init_);
|
||||
::new (static_cast<void*>(dataptr())) T(std::forward<Args>(args)...);
|
||||
OptionalBase<T>::init_ = true;
|
||||
}
|
||||
|
||||
template <class U, class... Args>
|
||||
void initialize(std::initializer_list<U> il, Args&&... args) noexcept(noexcept(T(il, std::forward<Args>(args)...)))
|
||||
{
|
||||
assert(!OptionalBase<T>::init_);
|
||||
::new (static_cast<void*>(dataptr())) T(il, std::forward<Args>(args)...);
|
||||
OptionalBase<T>::init_ = true;
|
||||
}
|
||||
|
||||
public:
|
||||
typedef T value_type;
|
||||
|
||||
// 20.5.5.1, constructors
|
||||
constexpr optional() noexcept : OptionalBase<T>() {};
|
||||
constexpr optional(nullopt_t) noexcept : OptionalBase<T>() {};
|
||||
|
||||
optional(const optional& rhs)
|
||||
: OptionalBase<T>()
|
||||
{
|
||||
if (rhs.initialized()) {
|
||||
::new (static_cast<void*>(dataptr())) T(*rhs);
|
||||
OptionalBase<T>::init_ = true;
|
||||
}
|
||||
}
|
||||
|
||||
optional(optional&& rhs) noexcept(std::is_nothrow_move_constructible<T>::value)
|
||||
: OptionalBase<T>()
|
||||
{
|
||||
if (rhs.initialized()) {
|
||||
::new (static_cast<void*>(dataptr())) T(std::move(*rhs));
|
||||
OptionalBase<T>::init_ = true;
|
||||
}
|
||||
}
|
||||
|
||||
constexpr optional(const T& v) : OptionalBase<T>(v) {}
|
||||
|
||||
constexpr optional(T&& v) : OptionalBase<T>(constexpr_move(v)) {}
|
||||
|
||||
template <class... Args>
|
||||
explicit constexpr optional(in_place_t, Args&&... args)
|
||||
: OptionalBase<T>(in_place_t{}, constexpr_forward<Args>(args)...) {}
|
||||
|
||||
template <class U, class... Args, TR2_OPTIONAL_REQUIRES(std::is_constructible<T, std::initializer_list<U>>)>
|
||||
OPTIONAL_CONSTEXPR_INIT_LIST explicit optional(in_place_t, std::initializer_list<U> il, Args&&... args)
|
||||
: OptionalBase<T>(in_place_t{}, il, constexpr_forward<Args>(args)...) {}
|
||||
|
||||
// 20.5.4.2, Destructor
|
||||
~optional() = default;
|
||||
|
||||
// 20.5.4.3, assignment
|
||||
optional& operator=(nullopt_t) noexcept
|
||||
{
|
||||
clear();
|
||||
return *this;
|
||||
}
|
||||
|
||||
optional& operator=(const optional& rhs)
|
||||
{
|
||||
if (initialized() == true && rhs.initialized() == false) clear();
|
||||
else if (initialized() == false && rhs.initialized() == true) initialize(*rhs);
|
||||
else if (initialized() == true && rhs.initialized() == true) contained_val() = *rhs;
|
||||
return *this;
|
||||
}
|
||||
|
||||
optional& operator=(optional&& rhs)
|
||||
noexcept(std::is_nothrow_move_assignable<T>::value && std::is_nothrow_move_constructible<T>::value)
|
||||
{
|
||||
if (initialized() == true && rhs.initialized() == false) clear();
|
||||
else if (initialized() == false && rhs.initialized() == true) initialize(std::move(*rhs));
|
||||
else if (initialized() == true && rhs.initialized() == true) contained_val() = std::move(*rhs);
|
||||
return *this;
|
||||
}
|
||||
|
||||
template <class U>
|
||||
auto operator=(U&& v)
|
||||
-> typename std::enable_if
|
||||
<
|
||||
std::is_same<typename std::decay<U>::type, T>::value,
|
||||
optional&
|
||||
>::type
|
||||
{
|
||||
if (initialized()) { contained_val() = std::forward<U>(v); }
|
||||
else { initialize(std::forward<U>(v)); }
|
||||
return *this;
|
||||
}
|
||||
|
||||
|
||||
template <class... Args>
|
||||
void emplace(Args&&... args)
|
||||
{
|
||||
clear();
|
||||
initialize(std::forward<Args>(args)...);
|
||||
}
|
||||
|
||||
template <class U, class... Args>
|
||||
void emplace(std::initializer_list<U> il, Args&&... args)
|
||||
{
|
||||
clear();
|
||||
initialize<U, Args...>(il, std::forward<Args>(args)...);
|
||||
}
|
||||
|
||||
// 20.5.4.4, Swap
|
||||
void swap(optional<T>& rhs) noexcept(std::is_nothrow_move_constructible<T>::value
|
||||
&& noexcept(detail_::swap_ns::adl_swap(std::declval<T&>(), std::declval<T&>())))
|
||||
{
|
||||
if (initialized() == true && rhs.initialized() == false) { rhs.initialize(std::move(**this)); clear(); }
|
||||
else if (initialized() == false && rhs.initialized() == true) { initialize(std::move(*rhs)); rhs.clear(); }
|
||||
else if (initialized() == true && rhs.initialized() == true) { using std::swap; swap(**this, *rhs); }
|
||||
}
|
||||
|
||||
// 20.5.4.5, Observers
|
||||
|
||||
explicit constexpr operator bool() const noexcept { return initialized(); }
|
||||
constexpr bool has_value() const noexcept { return initialized(); }
|
||||
|
||||
constexpr T const* operator ->() const {
|
||||
return TR2_OPTIONAL_ASSERTED_EXPRESSION(initialized(), dataptr());
|
||||
}
|
||||
|
||||
# if OPTIONAL_HAS_MOVE_ACCESSORS == 1
|
||||
|
||||
constexpr T* operator ->() {
|
||||
assert (initialized());
|
||||
return dataptr();
|
||||
}
|
||||
|
||||
constexpr T const& operator *() const& {
|
||||
return TR2_OPTIONAL_ASSERTED_EXPRESSION(initialized(), contained_val());
|
||||
}
|
||||
|
||||
constexpr T& operator *() & {
|
||||
assert (initialized());
|
||||
return contained_val();
|
||||
}
|
||||
|
||||
constexpr T&& operator *() && {
|
||||
assert (initialized());
|
||||
return constexpr_move(contained_val());
|
||||
}
|
||||
|
||||
constexpr T const& value() const& {
|
||||
return initialized() ? contained_val() : (throw bad_optional_access("bad optional access"), contained_val());
|
||||
}
|
||||
|
||||
constexpr T& value() & {
|
||||
return initialized() ? contained_val() : (throw bad_optional_access("bad optional access"), contained_val());
|
||||
}
|
||||
|
||||
constexpr T&& value() && {
|
||||
if (!initialized()) throw bad_optional_access("bad optional access");
|
||||
return std::move(contained_val());
|
||||
}
|
||||
|
||||
# else
|
||||
|
||||
T* operator ->() {
|
||||
assert (initialized());
|
||||
return dataptr();
|
||||
}
|
||||
|
||||
constexpr T const& operator *() const {
|
||||
return TR2_OPTIONAL_ASSERTED_EXPRESSION(initialized(), contained_val());
|
||||
}
|
||||
|
||||
T& operator *() {
|
||||
assert (initialized());
|
||||
return contained_val();
|
||||
}
|
||||
|
||||
constexpr T const& value() const {
|
||||
return initialized() ? contained_val() : (throw bad_optional_access("bad optional access"), contained_val());
|
||||
}
|
||||
|
||||
T& value() {
|
||||
return initialized() ? contained_val() : (throw bad_optional_access("bad optional access"), contained_val());
|
||||
}
|
||||
|
||||
# endif
|
||||
|
||||
template <class V>
|
||||
constexpr T value_or(V&& v) const&
|
||||
{
|
||||
return *this ? **this : detail_::convert<T>(constexpr_forward<V>(v));
|
||||
}
|
||||
|
||||
# if OPTIONAL_HAS_MOVE_ACCESSORS == 1
|
||||
|
||||
template <class V>
|
||||
constexpr T value_or(V&& v) &&
|
||||
{
|
||||
return *this ? constexpr_move(const_cast<optional<T>&>(*this).contained_val()) : detail_::convert<T>(constexpr_forward<V>(v));
|
||||
}
|
||||
|
||||
# else
|
||||
|
||||
template <class V>
|
||||
T value_or(V&& v) &&
|
||||
{
|
||||
return *this ? constexpr_move(const_cast<optional<T>&>(*this).contained_val()) : detail_::convert<T>(constexpr_forward<V>(v));
|
||||
}
|
||||
|
||||
# endif
|
||||
|
||||
// 20.6.3.6, modifiers
|
||||
void reset() noexcept { clear(); }
|
||||
};
|
||||
|
||||
|
||||
template <class T>
|
||||
class optional<T&>
|
||||
{
|
||||
static_assert( !std::is_same<T, nullopt_t>::value, "bad T" );
|
||||
static_assert( !std::is_same<T, in_place_t>::value, "bad T" );
|
||||
T* ref;
|
||||
|
||||
public:
|
||||
|
||||
// 20.5.5.1, construction/destruction
|
||||
constexpr optional() noexcept : ref(nullptr) {}
|
||||
|
||||
constexpr optional(nullopt_t) noexcept : ref(nullptr) {}
|
||||
|
||||
constexpr optional(T& v) noexcept : ref(detail_::static_addressof(v)) {}
|
||||
|
||||
optional(T&&) = delete;
|
||||
|
||||
constexpr optional(const optional& rhs) noexcept : ref(rhs.ref) {}
|
||||
|
||||
explicit constexpr optional(in_place_t, T& v) noexcept : ref(detail_::static_addressof(v)) {}
|
||||
|
||||
explicit optional(in_place_t, T&&) = delete;
|
||||
|
||||
~optional() = default;
|
||||
|
||||
// 20.5.5.2, mutation
|
||||
optional& operator=(nullopt_t) noexcept {
|
||||
ref = nullptr;
|
||||
return *this;
|
||||
}
|
||||
|
||||
// optional& operator=(const optional& rhs) noexcept {
|
||||
// ref = rhs.ref;
|
||||
// return *this;
|
||||
// }
|
||||
|
||||
// optional& operator=(optional&& rhs) noexcept {
|
||||
// ref = rhs.ref;
|
||||
// return *this;
|
||||
// }
|
||||
|
||||
template <typename U>
|
||||
auto operator=(U&& rhs) noexcept
|
||||
-> typename std::enable_if
|
||||
<
|
||||
std::is_same<typename std::decay<U>::type, optional<T&>>::value,
|
||||
optional&
|
||||
>::type
|
||||
{
|
||||
ref = rhs.ref;
|
||||
return *this;
|
||||
}
|
||||
|
||||
template <typename U>
|
||||
auto operator=(U&& rhs) noexcept
|
||||
-> typename std::enable_if
|
||||
<
|
||||
!std::is_same<typename std::decay<U>::type, optional<T&>>::value,
|
||||
optional&
|
||||
>::type
|
||||
= delete;
|
||||
|
||||
void emplace(T& v) noexcept {
|
||||
ref = detail_::static_addressof(v);
|
||||
}
|
||||
|
||||
void emplace(T&&) = delete;
|
||||
|
||||
|
||||
void swap(optional<T&>& rhs) noexcept
|
||||
{
|
||||
std::swap(ref, rhs.ref);
|
||||
}
|
||||
|
||||
// 20.5.5.3, observers
|
||||
constexpr T* operator->() const {
|
||||
return TR2_OPTIONAL_ASSERTED_EXPRESSION(ref, ref);
|
||||
}
|
||||
|
||||
constexpr T& operator*() const {
|
||||
return TR2_OPTIONAL_ASSERTED_EXPRESSION(ref, *ref);
|
||||
}
|
||||
|
||||
constexpr T& value() const {
|
||||
return ref ? *ref : (throw bad_optional_access("bad optional access"), *ref);
|
||||
}
|
||||
|
||||
explicit constexpr operator bool() const noexcept {
|
||||
return ref != nullptr;
|
||||
}
|
||||
|
||||
constexpr bool has_value() const noexcept {
|
||||
return ref != nullptr;
|
||||
}
|
||||
|
||||
template <class V>
|
||||
constexpr typename std::decay<T>::type value_or(V&& v) const
|
||||
{
|
||||
return *this ? **this : detail_::convert<typename std::decay<T>::type>(constexpr_forward<V>(v));
|
||||
}
|
||||
|
||||
// x.x.x.x, modifiers
|
||||
void reset() noexcept { ref = nullptr; }
|
||||
};
|
||||
|
||||
|
||||
template <class T>
|
||||
class optional<T&&>
|
||||
{
|
||||
static_assert( sizeof(T) == 0, "optional rvalue references disallowed" );
|
||||
};
|
||||
|
||||
|
||||
// 20.5.8, Relational operators
|
||||
template <class T> constexpr bool operator==(const optional<T>& x, const optional<T>& y)
|
||||
{
|
||||
return bool(x) != bool(y) ? false : bool(x) == false ? true : *x == *y;
|
||||
}
|
||||
|
||||
template <class T> constexpr bool operator!=(const optional<T>& x, const optional<T>& y)
|
||||
{
|
||||
return !(x == y);
|
||||
}
|
||||
|
||||
template <class T> constexpr bool operator<(const optional<T>& x, const optional<T>& y)
|
||||
{
|
||||
return (!y) ? false : (!x) ? true : *x < *y;
|
||||
}
|
||||
|
||||
template <class T> constexpr bool operator>(const optional<T>& x, const optional<T>& y)
|
||||
{
|
||||
return (y < x);
|
||||
}
|
||||
|
||||
template <class T> constexpr bool operator<=(const optional<T>& x, const optional<T>& y)
|
||||
{
|
||||
return !(y < x);
|
||||
}
|
||||
|
||||
template <class T> constexpr bool operator>=(const optional<T>& x, const optional<T>& y)
|
||||
{
|
||||
return !(x < y);
|
||||
}
|
||||
|
||||
|
||||
// 20.5.9, Comparison with nullopt
|
||||
template <class T> constexpr bool operator==(const optional<T>& x, nullopt_t) noexcept
|
||||
{
|
||||
return (!x);
|
||||
}
|
||||
|
||||
template <class T> constexpr bool operator==(nullopt_t, const optional<T>& x) noexcept
|
||||
{
|
||||
return (!x);
|
||||
}
|
||||
|
||||
template <class T> constexpr bool operator!=(const optional<T>& x, nullopt_t) noexcept
|
||||
{
|
||||
return bool(x);
|
||||
}
|
||||
|
||||
template <class T> constexpr bool operator!=(nullopt_t, const optional<T>& x) noexcept
|
||||
{
|
||||
return bool(x);
|
||||
}
|
||||
|
||||
template <class T> constexpr bool operator<(const optional<T>&, nullopt_t) noexcept
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
template <class T> constexpr bool operator<(nullopt_t, const optional<T>& x) noexcept
|
||||
{
|
||||
return bool(x);
|
||||
}
|
||||
|
||||
template <class T> constexpr bool operator<=(const optional<T>& x, nullopt_t) noexcept
|
||||
{
|
||||
return (!x);
|
||||
}
|
||||
|
||||
template <class T> constexpr bool operator<=(nullopt_t, const optional<T>&) noexcept
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
template <class T> constexpr bool operator>(const optional<T>& x, nullopt_t) noexcept
|
||||
{
|
||||
return bool(x);
|
||||
}
|
||||
|
||||
template <class T> constexpr bool operator>(nullopt_t, const optional<T>&) noexcept
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
template <class T> constexpr bool operator>=(const optional<T>&, nullopt_t) noexcept
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
template <class T> constexpr bool operator>=(nullopt_t, const optional<T>& x) noexcept
|
||||
{
|
||||
return (!x);
|
||||
}
|
||||
|
||||
|
||||
|
||||
// 20.5.10, Comparison with T
|
||||
template <class T> constexpr bool operator==(const optional<T>& x, const T& v)
|
||||
{
|
||||
return bool(x) ? *x == v : false;
|
||||
}
|
||||
|
||||
template <class T> constexpr bool operator==(const T& v, const optional<T>& x)
|
||||
{
|
||||
return bool(x) ? v == *x : false;
|
||||
}
|
||||
|
||||
template <class T> constexpr bool operator!=(const optional<T>& x, const T& v)
|
||||
{
|
||||
return bool(x) ? *x != v : true;
|
||||
}
|
||||
|
||||
template <class T> constexpr bool operator!=(const T& v, const optional<T>& x)
|
||||
{
|
||||
return bool(x) ? v != *x : true;
|
||||
}
|
||||
|
||||
template <class T> constexpr bool operator<(const optional<T>& x, const T& v)
|
||||
{
|
||||
return bool(x) ? *x < v : true;
|
||||
}
|
||||
|
||||
template <class T> constexpr bool operator>(const T& v, const optional<T>& x)
|
||||
{
|
||||
return bool(x) ? v > *x : true;
|
||||
}
|
||||
|
||||
template <class T> constexpr bool operator>(const optional<T>& x, const T& v)
|
||||
{
|
||||
return bool(x) ? *x > v : false;
|
||||
}
|
||||
|
||||
template <class T> constexpr bool operator<(const T& v, const optional<T>& x)
|
||||
{
|
||||
return bool(x) ? v < *x : false;
|
||||
}
|
||||
|
||||
template <class T> constexpr bool operator>=(const optional<T>& x, const T& v)
|
||||
{
|
||||
return bool(x) ? *x >= v : false;
|
||||
}
|
||||
|
||||
template <class T> constexpr bool operator<=(const T& v, const optional<T>& x)
|
||||
{
|
||||
return bool(x) ? v <= *x : false;
|
||||
}
|
||||
|
||||
template <class T> constexpr bool operator<=(const optional<T>& x, const T& v)
|
||||
{
|
||||
return bool(x) ? *x <= v : true;
|
||||
}
|
||||
|
||||
template <class T> constexpr bool operator>=(const T& v, const optional<T>& x)
|
||||
{
|
||||
return bool(x) ? v >= *x : true;
|
||||
}
|
||||
|
||||
|
||||
// Comparison of optional<T&> with T
|
||||
template <class T> constexpr bool operator==(const optional<T&>& x, const T& v)
|
||||
{
|
||||
return bool(x) ? *x == v : false;
|
||||
}
|
||||
|
||||
template <class T> constexpr bool operator==(const T& v, const optional<T&>& x)
|
||||
{
|
||||
return bool(x) ? v == *x : false;
|
||||
}
|
||||
|
||||
template <class T> constexpr bool operator!=(const optional<T&>& x, const T& v)
|
||||
{
|
||||
return bool(x) ? *x != v : true;
|
||||
}
|
||||
|
||||
template <class T> constexpr bool operator!=(const T& v, const optional<T&>& x)
|
||||
{
|
||||
return bool(x) ? v != *x : true;
|
||||
}
|
||||
|
||||
template <class T> constexpr bool operator<(const optional<T&>& x, const T& v)
|
||||
{
|
||||
return bool(x) ? *x < v : true;
|
||||
}
|
||||
|
||||
template <class T> constexpr bool operator>(const T& v, const optional<T&>& x)
|
||||
{
|
||||
return bool(x) ? v > *x : true;
|
||||
}
|
||||
|
||||
template <class T> constexpr bool operator>(const optional<T&>& x, const T& v)
|
||||
{
|
||||
return bool(x) ? *x > v : false;
|
||||
}
|
||||
|
||||
template <class T> constexpr bool operator<(const T& v, const optional<T&>& x)
|
||||
{
|
||||
return bool(x) ? v < *x : false;
|
||||
}
|
||||
|
||||
template <class T> constexpr bool operator>=(const optional<T&>& x, const T& v)
|
||||
{
|
||||
return bool(x) ? *x >= v : false;
|
||||
}
|
||||
|
||||
template <class T> constexpr bool operator<=(const T& v, const optional<T&>& x)
|
||||
{
|
||||
return bool(x) ? v <= *x : false;
|
||||
}
|
||||
|
||||
template <class T> constexpr bool operator<=(const optional<T&>& x, const T& v)
|
||||
{
|
||||
return bool(x) ? *x <= v : true;
|
||||
}
|
||||
|
||||
template <class T> constexpr bool operator>=(const T& v, const optional<T&>& x)
|
||||
{
|
||||
return bool(x) ? v >= *x : true;
|
||||
}
|
||||
|
||||
// Comparison of optional<T const&> with T
|
||||
template <class T> constexpr bool operator==(const optional<const T&>& x, const T& v)
|
||||
{
|
||||
return bool(x) ? *x == v : false;
|
||||
}
|
||||
|
||||
template <class T> constexpr bool operator==(const T& v, const optional<const T&>& x)
|
||||
{
|
||||
return bool(x) ? v == *x : false;
|
||||
}
|
||||
|
||||
template <class T> constexpr bool operator!=(const optional<const T&>& x, const T& v)
|
||||
{
|
||||
return bool(x) ? *x != v : true;
|
||||
}
|
||||
|
||||
template <class T> constexpr bool operator!=(const T& v, const optional<const T&>& x)
|
||||
{
|
||||
return bool(x) ? v != *x : true;
|
||||
}
|
||||
|
||||
template <class T> constexpr bool operator<(const optional<const T&>& x, const T& v)
|
||||
{
|
||||
return bool(x) ? *x < v : true;
|
||||
}
|
||||
|
||||
template <class T> constexpr bool operator>(const T& v, const optional<const T&>& x)
|
||||
{
|
||||
return bool(x) ? v > *x : true;
|
||||
}
|
||||
|
||||
template <class T> constexpr bool operator>(const optional<const T&>& x, const T& v)
|
||||
{
|
||||
return bool(x) ? *x > v : false;
|
||||
}
|
||||
|
||||
template <class T> constexpr bool operator<(const T& v, const optional<const T&>& x)
|
||||
{
|
||||
return bool(x) ? v < *x : false;
|
||||
}
|
||||
|
||||
template <class T> constexpr bool operator>=(const optional<const T&>& x, const T& v)
|
||||
{
|
||||
return bool(x) ? *x >= v : false;
|
||||
}
|
||||
|
||||
template <class T> constexpr bool operator<=(const T& v, const optional<const T&>& x)
|
||||
{
|
||||
return bool(x) ? v <= *x : false;
|
||||
}
|
||||
|
||||
template <class T> constexpr bool operator<=(const optional<const T&>& x, const T& v)
|
||||
{
|
||||
return bool(x) ? *x <= v : true;
|
||||
}
|
||||
|
||||
template <class T> constexpr bool operator>=(const T& v, const optional<const T&>& x)
|
||||
{
|
||||
return bool(x) ? v >= *x : true;
|
||||
}
|
||||
|
||||
|
||||
// 20.5.12, Specialized algorithms
|
||||
template <class T>
|
||||
void swap(optional<T>& x, optional<T>& y) noexcept(noexcept(x.swap(y)))
|
||||
{
|
||||
x.swap(y);
|
||||
}
|
||||
|
||||
|
||||
template <class T>
|
||||
constexpr optional<typename std::decay<T>::type> make_optional(T&& v)
|
||||
{
|
||||
return optional<typename std::decay<T>::type>(constexpr_forward<T>(v));
|
||||
}
|
||||
|
||||
template <class X>
|
||||
constexpr optional<X&> make_optional(std::reference_wrapper<X> v)
|
||||
{
|
||||
return optional<X&>(v.get());
|
||||
}
|
||||
|
||||
|
||||
} // namespace wpi
|
||||
|
||||
namespace std
|
||||
{
|
||||
template <typename T>
|
||||
struct hash<wpi::optional<T>>
|
||||
{
|
||||
typedef typename hash<T>::result_type result_type;
|
||||
typedef wpi::optional<T> argument_type;
|
||||
|
||||
constexpr result_type operator()(argument_type const& arg) const {
|
||||
return arg ? std::hash<T>{}(*arg) : result_type{};
|
||||
}
|
||||
};
|
||||
|
||||
template <typename T>
|
||||
struct hash<wpi::optional<T&>>
|
||||
{
|
||||
typedef typename hash<T>::result_type result_type;
|
||||
typedef wpi::optional<T&> argument_type;
|
||||
|
||||
constexpr result_type operator()(argument_type const& arg) const {
|
||||
return arg ? std::hash<T>{}(*arg) : result_type{};
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
# undef TR2_OPTIONAL_REQUIRES
|
||||
# undef TR2_OPTIONAL_ASSERTED_EXPRESSION
|
||||
|
||||
# endif //WPIUTIL_WPI_OPTIONAL_H
|
||||
1520
wpiutil/src/test/native/cpp/test_optional.cpp
Normal file
1520
wpiutil/src/test/native/cpp/test_optional.cpp
Normal file
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user