Fix a few more generator scripts to produce pgindent-clean output.

tglsfdc · tglsfdc · commit f859c2ffa01d · 2020-09-21T13:58:26.000-04:00
This completes the project of making all our derived files be pgindent-clean (or else explicitly excluded from indentation), so that no surprises result when running pgindent in a built-out development tree. Discussion: https://postgr.es/m/79ed5348-be7a-b647-dd40-742207186a22@2ndquadrant.com
diff --git a/src/backend/utils/sort/gen_qsort_tuple.pl b/src/backend/utils/sort/gen_qsort_tuple.pl
@@ -115,7 +115,8 @@ sub emit_qsort_boilerplate
 {
 	do
 	{
-		SortTuple 	t = *a;
+		SortTuple	t = *a;
+
 		*a++ = *b;
 		*b++ = t;
 	} while (--n > 0);
@@ -143,9 +144,9 @@ sub emit_qsort_implementation
 {
 	return cmp_$SUFFIX(a, b$CMPPARAMS) < 0 ?
 		(cmp_$SUFFIX(b, c$CMPPARAMS) < 0 ? b :
-			(cmp_$SUFFIX(a, c$CMPPARAMS) < 0 ? c : a))
+		 (cmp_$SUFFIX(a, c$CMPPARAMS) < 0 ? c : a))
 		: (cmp_$SUFFIX(b, c$CMPPARAMS) > 0 ? b :
-			(cmp_$SUFFIX(a, c$CMPPARAMS) < 0 ? a : c));
+		   (cmp_$SUFFIX(a, c$CMPPARAMS) < 0 ? a : c));
 }
 
 static void
diff --git a/src/pl/plpgsql/src/generate-plerrcodes.pl b/src/pl/plpgsql/src/generate-plerrcodes.pl
@@ -34,7 +34,7 @@
 	# Skip lines without PL/pgSQL condition names
 	next unless defined($condition_name);
 
-	print "{\n\t\"$condition_name\", $errcode_macro\n},\n\n";
+	print "\n{\n\t\"$condition_name\", $errcode_macro\n},\n";
 }
 
 close $errcodes;
diff --git a/src/pl/plpython/generate-spiexceptions.pl b/src/pl/plpython/generate-spiexceptions.pl
@@ -37,8 +37,8 @@
 	# Change some_error_condition to SomeErrorCondition
 	$condition_name =~ s/([a-z])([^_]*)(?:_|$)/\u$1$2/g;
 
-	print "{ \"spiexceptions.$condition_name\", "
-	  . "\"$condition_name\", $errcode_macro },\n";
+	print "\n{\n\t\"spiexceptions.$condition_name\", "
+	  . "\"$condition_name\", $errcode_macro\n},\n";
 }
 
 close $errcodes;
diff --git a/src/pl/tcl/generate-pltclerrcodes.pl b/src/pl/tcl/generate-pltclerrcodes.pl
@@ -34,7 +34,7 @@
 	# Skip lines without PL/pgSQL condition names
 	next unless defined($condition_name);
 
-	print "{\n\t\"$condition_name\", $errcode_macro\n},\n\n";
+	print "\n{\n\t\"$condition_name\", $errcode_macro\n},\n";
 }
 
 close $errcodes;

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,8 @@ sub emit_qsort_boilerplate`
`115`	`115`	`{`
`116`	`116`	`do`
`117`	`117`	`{`
`118`		`- SortTuple t = *a;`
	`118`	`+ SortTuple t = *a;`
	`119`	`+`
`119`	`120`	`a++ = b;`
`120`	`121`	`*b++ = t;`
`121`	`122`	`} while (--n > 0);`
`@@ -143,9 +144,9 @@ sub emit_qsort_implementation`
`143`	`144`	`{`
`144`	`145`	`return cmp_$SUFFIX(a, b$CMPPARAMS) < 0 ?`
`145`	`146`	`(cmp_$SUFFIX(b, c$CMPPARAMS) < 0 ? b :`
`146`		`- (cmp_$SUFFIX(a, c$CMPPARAMS) < 0 ? c : a))`
	`147`	`+ (cmp_$SUFFIX(a, c$CMPPARAMS) < 0 ? c : a))`
`147`	`148`	`: (cmp_$SUFFIX(b, c$CMPPARAMS) > 0 ? b :`
`148`		`- (cmp_$SUFFIX(a, c$CMPPARAMS) < 0 ? a : c));`
	`149`	`+ (cmp_$SUFFIX(a, c$CMPPARAMS) < 0 ? a : c));`
`149`	`150`	`}`
`150`	`151`
`151`	`152`	`static void`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@`
`34`	`34`	`# Skip lines without PL/pgSQL condition names`
`35`	`35`	`next unless defined($condition_name);`
`36`	`36`
`37`		`- print "{\n\t\"$condition_name\", $errcode_macro\n},\n\n";`
	`37`	`+ print "\n{\n\t\"$condition_name\", $errcode_macro\n},\n";`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`close $errcodes;`
Original file line number	Diff line number	Diff line change
`@@ -37,8 +37,8 @@`
`37`	`37`	`# Change some_error_condition to SomeErrorCondition`
`38`	`38`	`$condition_name =~ s/([a-z])([^_]*)(?:_\|$)/\u$1$2/g;`
`39`	`39`
`40`		`- print "{ \"spiexceptions.$condition_name\", "`
`41`		`- . "\"$condition_name\", $errcode_macro },\n";`
	`40`	`+ print "\n{\n\t\"spiexceptions.$condition_name\", "`
	`41`	`+ . "\"$condition_name\", $errcode_macro\n},\n";`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`close $errcodes;`