final tweaks before beta2

p4raw-id: //depot/perl@1613

diff --git a/Changes b/Changes
index 5f6a241..a3b6069 100644 (file)
--- a/Changes
+++ b/Changes
@@ -78,6 +78,178 @@ Version 5.004_76        5.005 Public Beta, Issue 2
 ----------------
 
 ____________________________________________________________________________
+[  1612] By: gsar                                  on 1998/07/21  07:15:54
+        Log: fixes to enable PERL_OBJECT build with mingw32/egcs-1.0.2
+     Branch: perl
+          ! ext/Opcode/Opcode.xs proto.h win32/makedef.pl
+          ! win32/makefile.mk win32/perlhost.h win32/win32.c win32/win32.h
+           ! win32/win32sck.c
+____________________________________________________________________________
+[  1611] By: gsar                                  on 1998/07/21  07:12:00
+        Log: fix bytecode.pl with moved var names
+     Branch: perl
+           ! bytecode.pl byterun.c byterun.h ext/B/B/Asmdata.pm
+____________________________________________________________________________
+[  1610] By: gsar                                  on 1998/07/21  05:51:10
+        Log: tweak toke.c
+     Branch: perl
+           ! toke.c
+____________________________________________________________________________
+[  1609] By: gsar                                  on 1998/07/21  05:46:59
+        Log: change case of PERL_OBJECT filenames, consistent with the rest
+     Branch: perl
+           + XSlock.h objXSUB.h
+           - ObjXSub.h XSLock.h
+          ! MANIFEST XSUB.h lib/ExtUtils/MM_Win32.pm perl.h
+           ! win32/GenCAPI.pl win32/Makefile win32/makefile.mk
+____________________________________________________________________________
+[  1608] By: gsar                                  on 1998/07/21  05:31:13
+        Log: part 2 of PERL_OBJECT fixes (globals in bytecode.h moved to intrpvar.h)
+     Branch: perl
+           ! bytecode.h byterun.c embedvar.h interp.sym intrpvar.h
+____________________________________________________________________________
+[  1607] By: gsar                                  on 1998/07/21  05:29:10
+        Log: part 1 of PERL_OBJECT fixes for new var names
+     Branch: perl
+          ! ObjXSub.h bytecode.h globals.c iperlsys.h perl.h pp_ctl.c
+           ! run.c win32/GenCAPI.pl
+____________________________________________________________________________
+[  1606] By: gsar                                  on 1998/07/21  05:17:26
+        Log: From:    Stephen McCamant <alias@mcs.com>
+             Date:    Mon, 20 Jul 1998 23:53:32 CDT
+             Message-Id: <13748.6947.311341.657005@alias-2.pr.mcs.net>
+             Subject: [PATCH] redundant RV2GVs in ck_fun()
+     Branch: perl
+           ! op.c
+____________________________________________________________________________
+[  1605] By: gsar                                  on 1998/07/21  05:13:28
+        Log: From:    Stephen McCamant <alias@mcs.com>
+             Date:    Mon, 20 Jul 1998 23:32:42 CDT
+             Message-Id: <13748.6392.921893.643238@alias-2.pr.mcs.net>
+             Subject: B::Deparse 0.56 (first testsuite fixes; big)
+     Branch: perl
+           ! ext/B/B/Deparse.pm
+____________________________________________________________________________
+[  1604] By: gsar                                  on 1998/07/21  05:07:29
+        Log: applied a slightly tweaked version of suggested patch
+             From: Colin Kuskie <ckuskie@cadence.com>
+             Date: Mon, 20 Jul 1998 15:58:31 -0700 (PDT)
+             Message-ID: <Pine.GSO.3.96.980720154841.6188M-100000@pdxmail.cadence.com>
+             Subject: [PATCH _75] More documentation for -i prefix
+     Branch: perl
+           ! pod/perlrun.pod
+____________________________________________________________________________
+[  1603] By: gsar                                  on 1998/07/21  04:59:19
+        Log: disable malloced_size() feedback with -DLEAKTEST
+             From: Ilya Zakharevich <ilya@math.ohio-state.edu>
+             Date: Mon, 20 Jul 1998 21:20:21 -0400 (EDT)
+             Message-Id: <199807210120.VAA15031@monk.mps.ohio-state.edu>
+             Subject: [PATCH 5.004_75] -DLEAKTEST broken
+     Branch: perl
+           ! av.c sv.c
+____________________________________________________________________________
+[  1602] By: gsar                                  on 1998/07/21  04:57:43
+        Log: fix hints/hpux.sh for cpp recognition
+             From: Andy Dougherty <doughera@lafcol.lafayette.edu>
+             Date: Mon, 20 Jul 1998 12:46:33 -0400 (EDT)
+             Message-Id: <Pine.SUN.3.96.980720124202.6585B-100000@newton.phys>
+             Subject: RE: Configure misses preprocessor on HP-UX
+     Branch: perl
+           ! hints/hpux.sh
+____________________________________________________________________________
+[  1601] By: gsar                                  on 1998/07/21  04:55:51
+        Log: From: Ilya Zakharevich <ilya@math.ohio-state.edu>
+             Date: Sun, 19 Jul 1998 18:16:38 -0400 (EDT)
+             Message-Id: <199807192216.SAA10482@monk.mps.ohio-state.edu>
+             Subject: [PATCH 5.004_72] Compile (?{}) into a correct package
+     Branch: perl
+           ! pp_ctl.c t/op/pat.t
+____________________________________________________________________________
+[  1600] By: gsar                                  on 1998/07/21  04:48:32
+        Log: allocate a whole fd_set for pp_sselect() on more platforms
+             From: Jarkko Hietaniemi <jhi@cc.hut.fi>
+             Date: 20 Jul 1998 00:14:18 +0300
+             Message-ID: <oeen2a5y251.fsf@alpha.hut.fi>
+             Subject: Re: Not OK: perl 5.00475 +DEVEL_BETA_ISSUE_1 on OPENSTEP-Mach 4_1 (UNINSTALLED)
+     Branch: perl
+           ! pp_sys.c
+____________________________________________________________________________
+[  1599] By: gsar                                  on 1998/07/21  04:44:04
+        Log: add tests to check if context propagation works
+             From: Francois Desarmenien <desar@club-internet.fr>
+             Date: Sun, 19 Jul 1998 12:28:33 +0200
+             Message-ID: <35B1CA51.A606AD27@club-internet.fr>
+             Subject: Re: m//g strange behaviour in 5.004
+     Branch: perl
+           + t/op/context.t
+           ! MANIFEST
+____________________________________________________________________________
+[  1598] By: gsar                                  on 1998/07/21  04:37:49
+        Log: applied RE doc patches, with tweaks to the prose
+             From: Ilya Zakharevich <ilya@math.ohio-state.edu>
+             Date: Sat, 18 Jul 1998 23:11:13 -0400 (EDT)
+             Message-Id: <199807190311.XAA25080@monk.mps.ohio-state.edu>
+             Subject: [PATCH 5.004_72] Document irregular zero-length matches
+             --
+             Date: Sun, 19 Jul 1998 00:38:44 -0400 (EDT)
+             Message-Id: <199807190438.AAA26226@monk.mps.ohio-state.edu>
+             Subject: [PATCH 5.004_72] Another irregularity of expressions documented
+     Branch: perl
+           ! pod/perlre.pod
+____________________________________________________________________________
+[  1597] By: gsar                                  on 1998/07/21  04:16:51
+        Log: pod tweak suggested by Ilya
+     Branch: perl
+           ! pod/perlfunc.pod
+____________________________________________________________________________
+[  1596] By: gsar                                  on 1998/07/21  04:12:39
+        Log: enable color output with -Mre=debugcolor with -DDEBUGGING
+             From: Ilya Zakharevich <ilya@math.ohio-state.edu>
+             Date: Sat, 18 Jul 1998 17:34:00 -0400 (EDT)
+             Message-Id: <199807182134.RAA20644@monk.mps.ohio-state.edu>
+             Subject: [PATCH 5.004_72] Better -Mre=colordb
+     Branch: perl
+           ! ext/re/re.xs
+____________________________________________________________________________
+[  1595] By: gsar                                  on 1998/07/21  04:07:44
+        Log: From: "John L. Allen" <allen@grumman.com>
+             Date: Thu, 16 Jul 1998 11:43:54 -0400 (EDT)
+             Message-ID: <Pine.SOL.3.91.980716113018.14617A-100000@gateway.grumman.com>
+             Subject: [PATCH _75 & _05] perlbug does not report usage on invalid flags
+     Branch: perl
+           ! utils/perlbug.PL
+____________________________________________________________________________
+[  1594] By: gsar                                  on 1998/07/21  04:06:06
+        Log: don't use SelectSaver on IO::Handle->input_*() methods
+             From: Robin Barker <rmb1@cise.npl.co.uk>
+             Date: Thu, 16 Jul 1998 15:00:39 +0100 (BST)
+             Message-Id: <199807161400.PAA25532@tempest.cise.npl.co.uk>
+             Subject: Re: Bug in IO::Handle->input_record_separator
+     Branch: perl
+           ! ext/IO/lib/IO/Handle.pm
+____________________________________________________________________________
+[  1593] By: gsar                                  on 1998/07/21  04:03:46
+        Log: applied a tweaked version of suggested patch
+             From: Ilya Zakharevich <ilya@math.ohio-state.edu>
+             Date: Wed, 15 Jul 1998 17:02:48 -0400 (EDT)
+             Message-Id: <199807152102.RAA19952@monk.mps.ohio-state.edu>
+             Subject: [PATCH 5.004_72] Enable/document colors in re.pm
+     Branch: perl
+           ! ext/re/re.pm
+____________________________________________________________________________
+[  1592] By: gsar                                  on 1998/07/21  03:49:55
+        Log: remove compat3.sym and rename perld4.pod
+     Branch: perl
+          +> pod/perl5004delta.pod
+           - compat3.sym pod/perld4.pod
+           ! MANIFEST
+____________________________________________________________________________
+[  1591] By: gsar                                  on 1998/07/21  03:38:16
+        Log: update patchlevel, Changes
+     Branch: perl
+          ! Changes patchlevel.h win32/Makefile win32/config_H.bc
+           ! win32/config_H.gc win32/config_H.vc win32/makefile.mk
+____________________________________________________________________________
 [  1590] By: gsar                                  on 1998/07/21  03:06:04
         Log: documentation tweaks from Abigail <abigail@fnx.com>
              Date: Fri, 17 Jul 1998 20:52:36 -0400 (EDT)

