diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2020-05-16 11:54:51 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2020-05-16 11:54:51 -0400 |
| commit | fa27dd40d5c5f56a1ee837a75c97549e992e32a4 (patch) | |
| tree | 029cb03671144ee7b0c48efe8469990003e3bc86 /src/backend/parser | |
| parent | e02ad575d8ab6b44500d2a3fd8c3212345e3aa2b (diff) | |
Run pgindent with new pg_bsd_indent version 2.1.1.
Thomas Munro fixed a longstanding annoyance in pg_bsd_indent, that
it would misformat lines containing IsA() macros on the assumption
that the IsA() call should be treated like a cast. This improves
some other cases involving field/variable names that match typedefs,
too. The only places that get worse are a couple of uses of the
OpenSSL macro STACK_OF(); we'll gladly take that trade-off.
Discussion: https://postgr.es/m/20200114221814.GA19630@alvherre.pgsql
Diffstat (limited to 'src/backend/parser')
| -rw-r--r-- | src/backend/parser/analyze.c | 4 | ||||
| -rw-r--r-- | src/backend/parser/parse_agg.c | 4 | ||||
| -rw-r--r-- | src/backend/parser/parse_clause.c | 2 | ||||
| -rw-r--r-- | src/backend/parser/parse_expr.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/backend/parser/analyze.c b/src/backend/parser/analyze.c index eee9c33637b..401da5dedf7 100644 --- a/src/backend/parser/analyze.c +++ b/src/backend/parser/analyze.c @@ -221,7 +221,7 @@ transformOptionalSelectInto(ParseState *pstate, Node *parseTree) /* If it's a set-operation tree, drill down to leftmost SelectStmt */ while (stmt && stmt->op != SETOP_NONE) stmt = stmt->larg; - Assert(stmt && IsA(stmt, SelectStmt) &&stmt->larg == NULL); + Assert(stmt && IsA(stmt, SelectStmt) && stmt->larg == NULL); if (stmt->intoClause) { @@ -641,7 +641,7 @@ transformInsertStmt(ParseState *pstate, InsertStmt *stmt) if (tle->resjunk) continue; if (tle->expr && - (IsA(tle->expr, Const) ||IsA(tle->expr, Param)) && + (IsA(tle->expr, Const) || IsA(tle->expr, Param)) && exprType((Node *) tle->expr) == UNKNOWNOID) expr = tle->expr; else diff --git a/src/backend/parser/parse_agg.c b/src/backend/parser/parse_agg.c index f1cc5479e43..f813b587f18 100644 --- a/src/backend/parser/parse_agg.c +++ b/src/backend/parser/parse_agg.c @@ -750,8 +750,8 @@ check_agg_arguments_walker(Node *node, */ if (context->sublevels_up == 0) { - if ((IsA(node, FuncExpr) &&((FuncExpr *) node)->funcretset) || - (IsA(node, OpExpr) &&((OpExpr *) node)->opretset)) + if ((IsA(node, FuncExpr) && ((FuncExpr *) node)->funcretset) || + (IsA(node, OpExpr) && ((OpExpr *) node)->opretset)) ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), errmsg("aggregate function calls cannot contain set-returning function calls"), diff --git a/src/backend/parser/parse_clause.c b/src/backend/parser/parse_clause.c index 96ae3a7e64d..6fff13479e4 100644 --- a/src/backend/parser/parse_clause.c +++ b/src/backend/parser/parse_clause.c @@ -1767,7 +1767,7 @@ transformLimitClause(ParseState *pstate, Node *clause, * unadorned NULL that's not accepted back by the grammar. */ if (exprKind == EXPR_KIND_LIMIT && limitOption == LIMIT_OPTION_WITH_TIES && - IsA(clause, A_Const) &&((A_Const *) clause)->val.type == T_Null) + IsA(clause, A_Const) && ((A_Const *) clause)->val.type == T_Null) ereport(ERROR, (errcode(ERRCODE_INVALID_ROW_COUNT_IN_LIMIT_CLAUSE), errmsg("row count cannot be NULL in FETCH FIRST ... WITH TIES clause"))); diff --git a/src/backend/parser/parse_expr.c b/src/backend/parser/parse_expr.c index 831db4af955..f69976cc8c9 100644 --- a/src/backend/parser/parse_expr.c +++ b/src/backend/parser/parse_expr.c @@ -961,7 +961,7 @@ transformAExprOp(ParseState *pstate, A_Expr *a) list_length(a->name) == 1 && strcmp(strVal(linitial(a->name)), "=") == 0 && (exprIsNullConstant(lexpr) || exprIsNullConstant(rexpr)) && - (!IsA(lexpr, CaseTestExpr) &&!IsA(rexpr, CaseTestExpr))) + (!IsA(lexpr, CaseTestExpr) && !IsA(rexpr, CaseTestExpr))) { NullTest *n = makeNode(NullTest); |