Author: particle
Date: Tue Nov 7 06:44:10 2006
New Revision: 15160
Modified:
trunk/config/inter/libparrot.pm
trunk/lib/Parrot/Config.pm
trunk/lib/Parrot/Configure.pm
trunk/lib/Parrot/Op.pm
trunk/lib/Parrot/OpTrans.pm
trunk/lib/Parrot/Revision.pm
trunk/lib/Parrot/Test.pm
trunk/lib/Parrot/Vtable.pm
trunk/src/pmc/float.pmc
trunk/t/compilers/pge/p6regex/builtins.t
trunk/t/dynoplibs/dan.t
trunk/t/dynoplibs/myops.t
trunk/t/op/cc_params.t
trunk/t/perl/Parrot_Distribution.t
trunk/t/perl/Parrot_Docs.t
trunk/t/perl/Parrot_IO.t
trunk/t/perl/Parrot_PIR_Formatter.t
trunk/t/perl/Parrot_Test.t
trunk/tools/build/pmc2c.pl
Log:
[PDD07]: whitespace and code coda for some perl modules and test files
Modified: trunk/config/inter/libparrot.pm
==============================================================================
--- trunk/config/inter/libparrot.pm (original)
+++ trunk/config/inter/libparrot.pm Tue Nov 7 06:44:10 2006
@@ -45,12 +45,12 @@
}
$conf->data->set(
- parrot_is_shared => $parrot_is_shared,
+ parrot_is_shared => $parrot_is_shared,
- libparrot => $parrot_is_shared
- ? '$(LIBPARROT_SHARED)'
+ libparrot => $parrot_is_shared
+ ? '$(LIBPARROT_SHARED)'
: '$(LIBPARROT_STATIC)',
- );
+ );
$conf->data->set(
rpath_blib => ($parrot_is_shared && $conf->data->get('rpath'))
Modified: trunk/lib/Parrot/Config.pm
==============================================================================
--- trunk/lib/Parrot/Config.pm (original)
+++ trunk/lib/Parrot/Config.pm Tue Nov 7 06:44:10 2006
@@ -21,7 +21,7 @@
use strict;
use Exporter;
-
+
use vars qw(@ISA @EXPORT %PConfig);
@ISA=qw(Exporter);
Modified: trunk/lib/Parrot/Configure.pm
==============================================================================
--- trunk/lib/Parrot/Configure.pm (original)
+++ trunk/lib/Parrot/Configure.pm Tue Nov 7 06:44:10 2006
@@ -247,7 +247,7 @@
my $step = $step_name->new;
# XXX This works. but is probably not a good design.
- # Using $step->description() would be nicer
+ # Using $step->description() would be nicer
my $description = $step->description();
$description = "" unless defined $description;
Modified: trunk/lib/Parrot/Op.pm
==============================================================================
--- trunk/lib/Parrot/Op.pm (original)
+++ trunk/lib/Parrot/Op.pm Tue Nov 7 06:44:10 2006
@@ -413,7 +413,7 @@
if ($self->flags =~ /:pic/ &&
!(ref($trans) eq 'Parrot::OpTrans::CGP' ||
ref($trans) eq 'Parrot::OpTrans::CSwitch')) {
- return qq{PANIC("How did you do that");return 0;\n};
+ return qq{PANIC("How did you do that");return 0;\n};
}
return $self->rewrite_body($self->full_body, $trans);
Modified: trunk/lib/Parrot/OpTrans.pm
==============================================================================
--- trunk/lib/Parrot/OpTrans.pm (original)
+++ trunk/lib/Parrot/OpTrans.pm Tue Nov 7 06:44:10 2006
@@ -3,7 +3,7 @@
=head1 NAME
-Parrot::OpTrans - Transform Ops to C Code
+Parrot::OpTrans - Transform Ops to C Code
=head1 DESCRIPTION
@@ -44,8 +44,8 @@
=cut
sub new
-{
- return bless { }, shift;
+{
+ return bless { }, shift;
}
=back
@@ -62,9 +62,9 @@
=cut
-sub prefix
-{
- return 'Parrot_';
+sub prefix
+{
+ return 'Parrot_';
}
=item C<suffix()>
@@ -74,9 +74,9 @@
=cut
-sub suffix
-{
- return '';
+sub suffix
+{
+ return '';
}
=item C<defines()>
@@ -91,9 +91,9 @@
=cut
-sub opsarraytype
-{
- return 'opcode_t'
+sub opsarraytype
+{
+ return 'opcode_t'
};
=item C<core_type()>
@@ -105,10 +105,10 @@
=cut
-sub core_type
+sub core_type
{
my $self = shift;
-
+
die ref($self) . " doesn't have core_type()";
}
@@ -143,7 +143,7 @@
=item C<run_core_after_addr_table($base_suffix)>
Optionally implemented in subclasses to return the run core C code for
-section after the address table. C<$base_suffix> is the same as for
+section after the address table. C<$base_suffix> is the same as for
C<ops_addr_decl()>.
=item C<run_core_finish($base)>
@@ -183,7 +183,7 @@
=cut
-sub gen_goto
+sub gen_goto
{
my ($self, $where_str) = @_;
@@ -207,7 +207,7 @@
=cut
-sub goto_address
+sub goto_address
{
my $self = shift;
@@ -221,7 +221,7 @@
=cut
-sub goto_offset
+sub goto_offset
{
my $self = shift;
@@ -235,7 +235,7 @@
=cut
-sub goto_pop
+sub goto_pop
{
my ($self) = @_;
@@ -276,3 +276,4 @@
1;
+
Modified: trunk/lib/Parrot/Revision.pm
==============================================================================
--- trunk/lib/Parrot/Revision.pm (original)
+++ trunk/lib/Parrot/Revision.pm Tue Nov 7 06:44:10 2006
@@ -33,7 +33,7 @@
my $revision;
# code taken from pugs/util/version_h.pl rev 14410
- my $nul = File::Spec->devnull;
+ my $nul = File::Spec->devnull;
if (my @svn_info = qx/svn info 2>$nul/ and $? == 0) {
if (my ($line) = grep /^Revision:/, @svn_info) {
($revision) = $line =~ / (\d+)$/;
Modified: trunk/lib/Parrot/Test.pm
==============================================================================
--- trunk/lib/Parrot/Test.pm (original)
+++ trunk/lib/Parrot/Test.pm Tue Nov 7 06:44:10 2006
@@ -44,17 +44,17 @@
=over 4
-=item C<language_output_is( $language, $code, $expected, $description)>
+=item C<language_output_is( $language, $code, $expected, $description)>
Runs a langugage test and passes the test if a string comparison
of the output with the expected result it true.
-=item C<language_output_like( $language, $code, $expected, $description)>
+=item C<language_output_like( $language, $code, $expected, $description)>
Runs a langugage test and passes the test
if the output matches the expected result.
-=item C<language_output_isnt( $language, $code, $expected, $description)>
+=item C<language_output_isnt( $language, $code, $expected, $description)>
Runs a langugage test and passes the test if a string comparison
if a string comparison of the output with the unexpected result is false.
@@ -358,7 +358,7 @@
return $path;
}
-#
+#
# private methods, should not be used by Modules inheriting from Parrot::Test
#
@@ -384,7 +384,7 @@
pir_output_is => 'is_eq',
pir_output_isnt => 'isnt_eq',
pir_output_like => 'like',
- pir_output_unlike => 'unlike',
+ pir_output_unlike => 'unlike',
);
foreach my $func ( keys %parrot_test_map ) {
@@ -617,7 +617,7 @@
my ( $language, @remaining ) = @_;
my $meth = $language_test_map{$func};
- if ( my $prefix = $builtin_language_prefix{$language} ) {
+ if ( my $prefix = $builtin_language_prefix{$language} ) {
my $level = $builder->level();
$builder->level( $level + 2 );
my $test_func = "${package}::${prefix}_${meth}";
@@ -666,7 +666,7 @@
*{$package.'::'.$func} = sub {
my ($example_f, $expected, @options) = @_;
- my %lang_for_extension
+ my %lang_for_extension
= ( pasm => 'PASM',
past => 'PAST',
pir => 'PIR',
@@ -676,7 +676,7 @@
( pasm | pir | imc | past ) #
match and capture the extension
\z #
at end of string
}ixms or Usage();
- if ( defined $extension ) {
+ if ( defined $extension ) {
my $code = slurp_file($example_f);
my $test_func = join( '::', $package, $example_test_map{$func}
);
$test_func->( $lang_for_extension{$extension}, $code,
$expected, $example_f, @options );
@@ -706,7 +706,7 @@
$expected =~ s/\cM\cJ/\n/g;
my $source_f = per_test('.c', $test_no);
my $obj_f = per_test($PConfig{o}, $test_no);
- my $exe_f = per_test($PConfig{exe}, $test_no);
+ my $exe_f = per_test($PConfig{exe}, $test_no);
$exe_f =~ [EMAIL PROTECTED]/:[EMAIL PROTECTED]@g;
my $out_f = per_test('.out', $test_no);
my $build_f = per_test('.build', $test_no);
Modified: trunk/lib/Parrot/Vtable.pm
==============================================================================
--- trunk/lib/Parrot/Vtable.pm (original)
+++ trunk/lib/Parrot/Vtable.pm Tue Nov 7 06:44:10 2006
@@ -59,7 +59,7 @@
my $result = { %$default };
$result->{$1} = 1 while $attrs =~ /$attr_re/g;
return $result;
-}
+}
=item C<parse_vtable($file)>
Modified: trunk/src/pmc/float.pmc
==============================================================================
--- trunk/src/pmc/float.pmc (original)
+++ trunk/src/pmc/float.pmc Tue Nov 7 06:44:10 2006
@@ -81,9 +81,9 @@
*/
- INTVAL get_integer() {
+ INTVAL get_integer() {
return (INTVAL) PMC_num_val(SELF);
- }
+ }
/*
Modified: trunk/t/compilers/pge/p6regex/builtins.t
==============================================================================
--- trunk/t/compilers/pge/p6regex/builtins.t (original)
+++ trunk/t/compilers/pge/p6regex/builtins.t Tue Nov 7 06:44:10 2006
@@ -22,7 +22,7 @@
=head1 SYNOPSIS
- % prove t/p6regex/builtins.t
+ % prove t/p6regex/builtins.t
=cut
@@ -49,7 +49,7 @@
OK:
print "ok"
END:
- print "\n"
+ print "\n"
.end
POST
@@ -58,54 +58,61 @@
## <prior> -- match prior successful rule
+# L<S05/Nothing is illegal/"To match whatever the prior successful regex
matched, use:" prior>
pir_output_is ($PRE.<<"CODE".$POST, <<OUTPUT, 'prior rule (<prior>) ', todo
=> 'not yet implemented');
- rulesub = p6rule('abc')
- match = rulesub($str)
+ rulesub = p6rule('abc')
+ match = rulesub($str)
- .local pmc second_match
- rulesub = p6rule('<prior>')
- second_match = rulesub($str)
+ .local pmc second_match
+ rulesub = p6rule('<prior>')
+ second_match = rulesub($str)
- if match eq second_match goto OK
+ if match eq second_match goto OK
CODE
ok
OUTPUT
pir_output_is ($PRE.<<"CODE".$POST, <<OUTPUT, 'prior rule (<prior>) ', todo
=> 'not yet implemented');
- rulesub = p6rule('xxx')
- match = rulesub($str)
+ rulesub = p6rule('xxx')
+ match = rulesub($str)
- .local pmc second_match
- rulesub = p6rule('<prior>')
- second_match = rulesub($str)
+ .local pmc second_match
+ rulesub = p6rule('<prior>')
+ second_match = rulesub($str)
- if match ne second_match goto OK
+ if match ne second_match goto OK
CODE
ok
OUTPUT
pir_output_is ($PRE.<<"CODE".$POST, <<OUTPUT, 'prior rule (<prior>) ', todo
=> 'not yet implemented');
- rulesub = p6rule('abc')
- match = rulesub($str)
+ rulesub = p6rule('abc')
+ match = rulesub($str)
- .local pmc second_match
- rulesub = p6rule('xxx')
- second_match = rulesub($str)
-
- .local pmc third_match
- rulesub = p6rule('<prior>')
- third_match = rulesub($str)
+ .local pmc second_match
+ rulesub = p6rule('xxx')
+ second_match = rulesub($str)
+
+ .local pmc third_match
+ rulesub = p6rule('<prior>')
+ third_match = rulesub($str)
- if match ne second_match goto OK1
- print "not "
+ if match ne second_match goto OK1
+ print "not "
OK1:print "ok 1\n"
- if match eq third_match goto OK2
- print "not "
+ if match eq third_match goto OK2
+ print "not "
OK2:print "ok 2\n"
- goto END
+ goto END
CODE
ok 1
ok 2
OUTPUT
+# Local Variables:
+# mode: cperl
+# cperl-indent-level: 4
+# fill-column: 100
+# End:
+# vim: expandtab shiftwidth=4:
Modified: trunk/t/dynoplibs/dan.t
==============================================================================
--- trunk/t/dynoplibs/dan.t (original)
+++ trunk/t/dynoplibs/dan.t Tue Nov 7 06:44:10 2006
@@ -16,7 +16,7 @@
=head1 SYNOPSIS
- % prove t/dynoplibs/dan.t
+ % prove t/dynoplibs/dan.t
=head1 DESCRIPTION
@@ -39,7 +39,7 @@
pir_output_is(<< 'CODE', << 'OUTPUT', "mul_i_i_nc");
.loadlib "dan_ops"
.sub main :main
- $I2 = 10
+ $I2 = 10
mul $I1, $I2, 4.2
print $I1
print "\n"
@@ -51,7 +51,7 @@
pir_output_is(<< 'CODE', << 'OUTPUT', "mul_i_ic_n");
.loadlib "dan_ops"
.sub main :main
- $N3 = 4.2
+ $N3 = 4.2
mul $I1, 10, $N3
print $I1
print "\n"
@@ -63,8 +63,8 @@
pir_output_is(<< 'CODE', << 'OUTPUT', "mul_i_i_n");
.loadlib "dan_ops"
.sub main :main
- $I2 = 10
- $N3 = 4.2
+ $I2 = 10
+ $N3 = 4.2
mul $I1, $I2, $N3
print $I1
print "\n"
@@ -76,8 +76,8 @@
pir_output_is(<< 'CODE', << 'OUTPUT', "mul pir syntax");
.loadlib "dan_ops"
.sub main :main
- $I2 = 10
- $N3 = 4.2
+ $I2 = 10
+ $N3 = 4.2
$I1 = mul $I2, $N3
print $I1
print "\n"
@@ -95,3 +95,11 @@
CODE
11
OUTPUT
+
+
+# Local Variables:
+# mode: cperl
+# cperl-indent-level: 4
+# fill-column: 100
+# End:
+# vim: expandtab shiftwidth=4:
Modified: trunk/t/dynoplibs/myops.t
==============================================================================
--- trunk/t/dynoplibs/myops.t (original)
+++ trunk/t/dynoplibs/myops.t Tue Nov 7 06:44:10 2006
@@ -213,3 +213,11 @@
65535
OUTPUT
+
+# Local Variables:
+# mode: cperl
+# cperl-indent-level: 4
+# fill-column: 100
+# End:
+# vim: expandtab shiftwidth=4:
+
Modified: trunk/t/op/cc_params.t
==============================================================================
--- trunk/t/op/cc_params.t (original)
+++ trunk/t/op/cc_params.t Tue Nov 7 06:44:10 2006
@@ -15,7 +15,7 @@
=head1 SYNOPSIS
- % prove t/op/cc_params.t
+ % prove t/op/cc_params.t
=head1 DESCRIPTION
@@ -54,39 +54,39 @@
## expected in
for my $c_args (0..1)
{
- ## expected out
- for my $c_results (0..1)
- {
- ## got in
- for my $c_params (0..( $c_args ? 2 : 1 ))
- {
- ## got out
- for my $c_returns (0..( $c_results ? 2 : 1 ))
- {
- my $td = TemplateData->new;
-
- ## initialize template keys
- for( $t_testbody =~ m/@(\w+)@/g )
- { $td->addkey($_) }
-
- for( $t_expbody =~ m/@(\w+)@/g )
- { $td->addkey($_) }
-
- ## initialize template data
- $td->initialize( $c_args, $c_params,
$c_returns, $c_results );
-
- ## generate tests and results
- my $testbody = $td->generate( $t_testbody );
- my $expbody = $td->generate( $t_expbody );
- my $testhead = create_test_header(
- $c_args, $c_results, $c_params,
$c_returns,
- );
-
- ## execute tests
- pir_output_like( $testbody, "/$expbody/",
$testhead );
- }
- }
- }
+ ## expected out
+ for my $c_results (0..1)
+ {
+ ## got in
+ for my $c_params (0..( $c_args ? 2 : 1 ))
+ {
+ ## got out
+ for my $c_returns (0..( $c_results ? 2 : 1 ))
+ {
+ my $td = TemplateData->new;
+
+ ## initialize template keys
+ for( $t_testbody =~ m/@(\w+)@/g )
+ { $td->addkey($_) }
+
+ for( $t_expbody =~ m/@(\w+)@/g )
+ { $td->addkey($_) }
+
+ ## initialize template data
+ $td->initialize( $c_args, $c_params, $c_returns, $c_results );
+
+ ## generate tests and results
+ my $testbody = $td->generate( $t_testbody );
+ my $expbody = $td->generate( $t_expbody );
+ my $testhead = create_test_header(
+ $c_args, $c_results, $c_params, $c_returns,
+ );
+
+ ## execute tests
+ pir_output_like( $testbody, "/$expbody/", $testhead );
+ }
+ }
+ }
}
@@ -97,8 +97,8 @@
sub create_test_header
{
- return 'param mismatch: args:' . shift() . ' results:' . shift()
- . ' params:' . shift() . ' returns:' . shift();
+ return 'param mismatch: args:' . shift() . ' results:' . shift()
+ . ' params:' . shift() . ' returns:' . shift();
}
@@ -114,132 +114,133 @@
sub create_args
{
- my $self = shift;
- my $num = shift;
+ my $self = shift;
+ my $num = shift;
- $self->{C_ARGS} = $num;
+ $self->{C_ARGS} = $num;
- if( $self->{C_ARGS} )
- {
- $self->{_ARGS} = [ map { 'arg' . $_ } 1..$num ];
- $self->{LIST_ARGS} = join ', ' => @{ $self->{_ARGS} };
- $self->{INIT_ARGS} =
- ' .local int ' . $self->{LIST_ARGS} . $/;
- $self->{INIT_ARGS} .= " ${ $self->{_ARGS} }[$_] = $_$/"
- for 0..$#{ $self->{_ARGS} };
- }
+ if( $self->{C_ARGS} )
+ {
+ $self->{_ARGS} = [ map { 'arg' . $_ } 1..$num ];
+ $self->{LIST_ARGS} = join ', ' => @{ $self->{_ARGS} };
+ $self->{INIT_ARGS} =
+ ' .local int ' . $self->{LIST_ARGS} . $/;
+ $self->{INIT_ARGS} .= " ${ $self->{_ARGS} }[$_] = $_$/"
+ for 0..$#{ $self->{_ARGS} };
+ }
}
sub create_params
{
- my $self = shift;
- my $num = shift;
+ my $self = shift;
+ my $num = shift;
- $self->{C_PARAMS} = $num;
+ $self->{C_PARAMS} = $num;
- if( $self->{C_PARAMS} )
- {
- $self->{_PARAMS} = [ map { 'param' . $_ } 1..$num ];
- $self->{LIST_PARAMS} = join ', ' => @{ $self->{_PARAMS} };
- $self->{INIT_PARAMS} = join( "\n" =>
- map { ' .param int ' . ${ $self->{_PARAMS} }[$_] }
- 0..$#{ $self->{_PARAMS} }
- );
- }
- else
- {
- $self->{INIT_PARAMS} = q{ get_params '()'};
- }
+ if( $self->{C_PARAMS} )
+ {
+ $self->{_PARAMS} = [ map { 'param' . $_ } 1..$num ];
+ $self->{LIST_PARAMS} = join ', ' => @{ $self->{_PARAMS} };
+ $self->{INIT_PARAMS} = join( "\n" =>
+ map { ' .param int ' . ${ $self->{_PARAMS} }[$_] }
+ 0..$#{ $self->{_PARAMS} }
+ );
+ }
+ else
+ {
+ $self->{INIT_PARAMS} = q{ get_params '()'};
+ }
}
sub create_returns
{
- my $self = shift;
- my $num = shift;
+ my $self = shift;
+ my $num = shift;
- $self->{C_RETURNS} = $num;
+ $self->{C_RETURNS} = $num;
- if( $self->{C_RETURNS} )
- {
- $self->{_RETURNS} = [ map { 'return' . $_ } 1..$num ];
- $self->{LIST_RETURNS} = join ', ' => @{ $self->{_RETURNS} };
- $self->{INIT_RETURNS} =
- ' .local int ' . $self->{LIST_RETURNS} . $/;
- $self->{INIT_RETURNS} .= " ${ $self->{_RETURNS} }[$_] = $_$/"
- for 0..$#{ $self->{_RETURNS} };
- }
+ if( $self->{C_RETURNS} )
+ {
+ $self->{_RETURNS} = [ map { 'return' . $_ } 1..$num ];
+ $self->{LIST_RETURNS} = join ', ' => @{ $self->{_RETURNS} };
+ $self->{INIT_RETURNS} =
+ ' .local int ' . $self->{LIST_RETURNS} . $/;
+ $self->{INIT_RETURNS} .= " ${ $self->{_RETURNS} }[$_] = $_$/"
+ for 0..$#{ $self->{_RETURNS} };
+ }
}
sub create_results
{
- my $self = shift;
- my $num = shift;
+ my $self = shift;
+ my $num = shift;
- $self->{C_RESULTS} = $num;
+ $self->{C_RESULTS} = $num;
- if( $self->{C_RESULTS} )
- {
- $self->{_RESULTS} = [ map { 'result' . $_ } 1..$num ];
- $self->{LIST_RESULTS} = join ', ' => @{ $self->{_RESULTS} };
- $self->{INIT_RESULTS} =
- join "\n" => (map { ' .local int ' . $_ } @{
$self->{_RESULTS} });
- }
+ if( $self->{C_RESULTS} )
+ {
+ $self->{_RESULTS} = [ map { 'result' . $_ } 1..$num ];
+ $self->{LIST_RESULTS} = join ', ' => @{ $self->{_RESULTS} };
+ $self->{INIT_RESULTS} =
+ join "\n" => (map { ' .local int ' . $_ } @{ $self->{_RESULTS}
});
+ }
}
sub create_func {
- my $self = shift;
- my( $c_args, $c_params, $c_returns, $c_results ) = @_;
+ my $self = shift;
+ my( $c_args, $c_params, $c_returns, $c_results ) = @_;
- $self->{FUNC} =
- 'args' . $c_args . '_results' . $c_results
- . '__params' . $c_params . '_returns' . $c_returns;
+ $self->{FUNC} =
+ 'args' . $c_args . '_results' . $c_results
+ . '__params' . $c_params . '_returns' . $c_returns;
}
sub create_check_results
{
- my $self = shift;
- my( $c_args, $c_params, $c_returns, $c_results ) = @_;
+ my $self = shift;
+ my( $c_args, $c_params, $c_returns, $c_results ) = @_;
- $self->{CHECK_RESULTS} =
- (( $c_args == $c_params) and ($c_results == $c_returns ))
- ? 'ok'
- : 'too (many|few) arguments passed .*';
+ $self->{CHECK_RESULTS} =
+ (( $c_args == $c_params) and ($c_results == $c_returns ))
+ ? 'ok'
+ : 'too (many|few) arguments passed .*';
}
sub initialize
{
- my $self = shift;
- my( $c_args, $c_params, $c_returns, $c_results ) = @_;
+ my $self = shift;
+ my( $c_args, $c_params, $c_returns, $c_results ) = @_;
- $self->create_args( $c_args );
- $self->create_params( $c_params );
- $self->create_returns( $c_returns );
- $self->create_results( $c_results );
-
- $self->create_func( $c_args, $c_params, $c_returns, $c_results );
+ $self->create_args( $c_args );
+ $self->create_params( $c_params );
+ $self->create_returns( $c_returns );
+ $self->create_results( $c_results );
- $self->create_check_results( $c_args, $c_params, $c_returns, $c_results
);
+ $self->create_func( $c_args, $c_params, $c_returns, $c_results );
+
+ $self->create_check_results( $c_args, $c_params, $c_returns, $c_results );
}
sub generate
{
- my $self = shift;
- my( $template ) = @_;
+ my $self = shift;
+ my( $template ) = @_;
- for( $template =~ m/@(\w+)@/g )
- {
- my $replacement =
- ( exists $self->{$_} and defined $self->{$_} ) ?
$self->{$_} : '';
-
- $template =~ s/@(\w+)@/$replacement/;
- }
- return $template;
+ for( $template =~ m/@(\w+)@/g )
+ {
+ my $replacement =
+ ( exists $self->{$_} and defined $self->{$_} ) ? $self->{$_} : '';
+
+ $template =~ s/@(\w+)@/$replacement/;
+ }
+ return $template;
}
+
Modified: trunk/t/perl/Parrot_Distribution.t
==============================================================================
--- trunk/t/perl/Parrot_Distribution.t (original)
+++ trunk/t/perl/Parrot_Distribution.t Tue Nov 7 06:44:10 2006
@@ -14,7 +14,7 @@
=head1 SYNOPSIS
- % prove t/perl/Parrot_Distribution.t
+ % prove t/perl/Parrot_Distribution.t
=head1 DESCRIPTION
@@ -47,3 +47,10 @@
ok($d->file_for_perl_module('Parrot::Docs::Section::Parrot'), 'Perl module
file');
ok( ! $d->file_for_perl_module('Parrot::Dummy'), 'Perl module file not there');
+
+# Local Variables:
+# mode: cperl
+# cperl-indent-level: 4
+# fill-column: 100
+# End:
+# vim: expandtab shiftwidth=4:
Modified: trunk/t/perl/Parrot_Docs.t
==============================================================================
--- trunk/t/perl/Parrot_Docs.t (original)
+++ trunk/t/perl/Parrot_Docs.t Tue Nov 7 06:44:10 2006
@@ -15,7 +15,7 @@
=head1 SYNOPSIS
- % prove t/perl/Parrot_Docs.t
+ % prove t/perl/Parrot_Docs.t
=head1 DESCRIPTION
@@ -155,3 +155,10 @@
return $file;
}
+
+# Local Variables:
+# mode: cperl
+# cperl-indent-level: 4
+# fill-column: 100
+# End:
+# vim: expandtab shiftwidth=4:
Modified: trunk/t/perl/Parrot_IO.t
==============================================================================
--- trunk/t/perl/Parrot_IO.t (original)
+++ trunk/t/perl/Parrot_IO.t Tue Nov 7 06:44:10 2006
@@ -15,7 +15,7 @@
=head1 SYNOPSIS
- % prove t/perl/Parrot_IO.t
+ % prove t/perl/Parrot_IO.t
=head1 DESCRIPTION
@@ -101,20 +101,20 @@
is($d1->relative_path($f1->path), 'file1.txt', 'relative_path same file');
is($d->relative_path($d1->path), 'one', 'relative_path down to dir');
is($d->relative_path($f1->path), catfile(qw(one file1.txt)),
- 'relative_path down to file');
+ 'relative_path down to file');
is($d1->relative_path($d->path), '..', 'relative_path up to dir');
is($d->relative_path($f->path), catfile(qw(.. file.txt)),
- 'relative_path up to file');
+ 'relative_path up to file');
is($d1->relative_path($f->path), catfile(qw(.. .. file.txt)),
- 'relative_path up twice to file');
+ 'relative_path up twice to file');
ok($d->relative_path_is_directory(catdir(qw(one two))),
- 'relative_path_is_directory');
+ 'relative_path_is_directory');
ok($d->relative_path_is_file(catfile(qw(one two file2.foo))),
- 'relative_path_is_file');
+ 'relative_path_is_file');
is($d2, $d->directory_with_relative_path(catdir(qw(one/two))),
- 'file_with_relative_path');
+ 'file_with_relative_path');
is($f2, $d->file_with_relative_path(catfile(qw(one two file2.foo))),
- 'file_with_relative_path');
+ 'file_with_relative_path');
# Names and paths.
my @a = $d1->file_and_directory_names;
@@ -132,7 +132,7 @@
is('file2.foo file3.bar', join(' ', map {$_->name} @a), 'files');
@a = $d->files(1);
is('file1.txt file2.foo file3.bar', join(' ', map {$_->name} @a),
- 'files recursive');
+ 'files recursive');
@a = $d->files(1, 'two');
is('file1.txt', join(' ', map {$_->name} @a), 'files recursive ignore');
@@ -147,7 +147,7 @@
@a = $d->files_with_suffix('txt', 1, 'two');
is('file1.txt', join(' ', map {$_->name} @a),
- 'files_with_suffix recursive ignore');
+ 'files_with_suffix recursive ignore');
# Status (stat info)
my $time = time;
@@ -167,7 +167,7 @@
ok($f3->modified_since($time), 'modified_since');
$f = Parrot::IO::File->new(
- catfile('lib', 'Parrot', 'IO', 'File.pm'));
+ catfile('lib', 'Parrot', 'IO', 'File.pm'));
ok($f->has_svn_id(), 'has_svn_id');
# XXX doesn not work aftern switch to svn
@@ -209,16 +209,23 @@
sub tmp_file_path
{
my $file;
-
+
if ( @_ == 1 )
{
- $file = catfile(tmp_dir_path(), shift);
+ $file = catfile(tmp_dir_path(), shift);
}
else
{
- $file = pop(@_);
- $file = catfile(tmp_dir_path(@_), $file);
+ $file = pop(@_);
+ $file = catfile(tmp_dir_path(@_), $file);
}
return $file;
}
+
+# Local Variables:
+# mode: cperl
+# cperl-indent-level: 4
+# fill-column: 100
+# End:
+# vim: expandtab shiftwidth=4:
Modified: trunk/t/perl/Parrot_PIR_Formatter.t
==============================================================================
--- trunk/t/perl/Parrot_PIR_Formatter.t (original)
+++ trunk/t/perl/Parrot_PIR_Formatter.t Tue Nov 7 06:44:10 2006
@@ -252,9 +252,17 @@
=head1 SYNOPSIS
- % prove t/perl/Parrot_PIR_Formatter.t
+ % prove t/perl/Parrot_PIR_Formatter.t
=head1 DESCRIPTION
=cut
+
+# Local Variables:
+# mode: cperl
+# cperl-indent-level: 4
+# fill-column: 100
+# End:
+# vim: expandtab shiftwidth=4:
+
Modified: trunk/t/perl/Parrot_Test.t
==============================================================================
--- trunk/t/perl/Parrot_Test.t (original)
+++ trunk/t/perl/Parrot_Test.t Tue Nov 7 06:44:10 2006
@@ -277,3 +277,10 @@
## vim: expandtab sw=4
## remember to change the number of tests :-)
BEGIN { plan tests => 42; }
+
+# Local Variables:
+# mode: cperl
+# cperl-indent-level: 4
+# fill-column: 100
+# End:
+# vim: expandtab shiftwidth=4:
Modified: trunk/tools/build/pmc2c.pl
==============================================================================
--- trunk/tools/build/pmc2c.pl (original)
+++ trunk/tools/build/pmc2c.pl Tue Nov 7 06:44:10 2006
@@ -629,7 +629,7 @@
if (exists ($self->{has_parent}{$pname}{$meth} )) {
$self->{super}{$meth} = $pname;
my $n = $self->{has_parent}{$pname}{$meth};
- $self->{super_attrs}{$meth} =
+ $self->{super_attrs}{$meth} =
$all->{$pname}{methods}[$n]{attrs};
if (exists $self->{has_method}{$meth}) {
inherit_attrs(