diff --git a/MANIFEST b/MANIFEST
index aa8154a..a4629ce 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -18,6 +18,8 @@ Porting/Contract      Social contract for contributed modules in Perl core
 Porting/Glossary       Glossary of config.sh variables
 Porting/config.sh      Sample config.sh
 Porting/config_H       Sample config.h
+Porting/findvars       Find occurrences of words
+Porting/fixvars                Find undeclared variables with C compiler and fix em
 Porting/genlog         Generate formatted changelogs by querying p4d
 Porting/makerel                Release making utility
 Porting/p4d2p          Generate standard patches from p4 diffs

diff --git a/Porting/findvars b/Porting/findvars
new file mode 100755 (executable)
index 0000000..2e81244
--- /dev/null
+++ b/Porting/findvars
@@ -0,0 +1,373 @@
+#!/l/local/bin/perl -w
+
+$pat = '';
+# construct word list
+while (<DATA>) {
+  chomp;
+  next unless $_;
+  $pat .= "$_|";
+}
+chop $pat if $pat =~ /\|$/;
+
+# grep
+while (<>) {
+    if (/^(.*?)\b($pat)\b(.*)$/o) {
+        my $head = "$1#$2#";
+        $_ = $3;
+        while (/^(.*?)\b($pat)\b(.*)$/o) {
+            $head .= "$1#$2#";
+            $_ = $3;
+        }
+       print "$ARGV\:$.\:$head$_\n";
+    }
+}
+continue {
+    close ARGV if eof;
+}
+__END__
+Argv
+Cmd
+DBcv
+DBgv
+DBline
+DBsignal
+DBsingle
+DBsub
+DBtrace
+No
+Sv
+Xpv
+Yes
+amagic_generation
+ampergv
+an
+archpat_auto
+argvgv
+argvoutgv
+av_fetch_sv
+basetime
+beginav
+bodytarget
+bostr
+bufend
+bufptr
+cddir
+chopset
+collation_ix
+collation_name
+collation_standard
+collxfrm_base
+collxfrm_mult
+colors
+colorset
+compcv
+compiling
+comppad
+comppad_name
+comppad_name_fill
+comppad_name_floor
+cop_seqmax
+copline
+cryptseen
+cshlen
+cshname
+curcop
+curcopdb
+curinterp
+curpad
+curpm
+curstack
+curstackinfo
+curstash
+curstname
+curthr
+dbargs
+debdelim
+debname
+debstash
+debug
+defgv
+defoutgv
+defstash
+delaymagic
+diehook
+dirty
+dlevel
+dlmax
+do_undump
+doextract
+doswitches
+dowarn
+dumplvl
+e_script
+egid
+endav
+envgv
+errgv
+error_count
+euid
+eval_cond
+eval_mutex
+eval_owner
+eval_root
+eval_start
+evalseq
+exitlist
+exitlistlen
+expect
+extralen
+fdpid
+filemode
+firstgv
+forkprocess
+formfeed
+formtarget
+generation
+gensym
+gid
+globalstash
+he_root
+hexdigit
+hintgv
+hints
+hv_fetch_ent_mh
+hv_fetch_sv
+in_clean_all
+in_clean_objs
+in_eval
+in_my
+in_my_stash
+incgv
+initav
+inplace
+last_in_gv
+last_lop
+last_lop_op
+last_proto
+last_uni
+lastfd
+lastgotoprobe
+lastscream
+lastsize
+lastspbase
+laststatval
+laststype
+leftgv
+lex_brackets
+lex_brackstack
+lex_casemods
+lex_casestack
+lex_defer
+lex_dojoin
+lex_expect
+lex_fakebrack
+lex_formbrack
+lex_inpat
+lex_inwhat
+lex_op
+lex_repl
+lex_starts
+lex_state
+lex_stuff
+lineary
+linestart
+linestr
+localizing
+localpatches
+main_cv
+main_root
+main_start
+mainstack
+malloc_mutex
+markstack
+markstack_max
+markstack_ptr
+max_intro_pending
+maxo
+maxscream
+maxsysfd
+mess_sv
+min_intro_pending
+minus_F
+minus_a
+minus_c
+minus_l
+minus_n
+minus_p
+modcount
+modglobal
+multi_close
+multi_end
+multi_open
+multi_start
+multiline
+mystrk
+na
+nexttoke
+nexttype
+nextval
+nice_chunk
+nice_chunk_size
+ninterps
+nomemok
+nrs
+nthreads
+nthreads_cond
+numeric_local
+numeric_name
+numeric_standard
+ofmt
+ofs
+ofslen
+oldbufptr
+oldlastpm
+oldname
+oldoldbufptr
+op
+op_mask
+op_seqmax
+opsave
+origalen
+origargc
+origargv
+origenviron
+origfilename
+ors
+orslen
+osname
+pad_reset_pending
+padix
+padix_floor
+parsehook
+patchlevel
+patleave
+pending_ident
+perl_destruct_level
+perldb
+pidstatus
+preambleav
+preambled
+preprocess
+profiledata
+reg_eval_set
+reg_flags
+reg_start_tmp
+reg_start_tmpl
+regbol
+regcc
+regcode
+regcomp_parse
+regcomp_rx
+regcompp
+regdata
+regdummy
+regendp
+regeol
+regexecp
+regflags
+regindent
+reginput
+reginterp_cnt
+reglastparen
+regnarrate
+regnaughty
+regnpar
+regprecomp
+regprev
+regprogram
+regsawback
+regseen
+regsize
+regstartp
+regtill
+regxend
+replgv
+restartop
+retstack
+retstack_ix
+retstack_max
+rightgv
+rs
+rsfp
+rsfp_filters
+runops
+savestack
+savestack_ix
+savestack_max
+sawampersand
+sawstudy
+sawvec
+scopestack
+scopestack_ix
+scopestack_max
+screamfirst
+screamnext
+secondgv
+seen_evals
+seen_zerolen
+sh_path
+siggv
+sighandlerp
+sortcop
+sortcxix
+sortstash
+specialsv_list
+splitstr
+stack_base
+stack_max
+stack_sp
+start_env
+statbuf
+statcache
+statgv
+statname
+statusvalue
+statusvalue_vms
+stdingv
+strchop
+strtab
+sub_generation
+sublex_info
+subline
+subname
+sv_arenaroot
+sv_count
+sv_mutex
+sv_no
+sv_objcount
+sv_root
+sv_undef
+sv_yes
+svref_mutex
+sys_intern
+tainted
+tainting
+thisexpr
+thr_key
+threadnum
+threads_mutex
+threadsv_names
+thrsv
+timesbuf
+tmps_floor
+tmps_ix
+tmps_max
+tmps_stack
+tokenbuf
+top_env
+toptarget
+uid
+unsafe
+warnhook
+xiv_arenaroot
+xiv_root
+xnv_root
+xpv_root
+xrv_root
+piMem
+piENV
+piStdIO
+piLIO
+piDir
+piSock
+piProc

