King_DuckZ/Sprout
1
0
Fork 0
mirror of https://github.com/bolero-MURAKAMI/Sprout synced 2025-08-03 12:49:50 +00:00
Code Issues Releases Wiki Activity

add test optional

Browse source
This commit is contained in:
bolero-MURAKAMI 2012-10-27 15:37:39 +09:00
parent f9d8908f95
commit 5aa4cf8cbe
5 changed files with 338 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sprout/optional/io.hpp
View file

@ -13,7 +13,7 @@ namespace sprout {
//
template<typename Elem, typename Traits, typename T>
inline std::basic_istream<Elem, Traits>&
operator<<(std::basic_istream<Elem, Traits>& lhs, sprout::optional<T>& rhs) {
operator>>(std::basic_istream<Elem, Traits>& lhs, sprout::optional<T>& rhs) {
if (lhs.good()) {
int d = lhs.get();
if (d == ' ') {

26
sprout/optional/optional.hpp
View file

@ -55,10 +55,10 @@ namespace sprout {
: init(v.init)
, val(v.val)
{}
template<class U>
template<typename U>
explicit SPROUT_CONSTEXPR optional(optional<U> const& v)
: init(v.init)
, val(v.val.get())
: init(v.is_initialized())
, val(v.get())
{}
optional& operator=(sprout::nullopt_t v) SPROUT_NOEXCEPT {
@ -73,7 +73,7 @@ namespace sprout {
assign(v);
return *this;
}
template<class U>
template<typename U>
optional& operator=(optional<U> const& v) {
assign(v);
return *this;
@ -84,16 +84,16 @@ namespace sprout {
}
void assign(argument_type v) {
optional temp(v);
temp.swap(v);
temp.swap(*this);
}
void assign(optional const& v) {
optional temp(v);
temp.swap(v);
temp.swap(*this);
}
template<class U>
template<typename U>
void assign(optional<U> const& v) {
optional temp(v);
temp.swap(v);
temp.swap(*this);
}
void reset() SPROUT_NOEXCEPT {
@ -113,14 +113,20 @@ namespace sprout {
sprout::swap(val, other.val);
}
SPROUT_CONSTEXPR reference_const_type operator*() const {
return get();
}
reference_type operator*() {
return get();
}
SPROUT_CONSTEXPR reference_const_type get() const {
return is_initialized() ? val.get()
: throw std::domain_error("optional: value not initialized")
: (throw std::domain_error("optional: value not initialized"), val.get())
;
}
reference_type get() {
return is_initialized() ? val.get()
: throw std::domain_error("optional: value not initialized")
: (throw std::domain_error("optional: value not initialized"), val.get())
;
}
SPROUT_CONSTEXPR reference_const_type get_value_or(reference_const_type& v) const {

6
sprout/utility/value_holder/value_holder.hpp
View file

@ -138,8 +138,10 @@ namespace sprout {
private:
holder_type holder_;
public:
value_holder() = default;
value_holder(value_holder const&) = default;
SPROUT_CONSTEXPR value_holder()
: holder_()
{}
SPROUT_CONSTEXPR value_holder(value_holder const&) = default;
explicit SPROUT_CONSTEXPR value_holder(param_type p)
: holder_(helper_type::hold(p))
{}