mirror of
https://github.com/postgres/postgres.git
synced 2025-07-31 22:04:40 +03:00
perltidy: Add option --nooutdent-long-comments
This commit is contained in:
@ -97,35 +97,35 @@ sub Run()
|
|||||||
$CondReg ||= $s;
|
$CondReg ||= $s;
|
||||||
}
|
}
|
||||||
|
|
||||||
# s/([^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\})/(INT1, INT2, INT3, INT4)/
|
# s/([^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\})/(INT1, INT2, INT3, INT4)/
|
||||||
{
|
{
|
||||||
$s =
|
$s =
|
||||||
s /\([^,)]+, [^,)]+, [^,)]+, [^,)]+\)/(INT1, INT2, INT3, INT4)/s;
|
s /\([^,)]+, [^,)]+, [^,)]+, [^,)]+\)/(INT1, INT2, INT3, INT4)/s;
|
||||||
$CondReg ||= $s;
|
$CondReg ||= $s;
|
||||||
}
|
}
|
||||||
|
|
||||||
# s/([^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\})/(INT1, INT2, INT3, INT4, INT5)/
|
# s/([^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\})/(INT1, INT2, INT3, INT4, INT5)/
|
||||||
{
|
{
|
||||||
$s =
|
$s =
|
||||||
s /\([^,)]+, [^,)]+, [^,)]+, [^,)]+, [^,)]+\)/(INT1, INT2, INT3, INT4, INT5)/s;
|
s /\([^,)]+, [^,)]+, [^,)]+, [^,)]+, [^,)]+\)/(INT1, INT2, INT3, INT4, INT5)/s;
|
||||||
$CondReg ||= $s;
|
$CondReg ||= $s;
|
||||||
}
|
}
|
||||||
|
|
||||||
# s/([^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\})/(INT1, INT2, INT3, INT4, INT5, INT6)/
|
# s/([^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\})/(INT1, INT2, INT3, INT4, INT5, INT6)/
|
||||||
{
|
{
|
||||||
$s =
|
$s =
|
||||||
s /\([^,)]+, [^,)]+, [^,)]+, [^,)]+, [^,)]+, [^,)]+\)/(INT1, INT2, INT3, INT4, INT5, INT6)/s;
|
s /\([^,)]+, [^,)]+, [^,)]+, [^,)]+, [^,)]+, [^,)]+\)/(INT1, INT2, INT3, INT4, INT5, INT6)/s;
|
||||||
$CondReg ||= $s;
|
$CondReg ||= $s;
|
||||||
}
|
}
|
||||||
|
|
||||||
# s/([^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\})/(INT1, INT2, INT3, INT4, INT5, INT6, INT7)/
|
# s/([^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\})/(INT1, INT2, INT3, INT4, INT5, INT6, INT7)/
|
||||||
{
|
{
|
||||||
$s =
|
$s =
|
||||||
s /\([^,)]+, [^,)]+, [^,)]+, [^,)]+, [^,)]+, [^,)]+, [^,)]+\)/(INT1, INT2, INT3, INT4, INT5, INT6, INT7)/s;
|
s /\([^,)]+, [^,)]+, [^,)]+, [^,)]+, [^,)]+, [^,)]+, [^,)]+\)/(INT1, INT2, INT3, INT4, INT5, INT6, INT7)/s;
|
||||||
$CondReg ||= $s;
|
$CondReg ||= $s;
|
||||||
}
|
}
|
||||||
|
|
||||||
# s/([^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\})/(INT1, INT2, INT3, INT4, INT5, INT6, INT7, INT8)/
|
# s/([^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\})/(INT1, INT2, INT3, INT4, INT5, INT6, INT7, INT8)/
|
||||||
{
|
{
|
||||||
$s =
|
$s =
|
||||||
s /\([^,)]+, [^,)]+, [^,)]+, [^,)]+, [^,)]+, [^,)]+, [^,)]+, [^,)]+\)/(INT1, INT2, INT3, INT4, INT5, INT6, INT7, INT8)/s;
|
s /\([^,)]+, [^,)]+, [^,)]+, [^,)]+, [^,)]+, [^,)]+, [^,)]+, [^,)]+\)/(INT1, INT2, INT3, INT4, INT5, INT6, INT7, INT8)/s;
|
||||||
|
@ -62,9 +62,9 @@ foreach my $i (@$all)
|
|||||||
my $code = $i->{code};
|
my $code = $i->{code};
|
||||||
my $ucs = $i->{ucs};
|
my $ucs = $i->{ucs};
|
||||||
|
|
||||||
# BIG5.TXT maps several BIG5 characters to U+FFFD. The UTF-8 to BIG5 mapping can
|
# BIG5.TXT maps several BIG5 characters to U+FFFD. The UTF-8 to BIG5 mapping can
|
||||||
# contain only one of them. XXX: Doesn't really make sense to include any of them,
|
# contain only one of them. XXX: Doesn't really make sense to include any of them,
|
||||||
# but for historical reasons, we map the first one of them.
|
# but for historical reasons, we map the first one of them.
|
||||||
if ($i->{ucs} == 0xFFFD && $i->{code} != 0xA15A)
|
if ($i->{ucs} == 0xFFFD && $i->{code} != 0xA15A)
|
||||||
{
|
{
|
||||||
$i->{direction} = TO_UNICODE;
|
$i->{direction} = TO_UNICODE;
|
||||||
|
@ -138,7 +138,7 @@ sub print_conversion_tables_direction
|
|||||||
print $out "/* src/backend/utils/mb/Unicode/$fname */\n";
|
print $out "/* src/backend/utils/mb/Unicode/$fname */\n";
|
||||||
print $out "/* This file is generated by $this_script */\n\n";
|
print $out "/* This file is generated by $this_script */\n\n";
|
||||||
|
|
||||||
# Collect regular, non-combined, mappings, and create the radix tree from them.
|
# Collect regular, non-combined, mappings, and create the radix tree from them.
|
||||||
my $charmap = &make_charmap($out, $charset, $direction, 0);
|
my $charmap = &make_charmap($out, $charset, $direction, 0);
|
||||||
print_radix_table($out, $tblname, $charmap);
|
print_radix_table($out, $tblname, $charmap);
|
||||||
|
|
||||||
|
@ -2864,7 +2864,7 @@ foreach my $run (sort keys %pgdump_runs)
|
|||||||
next;
|
next;
|
||||||
}
|
}
|
||||||
|
|
||||||
# If there is a like entry, but no unlike entry, then we will test the like case
|
# If there is a like entry, but no unlike entry, then we will test the like case
|
||||||
if ($tests{$test}->{like}->{$test_key}
|
if ($tests{$test}->{like}->{$test_key}
|
||||||
&& !defined($tests{$test}->{unlike}->{$test_key}))
|
&& !defined($tests{$test}->{unlike}->{$test_key}))
|
||||||
{
|
{
|
||||||
|
@ -498,7 +498,7 @@ foreach my $run (sort keys %pgdump_runs)
|
|||||||
# Then count all the tests run against each run
|
# Then count all the tests run against each run
|
||||||
foreach my $test (sort keys %tests)
|
foreach my $test (sort keys %tests)
|
||||||
{
|
{
|
||||||
# If there is a like entry, but no unlike entry, then we will test the like case
|
# If there is a like entry, but no unlike entry, then we will test the like case
|
||||||
if ($tests{$test}->{like}->{$test_key}
|
if ($tests{$test}->{like}->{$test_key}
|
||||||
&& !defined($tests{$test}->{unlike}->{$test_key}))
|
&& !defined($tests{$test}->{unlike}->{$test_key}))
|
||||||
{
|
{
|
||||||
|
@ -115,7 +115,7 @@ sub configure_test_server_for_ssl
|
|||||||
open my $sslconf, '>', "$pgdata/sslconfig.conf";
|
open my $sslconf, '>', "$pgdata/sslconfig.conf";
|
||||||
close $sslconf;
|
close $sslconf;
|
||||||
|
|
||||||
# Copy all server certificates and keys, and client root cert, to the data dir
|
# Copy all server certificates and keys, and client root cert, to the data dir
|
||||||
copy_files("ssl/server-*.crt", $pgdata);
|
copy_files("ssl/server-*.crt", $pgdata);
|
||||||
copy_files("ssl/server-*.key", $pgdata);
|
copy_files("ssl/server-*.key", $pgdata);
|
||||||
chmod(0600, glob "$pgdata/server-*.key") or die $!;
|
chmod(0600, glob "$pgdata/server-*.key") or die $!;
|
||||||
|
@ -530,9 +530,9 @@ sub mkvcbuild
|
|||||||
|
|
||||||
my $perl_path = $solution->{options}->{perl} . '\lib\CORE\*perl*';
|
my $perl_path = $solution->{options}->{perl} . '\lib\CORE\*perl*';
|
||||||
|
|
||||||
# ActivePerl 5.16 provided perl516.lib; 5.18 provided libperl518.a
|
# ActivePerl 5.16 provided perl516.lib; 5.18 provided libperl518.a
|
||||||
# Starting with ActivePerl 5.24, both perlnn.lib and libperlnn.a are provided.
|
# Starting with ActivePerl 5.24, both perlnn.lib and libperlnn.a are provided.
|
||||||
# In this case, prefer .lib.
|
# In this case, prefer .lib.
|
||||||
my @perl_libs =
|
my @perl_libs =
|
||||||
reverse sort grep { /perl\d+\.lib$|libperl\d+\.a$/ }
|
reverse sort grep { /perl\d+\.lib$|libperl\d+\.a$/ }
|
||||||
glob($perl_path);
|
glob($perl_path);
|
||||||
|
@ -345,15 +345,15 @@ sub Save
|
|||||||
{
|
{
|
||||||
my ($self) = @_;
|
my ($self) = @_;
|
||||||
|
|
||||||
# If doing DLL and haven't specified a DEF file, do a full export of all symbols
|
# If doing DLL and haven't specified a DEF file, do a full export of all symbols
|
||||||
# in the project.
|
# in the project.
|
||||||
if ($self->{type} eq "dll" && !$self->{def})
|
if ($self->{type} eq "dll" && !$self->{def})
|
||||||
{
|
{
|
||||||
$self->FullExportDLL($self->{name} . ".lib");
|
$self->FullExportDLL($self->{name} . ".lib");
|
||||||
}
|
}
|
||||||
|
|
||||||
# Warning 4197 is about double exporting, disable this per
|
# Warning 4197 is about double exporting, disable this per
|
||||||
# http://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=99193
|
# http://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=99193
|
||||||
$self->DisableLinkerWarnings('4197') if ($self->{platform} eq 'x64');
|
$self->DisableLinkerWarnings('4197') if ($self->{platform} eq 'x64');
|
||||||
|
|
||||||
# Dump the project
|
# Dump the project
|
||||||
|
@ -54,7 +54,7 @@ sub CreateSolution
|
|||||||
return new VS2015Solution(@_);
|
return new VS2015Solution(@_);
|
||||||
}
|
}
|
||||||
|
|
||||||
# visual 2017 hasn't changed the nmake version to 15, so adjust the check to support it.
|
# visual 2017 hasn't changed the nmake version to 15, so adjust the check to support it.
|
||||||
elsif (($visualStudioVersion ge '14.10')
|
elsif (($visualStudioVersion ge '14.10')
|
||||||
or ($visualStudioVersion eq '15.00'))
|
or ($visualStudioVersion eq '15.00'))
|
||||||
{
|
{
|
||||||
@ -101,7 +101,7 @@ sub CreateProject
|
|||||||
return new VC2015Project(@_);
|
return new VC2015Project(@_);
|
||||||
}
|
}
|
||||||
|
|
||||||
# visual 2017 hasn't changed the nmake version to 15, so adjust the check to support it.
|
# visual 2017 hasn't changed the nmake version to 15, so adjust the check to support it.
|
||||||
elsif (($visualStudioVersion ge '14.10')
|
elsif (($visualStudioVersion ge '14.10')
|
||||||
or ($visualStudioVersion eq '15.00'))
|
or ($visualStudioVersion eq '15.00'))
|
||||||
{
|
{
|
||||||
@ -137,7 +137,7 @@ sub _GetVisualStudioVersion
|
|||||||
{
|
{
|
||||||
my ($major, $minor) = @_;
|
my ($major, $minor) = @_;
|
||||||
|
|
||||||
# visual 2017 hasn't changed the nmake version to 15, so still using the older version for comparison.
|
# visual 2017 hasn't changed the nmake version to 15, so still using the older version for comparison.
|
||||||
if ($major > 14)
|
if ($major > 14)
|
||||||
{
|
{
|
||||||
carp
|
carp
|
||||||
|
@ -5,6 +5,7 @@
|
|||||||
--entab-leading-whitespace=4
|
--entab-leading-whitespace=4
|
||||||
--keep-old-blank-lines=2
|
--keep-old-blank-lines=2
|
||||||
--maximum-line-length=78
|
--maximum-line-length=78
|
||||||
|
--nooutdent-long-comments
|
||||||
--nooutdent-long-quotes
|
--nooutdent-long-quotes
|
||||||
--nospace-for-semicolon
|
--nospace-for-semicolon
|
||||||
--opening-brace-on-new-line
|
--opening-brace-on-new-line
|
||||||
|
Reference in New Issue
Block a user