diff --git a/fixvars b/Porting/fixvars
similarity index 100%
rename from fixvars
rename to Porting/fixvars

diff --git a/intrpvar.h b/intrpvar.h
index f952d9d..b4ccc56 100644 (file)
--- a/intrpvar.h
+++ b/intrpvar.h
@@ -201,11 +201,11 @@ PERLVAR(Ithrsv,           SV *)           /* struct perl_thread for main thread */
 PERLVARI(Ithreadnum,   U32,    0)      /* incremented each thread creation */
 #endif /* USE_THREADS */
 
-PERLVARI(Iiv_overflows,        int,    0);     /* from bytecode.h */
-PERLVAR(Isv,           SV *);
-PERLVAR(Ipv,           XPV);
-PERLVAR(Iobj_list,     void **);
-PERLVARI(Iobj_list_fill, I32,  -1);
+PERLVARI(Iiv_overflows,        int,    0)      /* from bytecode.h */
+PERLVAR(Isv,           SV *)
+PERLVAR(Ipv,           XPV)
+PERLVAR(Iobj_list,     void **)
+PERLVARI(Iobj_list_fill, I32,  -1)
 
 #ifdef PERL_OBJECT
 PERLVARI(piMem,                IPerlMem*,  NULL)

diff --git a/iperlsys.h b/iperlsys.h
index f616533..0c93fd8 100644 (file)
--- a/iperlsys.h
+++ b/iperlsys.h
@@ -127,10 +127,32 @@ public:
 #endif
 };
 
