|
|
Author: jkeenan
Date: Sat Aug 23 07:15:08 2008
New Revision: 30478
Added:
trunk/lib/Parrot/Ops2pm.pm
- copied unchanged from r30476, /branches/opsrenum/lib/Parrot/Ops2pm.pm
trunk/lib/Parrot/Ops2pm/Base.pm
- copied unchanged from r30476,
/branches/opsrenum/lib/Parrot/Ops2pm/Base.pm
trunk/lib/Parrot/OpsRenumber.pm
- copied unchanged from r30476,
/branches/opsrenum/lib/Parrot/OpsRenumber.pm
trunk/t/tools/ops2pm/
- copied from r30476, /branches/opsrenum/t/tools/ops2pm/
trunk/t/tools/ops2pm/00-qualify.t
- copied unchanged from r30476,
/branches/opsrenum/t/tools/ops2pm/00-qualify.t
trunk/t/tools/ops2pm/01-ops2pm.t
- copied unchanged from r30476,
/branches/opsrenum/t/tools/ops2pm/01-ops2pm.t
trunk/t/tools/ops2pm/02-usage.t
- copied unchanged from r30476,
/branches/opsrenum/t/tools/ops2pm/02-usage.t
trunk/t/tools/ops2pm/03-new.t
- copied unchanged from r30476, /branches/opsrenum/t/tools/ops2pm/03-new.t
trunk/t/tools/ops2pm/04-prepare_ops.t
- copied unchanged from r30476,
/branches/opsrenum/t/tools/ops2pm/04-prepare_ops.t
trunk/t/tools/ops2pm/05-renum_op_map_file.t
- copied unchanged from r30476,
/branches/opsrenum/t/tools/ops2pm/05-renum_op_map_file.t
trunk/t/tools/ops2pm/06-load_op_map_files.t
- copied unchanged from r30476,
/branches/opsrenum/t/tools/ops2pm/06-load_op_map_files.t
trunk/t/tools/ops2pm/07-no_ops_skip.t
- copied unchanged from r30476,
/branches/opsrenum/t/tools/ops2pm/07-no_ops_skip.t
trunk/t/tools/ops2pm/08-sort_ops.t
- copied unchanged from r30476,
/branches/opsrenum/t/tools/ops2pm/08-sort_ops.t
trunk/t/tools/ops2pm/09-prepare_real_ops.t
- copied unchanged from r30476,
/branches/opsrenum/t/tools/ops2pm/09-prepare_real_ops.t
trunk/t/tools/ops2pm/10-print_module.t
- copied unchanged from r30476,
/branches/opsrenum/t/tools/ops2pm/10-print_module.t
trunk/t/tools/ops2pm/11-print_h.t
- copied unchanged from r30476,
/branches/opsrenum/t/tools/ops2pm/11-print_h.t
trunk/t/tools/ops2pm/samples/
- copied from r30476, /branches/opsrenum/t/tools/ops2pm/samples/
trunk/t/tools/ops2pm/samples/bit_ops.orig
- copied unchanged from r30476,
/branches/opsrenum/t/tools/ops2pm/samples/bit_ops.orig
trunk/t/tools/ops2pm/samples/bit_ops.second
- copied unchanged from r30476,
/branches/opsrenum/t/tools/ops2pm/samples/bit_ops.second
trunk/t/tools/ops2pm/samples/core_ops.orig
- copied unchanged from r30476,
/branches/opsrenum/t/tools/ops2pm/samples/core_ops.orig
trunk/t/tools/ops2pm/samples/ops_num.orig
- copied unchanged from r30476,
/branches/opsrenum/t/tools/ops2pm/samples/ops_num.orig
trunk/t/tools/ops2pm/samples/pic_ops.orig
- copied unchanged from r30476,
/branches/opsrenum/t/tools/ops2pm/samples/pic_ops.orig
trunk/tools/dev/opsrenumber.pl
- copied unchanged from r30476,
/branches/opsrenum/tools/dev/opsrenumber.pl
Removed:
trunk/lib/Parrot/Ops2pm/Utils.pm
trunk/t/tools/ops2pmutils/
trunk/tools/dev/ops_renum.mak
Modified:
trunk/MANIFEST
trunk/MANIFEST.SKIP
trunk/config/gen/makefiles/root.in
trunk/lib/Parrot/Ops2pm/Auxiliary.pm
trunk/t/tools/ops2cutils/01-new.t
trunk/t/tools/ops2cutils/03-print_c_header_file.t
trunk/t/tools/ops2cutils/04-print_c_source_top.t
trunk/t/tools/ops2cutils/05-print_c_source_bottom.t
trunk/t/tools/ops2cutils/06-dynamic.t
trunk/t/tools/ops2cutils/07-make_incdir.t
trunk/t/tools/ops2cutils/08-nolines.t
trunk/t/tools/ops2cutils/09-dynamic_nolines.t
trunk/t/tools/ops2cutils/10-print_c_source_file.t
trunk/t/tools/ops2cutils/testlib/GenerateCore.pm
trunk/tools/build/ops2pm.pl
Log:
Applying patch submitted in
http://rt.perl.org/rt3/Ticket/Display.html?id=53976; merge opsrenum branch
into trunk. tools/dev/ops_renum.mak replaced by tools/dev/opsrenumber.pl,
which now handles both pre- and post-Parrot 1.0 cases. That script's guts
transferred from lib/Parrot/Ops2pm/Utils.pm to lib/Parrot/OpsRenumber.pm.
lib/Parrot/Ops2pm/Utils.pm renamed to lib/Parrot/Ops2pm.pm; methods shared
with OpsRenumber.pm moved to lib/Parrot/Ops2pm/Base.pm. Names of associated
test files changed. Introduce 'make' target opsrenumber, which is just
wrapper around opsrenumber.pl.
Modified: trunk/MANIFEST
==============================================================================
--- trunk/MANIFEST (original)
+++ trunk/MANIFEST Sat Aug 23 07:15:08 2008
@@ -1,7 +1,7 @@
# ex: set ro:
# $Id$
#
-# generated by tools/dev/mk_manifest_and_skip.pl Wed Aug 20 04:58:13 2008 UT
+# generated by tools/dev/mk_manifest_and_skip.pl Sat Aug 23 13:31:08 2008 UT
#
# See tools/dev/install_files.pl for documentation on the
# format of this file.
@@ -83,6 +83,24 @@
compilers/json/JSON/pge2pir.tg []
compilers/json/postalcodes.pir []
compilers/json/test.pir []
+compilers/ncigen/MAINTAINER []
+compilers/ncigen/NCIGEN.TODO []
+compilers/ncigen/c99.pir []
+compilers/ncigen/config/makefiles/ncigen.in []
+compilers/ncigen/lib/Parrot/Test/C99AST.pm []
+compilers/ncigen/nci_gen.pl []
+compilers/ncigen/src/NCIPIR.pir []
+compilers/ncigen/src/builtins/say.pir []
+compilers/ncigen/src/c99.pg []
+compilers/ncigen/src/c99AST.pir []
+compilers/ncigen/src/parser/actions.pm []
+compilers/ncigen/src/parser/grammar.pg []
+compilers/ncigen/t/c99AST/struct_00.t []
+compilers/ncigen/t/c99AST/typedef_00.t []
+compilers/ncigen/t/harness []
+compilers/ncigen/t/parse_00.t []
+compilers/ncigen/t/parse_01.t []
+compilers/ncigen/t/spi.c []
compilers/nqp/README.pod []
compilers/nqp/TODO.pod []
compilers/nqp/bootstrap/actions.pm []
@@ -2239,6 +2257,7 @@
languages/pipp/t/php/type.t [pipp]
languages/pipp/t/php/var.t [pipp]
languages/pipp/t/php/variables.t [pipp]
+languages/pipp/t/pmc/array.t [pipp]
languages/pipp/t/pmc/boolean.t [pipp]
languages/punie/MAINTAINER [punie]
languages/punie/README [punie]
@@ -2753,9 +2772,11 @@
lib/Parrot/OpTrans/Compiled.pm [devel]
lib/Parrot/Ops2c/Auxiliary.pm [devel]
lib/Parrot/Ops2c/Utils.pm [devel]
+lib/Parrot/Ops2pm.pm [devel]
lib/Parrot/Ops2pm/Auxiliary.pm [devel]
-lib/Parrot/Ops2pm/Utils.pm [devel]
+lib/Parrot/Ops2pm/Base.pm [devel]
lib/Parrot/OpsFile.pm [devel]
+lib/Parrot/OpsRenumber.pm [devel]
lib/Parrot/Pmc2c/Attribute.pm [devel]
lib/Parrot/Pmc2c/ComposedMethod.pm [devel]
lib/Parrot/Pmc2c/Dumper.pm [devel]
@@ -3690,18 +3711,23 @@
t/tools/ops2cutils/09-dynamic_nolines.t []
t/tools/ops2cutils/10-print_c_source_file.t []
t/tools/ops2cutils/testlib/GenerateCore.pm []
-t/tools/ops2pmutils/00-qualify.t []
-t/tools/ops2pmutils/01-ops2pmutils.t []
-t/tools/ops2pmutils/02-usage.t []
-t/tools/ops2pmutils/03-new.t []
-t/tools/ops2pmutils/04-prepare_ops.t []
-t/tools/ops2pmutils/05-renum_op_map_file.t []
-t/tools/ops2pmutils/06-load_op_map_files.t []
-t/tools/ops2pmutils/07-no_ops_skip.t []
-t/tools/ops2pmutils/08-sort_ops.t []
-t/tools/ops2pmutils/09-prepare_real_ops.t []
-t/tools/ops2pmutils/10-print_module.t []
-t/tools/ops2pmutils/11-print_h.t []
+t/tools/ops2pm/00-qualify.t []
+t/tools/ops2pm/01-ops2pm.t []
+t/tools/ops2pm/02-usage.t []
+t/tools/ops2pm/03-new.t []
+t/tools/ops2pm/04-prepare_ops.t []
+t/tools/ops2pm/05-renum_op_map_file.t []
+t/tools/ops2pm/06-load_op_map_files.t []
+t/tools/ops2pm/07-no_ops_skip.t []
+t/tools/ops2pm/08-sort_ops.t []
+t/tools/ops2pm/09-prepare_real_ops.t []
+t/tools/ops2pm/10-print_module.t []
+t/tools/ops2pm/11-print_h.t []
+t/tools/ops2pm/samples/bit_ops.orig []
+t/tools/ops2pm/samples/bit_ops.second []
+t/tools/ops2pm/samples/core_ops.orig []
+t/tools/ops2pm/samples/ops_num.orig []
+t/tools/ops2pm/samples/pic_ops.orig []
t/tools/parrot_debugger.t []
t/tools/pbc_merge.t []
t/tools/pmc2c.t []
@@ -3748,7 +3774,7 @@
tools/dev/nm.pl [devel]
tools/dev/nopaste.pl [devel]
tools/dev/ops_not_tested.pl [devel]
-tools/dev/ops_renum.mak [devel]
+tools/dev/opsrenumber.pl [devel]
tools/dev/parrot.supp [devel]
tools/dev/parrot_8.supp [devel]
tools/dev/parrot_api.pl [devel]
Modified: trunk/MANIFEST.SKIP
==============================================================================
--- trunk/MANIFEST.SKIP (original)
+++ trunk/MANIFEST.SKIP Sat Aug 23 07:15:08 2008
@@ -1,6 +1,6 @@
# ex: set ro:
# $Id$
-# generated by tools/dev/mk_manifest_and_skip.pl Wed Aug 20 01:57:37 2008 UT
+# generated by tools/dev/mk_manifest_and_skip.pl Sat Aug 23 13:31:08 2008 UT
#
# This file should contain a transcript of the svn:ignore properties
# of the directories in the Parrot subversion repository. (Needed for
@@ -192,6 +192,9 @@
^compilers/json/JSON/.*\.pbc/
^compilers/json/JSON/.*\.pir$
^compilers/json/JSON/.*\.pir/
+# generated from svn:ignore of 'compilers/ncigen/'
+^compilers/ncigen/Makefile$
+^compilers/ncigen/Makefile/
# generated from svn:ignore of 'compilers/nqp/'
^compilers/nqp/Makefile$
^compilers/nqp/Makefile/
Modified: trunk/config/gen/makefiles/root.in
==============================================================================
--- trunk/config/gen/makefiles/root.in (original)
+++ trunk/config/gen/makefiles/root.in Sat Aug 23 07:15:08 2008
@@ -1775,6 +1775,9 @@
manitest :
$(PERL) tools/dev/manicheck.pl
+opsrenumber :
+ $(PERL) tools/dev/opsrenumber.pl $(OPS_FILES)
+
###############################################################################
#
# SVN Targets:
Modified: trunk/lib/Parrot/Ops2pm/Auxiliary.pm
==============================================================================
--- trunk/lib/Parrot/Ops2pm/Auxiliary.pm (original)
+++ trunk/lib/Parrot/Ops2pm/Auxiliary.pm Sat Aug 23 07:15:08 2008
@@ -48,7 +48,7 @@
Parrot::Ops2pm::Auxiliary provides subroutines called by
F<tools/build/ops2pm.pl>, a
program which is called at the very beginning of the Parrot F<make> process.
This package is intended to hold subroutines used by that program I<other
-than> the object-oriented methods provided by Parrot::Ops2pm::Utils.
+than> the object-oriented methods provided by Parrot::Ops2pm.
Extraction of the subroutines exported by this package from
F<tools/build/ops2pm.pl> facilitates the testing of their functionality by the
@@ -109,7 +109,7 @@
=head1 SEE ALSO
-Parrot::Ops2pm::Utils. F<tools/build/ops2pm.pl>.
+Parrot::Ops2pm. F<tools/build/ops2pm.pl>.
=cut
Modified: trunk/t/tools/ops2cutils/01-new.t
==============================================================================
--- trunk/t/tools/ops2cutils/01-new.t (original)
+++ trunk/t/tools/ops2cutils/01-new.t Sat Aug 23 07:15:08 2008
@@ -24,7 +24,7 @@
use Cwd;
use File::Copy;
use File::Temp (qw| tempdir |);
-use_ok('Parrot::Ops2pm::Utils');
+use_ok('Parrot::Ops2pm');
use lib ("$main::topdir/t/tools/ops2cutils/testlib");
use GenerateCore qw|
generate_core
Modified: trunk/t/tools/ops2cutils/03-print_c_header_file.t
==============================================================================
--- trunk/t/tools/ops2cutils/03-print_c_header_file.t (original)
+++ trunk/t/tools/ops2cutils/03-print_c_header_file.t Sat Aug 23 07:15:08 2008
@@ -24,7 +24,7 @@
use Cwd;
use File::Copy;
use File::Temp (qw| tempdir |);
-use_ok('Parrot::Ops2pm::Utils');
+use_ok('Parrot::Ops2pm');
use lib ("$main::topdir/t/tools/ops2cutils/testlib");
use GenerateCore qw|
generate_core
Modified: trunk/t/tools/ops2cutils/04-print_c_source_top.t
==============================================================================
--- trunk/t/tools/ops2cutils/04-print_c_source_top.t (original)
+++ trunk/t/tools/ops2cutils/04-print_c_source_top.t Sat Aug 23 07:15:08 2008
@@ -24,7 +24,7 @@
use Cwd;
use File::Copy;
use File::Temp (qw| tempdir |);
-use_ok('Parrot::Ops2pm::Utils');
+use_ok('Parrot::Ops2pm');
use lib ("$main::topdir/t/tools/ops2cutils/testlib");
use GenerateCore qw|
generate_core
Modified: trunk/t/tools/ops2cutils/05-print_c_source_bottom.t
==============================================================================
--- trunk/t/tools/ops2cutils/05-print_c_source_bottom.t (original)
+++ trunk/t/tools/ops2cutils/05-print_c_source_bottom.t Sat Aug 23 07:15:08 2008
@@ -24,7 +24,7 @@
use Cwd;
use File::Copy;
use File::Temp (qw| tempdir |);
-use_ok('Parrot::Ops2pm::Utils');
+use_ok('Parrot::Ops2pm');
use lib ("$main::topdir/t/tools/ops2cutils/testlib");
use GenerateCore qw|
generate_core
Modified: trunk/t/tools/ops2cutils/06-dynamic.t
==============================================================================
--- trunk/t/tools/ops2cutils/06-dynamic.t (original)
+++ trunk/t/tools/ops2cutils/06-dynamic.t Sat Aug 23 07:15:08 2008
@@ -24,7 +24,7 @@
use Cwd;
use File::Copy;
use File::Temp (qw| tempdir |);
-use_ok('Parrot::Ops2pm::Utils');
+use_ok('Parrot::Ops2pm');
use lib ("$main::topdir/t/tools/ops2cutils/testlib");
use GenerateCore qw|
generate_core
Modified: trunk/t/tools/ops2cutils/07-make_incdir.t
==============================================================================
--- trunk/t/tools/ops2cutils/07-make_incdir.t (original)
+++ trunk/t/tools/ops2cutils/07-make_incdir.t Sat Aug 23 07:15:08 2008
@@ -24,7 +24,7 @@
use Cwd;
use File::Copy;
use File::Temp (qw| tempdir |);
-use_ok('Parrot::Ops2pm::Utils');
+use_ok('Parrot::Ops2pm');
use lib ( "$main::topdir/t/tools/ops2cutils/testlib", "./lib" );
use GenerateCore qw|
generate_core
@@ -57,7 +57,7 @@
mkdir qq{$tdir/include};
mkdir qq{$tdir/include/parrot};
- my $o2p = Parrot::Ops2pm::Utils->new(
+ my $o2p = Parrot::Ops2pm->new(
{
argv => [@opsfiles],
script => "tools/build/ops2pm.pl",
Modified: trunk/t/tools/ops2cutils/08-nolines.t
==============================================================================
--- trunk/t/tools/ops2cutils/08-nolines.t (original)
+++ trunk/t/tools/ops2cutils/08-nolines.t Sat Aug 23 07:15:08 2008
@@ -24,7 +24,7 @@
use Cwd;
use File::Copy;
use File::Temp (qw| tempdir |);
-use_ok('Parrot::Ops2pm::Utils');
+use_ok('Parrot::Ops2pm');
use lib ("$main::topdir/t/tools/ops2cutils/testlib");
use GenerateCore qw|
generate_core
Modified: trunk/t/tools/ops2cutils/09-dynamic_nolines.t
==============================================================================
--- trunk/t/tools/ops2cutils/09-dynamic_nolines.t (original)
+++ trunk/t/tools/ops2cutils/09-dynamic_nolines.t Sat Aug 23 07:15:08 2008
@@ -24,7 +24,7 @@
use Cwd;
use File::Copy;
use File::Temp (qw| tempdir |);
-use_ok('Parrot::Ops2pm::Utils');
+use_ok('Parrot::Ops2pm');
use lib ("$main::topdir/t/tools/ops2cutils/testlib");
use GenerateCore qw|
generate_core
Modified: trunk/t/tools/ops2cutils/10-print_c_source_file.t
==============================================================================
--- trunk/t/tools/ops2cutils/10-print_c_source_file.t (original)
+++ trunk/t/tools/ops2cutils/10-print_c_source_file.t Sat Aug 23 07:15:08 2008
@@ -24,7 +24,7 @@
use Cwd;
use File::Copy;
use File::Temp (qw| tempdir |);
-use_ok('Parrot::Ops2pm::Utils');
+use_ok('Parrot::Ops2pm');
use lib ("$main::topdir/t/tools/ops2cutils/testlib");
use GenerateCore qw|
generate_core
Modified: trunk/t/tools/ops2cutils/testlib/GenerateCore.pm
==============================================================================
--- trunk/t/tools/ops2cutils/testlib/GenerateCore.pm (original)
+++ trunk/t/tools/ops2cutils/testlib/GenerateCore.pm Sat Aug 23 07:15:08 2008
@@ -23,7 +23,7 @@
use Carp;
use File::Copy;
use lib ("./lib");
-use Parrot::Ops2pm::Utils;
+use Parrot::Ops2pm;
sub generate_core {
@@ -47,7 +47,7 @@
mkdir qq{$tdir/include/parrot};
mkdir qq{$tdir/include/parrot/oplib};
- my $o2p = Parrot::Ops2pm::Utils->new(
+ my $o2p = Parrot::Ops2pm->new(
{
argv => [@opsfiles],
script => "tools/build/ops2pm.pl",
Modified: trunk/tools/build/ops2pm.pl
==============================================================================
--- trunk/tools/build/ops2pm.pl (original)
+++ trunk/tools/build/ops2pm.pl Sat Aug 23 07:15:08 2008
@@ -6,7 +6,7 @@
use warnings;
use lib 'lib';
-use Parrot::Ops2pm::Utils;
+use Parrot::Ops2pm;
use Parrot::Ops2pm::Auxiliary qw( Usage getoptions );
my $flagref = getoptions();
@@ -16,7 +16,7 @@
exit;
}
-my $self = Parrot::Ops2pm::Utils->new(
+my $self = Parrot::Ops2pm->new(
{
argv => [@ARGV],
nolines => $flagref->{nolines},
@@ -30,12 +30,6 @@
);
$self->prepare_ops();
-
-if ( $flagref->{renum} ) {
- $self->renum_op_map_file();
- exit 0;
-}
-
$self->load_op_map_files();
$self->sort_ops();
$self->prepare_real_ops();
@@ -125,7 +119,7 @@
=item F<tools/build/ops2c.pl>.
-=item F<lib/Parrot/Ops2pm/Utils.pm>.
+=item F<lib/Parrot/Ops2pm.pm>.
=item F<lib/Parrot/Ops2pm/Auxiliary.pm>.
|
|