diff options
| author | Tom Lane | 2017-04-10 17:51:29 +0000 |
|---|---|---|
| committer | Tom Lane | 2017-04-10 17:51:53 +0000 |
| commit | 8f0530f58061b185dc385df42e62d78a18d4ae3e (patch) | |
| tree | 63d038ae4012dcdcff3b556dde4c654959f8448e /src/backend/parser/parse_collate.c | |
| parent | 56dd8e85c40fef3e3c2c10afa186ee30416ec507 (diff) | |
Improve castNode notation by introducing list-extraction-specific variants.
This extends the castNode() notation introduced by commit 5bcab1114 to
provide, in one step, extraction of a list cell's pointer and coercion to
a concrete node type. For example, "lfirst_node(Foo, lc)" is the same
as "castNode(Foo, lfirst(lc))". Almost half of the uses of castNode
that have appeared so far include a list extraction call, so this is
pretty widely useful, and it saves a few more keystrokes compared to the
old way.
As with the previous patch, back-patch the addition of these macros to
pg_list.h, so that the notation will be available when back-patching.
Patch by me, after an idea of Andrew Gierth's.
Discussion: https://postgr.es/m/[email protected]
Diffstat (limited to 'src/backend/parser/parse_collate.c')
| -rw-r--r-- | src/backend/parser/parse_collate.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/backend/parser/parse_collate.c b/src/backend/parser/parse_collate.c index cc235d422f5..aa443f23ad5 100644 --- a/src/backend/parser/parse_collate.c +++ b/src/backend/parser/parse_collate.c @@ -514,7 +514,7 @@ assign_collations_walker(Node *node, assign_collations_context *context) if (qtree->targetList == NIL) return false; - tent = castNode(TargetEntry, linitial(qtree->targetList)); + tent = linitial_node(TargetEntry, qtree->targetList); if (tent->resjunk) return false; @@ -649,7 +649,7 @@ assign_collations_walker(Node *node, assign_collations_context *context) foreach(lc, expr->args) { - CaseWhen *when = castNode(CaseWhen, lfirst(lc)); + CaseWhen *when = lfirst_node(CaseWhen, lc); /* * The condition expressions mustn't affect @@ -865,7 +865,7 @@ assign_aggregate_collations(Aggref *aggref, /* Process aggregated args, holding resjunk ones at arm's length */ foreach(lc, aggref->args) { - TargetEntry *tle = castNode(TargetEntry, lfirst(lc)); + TargetEntry *tle = lfirst_node(TargetEntry, lc); if (tle->resjunk) assign_expr_collations(loccontext->pstate, (Node *) tle); @@ -909,7 +909,7 @@ assign_ordered_set_collations(Aggref *aggref, /* Process aggregated args appropriately */ foreach(lc, aggref->args) { - TargetEntry *tle = castNode(TargetEntry, lfirst(lc)); + TargetEntry *tle = lfirst_node(TargetEntry, lc); if (merge_sort_collations) (void) assign_collations_walker((Node *) tle, loccontext); |