Phase 2 of pgindent updates.

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

1 files changed, 16 insertions, 17 deletions

diff --git a/src/include/access/spgist.h b/src/include/access/spgist.h
index 9dca8fde7df..d1bc396e6df 100644
--- a/src/include/access/spgist.h
+++ b/src/include/access/spgist.h
@@ -74,33 +74,33 @@ typedef enum spgChooseResultType
 
 typedef struct spgChooseOut
 {
-	spgChooseResultType resultType;		/* action code, see above */
+	spgChooseResultType resultType; /* action code, see above */
 	union
 	{
 		struct					/* results for spgMatchNode */
 		{
 			int			nodeN;	/* descend to this node (index from 0) */
-			int			levelAdd;		/* increment level by this much */
-			Datum		restDatum;		/* new leaf datum */
+			int			levelAdd;	/* increment level by this much */
+			Datum		restDatum;	/* new leaf datum */
 		}			matchNode;
 		struct					/* results for spgAddNode */
 		{
-			Datum		nodeLabel;		/* new node's label */
+			Datum		nodeLabel;	/* new node's label */
 			int			nodeN;	/* where to insert it (index from 0) */
 		}			addNode;
 		struct					/* results for spgSplitTuple */
 		{
 			/* Info to form new upper-level inner tuple with one child tuple */
-			bool		prefixHasPrefix;		/* tuple should have a prefix? */
-			Datum		prefixPrefixDatum;		/* if so, its value */
+			bool		prefixHasPrefix;	/* tuple should have a prefix? */
+			Datum		prefixPrefixDatum;	/* if so, its value */
 			int			prefixNNodes;	/* number of nodes */
-			Datum	   *prefixNodeLabels;		/* their labels (or NULL for
-												 * no labels) */
-			int			childNodeN;		/* which node gets child tuple */
+			Datum	   *prefixNodeLabels;	/* their labels (or NULL for no
+											 * labels) */
+			int			childNodeN; /* which node gets child tuple */
 
 			/* Info to form new lower-level inner tuple with all old nodes */
-			bool		postfixHasPrefix;		/* tuple should have a prefix? */
-			Datum		postfixPrefixDatum;		/* if so, its value */
+			bool		postfixHasPrefix;	/* tuple should have a prefix? */
+			Datum		postfixPrefixDatum; /* if so, its value */
 		}			splitTuple;
 	}			result;
 } spgChooseOut;
@@ -123,7 +123,7 @@ typedef struct spgPickSplitOut
 	int			nNodes;			/* number of nodes for new inner tuple */
 	Datum	   *nodeLabels;		/* their labels (or NULL for no labels) */
 
-	int		   *mapTuplesToNodes;		/* node index for each leaf tuple */
+	int		   *mapTuplesToNodes;	/* node index for each leaf tuple */
 	Datum	   *leafTupleDatums;	/* datum to store in each new leaf tuple */
 } spgPickSplitOut;
 
@@ -135,10 +135,9 @@ typedef struct spgInnerConsistentIn
 	ScanKey		scankeys;		/* array of operators and comparison values */
 	int			nkeys;			/* length of array */
 
-	Datum		reconstructedValue;		/* value reconstructed at parent */
+	Datum		reconstructedValue; /* value reconstructed at parent */
 	void	   *traversalValue; /* opclass-specific traverse value */
-	MemoryContext traversalMemoryContext;		/* put new traverse values
-												 * here */
+	MemoryContext traversalMemoryContext;	/* put new traverse values here */
 	int			level;			/* current level (counting from zero) */
 	bool		returnData;		/* original data must be returned? */
 
@@ -167,7 +166,7 @@ typedef struct spgLeafConsistentIn
 	ScanKey		scankeys;		/* array of operators and comparison values */
 	int			nkeys;			/* length of array */
 
-	Datum		reconstructedValue;		/* value reconstructed at parent */
+	Datum		reconstructedValue; /* value reconstructed at parent */
 	void	   *traversalValue; /* opclass-specific traverse value */
 	int			level;			/* current level (counting from zero) */
 	bool		returnData;		/* original data must be returned? */
@@ -214,4 +213,4 @@ extern IndexBulkDeleteResult *spgvacuumcleanup(IndexVacuumInfo *info,
 /* spgvalidate.c */
 extern bool spgvalidate(Oid opclassoid);
 
-#endif   /* SPGIST_H */
+#endif							/* SPGIST_H */