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/char/char.cpp | 2 + src/char/int_storage.cpp | 1 + src/io/cxxstdio.hpp | 85 +------------------------------------ src/io/cxxstdio_enums.cpp | 26 ++++++++++++ src/io/cxxstdio_enums.hpp | 87 ++++++++++++++++++++++++++++++++++++++ src/map/atcommand.cpp | 2 + src/map/battle.cpp | 1 + src/map/clif.cpp | 1 + src/map/itemdb.cpp | 1 + src/map/magic-expr.cpp | 1 + src/map/magic-interpreter-base.cpp | 1 + src/map/magic-stmt.cpp | 1 + src/map/map.cpp | 1 + src/map/mapflag.cpp | 3 +- src/map/mapflag.hpp | 3 +- src/map/mob.cpp | 14 +++--- src/map/pc.cpp | 1 + src/map/script.cpp | 1 + src/map/skill-pools.cpp | 1 + src/map/skill.cpp | 2 + src/mmo/extract.cpp | 1 + src/mmo/extract.hpp | 5 +-- src/mmo/extract_enums.cpp | 26 ++++++++++++ src/mmo/extract_enums.hpp | 69 ++++++++++++++++++++++++++++++ 24 files changed, 240 insertions(+), 96 deletions(-) create mode 100644 src/io/cxxstdio_enums.cpp create mode 100644 src/io/cxxstdio_enums.hpp create mode 100644 src/mmo/extract_enums.cpp create mode 100644 src/mmo/extract_enums.hpp diff --git a/src/char/char.cpp b/src/char/char.cpp index b9cf17b..d5e887b 100644 --- a/src/char/char.cpp +++ b/src/char/char.cpp @@ -49,6 +49,7 @@ #include "../generic/array.hpp" #include "../io/cxxstdio.hpp" +#include "../io/cxxstdio_enums.hpp" #include "../io/lock.hpp" #include "../io/read.hpp" #include "../io/tty.hpp" @@ -67,6 +68,7 @@ #include "../mmo/config_parse.hpp" #include "../mmo/core.hpp" #include "../mmo/extract.hpp" +#include "../mmo/extract_enums.hpp" #include "../mmo/human_time_diff.hpp" #include "../mmo/mmo.hpp" #include "../mmo/utils.hpp" diff --git a/src/char/int_storage.cpp b/src/char/int_storage.cpp index 01665ec..76eff34 100644 --- a/src/char/int_storage.cpp +++ b/src/char/int_storage.cpp @@ -28,6 +28,7 @@ #include "../generic/db.hpp" #include "../io/cxxstdio.hpp" +#include "../io/cxxstdio_enums.hpp" #include "../io/lock.hpp" #include "../io/read.hpp" #include "../io/write.hpp" 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 diff --git a/src/map/atcommand.cpp b/src/map/atcommand.cpp index 11f6eb1..342f6ef 100644 --- a/src/map/atcommand.cpp +++ b/src/map/atcommand.cpp @@ -39,6 +39,7 @@ #include "../generic/random.hpp" #include "../io/cxxstdio.hpp" +#include "../io/cxxstdio_enums.hpp" #include "../io/read.hpp" #include "../io/write.hpp" @@ -48,6 +49,7 @@ #include "../mmo/config_parse.hpp" #include "../mmo/core.hpp" #include "../mmo/extract.hpp" +#include "../mmo/extract_enums.hpp" #include "../mmo/human_time_diff.hpp" #include "../mmo/ids.hpp" #include "../mmo/mmo.hpp" diff --git a/src/map/battle.cpp b/src/map/battle.cpp index eabe8a6..856408c 100644 --- a/src/map/battle.cpp +++ b/src/map/battle.cpp @@ -32,6 +32,7 @@ #include "../generic/random.hpp" #include "../io/cxxstdio.hpp" +#include "../io/cxxstdio_enums.hpp" #include "../io/read.hpp" #include "../mmo/config_parse.hpp" diff --git a/src/map/clif.cpp b/src/map/clif.cpp index e7557c8..bb21ca9 100644 --- a/src/map/clif.cpp +++ b/src/map/clif.cpp @@ -36,6 +36,7 @@ #include "../strings/xstring.hpp" #include "../io/cxxstdio.hpp" +#include "../io/cxxstdio_enums.hpp" #include "../io/write.hpp" #include "../net/ip.hpp" diff --git a/src/map/itemdb.cpp b/src/map/itemdb.cpp index edc9982..50cc5c4 100644 --- a/src/map/itemdb.cpp +++ b/src/map/itemdb.cpp @@ -33,6 +33,7 @@ #include "../mmo/config_parse.hpp" #include "../mmo/extract.hpp" +#include "../mmo/extract_enums.hpp" #include "../poison.hpp" diff --git a/src/map/magic-expr.cpp b/src/map/magic-expr.cpp index dfb65c5..2d2eba9 100644 --- a/src/map/magic-expr.cpp +++ b/src/map/magic-expr.cpp @@ -33,6 +33,7 @@ #include "../generic/random.hpp" #include "../io/cxxstdio.hpp" +#include "../io/cxxstdio_enums.hpp" #include "battle.hpp" #include "itemdb.hpp" diff --git a/src/map/magic-interpreter-base.cpp b/src/map/magic-interpreter-base.cpp index 768a7df..e628719 100644 --- a/src/map/magic-interpreter-base.cpp +++ b/src/map/magic-interpreter-base.cpp @@ -25,6 +25,7 @@ #include "../strings/xstring.hpp" #include "../io/cxxstdio.hpp" +#include "../io/cxxstdio_enums.hpp" #include "../net/timer.hpp" diff --git a/src/map/magic-stmt.cpp b/src/map/magic-stmt.cpp index 9aca511..f8f3b03 100644 --- a/src/map/magic-stmt.cpp +++ b/src/map/magic-stmt.cpp @@ -29,6 +29,7 @@ #include "../generic/random2.hpp" #include "../io/cxxstdio.hpp" +#include "../io/cxxstdio_enums.hpp" #include "../net/timer.hpp" diff --git a/src/map/map.cpp b/src/map/map.cpp index 033f299..832e6aa 100644 --- a/src/map/map.cpp +++ b/src/map/map.cpp @@ -45,6 +45,7 @@ #include "../generic/random2.hpp" #include "../io/cxxstdio.hpp" +#include "../io/cxxstdio_enums.hpp" #include "../io/read.hpp" #include "../io/tty.hpp" #include "../io/write.hpp" diff --git a/src/map/mapflag.cpp b/src/map/mapflag.cpp index f9cf8f6..be2ae67 100644 --- a/src/map/mapflag.cpp +++ b/src/map/mapflag.cpp @@ -38,8 +38,7 @@ void MapFlags::set(MapFlag mf, bool val) flags &=~ static_cast(mf); } -template<> -bool extract(XString str, MapFlag *mf) +bool extract(XString str, MapFlag *mf) { const struct { diff --git a/src/map/mapflag.hpp b/src/map/mapflag.hpp index 197d250..6d046fa 100644 --- a/src/map/mapflag.hpp +++ b/src/map/mapflag.hpp @@ -77,8 +77,7 @@ public: void set(MapFlag, bool); }; -template<> -bool extract(XString str, MapFlag *mf); +bool extract(XString str, MapFlag *mf); MapFlag map_flag_from_int(int shift); } // namespace tmwa diff --git a/src/map/mob.cpp b/src/map/mob.cpp index 1fd8cf3..dd061d0 100644 --- a/src/map/mob.cpp +++ b/src/map/mob.cpp @@ -36,6 +36,7 @@ #include "../generic/random.hpp" #include "../io/cxxstdio.hpp" +#include "../io/cxxstdio_enums.hpp" #include "../io/read.hpp" #include "../net/socket.hpp" @@ -43,6 +44,7 @@ #include "../mmo/config_parse.hpp" #include "../mmo/extract.hpp" +#include "../mmo/extract_enums.hpp" #include "battle.hpp" #include "clif.hpp" @@ -3582,8 +3584,8 @@ bool mob_readdb(ZString filename) return rv; } -template<> -bool extract(XString str, MobSkillCondition *msc) +static +bool extract(XString str, MobSkillCondition *msc) { const struct { @@ -3606,8 +3608,8 @@ bool extract(XString str, MobSkillCondition *msc) return false; } -template<> -bool extract(XString str, MobSkillState *mss) +static +bool extract(XString str, MobSkillState *mss) { const struct { @@ -3629,8 +3631,8 @@ bool extract(XString str, MobSkillState *mss) return false; } -template<> -bool extract(XString str, MobSkillTarget *mst) +static +bool extract(XString str, MobSkillTarget *mst) { const struct { diff --git a/src/map/pc.cpp b/src/map/pc.cpp index 03e2e76..0cb8382 100644 --- a/src/map/pc.cpp +++ b/src/map/pc.cpp @@ -37,6 +37,7 @@ #include "../generic/random.hpp" #include "../io/cxxstdio.hpp" +#include "../io/cxxstdio_enums.hpp" #include "../io/read.hpp" #include "../net/timer.hpp" diff --git a/src/map/script.cpp b/src/map/script.cpp index 0b2d05e..22fcb41 100644 --- a/src/map/script.cpp +++ b/src/map/script.cpp @@ -44,6 +44,7 @@ #include "../generic/random.hpp" #include "../io/cxxstdio.hpp" +#include "../io/cxxstdio_enums.hpp" #include "../io/lock.hpp" #include "../io/read.hpp" #include "../io/write.hpp" diff --git a/src/map/skill-pools.cpp b/src/map/skill-pools.cpp index e37b7e3..89bf426 100644 --- a/src/map/skill-pools.cpp +++ b/src/map/skill-pools.cpp @@ -21,6 +21,7 @@ // along with this program. If not, see . #include "../io/cxxstdio.hpp" +#include "../io/cxxstdio_enums.hpp" #include "battle.hpp" #include "pc.hpp" diff --git a/src/map/skill.cpp b/src/map/skill.cpp index f579920..20dcb1a 100644 --- a/src/map/skill.cpp +++ b/src/map/skill.cpp @@ -39,11 +39,13 @@ #include "../generic/random.hpp" #include "../io/cxxstdio.hpp" +#include "../io/cxxstdio_enums.hpp" #include "../io/read.hpp" #include "../net/timer.hpp" #include "../mmo/extract.hpp" +#include "../mmo/extract_enums.hpp" #include "battle.hpp" #include "clif.hpp" diff --git a/src/mmo/extract.cpp b/src/mmo/extract.cpp index d486ed5..a480984 100644 --- a/src/mmo/extract.cpp +++ b/src/mmo/extract.cpp @@ -24,6 +24,7 @@ #include "../strings/xstring.hpp" #include "../strings/vstring.hpp" +#include "extract_enums.hpp" #include "mmo.hpp" #include "../poison.hpp" diff --git a/src/mmo/extract.hpp b/src/mmo/extract.hpp index 355e2da..ed2eb78 100644 --- a/src/mmo/extract.hpp +++ b/src/mmo/extract.hpp @@ -79,9 +79,8 @@ bool extract(XString str, TimeT *tv) return extract(str, &tv->value); } -// extra typename=void to workaround some duplicate overload rule -template::value>::type, typename=void> -bool extract(XString str, T *iv) +template::value>::type> +bool extract_as_int(XString str, T *iv) { typedef typename underlying_type::type U; U v; diff --git a/src/mmo/extract_enums.cpp b/src/mmo/extract_enums.cpp new file mode 100644 index 0000000..f906179 --- /dev/null +++ b/src/mmo/extract_enums.cpp @@ -0,0 +1,26 @@ +#include "extract_enums.hpp" +// extract_enums.cpp - Opt-in integer extraction 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/mmo/extract_enums.hpp b/src/mmo/extract_enums.hpp new file mode 100644 index 0000000..613fae9 --- /dev/null +++ b/src/mmo/extract_enums.hpp @@ -0,0 +1,69 @@ +#pragma once +// extract_enums.hpp - Opt-in integer extraction 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 "extract.hpp" + + +namespace tmwa +{ +namespace e +{ +enum class EPOS : uint16_t; +enum class MobMode : uint16_t; +enum class Opt1 : uint16_t; +enum class Opt2 : uint16_t; +enum class Option : uint16_t; + +inline +bool extract(XString str, EPOS *iv) { return extract_as_int(str, iv); } +inline +bool extract(XString str, MobMode *iv) { return extract_as_int(str, iv); } +inline +bool extract(XString str, Opt1 *iv) { return extract_as_int(str, iv); } +inline +bool extract(XString str, Opt2 *iv) { return extract_as_int(str, iv); } +inline +bool extract(XString str, Option *iv) { return extract_as_int(str, iv); } +} + +enum class ItemLook : uint16_t; +enum class ItemType : uint8_t; +enum class Race : uint8_t; +enum class SEX : uint8_t; +enum class SkillID : uint16_t; +enum class StatusChange : uint16_t; + +inline +bool extract(XString str, ItemLook *iv) { return extract_as_int(str, iv); } +inline +bool extract(XString str, ItemType *iv) { return extract_as_int(str, iv); } +inline +bool extract(XString str, Race *iv) { return extract_as_int(str, iv); } +inline +bool extract(XString str, SEX *iv) { return extract_as_int(str, iv); } +inline +bool extract(XString str, SkillID *iv) { return extract_as_int(str, iv); } +inline +bool extract(XString str, StatusChange *iv) { return extract_as_int(str, iv); } +} // namespace tmwa -- cgit v1.2.3-70-g09d2