feedc0de/mp-units
1
0
Fork 0
forked from mpusz/mp-units
Code Pull Requests Activity

refactor: quantity_io refactored to V2

Browse Source
This commit is contained in:
Mateusz Pusz
2022-11-06 19:15:11 -10:00
parent f1caad7b74
commit b46e9e1dbd
2 changed files with 8 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/core-io/include/units/bits/external/fixed_string_io.h vendored
View File

@@ -1,37 +0,0 @@
// The MIT License (MIT)
//
// Copyright (c) 2018 Mateusz Pusz
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in all
// copies or substantial portions of the Software.
//
// 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 AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE.
#pragma once
#include <units/bits/external/fixed_string.h>
#include <ostream>
namespace units {
template<typename CharT, class Traits, std::size_t N>
std::basic_ostream<CharT, Traits>& operator<<(std::basic_ostream<CharT, Traits>& os,
const basic_fixed_string<CharT, N>& txt)
{
return os << txt.c_str();
}
} // namespace units

20
src/core-io/include/units/quantity_io.h
View File

@@ -24,31 +24,27 @@
#pragma once #pragma once
#include <units/quantity.h> #include <units/quantity.h>
#include <units/unit.h>
// IWYU pragma: begin_exports
#include <units/bits/external/fixed_string_io.h>
#include <units/bits/unit_text.h>
#include <sstream> #include <sstream>
// IWYU pragma: end_exports
namespace units { namespace units {
namespace detail { namespace detail {
template<typename CharT, class Traits, typename D, typename U, typename Rep> template<typename CharT, class Traits, auto R, typename Rep>
void to_stream(std::basic_ostream<CharT, Traits>& os, const quantity<D, U, Rep>& q) void to_stream(std::basic_ostream<CharT, Traits>& os, const quantity<R, Rep>& q)
{ {
os << q.number(); os << q.number();
constexpr auto symbol = detail::unit_text<D, U>(); if constexpr (!std::derived_from<decltype(R.unit), derived_unit<>>) {
if constexpr (!symbol.standard().empty()) { os << " ";
os << " " << symbol.standard(); unit_symbol_to<CharT>(std::ostream_iterator<CharT>(os), R.unit);
} }
} }
} // namespace detail } // namespace detail
template<typename CharT, typename Traits, typename D, typename U, typename Rep> template<typename CharT, typename Traits, auto R, typename Rep>
std::basic_ostream<CharT, Traits>& operator<<(std::basic_ostream<CharT, Traits>& os, const quantity<D, U, Rep>& q) std::basic_ostream<CharT, Traits>& operator<<(std::basic_ostream<CharT, Traits>& os, const quantity<R, Rep>& q)
requires requires { os << q.number(); } requires requires { os << q.number(); }
{ {
if (os.width()) { if (os.width()) {