From 7ea6206126a4ecee176d8567fbfb2ce62c4de5d9 Mon Sep 17 00:00:00 2001
From: Seth Hillbrand <seth@kipro-pcb.com>
Date: Mon, 27 Jan 2025 20:00:24 -0800
Subject: [PATCH] dynamic_bitset requires both sets to be same size
---
include/base_set.h | 60 +++++++++++++++++++++++++++++++++++++++++++---
1 file changed, 57 insertions(+), 3 deletions(-)
diff --git a/include/base_set.h b/include/base_set.h
index b4480ef2c2..c8407ee12c 100644
--- a/include/base_set.h
+++ b/include/base_set.h
@@ -186,21 +186,75 @@ public:
// Compound assignment AND operator
BASE_SET& operator&=(const BASE_SET& other)
{
- sul::dynamic_bitset<uint64_t>::operator&=(other);
+ size_t my_size = size();
+ size_t other_size = other.size();
+
+ if( my_size == other_size )
+ {
+ sul::dynamic_bitset<uint64_t>::operator&=(other);
+ }
+ else if( my_size < other_size )
+ {
+ sul::dynamic_bitset<uint64_t>::resize( other_size );
+ sul::dynamic_bitset<uint64_t>::operator&=( other );
+ }
+ else
+ {
+ BASE_SET tmp( other );
+ tmp.resize( my_size );
+ sul::dynamic_bitset<uint64_t>::operator&=( tmp );
+ }
+
return *this;
}
// Compound assignment OR operator
BASE_SET& operator|=(const BASE_SET& other)
{
- sul::dynamic_bitset<uint64_t>::operator|=(other);
+ size_t my_size = size();
+ size_t other_size = other.size();
+
+ if( my_size == other_size )
+ {
+ sul::dynamic_bitset<uint64_t>::operator|=(other);
+ }
+ else if( my_size < other_size )
+ {
+ sul::dynamic_bitset<uint64_t>::resize( other_size );
+ sul::dynamic_bitset<uint64_t>::operator|=( other );
+ }
+ else
+ {
+ BASE_SET tmp( other );
+ tmp.resize( my_size );
+ sul::dynamic_bitset<uint64_t>::operator|=( tmp );
+ }
+
return *this;
}
// Compound assignment XOR operator
BASE_SET& operator^=(const BASE_SET& other)
{
- sul::dynamic_bitset<uint64_t>::operator^=(other);
+ size_t my_size = size();
+ size_t other_size = other.size();
+
+ if( my_size == other_size )
+ {
+ sul::dynamic_bitset<uint64_t>::operator^=(other);
+ }
+ else if( my_size < other_size )
+ {
+ sul::dynamic_bitset<uint64_t>::resize( other_size );
+ sul::dynamic_bitset<uint64_t>::operator^=( other );
+ }
+ else
+ {
+ BASE_SET tmp( other );
+ tmp.resize( my_size );
+ sul::dynamic_bitset<uint64_t>::operator^=( tmp );
+ }
+
return *this;
}