In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/18391b266d7c701eef1760fa9fddfc3e43ebcfcd?hp=6c0d35ff1e3d608716c812fc4ba0474d9041e7bf>
- Log ----------------------------------------------------------------- commit 18391b266d7c701eef1760fa9fddfc3e43ebcfcd Author: Karl Williamson <[email protected]> Date: Thu Mar 19 10:07:38 2015 -0600 lib/perl5db.pl: Fix pod typo M lib/perl5db.pl commit 7d4d3e294c3a762ce652db1f04649d524a50ceb9 Author: Karl Williamson <[email protected]> Date: Sat Mar 14 21:50:49 2015 -0600 lib/perl5db.pl: Generalize for EBCDIC M lib/perl5db.pl commit 4b6af431de82c30fc8df0d5d024cf77f6512e8b9 Author: Karl Williamson <[email protected]> Date: Sat Mar 14 21:50:27 2015 -0600 Create single fcn for dup'd /lib code Several /lib .pm's have the same code which is complicated enough to warrant being placed in a shared function. This commit creates a .pm to be used by these .pm's. This implements the perhaps archaic 'Meta' notation wherein characters above 0x7f are displayed as M- plus the ASCII-range character derived by looking at only the lower 7 bits of the upper range one. There are problems with this, in that a literal control character can be in the string, whereas it is trying to get rid of control characters. But I left it to work as-is, just centralizing the code. On EBCDIC platforms this notation makes no sense because the bit patterns are all mixed up about having the upper bit set. So this commit fixes things on these platforms, so these are changed to \x{...}. No literal control characters are emitted. Another potential problem is that characters above 0xFF are passed through, unchanged. But again, I let the existing behavior stand. M MANIFEST M Porting/Maintainers.pl M lib/DB.pm A lib/meta_notation.pm A lib/meta_notation.t M lib/perl5db.pl M lib/sigtrap.pm commit 8b371338c1359c38e4de8ec65a0b9b884f05e450 Author: Karl Williamson <[email protected]> Date: Mon Mar 16 11:14:12 2015 -0600 Change name of mro.c This is to prevent a conflict showing up on z/OS (os390) because this file's name is the same as one in /ext, and there are functions cross-referenced between them, and the loader on that platform can't deal with this. See http://nntp.perl.org/group/perl.perl5.porters/226612 M Cross/Makefile-cross-SH M MANIFEST M Makefile.SH M Makefile.micro M NetWare/Makefile M hv.h D mro.c A mro_core.c M vms/descrip_mms.template M win32/Makefile M win32/Makefile.ce M win32/makefile.mk ----------------------------------------------------------------------- Summary of changes: Cross/Makefile-cross-SH | 4 ++-- MANIFEST | 4 +++- Makefile.SH | 4 ++-- Makefile.micro | 4 ++-- NetWare/Makefile | 2 +- Porting/Maintainers.pl | 1 + hv.h | 2 +- lib/DB.pm | 6 +++--- lib/meta_notation.pm | 54 ++++++++++++++++++++++++++++++++++++++++++++++++ lib/meta_notation.t | 40 +++++++++++++++++++++++++++++++++++ lib/perl5db.pl | 19 +++++++++-------- lib/sigtrap.pm | 6 +++--- mro.c => mro_core.c | 25 ++++++++++++---------- vms/descrip_mms.template | 6 +++--- win32/Makefile | 2 +- win32/Makefile.ce | 4 ++-- win32/makefile.mk | 2 +- 17 files changed, 143 insertions(+), 42 deletions(-) create mode 100644 lib/meta_notation.pm create mode 100644 lib/meta_notation.t rename mro.c => mro_core.c (99%) diff --git a/Cross/Makefile-cross-SH b/Cross/Makefile-cross-SH index 3260be4..01cde92 100644 --- a/Cross/Makefile-cross-SH +++ b/Cross/Makefile-cross-SH @@ -345,7 +345,7 @@ h4 = regexp.h scope.h sv.h unixish.h util.h iperlsys.h thread.h h5 = utf8.h warnings.h h = $(h1) $(h2) $(h3) $(h4) $(h5) -c1 = av.c scope.c op.c doop.c doio.c dump.c gv.c hv.c mg.c reentr.c mro.c perl.c +c1 = av.c scope.c op.c doop.c doio.c dump.c gv.c hv.c mg.c reentr.c mro_core.c perl.c c2 = perly.c pp.c pp_hot.c pp_ctl.c pp_sys.c regcomp.c regexec.c utf8.c sv.c c3 = taint.c toke.c util.c deb.c run.c universal.c pad.c globals.c keywords.c c4 = perlio.c perlapi.c numeric.c mathoms.c locale.c pp_pack.c pp_sort.c @@ -353,7 +353,7 @@ c5 = $(mallocsrc) c = $(c1) $(c2) $(c3) $(c4) $(c5) miniperlmain.c perlmain.c opmini.c -obj1 = $(mallocobj) gv$(OBJ_EXT) toke$(OBJ_EXT) perly$(OBJ_EXT) op$(OBJ_EXT) pad$(OBJ_EXT) regcomp$(OBJ_EXT) dump$(OBJ_EXT) util$(OBJ_EXT) mg$(OBJ_EXT) reentr$(OBJ_EXT) mro$(OBJ_EXT) +obj1 = $(mallocobj) gv$(OBJ_EXT) toke$(OBJ_EXT) perly$(OBJ_EXT) op$(OBJ_EXT) pad$(OBJ_EXT) regcomp$(OBJ_EXT) dump$(OBJ_EXT) util$(OBJ_EXT) mg$(OBJ_EXT) reentr$(OBJ_EXT) mro_core$(OBJ_EXT) obj2 = hv$(OBJ_EXT) av$(OBJ_EXT) perl$(OBJ_EXT) run$(OBJ_EXT) pp_hot$(OBJ_EXT) sv$(OBJ_EXT) pp$(OBJ_EXT) scope$(OBJ_EXT) pp_ctl$(OBJ_EXT) pp_sys$(OBJ_EXT) obj3 = doop$(OBJ_EXT) doio$(OBJ_EXT) regexec$(OBJ_EXT) utf8$(OBJ_EXT) taint$(OBJ_EXT) deb$(OBJ_EXT) universal$(OBJ_EXT) globals$(OBJ_EXT) perlio$(OBJ_EXT) perlapi$(OBJ_EXT) numeric$(OBJ_EXT) mathoms$ ... [62 chars truncated] diff --git a/MANIFEST b/MANIFEST index 2652ab0..9fb277b 100644 --- a/MANIFEST +++ b/MANIFEST @@ -4182,6 +4182,8 @@ lib/less.pm For "use less" lib/less.t See if less support works lib/locale.pm For "use locale" lib/locale.t See if locale support works +lib/meta_notation.pm Helper for certain /lib .pm's +lib/meta_notation.t See if meta_notation.t works lib/Net/hostent.pm By-name interface to Perl's builtin gethost* lib/Net/hostent.t See if Net::hostent works lib/Net/netent.pm By-name interface to Perl's builtin getnet* @@ -4370,7 +4372,7 @@ mg_vtable.h Generated magic vtable data miniperlmain.c Basic perl w/o dynamic loading or extensions mkppport A script that distributes ppport.h mkppport.lst List of extensions that need a ppport.h -mro.c Method Resolution Order code +mro_core.c Method Resolution Order code myconfig.SH Prints summary of the current configuration mydtrace.h Support for optional DTrace probes NetWare/bat/Buildtype.bat NetWare port diff --git a/Makefile.SH b/Makefile.SH index 12414a5..2889b27 100755 --- a/Makefile.SH +++ b/Makefile.SH @@ -473,7 +473,7 @@ h5 = utf8.h warnings.h mydtrace.h op_reg_common.h l1_char_class_tab.h h6 = charclass_invlists.h h = $(h1) $(h2) $(h3) $(h4) $(h5) $(h6) -c1 = av.c scope.c op.c doop.c doio.c dump.c gv.c hv.c mg.c reentr.c mro.c perl.c +c1 = av.c scope.c op.c doop.c doio.c dump.c gv.c hv.c mg.c reentr.c mro_core.c perl.c c2 = perly.c pp.c pp_hot.c pp_ctl.c pp_sys.c regcomp.c regexec.c utf8.c sv.c c3 = taint.c toke.c util.c deb.c run.c universal.c pad.c globals.c keywords.c c4 = perlio.c perlapi.c numeric.c mathoms.c locale.c pp_pack.c pp_sort.c caretx.c @@ -483,7 +483,7 @@ c = $(c1) $(c2) $(c3) $(c4) $(c5) miniperlmain.c opmini.c perlmini.c obj0 = op$(OBJ_EXT) perl$(OBJ_EXT) obj0mini = perlmini$(OBJ_EXT) opmini$(OBJ_EXT) miniperlmain$(OBJ_EXT) -obj1 = $(mallocobj) gv$(OBJ_EXT) toke$(OBJ_EXT) perly$(OBJ_EXT) pad$(OBJ_EXT) regcomp$(OBJ_EXT) dump$(OBJ_EXT) util$(OBJ_EXT) mg$(OBJ_EXT) reentr$(OBJ_EXT) mro$(OBJ_EXT) keywords$(OBJ_EXT) +obj1 = $(mallocobj) gv$(OBJ_EXT) toke$(OBJ_EXT) perly$(OBJ_EXT) pad$(OBJ_EXT) regcomp$(OBJ_EXT) dump$(OBJ_EXT) util$(OBJ_EXT) mg$(OBJ_EXT) reentr$(OBJ_EXT) mro_core$(OBJ_EXT) keywords$(OBJ_EXT) obj2 = hv$(OBJ_EXT) av$(OBJ_EXT) run$(OBJ_EXT) pp_hot$(OBJ_EXT) sv$(OBJ_EXT) pp$(OBJ_EXT) scope$(OBJ_EXT) pp_ctl$(OBJ_EXT) pp_sys$(OBJ_EXT) obj3 = doop$(OBJ_EXT) doio$(OBJ_EXT) regexec$(OBJ_EXT) utf8$(OBJ_EXT) taint$(OBJ_EXT) deb$(OBJ_EXT) universal$(OBJ_EXT) globals$(OBJ_EXT) perlio$(OBJ_EXT) perlapi$(OBJ_EXT) numeric$(OBJ_EXT) mathoms$ ... [79 chars truncated] diff --git a/Makefile.micro b/Makefile.micro index cd9a9c5..dedf183 100644 --- a/Makefile.micro +++ b/Makefile.micro @@ -85,8 +85,8 @@ uglobals$(_O): $(H) globals.c INTERN.h perlapi.h $(generated_headers) ugv$(_O): $(HE) gv.c $(CC) $(CCFLAGS) -o $@ $(CFLAGS) gv.c -umro$(_O): $(HE) mro.c - $(CC) $(CCFLAGS) -o $@ $(CFLAGS) mro.c +umro$(_O): $(HE) mro_core.c + $(CC) $(CCFLAGS) -o $@ $(CFLAGS) mro_core.c uhv$(_O): $(HE) hv.c $(CC) $(CCFLAGS) -o $@ $(CFLAGS) hv.c diff --git a/NetWare/Makefile b/NetWare/Makefile index e9a74b1..de3fb9e 100644 --- a/NetWare/Makefile +++ b/NetWare/Makefile @@ -692,7 +692,7 @@ MICROCORE_SRC = \ ..\dump.c \ ..\globals.c \ ..\gv.c \ - ..\mro.c \ + ..\mro_core.c \ ..\hv.c \ ..\keywords.c \ ..\locale.c \ diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index b0e3ea4..a21e843 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -1368,6 +1368,7 @@ use File::Glob qw(:case); lib/FindBin.{pm,t} lib/Getopt/Std.{pm,t} lib/Internals.t + lib/meta_notation.{pm,t} lib/Net/hostent.{pm,t} lib/Net/netent.{pm,t} lib/Net/protoent.{pm,t} diff --git a/hv.h b/hv.h index 95dde46..a912476 100644 --- a/hv.h +++ b/hv.h @@ -58,7 +58,7 @@ struct shared_he { /* Subject to change. Don't access this directly. - Use the funcs in mro.c + Use the funcs in mro_core.c */ struct mro_alg { diff --git a/lib/DB.pm b/lib/DB.pm index fd0ff92..404c57c 100644 --- a/lib/DB.pm +++ b/lib/DB.pm @@ -41,7 +41,7 @@ BEGIN { $DB::subname = ''; # currently executing sub (fully qualified name) $DB::lineno = ''; # current line number - $DB::VERSION = $DB::VERSION = '1.07'; + $DB::VERSION = $DB::VERSION = '1.08'; # initialize private globals to avoid warnings @@ -244,8 +244,8 @@ sub backtrace { for (@a) { s/'/\\'/g; s/([^\0]*)/'$1'/ unless /^-?[\d.]+$/; - s/([\200-\377])/sprintf("M-%c",ord($1)&0177)/eg; - s/([\0-\37\177])/sprintf("^%c",ord($1)^64)/eg; + require 'meta_notation.pm'; + $_ = _meta_notation($_) if /[[:^print:]]/a; } $w = $w ? '@ = ' : '$ = '; $a = $h ? '(' . join(', ', @a) . ')' : ''; diff --git a/lib/meta_notation.pm b/lib/meta_notation.pm new file mode 100644 index 0000000..2f85cd3 --- /dev/null +++ b/lib/meta_notation.pm @@ -0,0 +1,54 @@ +use strict; +use warnings; + +# A tiny private library routine which is a helper to several Perl core +# modules, to allow a paradigm to be implemented in a single place. The name, +# contents, or even the existence of this file may be changed at any time and +# are NOT to be used by anthing outside the Perl core. + +sub _meta_notation ($) { + + # Returns a copy of the input string with the nonprintable characters + # below 0x100 changed into printables. Any ASCII printables or above 0xFF + # are unchanged. (XXX Probably above-Latin1 characters should be + # converted to \X{...}) + # + # \0 .. \x1F (which are "\c@" .. "\c_") are changed into ^@, ^A, ^B, ... + # ^Z, ^[, ^\, ^], ^^, ^_ + # \c? is changed into ^?. + # + # The above accounts for all the ASCII-range nonprintables. + # + # On ASCII platforms, the upper-Latin1-range characters are converted to + # Meta notation, so that \xC1 becomes 'M-A', \xE2 becomes 'M-b', etc. + # This is how it always has worked, so is continued that way for backwards + # compatibility. XXX Wrong, but the way it has always worked is that \x80 + # .. \x9F are converted to M- followed by a literal control char. This + # probably has escaped attention due to the limited domains this code has + # been applied to. ext/SDBM_File/dbu.c does this right. + # + # On EBCDIC platforms, the upper-Latin1-range characters are converted + # into '\x{...}' Meta notation doesn't make sense on EBCDIC platforms + # because the ASCII-range printables are a mixture of upper bit set or + # not. [A-Za-Z0-9] all have the upper bit set. The underscore likely + # doesn't; and other punctuation may or may not. There's no simple + # pattern. + + my $string = shift; + + $string =~ s/([\0-\037])/ + sprintf("^%c",utf8::unicode_to_native(ord($1)^64))/xeg; + $string =~ s/\c?/^?/g; + if (ord("A") == 65) { + $string =~ s/([\200-\377])/sprintf("M-%c",ord($1)&0177)/eg; + } + else { + no warnings 'experimental::regex_sets'; + # Leave alone things above \xff + $string =~ s/( (?[ [\x00-\xFF] & [:^print:]])) / + sprintf("\\x{%X}", ord($1))/xaeg; + } + + return $string; +} +1 diff --git a/lib/meta_notation.t b/lib/meta_notation.t new file mode 100644 index 0000000..d89d50c --- /dev/null +++ b/lib/meta_notation.t @@ -0,0 +1,40 @@ +#!./perl + +BEGIN { + chdir 't' if -d 't'; + @INC = '../lib'; + require './test.pl'; +} + +use strict; +use warnings; + +eval "require 'meta_notation.pm'"; +if ($@) { + fail("Could not find 'meta_notation.pm'"); +} +else { + + is(_meta_notation("\007\010\011\c?Z\x{103}"), "^G^H^I^?Z\x{103}"); + + if ($::IS_ASCII || $::IS_ASCII) { + is(_meta_notation("\x{c1}\x{e2}"), 'M-AM-b'); + is(_meta_notation("\x{df}"), 'M-_'); + } + else { # EBCDIC platform + # In the first iteration we are looking for a non-ASCII control; in + # the second, a regular non-ASCII character. SPACE marks the end of + # most controls. We test each to see that they are properly converted + # to \x{...} + foreach my $start (0x20, ord " ") { + for (my $i = $start; $i < 256; $i++) { + my $char = chr $i; + next if $char =~ /[[:ascii:]]/; + is(_meta_notation($char), sprintf("\\x{%X}", $i)); + last; + } + } + } +} + +done_testing(); diff --git a/lib/perl5db.pl b/lib/perl5db.pl index e0989db..8babb45 100644 --- a/lib/perl5db.pl +++ b/lib/perl5db.pl @@ -528,7 +528,7 @@ BEGIN { # Debugger for Perl 5.00x; perl5db.pl patch level: use vars qw($VERSION $header); -$VERSION = '1.47'; +$VERSION = '1.48'; $header = "perl5db.pl version $VERSION"; @@ -6540,11 +6540,10 @@ sub _dump_trace_calc_saved_single_arg s/(.*)/'$1'/s unless /^(?: -?[\d.]+ | \*[\w:]* )$/x; - # Turn high-bit characters into meta-whatever. - s/([\200-\377])/sprintf("M-%c",ord($1)&0177)/eg; - - # Turn control characters into ^-whatever. - s/([\0-\37\177])/sprintf("^%c",ord($1)^64)/eg; + # Turn high-bit characters into meta-whatever, and controls into like + # '^D'. + require 'meta_notation.pm'; + $_ = _meta_notation($_) if /[[:^print:]]/a; return $_; } @@ -7573,7 +7572,7 @@ variables during a restart. Set_list packages up items to be stored in a set of environment variables (VAR_n, containing the number of items, and VAR_0, VAR_1, etc., containing the values). Values outside the standard ASCII charset are stored by encoding -then as hexadecimal values. +them as hexadecimal values. =cut @@ -7589,7 +7588,9 @@ sub set_list { for my $i ( 0 .. $#list ) { $val = $list[$i]; $val =~ s/\\/\\\\/g; - $val =~ s/([\0-\37\177\200-\377])/"\\0x" . unpack('H2',$1)/eg; + no warnings 'experimental::regex_sets'; + $val =~ s/ ( (?[ [\000-\xFF] & [:^print:] ]) ) / + "\\0x" . unpack('H2',$1)/xaeg; $ENV{"${stem}_$i"} = $val; } ## end for $i (0 .. $#list) } ## end sub set_list @@ -8429,7 +8430,7 @@ sub print_help { # wide. If it's wider than that, an extra space will be added. $help_str =~ s{ ^ # only matters at start of line - ( \040{4} | \t )* # some subcommands are indented + ( \ {4} | \t )* # some subcommands are indented ( < ? # so <CR> works [BI] < [^\t\n] + ) # find an eeevil ornament ( \t+ ) # original separation, discarded diff --git a/lib/sigtrap.pm b/lib/sigtrap.pm index df728c8..7d80146 100644 --- a/lib/sigtrap.pm +++ b/lib/sigtrap.pm @@ -8,7 +8,7 @@ sigtrap - Perl pragma to enable simple signal handling use Carp; -$VERSION = 1.07; +$VERSION = 1.08; $Verbose ||= 0; sub import { @@ -99,8 +99,8 @@ sub handler_traceback { s/([\'\\])/\\$1/g; s/([^\0]*)/'$1'/ unless /^(?: -?[\d.]+ | \*[\w:]* )$/x; - s/([\200-\377])/sprintf("M-%c",ord($1)&0177)/eg; - s/([\0-\37\177])/sprintf("^%c",ord($1)^64)/eg; + require 'meta_notation.pm'; + $_ = _meta_notation($_) if /[[:^print:]]/a; push(@a, $_); } $w = $w ? '@ = ' : '$ = '; diff --git a/mro.c b/mro_core.c similarity index 99% rename from mro.c rename to mro_core.c index d501681..4da9682 100644 --- a/mro.c +++ b/mro_core.c @@ -1,4 +1,4 @@ -/* mro.c +/* mro_core.c * * Copyright (c) 2007 Brandon L Black * Copyright (c) 2007, 2008, 2009, 2010, 2011 Larry Wall and others @@ -6,6 +6,9 @@ * You may distribute under the terms of either the GNU General Public * License or the Artistic License, as specified in the README file. * + * This was 'mro.c', but changed because there is another mro.c in /ext, and + * the os390 loader can't cope with this situation (which involves the two + * files calling functions defined in the other) */ /* @@ -66,13 +69,13 @@ Perl_mro_set_private_data(pTHX_ struct mro_meta *const smeta, } else { HV *const hv = newHV(); /* Start with 2 buckets. It's unlikely we'll need more. */ - HvMAX(hv) = 1; + HvMAX(hv) = 1; smeta->mro_linear_all = hv; if (smeta->mro_linear_current) { /* If we were storing something directly, put it in the hash before we lose it. */ - Perl_mro_set_private_data(aTHX_ smeta, smeta->mro_which, + Perl_mro_set_private_data(aTHX_ smeta, smeta->mro_which, smeta->mro_linear_current); } } @@ -126,7 +129,7 @@ Perl_mro_register(pTHX_ const struct mro_alg *mro) { PERL_ARGS_ASSERT_MRO_REGISTER; - + if (!Perl_hv_common(aTHX_ PL_registered_mros, NULL, mro->name, mro->length, mro->kflags, HV_FETCH_ISSTORE, wrapper, mro->hash)) { @@ -620,7 +623,7 @@ Perl_mro_isa_changed_in(pTHX_ HV* stash) so on aggregate we expect to save time by not making two calls to the common HV code for the case where it doesn't exist. */ - + (void) hv_storehek(mroisarev, namehek, &PL_sv_yes); } @@ -664,7 +667,7 @@ Perl_mro_isa_changed_in(pTHX_ HV* stash) almost as cheap as calling hv_exists, so on aggregate we expect to save time by not making two calls to the common HV code for the case where it doesn't exist. */ - + (void)hv_storehek(mroisarev, stashhek, &PL_sv_yes); } @@ -856,7 +859,7 @@ Perl_mro_package_moved(pTHX_ HV * const stash, HV * const oldstash, mro_gather_and_rename set aside for us) this way, in case one class in this list is a superclass of a another class that we have already encountered. In such a case, meta->isa - will have been overwritten without old entries being deleted + from PL_isarev. */ struct mro_meta * const meta = HvMROMETA(stash); if(meta->isa != (HV *)HeVAL(iter)){ @@ -1103,7 +1106,7 @@ S_mro_gather_and_rename(pTHX_ HV * const stashes, HV * const seen_stashes, ing that here, as we want to avoid resetting the hash iterator. */ /* Skip the entire loop if the hash is empty. */ - if(oldstash && HvUSEDKEYS(oldstash)) { + if(oldstash && HvUSEDKEYS(oldstash)) { xhv = (XPVHV*)SvANY(oldstash); seen = (HV *) sv_2mortal((SV *)newHV()); @@ -1358,7 +1361,7 @@ void Perl_mro_set_mro(pTHX_ struct mro_meta *const meta, SV *const name) { const struct mro_alg *const which = Perl_mro_get_from_name(aTHX_ name); - + PERL_ARGS_ASSERT_MRO_SET_MRO; if (!which) @@ -1368,7 +1371,7 @@ Perl_mro_set_mro(pTHX_ struct mro_meta *const meta, SV *const name) if (meta->mro_linear_current && !meta->mro_linear_all) { /* If we were storing something directly, put it in the hash before we lose it. */ - Perl_mro_set_private_data(aTHX_ meta, meta->mro_which, + Perl_mro_set_private_data(aTHX_ meta, meta->mro_which, MUTABLE_SV(meta->mro_linear_current)); } meta->mro_which = which; @@ -1404,7 +1407,7 @@ XS(XS_mro_method_changed_in) if(items != 1) croak_xs_usage(cv, "classname"); - + classname = ST(0); class_stash = gv_stashsv(classname, 0); diff --git a/vms/descrip_mms.template b/vms/descrip_mms.template index faf8a98..31c867c 100644 --- a/vms/descrip_mms.template +++ b/vms/descrip_mms.template @@ -226,14 +226,14 @@ FULLLIBS2 = $(LIBS2)|$(THRLIBS1)|$(THRLIBS2) #### End of system configuration section. #### -c0 = $(MALLOC_C) av.c caretx.c deb.c doio.c doop.c dump.c globals.c gv.c hv.c mro.c +c0 = $(MALLOC_C) av.c caretx.c deb.c doio.c doop.c dump.c globals.c gv.c hv.c mro_core.c c1 = mg.c locale.c mathoms.c miniperlmain.c numeric.c op.c pad.c perl.c perlapi.c perlio.c c2 = perly.c pp.c pp_ctl.c pp_hot.c pp_pack.c pp_sort.c pp_sys.c regcomp.c regexec.c reentr.c c3 = run.c scope.c sv.c taint.c toke.c universal.c utf8.c util.c vms.c keywords.c c = $(c0) $(c1) $(c2) $(c3) obj0 = perl$(O) -obj1 = $(MALLOC_O) av$(O) caretx$(O) deb$(O) doio$(O) doop$(O) dump$(O) mro$(O) globals$(O) gv$(O) hv$(O) +obj1 = $(MALLOC_O) av$(O) caretx$(O) deb$(O) doio$(O) doop$(O) dump$(O) mro_core$(O) globals$(O) gv$(O) hv$(O) obj2 = keywords$(O) locale$(O) mathoms$(O) mg$(O) miniperlmain$(O) numeric$(O) op$(O) pad$(O) perlapi$(O) perlio$(O) obj3 = perly$(O) pp$(O) pp_ctl$(O) pp_hot$(O) reentr$(O) pp_pack$(O) pp_sort$(O) pp_sys$(O) regcomp$(O) obj4 = regexec$(O) run$(O) scope$(O) sv$(O) taint$(O) toke$(O) universal$(O) utf8$(O) util$(O) vms$(O) @@ -632,7 +632,7 @@ globals$(O) : globals.c $(generated_headers) $(h) $(CC) $(CORECFLAGS) $(MMS$SOURCE) gv$(O) : gv.c $(h) $(CC) $(CORECFLAGS) $(MMS$SOURCE) -mro$(O) : mro.c $(h) +mro_core$(O) : mro_core.c $(h) $(CC) $(CORECFLAGS) $(MMS$SOURCE) hv$(O) : hv.c $(h) $(CC) $(CORECFLAGS) $(MMS$SOURCE) diff --git a/win32/Makefile b/win32/Makefile index 35cd298..22632d2 100644 --- a/win32/Makefile +++ b/win32/Makefile @@ -688,7 +688,7 @@ MICROCORE_SRC = \ ..\dump.c \ ..\globals.c \ ..\gv.c \ - ..\mro.c \ + ..\mro_core.c \ ..\hv.c \ ..\locale.c \ ..\keywords.c \ diff --git a/win32/Makefile.ce b/win32/Makefile.ce index 6455942..894da33 100644 --- a/win32/Makefile.ce +++ b/win32/Makefile.ce @@ -625,7 +625,7 @@ MICROCORE_SRC = \ ..\dump.c \ ..\globals.c \ ..\gv.c \ - ..\mro.c \ + ..\mro_core.c \ ..\hv.c \ ..\locale.c \ ..\keywords.c \ @@ -870,7 +870,7 @@ $(DLLDIR)\doop.obj \ $(DLLDIR)\dump.obj \ $(DLLDIR)\globals.obj \ $(DLLDIR)\gv.obj \ -$(DLLDIR)\mro.obj \ +$(DLLDIR)\mro_core.obj \ $(DLLDIR)\hv.obj \ $(DLLDIR)\locale.obj \ $(DLLDIR)\keywords.obj \ diff --git a/win32/makefile.mk b/win32/makefile.mk index da4825a..0362443 100644 --- a/win32/makefile.mk +++ b/win32/makefile.mk @@ -834,7 +834,7 @@ MICROCORE_SRC = \ ..\dump.c \ ..\globals.c \ ..\gv.c \ - ..\mro.c \ + ..\mro_core.c \ ..\hv.c \ ..\locale.c \ ..\keywords.c \ -- Perl5 Master Repository
