Run pgindent on 9.2 source tree in preparation for first 9.3

commit-fest.

1 files changed, 146 insertions, 146 deletions

diff --git a/src/tools/msvc/VCBuildProject.pm b/src/tools/msvc/VCBuildProject.pm
index 97439d9d5c4..a7fd0c0d9d5 100644
--- a/src/tools/msvc/VCBuildProject.pm
+++ b/src/tools/msvc/VCBuildProject.pm
@@ -13,124 +13,124 @@ use base qw(Project);
 
 sub _new
 {
-    my $classname = shift;
-    my $self = $classname->SUPER::_new(@_);
-    bless($self, $classname);
+	my $classname = shift;
+	my $self = $classname->SUPER::_new(@_);
+	bless($self, $classname);
 
-    $self->{filenameExtension} = '.vcproj';
+	$self->{filenameExtension} = '.vcproj';
 
-    return $self;
+	return $self;
 }
 
 sub WriteHeader
 {
-    my ($self, $f) = @_;
+	my ($self, $f) = @_;
 
-    print $f <<EOF;
+	print $f <<EOF;
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject ProjectType="Visual C++" Version="$self->{vcver}" Name="$self->{name}" ProjectGUID="$self->{guid}">
  <Platforms><Platform Name="$self->{platform}"/></Platforms>
  <Configurations>
 EOF
-    $self->WriteConfiguration($f, 'Debug',
-        { defs=>'_DEBUG;DEBUG=1;', wholeopt=>0, opt=>0, strpool=>'false', runtime=>3 });
-    $self->WriteConfiguration($f, 'Release',
-        { defs=>'', wholeopt=>0, opt=>3, strpool=>'true', runtime=>2 });
-    print $f <<EOF;
+	$self->WriteConfiguration($f, 'Debug',
+		{defs=>'_DEBUG;DEBUG=1;', wholeopt=>0, opt=>0, strpool=>'false', runtime=>3});
+	$self->WriteConfiguration($f, 'Release',
+		{defs=>'', wholeopt=>0, opt=>3, strpool=>'true', runtime=>2});
+	print $f <<EOF;
  </Configurations>
 EOF
-    $self->WriteReferences($f);
+	$self->WriteReferences($f);
 }
 
 sub WriteFiles
 {
-    my ($self, $f) = @_;
-    print $f <<EOF;
+	my ($self, $f) = @_;
+	print $f <<EOF;
  <Files>
 EOF
-    my @dirstack = ();
-    my %uniquefiles;
-    foreach my $fileNameWithPath (sort keys %{ $self->{files} })
-    {
-        confess "Bad format filename '$fileNameWithPath'\n"
-          unless ($fileNameWithPath =~ /^(.*)\\([^\\]+)\.[r]?[cyl]$/);
-        my $dir = $1;
-        my $file = $2;
-
-        # Walk backwards down the directory stack and close any dirs we're done with
-        while ($#dirstack >= 0)
-        {
-            if (join('\\',@dirstack) eq substr($dir, 0, length(join('\\',@dirstack))))
-            {
-                last if (length($dir) == length(join('\\',@dirstack)));
-                last if (substr($dir, length(join('\\',@dirstack)),1) eq '\\');
-            }
-            print $f ' ' x $#dirstack . "  </Filter>\n";
-            pop @dirstack;
-        }
-
-        # Now walk forwards and create whatever directories are needed
-        while (join('\\',@dirstack) ne $dir)
-        {
-            my $left = substr($dir, length(join('\\',@dirstack)));
-            $left =~ s/^\\//;
-            my @pieces = split /\\/, $left;
-            push @dirstack, $pieces[0];
-            print $f ' ' x $#dirstack . "  <Filter Name=\"$pieces[0]\" Filter=\"\">\n";
-        }
-
-        print $f ' ' x $#dirstack . "   <File RelativePath=\"$fileNameWithPath\"";
-        if ($fileNameWithPath =~ /\.y$/)
-        {
-            my $of = $fileNameWithPath;
-            $of =~ s/\.y$/.c/;
-            $of =~ s{^src\\pl\\plpgsql\\src\\gram.c$}{src\\pl\\plpgsql\\src\\pl_gram.c};
-            print $f '>'
-              . $self->GenerateCustomTool('Running bison on ' . $fileNameWithPath,
-                "perl src\\tools\\msvc\\pgbison.pl $fileNameWithPath", $of)
-              . '</File>' . "\n";
-        }
-        elsif ($fileNameWithPath =~ /\.l$/)
-        {
-            my $of = $fileNameWithPath;
-            $of =~ s/\.l$/.c/;
-            print $f '>'
-              . $self->GenerateCustomTool('Running flex on ' . $fileNameWithPath,
-                "perl src\\tools\\msvc\\pgflex.pl $fileNameWithPath", $of)
-              . '</File>' . "\n";
-        }
-        elsif (defined($uniquefiles{$file}))
-        {
-
-            # File already exists, so fake a new name
-            my $obj = $dir;
-            $obj =~ s/\\/_/g;
-            print $f
+	my @dirstack = ();
+	my %uniquefiles;
+	foreach my $fileNameWithPath (sort keys %{$self->{files}})
+	{
+		confess "Bad format filename '$fileNameWithPath'\n"
+		  unless ($fileNameWithPath =~ /^(.*)\\([^\\]+)\.[r]?[cyl]$/);
+		my $dir = $1;
+		my $file = $2;
+
+		# Walk backwards down the directory stack and close any dirs we're done with
+		while ($#dirstack >= 0)
+		{
+			if (join('\\',@dirstack) eq substr($dir, 0, length(join('\\',@dirstack))))
+			{
+				last if (length($dir) == length(join('\\',@dirstack)));
+				last if (substr($dir, length(join('\\',@dirstack)),1) eq '\\');
+			}
+			print $f ' ' x $#dirstack . "  </Filter>\n";
+			pop @dirstack;
+		}
+
+		# Now walk forwards and create whatever directories are needed
+		while (join('\\',@dirstack) ne $dir)
+		{
+			my $left = substr($dir, length(join('\\',@dirstack)));
+			$left =~ s/^\\//;
+			my @pieces = split /\\/, $left;
+			push @dirstack, $pieces[0];
+			print $f ' ' x $#dirstack . "  <Filter Name=\"$pieces[0]\" Filter=\"\">\n";
+		}
+
+		print $f ' ' x $#dirstack . "   <File RelativePath=\"$fileNameWithPath\"";
+		if ($fileNameWithPath =~ /\.y$/)
+		{
+			my $of = $fileNameWithPath;
+			$of =~ s/\.y$/.c/;
+			$of =~ s{^src\\pl\\plpgsql\\src\\gram.c$}{src\\pl\\plpgsql\\src\\pl_gram.c};
+			print $f '>'
+			  . $self->GenerateCustomTool('Running bison on ' . $fileNameWithPath,
+				"perl src\\tools\\msvc\\pgbison.pl $fileNameWithPath", $of)
+			  . '</File>' . "\n";
+		}
+		elsif ($fileNameWithPath =~ /\.l$/)
+		{
+			my $of = $fileNameWithPath;
+			$of =~ s/\.l$/.c/;
+			print $f '>'
+			  . $self->GenerateCustomTool('Running flex on ' . $fileNameWithPath,
+				"perl src\\tools\\msvc\\pgflex.pl $fileNameWithPath", $of)
+			  . '</File>' . "\n";
+		}
+		elsif (defined($uniquefiles{$file}))
+		{
+
+			# File already exists, so fake a new name
+			my $obj = $dir;
+			$obj =~ s/\\/_/g;
+			print $f
 "><FileConfiguration Name=\"Debug|$self->{platform}\"><Tool Name=\"VCCLCompilerTool\" ObjectFile=\".\\debug\\$self->{name}\\$obj"
-              . "_$file.obj\" /></FileConfiguration><FileConfiguration Name=\"Release|$self->{platform}\"><Tool Name=\"VCCLCompilerTool\" ObjectFile=\".\\release\\$self->{name}\\$obj"
-              . "_$file.obj\" /></FileConfiguration></File>\n";
-        }
-        else
-        {
-            $uniquefiles{$file} = 1;
-            print $f " />\n";
-        }
-    }
-    while ($#dirstack >= 0)
-    {
-        print $f ' ' x $#dirstack . "  </Filter>\n";
-        pop @dirstack;
-    }
-    print $f <<EOF;
+			  . "_$file.obj\" /></FileConfiguration><FileConfiguration Name=\"Release|$self->{platform}\"><Tool Name=\"VCCLCompilerTool\" ObjectFile=\".\\release\\$self->{name}\\$obj"
+			  . "_$file.obj\" /></FileConfiguration></File>\n";
+		}
+		else
+		{
+			$uniquefiles{$file} = 1;
+			print $f " />\n";
+		}
+	}
+	while ($#dirstack >= 0)
+	{
+		print $f ' ' x $#dirstack . "  </Filter>\n";
+		pop @dirstack;
+	}
+	print $f <<EOF;
  </Files>
 EOF
 }
 
 sub Footer
 {
-    my ($self, $f) = @_;
+	my ($self, $f) = @_;
 
-    print $f <<EOF;
+	print $f <<EOF;
  <Globals/>
 </VisualStudioProject>
 EOF
@@ -138,13 +138,13 @@ EOF
 
 sub WriteConfiguration
 {
-    my ($self, $f, $cfgname, $p) = @_;
-    my $cfgtype = ($self->{type} eq "exe")?1:($self->{type} eq "dll"?2:4);
-    my $libs = $self->GetAdditionalLinkerDependencies($cfgname, ' ');
+	my ($self, $f, $cfgname, $p) = @_;
+	my $cfgtype = ($self->{type} eq "exe")?1:($self->{type} eq "dll"?2:4);
+	my $libs = $self->GetAdditionalLinkerDependencies($cfgname, ' ');
 
-    my $targetmachine = $self->{platform} eq 'Win32' ? 1 : 17;
+	my $targetmachine = $self->{platform} eq 'Win32' ? 1 : 17;
 
-    print $f <<EOF;
+	print $f <<EOF;
   <Configuration Name="$cfgname|$self->{platform}" OutputDirectory=".\\$cfgname\\$self->{name}" IntermediateDirectory=".\\$cfgname\\$self->{name}"
 	ConfigurationType="$cfgtype" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="2" WholeProgramOptimization="$p->{wholeopt}">
 	<Tool Name="VCCLCompilerTool" Optimization="$p->{opt}"
@@ -154,7 +154,7 @@ sub WriteConfiguration
 		RuntimeLibrary="$p->{runtime}" DisableSpecificWarnings="$self->{disablewarnings}"
 		AdditionalOptions="/MP"
 EOF
-    print $f <<EOF;
+	print $f <<EOF;
 		AssemblerOutput="0" AssemblerListingLocation=".\\$cfgname\\$self->{name}\\" ObjectFile=".\\$cfgname\\$self->{name}\\"
 		ProgramDataBaseFileName=".\\$cfgname\\$self->{name}\\" BrowseInformation="0"
 		WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/>
@@ -166,59 +166,59 @@ EOF
 		GenerateMapFile="FALSE" MapFileName=".\\$cfgname\\$self->{name}\\$self->{name}.map"
 		SubSystem="1" TargetMachine="$targetmachine"
 EOF
-    if ($self->{disablelinkerwarnings})
-    {
-        print $f "\t\tAdditionalOptions=\"/ignore:$self->{disablelinkerwarnings}\"\n";
-    }
-    if ($self->{implib})
-    {
-        my $l = $self->{implib};
-        $l =~ s/__CFGNAME__/$cfgname/g;
-        print $f "\t\tImportLibrary=\"$l\"\n";
-    }
-    if ($self->{def})
-    {
-        my $d = $self->{def};
-        $d =~ s/__CFGNAME__/$cfgname/g;
-        print $f "\t\tModuleDefinitionFile=\"$d\"\n";
-    }
-
-    print $f "\t/>\n";
-    print $f
+	if ($self->{disablelinkerwarnings})
+	{
+		print $f "\t\tAdditionalOptions=\"/ignore:$self->{disablelinkerwarnings}\"\n";
+	}
+	if ($self->{implib})
+	{
+		my $l = $self->{implib};
+		$l =~ s/__CFGNAME__/$cfgname/g;
+		print $f "\t\tImportLibrary=\"$l\"\n";
+	}
+	if ($self->{def})
+	{
+		my $d = $self->{def};
+		$d =~ s/__CFGNAME__/$cfgname/g;
+		print $f "\t\tModuleDefinitionFile=\"$d\"\n";
+	}
+
+	print $f "\t/>\n";
+	print $f
 "\t<Tool Name=\"VCLibrarianTool\" OutputFile=\".\\$cfgname\\$self->{name}\\$self->{name}.lib\" IgnoreDefaultLibraryNames=\"libc\" />\n";
-    print $f
-      "\t<Tool Name=\"VCResourceCompilerTool\" AdditionalIncludeDirectories=\"src\\include\" />\n";
-    if ($self->{builddef})
-    {
-        print $f
+	print $f
+"\t<Tool Name=\"VCResourceCompilerTool\" AdditionalIncludeDirectories=\"src\\include\" />\n";
+	if ($self->{builddef})
+	{
+		print $f
 "\t<Tool Name=\"VCPreLinkEventTool\" Description=\"Generate DEF file\" CommandLine=\"perl src\\tools\\msvc\\gendef.pl $cfgname\\$self->{name} $self->{platform}\" />\n";
-    }
-    print $f <<EOF;
+	}
+	print $f <<EOF;
   </Configuration>
 EOF
 }
 
 sub WriteReferences
 {
-    my ($self, $f) = @_;
-    print $f " <References>\n";
-    foreach my $ref (@{$self->{references}})
-    {
-        print $f
+	my ($self, $f) = @_;
+	print $f " <References>\n";
+	foreach my $ref (@{$self->{references}})
+	{
+		print $f
 "  <ProjectReference ReferencedProjectIdentifier=\"$ref->{guid}\" Name=\"$ref->{name}\" />\n";
-    }
-    print $f " </References>\n";
+	}
+	print $f " </References>\n";
 }
 
 sub GenerateCustomTool
 {
-    my ($self, $desc, $tool, $output, $cfg) = @_;
-    if (!defined($cfg))
-    {
-        return $self->GenerateCustomTool($desc, $tool, $output, 'Debug')
-          .$self->GenerateCustomTool($desc, $tool, $output, 'Release');
-    }
-    return
+	my ($self, $desc, $tool, $output, $cfg) = @_;
+	if (!defined($cfg))
+	{
+		return $self->GenerateCustomTool($desc, $tool, $output, 'Debug')
+		  .$self->GenerateCustomTool($desc, $tool, $output, 'Release');
+	}
+	return
 "<FileConfiguration Name=\"$cfg|$self->{platform}\"><Tool Name=\"VCCustomBuildTool\" Description=\"$desc\" CommandLine=\"$tool\" AdditionalDependencies=\"\" Outputs=\"$output\" /></FileConfiguration>";
 }
 
@@ -234,13 +234,13 @@ use base qw(VCBuildProject);
 
 sub new
 {
-    my $classname = shift;
-    my $self = $classname->SUPER::_new(@_);
-    bless($self, $classname);
+	my $classname = shift;
+	my $self = $classname->SUPER::_new(@_);
+	bless($self, $classname);
 
-    $self->{vcver} = '8.00';
+	$self->{vcver} = '8.00';
 
-    return $self;
+	return $self;
 }
 
 package VC2008Project;
@@ -255,13 +255,13 @@ use base qw(VCBuildProject);
 
 sub new
 {
-    my $classname = shift;
-    my $self = $classname->SUPER::_new(@_);
-    bless($self, $classname);
+	my $classname = shift;
+	my $self = $classname->SUPER::_new(@_);
+	bless($self, $classname);
 
-    $self->{vcver} = '9.00';
+	$self->{vcver} = '9.00';
 
-    return $self;
+	return $self;
 }
 
 1;