sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Core/Bitset:

Browse Source
This commit is contained in:
Lynix
2018-03-06 20:25:29 +01:00
parent 464419db73
commit 3036c32d9d
5 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/Nazara/Core/Bitset.hpp
View File

@@ -51,9 +51,6 @@ namespace Nz
std::size_t GetCapacity() const;
std::size_t GetSize() const;
PointerSequence Read(const void* ptr, std::size_t bitCount);
PointerSequence Read(const PointerSequence& sequence, std::size_t bitCount);
void PerformsAND(const Bitset& a, const Bitset& b);
void PerformsNOT(const Bitset& a);
void PerformsOR(const Bitset& a, const Bitset& b);
@@ -90,6 +87,9 @@ namespace Nz
void UnboundedSet(std::size_t bit, bool val = true);
bool UnboundedTest(std::size_t bit) const;
PointerSequence Write(const void* ptr, std::size_t bitCount);
PointerSequence Write(const PointerSequence& sequence, std::size_t bitCount);
Bit operator[](std::size_t index);
bool operator[](std::size_t index) const;

20
include/Nazara/Core/Bitset.inl
View File

@@ -328,9 +328,9 @@ namespace Nz
}
/*!
* \brief Read a byte sequence into a bitset
* \brief Writes a byte sequence into a bitset
*
* This function extends the bitset with bits read from a byte sequence
* This function extends the bitset with bits read from a byte sequence.
*
* \param ptr A pointer to the start of the byte sequence
* \param bitCount Number of bits to read from the byte sequence
@@ -341,17 +341,18 @@ namespace Nz
*
* \see AppendBits
* \see Read
* \see Write
*/
template<typename Block, class Allocator>
typename Bitset<Block, Allocator>::PointerSequence Bitset<Block, Allocator>::Read(const void* ptr, std::size_t bitCount)
typename Bitset<Block, Allocator>::PointerSequence Bitset<Block, Allocator>::Write(const void* ptr, std::size_t bitCount)
{
return Read(PointerSequence(ptr, 0U), bitCount);
return Write(PointerSequence(ptr, 0U), bitCount);
}
/*!
* \brief Read a byte sequence into a bitset
* \brief Writes a byte sequence into a bitset
*
* This function extends the bitset with bits read from a pointer sequence (made of a pointer and a bit index)
* This function extends the bitset with bits read from a pointer sequence (made of a pointer and a bit index).
*
* \param sequence A pointer sequence to the start of the byte sequence
* \param bitCount Number of bits to read from the byte sequence
@@ -362,9 +363,10 @@ namespace Nz
*
* \see AppendBits
* \see Read
* \see Write
*/
template<typename Block, class Allocator>
typename Bitset<Block, Allocator>::PointerSequence Bitset<Block, Allocator>::Read(const PointerSequence& sequence, std::size_t bitCount)
typename Bitset<Block, Allocator>::PointerSequence Bitset<Block, Allocator>::Write(const PointerSequence& sequence, std::size_t bitCount)
{
NazaraAssert(sequence.first, "Invalid pointer sequence");
NazaraAssert(sequence.second < 8, "Invalid next bit index (must be < 8)");
@@ -1161,9 +1163,9 @@ namespace Nz
Bitset bitset;
if (sequence)
*sequence = bitset.Read(ptr, bitCount);
*sequence = bitset.Write(ptr, bitCount);
else
bitset.Read(ptr, bitCount);
bitset.Write(ptr, bitCount);
return bitset;
}