Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 7690b41

Browse files
committed
Add backslashes to parentheses in awk regex because if not, they are
treated as regex groups.
1 parent 5bced8f commit 7690b41

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/tools/pgindent/pgindent

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ do
5656
line1 !~ /^typedef/ &&
5757
line1 !~ /^extern[ ][ ]*"C"/ &&
5858
line1 !~ /=/ &&
59-
line1 ~ /)/)
59+
line1 ~ /\)/)
6060
print "int pgindent_func_no_var_fix;";
6161
line1 = line2;
6262
}
@@ -1688,16 +1688,16 @@ do
16881688
# like real functions.
16891689
awk ' BEGIN {paren_level = 0}
16901690
{
1691-
if ($0 ~ /^[a-zA-Z_][a-zA-Z_0-9]*[^(]*$/)
1691+
if ($0 ~ /^[a-zA-Z_][a-zA-Z_0-9]*[^\(]*$/)
16921692
{
16931693
saved_len = 0;
16941694
saved_lines[++saved_len] = $0;
16951695
if ((getline saved_lines[++saved_len]) == 0)
16961696
print saved_lines[1];
16971697
else
1698-
if (saved_lines[saved_len] !~ /^[a-zA-Z_][a-zA-Z_0-9]*(/ ||
1699-
saved_lines[saved_len] ~ /^[a-zA-Z_][a-zA-Z_0-9]*(.*)$/ ||
1700-
saved_lines[saved_len] ~ /^[a-zA-Z_][a-zA-Z_0-9]*(.*);$/)
1698+
if (saved_lines[saved_len] !~ /^[a-zA-Z_][a-zA-Z_0-9]*\(/ ||
1699+
saved_lines[saved_len] ~ /^[a-zA-Z_][a-zA-Z_0-9]*\(.*\)$/ ||
1700+
saved_lines[saved_len] ~ /^[a-zA-Z_][a-zA-Z_0-9]*\(.*\);$/)
17011701
{
17021702
print saved_lines[1];
17031703
print saved_lines[2];
@@ -1714,7 +1714,7 @@ do
17141714
}
17151715
for (i=1; i <= saved_len; i++)
17161716
{
1717-
if (i == 1 && saved_lines[saved_len] ~ /);$/)
1717+
if (i == 1 && saved_lines[saved_len] ~ /\);$/)
17181718
{
17191719
printf "%s", saved_lines[i];
17201720
if (substr(saved_lines[i], length(saved_lines[i]),1) != "*")

0 commit comments

Comments
 (0)