Fix pgindent to not have blank line before #else in variable definition

bmomjian · bmomjian · commit 5d0a43c585b7 · 2005-07-13T04:44:42.000Z
section of a function.
diff --git a/src/tools/pgindent/pgindent b/src/tools/pgindent/pgindent
@@ -1648,14 +1648,15 @@ do
 				print line1;
 			}
 		}' |
-# remove blank line before #endif
+# remove blank line before #else and #endif
 	awk '	BEGIN	{line1 = ""; line2 = ""; skips = 0}
 		{
 			line2 = $0;
 			if (skips > 0)
 				skips--;
 			if (line1 ~ /^$/ &&
-			    line2 ~ /^#endif/)
+			    (line2 ~ /^#else/ ||
+			     line2 ~ /^#endif/))
 			{
 				print line2;
 				line2 = "";

Original file line number	Diff line number	Diff line change
`@@ -1648,14 +1648,15 @@ do`
`1648`	`1648`	`print line1;`
`1649`	`1649`	`}`
`1650`	`1650`	`}' \|`
`1651`		`-# remove blank line before #endif`
	`1651`	`+# remove blank line before #else and #endif`
`1652`	`1652`	`awk ' BEGIN {line1 = ""; line2 = ""; skips = 0}`
`1653`	`1653`	`{`
`1654`	`1654`	`line2 = $0;`
`1655`	`1655`	`if (skips > 0)`
`1656`	`1656`	`skips--;`
`1657`	`1657`	`if (line1 ~ /^$/ &&`
`1658`		`- line2 ~ /^#endif/)`
	`1658`	`+ (line2 ~ /^#else/ \|\|`
	`1659`	`+ line2 ~ /^#endif/))`
`1659`	`1660`	`{`
`1660`	`1661`	`print line2;`
`1661`	`1662`	`line2 = "";`