mirror/Vulkan-Hpp
1
0
Fork 0
mirror of https://github.com/KhronosGroup/Vulkan-Hpp.git synced 2024-10-14 16:32:17 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Change exceptions to warnings for unknown elements & attributes (#232)

Browse Source
This commit is contained in:
Markus Tavenrath 2018-07-16 10:26:24 +02:00 committed by Andreas Süßenbach
parent ccd9636c51
commit 1c06eb7ac0
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
VulkanHppGenerator.cpp
View File

@ -934,12 +934,10 @@ void checkAttributes(std::map<std::string, std::string> const& attributes, int l
auto attributesIt = attributes.find(r.first); auto attributesIt = attributes.find(r.first);
if (attributesIt == attributes.end()) if (attributesIt == attributes.end())
{ {
assert(false);
throw std::runtime_error("Spec error on line " + lineNumber + ": missing attribute <" + r.first + ">"); throw std::runtime_error("Spec error on line " + lineNumber + ": missing attribute <" + r.first + ">");
} }
if (!r.second.empty() && (r.second.find(attributesIt->second) == r.second.end())) if (!r.second.empty() && (r.second.find(attributesIt->second) == r.second.end()))
{ {
assert(false);
throw std::runtime_error("Spec error on line " + lineNumber + ": unexpected attribute value <" + attributesIt->second + "> in attribute <" + r.first + ">"); throw std::runtime_error("Spec error on line " + lineNumber + ": unexpected attribute value <" + attributesIt->second + "> in attribute <" + r.first + ">");
} }
} }
@ -951,8 +949,8 @@ void checkAttributes(std::map<std::string, std::string> const& attributes, int l
auto optionalIt = optional.find(a.first); auto optionalIt = optional.find(a.first);
if (optionalIt == optional.end()) if (optionalIt == optional.end())
{ {
assert(false); std::cerr << "warning: " << "Unknown attribute " + a.first + " in line " + lineNumber + "!";
throw std::runtime_error("Spec error on line " + lineNumber + ": unexpected attribute <" + a.first + ">"); continue;
} }
if (!optionalIt->second.empty()) if (!optionalIt->second.empty())
{ {
@ -961,7 +959,6 @@ void checkAttributes(std::map<std::string, std::string> const& attributes, int l
{ {
if (optionalIt->second.find(v) == optionalIt->second.end()) if (optionalIt->second.find(v) == optionalIt->second.end())
{ {
assert(false);
throw std::runtime_error("Spec error on line " + lineNumber + ": unexpected attribute value <" + v + "> in attribute <" + a.first + ">"); throw std::runtime_error("Spec error on line " + lineNumber + ": unexpected attribute value <" + v + "> in attribute <" + a.first + ">");
} }
} }
@ -979,7 +976,7 @@ void checkElements(std::vector<tinyxml2::XMLElement const*> const& elements, std
std::stringstream ss; std::stringstream ss;
ss << e->GetLineNum(); ss << e->GetLineNum();
std::string lineNumber = ss.str(); std::string lineNumber = ss.str();
std::cerr << "Unknown element in spec on line: " << lineNumber << " " << e->Value() << std::endl; std::cerr << "warning: Unknown element in spec on line: " << lineNumber << " " << e->Value() << "!" << std::endl;
} }
} }
} }
@ -1000,12 +997,10 @@ void checkOrderedElements(std::vector<tinyxml2::XMLElement const*> const& elemen
if (values.size() <= i) if (values.size() <= i)
{ {
assert(false);
throw std::runtime_error("Spec error on line " + lineNumber + ": unexpected surplus element <" + elements[i]->Value() + ">"); throw std::runtime_error("Spec error on line " + lineNumber + ": unexpected surplus element <" + elements[i]->Value() + ">");
} }
if (values[i] != elements[i]->Value()) if (values[i] != elements[i]->Value())
{ {
assert(false);
throw std::runtime_error("Spec error on line " + lineNumber + ": unexpected element <" + elements[i]->Value() + ">, expected <" + values[i] + ">"); throw std::runtime_error("Spec error on line " + lineNumber + ": unexpected element <" + elements[i]->Value() + ">, expected <" + values[i] + ">");
} }
} }
@ -1369,7 +1364,6 @@ void VulkanHppGenerator::checkAlias(std::map<std::string, T> const& data, std::s
ss << line; ss << line;
std::string lineNumber = ss.str(); std::string lineNumber = ss.str();
assert(false);
throw std::runtime_error("Spec error on line " + lineNumber + ": missing alias <" + name + ">"); throw std::runtime_error("Spec error on line " + lineNumber + ": missing alias <" + name + ">");
} }
} }
@ -1418,7 +1412,7 @@ std::map<std::string, std::string> VulkanHppGenerator::createDefaults()
defaultValues[dependency.name] = "0"; defaultValues[dependency.name] = "0";
break; break;
default: default:
assert(false); assert(false && "Unhandled exception category");
break; break;
} }
} }
@ -2447,7 +2441,6 @@ void VulkanHppGenerator::readType(tinyxml2::XMLElement const* element)
ss << element->GetLineNum(); ss << element->GetLineNum();
std::string lineNumber = ss.str(); std::string lineNumber = ss.str();
assert(false);
throw std::runtime_error("Spec error on line " + lineNumber + ": unknown category <" + categoryIt->second + ">"); throw std::runtime_error("Spec error on line " + lineNumber + ": unknown category <" + categoryIt->second + ">");
} }
} }
@ -5132,7 +5125,7 @@ int main( int argc, char **argv )
{ {
std::stringstream lineNumber; std::stringstream lineNumber;
lineNumber << child->GetLineNum(); lineNumber << child->GetLineNum();
std::cerr << "Unhandled tag " << value << " at line number: " << lineNumber.str() << std::endl; std::cerr << "warning: Unhandled tag " << value << " at line number: " << lineNumber.str() << "!" << std::endl;
} }
} }