Fixed parsing bug and subsequent failing test in GenerateEnumFromMacros.

It now uses preprocessed entities instead of the soon-to-be-removed macros.