5050 if (NR >= 2)
5151print line1;
5252if (NR >= 2 &&
53- line2 ~" ^{[ ]*$" &&
54- line1 !~" ^struct" &&
55- line1 !~" ^enum" &&
56- line1 !~" ^typedef" &&
57- line1 !~" ^extern[ ][ ]*\"C\"" &&
58- line1 !~"=" &&
59- line1 ~"\)" )
53+ line2 ~/ ^{[ ]*$/ &&
54+ line1 !~/ ^struct/ &&
55+ line1 !~/ ^enum/ &&
56+ line1 !~/ ^typedef/ &&
57+ line1 !~/ ^extern[ ][ ]*"C"/ &&
58+ line1 !~/=/ &&
59+ line1 ~/)/ )
6060print "intpgindent_func_no_var_fix;";
6161line1 = line2;
6262}
7070line2 = $0;
7171if (skips > 0)
7272skips--;
73- if (line1 ~" ^#ifdef[ ]*__cplusplus" &&
74- line2 ~" ^extern[ ]*\"C\ "[ ]*$" )
73+ if (line1 ~/ ^#ifdef[ ]*__cplusplus/ &&
74+ line2 ~/ ^extern[ ]*"C "[ ]*$/ )
7575{
7676print line1;
7777print line2;
8181line2 = "";
8282skips = 2;
8383}
84- else if (line1 ~" ^#ifdef[ ]*__cplusplus" &&
85- line2 ~" ^}[ ]*$" )
84+ else if (line1 ~/ ^#ifdef[ ]*__cplusplus/ &&
85+ line2 ~/ ^}[ ]*$/ )
8686{
8787print line1;
8888print "/* Close extern \"C\" */";
17321732# work around misindenting of function with no variables defined
17331733awk'
17341734{
1735- if ($0 ~" ^[ ]*int[ ]*pgindent_func_no_var_fix;" )
1735+ if ($0 ~/ ^[ ]*int[ ]*pgindent_func_no_var_fix;/ )
17361736{
17371737if (getline && $0 != "")
17381738print $0;
17511751# line3 = $0;
17521752# if (skips > 0)
17531753# skips--;
1754- # if (line1 ~" *{$" &&
1755- # line2 ~" *[^;{}]*;$" &&
1756- # line3 ~" *}$" )
1754+ # if (line1 ~/ *{$/ &&
1755+ # line2 ~/ *[^;{}]*;$/ &&
1756+ # line3 ~/ *}$/ )
17571757# {
17581758# print line2;
17591759# line2 = "";
17781778line3 = $0;
17791779if (skips > 0)
17801780skips--;
1781- if (line1 ~" *{$" &&
1782- line2 ~"^$" &&
1783- line3 ~" */\\*$" )
1781+ if (line1 ~/ *{$/ &&
1782+ line2 ~/^$/ &&
1783+ line3 ~/ *\/\*$/ )
17841784{
17851785print line1;
17861786print line3;
18191819line2 = $0;
18201820if (skips > 0)
18211821skips--;
1822- if (line1 ~"^$" &&
1823- line2 ~" ^#endif" )
1822+ if (line1 ~/^$/ &&
1823+ line2 ~/ ^#endif/ )
18241824{
18251825print line2;
18261826line2 = "";
18441844line1 = line2;
18451845}
18461846END {
1847- if (NR >= 1 && line2 ~" ^#endif" )
1847+ if (NR >= 1 && line2 ~/ ^#endif/ )
18481848printf "\n";
18491849print line1;
18501850}' |
@@ -1853,16 +1853,16 @@ do
18531853# like real functions.
18541854awk' BEGIN{paren_level = 0}
18551855{
1856- if ($0 ~ /^[a-zA-Z_][a-zA-Z_0-9]*[^\ (]*$/)
1856+ if ($0 ~ /^[a-zA-Z_][a-zA-Z_0-9]*[^(]*$/)
18571857{
18581858saved_len = 0;
18591859saved_lines[++saved_len] = $0;
18601860if ((getline saved_lines[++saved_len]) == 0)
18611861print saved_lines[1];
18621862else
1863- if (saved_lines[saved_len] !~ /^[a-zA-Z_][a-zA-Z_0-9]*\ (/ ||
1864- saved_lines[saved_len] ~ /^[a-zA-Z_][a-zA-Z_0-9]*\ (.*\ )$/ ||
1865- saved_lines[saved_len] ~ /^[a-zA-Z_][a-zA-Z_0-9]*\ (.*\ );$/)
1863+ if (saved_lines[saved_len] !~ /^[a-zA-Z_][a-zA-Z_0-9]*(/ ||
1864+ saved_lines[saved_len] ~ /^[a-zA-Z_][a-zA-Z_0-9]*(.*)$/ ||
1865+ saved_lines[saved_len] ~ /^[a-zA-Z_][a-zA-Z_0-9]*(.*);$/)
18661866{
18671867print saved_lines[1];
18681868print saved_lines[2];
18791879}
18801880for (i=1; i <= saved_len; i++)
18811881{
1882- if (i == 1 && saved_lines[saved_len] ~ /\ );$/)
1882+ if (i == 1 && saved_lines[saved_len] ~ /);$/)
18831883{
18841884printf "%s", saved_lines[i];
18851885if (substr(saved_lines[i], length(saved_lines[i]),1) != "*")