benn/lumiera_
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

UI-Coordinates: bugfix to pass unit test thus far

Browse source 
whew!
This commit is contained in:
Fischlurch 2017-10-01 03:58:42 +02:00
parent 5dfd135595
commit 107e9008e5
2 changed files with 42 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
src/lib/path-array.hpp
View file

@ -194,7 +194,8 @@ namespace lib {
trimTo (size_t cnt)
{
REQUIRE (cnt <= size());
if (cnt == 0 and storage_)
if (not storage_) return;
if (cnt == 0)
{
delete[] storage_;
storage_ = nullptr;
@ -321,7 +322,7 @@ namespace lib {
checkPoint (const PathArray* src, const Literal*& pos)
{
REQUIRE (src);
if (pos >= src->elms_.end() and src->tail_)
if (pos == src->elms_.end() and src->tail_)
pos = &src->tail_[0];
else
if (not src->isValid (pos))
@ -338,7 +339,8 @@ namespace lib {
using const_iterator = lib::IterAdapter<Literal const*, PathArray const*>;
using iterator = const_iterator;
iterator begin() const { return iterator{this, elms_.begin()}; }
/** @remark iteration is defined to begin with real content */
iterator begin() const { return firstNonempty(); }
iterator end() const { return iterator{}; }
friend iterator begin(PathArray const& pa) { return pa.begin();}
@ -352,7 +354,17 @@ namespace lib {
{
return pos
and (tail_.isValid(pos)
or (pos < elms_.end() and *pos));
or (elms_.begin() <= pos and pos < elms_.end()
and *pos));
}
iterator
firstNonempty () const
{
iterator startPos{this, elms_.begin()};
while (startPos && isnil (*startPos))
++startPos;
return startPos;
}
/** find _effective end_ of data in the inline array,
@ -403,33 +415,41 @@ namespace lib {
void
normalise()
{
if (size() == 0) return;
static Symbol ANY("*");
const char* fill = Symbol::EMPTY;
Literal* end = elms_.end();
Literal* seg = elms_.begin();
for (Literal* pos = elms_.begin(); pos!=end; ++pos)
if (isnil (*pos))
setContent (pos, fill);
else
if (fill==Symbol::EMPTY)
fill = ANY;
if (not tail_) return;
seg = const_cast<Literal*> (&tail_[0]);
end = seg + tail_.size();
for (Literal* pos = seg; pos!=end; ++pos)
Literal* pos = elms_.begin();
for ( ; pos!=end; ++pos)
if (isnil (*pos))
setContent (pos, fill);
else
if (fill==Symbol::EMPTY)
fill = ANY;
if (tail_)
{
// normalise data in extension storage
pos = getPosition (chunk_size);
end = pos + tail_.size();
for ( ; pos!=end; ++pos)
if (isnil (*pos))
setContent (pos, fill);
else
if (fill==Symbol::EMPTY)
fill = ANY;
}
size_t idx = size();
while (idx and ANY == (*this)[--idx])
// trim trailing fill
while (idx and fill == *getPosition (--idx))
setContent (getPosition(idx), nullptr);
if (idx >= chunk_size-1)
tail_.trimTo (idx - chunk_size);
tail_.trimTo (idx+1 - chunk_size);
else
tail_.trimTo (0);
}
};

6
tests/library/path-array-test.cpp
View file

@ -149,10 +149,14 @@ namespace test {
CHECK (7 == parr.size());
CHECK ("Θ***Φ" == join(parr,""));
parr = ParrT{nullptr,"Δ",nullptr,"Ξ",nullptr,nullptr,"Φ"};
parr = ParrT{nullptr,"Δ",nullptr,"Ξ",nullptr,nullptr,nullptr};
CHECK (4 == parr.size());
CHECK ("Δ*Ξ" == join(parr,""));
parr = ParrT{nullptr,"Δ",nullptr,"Ξ",nullptr,nullptr,"Φ"};
CHECK (7 == parr.size());
CHECK ("Δ*Ξ**Φ" == join(parr,""));
parr = ParrT{nullptr,nullptr,nullptr,nullptr,nullptr,nullptr,nullptr,nullptr,nullptr,nullptr,nullptr,nullptr,nullptr,nullptr,nullptr,"Ω",nullptr};
CHECK (16 == parr.size());
CHECK ("Ω" == join(parr,""));