Partial pgindent of .l and .y files

Trying to clean up the code a bit while we're working on these files
for the reentrant scanner/pure parser patches.  This cleanup only
touches the code sections after the second '%%' in each file, via a
manually-supervised and locally hacked up pgindent.

contrib/cube/cubeparse.y

@@ -244,8 +244,8 @@ write_box(int dim, char *str1, char *str2,
 		 * The value turned out to be a point, ie. all the upper-right
 		 * coordinates were equal to the lower-left coordinates. Resize the
 		 * cube we constructed.  Note: we don't bother to repalloc() it
-		 * smaller, as it's unlikely that the tiny amount of memory freed
+		 * smaller, as it's unlikely that the tiny amount of memory freed that
-		 * that way would be useful, and the output is always short-lived.
+		 * way would be useful, and the output is always short-lived.
 		 */
 		size = POINT_SIZE(dim);
 		SET_VARSIZE(bp, size);

contrib/cube/cubescan.l

@@ -73,7 +73,8 @@ cube_yyerror(NDBOX **result, Size scanbuflen,
 			 yyscan_t yyscanner,
 			 const char *message)
 {
-	struct yyguts_t * yyg = (struct yyguts_t *) yyscanner;	/* needed for yytext macro */
+	struct yyguts_t *yyg = (struct yyguts_t *) yyscanner;	/* needed for yytext
+															 * macro */
 
 	if (*yytext == YY_END_OF_BUFFER_CHAR)
 	{

contrib/seg/segscan.l

@@ -66,7 +66,8 @@ float        ({integer}|{real})([eE]{integer})?
 void
 seg_yyerror(SEG *result, struct Node *escontext, yyscan_t yyscanner, const char *message)
 {
-	struct yyguts_t * yyg = (struct yyguts_t *) yyscanner;	/* needed for yytext macro */
+	struct yyguts_t *yyg = (struct yyguts_t *) yyscanner;	/* needed for yytext
+															 * macro */
 
 	/* if we already reported an error, don't overwrite it */
 	if (SOFT_ERROR_OCCURRED(escontext))

src/backend/bootstrap/bootscanner.l

@@ -131,7 +131,8 @@ NULL			{ yylval->kw = "NULL"; return XNULL; }
 void
 boot_yyerror(yyscan_t yyscanner, const char *message)
 {
-	struct yyguts_t * yyg = (struct yyguts_t *) yyscanner;	/* needed for yylineno macro */
+	struct yyguts_t *yyg = (struct yyguts_t *) yyscanner;	/* needed for yylineno
+															 * macro */
 
 	elog(ERROR, "%s at line %d", message, yylineno);
 }

src/backend/parser/gram.y

@@ -18683,10 +18683,10 @@ makeColumnRef(char *colname, List *indirection,
 			  int location, core_yyscan_t yyscanner)
 {
 	/*
-	 * Generate a ColumnRef node, with an A_Indirection node added if there
+	 * Generate a ColumnRef node, with an A_Indirection node added if there is
-	 * is any subscripting in the specified indirection list.  However,
+	 * any subscripting in the specified indirection list.  However, any field
-	 * any field selection at the start of the indirection list must be
+	 * selection at the start of the indirection list must be transposed into
-	 * transposed into the "fields" part of the ColumnRef node.
+	 * the "fields" part of the ColumnRef node.
 	 */
 	ColumnRef  *c = makeNode(ColumnRef);
 	int			nfields = 0;
@@ -18952,8 +18952,8 @@ makeOrderedSetArgs(List *directargs, List *orderedargs,
 		FunctionParameter *firsto = (FunctionParameter *) linitial(orderedargs);
 
 		/*
-		 * We ignore the names, though the aggr_arg production allows them;
+		 * We ignore the names, though the aggr_arg production allows them; it
-		 * it doesn't allow default values, so those need not be checked.
+		 * doesn't allow default values, so those need not be checked.
 		 */
 		if (list_length(orderedargs) != 1 ||
 			firsto->mode != FUNC_PARAM_VARIADIC ||
@@ -19218,6 +19218,7 @@ makeXmlExpr(XmlExprOp op, char *name, List *named_args, List *args,
 
 	x->op = op;
 	x->name = name;
+
 	/*
 	 * named_args is a list of ResTarget; it'll be split apart into separate
 	 * expression and name lists in transformXmlExpr().
@@ -19556,8 +19557,8 @@ preprocess_pubobj_list(List *pubobjspec_list, core_yyscan_t yyscanner)
 						parser_errposition(pubobj->location));
 
 			/*
-			 * We can distinguish between the different type of schema
+			 * We can distinguish between the different type of schema objects
-			 * objects based on whether name and pubtable is set.
+			 * based on whether name and pubtable is set.
 			 */
 			if (pubobj->name)
 				pubobj->pubobjtype = PUBLICATIONOBJ_TABLES_IN_SCHEMA;
@@ -19612,8 +19613,10 @@ makeRecursiveViewSelect(char *relname, List *aliases, Node *query)
 	w->ctes = list_make1(cte);
 	w->location = -1;
 
-	/* create target list for the new SELECT from the alias list of the
+	/*
-	 * recursive view specification */
+	 * create target list for the new SELECT from the alias list of the
+	 * recursive view specification
+	 */
 	foreach(lc, aliases)
 	{
 		ResTarget  *rt = makeNode(ResTarget);
@@ -19626,8 +19629,10 @@ makeRecursiveViewSelect(char *relname, List *aliases, Node *query)
 		tl = lappend(tl, rt);
 	}
 
-	/* create new SELECT combining WITH clause, target list, and fake FROM
+	/*
-	 * clause */
+	 * create new SELECT combining WITH clause, target list, and fake FROM
+	 * clause
+	 */
 	s->withClause = w;
 	s->targetList = tl;
 	s->fromClause = list_make1(makeRangeVar(NULL, relname, -1));

src/backend/replication/syncrep_scanner.l

@@ -140,7 +140,8 @@ xdinside		[^"]+
 void
 syncrep_yyerror(yyscan_t yyscanner, const char *message)
 {
-	struct yyguts_t * yyg = (struct yyguts_t *) yyscanner;	/* needed for yytext macro */
+	struct yyguts_t *yyg = (struct yyguts_t *) yyscanner;	/* needed for yytext
+															 * macro */
 
 	/* report only the first error in a parse operation */
 	if (syncrep_parse_error_msg)

src/backend/utils/adt/jsonpath_scan.l

@@ -363,7 +363,8 @@ jsonpath_yyerror(JsonPathParseResult **result, struct Node *escontext,
 				 yyscan_t yyscanner,
 				 const char *message)
 {
-	struct yyguts_t * yyg = (struct yyguts_t *) yyscanner;	/* needed for yytext macro */
+	struct yyguts_t *yyg = (struct yyguts_t *) yyscanner;	/* needed for yytext
+															 * macro */
 
 	/* don't overwrite escontext if it's already been set */
 	if (SOFT_ERROR_OCCURRED(escontext))
@@ -655,7 +656,8 @@ parseUnicode(char *s, int l, struct Node *escontext, yyscan_t yyscanner)
 	for (i = 2; i < l; i += 2)	/* skip '\u' */
 	{
 		int			ch = 0;
-		int			j, si;
+		int			j,
+					si;
 
 		if (s[i] == '{')		/* parse '\u{XX...}' */
 		{
@@ -697,7 +699,10 @@ parseUnicode(char *s, int l, struct Node *escontext, yyscan_t yyscanner)
 static bool
 parseHexChar(char *s, struct Node *escontext, yyscan_t yyscanner)
 {
-	int s2, s3, ch;
+	int			s2,
+				s3,
+				ch;
+
 	if (!hexval(s[2], &s2, escontext, yyscanner))
 		return false;
 	if (!hexval(s[3], &s3, escontext, yyscanner))

src/bin/pgbench/exprparse.y

@@ -253,6 +253,7 @@ static const struct
 	int			nargs;
 	PgBenchFunction tag;
 }			PGBENCH_FUNCTIONS[] =
+
 {
 	/* parsed as operators, executed as functions */
 	{
@@ -485,6 +486,7 @@ make_func(yyscan_t yyscanner, int fnumber, PgBenchExprList *args)
 			if (len == 1)
 			{
 				PgBenchExpr *var = make_variable("default_seed");
+
 				args = make_elist(var, args);
 			}
 			break;
@@ -498,6 +500,7 @@ make_func(yyscan_t yyscanner, int fnumber, PgBenchExprList *args)
 			if (len == 2)
 			{
 				PgBenchExpr *var = make_variable("default_seed");
+
 				args = make_elist(var, args);
 			}
 			break;

src/bin/psql/psqlscanslash.l

@@ -598,9 +598,9 @@ psql_scan_slash_option(PsqlScanState state,
 	psql_scan_reselect_sql_lexer(state);
 
 	/*
-	 * Check the lex result: we should have gotten back either LEXRES_OK
+	 * Check the lex result: we should have gotten back either LEXRES_OK or
-	 * or LEXRES_EOL (the latter indicating end of string).  If we were inside
+	 * LEXRES_EOL (the latter indicating end of string).  If we were inside a
-	 * a quoted string, as indicated by final_state, EOL is an error.
+	 * quoted string, as indicated by final_state, EOL is an error.
 	 */
 	Assert(lexresult == LEXRES_EOL || lexresult == LEXRES_OK);
 
@@ -642,6 +642,7 @@ psql_scan_slash_option(PsqlScanState state,
 			termPQExpBuffer(&mybuf);
 			return NULL;
 		case xslashwholeline:
+
 			/*
 			 * In whole-line mode, we interpret semicolon = true as stripping
 			 * trailing whitespace as well as semicolons; this gives the

src/interfaces/ecpg/preproc/pgc.l

@@ -1847,9 +1847,9 @@ isdefine(void)
 			ptr->used = yb;
 
 			/*
-			 * We use yy_scan_string which will copy the value, so there's
+			 * We use yy_scan_string which will copy the value, so there's no
-			 * no need to worry about a possible undef happening while we
+			 * need to worry about a possible undef happening while we are
-			 * are still scanning it.
+			 * still scanning it.
 			 */
 			yy_scan_string(ptr->value);
 			return true;

src/pl/plpgsql/src/pl_gram.y

@@ -2723,10 +2723,11 @@ read_sql_construct(int until,
 			if (parenlevel < 0)
 				yyerror("mismatched parentheses");
 		}
+
 		/*
-		 * End of function definition is an error, and we don't expect to
+		 * End of function definition is an error, and we don't expect to hit
-		 * hit a semicolon either (unless it's the until symbol, in which
+		 * a semicolon either (unless it's the until symbol, in which case we
-		 * case we should have fallen out above).
+		 * should have fallen out above).
 		 */
 		if (tok == 0 || tok == ';')
 		{
@@ -2983,8 +2984,8 @@ make_execsql_stmt(int firsttoken, int location, PLword *word)
 	plpgsql_IdentifierLookup = IDENTIFIER_LOOKUP_EXPR;
 
 	/*
-	 * Scan to the end of the SQL command.  Identify any INTO-variables
+	 * Scan to the end of the SQL command.  Identify any INTO-variables clause
-	 * clause lurking within it, and parse that via read_into_target().
+	 * lurking within it, and parse that via read_into_target().
 	 *
 	 * The end of the statement is defined by a semicolon ... except that
 	 * semicolons within parentheses or BEGIN/END blocks don't terminate a
@@ -3006,12 +3007,12 @@ make_execsql_stmt(int firsttoken, int location, PLword *word)
 	 * but it's not very likely.
 	 *
 	 * 3. IMPORT FOREIGN SCHEMA ... INTO.  This is not allowed in CREATE RULE
-	 * or WITH, so we just check for IMPORT as the command's first token.
+	 * or WITH, so we just check for IMPORT as the command's first token. (If
-	 * (If IMPORT FOREIGN SCHEMA returned data someone might wish to capture
+	 * IMPORT FOREIGN SCHEMA returned data someone might wish to capture with
-	 * with an INTO-variables clause, we'd have to work much harder here.)
+	 * an INTO-variables clause, we'd have to work much harder here.)
 	 *
-	 * Fortunately, INTO is a fully reserved word in the main grammar, so
+	 * Fortunately, INTO is a fully reserved word in the main grammar, so at
-	 * at least we need not worry about it appearing as an identifier.
+	 * least we need not worry about it appearing as an identifier.
 	 *
 	 * Any future additional uses of INTO in the main grammar will doubtless
 	 * break this logic again ... beware!
@@ -3087,9 +3088,9 @@ make_execsql_stmt(int firsttoken, int location, PLword *word)
 	if (have_into)
 	{
 		/*
-		 * Insert an appropriate number of spaces corresponding to the
+		 * Insert an appropriate number of spaces corresponding to the INTO
-		 * INTO text, so that locations within the redacted SQL statement
+		 * text, so that locations within the redacted SQL statement still
-		 * still line up with those in the original source text.
+		 * line up with those in the original source text.
 		 */
 		plpgsql_append_source_text(&ds, location, into_start_loc);
 		appendStringInfoSpaces(&ds, into_end_loc - into_start_loc);
@@ -3137,8 +3138,8 @@ read_fetch_direction(void)
 	bool		check_FROM = true;
 
 	/*
-	 * We create the PLpgSQL_stmt_fetch struct here, but only fill in
+	 * We create the PLpgSQL_stmt_fetch struct here, but only fill in the
-	 * the fields arising from the optional direction clause
+	 * fields arising from the optional direction clause
 	 */
 	fetch = (PLpgSQL_stmt_fetch *) palloc0(sizeof(PLpgSQL_stmt_fetch));
 	fetch->cmd_type = PLPGSQL_STMT_FETCH;
@@ -3223,12 +3224,12 @@ read_fetch_direction(void)
 	else
 	{
 		/*
-		 * Assume it's a count expression with no preceding keyword.
+		 * Assume it's a count expression with no preceding keyword. Note: we
-		 * Note: we allow this syntax because core SQL does, but it's
+		 * allow this syntax because core SQL does, but it's ambiguous with
-		 * ambiguous with the case of an omitted direction clause; for
+		 * the case of an omitted direction clause; for instance, "MOVE n IN
-		 * instance, "MOVE n IN c" will fail if n is a variable, because the
+		 * c" will fail if n is a variable, because the preceding else-arm
-		 * preceding else-arm will trigger.  Perhaps this can be improved
+		 * will trigger.  Perhaps this can be improved someday, but it hardly
-		 * someday, but it hardly seems worth a lot of work.
+		 * seems worth a lot of work.
 		 */
 		plpgsql_push_back_token(tok);
 		fetch->expr = read_sql_expression2(K_FROM, K_IN,
@@ -3357,8 +3358,8 @@ make_return_stmt(int location)
 			/*
 			 * Not (just) a variable name, so treat as expression.
 			 *
-			 * Note that a well-formed expression is _required_ here;
+			 * Note that a well-formed expression is _required_ here; anything
-			 * anything else is a compile-time error.
+			 * else is a compile-time error.
 			 */
 			plpgsql_push_back_token(tok);
 			new->expr = read_sql_expression(';', ";");
@@ -3420,8 +3421,8 @@ make_return_next_stmt(int location)
 			/*
 			 * Not (just) a variable name, so treat as expression.
 			 *
-			 * Note that a well-formed expression is _required_ here;
+			 * Note that a well-formed expression is _required_ here; anything
-			 * anything else is a compile-time error.
+			 * else is a compile-time error.
 			 */
 			plpgsql_push_back_token(tok);
 			new->expr = read_sql_expression(';', ";");
@@ -3540,11 +3541,11 @@ read_into_target(PLpgSQL_variable **target, bool *strict)
 	}
 
 	/*
-	 * Currently, a row or record variable can be the single INTO target,
+	 * Currently, a row or record variable can be the single INTO target, but
-	 * but not a member of a multi-target list.  So we throw error if there
+	 * not a member of a multi-target list.  So we throw error if there is a
-	 * is a comma after it, because that probably means the user tried to
+	 * comma after it, because that probably means the user tried to write a
-	 * write a multi-target list.  If this ever gets generalized, we should
+	 * multi-target list.  If this ever gets generalized, we should probably
-	 * probably refactor read_into_scalar_list so it handles all cases.
+	 * refactor read_into_scalar_list so it handles all cases.
 	 */
 	switch (tok)
 	{
@@ -3630,8 +3631,8 @@ read_into_scalar_list(char *initial_name,
 	}
 
 	/*
-	 * We read an extra, non-comma token from yylex(), so push it
+	 * We read an extra, non-comma token from yylex(), so push it back onto
-	 * back onto the input stream
+	 * the input stream
 	 */
 	plpgsql_push_back_token(tok);
 
@@ -3741,14 +3742,14 @@ plpgsql_sql_error_callback(void *arg)
 
 	/*
 	 * First, set up internalerrposition to point to the start of the
-	 * statement text within the function text.  Note this converts
+	 * statement text within the function text.  Note this converts location
-	 * location (a byte offset) to a character number.
+	 * (a byte offset) to a character number.
 	 */
 	parser_errposition(cbarg->location);
 
 	/*
-	 * If the core parser provided an error position, transpose it.
+	 * If the core parser provided an error position, transpose it. Note we
-	 * Note we are dealing with 1-based character numbers at this point.
+	 * are dealing with 1-based character numbers at this point.
 	 */
 	errpos = geterrposition();
 	if (errpos > 0)
@@ -4121,9 +4122,9 @@ make_case(int location, PLpgSQL_expr *t_expr,
 	/*
 	 * When test expression is present, we create a var for it and then
 	 * convert all the WHEN expressions to "VAR IN (original_expression)".
-	 * This is a bit klugy, but okay since we haven't yet done more than
+	 * This is a bit klugy, but okay since we haven't yet done more than read
-	 * read the expressions as text.  (Note that previous parsing won't
+	 * the expressions as text.  (Note that previous parsing won't have
-	 * have complained if the WHEN ... THEN expression contained multiple
+	 * complained if the WHEN ... THEN expression contained multiple
 	 * comma-separated values.)
 	 */
 	if (t_expr)