caiyu/nextpnr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace assertion failure with error

Browse Source 
Signed-off-by: David Shah <dave@ds0.me>
This commit is contained in:
David Shah 2020-03-13 11:35:09 +00:00
parent bb73580209
commit 54b15ed201
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
common/util.h
View File

@ -25,6 +25,8 @@
#include <string> #include <string>
#include "nextpnr.h" #include "nextpnr.h"
#include "log.h"
NEXTPNR_NAMESPACE_BEGIN NEXTPNR_NAMESPACE_BEGIN
// Get a value from a map-style container, returning default if value is not // Get a value from a map-style container, returning default if value is not
@ -47,8 +49,9 @@ std::string str_or_default(const Container &ct, const KeyType &key, std::string
auto found = ct.find(key); auto found = ct.find(key);
if (found == ct.end()) if (found == ct.end())
return def; return def;
else else {
return found->second; return found->second;
}
}; };
template <typename KeyType> template <typename KeyType>
@ -57,8 +60,11 @@ std::string str_or_default(const std::unordered_map<KeyType, Property> &ct, cons
auto found = ct.find(key); auto found = ct.find(key);
if (found == ct.end()) if (found == ct.end())
return def; return def;
else else {
if (!found->second.is_string)
log_error("Expecting string value but got integer %d.\n", int(found->second.intval));
return found->second.as_string(); return found->second.as_string();
}
}; };
// Get a value from a map-style container, converting to int, and returning // Get a value from a map-style container, converting to int, and returning
@ -79,9 +85,13 @@ int int_or_default(const std::unordered_map<KeyType, Property> &ct, const KeyTyp
if (found == ct.end()) if (found == ct.end())
return def; return def;
else { else {
if (found->second.is_string) if (found->second.is_string) {
return std::stoi(found->second.as_string()); try {
else return std::stoi(found->second.as_string());
} catch (std::invalid_argument &e) {
log_error("Expecting numeric value but got '%s'.\n", found->second.as_string().c_str());
}
} else
return found->second.as_int64(); return found->second.as_int64();
} }
}; };