AuroraMiddleware/Vulkan-Hpp
1
0
Fork 0
mirror of https://github.com/KhronosGroup/Vulkan-Hpp synced 2024-11-08 13:40:08 +00:00
Code Issues Releases Wiki Activity

Move argument type check of func pointers to final check.

Browse Source
This commit is contained in:
asuessenbach 2021-09-21 14:20:24 +02:00
parent 0eea598f6f
commit 4e055c376d
2 changed files with 33 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
VulkanHppGenerator.cpp
View File

@ -1332,6 +1332,12 @@ void VulkanHppGenerator::checkFuncPointerCorrectness() const
funcPointer.second.xmlLine, funcPointer.second.xmlLine,
"funcpointer requires unknown <" + funcPointer.second.requirements + ">" ); "funcpointer requires unknown <" + funcPointer.second.requirements + ">" );
} }
for ( auto const & argument : funcPointer.second.arguments )
{
check( m_types.find( argument.type ) != m_types.end(),
argument.xmlLine,
"funcpointer argument of unknown type <" + argument.type + ">" );
}
} }
} }
@ -7262,7 +7268,7 @@ std::pair<std::string, std::string> VulkanHppGenerator::generateRAIIHandleConstr
assert( constructorIt->second.successCodes[1] == "VK_INCOMPLETE" ); assert( constructorIt->second.successCodes[1] == "VK_INCOMPLETE" );
auto lenParamIt = constructorIt->second.params.begin() + returnParamIndices[0]; auto lenParamIt = constructorIt->second.params.begin() + returnParamIndices[0];
auto handleParamIt = constructorIt->second.params.begin() + returnParamIndices[1]; auto handleParamIt = constructorIt->second.params.begin() + returnParamIndices[1];
arrayConstructor = generateRAIIHandleConstructorEnumerate( arrayConstructor = generateRAIIHandleConstructorEnumerate(
handle, constructorIt, handleParamIt, lenParamIt, enter, leave ); handle, constructorIt, handleParamIt, lenParamIt, enter, leave );
} }
} }
@ -13595,6 +13601,8 @@ void VulkanHppGenerator::readFuncpointer( tinyxml2::XMLElement const *
} }
} }
auto funcPointerIt = m_funcPointers.end();
std::set<std::string> argumentNames;
for ( auto const & child : children ) for ( auto const & child : children )
{ {
std::string value = child->Value(); std::string value = child->Value();
@ -13603,20 +13611,29 @@ void VulkanHppGenerator::readFuncpointer( tinyxml2::XMLElement const *
{ {
std::string name = child->GetText(); std::string name = child->GetText();
check( !name.empty(), childLine, "funcpointer with empty name" ); check( !name.empty(), childLine, "funcpointer with empty name" );
check( m_funcPointers.insert( std::make_pair( name, FuncPointerData( requirements, line ) ) ).second, check( m_funcPointers.find( name ) == m_funcPointers.end(),
childLine, childLine,
"funcpointer <" + name + "> already specified" ); "funcpointer <" + name + "> already specified" );
funcPointerIt = m_funcPointers.insert( std::make_pair( name, FuncPointerData( requirements, line ) ) ).first;
check( m_types.insert( std::make_pair( name, TypeCategory::FuncPointer ) ).second, check( m_types.insert( std::make_pair( name, TypeCategory::FuncPointer ) ).second,
childLine, childLine,
"funcpointer <" + name + "> already specified as a type" ); "funcpointer <" + name + "> already specified as a type" );
} }
else if ( value == "type" ) else if ( value == "type" )
{ {
assert( funcPointerIt != m_funcPointers.end() );
std::string type = child->GetText(); std::string type = child->GetText();
check( !type.empty(), childLine, "funcpointer argument with empty type" ); funcPointerIt->second.arguments.push_back( { type, childLine } );
check( ( m_types.find( type ) != m_types.end() ) || ( type == requirements ),
auto sibling = child->NextSibling();
char const * siblingValue = sibling->Value();
assert( siblingValue != nullptr );
std::string argumentName = siblingValue;
argumentName = argumentName.substr( argumentName.find_first_not_of( "* " ) );
argumentName = argumentName.substr( 0, argumentName.find_first_of( ",)" ) );
check( argumentNames.insert( argumentName ).second,
childLine, childLine,
"funcpointer argument of unknown type <" + type + ">" ); "funcpointer <" + funcPointerIt->first + "> already has an argument named <" + argumentName + ">" );
} }
} }
} }

13
VulkanHppGenerator.hpp
View File

@ -228,12 +228,21 @@ private:
int xmlLine; int xmlLine;
}; };
struct FuncPointerArgumentData
{
FuncPointerArgumentData( std::string const & t, int line ) : type( t ), xmlLine( line ) {}
std::string type;
int xmlLine;
};
struct FuncPointerData struct FuncPointerData
{ {
FuncPointerData( std::string const & r, int line ) : requirements( r ), xmlLine( line ) {} FuncPointerData( std::string const & r, int line ) : requirements( r ), xmlLine( line ) {}
std::string requirements; std::vector<FuncPointerArgumentData> arguments;
int xmlLine; std::string requirements;
int xmlLine;
}; };
struct HandleData struct HandleData