From cd123067971f70d8a98cb135e4178c385fa62629 Mon Sep 17 00:00:00 2001 From: Markus Tavenrath Date: Wed, 17 Feb 2016 14:03:05 +0100 Subject: [PATCH] switch to TinyXML2 which is being fetches as submodule --- .gitmodules | 3 + CMakeLists.txt | 28 ++--- README.md | 4 +- main.cpp => VkCppGenerator.cpp | 201 ++++++++++++++++++--------------- 4 files changed, 122 insertions(+), 114 deletions(-) create mode 100644 .gitmodules rename main.cpp => VkCppGenerator.cpp (85%) diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..2c941dc --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "tinyxml2"] + path = tinyxml2 + url = https://github.com/leethomason/tinyxml2.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 5428f85..9ce43c4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,42 +28,34 @@ cmake_minimum_required(VERSION 3.2) project(VkCppGenerator) -if(NOT EXISTS "${CMAKE_SOURCE_DIR}/tinyxml/tinyxml.cpp") - message(FATAL_ERROR, "TinyXML is missing. Please download the latest version from http://www.grinninglizard.com/tinyxml/index.html and put the sources in a folder named 'tinyxml'") -endif() - set(HEADERS ) set(SOURCES - main.cpp + VkCppGenerator.cpp ) -set(TINYXML_SOURCES - tinyxml/tinyxml.cpp - tinyxml/tinyxmlerror.cpp - tinyxml/tinyxmlparser.cpp - tinyxml/tinystr.cpp +set(TINYXML2_SOURCES + tinyxml2/tinyxml2.cpp ) -set(TINYXML_HEADERS - tinyxml/tinyxml.h - tinyxml/tinystr.h +set(TINYXML2_HEADERS + tinyxml2/tinyxml2.h ) source_group(headers FILES ${HEADERS}) source_group(sources FILES ${SOURCES}) -source_group(TinyXML\\headers FILES ${TINYXML_HEADERS}) -source_group(TinyXML\\sources FILES ${TINYXML_SOURCES}) +source_group(TinyXML2\\headers FILES ${TINYXML2_HEADERS}) +source_group(TinyXML2\\sources FILES ${TINYXML2_SOURCES}) add_executable(VkCppGenerator ${HEADERS} ${SOURCES} - ${TINYXML_SOURCES} - ${TINYXML_HEADERS} + ${TINYXML2_SOURCES} + ${TINYXML2_HEADERS} ) set_property(TARGET VkCppGenerator PROPERTY CXX_STANDARD 11) -target_include_directories(VkCppGenerator PRIVATE "${CMAKE_SOURCE_DIR}/tinyxml") +target_include_directories(VkCppGenerator PRIVATE "${CMAKE_SOURCE_DIR}/tinyxml2") diff --git a/README.md b/README.md index 615f35d..f515bdd 100644 --- a/README.md +++ b/README.md @@ -185,7 +185,7 @@ before this line: # Build instructions for VkCppGenerator -* Clone the repository -* Download tinyxml from http://www.grinninglizard.com/tinyxml/index.html and extract it in the source folder +* Clone the repository: git clone https://github.com/nvpro-pipeline/vkcpp.git +* Update submodules: git submodule update --init --recursive * Use CMake to generate a solution or makefile for your favourite build environment * Launch the build diff --git a/main.cpp b/VkCppGenerator.cpp similarity index 85% rename from main.cpp rename to VkCppGenerator.cpp index 5bb2b47..d2888ae 100644 --- a/main.cpp +++ b/VkCppGenerator.cpp @@ -24,8 +24,10 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#include +#include +#include #include +#include #include #include #include @@ -34,7 +36,7 @@ #include #include -#include +#include #define VK_PROTOTYPES @@ -175,6 +177,14 @@ const std::string flagsHeader( "\n" ); +// trim from end +std::string trimEnd(std::string const& input) +{ + std::string result = input; + result.erase(std::find_if(result.rbegin(), result.rend(), std::not1(std::ptr_fun(std::isspace))).base(), result.end()); + return result; +} + struct MemberData { std::string type; @@ -246,25 +256,25 @@ size_t findComplexIndex(CommandData const& commandData, std::vector> const& lenParameters); std::vector> getLenParameters(CommandData const& commandData); bool noDependencies(std::set const& dependencies, std::map & listedTypes); -void readCommandParam( TiXmlElement * element, DependencyData & typeData, std::vector & arguments ); -CommandData & readCommandProto( TiXmlElement * element, std::list & dependencies, std::map & commands ); -void readCommands( TiXmlElement * element, std::list & dependencies, std::map & commands ); -void readCommandsCommand( TiXmlElement * element, std::list & dependencies, std::map & commands ); -void readEnums( TiXmlElement * element, std::list & dependencies, std::map & enums, std::set & vkTypes ); -void readEnumsEnum( TiXmlElement * element, std::string const& prefix, std::string const& postfix, EnumData & enumData ); -void readExtensionRequire( TiXmlElement * element, std::vector & elements ); -void readExtensions( TiXmlElement * element, std::vector & extensions ); -void readExtensionsExtension( TiXmlElement * element, std::vector & extensions ); -void readTypeBasetype( TiXmlElement * element, std::list & dependencies ); -void readTypeBitmask( TiXmlElement * element, std::list & dependencies, std::set & flags, std::set & vkTypes ); -void readTypeDefine( TiXmlElement * element, std::string & version ); -void readTypeFuncpointer( TiXmlElement * element, std::list & dependencies ); -void readTypeHandle( TiXmlElement * element, std::list & dependencies ); -void readTypeStruct( TiXmlElement * element, std::list & dependencies, std::map & structs, std::set & vkTypes ); -void readTypeStructMember( TiXmlElement * element, std::vector & members, std::set & dependencies ); -void readTypeUnion( TiXmlElement * element, std::list & dependencies, std::map & structs, std::set & vkTypes ); -void readTypeUnionMember( TiXmlElement * element, std::vector & members, std::set & dependencies ); -void readTypes( TiXmlElement * element, std::string & version, std::list & dependencies, std::set & flags, std::map & structs, std::set & vkTypes ); +void readCommandParam( tinyxml2::XMLElement * element, DependencyData & typeData, std::vector & arguments ); +CommandData & readCommandProto( tinyxml2::XMLElement * element, std::list & dependencies, std::map & commands ); +void readCommands( tinyxml2::XMLElement * element, std::list & dependencies, std::map & commands ); +void readCommandsCommand( tinyxml2::XMLElement * element, std::list & dependencies, std::map & commands ); +void readEnums( tinyxml2::XMLElement * element, std::list & dependencies, std::map & enums, std::set & vkTypes ); +void readEnumsEnum( tinyxml2::XMLElement * element, std::string const& prefix, std::string const& postfix, EnumData & enumData ); +void readExtensionRequire( tinyxml2::XMLElement * element, std::vector & elements ); +void readExtensions( tinyxml2::XMLElement * element, std::vector & extensions ); +void readExtensionsExtension( tinyxml2::XMLElement * element, std::vector & extensions ); +void readTypeBasetype( tinyxml2::XMLElement * element, std::list & dependencies ); +void readTypeBitmask( tinyxml2::XMLElement * element, std::list & dependencies, std::set & flags, std::set & vkTypes ); +void readTypeDefine( tinyxml2::XMLElement * element, std::string & version ); +void readTypeFuncpointer( tinyxml2::XMLElement * element, std::list & dependencies ); +void readTypeHandle( tinyxml2::XMLElement * element, std::list & dependencies ); +void readTypeStruct( tinyxml2::XMLElement * element, std::list & dependencies, std::map & structs, std::set & vkTypes ); +void readTypeStructMember( tinyxml2::XMLElement * element, std::vector & members, std::set & dependencies ); +void readTypeUnion( tinyxml2::XMLElement * element, std::list & dependencies, std::map & structs, std::set & vkTypes ); +void readTypeUnionMember( tinyxml2::XMLElement * element, std::vector & members, std::set & dependencies ); +void readTypes( tinyxml2::XMLElement * element, std::string & version, std::list & dependencies, std::set & flags, std::map & structs, std::set & vkTypes ); void sortDependencies( std::list & dependencies, std::vector const& extensions, std::vector> & sortedDependencies ); std::string reduceName(std::string const& name); std::string strip( std::string const& value, std::string const& prefix ); @@ -395,7 +405,7 @@ bool noDependencies(std::set const& dependencies, std::set & arguments ) +void readCommandParam( tinyxml2::XMLElement * element, DependencyData & typeData, std::vector & arguments ) { arguments.push_back( MemberData() ); MemberData & arg = arguments.back(); @@ -405,17 +415,18 @@ void readCommandParam( TiXmlElement * element, DependencyData & typeData, std::v arg.len = element->Attribute("len"); } - TiXmlNode * child = element->FirstChild(); + tinyxml2::XMLNode * child = element->FirstChild(); assert( child ); - if ( child->Type() == TiXmlNode::TINYXML_TEXT ) + if ( child->ToText() ) { - assert( ( strcmp( child->Value(), "const" ) == 0 ) || ( strcmp( child->Value(), "struct" ) == 0 ) ); - arg.type = std::string( child->Value() ) + " "; + std::string value = trimEnd(child->Value()); + assert( (value == "const") || (value == "struct") ); + arg.type = value + " "; child = child->NextSibling(); assert( child ); } - assert( child->Type() == TiXmlNode::TINYXML_ELEMENT ); + assert( child->ToElement() ); assert( ( strcmp( child->Value(), "type" ) == 0 ) && child->ToElement() && child->ToElement()->GetText() ); std::string type = strip( child->ToElement()->GetText(), "Vk" ); typeData.dependencies.insert( type ); @@ -424,15 +435,15 @@ void readCommandParam( TiXmlElement * element, DependencyData & typeData, std::v child = child->NextSibling(); assert( child ); - if ( child->Type() == TiXmlNode::TINYXML_TEXT ) + if ( child->ToText() ) { - std::string value = child->Value(); + std::string value = trimEnd(child->Value()); assert( ( value == "*" ) || ( value == "**" ) || ( value == "* const*" ) ); arg.type += value; child = child->NextSibling(); } - assert( ( child->Type() == TiXmlNode::TINYXML_ELEMENT ) && ( strcmp( child->Value(), "name" ) == 0 ) && child->ToElement() ); + assert( child->ToElement() && ( strcmp( child->Value(), "name" ) == 0 ) ); arg.name = child->ToElement()->GetText(); if ( arg.name.back() == ']' ) @@ -447,18 +458,18 @@ void readCommandParam( TiXmlElement * element, DependencyData & typeData, std::v child = child->NextSibling(); if ( child ) { - if ( child->Type() == TiXmlNode::TINYXML_TEXT ) + if ( child->ToText() ) { std::string value = child->Value(); if ( value == "[" ) { child = child->NextSibling(); assert( child ); - assert( ( child->Type() == TiXmlNode::TINYXML_ELEMENT ) && ( strcmp( child->Value(), "enum" ) == 0 ) ); + assert( child->ToElement() && ( strcmp( child->Value(), "enum" ) == 0 ) ); arg.arraySize = child->ToElement()->GetText(); child = child->NextSibling(); assert( child ); - assert( child->Type() == TiXmlNode::TINYXML_TEXT ); + assert( child->ToText() ); assert( strcmp( child->Value(), "]" ) == 0 ); assert( !child->NextSibling() ); } @@ -472,11 +483,11 @@ void readCommandParam( TiXmlElement * element, DependencyData & typeData, std::v } } -CommandData & readCommandProto( TiXmlElement * element, std::list & dependencies, std::map & commands ) +CommandData & readCommandProto( tinyxml2::XMLElement * element, std::list & dependencies, std::map & commands ) { - TiXmlElement * typeElement = element->FirstChildElement(); + tinyxml2::XMLElement * typeElement = element->FirstChildElement(); assert( typeElement && ( strcmp( typeElement->Value(), "type" ) == 0 ) ); - TiXmlElement * nameElement = typeElement->NextSiblingElement(); + tinyxml2::XMLElement * nameElement = typeElement->NextSiblingElement(); assert( nameElement && ( strcmp( nameElement->Value(), "name" ) == 0 ) ); assert( !nameElement->NextSiblingElement() ); @@ -494,9 +505,9 @@ CommandData & readCommandProto( TiXmlElement * element, std::listsecond; } -void readCommands( TiXmlElement * element, std::list & dependencies, std::map & commands ) +void readCommands( tinyxml2::XMLElement * element, std::list & dependencies, std::map & commands ) { - TiXmlElement * child = element->FirstChildElement(); + tinyxml2::XMLElement * child = element->FirstChildElement(); assert( child ); do { @@ -505,9 +516,9 @@ void readCommands( TiXmlElement * element, std::list & dependenc } while ( child = child->NextSiblingElement() ); } -void readCommandsCommand( TiXmlElement * element, std::list & dependencies, std::map & commands ) +void readCommandsCommand( tinyxml2::XMLElement * element, std::list & dependencies, std::map & commands ) { - TiXmlElement * child = element->FirstChildElement(); + tinyxml2::XMLElement * child = element->FirstChildElement(); assert( child && ( strcmp( child->Value(), "proto" ) == 0 ) ); CommandData & commandData = readCommandProto( child, dependencies, commands ); @@ -526,7 +537,7 @@ void readCommandsCommand( TiXmlElement * element, std::list & de } } -void readEnums( TiXmlElement * element, std::list & dependencies, std::map & enums, std::set & vkTypes ) +void readEnums( tinyxml2::XMLElement * element, std::list & dependencies, std::map & enums, std::set & vkTypes ) { assert( element->Attribute( "name" ) ); std::string name = strip( element->Attribute( "name" ), "Vk" ); @@ -559,9 +570,9 @@ void readEnums( TiXmlElement * element, std::list & dependencies } } -void readEnumsEnum( TiXmlElement * element, std::string const& prefix, std::string const& postfix, EnumData & enumData ) +void readEnumsEnum( tinyxml2::XMLElement * element, std::string const& prefix, std::string const& postfix, EnumData & enumData ) { - TiXmlElement * child = element->FirstChildElement(); + tinyxml2::XMLElement * child = element->FirstChildElement(); do { if ( child->Attribute( "name" ) ) @@ -581,9 +592,9 @@ void readEnumsEnum( TiXmlElement * element, std::string const& prefix, std::stri } while ( child = child->NextSiblingElement() ); } -void readExtensionRequire( TiXmlElement * element, std::vector & elements ) +void readExtensionRequire( tinyxml2::XMLElement * element, std::vector & elements ) { - TiXmlElement * child = element->FirstChildElement(); + tinyxml2::XMLElement * child = element->FirstChildElement(); do { std::string value = child->Value(); @@ -605,9 +616,9 @@ void readExtensionRequire( TiXmlElement * element, std::vector & el } while ( child = child->NextSiblingElement() ); } -void readExtensions( TiXmlElement * element, std::vector & extensions ) +void readExtensions( tinyxml2::XMLElement * element, std::vector & extensions ) { - TiXmlElement * child = element->FirstChildElement(); + tinyxml2::XMLElement * child = element->FirstChildElement(); assert( child ); do { @@ -616,7 +627,7 @@ void readExtensions( TiXmlElement * element, std::vector & extens } while ( child = child->NextSiblingElement() ); } -void readExtensionsExtension( TiXmlElement * element, std::vector & extensions ) +void readExtensionsExtension( tinyxml2::XMLElement * element, std::vector & extensions ) { extensions.push_back( ExtensionData() ); ExtensionData & ext = extensions.back(); @@ -628,19 +639,19 @@ void readExtensionsExtension( TiXmlElement * element, std::vector ext.protect = element->Attribute( "protect" ); } - TiXmlElement * child = element->FirstChildElement(); + tinyxml2::XMLElement * child = element->FirstChildElement(); assert( child && ( strcmp( child->Value(), "require" ) == 0 ) && !child->NextSiblingElement() ); readExtensionRequire( child, ext.elements ); } -void readTypeBasetype( TiXmlElement * element, std::list & dependencies ) +void readTypeBasetype( tinyxml2::XMLElement * element, std::list & dependencies ) { - TiXmlElement * typeElement = element->FirstChildElement(); + tinyxml2::XMLElement * typeElement = element->FirstChildElement(); assert( typeElement && ( strcmp( typeElement->Value(), "type" ) == 0 ) && typeElement->GetText() ); std::string type = typeElement->GetText(); assert( ( type == "uint32_t" ) || ( type == "uint64_t" ) ); - TiXmlElement * nameElement = typeElement->NextSiblingElement(); + tinyxml2::XMLElement * nameElement = typeElement->NextSiblingElement(); assert( nameElement && ( strcmp( nameElement->Value(), "name" ) == 0 ) && nameElement->GetText() ); std::string name = strip( nameElement->GetText(), "Vk" ); @@ -656,13 +667,13 @@ void readTypeBasetype( TiXmlElement * element, std::list & depen } } -void readTypeBitmask( TiXmlElement * element, std::list & dependencies, std::set & flags, std::set & vkTypes ) +void readTypeBitmask( tinyxml2::XMLElement * element, std::list & dependencies, std::set & flags, std::set & vkTypes ) { - TiXmlElement * typeElement = element->FirstChildElement(); + tinyxml2::XMLElement * typeElement = element->FirstChildElement(); assert( typeElement && ( strcmp( typeElement->Value(), "type" ) == 0 ) && typeElement->GetText() && ( strcmp( typeElement->GetText(), "VkFlags" ) == 0 ) ); std::string type = typeElement->GetText(); - TiXmlElement * nameElement = typeElement->NextSiblingElement(); + tinyxml2::XMLElement * nameElement = typeElement->NextSiblingElement(); assert( nameElement && ( strcmp( nameElement->Value(), "name" ) == 0 ) && nameElement->GetText() ); std::string name = strip( nameElement->GetText(), "Vk" ); @@ -685,54 +696,55 @@ void readTypeBitmask( TiXmlElement * element, std::list & depend } } -void readTypeDefine( TiXmlElement * element, std::string & version ) +void readTypeDefine( tinyxml2::XMLElement * element, std::string & version ) { - TiXmlElement * child = element->FirstChildElement(); + tinyxml2::XMLElement * child = element->FirstChildElement(); if ( child && ( strcmp( child->GetText(), "VK_API_VERSION" ) == 0 ) ) { version = element->LastChild()->ToText()->Value(); } } -void readTypeFuncpointer( TiXmlElement * element, std::list & dependencies ) +void readTypeFuncpointer( tinyxml2::XMLElement * element, std::list & dependencies ) { - TiXmlElement * child = element->FirstChildElement(); + tinyxml2::XMLElement * child = element->FirstChildElement(); assert( child && ( strcmp( child->Value(), "name" ) == 0 ) && child->GetText() ); dependencies.push_back( DependencyData( DependencyData::Category::FUNC_POINTER, child->GetText() ) ); } -void readTypeHandle( TiXmlElement * element, std::list & dependencies ) +void readTypeHandle( tinyxml2::XMLElement * element, std::list & dependencies ) { - TiXmlElement * typeElement = element->FirstChildElement(); + tinyxml2::XMLElement * typeElement = element->FirstChildElement(); assert( typeElement && ( strcmp( typeElement->Value(), "type" ) == 0 ) && typeElement->GetText() ); #if !defined(NDEBUG) std::string type = typeElement->GetText(); assert( type.find( "VK_DEFINE" ) == 0 ); #endif - TiXmlElement * nameElement = typeElement->NextSiblingElement(); + tinyxml2::XMLElement * nameElement = typeElement->NextSiblingElement(); assert( nameElement && ( strcmp( nameElement->Value(), "name" ) == 0 ) && nameElement->GetText() ); std::string name = strip( nameElement->GetText(), "Vk" ); dependencies.push_back( DependencyData( DependencyData::Category::HANDLE, name ) ); } -void readTypeStructMember( TiXmlElement * element, std::vector & members, std::set & dependencies ) +void readTypeStructMember( tinyxml2::XMLElement * element, std::vector & members, std::set & dependencies ) { members.push_back( MemberData() ); MemberData & member = members.back(); - TiXmlNode * child = element->FirstChild(); + tinyxml2::XMLNode * child = element->FirstChild(); assert( child ); - if ( child->Type() == TiXmlNode::TINYXML_TEXT ) + if ( child->ToText()) { - assert( ( strcmp( child->Value(), "const" ) == 0 ) || ( strcmp( child->Value(), "struct" ) == 0 ) ); - member.type = std::string( child->Value() ) + " "; + std::string value = trimEnd(child->Value()); + assert( (value == "const") || (value == "struct") ); + member.type = value + " "; child = child->NextSibling(); assert( child ); } - assert( child->Type() == TiXmlNode::TINYXML_ELEMENT ); + assert( child->ToElement() ); assert( ( strcmp( child->Value(), "type" ) == 0 ) && child->ToElement() && child->ToElement()->GetText() ); std::string type = strip( child->ToElement()->GetText(), "Vk" ); dependencies.insert( type ); @@ -741,15 +753,15 @@ void readTypeStructMember( TiXmlElement * element, std::vector & mem child = child->NextSibling(); assert( child ); - if ( child->Type() == TiXmlNode::TINYXML_TEXT ) + if ( child->ToText()) { - std::string value = child->Value(); + std::string value = trimEnd(child->Value()); assert( ( value == "*" ) || ( value == "**" ) || ( value == "* const*" ) ); member.type += value; child = child->NextSibling(); } - assert( ( child->Type() == TiXmlNode::TINYXML_ELEMENT ) && ( strcmp( child->Value(), "name" ) == 0 ) && child->ToElement() ); + assert( ( child->ToElement() && strcmp( child->Value(), "name" ) == 0 )); member.name = child->ToElement()->GetText(); if ( member.name.back() == ']' ) @@ -765,18 +777,18 @@ void readTypeStructMember( TiXmlElement * element, std::vector & mem if ( child ) { assert( member.arraySize.empty() ); - if ( child->Type() == TiXmlNode::TINYXML_TEXT ) + if ( child->ToText() ) { std::string value = child->Value(); if ( value == "[" ) { child = child->NextSibling(); assert( child ); - assert( ( child->Type() == TiXmlNode::TINYXML_ELEMENT ) && ( strcmp( child->Value(), "enum" ) == 0 ) ); + assert( child->ToElement() && ( strcmp( child->Value(), "enum" ) == 0 ) ); member.arraySize = child->ToElement()->GetText(); child = child->NextSibling(); assert( child ); - assert( child->Type() == TiXmlNode::TINYXML_TEXT ); + assert( child->ToText() ); assert( strcmp( child->Value(), "]" ) == 0 ); assert( !child->NextSibling() ); } @@ -790,7 +802,7 @@ void readTypeStructMember( TiXmlElement * element, std::vector & mem } } -void readTypeStruct( TiXmlElement * element, std::list & dependencies, std::map & structs, std::set & vkTypes ) +void readTypeStruct( tinyxml2::XMLElement * element, std::list & dependencies, std::map & structs, std::set & vkTypes ) { assert( !element->Attribute( "returnedonly" ) || ( strcmp( element->Attribute( "returnedonly" ), "true" ) == 0 ) ); @@ -808,7 +820,7 @@ void readTypeStruct( TiXmlElement * element, std::list & depende std::map::iterator it = structs.insert( std::make_pair( name, StructData() ) ).first; it->second.returnedOnly = !!element->Attribute( "returnedonly" ); - TiXmlElement * child = element->FirstChildElement(); + tinyxml2::XMLElement * child = element->FirstChildElement(); do { assert( child->Value() ); @@ -827,14 +839,14 @@ void readTypeStruct( TiXmlElement * element, std::list & depende vkTypes.insert( name ); } -void readTypeUnionMember( TiXmlElement * element, std::vector & members, std::set & dependencies ) +void readTypeUnionMember( tinyxml2::XMLElement * element, std::vector & members, std::set & dependencies ) { members.push_back( MemberData() ); MemberData & member = members.back(); - TiXmlNode * child = element->FirstChild(); + tinyxml2::XMLNode * child = element->FirstChild(); assert( child ); - if ( child->Type() == TiXmlNode::TINYXML_TEXT ) + if ( child->ToText() ) { assert( ( strcmp( child->Value(), "const" ) == 0 ) || ( strcmp( child->Value(), "struct" ) == 0 ) ); member.type = std::string( child->Value() ) + " "; @@ -842,7 +854,7 @@ void readTypeUnionMember( TiXmlElement * element, std::vector & memb assert( child ); } - assert( child->Type() == TiXmlNode::TINYXML_ELEMENT ); + assert( child->ToElement() ); assert( ( strcmp( child->Value(), "type" ) == 0 ) && child->ToElement() && child->ToElement()->GetText() ); std::string type = strip( child->ToElement()->GetText(), "Vk" ); dependencies.insert( type ); @@ -851,7 +863,7 @@ void readTypeUnionMember( TiXmlElement * element, std::vector & memb child = child->NextSibling(); assert( child ); - if ( child->Type() == TiXmlNode::TINYXML_TEXT ) + if ( child->ToText() ) { std::string value = child->Value(); assert( ( value == "*" ) || ( value == "**" ) || ( value == "* const*" ) ); @@ -859,7 +871,7 @@ void readTypeUnionMember( TiXmlElement * element, std::vector & memb child = child->NextSibling(); } - assert( ( child->Type() == TiXmlNode::TINYXML_ELEMENT ) && ( strcmp( child->Value(), "name" ) == 0 ) && child->ToElement() ); + assert( child->ToElement() && ( strcmp( child->Value(), "name" ) == 0 ) ); member.name = child->ToElement()->GetText(); if ( member.name.back() == ']' ) @@ -874,18 +886,18 @@ void readTypeUnionMember( TiXmlElement * element, std::vector & memb child = child->NextSibling(); if ( child ) { - if ( child->Type() == TiXmlNode::TINYXML_TEXT ) + if ( child->ToText() ) { std::string value = child->Value(); if ( value == "[" ) { child = child->NextSibling(); assert( child ); - assert( ( child->Type() == TiXmlNode::TINYXML_ELEMENT ) && ( strcmp( child->Value(), "enum" ) == 0 ) ); + assert( child->ToElement() && ( strcmp( child->Value(), "enum" ) == 0 ) ); member.arraySize = child->ToElement()->GetText(); child = child->NextSibling(); assert( child ); - assert( child->Type() == TiXmlNode::TINYXML_TEXT ); + assert( child->ToText() ); assert( strcmp( child->Value(), "]" ) == 0 ); assert( !child->NextSibling() ); } @@ -899,7 +911,7 @@ void readTypeUnionMember( TiXmlElement * element, std::vector & memb } } -void readTypeUnion( TiXmlElement * element, std::list & dependencies, std::map & structs, std::set & vkTypes ) +void readTypeUnion( tinyxml2::XMLElement * element, std::list & dependencies, std::map & structs, std::set & vkTypes ) { assert( element->Attribute( "name" ) ); std::string name = strip( element->Attribute( "name" ), "Vk" ); @@ -909,7 +921,7 @@ void readTypeUnion( TiXmlElement * element, std::list & dependen assert( structs.find( name ) == structs.end() ); std::map::iterator it = structs.insert( std::make_pair( name, StructData() ) ).first; - TiXmlElement * child = element->FirstChildElement(); + tinyxml2::XMLElement * child = element->FirstChildElement(); do { assert( strcmp( child->Value(), "member" ) == 0 ); @@ -920,9 +932,9 @@ void readTypeUnion( TiXmlElement * element, std::list & dependen vkTypes.insert( name ); } -void readTypes( TiXmlElement * element, std::string & version, std::list & dependencies, std::set & flags, std::map & structs, std::set & vkTypes ) +void readTypes( tinyxml2::XMLElement * element, std::string & version, std::list & dependencies, std::set & flags, std::map & structs, std::set & vkTypes ) { - TiXmlElement * child = element->FirstChildElement(); + tinyxml2::XMLElement * child = element->FirstChildElement(); do { assert( strcmp( child->Value(), "type" ) == 0 ); @@ -1794,15 +1806,16 @@ void writeVersionCheck( std::ofstream & ofs, std::string const& version ) int main( int argc, char **argv ) { - TiXmlDocument doc; + tinyxml2::XMLDocument doc; - if ( !doc.LoadFile( argv[1] ) ) + tinyxml2::XMLError error = doc.LoadFile( argv[1] ); + if (error != tinyxml2::XML_SUCCESS) { - std::cout << "VkGenerate: failed to load file " << argv[1] << std::endl; + std::cout << "VkGenerate: failed to load file " << argv[1] << " . Error code: " << error << std::endl; return -1; } - TiXmlElement * registryElement = doc.FirstChildElement(); + tinyxml2::XMLElement * registryElement = doc.FirstChildElement(); assert( strcmp( registryElement->Value(), "registry" ) == 0 ); assert( !registryElement->NextSiblingElement() ); @@ -1815,7 +1828,7 @@ int main( int argc, char **argv ) std::map commands; std::set vkTypes; - TiXmlElement * child = registryElement->FirstChildElement(); + tinyxml2::XMLElement * child = registryElement->FirstChildElement(); do { assert( child->Value() );