Print all names for an enum value

Author: scheibel

khrgenerator/cpp/CPPGenerator.py

@@ -212,20 +212,23 @@ def generate(cls, profile, api, binding):
             extensionsByFunction=cls.identifierPrefixGroupsDict(api, api.extensionsByFunction(), len(profile.lowercasePrefix))
         )
 
+        uniqueEnumTypes = []
         for type in [ api.typeByIdentifier(binding.extensionType), api.typeByIdentifier(binding.enumType), api.typeByIdentifier(binding.booleanType) ]:
-            if type not in enumTypes and type is not None:
-                enumTypes.append(type)
-    
+            if type not in enumTypes and type not in uniqueEnumTypes and type is not None:
+                uniqueEnumTypes.append(type)
+        
         cls.render(template_engine, "khrbinding-aux/RingBuffer.h", includedir_aux+"RingBuffer.h", api=api, profile=profile, binding=binding)
         cls.render(template_engine, "khrbinding-aux/RingBuffer.inl", includedir_aux+"RingBuffer.inl", api=api, profile=profile, binding=binding)
         cls.render(template_engine, "khrbinding-aux/types_to_string.h", includedir_aux+"types_to_string.h", api=api, profile=profile, binding=binding,
             enumerators=enumTypes,
+            uniqueEnumerators=uniqueEnumTypes,
             bitfields=bitfieldTypes,
             cStringTypes=binding.cStringOutputTypes,
         )
         cls.render(template_engine, "khrbinding-aux/types_to_string.inl", includedir_aux+"types_to_string.inl", api=api, profile=profile, binding=binding)
         cls.render(template_engine, "khrbinding-aux/types_to_string.cpp", sourcedir_aux+"types_to_string.cpp", api=api, profile=profile, binding=binding,
             enumerators=enumTypes,
+            uniqueEnumerators=uniqueEnumTypes,
             bitfields=bitfieldTypes,
             cStringTypes=binding.cStringOutputTypes,
             cPointerTypes=binding.cPointerTypes,

khrgenerator/cpp/templates/Meta.h

@@ -103,7 +103,7 @@ class {{binding.auxApiExport}} Meta
     *  @return
     *    The list of all enums known by the {{profile.inputfile}}
     */
-    static std::vector<{{api.identifier}}::{{binding.enumType}}> enums();
+    static std::set<{{api.identifier}}::{{binding.enumType}}> enums();
 
     /**
     *  @brief
@@ -273,9 +273,24 @@ class {{binding.auxApiExport}} Meta
     *    The enum value
     *
     *  @return
-    *    The string representation of the value
+    *    The shortest string representation of the value
+    *
+    *  @remark
+    *    Beware, that some enums in the API have different symbol names but identical enum values and that this function cannot differentiate between them
     */
     static const std::string & getString({{api.identifier}}::{{group.identifier}} {{api.identifier}}enum);
+
+    /**
+    *  @brief
+    *    Convert enum to symbol name string representation
+    *
+    *  @param[in] {{api.identifierl}}enum
+    *    The enum value
+    *
+    *  @return
+    *    All string representations of the value
+    */
+    static std::vector<std::string> getStrings({{api.identifier}}::{{group.identifier}} {{api.identifier}}enum);
 {% endfor %}
 
 private:

khrgenerator/cpp/templates/khrbinding-aux/types_to_string.cpp

@@ -16,8 +16,27 @@ namespace {{api.identifier}}
 
 {% for group in enumerators|sort(attribute='identifier') %}
 std::ostream & operator<<(std::ostream & stream, const {{group.identifier}} & value)
+{
+    const auto strings = {{binding.bindingAuxNamespace}}::Meta::getStrings(value);
+
+    if (strings.size() == 0)
+    {
+        return stream;
+    }
+
+    stream << strings[0];
+
+    for (auto i = static_cast<std::size_t>(1); i < strings.size(); ++i)
+        stream << " | " << strings[i];
+
+    return stream;
+}
+{% endfor -%}
+{% for group in uniqueEnumerators|sort(attribute='identifier') %}
+std::ostream & operator<<(std::ostream & stream, const {{group.identifier}} & value)
 {
     stream << {{binding.bindingAuxNamespace}}::Meta::getString(value);
+
     return stream;
 }
 {% endfor -%}
@@ -39,8 +58,7 @@ namespace {{binding.namespace}}
 template <>
 std::ostream & operator<<(std::ostream & stream, const Value<{{api.identifier}}::{{binding.enumType}}> & value)
 {
-    const auto & name = {{binding.auxNamespace}}::Meta::getString(value.value());
-    stream.write(name.c_str(), static_cast<std::streamsize>(name.size()));
+    stream << value.value();
 
     return stream;
 }

khrgenerator/cpp/templates/khrbinding-aux/types_to_string.h

@@ -19,6 +19,9 @@ namespace {{api.identifier}}
 {% for group in enumerators|sort(attribute='identifier') -%}
 {{binding.auxApiExport}} std::ostream & operator<<(std::ostream & stream, const {{group.identifier}} & value);
 {% endfor -%}
+{% for group in uniqueEnumerators|sort(attribute='identifier') -%}
+{{binding.auxApiExport}} std::ostream & operator<<(std::ostream & stream, const {{group.identifier}} & value);
+{% endfor -%}
 {% for group in bitfields|sort(attribute='identifier') -%}
 {{binding.auxApiExport}} std::ostream & operator<<(std::ostream & stream, const {{group.identifier}} & value);
 {% endfor %}