diff options
author | David Shah <dave@ds0.me> | 2020-03-13 11:35:09 +0000 |
---|---|---|
committer | David Shah <dave@ds0.me> | 2020-03-13 11:35:09 +0000 |
commit | 54b15ed20100523199885685c4557f160fbf56a0 (patch) | |
tree | 1161b8719fc192fcbc3071a938a4a17662995dfc | |
parent | bb7358020928d0a26ab7becd123ccdc15b0206cb (diff) | |
download | nextpnr-54b15ed20100523199885685c4557f160fbf56a0.tar.gz nextpnr-54b15ed20100523199885685c4557f160fbf56a0.tar.bz2 nextpnr-54b15ed20100523199885685c4557f160fbf56a0.zip |
Replace assertion failure with error
Signed-off-by: David Shah <dave@ds0.me>
-rw-r--r-- | common/util.h | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/common/util.h b/common/util.h index 2ccfe5d2..9512bd40 100644 --- a/common/util.h +++ b/common/util.h @@ -25,6 +25,8 @@ #include <string> #include "nextpnr.h" +#include "log.h" + NEXTPNR_NAMESPACE_BEGIN // 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); if (found == ct.end()) return def; - else + else { return found->second; + } }; 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); if (found == ct.end()) 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(); + } }; // 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()) return def; else { - if (found->second.is_string) - return std::stoi(found->second.as_string()); - else + if (found->second.is_string) { + try { + 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(); } }; |