Change 20064 by [EMAIL PROTECTED] on 2003/07/08 05:01:15
v-string API tweak from John Peacock to synchronize
5.8.1-to-be as much as possible with 5.9.0-to-be.
Affected files ...
... //depot/maint-5.8/perl/embed.fnc#34 edit
... //depot/maint-5.8/perl/embed.h#36 edit
... //depot/maint-5.8/perl/global.sym#16 edit
... //depot/maint-5.8/perl/proto.h#31 edit
... //depot/maint-5.8/perl/toke.c#22 edit
... //depot/maint-5.8/perl/util.c#25 edit
Differences ...
==== //depot/maint-5.8/perl/embed.fnc#34 (text) ====
Index: perl/embed.fnc
--- perl/embed.fnc#33~19951~ Thu Jul 3 01:47:35 2003
+++ perl/embed.fnc Mon Jul 7 22:01:15 2003
@@ -549,7 +549,7 @@
|I32 whileline|OP* expr|OP* block|OP* cont
Ap |PERL_SI*|new_stackinfo|I32 stitems|I32 cxitems
-Apd |char* |new_vstring |char *vstr|SV *sv
+Apd |char* |scan_vstring |char *vstr|SV *sv
p |PerlIO*|nextargv |GV* gv
Ap |char* |ninstr |const char* big|const char* bigend \
|const char* little|const char* lend
==== //depot/maint-5.8/perl/embed.h#36 (text+w) ====
Index: perl/embed.h
--- perl/embed.h#35~19891~ Mon Jun 30 02:39:29 2003
+++ perl/embed.h Mon Jul 7 22:01:15 2003
@@ -752,7 +752,7 @@
#define newUNOP Perl_newUNOP
#define newWHILEOP Perl_newWHILEOP
#define new_stackinfo Perl_new_stackinfo
-#define new_vstring Perl_new_vstring
+#define scan_vstring Perl_scan_vstring
#ifdef PERL_CORE
#define nextargv Perl_nextargv
#endif
@@ -3263,7 +3263,7 @@
#define newUNOP(a,b,c) Perl_newUNOP(aTHX_ a,b,c)
#define newWHILEOP(a,b,c,d,e,f,g) Perl_newWHILEOP(aTHX_ a,b,c,d,e,f,g)
#define new_stackinfo(a,b) Perl_new_stackinfo(aTHX_ a,b)
-#define new_vstring(a,b) Perl_new_vstring(aTHX_ a,b)
+#define scan_vstring(a,b) Perl_scan_vstring(aTHX_ a,b)
#ifdef PERL_CORE
#define nextargv(a) Perl_nextargv(aTHX_ a)
#endif
==== //depot/maint-5.8/perl/global.sym#16 (text+w) ====
Index: perl/global.sym
--- perl/global.sym#15~19891~ Mon Jun 30 02:39:29 2003
+++ perl/global.sym Mon Jul 7 22:01:15 2003
@@ -326,7 +326,7 @@
Perl_newUNOP
Perl_newWHILEOP
Perl_new_stackinfo
-Perl_new_vstring
+Perl_scan_vstring
Perl_ninstr
Perl_op_free
Perl_pad_sv
==== //depot/maint-5.8/perl/proto.h#31 (text+w) ====
Index: perl/proto.h
--- perl/proto.h#30~19891~ Mon Jun 30 02:39:29 2003
+++ perl/proto.h Mon Jul 7 22:01:15 2003
@@ -528,7 +528,7 @@
PERL_CALLCONV OP* Perl_newWHILEOP(pTHX_ I32 flags, I32 debuggable, LOOP* loop,
I32 whileline, OP* expr, OP* block, OP* cont);
PERL_CALLCONV PERL_SI* Perl_new_stackinfo(pTHX_ I32 stitems, I32 cxitems);
-PERL_CALLCONV char* Perl_new_vstring(pTHX_ char *vstr, SV *sv);
+PERL_CALLCONV char* Perl_scan_vstring(pTHX_ char *vstr, SV *sv);
PERL_CALLCONV PerlIO* Perl_nextargv(pTHX_ GV* gv);
PERL_CALLCONV char* Perl_ninstr(pTHX_ const char* big, const char* bigend, const
char* little, const char* lend);
PERL_CALLCONV OP* Perl_oopsCV(pTHX_ OP* o);
==== //depot/maint-5.8/perl/toke.c#22 (text) ====
Index: perl/toke.c
--- perl/toke.c#21~19951~ Thu Jul 3 01:47:35 2003
+++ perl/toke.c Mon Jul 7 22:01:15 2003
@@ -3650,7 +3650,7 @@
case '5': case '6': case '7': case '8': case '9':
s = scan_num(s, &yylval);
DEBUG_T( { PerlIO_printf(Perl_debug_log,
- "### Saw number in '%s'\n", s);
+ "### Saw number before '%s'\n", s);
} );
if (PL_expect == XOPERATOR)
no_op("Number",s);
@@ -7551,7 +7551,10 @@
case 'v':
vstring:
sv = NEWSV(92,5); /* preallocate storage space */
- s = new_vstring(s,sv);
+ s = scan_vstring(s,sv);
+ DEBUG_T( { PerlIO_printf(Perl_debug_log,
+ "### Saw v-string before '%s'\n", s);
+ } );
break;
}
==== //depot/maint-5.8/perl/util.c#25 (text) ====
Index: perl/util.c
--- perl/util.c#24~19850~ Tue Jun 24 11:49:22 2003
+++ perl/util.c Mon Jul 7 22:01:15 2003
@@ -3926,7 +3926,7 @@
/*
=head1 SV Manipulation Functions
-=for apidoc new_vstring
+=for apidoc scan_vstring
Returns a pointer to the next character after the parsed
vstring, as well as updating the passed in sv.
@@ -3934,7 +3934,7 @@
Function must be called like
sv = NEWSV(92,5);
- s = new_vstring(s,sv);
+ s = scan_vstring(s,sv);
The sv must already be large enough to store the vstring
passed in.
@@ -3943,7 +3943,7 @@
*/
char *
-Perl_new_vstring(pTHX_ char *s, SV *sv)
+Perl_scan_vstring(pTHX_ char *s, SV *sv)
{
char *pos = s;
char *start = s;
End of Patch.
