mirror of
https://github.com/postgres/postgres.git
synced 2026-06-03 14:00:01 -04:00
Change pg_bsd_indent to follow upstream rules for placement of comments
to the right of code, and remove pgindent hack that caused comments
following #endif to not obey the general rule.
Commit e3860ffa4d wasn't actually using
the published version of pg_bsd_indent, but a hacked-up version that
tried to minimize the amount of movement of comments to the right of
code. The situation of interest is where such a comment has to be
moved to the right of its default placement at column 33 because there's
code there. BSD indent has always moved right in units of tab stops
in such cases --- but in the previous incarnation, indent was working
in 8-space tab stops, while now it knows we use 4-space tabs. So the
net result is that in about half the cases, such comments are placed
one tab stop left of before. This is better all around: it leaves
more room on the line for comment text, and it means that in such
cases the comment uniformly starts at the next 4-space tab stop after
the code, rather than sometimes one and sometimes two tabs after.
Also, ensure that comments following #endif are indented the same
as comments following other preprocessor commands such as #else.
That inconsistency turns out to have been self-inflicted damage
from a poorly-thought-through post-indent "fixup" in pgindent.
This patch is much less interesting than the first round of indent
changes, but also bulkier, so I thought it best to separate the effects.
Discussion: https://postgr.es/m/E1dAmxK-0006EE-1r@gemulon.postgresql.org
Discussion: https://postgr.es/m/30527.1495162840@sss.pgh.pa.us
79 lines
2 KiB
C
79 lines
2 KiB
C
/*-------------------------------------------------------------------------
|
|
*
|
|
* parsetree.h
|
|
* Routines to access various components and subcomponents of
|
|
* parse trees.
|
|
*
|
|
*
|
|
* Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
|
|
* Portions Copyright (c) 1994, Regents of the University of California
|
|
*
|
|
* src/include/parser/parsetree.h
|
|
*
|
|
*-------------------------------------------------------------------------
|
|
*/
|
|
#ifndef PARSETREE_H
|
|
#define PARSETREE_H
|
|
|
|
#include "nodes/parsenodes.h"
|
|
|
|
|
|
/* ----------------
|
|
* range table operations
|
|
* ----------------
|
|
*/
|
|
|
|
/*
|
|
* rt_fetch
|
|
*
|
|
* NB: this will crash and burn if handed an out-of-range RT index
|
|
*/
|
|
#define rt_fetch(rangetable_index, rangetable) \
|
|
((RangeTblEntry *) list_nth(rangetable, (rangetable_index)-1))
|
|
|
|
/*
|
|
* getrelid
|
|
*
|
|
* Given the range index of a relation, return the corresponding
|
|
* relation OID. Note that InvalidOid will be returned if the
|
|
* RTE is for a non-relation-type RTE.
|
|
*/
|
|
#define getrelid(rangeindex,rangetable) \
|
|
(rt_fetch(rangeindex, rangetable)->relid)
|
|
|
|
/*
|
|
* Given an RTE and an attribute number, return the appropriate
|
|
* variable name or alias for that attribute of that RTE.
|
|
*/
|
|
extern char *get_rte_attribute_name(RangeTblEntry *rte, AttrNumber attnum);
|
|
|
|
/*
|
|
* Given an RTE and an attribute number, return the appropriate
|
|
* type and typemod info for that attribute of that RTE.
|
|
*/
|
|
extern void get_rte_attribute_type(RangeTblEntry *rte, AttrNumber attnum,
|
|
Oid *vartype, int32 *vartypmod, Oid *varcollid);
|
|
|
|
/*
|
|
* Check whether an attribute of an RTE has been dropped (note that
|
|
* get_rte_attribute_type will fail on such an attr)
|
|
*/
|
|
extern bool get_rte_attribute_is_dropped(RangeTblEntry *rte,
|
|
AttrNumber attnum);
|
|
|
|
|
|
/* ----------------
|
|
* target list operations
|
|
* ----------------
|
|
*/
|
|
|
|
extern TargetEntry *get_tle_by_resno(List *tlist, AttrNumber resno);
|
|
|
|
/* ----------------
|
|
* FOR UPDATE/SHARE info
|
|
* ----------------
|
|
*/
|
|
|
|
extern RowMarkClause *get_parse_rowmark(Query *qry, Index rtindex);
|
|
|
|
#endif /* PARSETREE_H */
|