From c1d7ef8b529953bb38f575930eca662d714385ab Mon Sep 17 00:00:00 2001 From: David Shah Date: Wed, 28 Feb 2018 15:03:40 +0000 Subject: Fix handling of a port name like CLKHF_FABRIC in icetime Signed-off-by: David Shah --- icetime/icetime.cc | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'icetime/icetime.cc') diff --git a/icetime/icetime.cc b/icetime/icetime.cc index 9caf82b..0b7cea2 100644 --- a/icetime/icetime.cc +++ b/icetime/icetime.cc @@ -1283,12 +1283,18 @@ std::string ecnetname_to_vlog(std::string ec_name) std::string end = ec_name.substr(last_+1); size_t nidx = 0; - int num = std::stoi(end, &nidx, 10); - if(nidx == end.length()) { - return base + "[" + std::to_string(num) + "]"; - } else { + int num = 0; + try { + num = std::stoi(end, &nidx, 10); + if(nidx == end.length()) { + return base + "[" + std::to_string(num) + "]"; + } else { + return ec_name; + } + } catch(std::invalid_argument e) { // Not numeric and stoi throws exception return ec_name; } + } std::string make_dsp_ip(int x, int y, std::string net, std::string &primnet) -- cgit v1.2.3