diff options
| author | Tom Lane | 2017-08-14 21:29:33 +0000 |
|---|---|---|
| committer | Tom Lane | 2017-08-14 21:29:33 +0000 |
| commit | 21d304dfedb4f26d0d6587d9ac39b1b5c499bb55 (patch) | |
| tree | bd5328464e037f15bf069fb91d54db06509b459c /src/tools/pgindent | |
| parent | 5b6289c1e07dc45f09c3169a189e60d2fcaec2b3 (diff) | |
Final pgindent + perltidy run for v10.
Diffstat (limited to 'src/tools/pgindent')
| -rwxr-xr-x | src/tools/pgindent/pgindent | 11 | ||||
| -rw-r--r-- | src/tools/pgindent/typedefs.list | 8 |
2 files changed, 12 insertions, 7 deletions
diff --git a/src/tools/pgindent/pgindent b/src/tools/pgindent/pgindent index 104f4c253be..a32aaa64f33 100755 --- a/src/tools/pgindent/pgindent +++ b/src/tools/pgindent/pgindent @@ -13,11 +13,12 @@ use Getopt::Long; # Update for pg_bsd_indent version my $INDENT_VERSION = "2.0"; + # Our standard indent settings my $indent_opts = - "-bad -bap -bbb -bc -bl -cli1 -cp33 -cdb -nce -d0 -di12 -nfc1 -i4 -l79 -lp -lpl -nip -npro -sac -tpg -ts4"; +"-bad -bap -bbb -bc -bl -cli1 -cp33 -cdb -nce -d0 -di12 -nfc1 -i4 -l79 -lp -lpl -nip -npro -sac -tpg -ts4"; -my $devnull = File::Spec->devnull; +my $devnull = File::Spec->devnull; my ($typedefs_file, $typedef_str, $code_base, $excludes, $indent, $build); @@ -75,7 +76,7 @@ sub check_indent if ($? == 0) { print STDERR - "You appear to have GNU indent rather than BSD indent.\n"; + "You appear to have GNU indent rather than BSD indent.\n"; exit 1; } } @@ -254,8 +255,7 @@ sub run_indent my $source = shift; my $error_message = shift; - my $cmd = - "$indent $indent_opts -U" . $filtered_typedefs_fh->filename; + my $cmd = "$indent $indent_opts -U" . $filtered_typedefs_fh->filename; my $tmp_fh = new File::Temp(TEMPLATE => "pgsrcXXXXX"); my $filename = $tmp_fh->filename; @@ -394,6 +394,7 @@ push(@files, @ARGV); foreach my $source_filename (@files) { + # Automatically ignore .c and .h files that correspond to a .y or .l # file. indent tends to get badly confused by Bison/flex output, # and there's no value in indenting derived files anyway. diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index 951d80a7fb6..8166d86ca1d 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -307,7 +307,6 @@ CheckpointStatsData CheckpointerRequest CheckpointerShmemStruct Chromosome -City CkptSortItem CkptTsStatus ClientAuthentication_hook_type @@ -327,6 +326,7 @@ CoerceViaIO CoercionContext CoercionForm CoercionPathType +CollAliasData CollInfo CollateClause CollateExpr @@ -569,6 +569,7 @@ ExecForeignUpdate_function ExecParallelEstimateContext ExecParallelInitializeDSMContext ExecPhraseData +ExecProcNodeMtd ExecRowMark ExecScanAccessMtd ExecScanRecheckMtd @@ -1180,6 +1181,7 @@ LogicalRepRelation LogicalRepTupleData LogicalRepTyp LogicalRepWorker +LogicalRepWorkerId LogicalRewriteMappingData LogicalTape LogicalTapeSet @@ -1770,7 +1772,6 @@ RWConflictPoolHeader Range RangeBound RangeBox -RangeDatumContent RangeFunction RangeIOData RangeQueryClause @@ -1880,6 +1881,7 @@ ResourceReleaseCallback ResourceReleaseCallbackItem ResourceReleasePhase RestoreOptions +RestorePass RestrictInfo Result ResultPath @@ -2251,6 +2253,7 @@ TransactionStmt TransactionStmtKind TransformInfo TransformJsonStringValuesState +TransitionCaptureState TrgmArc TrgmArcInfo TrgmColor @@ -2388,6 +2391,7 @@ WaitEventIO WaitEventIPC WaitEventSet WaitEventTimeout +WaitPMResult WalCloseMethod WalLevel WalRcvData |