Change 18312 by [EMAIL PROTECTED] on 2002/12/17 01:43:28
Subject: [Fwd: Patch for perl utf8-related bug]
From: Richard Hitt <[EMAIL PROTECTED]>
Date: Fri, 06 Dec 2002 16:47:42 -0800
[perl #18932]
Affected files ...
... //depot/perl/embed.fnc#60 edit
... //depot/perl/embed.h#374 edit
... //depot/perl/global.sym#229 edit
... //depot/perl/perl.h#481 edit
... //depot/perl/proto.h#418 edit
... //depot/perl/regcomp.c#316 edit
... //depot/perl/scope.c#104 edit
... //depot/perl/scope.h#54 edit
Differences ...
==== //depot/perl/embed.fnc#60 (text) ====
Index: perl/embed.fnc
--- perl/embed.fnc#59~18311~ Mon Dec 16 16:52:05 2002
+++ perl/embed.fnc Mon Dec 16 17:43:28 2002
@@ -626,6 +626,7 @@
Ap |I32 |save_alloc |I32 size|I32 pad
Ap |void |save_aptr |AV** aptr
Ap |AV* |save_ary |GV* gv
+Ap |void |save_bool |bool* boolp
Ap |void |save_clearsv |SV** svp
Ap |void |save_delete |HV* hv|char* key|I32 klen
Ap |void |save_destructor|DESTRUCTORFUNC_NOCONTEXT_t f|void* p
==== //depot/perl/embed.h#374 (text+w) ====
Index: perl/embed.h
--- perl/embed.h#373~18307~ Mon Dec 16 14:01:14 2002
+++ perl/embed.h Mon Dec 16 17:43:28 2002
@@ -564,6 +564,7 @@
#define save_alloc Perl_save_alloc
#define save_aptr Perl_save_aptr
#define save_ary Perl_save_ary
+#define save_bool Perl_save_bool
#define save_clearsv Perl_save_clearsv
#define save_delete Perl_save_delete
#define save_destructor Perl_save_destructor
@@ -2122,6 +2123,7 @@
#define save_alloc(a,b) Perl_save_alloc(aTHX_ a,b)
#define save_aptr(a) Perl_save_aptr(aTHX_ a)
#define save_ary(a) Perl_save_ary(aTHX_ a)
+#define save_bool(a) Perl_save_bool(aTHX_ a)
#define save_clearsv(a) Perl_save_clearsv(aTHX_ a)
#define save_delete(a,b,c) Perl_save_delete(aTHX_ a,b,c)
#define save_destructor(a,b) Perl_save_destructor(aTHX_ a,b)
==== //depot/perl/global.sym#229 (text+w) ====
Index: perl/global.sym
--- perl/global.sym#228~18113~ Tue Nov 5 12:11:55 2002
+++ perl/global.sym Mon Dec 16 17:43:28 2002
@@ -376,6 +376,7 @@
Perl_save_alloc
Perl_save_aptr
Perl_save_ary
+Perl_save_bool
Perl_save_clearsv
Perl_save_delete
Perl_save_destructor
==== //depot/perl/perl.h#481 (text) ====
Index: perl/perl.h
--- perl/perl.h#480~18217~ Fri Nov 29 04:11:28 2002
+++ perl/perl.h Mon Dec 16 17:43:28 2002
@@ -2173,6 +2173,7 @@
I32 any_i32;
IV any_iv;
long any_long;
+ bool any_bool;
void (*any_dptr) (void*);
void (*any_dxptr) (pTHX_ void*);
};
==== //depot/perl/proto.h#418 (text+w) ====
Index: perl/proto.h
--- perl/proto.h#417~18311~ Mon Dec 16 16:52:05 2002
+++ perl/proto.h Mon Dec 16 17:43:28 2002
@@ -661,6 +661,7 @@
PERL_CALLCONV I32 Perl_save_alloc(pTHX_ I32 size, I32 pad);
PERL_CALLCONV void Perl_save_aptr(pTHX_ AV** aptr);
PERL_CALLCONV AV* Perl_save_ary(pTHX_ GV* gv);
+PERL_CALLCONV void Perl_save_bool(pTHX_ bool* boolp);
PERL_CALLCONV void Perl_save_clearsv(pTHX_ SV** svp);
PERL_CALLCONV void Perl_save_delete(pTHX_ HV* hv, char* key, I32 klen);
PERL_CALLCONV void Perl_save_destructor(pTHX_ DESTRUCTORFUNC_NOCONTEXT_t f, void*
p);
==== //depot/perl/regcomp.c#316 (text) ====
Index: perl/regcomp.c
--- perl/regcomp.c#315~18268~ Sun Dec 8 16:14:58 2002
+++ perl/regcomp.c Mon Dec 16 17:43:28 2002
@@ -5058,7 +5058,7 @@
SAVEVPTR(PL_reg_re); /* from regexec.c */
SAVEPPTR(PL_reg_ganch); /* from regexec.c */
SAVESPTR(PL_reg_sv); /* from regexec.c */
- SAVEI8(PL_reg_match_utf8); /* from regexec.c */
+ SAVEBOOL(PL_reg_match_utf8); /* from regexec.c */
SAVEVPTR(PL_reg_magic); /* from regexec.c */
SAVEI32(PL_reg_oldpos); /* from regexec.c */
SAVEVPTR(PL_reg_oldcurpm); /* from regexec.c */
==== //depot/perl/scope.c#104 (text) ====
Index: perl/scope.c
--- perl/scope.c#103~18048~ Tue Oct 22 10:04:26 2002
+++ perl/scope.c Mon Dec 16 17:43:28 2002
@@ -391,6 +391,15 @@
}
void
+Perl_save_bool(pTHX_ bool *boolp)
+{
+ SSCHECK(3);
+ SSPUSHBOOL(*boolp);
+ SSPUSHPTR(boolp);
+ SSPUSHINT(SAVEt_BOOL);
+}
+
+void
Perl_save_I32(pTHX_ I32 *intp)
{
SSCHECK(3);
@@ -788,6 +797,10 @@
case SAVEt_LONG: /* long reference */
ptr = SSPOPPTR;
*(long*)ptr = (long)SSPOPLONG;
+ break;
+ case SAVEt_BOOL: /* bool reference */
+ ptr = SSPOPPTR;
+ *(bool*)ptr = (bool)SSPOPBOOL;
break;
case SAVEt_I32: /* I32 reference */
ptr = SSPOPPTR;
==== //depot/perl/scope.h#54 (text) ====
Index: perl/scope.h
--- perl/scope.h#53~18048~ Tue Oct 22 10:04:26 2002
+++ perl/scope.h Mon Dec 16 17:43:28 2002
@@ -45,6 +45,7 @@
#define SAVEt_PADSV 35
#define SAVEt_MORTALIZESV 36
#define SAVEt_SHARED_PVREF 37
+#define SAVEt_BOOL 38
#ifndef SCOPE_SAVES_SIGNAL_MASK
#define SCOPE_SAVES_SIGNAL_MASK 0
@@ -53,12 +54,14 @@
#define SSCHECK(need) if (PL_savestack_ix + need > PL_savestack_max) savestack_grow()
#define SSPUSHINT(i) (PL_savestack[PL_savestack_ix++].any_i32 = (I32)(i))
#define SSPUSHLONG(i) (PL_savestack[PL_savestack_ix++].any_long = (long)(i))
+#define SSPUSHBOOL(p) (PL_savestack[PL_savestack_ix++].any_bool = (p))
#define SSPUSHIV(i) (PL_savestack[PL_savestack_ix++].any_iv = (IV)(i))
#define SSPUSHPTR(p) (PL_savestack[PL_savestack_ix++].any_ptr = (void*)(p))
#define SSPUSHDPTR(p) (PL_savestack[PL_savestack_ix++].any_dptr = (p))
#define SSPUSHDXPTR(p) (PL_savestack[PL_savestack_ix++].any_dxptr = (p))
#define SSPOPINT (PL_savestack[--PL_savestack_ix].any_i32)
#define SSPOPLONG (PL_savestack[--PL_savestack_ix].any_long)
+#define SSPOPBOOL (PL_savestack[--PL_savestack_ix].any_bool)
#define SSPOPIV (PL_savestack[--PL_savestack_ix].any_iv)
#define SSPOPPTR (PL_savestack[--PL_savestack_ix].any_ptr)
#define SSPOPDPTR (PL_savestack[--PL_savestack_ix].any_dptr)
@@ -116,6 +119,7 @@
#define SAVEINT(i) save_int(SOFT_CAST(int*)&(i))
#define SAVEIV(i) save_iv(SOFT_CAST(IV*)&(i))
#define SAVELONG(l) save_long(SOFT_CAST(long*)&(l))
+#define SAVEBOOL(b) save_bool(SOFT_CAST(bool*)&(b))
#define SAVESPTR(s) save_sptr((SV**)&(s))
#define SAVEPPTR(s) save_pptr(SOFT_CAST(char**)&(s))
#define SAVEVPTR(s) save_vptr((void*)&(s))
End of Patch.