Rework tree generation mode and API
Store tree nodes in congruent, compact arena array. Define handle types to refer to tree nodes rather than pointers to structure instances. Free tree with context.
This commit is contained in:
1 parent
dddb1b5089
commit
5fc712c6ee
39 files changed
+1349
-811
No files matched your search
@@ -9,105 +9,113 @@ int main()
|
||||
p_context_t * context;
|
||||
context = p_context_new((uint8_t const *)input, strlen(input));
|
||||
assert(p_parse(context) == P_SUCCESS);
|
||||
Start * start = p_result(context);
|
||||
Start start = p_result(context);
|
||||
T t1 = p_Start_pT1(start);
|
||||
Token k1 = p_T_pToken(t1);
|
||||
A a1 = p_T_pA(t1);
|
||||
|
||||
assert_eq(2, start->pT1->pToken->position.row);
|
||||
assert_eq(1, start->pT1->pToken->position.col);
|
||||
assert_eq(2, start->pT1->pToken->end_position.row);
|
||||
assert_eq(1, start->pT1->pToken->end_position.col);
|
||||
assert(p_position_valid(start->pT1->pA->position));
|
||||
assert_eq(3, start->pT1->pA->position.row);
|
||||
assert_eq(3, start->pT1->pA->position.col);
|
||||
assert_eq(3, start->pT1->pA->end_position.row);
|
||||
assert_eq(8, start->pT1->pA->end_position.col);
|
||||
assert_eq(2, start->pT1->position.row);
|
||||
assert_eq(1, start->pT1->position.col);
|
||||
assert_eq(3, start->pT1->end_position.row);
|
||||
assert_eq(8, start->pT1->end_position.col);
|
||||
assert_eq(2, p_node_position(k1).row);
|
||||
assert_eq(1, p_node_position(k1).col);
|
||||
assert_eq(2, p_node_end_position(k1).row);
|
||||
assert_eq(1, p_node_end_position(k1).col);
|
||||
assert(p_position_valid(p_node_position(a1)));
|
||||
assert_eq(3, p_node_position(a1).row);
|
||||
assert_eq(3, p_node_position(a1).col);
|
||||
assert_eq(3, p_node_end_position(a1).row);
|
||||
assert_eq(8, p_node_end_position(a1).col);
|
||||
assert_eq(2, p_node_position(t1).row);
|
||||
assert_eq(1, p_node_position(t1).col);
|
||||
assert_eq(3, p_node_end_position(t1).row);
|
||||
assert_eq(8, p_node_end_position(t1).col);
|
||||
|
||||
assert_eq(2, start->position.row);
|
||||
assert_eq(1, start->position.col);
|
||||
assert_eq(3, start->end_position.row);
|
||||
assert_eq(8, start->end_position.col);
|
||||
assert_eq(2, p_node_position(start).row);
|
||||
assert_eq(1, p_node_position(start).col);
|
||||
assert_eq(3, p_node_end_position(start).row);
|
||||
assert_eq(8, p_node_end_position(start).col);
|
||||
|
||||
p_tree_delete(start);
|
||||
p_context_delete(context);
|
||||
|
||||
input = "a\nbb";
|
||||
context = p_context_new((uint8_t const *)input, strlen(input));
|
||||
assert(p_parse(context) == P_SUCCESS);
|
||||
start = p_result(context);
|
||||
t1 = p_Start_pT1(start);
|
||||
k1 = p_T_pToken(t1);
|
||||
a1 = p_T_pA(t1);
|
||||
|
||||
assert_eq(1, start->pT1->pToken->position.row);
|
||||
assert_eq(1, start->pT1->pToken->position.col);
|
||||
assert_eq(1, start->pT1->pToken->end_position.row);
|
||||
assert_eq(1, start->pT1->pToken->end_position.col);
|
||||
assert(p_position_valid(start->pT1->pA->position));
|
||||
assert_eq(2, start->pT1->pA->position.row);
|
||||
assert_eq(1, start->pT1->pA->position.col);
|
||||
assert_eq(2, start->pT1->pA->end_position.row);
|
||||
assert_eq(2, start->pT1->pA->end_position.col);
|
||||
assert_eq(1, start->pT1->position.row);
|
||||
assert_eq(1, start->pT1->position.col);
|
||||
assert_eq(2, start->pT1->end_position.row);
|
||||
assert_eq(2, start->pT1->end_position.col);
|
||||
assert_eq(1, p_node_position(k1).row);
|
||||
assert_eq(1, p_node_position(k1).col);
|
||||
assert_eq(1, p_node_end_position(k1).row);
|
||||
assert_eq(1, p_node_end_position(k1).col);
|
||||
assert(p_position_valid(p_node_position(a1)));
|
||||
assert_eq(2, p_node_position(a1).row);
|
||||
assert_eq(1, p_node_position(a1).col);
|
||||
assert_eq(2, p_node_end_position(a1).row);
|
||||
assert_eq(2, p_node_end_position(a1).col);
|
||||
assert_eq(1, p_node_position(t1).row);
|
||||
assert_eq(1, p_node_position(t1).col);
|
||||
assert_eq(2, p_node_end_position(t1).row);
|
||||
assert_eq(2, p_node_end_position(t1).col);
|
||||
|
||||
assert_eq(1, start->position.row);
|
||||
assert_eq(1, start->position.col);
|
||||
assert_eq(2, start->end_position.row);
|
||||
assert_eq(2, start->end_position.col);
|
||||
assert_eq(1, p_node_position(start).row);
|
||||
assert_eq(1, p_node_position(start).col);
|
||||
assert_eq(2, p_node_end_position(start).row);
|
||||
assert_eq(2, p_node_end_position(start).col);
|
||||
|
||||
p_tree_delete(start);
|
||||
p_context_delete(context);
|
||||
|
||||
input = "a\nc\nc";
|
||||
context = p_context_new((uint8_t const *)input, strlen(input));
|
||||
assert(p_parse(context) == P_SUCCESS);
|
||||
start = p_result(context);
|
||||
t1 = p_Start_pT1(start);
|
||||
k1 = p_T_pToken(t1);
|
||||
a1 = p_T_pA(t1);
|
||||
|
||||
assert_eq(1, start->pT1->pToken->position.row);
|
||||
assert_eq(1, start->pT1->pToken->position.col);
|
||||
assert_eq(1, start->pT1->pToken->end_position.row);
|
||||
assert_eq(1, start->pT1->pToken->end_position.col);
|
||||
assert(p_position_valid(start->pT1->pA->position));
|
||||
assert_eq(2, start->pT1->pA->position.row);
|
||||
assert_eq(1, start->pT1->pA->position.col);
|
||||
assert_eq(3, start->pT1->pA->end_position.row);
|
||||
assert_eq(1, start->pT1->pA->end_position.col);
|
||||
assert_eq(1, start->pT1->position.row);
|
||||
assert_eq(1, start->pT1->position.col);
|
||||
assert_eq(3, start->pT1->end_position.row);
|
||||
assert_eq(1, start->pT1->end_position.col);
|
||||
assert_eq(1, p_node_position(k1).row);
|
||||
assert_eq(1, p_node_position(k1).col);
|
||||
assert_eq(1, p_node_end_position(k1).row);
|
||||
assert_eq(1, p_node_end_position(k1).col);
|
||||
assert(p_position_valid(p_node_position(a1)));
|
||||
assert_eq(2, p_node_position(a1).row);
|
||||
assert_eq(1, p_node_position(a1).col);
|
||||
assert_eq(3, p_node_end_position(a1).row);
|
||||
assert_eq(1, p_node_end_position(a1).col);
|
||||
assert_eq(1, p_node_position(t1).row);
|
||||
assert_eq(1, p_node_position(t1).col);
|
||||
assert_eq(3, p_node_end_position(t1).row);
|
||||
assert_eq(1, p_node_end_position(t1).col);
|
||||
|
||||
assert_eq(1, start->position.row);
|
||||
assert_eq(1, start->position.col);
|
||||
assert_eq(3, start->end_position.row);
|
||||
assert_eq(1, start->end_position.col);
|
||||
assert_eq(1, p_node_position(start).row);
|
||||
assert_eq(1, p_node_position(start).col);
|
||||
assert_eq(3, p_node_end_position(start).row);
|
||||
assert_eq(1, p_node_end_position(start).col);
|
||||
|
||||
p_tree_delete(start);
|
||||
p_context_delete(context);
|
||||
|
||||
input = "a";
|
||||
context = p_context_new((uint8_t const *)input, strlen(input));
|
||||
assert(p_parse(context) == P_SUCCESS);
|
||||
start = p_result(context);
|
||||
t1 = p_Start_pT1(start);
|
||||
k1 = p_T_pToken(t1);
|
||||
a1 = p_T_pA(t1);
|
||||
|
||||
assert_eq(1, start->pT1->pToken->position.row);
|
||||
assert_eq(1, start->pT1->pToken->position.col);
|
||||
assert_eq(1, start->pT1->pToken->end_position.row);
|
||||
assert_eq(1, start->pT1->pToken->end_position.col);
|
||||
assert(!p_position_valid(start->pT1->pA->position));
|
||||
assert_eq(1, start->pT1->position.row);
|
||||
assert_eq(1, start->pT1->position.col);
|
||||
assert_eq(1, start->pT1->end_position.row);
|
||||
assert_eq(1, start->pT1->end_position.col);
|
||||
assert_eq(1, p_node_position(k1).row);
|
||||
assert_eq(1, p_node_position(k1).col);
|
||||
assert_eq(1, p_node_end_position(k1).row);
|
||||
assert_eq(1, p_node_end_position(k1).col);
|
||||
assert(!p_position_valid(p_node_position(a1)));
|
||||
assert_eq(1, p_node_position(t1).row);
|
||||
assert_eq(1, p_node_position(t1).col);
|
||||
assert_eq(1, p_node_end_position(t1).row);
|
||||
assert_eq(1, p_node_end_position(t1).col);
|
||||
|
||||
assert_eq(1, start->position.row);
|
||||
assert_eq(1, start->position.col);
|
||||
assert_eq(1, start->end_position.row);
|
||||
assert_eq(1, start->end_position.col);
|
||||
assert_eq(1, p_node_position(start).row);
|
||||
assert_eq(1, p_node_position(start).col);
|
||||
assert_eq(1, p_node_end_position(start).row);
|
||||
assert_eq(1, p_node_end_position(start).col);
|
||||
|
||||
p_tree_delete(start);
|
||||
p_context_delete(context);
|
||||
|
||||
return 0;
|
||||
|
||||
Reference in new issue
Block a user