[svn:parrot] r18033 - in trunk: . config/gen src/pmc t t/distro

[jkeenan]

Author: jkeenan
Date: Sat Apr  7 19:07:07 2007
New Revision: 18033

Modified:
   trunk/Configure.pl
   trunk/config/gen/platform.pm
   trunk/src/pmc/role.pmc
   trunk/t/distro/test_file_coverage.t
   trunk/t/harness

Log:
1.  Committing patch presented by Shawn M Moore in
http://rt.perl.org/rt3//Ticket/Display.html?id=42333.  Eliminate 'use English'
from 4 files, reverting to standard Perl 'punctuation variables.
2.  Fix one POD error (=over 4 unmatched by =back) in src/pmc/role.pmc.


Modified: trunk/Configure.pl
==============================================================================
--- trunk/Configure.pl  (original)
+++ trunk/Configure.pl  Sat Apr  7 19:07:07 2007
@@ -259,7 +259,6 @@
 use warnings;
 use lib 'lib';
 
-use English qw( -no_match_vars );
 use Parrot::BuildUtil;
 use Parrot::Configure;
 use Parrot::Configure::Options qw( process_options );
@@ -272,7 +271,7 @@
 our $parrot_version = Parrot::BuildUtil::parrot_version();
 our @parrot_version = Parrot::BuildUtil::parrot_version();
 
-$OUTPUT_AUTOFLUSH = 1;
+$| = 1;
 
 # Install Option text was taken from:
 #

Modified: trunk/config/gen/platform.pm
==============================================================================
--- trunk/config/gen/platform.pm        (original)
+++ trunk/config/gen/platform.pm        Sat Apr  7 19:07:07 2007
@@ -19,7 +19,6 @@
 use base qw(Parrot::Configure::Step::Base);
 
 use Config;
-use English qw( -no_match_vars );
 
 use Parrot::Configure::Step qw(copy_if_diff);
 
@@ -30,7 +29,7 @@
     my ( $self, $conf ) = @_;
 
     my $verbose  = $conf->options->get('verbose');
-    my $platform = lc $OSNAME;
+    my $platform = lc $^O;
 
     $platform = "ansi"  if defined( $conf->options->get('miniparrot') );
     $platform = "win32" if $platform =~ /^msys/;

Modified: trunk/src/pmc/role.pmc
==============================================================================
--- trunk/src/pmc/role.pmc      (original)
+++ trunk/src/pmc/role.pmc      Sat Apr  7 19:07:07 2007
@@ -206,6 +206,8 @@
 =item roles - Array of Role PMCs. Includes roles done by the roles that were
 composed into this role.
 
+=back
+
 =cut
 
 */

Modified: trunk/t/distro/test_file_coverage.t
==============================================================================
--- trunk/t/distro/test_file_coverage.t (original)
+++ trunk/t/distro/test_file_coverage.t Sat Apr  7 19:07:07 2007
@@ -7,7 +7,6 @@
 use lib qw( . lib ../lib ../../lib );
 
 use Test::More;
-use English qw( -no_match_vars );
 use File::Find qw( find );
 use File::Basename qw( fileparse );
 use File::Spec::Functions qw( catdir catfile );
@@ -52,7 +51,7 @@
 
     my ( $pmc_miss, $test_miss ) = list_diff( [EMAIL PROTECTED], [EMAIL 
PROTECTED] );
 
-    local $LIST_SEPARATOR = "\n\t";
+    local $" = "\n\t";
 
 TODO: {
         local $TODO = "not yet implemented";

Modified: trunk/t/harness
==============================================================================
--- trunk/t/harness     (original)
+++ trunk/t/harness     Sat Apr  7 19:07:07 2007
@@ -91,7 +91,6 @@
 
 use Getopt::Std;
 use Test::Harness();
-use English qw( -no_match_vars );
 use Parrot::Config qw/%PConfig/;
 
 
@@ -204,8 +203,8 @@
         require Test::TAP::HTMLMatrix;
         require Test::TAP::Model::Visual;
     };
-    die "You must have Test::TAP::HTMLMatrix installed.\n\n$EVAL_ERROR"
-        if $EVAL_ERROR;
+    die "You must have Test::TAP::HTMLMatrix installed.\n\n$@"
+        if $@;
 
     ## FIXME: ###
     # This is a temporary solution until Test::TAP::Model version