- bugfix for deque with _size not being initialized
- wrote PrettyPrinter for deque
This commit is contained in:
@@ -138,6 +138,45 @@ class ListPrinter:
|
|||||||
return 'array'
|
return 'array'
|
||||||
|
|
||||||
|
|
||||||
|
# DEQUE ================================================================================================================
|
||||||
|
|
||||||
|
class DequePrinter:
|
||||||
|
"""Print a fennec::deque"""
|
||||||
|
|
||||||
|
class Iterator:
|
||||||
|
def __init__(self, start):
|
||||||
|
self.node = start
|
||||||
|
self.index = 0
|
||||||
|
|
||||||
|
def __iter__(self):
|
||||||
|
return self
|
||||||
|
|
||||||
|
def __next__(self):
|
||||||
|
if self.node is None:
|
||||||
|
raise StopIteration
|
||||||
|
|
||||||
|
i = self.index
|
||||||
|
value = self.node.dereference()['value']
|
||||||
|
|
||||||
|
self.node = self.node.dereference()['next']
|
||||||
|
self.index = self.index + 1
|
||||||
|
|
||||||
|
return '[{}]'.format(i), value
|
||||||
|
|
||||||
|
def __init__(self, val):
|
||||||
|
self.first = val['_first']
|
||||||
|
self.last = val['_last']
|
||||||
|
self.size = val['_size']
|
||||||
|
|
||||||
|
def to_string(self):
|
||||||
|
if self.first is None:
|
||||||
|
return "{ empty }"
|
||||||
|
return "{ length " + str(self.size) + " }"
|
||||||
|
|
||||||
|
def children(self):
|
||||||
|
return self.Iterator(self.first)
|
||||||
|
|
||||||
|
|
||||||
# SET ==================================================================================================================
|
# SET ==================================================================================================================
|
||||||
|
|
||||||
class SetPrinter:
|
class SetPrinter:
|
||||||
@@ -426,6 +465,7 @@ def register_printers():
|
|||||||
print("registering containers")
|
print("registering containers")
|
||||||
pp = gdb.printing.RegexpCollectionPrettyPrinter("fennec::containers")
|
pp = gdb.printing.RegexpCollectionPrettyPrinter("fennec::containers")
|
||||||
pp.add_printer('fennec::array', '^fennec::array<.*>$', ArrayPrinter)
|
pp.add_printer('fennec::array', '^fennec::array<.*>$', ArrayPrinter)
|
||||||
|
pp.add_printer('fennec::deque', '^fennec::deque<.*>$', DequePrinter)
|
||||||
pp.add_printer('fennec::dynarray', '^fennec::dynarray<.*>$', DynArrayPrinter)
|
pp.add_printer('fennec::dynarray', '^fennec::dynarray<.*>$', DynArrayPrinter)
|
||||||
pp.add_printer('fennec::graph', '^fennec::graph<.*>$', GraphPrinter)
|
pp.add_printer('fennec::graph', '^fennec::graph<.*>$', GraphPrinter)
|
||||||
pp.add_printer('fennec::list', '^fennec::list<.*>$', ListPrinter)
|
pp.add_printer('fennec::list', '^fennec::list<.*>$', ListPrinter)
|
||||||
|
|||||||
@@ -54,13 +54,15 @@ public:
|
|||||||
deque()
|
deque()
|
||||||
: _alloc()
|
: _alloc()
|
||||||
, _first(nullptr)
|
, _first(nullptr)
|
||||||
, _last(nullptr) {
|
, _last(nullptr)
|
||||||
|
, _size(0) {
|
||||||
}
|
}
|
||||||
|
|
||||||
deque(deque&& deque) noexcept
|
deque(deque&& deque) noexcept
|
||||||
: _alloc(deque._alloc)
|
: _alloc(deque._alloc)
|
||||||
, _first(deque._first)
|
, _first(deque._first)
|
||||||
, _last(deque._last) {
|
, _last(deque._last)
|
||||||
|
, _size(deque._size) {
|
||||||
deque._first = nullptr;
|
deque._first = nullptr;
|
||||||
deque._last = nullptr;
|
deque._last = nullptr;
|
||||||
}
|
}
|
||||||
|
|||||||
52
test/tests/containers/test_deque.h
Normal file
52
test/tests/containers/test_deque.h
Normal file
@@ -0,0 +1,52 @@
|
|||||||
|
// =====================================================================================================================
|
||||||
|
// fennec, a free and open source game engine
|
||||||
|
// Copyright © 2025 Medusa Slockbower
|
||||||
|
//
|
||||||
|
// This program is free software: you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU General Public License as published by
|
||||||
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
|
// (at your option) any later version.
|
||||||
|
//
|
||||||
|
// This program is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
// =====================================================================================================================
|
||||||
|
|
||||||
|
#ifndef FENNEC_TEST_CONTAINERS_DEQUE_H
|
||||||
|
#define FENNEC_TEST_CONTAINERS_DEQUE_H
|
||||||
|
|
||||||
|
#include <fennec/containers/deque.h>
|
||||||
|
|
||||||
|
#include "../../test.h"
|
||||||
|
|
||||||
|
namespace fennec
|
||||||
|
{
|
||||||
|
|
||||||
|
namespace test
|
||||||
|
{
|
||||||
|
|
||||||
|
inline void fennec_test_containers_deque() {
|
||||||
|
deque<size_t> test;
|
||||||
|
|
||||||
|
const size_t n = 50;
|
||||||
|
for (size_t i = 0; i < n; ++i) {
|
||||||
|
test.push_front(i);
|
||||||
|
}
|
||||||
|
|
||||||
|
for (size_t i = 0; i < n; ++i) {
|
||||||
|
assertf(test.back() == i, "Deque test Failed!");
|
||||||
|
test.pop_back();
|
||||||
|
}
|
||||||
|
|
||||||
|
fennec_test_run(test.empty(), true);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif // FENNEC_TEST_CONTAINERS_DEQUE_H
|
||||||
@@ -20,6 +20,7 @@
|
|||||||
#define FENNEC_TEST_CONTAINERS_H
|
#define FENNEC_TEST_CONTAINERS_H
|
||||||
|
|
||||||
#include "containers/test_array.h"
|
#include "containers/test_array.h"
|
||||||
|
#include "containers/test_deque.h"
|
||||||
#include "containers/test_dynarray.h"
|
#include "containers/test_dynarray.h"
|
||||||
#include "containers/test_graph.h"
|
#include "containers/test_graph.h"
|
||||||
#include "containers/test_list.h"
|
#include "containers/test_list.h"
|
||||||
@@ -60,6 +61,11 @@ namespace fennec::test
|
|||||||
fennec_test_containers_list();
|
fennec_test_containers_list();
|
||||||
fennec_test_spacer(3);
|
fennec_test_spacer(3);
|
||||||
|
|
||||||
|
fennec_test_subheader("deque tests");
|
||||||
|
fennec_test_spacer(2);
|
||||||
|
fennec_test_containers_deque();
|
||||||
|
fennec_test_spacer(3);
|
||||||
|
|
||||||
fennec_test_subheader("set tests");
|
fennec_test_subheader("set tests");
|
||||||
fennec_test_spacer(2);
|
fennec_test_spacer(2);
|
||||||
fennec_test_containers_set();
|
fennec_test_containers_set();
|
||||||
|
|||||||
Reference in New Issue
Block a user