From 3c82863c528fa9ea1bd5eb75fa596a99266431b7 Mon Sep 17 00:00:00 2001 From: Peter Keresztes Schmidt Date: Thu, 20 Aug 2020 00:46:52 +0200 Subject: Core/ChatCommands: Check whether a passed numeric enum value is valid (#25285) (cherry picked from commit 4286e7aa02e777268b25d8a5bcc1ee87f7b16c4d) --- contrib/enumutils_describe.py | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'contrib/enumutils_describe.py') diff --git a/contrib/enumutils_describe.py b/contrib/enumutils_describe.py index 6da72d25198..203cfca8538 100644 --- a/contrib/enumutils_describe.py +++ b/contrib/enumutils_describe.py @@ -108,9 +108,7 @@ def processFile(path, filename): output.write('#include "SmartEnum.h"\n') output.write('#include \n') output.write('\n') - output.write('namespace Trinity\n') - output.write('{\n') - output.write('namespace Impl\n') + output.write('namespace Trinity::Impl\n') output.write('{\n') for name, values in enums: tag = ('data for enum \'%s\' in \'%s.h\' auto-generated' % (name, filename)) @@ -129,10 +127,10 @@ def processFile(path, filename): output.write(' }\n') output.write('}\n') output.write('\n') - output.write('template <>\n'); + output.write('template <>\n') output.write('TC_API_EXPORT size_t EnumUtils<%s>::Count() { return %d; }\n' % (name, len(values))) output.write('\n') - output.write('template <>\n'); + output.write('template <>\n') output.write('TC_API_EXPORT %s EnumUtils<%s>::FromIndex(size_t index)\n' % (name, name)) output.write('{\n') output.write(' switch (index)\n') @@ -142,9 +140,19 @@ def processFile(path, filename): output.write(' default: throw std::out_of_range("index");\n') output.write(' }\n') output.write('}\n') + output.write('\n') + output.write('template <>\n') + output.write('TC_API_EXPORT size_t EnumUtils<%s>::ToIndex(%s value)\n' % (name, name)) + output.write('{\n') + output.write(' switch (value)\n') + output.write(' {\n') + for i in range(len(values)): + output.write(' case %s: return %d;\n' % (values[i][0], i)) + output.write(' default: throw std::out_of_range("value");\n') + output.write(' }\n') + output.write('}\n') output.write('}\n') - output.write('}\n') FilenamePattern = compile(r'^(.+)\.h$') for root, dirs, files in walk('.'): -- cgit v1.2.3