Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit80b9a00

Browse files
committed
Add blank line before #endif to #endif's at the end of the file.
1 parentbac0d2d commit80b9a00

File tree

2 files changed

+25
-8
lines changed

2 files changed

+25
-8
lines changed

‎HISTORY‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@ Fix nested EXCEPT/INTERSECT (Tom)
6666
Python fix fetchone() (Gerhard Haring)
6767
ECPG fixes (Michael, Christof Petig)
6868
PL/PgSQL trailing semicolon optional (Tom)
69+
Fix path_inter, path_distance, path_length, dist_ppath to handle closed
70+
paths (Curtis Barrett, Tom)
6971

7072
Enhancements
7173
------------
@@ -138,6 +140,7 @@ New CREATE OR REPLACE FUNCTION that preserves function oid (Gavin Sherry)
138140
DROP AGGREGATE and COMMENT ON AGGREGATE now accept an aggtype (Tom)
139141
Prevent output of default index op class in pg_dump (Tom)
140142
Allow trailing semicolons in psql backslash commands (Greg Sabino Mullane)
143+
Prompt for psql password from /dev/tty if possible
141144

142145
Types
143146
-----
@@ -165,7 +168,10 @@ Modify type coersion logic to attempt binary-compatible functions first (Tom)
165168
Allow optional () after current_user, session_user, user, etc. (Peter E)
166169
Add compatibility functions to odbc.sql (Peter E)
167170
Force new password prompt when changing user and database in psql (Tatsuo, Tom)
168-
171+
New /contrib/tsearch full text indexing (Oleg, Teodor Sigaev)
172+
Allow better selectivity with Nan and infinities in NUMERIC (Tom)
173+
Accept an INTERVAL argument for SET TIME ZONE (Thomas)
174+
Implement INTERVAL() YEA
169175
Performance
170176
-----------
171177
Optimizer improvements (Tom)
@@ -225,6 +231,7 @@ ODBC
225231
ECPG
226232
EXECUTE ... INTO ... implemented
227233
multiple row descriptor support (e.g. CARDINALITY)
234+
Fix for GRANT parameters (Lee Kindness)
228235

229236
Source Code
230237
-----------

‎src/tools/pgindent/pgindent‎

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1292,7 +1292,7 @@ intpgindent_func_no_var_fix;\
12921292
# pull in #endif comments
12931293
sed's;^#endif[ ][ ]*/\*;#endif /*;'|
12941294
# add space after comments that start on tab stops
1295-
sed's:\([;,)/]\)/\*.*\*/\)$:\1\2:'|
1295+
sed's:\([^]\)/\*.*\*/\)$:\1\2:'|
12961296
# work around #else indenting next line if #ifdef defines variables at top
12971297
# work around misindenting of function with no variables defined
12981298
awk'
@@ -1329,14 +1329,13 @@ intpgindent_func_no_var_fix;\
13291329
print line1;
13301330
line1 = line2;
13311331
line2 = line3;
1332-
line3 = "";
13331332
}
13341333
END {
13351334
if (skips <= 1)
13361335
print line1;
13371336
if (skips <= 2)
13381337
print line2;
1339-
}'|
1338+
}'|
13401339
# remove blank line between opening brace and block comment
13411340
awk'
13421341
{
@@ -1358,14 +1357,13 @@ intpgindent_func_no_var_fix;\
13581357
print line1;
13591358
line1 = line2;
13601359
line2 = line3;
1361-
line3 = "";
13621360
}
13631361
END {
13641362
if (skips <= 1)
13651363
print line1;
13661364
if (skips <= 2)
13671365
print line2;
1368-
}'|
1366+
}'|
13691367
# remove blank line before #endif
13701368
awk'BEGIN{line1 = ""; line2 = ""; skips = 0}
13711369
{
@@ -1383,12 +1381,24 @@ intpgindent_func_no_var_fix;\
13831381
if (skips == 0 && NR >= 2)
13841382
print line1;
13851383
line1 = line2;
1386-
line2 = "";
13871384
}
13881385
END {
13891386
if (skips <= 1)
13901387
print line1;
1391-
}'|
1388+
}'|
1389+
# add blank line before #endif if it is the last line in the file
1390+
awk'BEGIN{line1 = ""; line2 = ""}
1391+
{
1392+
line2 = $0;
1393+
if (NR >= 2)
1394+
print line1;
1395+
line1 = line2;
1396+
}
1397+
END {
1398+
if (line2 ~ "^#endif")
1399+
printf "\n";
1400+
print line1;
1401+
}'|
13921402
# Move prototype names to the same line as return type. Useful for ctags.
13931403
# Indent should do this, but it does not. It formats prototypes just
13941404
# like real functions.

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp