mirror of
https://git.postgresql.org/git/postgresql.git
synced 2026-02-12 01:18:35 +08:00
c7b8998ebb
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 e3860ffa4dd0dad0dd9eea4be9cc1412373a8c89 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
68 lines
2.4 KiB
C
68 lines
2.4 KiB
C
/*-------------------------------------------------------------------------
|
|
*
|
|
* parse_oper.h
|
|
* handle operator things for parser
|
|
*
|
|
*
|
|
* Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
|
|
* Portions Copyright (c) 1994, Regents of the University of California
|
|
*
|
|
* src/include/parser/parse_oper.h
|
|
*
|
|
*-------------------------------------------------------------------------
|
|
*/
|
|
#ifndef PARSE_OPER_H
|
|
#define PARSE_OPER_H
|
|
|
|
#include "access/htup.h"
|
|
#include "nodes/parsenodes.h"
|
|
#include "parser/parse_node.h"
|
|
|
|
|
|
typedef HeapTuple Operator;
|
|
|
|
/* Routines to look up an operator given name and exact input type(s) */
|
|
extern Oid LookupOperName(ParseState *pstate, List *opername,
|
|
Oid oprleft, Oid oprright,
|
|
bool noError, int location);
|
|
extern Oid LookupOperWithArgs(ObjectWithArgs *oper, bool noError);
|
|
|
|
/* Routines to find operators matching a name and given input types */
|
|
/* NB: the selected operator may require coercion of the input types! */
|
|
extern Operator oper(ParseState *pstate, List *op, Oid arg1, Oid arg2,
|
|
bool noError, int location);
|
|
extern Operator right_oper(ParseState *pstate, List *op, Oid arg,
|
|
bool noError, int location);
|
|
extern Operator left_oper(ParseState *pstate, List *op, Oid arg,
|
|
bool noError, int location);
|
|
|
|
/* Routines to find operators that DO NOT require coercion --- ie, their */
|
|
/* input types are either exactly as given, or binary-compatible */
|
|
extern Operator compatible_oper(ParseState *pstate, List *op,
|
|
Oid arg1, Oid arg2,
|
|
bool noError, int location);
|
|
|
|
/* currently no need for compatible_left_oper/compatible_right_oper */
|
|
|
|
/* Routines for identifying "<", "=", ">" operators for a type */
|
|
extern void get_sort_group_operators(Oid argtype,
|
|
bool needLT, bool needEQ, bool needGT,
|
|
Oid *ltOpr, Oid *eqOpr, Oid *gtOpr,
|
|
bool *isHashable);
|
|
|
|
/* Convenience routines for common calls on the above */
|
|
extern Oid compatible_oper_opid(List *op, Oid arg1, Oid arg2, bool noError);
|
|
|
|
/* Extract operator OID or underlying-function OID from an Operator tuple */
|
|
extern Oid oprid(Operator op);
|
|
extern Oid oprfuncid(Operator op);
|
|
|
|
/* Build expression tree for an operator invocation */
|
|
extern Expr *make_op(ParseState *pstate, List *opname,
|
|
Node *ltree, Node *rtree, Node *last_srf, int location);
|
|
extern Expr *make_scalar_array_op(ParseState *pstate, List *opname,
|
|
bool useOr,
|
|
Node *ltree, Node *rtree, int location);
|
|
|
|
#endif /* PARSE_OPER_H */
|