Add remove extra braces code to pgindent.

diff --git a/src/tools/pgindent/pgindent b/src/tools/pgindent/pgindent
index 8b4be4ade1cb78ba2a55d345317de4d426e4a4ba..33b6e06072ae2135bd7b18ba21550b8f967f50c6 100755 (executable)
--- a/src/tools/pgindent/pgindent
+++ b/src/tools/pgindent/pgindent
@@ -797,6 +797,32 @@ do
        detab -t8 -qc |
        entab -t4 -qc |
        sed 's;^\([A-Za-z_][^   ]*\)[   ][      ]*\*$;\1 *;' | # move trailing * in function return type
+       awk '   {       line3 = $0;  /* remove un-needed braces around single statements */
+                       if (skips > 0)
+                               skips--;
+                       if (line1 ~ "           *{$" &&
+                           line2 ~ "           *[^;{}]*;$" &&
+                           line3 ~ "           *}$")
+                       {
+                               print line2;
+                               line1 = "";
+                               line2 = "";
+                               line3 = "";
+                               skips = 3;
+                       }
+                       else
+                               if (skips == 0 && NR >= 3)
+                                       print line1;
+                       line1 = line2;
+                       line2 = line3;
+                       line3 = "";
+               }
+               END {
+                       if (skips <= 1)
+                               print line1;
+                       if (skips <= 2)
+                               print line2;
+       }' |
        cat >/tmp/$$ && cat /tmp/$$ >$FILE
 done