Merge branch 'cshar-fix-enum-constants'

* cshar-fix-enum-constants:
  Fix invalid code generated for "%constant enum EnumType ..." and add a test.