mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-10-31 03:32:29 +00:00
Code Activity

Fix const_iterator postincrement behavior

Browse source
This commit is contained in:
Robert O'Callahan 2025-08-29 04:33:14 +00:00
parent c5d096b7b8
commit 4657768506
2 changed files with 26 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
kernel/rtlil.h
View file

@ -805,8 +805,8 @@ public:
const_iterator& operator++() { ++idx; return *this; } const_iterator& operator++() { ++idx; return *this; }
const_iterator& operator--() { --idx; return *this; } const_iterator& operator--() { --idx; return *this; }
const_iterator& operator++(int) { ++idx; return *this; } const_iterator operator++(int) { const_iterator result(*this); ++idx; return result; }
const_iterator& operator--(int) { --idx; return *this; } const_iterator operator--(int) { const_iterator result(*this); --idx; return result; }
const_iterator& operator+=(int i) { idx += i; return *this; } const_iterator& operator+=(int i) { idx += i; return *this; }
const_iterator operator+(int add) { const_iterator operator+(int add) {

24
tests/unit/kernel/rtlilTest.cc
View file

@ -90,6 +90,30 @@ namespace RTLIL {
} }
TEST_F(KernelRtlilTest, ConstConstIteratorWorks) {
const Const c(0x2, 2);
Const::const_iterator it = c.begin();
ASSERT_NE(it, c.end());
EXPECT_EQ(*it, State::S0);
++it;
ASSERT_NE(it, c.end());
EXPECT_EQ(*it, State::S1);
++it;
EXPECT_EQ(it, c.end());
}
TEST_F(KernelRtlilTest, ConstConstIteratorPreincrement) {
const Const c(0x2, 2);
Const::const_iterator it = c.begin();
EXPECT_EQ(*++it, State::S1);
}
TEST_F(KernelRtlilTest, ConstConstIteratorPostincrement) {
const Const c(0x2, 2);
Const::const_iterator it = c.begin();
EXPECT_EQ(*it++, State::S0);
}
class WireRtlVsHdlIndexConversionTest : class WireRtlVsHdlIndexConversionTest :
public KernelRtlilTest, public KernelRtlilTest,
public testing::WithParamInterface<std::tuple<bool, int, int>> public testing::WithParamInterface<std::tuple<bool, int, int>>