-#define PerlIO_canset_cnt(f)   1
-#define PerlIO_has_base(f)     1
-#define PerlIO_has_cntptr(f)   1
-#define PerlIO_fast_gets(f)    1
+
+
+#ifdef USE_STDIO_PTR
+#  define PerlIO_has_cntptr(f)         1       
+#  ifdef STDIO_CNT_LVALUE
+#    define PerlIO_canset_cnt(f)       1      
+#    ifdef STDIO_PTR_LVALUE
+#      define PerlIO_fast_gets(f)      1        
+#    endif
+#  else
+#    define PerlIO_canset_cnt(f)       0      
+#  endif
+#else  /* USE_STDIO_PTR */
+#  define PerlIO_has_cntptr(f)         0
+#  define PerlIO_canset_cnt(f)         0
+#endif /* USE_STDIO_PTR */
+
+#ifndef PerlIO_fast_gets
+#define PerlIO_fast_gets(f)            0        
+#endif
+
+#ifdef FILE_base
+#define PerlIO_has_base(f)             1
+#else
+#define PerlIO_has_base(f)             0
+#endif
 
 #define PerlIO_stdin()         PL_piStdIO->Stdin()
 #define PerlIO_stdout()                PL_piStdIO->Stdout()

diff --git a/lib/ExtUtils/MM_Win32.pm b/lib/ExtUtils/MM_Win32.pm
index 4b478bb..72c32fb 100644 (file)
--- a/lib/ExtUtils/MM_Win32.pm
+++ b/lib/ExtUtils/MM_Win32.pm
@@ -454,9 +454,6 @@ sub perl_archive
         if ($self->{CAPI} eq 'TRUE') {
             return '$(PERL_INC)\perlCAPI$(LIB_EXT)';
         }
