From 238093f1c67c2e2275fbd3d20ee0efbe7353d0a6 Mon Sep 17 00:00:00 2001
From: Yiwei Zhang <zzyiwei@google.com>
Date: Tue, 9 Mar 2021 00:04:24 +0000
Subject: [PATCH] Fix enum array initializer using enum constant

---
 VulkanHppGenerator.cpp | 17 +++++++++++++++--
 VulkanHppGenerator.hpp |  2 +-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/VulkanHppGenerator.cpp b/VulkanHppGenerator.cpp
index a796f4e..e5e6073 100644
--- a/VulkanHppGenerator.cpp
+++ b/VulkanHppGenerator.cpp
@@ -2505,7 +2505,8 @@ void VulkanHppGenerator::appendEnumInitializer( std::string &
   else
   {
     assert( arraySizes.size() == 1 );
-    int count = std::stoi( arraySizes[0] );
+    auto constIt = m_constants.find( arraySizes[0] );
+    int count = std::stoi( ( constIt == m_constants.end() ) ? arraySizes[0] : constIt->second );
     assert( 1 < count );
     str += "{ { " + value;
     for ( int i = 1; i < count; i++ )
@@ -11713,6 +11714,7 @@ void VulkanHppGenerator::readEnumConstant( tinyxml2::XMLElement const * element
   checkAttributes( line, attributes, { { "name", {} } }, { { "alias", {} }, { "comment", {} }, { "value", {} } } );
   checkElements( line, getChildElements( element ), {} );
 
+  std::string alias, name, value;
   for ( auto const & attribute : attributes )
   {
     if ( attribute.first == "alias" )
@@ -11720,14 +11722,25 @@ void VulkanHppGenerator::readEnumConstant( tinyxml2::XMLElement const * element
       check( m_constants.find( attribute.second ) != m_constants.end(),
              line,
              "unknown enum constant alias <" + attribute.second + ">" );
+      alias = attribute.second;
     }
     else if ( attribute.first == "name" )
     {
-      check( m_constants.insert( attribute.second ).second,
+      check( m_constants.find( attribute.second ) == m_constants.end(),
              line,
              "already specified enum constant <" + attribute.second + ">" );
+      name = attribute.second;
+    }
+    else if ( attribute.first == "value" )
+    {
+      check( !attribute.second.empty(),
+             line,
+             "value of enum constant is empty");
+      value = attribute.second;
     }
   }
+  check( alias.empty() != value.empty(), line, "for enum <" + name + "> either alias or value need to be specified" );
+  m_constants[name] = alias.empty() ? value : m_constants[alias];
 }
 
 void VulkanHppGenerator::readEnums( tinyxml2::XMLElement const * element )
diff --git a/VulkanHppGenerator.hpp b/VulkanHppGenerator.hpp
index de8a7a1..64e0670 100644
--- a/VulkanHppGenerator.hpp
+++ b/VulkanHppGenerator.hpp
@@ -1047,7 +1047,7 @@ private:
   std::map<std::string, BaseTypeData>    m_baseTypes;
   std::map<std::string, BitmaskData>     m_bitmasks;
   std::map<std::string, CommandData>     m_commands;
-  std::set<std::string>                  m_constants;
+  std::map<std::string, std::string>     m_constants;
   std::set<std::string>                  m_defines;
   std::map<std::string, EnumData>        m_enums;
   std::set<std::string>                  m_extendedStructs;  // structs which are referenced by the structextends tag