Handle more return() forms in util/unbrace

In particular, we now handle cases where there was a second-level
parenthesis at the beginning or end of the outer parentheses, and
also where the outer parentheses contain more than one parenthesised
subexpression.

Also, take advantage of /x and format the RE a little more nicely.

1 files changed, 8 insertions, 2 deletions

diff --git a/crawl-ref/source/util/unbrace b/crawl-ref/source/util/unbrace
index a0eb3981e8..7cff755dde 100755
--- a/crawl-ref/source/util/unbrace
+++ b/crawl-ref/source/util/unbrace
@@ -29,11 +29,17 @@ for $f (grep /\.(cc|h)$/, split /\n/, `git ls-files`)
     # return (x) where x contains parentheses.
     # Looks like no one told Larry Wall properties of regular expression,
     # including the part where they can't do arbitrarily nested parentheses.
-    while (/^(\ *)return\ \( ([^()]++) (\( (?: [^()]++ | (?3) )* \)) ([^()]++)\);/sxm)
+    while (/^(\s*)return\s+
+            \((
+             (?: [^()]*+
+                 (\( (?: [^()]++ | (?3) )* \))
+             )+
+             [^()]*+
+            )\);/sxm)
     {
         my $prev = "$`$1return ";
         my $next = ";$'";
-        my $cur = "$2$3$4";
+        my $cur = "$2";
         $cur =~ s/\n /\n/sg;
         $_ = "$prev$cur$next";
     }