From: Brandon L Black Date: Wed, 3 Jan 2007 05:46:39 +0000 (+0000) Subject: newer c3.patch X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=935c88416caaf8fc03f82bae61ea05cf763ab7e4;p=gitmo%2FClass-C3.git newer c3.patch --- diff --git a/c3.patch b/c3.patch index c1248ee..45ba0f9 100644 --- a/c3.patch +++ b/c3.patch @@ -1,7 +1,7 @@ === Makefile.micro ================================================================== ---- Makefile.micro (/local/perl-current) (revision 12570) -+++ Makefile.micro (/local/perl-c3) (revision 12570) +--- Makefile.micro (/local/perl-current) (revision 12599) ++++ Makefile.micro (/local/perl-c3) (revision 12599) @@ -9,7 +9,7 @@ all: microperl @@ -23,8 +23,8 @@ === embed.h ================================================================== ---- embed.h (/local/perl-current) (revision 12570) -+++ embed.h (/local/perl-c3) (revision 12570) +--- embed.h (/local/perl-current) (revision 12599) ++++ embed.h (/local/perl-c3) (revision 12599) @@ -266,6 +266,10 @@ #define gv_efullname Perl_gv_efullname #define gv_efullname4 Perl_gv_efullname4 @@ -36,7 +36,7 @@ #define gv_fetchmeth Perl_gv_fetchmeth #define gv_fetchmeth_autoload Perl_gv_fetchmeth_autoload #define gv_fetchmethod_autoload Perl_gv_fetchmethod_autoload -@@ -2470,6 +2474,10 @@ +@@ -2474,6 +2478,10 @@ #define gv_efullname(a,b) Perl_gv_efullname(aTHX_ a,b) #define gv_efullname4(a,b,c,d) Perl_gv_efullname4(aTHX_ a,b,c,d) #define gv_fetchfile(a) Perl_gv_fetchfile(aTHX_ a) @@ -49,9 +49,9 @@ #define gv_fetchmethod_autoload(a,b,c) Perl_gv_fetchmethod_autoload(aTHX_ a,b,c) === embedvar.h ================================================================== ---- embedvar.h (/local/perl-current) (revision 12570) -+++ embedvar.h (/local/perl-c3) (revision 12570) -@@ -229,6 +229,7 @@ +--- embedvar.h (/local/perl-current) (revision 12599) ++++ embedvar.h (/local/perl-c3) (revision 12599) +@@ -227,6 +227,7 @@ #define PL_incgv (vTHX->Iincgv) #define PL_initav (vTHX->Iinitav) #define PL_inplace (vTHX->Iinplace) @@ -59,7 +59,7 @@ #define PL_known_layers (vTHX->Iknown_layers) #define PL_last_lop (vTHX->Ilast_lop) #define PL_last_lop_op (vTHX->Ilast_lop_op) -@@ -526,6 +527,7 @@ +@@ -493,6 +494,7 @@ #define PL_Iincgv PL_incgv #define PL_Iinitav PL_initav #define PL_Iinplace PL_inplace @@ -69,8 +69,8 @@ #define PL_Ilast_lop_op PL_last_lop_op === pod/perlapi.pod ================================================================== ---- pod/perlapi.pod (/local/perl-current) (revision 12570) -+++ pod/perlapi.pod (/local/perl-c3) (revision 12570) +--- pod/perlapi.pod (/local/perl-current) (revision 12599) ++++ pod/perlapi.pod (/local/perl-c3) (revision 12599) @@ -1280,7 +1280,7 @@ The argument C should be either 0 or -1. If C, as a side-effect creates a glob with the given C in the given C @@ -82,8 +82,8 @@ GV returned from C may be a method cache entry, which is not === global.sym ================================================================== ---- global.sym (/local/perl-current) (revision 12570) -+++ global.sym (/local/perl-c3) (revision 12570) +--- global.sym (/local/perl-current) (revision 12599) ++++ global.sym (/local/perl-c3) (revision 12599) @@ -133,6 +133,10 @@ Perl_gv_efullname3 Perl_gv_efullname4 @@ -97,8 +97,8 @@ Perl_gv_fetchmethod === universal.c ================================================================== ---- universal.c (/local/perl-current) (revision 12570) -+++ universal.c (/local/perl-c3) (revision 12570) +--- universal.c (/local/perl-current) (revision 12599) ++++ universal.c (/local/perl-c3) (revision 12599) @@ -36,12 +36,10 @@ int len, int level) { @@ -207,8 +207,8 @@ === gv.c ================================================================== ---- gv.c (/local/perl-current) (revision 12570) -+++ gv.c (/local/perl-c3) (revision 12570) +--- gv.c (/local/perl-current) (revision 12599) ++++ gv.c (/local/perl-c3) (revision 12599) @@ -298,7 +298,7 @@ The argument C should be either 0 or -1. If C, as a side-effect creates a glob with the given C in the given C @@ -456,9 +456,9 @@ return 0; === perlapi.h ================================================================== ---- perlapi.h (/local/perl-current) (revision 12570) -+++ perlapi.h (/local/perl-c3) (revision 12570) -@@ -336,6 +336,8 @@ +--- perlapi.h (/local/perl-current) (revision 12599) ++++ perlapi.h (/local/perl-c3) (revision 12599) +@@ -332,6 +332,8 @@ #define PL_initav (*Perl_Iinitav_ptr(aTHX)) #undef PL_inplace #define PL_inplace (*Perl_Iinplace_ptr(aTHX)) @@ -469,8 +469,8 @@ #undef PL_last_lop === win32/Makefile ================================================================== ---- win32/Makefile (/local/perl-current) (revision 12570) -+++ win32/Makefile (/local/perl-c3) (revision 12570) +--- win32/Makefile (/local/perl-current) (revision 12599) ++++ win32/Makefile (/local/perl-c3) (revision 12599) @@ -644,6 +644,7 @@ ..\dump.c \ ..\globals.c \ @@ -481,8 +481,8 @@ ..\mathoms.c \ === win32/makefile.mk ================================================================== ---- win32/makefile.mk (/local/perl-current) (revision 12570) -+++ win32/makefile.mk (/local/perl-c3) (revision 12570) +--- win32/makefile.mk (/local/perl-current) (revision 12599) ++++ win32/makefile.mk (/local/perl-c3) (revision 12599) @@ -813,6 +813,7 @@ ..\dump.c \ ..\globals.c \ @@ -493,8 +493,8 @@ ..\mathoms.c \ === win32/Makefile.ce ================================================================== ---- win32/Makefile.ce (/local/perl-current) (revision 12570) -+++ win32/Makefile.ce (/local/perl-c3) (revision 12570) +--- win32/Makefile.ce (/local/perl-current) (revision 12599) ++++ win32/Makefile.ce (/local/perl-c3) (revision 12599) @@ -571,6 +571,7 @@ ..\dump.c \ ..\globals.c \ @@ -513,8 +513,8 @@ $(DLLDIR)\mathoms.obj \ === NetWare/Makefile ================================================================== ---- NetWare/Makefile (/local/perl-current) (revision 12570) -+++ NetWare/Makefile (/local/perl-c3) (revision 12570) +--- NetWare/Makefile (/local/perl-current) (revision 12599) ++++ NetWare/Makefile (/local/perl-c3) (revision 12599) @@ -701,6 +701,7 @@ ..\dump.c \ ..\globals.c \ @@ -525,8 +525,8 @@ ..\mathoms.c \ === vms/descrip_mms.template ================================================================== ---- vms/descrip_mms.template (/local/perl-current) (revision 12570) -+++ vms/descrip_mms.template (/local/perl-c3) (revision 12570) +--- vms/descrip_mms.template (/local/perl-current) (revision 12599) ++++ vms/descrip_mms.template (/local/perl-c3) (revision 12599) @@ -279,13 +279,13 @@ #### End of system configuration section. #### @@ -554,8 +554,8 @@ locale$(O) : locale.c $(h) === Makefile.SH ================================================================== ---- Makefile.SH (/local/perl-current) (revision 12570) -+++ Makefile.SH (/local/perl-c3) (revision 12570) +--- Makefile.SH (/local/perl-current) (revision 12599) ++++ Makefile.SH (/local/perl-c3) (revision 12599) @@ -364,7 +364,7 @@ h5 = utf8.h warnings.h h = $(h1) $(h2) $(h3) $(h4) $(h5) @@ -576,8 +576,8 @@ === proto.h ================================================================== ---- proto.h (/local/perl-current) (revision 12570) -+++ proto.h (/local/perl-c3) (revision 12570) +--- proto.h (/local/perl-current) (revision 12599) ++++ proto.h (/local/perl-c3) (revision 12599) @@ -624,6 +624,18 @@ PERL_CALLCONV GV* Perl_gv_fetchfile(pTHX_ const char* name) __attribute__nonnull__(pTHX_1); @@ -599,14 +599,14 @@ === ext/B/t/concise-xs.t ================================================================== ---- ext/B/t/concise-xs.t (/local/perl-current) (revision 12570) -+++ ext/B/t/concise-xs.t (/local/perl-c3) (revision 12570) +--- ext/B/t/concise-xs.t (/local/perl-current) (revision 12599) ++++ ext/B/t/concise-xs.t (/local/perl-c3) (revision 12599) @@ -117,7 +117,7 @@ use Carp; use Test::More tests => ( # per-pkg tests (function ct + require_ok) 40 + 16 # Data::Dumper, Digest::MD5 -- + 517 + 236 # B::Deparse, B -+ + 517 + 237 # B::Deparse, B +- + 517 + 238 # B::Deparse, B ++ + 517 + 239 # B::Deparse, B + 595 + 190 # POSIX, IO::Socket + 3 * ($] > 5.009) + 16 * ($] >= 5.009003) @@ -621,8 +621,8 @@ === ext/B/B.xs ================================================================== ---- ext/B/B.xs (/local/perl-current) (revision 12570) -+++ ext/B/B.xs (/local/perl-c3) (revision 12570) +--- ext/B/B.xs (/local/perl-current) (revision 12599) ++++ ext/B/B.xs (/local/perl-c3) (revision 12599) @@ -604,6 +604,7 @@ #define B_main_start() PL_main_start #define B_amagic_generation() PL_amagic_generation @@ -643,8 +643,8 @@ === ext/B/B.pm ================================================================== ---- ext/B/B.pm (/local/perl-current) (revision 12570) -+++ ext/B/B.pm (/local/perl-c3) (revision 12570) +--- ext/B/B.pm (/local/perl-current) (revision 12599) ++++ ext/B/B.pm (/local/perl-c3) (revision 12599) @@ -23,6 +23,7 @@ parents comppadlist sv_undef compile_stats timing_info begin_av init_av unitcheck_av check_av end_av regex_padav @@ -655,8 +655,8 @@ sub OPf_KIDS (); === ext/mro/t/basic_01_dfs.t ================================================================== ---- ext/mro/t/basic_01_dfs.t (/local/perl-current) (revision 12570) -+++ ext/mro/t/basic_01_dfs.t (/local/perl-c3) (revision 12570) +--- ext/mro/t/basic_01_dfs.t (/local/perl-current) (revision 12599) ++++ ext/mro/t/basic_01_dfs.t (/local/perl-c3) (revision 12599) @@ -0,0 +1,54 @@ +#!./perl + @@ -714,8 +714,8 @@ +is(UNIVERSAL::can("Diamond_D", 'hello')->(), 'Diamond_A::hello', '... can(method) resolved itself as expected'); === ext/mro/t/vulcan_c3.t ================================================================== ---- ext/mro/t/vulcan_c3.t (/local/perl-current) (revision 12570) -+++ ext/mro/t/vulcan_c3.t (/local/perl-c3) (revision 12570) +--- ext/mro/t/vulcan_c3.t (/local/perl-current) (revision 12599) ++++ ext/mro/t/vulcan_c3.t (/local/perl-c3) (revision 12599) @@ -0,0 +1,73 @@ +#!./perl + @@ -792,8 +792,8 @@ + '... got the right MRO for the Vulcan Dylan Example'); === ext/mro/t/basic_02_dfs.t ================================================================== ---- ext/mro/t/basic_02_dfs.t (/local/perl-current) (revision 12570) -+++ ext/mro/t/basic_02_dfs.t (/local/perl-c3) (revision 12570) +--- ext/mro/t/basic_02_dfs.t (/local/perl-current) (revision 12599) ++++ ext/mro/t/basic_02_dfs.t (/local/perl-c3) (revision 12599) @@ -0,0 +1,122 @@ +#!./perl + @@ -919,8 +919,8 @@ +is(Test::A->can('C_or_E')->(), 'Test::E', '... can got the expected method output'); === ext/mro/t/basic_03_dfs.t ================================================================== ---- ext/mro/t/basic_03_dfs.t (/local/perl-current) (revision 12570) -+++ ext/mro/t/basic_03_dfs.t (/local/perl-c3) (revision 12570) +--- ext/mro/t/basic_03_dfs.t (/local/perl-current) (revision 12599) ++++ ext/mro/t/basic_03_dfs.t (/local/perl-c3) (revision 12599) @@ -0,0 +1,108 @@ +#!./perl + @@ -1032,8 +1032,8 @@ +is(Test::A->C_or_D, 'Test::D', '... got the right method dispatch'); === ext/mro/t/basic_04_dfs.t ================================================================== ---- ext/mro/t/basic_04_dfs.t (/local/perl-current) (revision 12570) -+++ ext/mro/t/basic_04_dfs.t (/local/perl-c3) (revision 12570) +--- ext/mro/t/basic_04_dfs.t (/local/perl-current) (revision 12599) ++++ ext/mro/t/basic_04_dfs.t (/local/perl-c3) (revision 12599) @@ -0,0 +1,41 @@ +#!./perl + @@ -1078,8 +1078,8 @@ + === ext/mro/t/basic_05_dfs.t ================================================================== ---- ext/mro/t/basic_05_dfs.t (/local/perl-current) (revision 12570) -+++ ext/mro/t/basic_05_dfs.t (/local/perl-c3) (revision 12570) +--- ext/mro/t/basic_05_dfs.t (/local/perl-current) (revision 12599) ++++ ext/mro/t/basic_05_dfs.t (/local/perl-c3) (revision 12599) @@ -0,0 +1,62 @@ +#!./perl + @@ -1145,8 +1145,8 @@ + '... got the right next::method dispatch path'); === ext/mro/t/vulcan_dfs.t ================================================================== ---- ext/mro/t/vulcan_dfs.t (/local/perl-current) (revision 12570) -+++ ext/mro/t/vulcan_dfs.t (/local/perl-c3) (revision 12570) +--- ext/mro/t/vulcan_dfs.t (/local/perl-current) (revision 12599) ++++ ext/mro/t/vulcan_dfs.t (/local/perl-c3) (revision 12599) @@ -0,0 +1,73 @@ +#!./perl + @@ -1223,8 +1223,8 @@ + '... got the right MRO for the Vulcan Dylan Example'); === ext/mro/t/dbic_c3.t ================================================================== ---- ext/mro/t/dbic_c3.t (/local/perl-current) (revision 12570) -+++ ext/mro/t/dbic_c3.t (/local/perl-c3) (revision 12570) +--- ext/mro/t/dbic_c3.t (/local/perl-current) (revision 12599) ++++ ext/mro/t/dbic_c3.t (/local/perl-c3) (revision 12599) @@ -0,0 +1,126 @@ +#!./perl + @@ -1354,8 +1354,8 @@ + '... got the right C3 merge order for xx::DBIx::Class::Core'); === ext/mro/t/complex_c3.t ================================================================== ---- ext/mro/t/complex_c3.t (/local/perl-current) (revision 12570) -+++ ext/mro/t/complex_c3.t (/local/perl-c3) (revision 12570) +--- ext/mro/t/complex_c3.t (/local/perl-current) (revision 12599) ++++ ext/mro/t/complex_c3.t (/local/perl-c3) (revision 12599) @@ -0,0 +1,144 @@ +#!./perl + @@ -1503,8 +1503,8 @@ + '... got the right C3 merge order for Test::K'); === ext/mro/t/dbic_dfs.t ================================================================== ---- ext/mro/t/dbic_dfs.t (/local/perl-current) (revision 12570) -+++ ext/mro/t/dbic_dfs.t (/local/perl-c3) (revision 12570) +--- ext/mro/t/dbic_dfs.t (/local/perl-current) (revision 12599) ++++ ext/mro/t/dbic_dfs.t (/local/perl-c3) (revision 12599) @@ -0,0 +1,150 @@ +#!./perl + @@ -1658,8 +1658,8 @@ + '... got the right DFS merge order for xx::DBIx::Class::Core'); === ext/mro/t/recursion_c3.t ================================================================== ---- ext/mro/t/recursion_c3.t (/local/perl-current) (revision 12570) -+++ ext/mro/t/recursion_c3.t (/local/perl-c3) (revision 12570) +--- ext/mro/t/recursion_c3.t (/local/perl-current) (revision 12599) ++++ ext/mro/t/recursion_c3.t (/local/perl-c3) (revision 12599) @@ -0,0 +1,90 @@ +#!./perl + @@ -1753,8 +1753,8 @@ +} === ext/mro/t/overload_c3.t ================================================================== ---- ext/mro/t/overload_c3.t (/local/perl-current) (revision 12570) -+++ ext/mro/t/overload_c3.t (/local/perl-c3) (revision 12570) +--- ext/mro/t/overload_c3.t (/local/perl-current) (revision 12599) ++++ ext/mro/t/overload_c3.t (/local/perl-c3) (revision 12599) @@ -0,0 +1,55 @@ +#!./perl + @@ -1813,8 +1813,8 @@ + === ext/mro/t/complex_dfs.t ================================================================== ---- ext/mro/t/complex_dfs.t (/local/perl-current) (revision 12570) -+++ ext/mro/t/complex_dfs.t (/local/perl-c3) (revision 12570) +--- ext/mro/t/complex_dfs.t (/local/perl-current) (revision 12599) ++++ ext/mro/t/complex_dfs.t (/local/perl-c3) (revision 12599) @@ -0,0 +1,144 @@ +#!./perl + @@ -1962,8 +1962,8 @@ + '... got the right DFS merge order for Test::K'); === ext/mro/t/inconsistent_c3.t ================================================================== ---- ext/mro/t/inconsistent_c3.t (/local/perl-current) (revision 12570) -+++ ext/mro/t/inconsistent_c3.t (/local/perl-c3) (revision 12570) +--- ext/mro/t/inconsistent_c3.t (/local/perl-current) (revision 12599) ++++ ext/mro/t/inconsistent_c3.t (/local/perl-c3) (revision 12599) @@ -0,0 +1,48 @@ +#!./perl + @@ -2012,11 +2012,11 @@ +} + +eval { mro::get_mro_linear_c3('Z') }; -+like($@, qr/^Inconsistent hierarchy/, '... got the right error with an inconsistent hierarchy'); ++like($@, qr/^Inconsistent /, '... got the right error with an inconsistent hierarchy'); === ext/mro/t/recursion_dfs.t ================================================================== ---- ext/mro/t/recursion_dfs.t (/local/perl-current) (revision 12570) -+++ ext/mro/t/recursion_dfs.t (/local/perl-c3) (revision 12570) +--- ext/mro/t/recursion_dfs.t (/local/perl-current) (revision 12599) ++++ ext/mro/t/recursion_dfs.t (/local/perl-c3) (revision 12599) @@ -0,0 +1,90 @@ +#!./perl + @@ -2110,8 +2110,8 @@ +} === ext/mro/t/basic_01_c3.t ================================================================== ---- ext/mro/t/basic_01_c3.t (/local/perl-current) (revision 12570) -+++ ext/mro/t/basic_01_c3.t (/local/perl-c3) (revision 12570) +--- ext/mro/t/basic_01_c3.t (/local/perl-current) (revision 12599) ++++ ext/mro/t/basic_01_c3.t (/local/perl-c3) (revision 12599) @@ -0,0 +1,54 @@ +#!./perl + @@ -2169,8 +2169,8 @@ +is(UNIVERSAL::can("Diamond_D", 'hello')->(), 'Diamond_C::hello', '... can(method) resolved itself as expected'); === ext/mro/t/basic_02_c3.t ================================================================== ---- ext/mro/t/basic_02_c3.t (/local/perl-current) (revision 12570) -+++ ext/mro/t/basic_02_c3.t (/local/perl-c3) (revision 12570) +--- ext/mro/t/basic_02_c3.t (/local/perl-current) (revision 12599) ++++ ext/mro/t/basic_02_c3.t (/local/perl-c3) (revision 12599) @@ -0,0 +1,122 @@ +#!./perl + @@ -2296,8 +2296,8 @@ +is(Test::A->can('C_or_E')->(), 'Test::C', '... can got the expected method output'); === ext/mro/t/overload_dfs.t ================================================================== ---- ext/mro/t/overload_dfs.t (/local/perl-current) (revision 12570) -+++ ext/mro/t/overload_dfs.t (/local/perl-c3) (revision 12570) +--- ext/mro/t/overload_dfs.t (/local/perl-current) (revision 12599) ++++ ext/mro/t/overload_dfs.t (/local/perl-c3) (revision 12599) @@ -0,0 +1,55 @@ +#!./perl + @@ -2356,8 +2356,8 @@ + === ext/mro/t/basic_03_c3.t ================================================================== ---- ext/mro/t/basic_03_c3.t (/local/perl-current) (revision 12570) -+++ ext/mro/t/basic_03_c3.t (/local/perl-c3) (revision 12570) +--- ext/mro/t/basic_03_c3.t (/local/perl-current) (revision 12599) ++++ ext/mro/t/basic_03_c3.t (/local/perl-c3) (revision 12599) @@ -0,0 +1,108 @@ +#!./perl + @@ -2469,8 +2469,8 @@ +is(Test::A->C_or_D, 'Test::C', '... got the right method dispatch'); === ext/mro/t/basic_04_c3.t ================================================================== ---- ext/mro/t/basic_04_c3.t (/local/perl-current) (revision 12570) -+++ ext/mro/t/basic_04_c3.t (/local/perl-c3) (revision 12570) +--- ext/mro/t/basic_04_c3.t (/local/perl-current) (revision 12599) ++++ ext/mro/t/basic_04_c3.t (/local/perl-c3) (revision 12599) @@ -0,0 +1,41 @@ +#!./perl + @@ -2515,8 +2515,8 @@ + === ext/mro/t/basic_05_c3.t ================================================================== ---- ext/mro/t/basic_05_c3.t (/local/perl-current) (revision 12570) -+++ ext/mro/t/basic_05_c3.t (/local/perl-c3) (revision 12570) +--- ext/mro/t/basic_05_c3.t (/local/perl-current) (revision 12599) ++++ ext/mro/t/basic_05_c3.t (/local/perl-c3) (revision 12599) @@ -0,0 +1,62 @@ +#!./perl + @@ -2582,8 +2582,8 @@ + '... got the right next::method dispatch path'); === ext/mro/mro.xs ================================================================== ---- ext/mro/mro.xs (/local/perl-current) (revision 12570) -+++ ext/mro/mro.xs (/local/perl-c3) (revision 12570) +--- ext/mro/mro.xs (/local/perl-current) (revision 12599) ++++ ext/mro/mro.xs (/local/perl-c3) (revision 12599) @@ -0,0 +1,98 @@ +/* mro.xs + * @@ -2685,8 +2685,8 @@ + RETVAL === ext/mro/Makefile.PL ================================================================== ---- ext/mro/Makefile.PL (/local/perl-current) (revision 12570) -+++ ext/mro/Makefile.PL (/local/perl-c3) (revision 12570) +--- ext/mro/Makefile.PL (/local/perl-current) (revision 12599) ++++ ext/mro/Makefile.PL (/local/perl-c3) (revision 12599) @@ -0,0 +1,35 @@ +use ExtUtils::MakeMaker; +use Config; @@ -2725,8 +2725,8 @@ +} === ext/mro/mro.pm ================================================================== ---- ext/mro/mro.pm (/local/perl-current) (revision 12570) -+++ ext/mro/mro.pm (/local/perl-c3) (revision 12570) +--- ext/mro/mro.pm (/local/perl-current) (revision 12599) ++++ ext/mro/mro.pm (/local/perl-c3) (revision 12599) @@ -0,0 +1,91 @@ +# mro.pm +# @@ -2821,8 +2821,8 @@ +=cut === MANIFEST ================================================================== ---- MANIFEST (/local/perl-current) (revision 12570) -+++ MANIFEST (/local/perl-c3) (revision 12570) +--- MANIFEST (/local/perl-current) (revision 12599) ++++ MANIFEST (/local/perl-c3) (revision 12599) @@ -893,6 +893,30 @@ ext/MIME/Base64/t/quoted-print.t See whether MIME::QuotedPrint works ext/MIME/Base64/t/unicode.t See whether MIME::Base64 works @@ -2864,9 +2864,9 @@ NetWare/bat/SetCodeWar.bat NetWare port === mro.c ================================================================== ---- mro.c (/local/perl-current) (revision 12570) -+++ mro.c (/local/perl-c3) (revision 12570) -@@ -0,0 +1,297 @@ +--- mro.c (/local/perl-current) (revision 12599) ++++ mro.c (/local/perl-c3) (revision 12599) +@@ -0,0 +1,298 @@ +/* mro.c + * + * Copyright (C) 2006 by Larry Wall and others @@ -3116,7 +3116,8 @@ + } + if(!cand) break; + if(!winner) -+ Perl_croak(aTHX_ "Inconsistent hierarchy XXX"); ++ Perl_croak(aTHX_ "Inconsistent inheritance hierarchy during C3 merge of class '%s': " ++ "merging failed on parent '%"SVf"'", stashname, cand); + } + } + @@ -3166,8 +3167,8 @@ + */ === hv.c ================================================================== ---- hv.c (/local/perl-current) (revision 12570) -+++ hv.c (/local/perl-c3) (revision 12570) +--- hv.c (/local/perl-current) (revision 12599) ++++ hv.c (/local/perl-c3) (revision 12599) @@ -1743,6 +1743,7 @@ if (SvOOK(hv)) { @@ -3200,8 +3201,8 @@ === hv.h ================================================================== ---- hv.h (/local/perl-current) (revision 12570) -+++ hv.h (/local/perl-c3) (revision 12570) +--- hv.h (/local/perl-current) (revision 12599) ++++ hv.h (/local/perl-c3) (revision 12599) @@ -38,12 +38,32 @@ /* Subject to change. @@ -3235,7 +3236,7 @@ }; /* hash structure: */ -@@ -235,6 +255,7 @@ +@@ -240,6 +260,7 @@ #define HvRITER_get(hv) (SvOOK(hv) ? HvAUX(hv)->xhv_riter : -1) #define HvEITER_get(hv) (SvOOK(hv) ? HvAUX(hv)->xhv_eiter : 0) #define HvNAME(hv) HvNAME_get(hv) @@ -3245,9 +3246,9 @@ /* This macro may go away without notice. */ === mg.c ================================================================== ---- mg.c (/local/perl-current) (revision 12570) -+++ mg.c (/local/perl-c3) (revision 12570) -@@ -1517,6 +1517,7 @@ +--- mg.c (/local/perl-current) (revision 12599) ++++ mg.c (/local/perl-c3) (revision 12599) +@@ -1520,6 +1520,7 @@ PERL_UNUSED_ARG(sv); PERL_UNUSED_ARG(mg); PL_sub_generation++; @@ -3257,9 +3258,9 @@ === intrpvar.h ================================================================== ---- intrpvar.h (/local/perl-current) (revision 12570) -+++ intrpvar.h (/local/perl-c3) (revision 12570) -@@ -558,6 +558,7 @@ +--- intrpvar.h (/local/perl-current) (revision 12599) ++++ intrpvar.h (/local/perl-c3) (revision 12599) +@@ -529,6 +529,7 @@ PERLVARI(Iutf8cache, I8, 1) /* Is the utf8 caching code enabled? */ #endif @@ -3269,9 +3270,9 @@ * (Don't forget to add your variable also to perl_clone()!) === sv.c ================================================================== ---- sv.c (/local/perl-current) (revision 12570) -+++ sv.c (/local/perl-c3) (revision 12570) -@@ -10985,6 +10985,7 @@ +--- sv.c (/local/perl-current) (revision 12599) ++++ sv.c (/local/perl-c3) (revision 12599) +@@ -11061,6 +11061,7 @@ PL_initav = av_dup_inc(proto_perl->Iinitav, param); PL_sub_generation = proto_perl->Isub_generation; @@ -3281,8 +3282,8 @@ PL_forkprocess = proto_perl->Iforkprocess; === embed.fnc ================================================================== ---- embed.fnc (/local/perl-current) (revision 12570) -+++ embed.fnc (/local/perl-c3) (revision 12570) +--- embed.fnc (/local/perl-current) (revision 12599) ++++ embed.fnc (/local/perl-c3) (revision 12599) @@ -278,6 +278,10 @@ Apmb |void |gv_efullname3 |NN SV* sv|NN const GV* gv|NULLOK const char* prefix Ap |void |gv_efullname4 |NN SV* sv|NN const GV* gv|NULLOK const char* prefix|bool keepmain @@ -3298,5 +3299,5 @@ Property changes on: ___________________________________________________________________ Name: svk:merge - +2679d79f-d018-0410-a353-0f906ad2929c:/local/perl-current:12569 + +2679d79f-d018-0410-a353-0f906ad2929c:/local/perl-current:12598