Merge pull request #1451 from asuessenbach/equal

Use std::equal to compare array of null-terminated strings in structs.
KhronosGroup · Nov 17, 2022 · 81cd156 · 81cd156
2 parents 1d250f5 + 1b61fc6
commit 81cd156
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 50 deletions.
diff --git a/VulkanHppGenerator.cpp b/VulkanHppGenerator.cpp
@@ -533,9 +533,9 @@ void VulkanHppGenerator::addCommand( std::string const & name, CommandData & com
   std::map<std::string, HandleData>::iterator handleIt = m_handles.find( commandData.params[0].type.type );
   if ( handleIt == m_handles.end() )
   {
-    handleIt = m_handles.find( "" );
+    handleIt = m_handles.begin();
+    assert( handleIt->first == "" );
   }
-  assert( handleIt != m_handles.end() );
   commandData.handle = handleIt->first;
 
   // add this command to the list of commands
@@ -9003,16 +9003,10 @@ std::string VulkanHppGenerator::generateStructCompareOperators( std::pair<std::s
       else
       {
         assert( member.len[1] == "null-terminated" );
-        static const std::string commpareMemberTemplate = R"(      [this, rhs]
-      {
-        bool equal = true;
-        for ( size_t i = 0; equal && ( i < ${count} ); ++i )
-        {
-          equal = ( ( ${name}[i] == rhs.${name}[i] ) || ( strcmp( ${name}[i], rhs.${name}[i] ) == 0 ) );
-        }
-        return equal;
-      }())";
-        compareMembers += intro + replaceWithMap( commpareMemberTemplate, { { "count", member.len[0] }, { "name", member.name } } );
+        assert( ( member.type.prefix == "const" ) && ( member.type.postfix == "* const *" ) );
+        static const std::string compareMemberTemplate =
+          R"(std::equal( ${name}, ${name} + ${count}, rhs.${name}, []( char const * left, char const * right ) { return ( left == right ) || ( strcmp( left, right ) == 0 ); } ))";
+        compareMembers += intro + replaceWithMap( compareMemberTemplate, { { "count", member.len[0] }, { "name", member.name } } );
 
         static const std::string spaceshipMemberTemplate = R"(      for ( size_t i = 0; i < ${count}; ++i )
       {

diff --git a/vulkan/vulkan_structs.hpp b/vulkan/vulkan_structs.hpp
@@ -23531,25 +23531,16 @@ namespace VULKAN_HPP_NAMESPACE
     {
       return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( flags == rhs.flags ) && ( queueCreateInfoCount == rhs.queueCreateInfoCount ) &&
              ( pQueueCreateInfos == rhs.pQueueCreateInfos ) && ( enabledLayerCount == rhs.enabledLayerCount ) &&
-             [this, rhs]
-      {
-        bool equal = true;
-        for ( size_t i = 0; equal && ( i < enabledLayerCount ); ++i )
-        {
-          equal = ( ( ppEnabledLayerNames[i] == rhs.ppEnabledLayerNames[i] ) || ( strcmp( ppEnabledLayerNames[i], rhs.ppEnabledLayerNames[i] ) == 0 ) );
-        }
-        return equal;
-      }() && ( enabledExtensionCount == rhs.enabledExtensionCount ) &&
-             [this, rhs]
-      {
-        bool equal = true;
-        for ( size_t i = 0; equal && ( i < enabledExtensionCount ); ++i )
-        {
-          equal = ( ( ppEnabledExtensionNames[i] == rhs.ppEnabledExtensionNames[i] ) ||
-                    ( strcmp( ppEnabledExtensionNames[i], rhs.ppEnabledExtensionNames[i] ) == 0 ) );
-        }
-        return equal;
-      }() && ( pEnabledFeatures == rhs.pEnabledFeatures );
+             std::equal( ppEnabledLayerNames,
+                         ppEnabledLayerNames + enabledLayerCount,
+                         rhs.ppEnabledLayerNames,
+                         []( char const * left, char const * right ) { return ( left == right ) || ( strcmp( left, right ) == 0 ); } ) &&
+             ( enabledExtensionCount == rhs.enabledExtensionCount ) &&
+             std::equal( ppEnabledExtensionNames,
+                         ppEnabledExtensionNames + enabledExtensionCount,
+                         rhs.ppEnabledExtensionNames,
+                         []( char const * left, char const * right ) { return ( left == right ) || ( strcmp( left, right ) == 0 ); } ) &&
+             ( pEnabledFeatures == rhs.pEnabledFeatures );
     }
 
     bool operator!=( DeviceCreateInfo const & rhs ) const VULKAN_HPP_NOEXCEPT
@@ -43092,25 +43083,15 @@ namespace VULKAN_HPP_NAMESPACE
     {
       return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( flags == rhs.flags ) && ( pApplicationInfo == rhs.pApplicationInfo ) &&
              ( enabledLayerCount == rhs.enabledLayerCount ) &&
-             [this, rhs]
-      {
-        bool equal = true;
-        for ( size_t i = 0; equal && ( i < enabledLayerCount ); ++i )
-        {
-          equal = ( ( ppEnabledLayerNames[i] == rhs.ppEnabledLayerNames[i] ) || ( strcmp( ppEnabledLayerNames[i], rhs.ppEnabledLayerNames[i] ) == 0 ) );
-        }
-        return equal;
-      }() && ( enabledExtensionCount == rhs.enabledExtensionCount ) &&
-             [this, rhs]
-      {
-        bool equal = true;
-        for ( size_t i = 0; equal && ( i < enabledExtensionCount ); ++i )
-        {
-          equal = ( ( ppEnabledExtensionNames[i] == rhs.ppEnabledExtensionNames[i] ) ||
-                    ( strcmp( ppEnabledExtensionNames[i], rhs.ppEnabledExtensionNames[i] ) == 0 ) );
-        }
-        return equal;
-      }();
+             std::equal( ppEnabledLayerNames,
+                         ppEnabledLayerNames + enabledLayerCount,
+                         rhs.ppEnabledLayerNames,
+                         []( char const * left, char const * right ) { return ( left == right ) || ( strcmp( left, right ) == 0 ); } ) &&
+             ( enabledExtensionCount == rhs.enabledExtensionCount ) &&
+             std::equal( ppEnabledExtensionNames,
+                         ppEnabledExtensionNames + enabledExtensionCount,
+                         rhs.ppEnabledExtensionNames,
+                         []( char const * left, char const * right ) { return ( left == right ) || ( strcmp( left, right ) == 0 ); } );
     }
 
     bool operator!=( InstanceCreateInfo const & rhs ) const VULKAN_HPP_NOEXCEPT