From 44ba9a9eebec2ffe202fc5594f76864a56f3730a Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Wed, 23 Jul 2014 17:05:58 -0700 Subject: Enums are not usually integers, sorry --- src/io/cxxstdio.hpp | 85 ++------------------------------------------- src/io/cxxstdio_enums.cpp | 26 ++++++++++++++ src/io/cxxstdio_enums.hpp | 87 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 115 insertions(+), 83 deletions(-) create mode 100644 src/io/cxxstdio_enums.cpp create mode 100644 src/io/cxxstdio_enums.hpp (limited to 'src/io') diff --git a/src/io/cxxstdio.hpp b/src/io/cxxstdio.hpp index 20d3a33..7312382 100644 --- a/src/io/cxxstdio.hpp +++ b/src/io/cxxstdio.hpp @@ -25,8 +25,6 @@ #include "../compat/cast.hpp" -#include "../generic/enum.hpp" - #include "../diagnostics.hpp" @@ -54,10 +52,9 @@ namespace cxxstdio } template::value>::type> - typename remove_enum::type decay_for_printf(T v) + T decay_for_printf(T v) { - typedef typename remove_enum::type repr_type; - return repr_type(v); + return v; } template()))> @@ -69,84 +66,6 @@ namespace cxxstdio inline const char *convert_for_printf(const char *) = delete; -#if 0 - template - constexpr - E get_enum_min_value(decltype(E::min_value)) - { - return E::min_value; - } - template - constexpr - E get_enum_min_value(E def) - { - return def; - } - - template - constexpr - E get_enum_max_value(decltype(E::max_value)) - { - return E::max_value; - } - template - constexpr - E get_enum_max_value(E def) - { - return def; - } -#else - template - constexpr - E get_enum_min_value(E) - { - return E::min_value; - } - template - constexpr - E get_enum_max_value(E) - { - return E::max_value; - } -#endif - - template - class EnumConverter - { - E& out; - typedef typename underlying_type::type U; -#if 0 - constexpr static - U min_value = U(get_enum_min_value(E(std::numeric_limits::min()))); - constexpr static - U max_value = U(get_enum_max_value(E(std::numeric_limits::max()))); -#else - constexpr static - U min_value = U(get_enum_min_value(E())); - constexpr static - U max_value = U(get_enum_max_value(E())); -#endif - U mid; - public: - EnumConverter(E& e) - : out(e), mid(0) - {} - ~EnumConverter() - { - DIAG_PUSH(); - DIAG_I(type_limits); - if (min_value <= mid && mid <= max_value) - { - DIAG_POP(); - out = E(mid); - } - } - U *operator &() - { - return ∣ - } - }; - template class PrintFormatter { diff --git a/src/io/cxxstdio_enums.cpp b/src/io/cxxstdio_enums.cpp new file mode 100644 index 0000000..216da1d --- /dev/null +++ b/src/io/cxxstdio_enums.cpp @@ -0,0 +1,26 @@ +#include "cxxstdio_enums.hpp" +// cxxstdio_enums.cpp - Opt-in integer formatting support for enums. +// +// Copyright © 2014 Ben Longbons +// +// This file is part of The Mana World (Athena server) +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + +#include "../poison.hpp" + + +namespace tmwa +{ +} // namespace tmwa diff --git a/src/io/cxxstdio_enums.hpp b/src/io/cxxstdio_enums.hpp new file mode 100644 index 0000000..3a11dde --- /dev/null +++ b/src/io/cxxstdio_enums.hpp @@ -0,0 +1,87 @@ +#pragma once +// cxxstdio_enums.hpp - Opt-in integer formatting support for enums. +// +// Copyright © 2014 Ben Longbons +// +// This file is part of The Mana World (Athena server) +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + +#include "fwd.hpp" + +#include + +#include "../generic/enum.hpp" + + +namespace tmwa +{ +namespace e +{ +enum class BF : uint16_t; +enum class EPOS : uint16_t; +enum class MapCell : uint8_t; +enum class Option : uint16_t; + +inline +auto decay_for_printf(BF v) -> typename remove_enum::type { return typename remove_enum::type(v); } +inline +auto decay_for_printf(EPOS v) -> typename remove_enum::type { return typename remove_enum::type(v); } +inline +auto decay_for_printf(MapCell v) -> typename remove_enum::type { return typename remove_enum::type(v); } +inline +auto decay_for_printf(Option v) -> typename remove_enum::type { return typename remove_enum::type(v); } +} + +enum class AREA : uint8_t; +enum class BL : uint8_t; +enum class ByteCode : uint8_t; +enum class EFFECT : uint8_t; +enum class EXPR : uint8_t; +enum class ItemLook : uint16_t; +enum class MS : uint8_t; +enum class SP : uint16_t; +enum class SPELLARG : uint8_t; +enum class SPELLGUARD : uint8_t; +enum class SkillID : uint16_t; +enum class StatusChange : uint16_t; +enum class TYPE : uint8_t; + +inline +auto decay_for_printf(AREA v) -> typename remove_enum::type { return typename remove_enum::type(v); } +inline +auto decay_for_printf(BL v) -> typename remove_enum::type { return typename remove_enum::type(v); } +inline +auto decay_for_printf(ByteCode v) -> typename remove_enum::type { return typename remove_enum::type(v); } +inline +auto decay_for_printf(EFFECT v) -> typename remove_enum::type { return typename remove_enum::type(v); } +inline +auto decay_for_printf(EXPR v) -> typename remove_enum::type { return typename remove_enum::type(v); } +inline +auto decay_for_printf(ItemLook v) -> typename remove_enum::type { return typename remove_enum::type(v); } +inline +auto decay_for_printf(MS v) -> typename remove_enum::type { return typename remove_enum::type(v); } +inline +auto decay_for_printf(SP v) -> typename remove_enum::type { return typename remove_enum::type(v); } +inline +auto decay_for_printf(SPELLARG v) -> typename remove_enum::type { return typename remove_enum::type(v); } +inline +auto decay_for_printf(SPELLGUARD v) -> typename remove_enum::type { return typename remove_enum::type(v); } +inline +auto decay_for_printf(SkillID v) -> typename remove_enum::type { return typename remove_enum::type(v); } +inline +auto decay_for_printf(StatusChange v) -> typename remove_enum::type { return typename remove_enum::type(v); } +inline +auto decay_for_printf(TYPE v) -> typename remove_enum::type { return typename remove_enum::type(v); } +} // namespace tmwa -- cgit v1.2.3-70-g09d2