coffee/better-enums
1
0
Fork 0
mirror of https://github.com/aantron/better-enums.git synced 2025-12-06 16:56:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Removed double underscores from macro names.

Browse Source 
Names containing (and not only beginning with) double underscores are
reserved in C++.

Resolves #15.
This commit is contained in:
Mikhail Ovchinnikov 2016-02-24 17:42:22 +03:00 committed by Anton Bachin
parent f45897fcb3
commit 76ad2256dd
4 changed files with 433 additions and 434 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

802
enum.h
View File

File diff suppressed because it is too large Load Diff

6
extra/better-enums/n4428.h
View File

@ -12,8 +12,8 @@
#pragma once #pragma once
#ifndef BETTER_ENUMS__N4428_H #ifndef BETTER_ENUMS_N4428_H
#define BETTER_ENUMS__N4428_H #define BETTER_ENUMS_N4428_H
@ -49,4 +49,4 @@ struct enum_traits {
#endif // #ifndef BETTER_ENUMS__N4428_H #endif // #ifndef BETTER_ENUMS_N4428_H

49
script/make_macros.py
View File

@ -5,14 +5,13 @@
# You only need this script if you are developing enum.h, or run into a limit. # You only need this script if you are developing enum.h, or run into a limit.
# #
# This script generates the macros BETTER_ENUMS__PP_MAP and # This script generates the macros BETTER_ENUMS_PP_MAP and BETTER_ENUMS_ITERATE,
# BETTER_ENUMS__ITERATE, used internally by enum.h. These are already inlined # used internally by enum.h. These are already inlined into enum.h.
# into enum.h.
# #
# BETTER_ENUMS__PP_MAP has a limit, which determines the maximum number of # BETTER_ENUMS_PP_MAP has a limit, which determines the maximum number of
# constants an enum can have. By default, this limit is 64 constants. # constants an enum can have. By default, this limit is 64 constants.
# #
# BETTER_ENUMS__ITERATE also has a limit. This one determines the maximum length # BETTER_ENUMS_ITERATE also has a limit. This one determines the maximum length
# of the name of a constant that is followed by an initializer (" = 2") when # of the name of a constant that is followed by an initializer (" = 2") when
# compiling an enum with constexpr _to_string function (i.e. usually, this limit # compiling an enum with constexpr _to_string function (i.e. usually, this limit
# does not apply). By default, the limit is 23 characters (24 with the # does not apply). By default, the limit is 23 characters (24 with the
@ -68,38 +67,38 @@ def generate(stream, constants, length, script):
print >> stream, '' print >> stream, ''
print >> stream, '#pragma once' print >> stream, '#pragma once'
print >> stream, '' print >> stream, ''
print >> stream, '#ifndef BETTER_ENUMS__MACRO_FILE_H' print >> stream, '#ifndef BETTER_ENUMS_MACRO_FILE_H'
print >> stream, '#define BETTER_ENUMS__MACRO_FILE_H' print >> stream, '#define BETTER_ENUMS_MACRO_FILE_H'
print >> stream, '' print >> stream, ''
print >> stream, '#define BETTER_ENUMS__PP_MAP(macro, data, ...) \\' print >> stream, '#define BETTER_ENUMS_PP_MAP(macro, data, ...) \\'
print >> stream, ' BETTER_ENUMS__ID( \\' print >> stream, ' BETTER_ENUMS_ID( \\'
print >> stream, ' BETTER_ENUMS__APPLY( \\' print >> stream, ' BETTER_ENUMS_APPLY( \\'
print >> stream, ' BETTER_ENUMS__PP_MAP_VAR_COUNT, \\' print >> stream, ' BETTER_ENUMS_PP_MAP_VAR_COUNT, \\'
print >> stream, ' BETTER_ENUMS__PP_COUNT(__VA_ARGS__)) \\' print >> stream, ' BETTER_ENUMS_PP_COUNT(__VA_ARGS__)) \\'
print >> stream, ' (macro, data, __VA_ARGS__))' print >> stream, ' (macro, data, __VA_ARGS__))'
print >> stream, '' print >> stream, ''
print >> stream, '#define BETTER_ENUMS__PP_MAP_VAR_COUNT(count) ' + \ print >> stream, '#define BETTER_ENUMS_PP_MAP_VAR_COUNT(count) ' + \
'BETTER_ENUMS__M ## count' 'BETTER_ENUMS_M ## count'
print >> stream, '' print >> stream, ''
print >> stream, '#define BETTER_ENUMS__APPLY(macro, ...) ' + \ print >> stream, '#define BETTER_ENUMS_APPLY(macro, ...) ' + \
'BETTER_ENUMS__ID(macro(__VA_ARGS__))' 'BETTER_ENUMS_ID(macro(__VA_ARGS__))'
print >> stream, '' print >> stream, ''
print >> stream, '#define BETTER_ENUMS__ID(x) x' print >> stream, '#define BETTER_ENUMS_ID(x) x'
print >> stream, '' print >> stream, ''
print >> stream, '#define BETTER_ENUMS__M1(m, d, x) m(d,0,x)' print >> stream, '#define BETTER_ENUMS_M1(m, d, x) m(d,0,x)'
for index in range(2, constants + 1): for index in range(2, constants + 1):
print >> stream, '#define BETTER_ENUMS__M' + str(index) + \ print >> stream, '#define BETTER_ENUMS_M' + str(index) + \
'(m,d,x,...) m(d,' + str(index - 1) + ',x) \\' '(m,d,x,...) m(d,' + str(index - 1) + ',x) \\'
print >> stream, ' BETTER_ENUMS__ID(BETTER_ENUMS__M' + \ print >> stream, ' BETTER_ENUMS_ID(BETTER_ENUMS_M' + \
str(index - 1) + '(m,d,__VA_ARGS__))' str(index - 1) + '(m,d,__VA_ARGS__))'
print >> stream, '' print >> stream, ''
pp_count_impl_prefix = '#define BETTER_ENUMS__PP_COUNT_IMPL(_1,' pp_count_impl_prefix = '#define BETTER_ENUMS_PP_COUNT_IMPL(_1,'
stream.write(pp_count_impl_prefix) stream.write(pp_count_impl_prefix)
pp_count_impl = MultiLine(stream = stream, indent = 4, pp_count_impl = MultiLine(stream = stream, indent = 4,
initial_column = len(pp_count_impl_prefix)) initial_column = len(pp_count_impl_prefix))
@ -111,9 +110,9 @@ def generate(stream, constants, length, script):
print >> stream, '' print >> stream, ''
print >> stream, '' print >> stream, ''
print >> stream, '#define BETTER_ENUMS__PP_COUNT(...) \\' print >> stream, '#define BETTER_ENUMS_PP_COUNT(...) \\'
pp_count_prefix = \ pp_count_prefix = \
' BETTER_ENUMS__ID(BETTER_ENUMS__PP_COUNT_IMPL(__VA_ARGS__,' ' BETTER_ENUMS_ID(BETTER_ENUMS_PP_COUNT_IMPL(__VA_ARGS__,'
stream.write(pp_count_prefix) stream.write(pp_count_prefix)
pp_count = MultiLine(stream = stream, indent = 8, pp_count = MultiLine(stream = stream, indent = 8,
initial_column = len(pp_count_prefix)) initial_column = len(pp_count_prefix))
@ -123,7 +122,7 @@ def generate(stream, constants, length, script):
print >> stream, '' print >> stream, ''
print >> stream, '' print >> stream, ''
iterate_prefix = '#define BETTER_ENUMS__ITERATE(X, f, l)' iterate_prefix = '#define BETTER_ENUMS_ITERATE(X, f, l)'
stream.write(iterate_prefix) stream.write(iterate_prefix)
iterate = MultiLine(stream = stream, indent = 4, iterate = MultiLine(stream = stream, indent = 4,
initial_column = len(iterate_prefix)) initial_column = len(iterate_prefix))
@ -132,7 +131,7 @@ def generate(stream, constants, length, script):
print >> stream, '' print >> stream, ''
print >> stream, '' print >> stream, ''
print >> stream, '#endif // #ifndef BETTER_ENUMS__MACRO_FILE_H' print >> stream, '#endif // #ifndef BETTER_ENUMS_MACRO_FILE_H'
if __name__ == '__main__': if __name__ == '__main__':
if len(sys.argv) != 3: if len(sys.argv) != 3:

6
test/cxxtest/general.h
View File

@ -26,9 +26,9 @@ BETTER_ENUM(Namespaced, short, One, Two)
// Using _ENUM_HAVE_CONSTEXPR as a proxy for C++11 support. This should be // Using BETTER_ENUMS_HAVE_CONSTEXPR_ as a proxy for C++11 support. This should
// changed to be more precise in the future. // be changed to be more precise in the future.
#ifdef BETTER_ENUMS__HAVE_CONSTEXPR #ifdef BETTER_ENUMS_HAVE_CONSTEXPR_
#include <type_traits> #include <type_traits>