Eric Blake <ebl...@redhat.com> writes: > When munging enum values, the fact that we were passing the entire > prefix + value through camel_to_upper() meant that enum values > spelled with CamelCase could be turned into CAMEL_CASE. However, > this provides a potential collision (both OneTwo and One-Two would > munge into ONE_TWO) for enum types, when the same two names are > valid side-by-side as qapi member names. By changing the generation > of enum constants to always be prefix + '_' + c_name(value, > False).upper(), and ensuring that there are no case collisions (in > the next patches), we no longer have to worry about names that > would be distinct as qapi members but collide as variant tag names, > without having to think about what munging the heuristics in > camel_to_upper() will actually perform on an enum value. > > Making the change will affect enums that did not follow coding > conventions, using 'CamelCase' rather than desired 'lower-case'. > > Thankfully, there are only two culprits: InputButton and ErrorClass. > We already tweaked ErrorClass to make it an alias of QapiErrorClass, > where only the alias needs changingrather than the whole tree. So
s/changingrather/changing rather/ > the bulk of this change is modifying INPUT_BUTTON_WHEEL_UP to the > new INPUT_BUTTON_WHEELUP (and likewise for WHEELDOWN). That part > of this commit may later need reverting if we rename the enum > constants from 'WheelUp' to 'wheel-up' as part of moving > x-input-send-event to a stable interface; but at least we have > documentation bread crumbs in place to remind us (commit 513e7cd), > and it matches the fact that SDL constants are also spelled > SDL_BUTTON_WHEELUP. > > Suggested by: Markus Armbruster <arm...@redhat.com> > Signed-off-by: Eric Blake <ebl...@redhat.com> > > --- > v12: rebase to simpler ErrorClass changes, document decisions on > InputButton The ugliness is now confined to just the definition of enum ErrorClass. Good.