Skip to content

feat: basic_node allocation and aug_node iterate method #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: basic_node allocation and aug_node iterate method #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions include/cpam/augmented_node.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,13 +160,13 @@ struct aug_node : public basic_node<balance,
template<typename F>
static void iterate_seq(node* a, const F& f) {
if (!a) return;
if (basic::is_regular(a)) {
auto r = basic::cast_to_regular(a);
if (is_regular(a)) {
auto r = cast_to_regular(a);
iterate_seq(r->lc, f);
f(get_entry(r));
iterate_seq(r->rc, f);
} else {
auto c = basic::cast_to_compressed(a);
auto c = cast_to_compressed(a);
uint8_t* data_start = (((uint8_t*)c) + sizeof(aug_compressed_node));
AugEntryEncoder::decode(data_start, c->s, f);
}
Expand Down
4 changes: 2 additions & 2 deletions include/cpam/basic_node.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,15 +193,15 @@ struct basic_node {
assert(s <= 2*B);

size_t encoded_size = EntryEncoder::encoded_size(e, s);
size_t node_size = 3*sizeof(node_size_t) + encoded_size;
size_t node_size = sizeof(compressed_node) + encoded_size;
compressed_node* c_node = (compressed_node*)utils::new_array_no_init<uint8_t>(node_size);
//compressed_node* c_node = (compressed_node*)complex_allocator::alloc();

c_node->r = 1;
c_node->s = s;
c_node->size_in_bytes = node_size;

uint8_t* encoded_data = (((uint8_t*)c_node) + 3*sizeof(node_size_t));
uint8_t* encoded_data = (((uint8_t*)c_node) + sizeof(compressed_node));
EntryEncoder::encode(e, s, encoded_data);

check_compressed_node(c_node);
Expand Down