Add cast-to-bool operators for tree node handles for C++ and D

This commit is contained in:
josh committed 2026-09-05 17:56:18 -04:00
1 parent 3b914466b3
commit 429ce88eb5
8 files changed
+98

No files matched your search

+2
View File
@@ -17,6 +17,8 @@ int main()
assert(p_node_valid(p_tree_walk_Items(items, pItem, pToken1)));
assert_eq(TOKEN_a, p_tree_walk_Items(items, pItem, pToken1, token));
assert_eq(11, p_tree_walk_Items(items, pItem, pToken1, pvalue));
/* A token node handle from an unmatched rule is invalid. */
assert(!p_node_valid(p_tree_walk_Items(items, pItem, pDual, pOne1, pToken1)));
assert(p_node_valid(p_Items_pItemsMore(items)));
ItemsMore itemsmore = p_Items_pItemsMore(items);
assert(p_node_valid(p_ItemsMore_pItem(itemsmore)));
+28
View File
@@ -12,6 +12,13 @@ int main()
Start start = p_result(context);
assert(start.pItems1().valid());
assert(start.pItems().valid());
// A rule node handle is usable directly as a boolean condition.
assert(start);
assert(start.pItems());
if (!start.pItems())
{
return 1;
}
Items items = start.pItems();
assert_ne(0u, items.node_id());
assert_eq(start.pItems().node_id(), items.node_id());
@@ -19,6 +26,21 @@ int main()
assert(items.pItem().pToken1().valid());
assert_eq(TOKEN_a, items.pItem().pToken1().token());
assert_eq(11, items.pItem().pToken1().pvalue());
// A token node handle is usable directly as a boolean condition.
Token token = items.pItem().pToken1();
assert(token);
if (!token)
{
return 1;
}
// An invalid token node handle converts to false.
Token invalid_token = items.pItem().pDual().pOne1().pToken1();
assert(!invalid_token.valid());
assert(!invalid_token);
if (invalid_token)
{
return 1;
}
assert(items.pItemsMore().valid());
ItemsMore itemsmore = items.pItemsMore();
assert(itemsmore.pItem().valid());
@@ -42,6 +64,12 @@ int main()
assert_eq(P_SUCCESS, p_parse(context));
start = p_result(context);
assert(!start.pItems().valid());
// An invalid rule node handle converts to false.
assert(!start.pItems());
if (start.pItems())
{
return 1;
}
assert_eq(0u, start.pItems().node_id());
p_context_delete(context);
+28
View File
@@ -15,11 +15,33 @@ unittest
Start start = p_result(context);
assert(start.pItems1.valid);
assert(start.pItems.valid);
// A rule node handle is usable directly as a boolean condition.
assert(start);
assert(start.pItems);
if (!start.pItems)
{
assert(false);
}
Items items = start.pItems;
assert(items.pItem.valid);
assert(items.pItem.pToken1.valid);
assert_eq(TOKEN_a, items.pItem.pToken1.token);
assert_eq(11, items.pItem.pToken1.pvalue);
// A token node handle is usable directly as a boolean condition.
Token token = items.pItem.pToken1;
assert(token);
if (!token)
{
assert(false);
}
// An invalid token node handle converts to false.
Token invalidToken = items.pItem.pDual.pOne1.pToken1;
assert(!invalidToken.valid);
assert(!invalidToken);
if (invalidToken)
{
assert(false);
}
assert(items.pItemsMore.valid);
ItemsMore itemsmore = items.pItemsMore;
assert(itemsmore.pItem.valid);
@@ -43,6 +65,12 @@ unittest
assert_eq(P_SUCCESS, p_parse(context));
start = p_result(context);
assert(!start.pItems.valid);
// An invalid rule node handle converts to false.
assert(!start.pItems);
if (start.pItems)
{
assert(false);
}
p_context_delete(context);
+2
View File
@@ -13,6 +13,8 @@ fn main() {
assert!(items.pItem().pToken1().valid());
assert_eq!(TOKEN_a, items.pItem().pToken1().token());
assert_eq!(11, items.pItem().pToken1().pvalue());
/* A token node handle from an unmatched rule is invalid. */
assert!(!items.pItem().pDual().pOne1().pToken1().valid());
let itemsmore = items.pItemsMore();
assert!(itemsmore.pItem().pItem().pItem().pToken1().valid());
assert_eq!(TOKEN_b, itemsmore.pItem().pItem().pItem().pToken1().token());