summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Changes27
-rw-r--r--MANIFEST3
-rw-r--r--Makefile.SH8
-rw-r--r--Porting/makerel4
-rw-r--r--lib/Pod/Man.pm9
-rw-r--r--lib/Pod/Parser.pm2
-rw-r--r--op.c4
-rw-r--r--pod/perldelta.pod2
-rw-r--r--pod/perlopentut.pod2
-rw-r--r--win32/Makefile5
-rw-r--r--win32/makefile.mk5
11 files changed, 59 insertions, 12 deletions
diff --git a/Changes b/Changes
index 40c0eca71c..9d142bcfd0 100644
--- a/Changes
+++ b/Changes
@@ -79,6 +79,33 @@ Version 5.005_62 Development release working toward 5.006
----------------
____________________________________________________________________________
+[ 4390] By: gsar on 1999/10/15 09:45:51
+ Log: lvalue subs patch (change#4081) breaks C<\(Foo->Bar())>;
+ avoid tickling it in Pod::Man for now; other nits in
+ Pod::*
+ Branch: perl
+ ! lib/Pod/Man.pm lib/Pod/Parser.pm pod/perldelta.pod
+ ! pod/perlopentut.pod
+____________________________________________________________________________
+[ 4389] By: gsar on 1999/10/15 08:55:01
+ Log: disable internal globbing for miniperl (or build breaks out
+ in a rash of failed dependencies)
+ Branch: perl
+ ! Makefile.SH op.c win32/Makefile win32/makefile.mk
+____________________________________________________________________________
+[ 4388] By: jhi on 1999/10/15 08:07:49
+ Log: Integrate with Sarathy.
+ Branch: cfgperl
+ !> Changes ext/POSIX/POSIX.xs lib/Benchmark.pm pod/perldelta.pod
+ !> pod/perlfaq2.pod win32/include/dirent.h win32/win32.c
+____________________________________________________________________________
+[ 4387] By: gsar on 1999/10/15 07:46:24
+ Log: integrate cfgperl contents into mainline
+ Branch: perl
+ ! Changes
+ !> pod/perldelta.pod pod/perldiag.pod regcomp.c
+ !> t/pragma/warn/regcomp
+____________________________________________________________________________
[ 4386] By: gsar on 1999/10/15 05:45:36
Log: various little goofs in change#4385
Branch: perl
diff --git a/MANIFEST b/MANIFEST
index aebd662964..00052dfab2 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -504,7 +504,7 @@ iperlsys.h Perl's interface to the system
jpl/JNI/Changes Java Native Interface changes
jpl/JNI/Closer.java Java Native Interface example
jpl/JNI/JNI.pm Java Native Interface module
-jpl/JNI/JNI.pm Java Native Interface module
+jpl/JNI/JNI.xs Java Native Interface module
jpl/JNI/JNIConfig Java Native Interface config
jpl/JNI/JNIConfig.Win32 Java Native Interface config
jpl/JNI/JNIConfig.kaffe Java Native Interface config
@@ -623,6 +623,7 @@ lib/Pod/Checker.pm Pod-Parser - check POD documents for syntax errors
lib/Pod/Functions.pm used by pod/splitpod
lib/Pod/Html.pm Convert POD data to HTML
lib/Pod/InputObjects.pm Pod-Parser - define objects for input streams
+lib/Pod/Man.pm Convert POD data to *roff
lib/Pod/Parser.pm Pod-Parser - define base class for parsing POD
lib/Pod/Select.pm Pod-Parser - select portions of POD docs
lib/Pod/Text.pm Pod-Parser - convert POD data to formatted ASCII text
diff --git a/Makefile.SH b/Makefile.SH
index 6693565b55..2e88cdd333 100644
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -333,7 +333,9 @@ $(LIBPERL_NONSHR): perl$(OBJ_EXT) $(obj)
$(AR) rcu $(LIBPERL_NONSHR) perl$(OBJ_EXT) $(obj)
$(MINIPERL_NONSHR): $(LIBPERL_NONSHR) miniperlmain$(OBJ_EXT)
- $(CC) $(LDFLAGS) -o $(MINIPERL_NONSHR) miniperlmain$(OBJ_EXT) $(LIBPERL_NONSHR) $(LIBS)
+ $(CCCMD) $(PLDLFLAGS) -DMINIPERL_BUILD -o opmini$(OBJ_EXT) op.c
+ $(CC) $(LDFLAGS) -o $(MINIPERL_NONSHR) miniperlmain$(OBJ_EXT) \
+ opmini$(OBJ_EXT) $(LIBPERL_NONSHR) $(LIBS)
MINIPERLEXP = $(MINIPERL_NONSHR)
@@ -416,7 +418,9 @@ $(LIBPERL): $& perl$(OBJ_EXT) $(obj) $(LIBPERLEXPORT)
# The Module used here must not depend on Config or any extensions.
miniperl: $& miniperlmain$(OBJ_EXT) $(LIBPERL)
- $(LDLIBPTH) $(CC) $(LARGE) $(CLDFLAGS) -o miniperl miniperlmain$(OBJ_EXT) $(LLIBPERL) $(libs)
+ $(CCCMD) $(PLDLFLAGS) -DMINIPERL_BUILD -o opmini$(OBJ_EXT) op.c
+ $(LDLIBPTH) $(CC) $(LARGE) $(CLDFLAGS) -o miniperl \
+ miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) $(LLIBPERL) $(libs)
$(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e 0 || $(MAKE) minitest
perl: $& perlmain$(OBJ_EXT) $(LIBPERL) $(DYNALOADER) $(static_ext) ext.libs $(PERLEXPORT)
diff --git a/Porting/makerel b/Porting/makerel
index 8db209aea0..f51b4a5478 100644
--- a/Porting/makerel
+++ b/Porting/makerel
@@ -114,13 +114,13 @@ my @writables = qw(
ext/ByteLoader/byterun.h
global.sym
keywords.h
- lib/warning.pm
+ lib/warnings.pm
objXSUB.h
opcode.h
pp.sym
pp_proto.h
regnodes.h
- warning.h
+ warnings.h
win32/config_H.bc
win32/config_H.gc
win32/config_H.vc
diff --git a/lib/Pod/Man.pm b/lib/Pod/Man.pm
index a85fba538c..0ed16b627c 100644
--- a/lib/Pod/Man.pm
+++ b/lib/Pod/Man.pm
@@ -518,7 +518,9 @@ sub sequence {
my $command = $seq->cmd_name;
# Zero-width characters.
- if ($command eq 'Z') { return bless \ '\&', 'Pod::Man::String' }
+ if ($command eq 'Z') {
+ my $v = '\&'; return bless \ $v, 'Pod::Man::String';
+ }
# C<>, L<>, X<>, and E<> don't apply guesswork to their contents.
local $_ = $self->collapse ($seq->parse_tree, $command =~ /^[CELX]$/);
@@ -554,7 +556,10 @@ sub sequence {
# Handle links.
if ($command eq 'L') {
- return bless \ ($self->buildlink ($_)), 'Pod::Man::String';
+ # XXX bug in lvalue subroutines prevents this from working
+ #return bless \ ($self->buildlink ($_)), 'Pod::Man::String';
+ my $v = $self->buildlink($_);
+ return bless \$v, 'Pod::Man::String';
}
# Whitespace protection replaces whitespace with "\ ".
diff --git a/lib/Pod/Parser.pm b/lib/Pod/Parser.pm
index c96f86b298..ab6787d10e 100644
--- a/lib/Pod/Parser.pm
+++ b/lib/Pod/Parser.pm
@@ -815,7 +815,7 @@ sub parse_text {
pop @seq_stack;
my $errmsg = "** Unterminated $cmd<...> at $file line $line\n";
(ref $errorsub) and &{$errorsub}($errmsg)
- or (defined $errmsg) and $self->$errorsub($errmsg)
+ or (defined $errorsub) and $self->$errorsub($errmsg)
or warn($errmsg);
$seq_stack[-1]->append($expand_seq ? &$xseq_sub($self,$seq) : $seq);
$seq = $seq_stack[-1];
diff --git a/op.c b/op.c
index 99151dcf66..64d801ff62 100644
--- a/op.c
+++ b/op.c
@@ -5181,7 +5181,7 @@ Perl_ck_glob(pTHX_ OP *o)
if (!((gv = gv_fetchpv("glob", FALSE, SVt_PVCV)) && GvIMPORTED_CV(gv)))
gv = gv_fetchpv("CORE::GLOBAL::glob", FALSE, SVt_PVCV);
-#ifdef PERL_INTERNAL_GLOB
+#if defined(PERL_INTERNAL_GLOB) && !defined(MINIPERL_BUILD)
/* XXX this can be tightened up and made more failsafe. */
if (!gv) {
OP *modname = newSVOP(OP_CONST, 0, newSVpvn("File::Glob", 10));
@@ -5192,7 +5192,7 @@ Perl_ck_glob(pTHX_ OP *o)
gv = gv_fetchpv("CORE::GLOBAL::glob", FALSE, SVt_PVCV);
LEAVE;
}
-#endif /* PERL_INTERNAL_GLOB */
+#endif /* PERL_INTERNAL_GLOB && !MINIPERL_BUILD */
if (gv && GvIMPORTED_CV(gv)) {
append_elem(OP_GLOB, o,
diff --git a/pod/perldelta.pod b/pod/perldelta.pod
index 6fb3807a88..c203960cbd 100644
--- a/pod/perldelta.pod
+++ b/pod/perldelta.pod
@@ -790,7 +790,7 @@ behavior, END blocks are not executed anymore when the C<-c> switch
is used.
Note that something resembling the previous behavior can still be
-obtained by putting C<BEGIN { $^C = 0; exit; } at the very end of
+obtained by putting C<BEGIN { $^C = 0; exit; }> at the very end of
the top level source file.
=head2 Potential to leak DATA filehandles
diff --git a/pod/perlopentut.pod b/pod/perlopentut.pod
index ae622a6e41..dbb3a0bd83 100644
--- a/pod/perlopentut.pod
+++ b/pod/perlopentut.pod
@@ -84,7 +84,7 @@ C<popen> function. But in the shell, you just use a different redirection
character. That's also the case for Perl. The C<open> call
remains the same--just its argument differs.
-If the leading character is a pipe symbol, C<open) starts up a new
+If the leading character is a pipe symbol, C<open> starts up a new
command and open a write-only filehandle leading into that command.
This lets you write into that handle and have what you write show up on
that command's standard input. For example:
diff --git a/win32/Makefile b/win32/Makefile
index def59fc757..f7420804d0 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -141,6 +141,11 @@ CCLIBDIR = $(CCHOME)\lib
#BUILDOPT = $(BUILDOPT) -DPERL_POLLUTE
#
+# enable this to test the File::Glob implementation of CORE::glob
+#
+#BUILDOPT = $(BUILDOPT) -DPERL_INTERNAL_GLOB
+
+#
# specify semicolon-separated list of extra directories that modules will
# look for libraries (spaces in path names need not be quoted)
#
diff --git a/win32/makefile.mk b/win32/makefile.mk
index a9d69833b4..bb87b58269 100644
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -161,6 +161,11 @@ CCLIBDIR *= $(CCHOME)\lib
#BUILDOPT += -DPERL_POLLUTE
#
+# enable this to test the File::Glob implementation of CORE::glob
+#
+#BUILDOPT += -DPERL_INTERNAL_GLOB
+
+#
# specify semicolon-separated list of extra directories that modules will
# look for libraries (spaces in path names need not be quoted)
#
View Lorry Controller Status