-        else {
-            return '$(PERL_INC)\perlcore$(LIB_EXT)';
-        }
     }
     return '$(PERL_INC)\\'.$Config{'libperl'};
 }

diff --git a/win32/perlhost.h b/win32/perlhost.h
index 57e0d2f..729dd57 100644 (file)
--- a/win32/perlhost.h
+++ b/win32/perlhost.h
@@ -652,19 +652,39 @@ public:
     };
     virtual char* GetBase(PerlIO* pf, int &err)
     {
-       return (PerlIO_has_base(pf) ? PerlIO_get_base(pf) : Nullch);
+#ifdef FILE_base
+       FILE *f = (FILE*)pf;
+       return FILE_base(f);
+#else
+       return Nullch;
+#endif
     };
     virtual int GetBufsiz(PerlIO* pf, int &err)
     {
-       return PerlIO_get_bufsiz(pf);
+#ifdef FILE_bufsize
+       FILE *f = (FILE*)pf;
+       return FILE_bufsiz(f);
+#else
+       return (-1);
+#endif
     };
     virtual int GetCnt(PerlIO* pf, int &err)
     {
-       return PerlIO_get_cnt(pf);
+#ifdef USE_STDIO_PTR
+       FILE *f = (FILE*)pf;
+       return FILE_cnt(f);
+#else
+       return (-1);
+#endif
     };
     virtual char* GetPtr(PerlIO* pf, int &err)
     {
-       return PerlIO_get_ptr(pf);
+#ifdef USE_STDIO_PTR
+       FILE *f = (FILE*)pf;
+       return FILE_ptr(f);
+#else
+       return Nullch;
+#endif
     };
     virtual char* Gets(PerlIO* pf, char* s, int n, int& err)
     {
@@ -734,15 +754,18 @@ public:
     };
     virtual void SetCnt(PerlIO* pf, int n, int &err)
     {
-       if (PerlIO_canset_cnt(pf)) {
-           PerlIO_set_cnt(pf,n);
-       }
+#ifdef STDIO_CNT_LVALUE
+       FILE *f = (FILE*)pf;
+       FILE_cnt(f) = n;
+#endif
     };
     virtual void SetPtrCnt(PerlIO* pf, char * ptr, int n, int& err)
     {
-       if (PerlIO_canset_cnt(pf)) {
-           PerlIO_set_ptrcnt(pf,ptr,n);
-       }
+#ifdef STDIO_PTR_LVALUE
+       FILE *f = (FILE*)pf;
+       FILE_ptr(f) = ptr;
+       FILE_cnt(f) = n;
+#endif
     };
     virtual void Setlinebuf(PerlIO* pf, int &err)
     {