aboutsummaryrefslogtreecommitdiffstats
path: root/backends/cxxrtl/cxxrtl_vcd.h
diff options
context:
space:
mode:
authorwhitequark <whitequark@whitequark.org>2020-06-09 11:59:17 +0000
committerGitHub <noreply@github.com>2020-06-09 11:59:17 +0000
commit3dc32490e071f221481c7bae9285957565026d76 (patch)
treef8be815a179ac1f49c3550388c9d19efff013f1c /backends/cxxrtl/cxxrtl_vcd.h
parent74e3ac2449f521a50d5e88daa951acee1062e620 (diff)
parentbbfe55a8d0a40eda2df8af0383c9175791377eb7 (diff)
downloadyosys-3dc32490e071f221481c7bae9285957565026d76.tar.gz
yosys-3dc32490e071f221481c7bae9285957565026d76.tar.bz2
yosys-3dc32490e071f221481c7bae9285957565026d76.zip
Merge pull request #2130 from whitequark/cxxrtl-fix-split_by
cxxrtl: fix two buggy split_by functions
Diffstat (limited to 'backends/cxxrtl/cxxrtl_vcd.h')
-rw-r--r--backends/cxxrtl/cxxrtl_vcd.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/backends/cxxrtl/cxxrtl_vcd.h b/backends/cxxrtl/cxxrtl_vcd.h
index 5f5f612b5..f6b78bbf7 100644
--- a/backends/cxxrtl/cxxrtl_vcd.h
+++ b/backends/cxxrtl/cxxrtl_vcd.h
@@ -136,14 +136,14 @@ class vcd_writer {
std::vector<std::string> hierarchy;
size_t prev = 0;
while (true) {
- size_t curr = hier_name.find_first_of(' ', prev + 1);
- if (curr > hier_name.size())
- curr = hier_name.size();
- if (curr > prev + 1)
- hierarchy.push_back(hier_name.substr(prev, curr - prev));
- if (curr == hier_name.size())
+ size_t curr = hier_name.find_first_of(' ', prev);
+ if (curr == std::string::npos) {
+ hierarchy.push_back(hier_name.substr(prev));
break;
- prev = curr + 1;
+ } else {
+ hierarchy.push_back(hier_name.substr(prev, curr - prev));
+ prev = curr + 1;
+ }
}
return hierarchy;
}