Change 29457 by [EMAIL PROTECTED] on 2006/12/04 16:24:09
Actually submit previous change.
Affected files ...
... //depot/perl/embed.fnc#434 edit
... //depot/perl/embed.h#644 edit
... //depot/perl/global.sym#314 edit
... //depot/perl/proto.h#775 edit
... //depot/perl/regcomp.c#523 edit
Differences ...
==== //depot/perl/embed.fnc#434 (text) ====
Index: perl/embed.fnc
--- perl/embed.fnc#433~29456~ 2006-12-04 08:15:54.000000000 -0800
+++ perl/embed.fnc 2006-12-04 08:24:09.000000000 -0800
@@ -675,6 +675,7 @@
Ap |void* |regdupe_internal|NN const regexp* r|NN CLONE_PARAMS* param
#endif
Ap |regexp*|pregcomp |NN char* exp|NN char* xend|NN PMOP* pm
+Ap |regexp*|re_compile |NN char* exp|NN char* xend|NN PMOP* pm
Ap |char* |re_intuit_start|NN regexp* prog|NULLOK SV* sv|NN char* strpos \
|NN char* strend|U32 flags \
|NULLOK struct re_scream_pos_data_s *data
==== //depot/perl/embed.h#644 (text+w) ====
Index: perl/embed.h
--- perl/embed.h#643~29456~ 2006-12-04 08:15:54.000000000 -0800
+++ perl/embed.h 2006-12-04 08:24:09.000000000 -0800
@@ -686,6 +686,7 @@
#define regdupe_internal Perl_regdupe_internal
#endif
#define pregcomp Perl_pregcomp
+#define re_compile Perl_re_compile
#define re_intuit_start Perl_re_intuit_start
#define re_intuit_string Perl_re_intuit_string
#define regexec_flags Perl_regexec_flags
@@ -2897,6 +2898,7 @@
#define regdupe_internal(a,b) Perl_regdupe_internal(aTHX_ a,b)
#endif
#define pregcomp(a,b,c) Perl_pregcomp(aTHX_ a,b,c)
+#define re_compile(a,b,c) Perl_re_compile(aTHX_ a,b,c)
#define re_intuit_start(a,b,c,d,e,f) Perl_re_intuit_start(aTHX_ a,b,c,d,e,f)
#define re_intuit_string(a) Perl_re_intuit_string(aTHX_ a)
#define regexec_flags(a,b,c,d,e,f,g,h) Perl_regexec_flags(aTHX_
a,b,c,d,e,f,g,h)
==== //depot/perl/global.sym#314 (text+w) ====
Index: perl/global.sym
--- perl/global.sym#313~29456~ 2006-12-04 08:15:54.000000000 -0800
+++ perl/global.sym 2006-12-04 08:24:09.000000000 -0800
@@ -390,6 +390,7 @@
Perl_reg_stringify
Perl_regdupe_internal
Perl_pregcomp
+Perl_re_compile
Perl_re_intuit_start
Perl_re_intuit_string
Perl_regexec_flags
==== //depot/perl/proto.h#775 (text+w) ====
Index: perl/proto.h
--- perl/proto.h#774~29456~ 2006-12-04 08:15:54.000000000 -0800
+++ perl/proto.h 2006-12-04 08:24:09.000000000 -0800
@@ -1851,6 +1851,11 @@
__attribute__nonnull__(pTHX_2)
__attribute__nonnull__(pTHX_3);
+PERL_CALLCONV regexp* Perl_re_compile(pTHX_ char* exp, char* xend, PMOP* pm)
+ __attribute__nonnull__(pTHX_1)
+ __attribute__nonnull__(pTHX_2)
+ __attribute__nonnull__(pTHX_3);
+
PERL_CALLCONV char* Perl_re_intuit_start(pTHX_ regexp* prog, SV* sv, char*
strpos, char* strend, U32 flags, struct re_scream_pos_data_s *data)
__attribute__nonnull__(pTHX_1)
__attribute__nonnull__(pTHX_3)
==== //depot/perl/regcomp.c#523 (text) ====
Index: perl/regcomp.c
--- perl/regcomp.c#522~29456~ 2006-12-04 08:15:54.000000000 -0800
+++ perl/regcomp.c 2006-12-04 08:24:09.000000000 -0800
@@ -3965,9 +3965,6 @@
extern const struct regexp_engine my_reg_engine;
#define RE_ENGINE_PTR &my_reg_engine
#endif
-/* these make a few things look better, to avoid indentation */
-#define BEGIN_BLOCK {
-#define END_BLOCK }
regexp *
Perl_pregcomp(pTHX_ char *exp, char *xend, PMOP *pm)
@@ -3976,7 +3973,7 @@
GET_RE_DEBUG_FLAGS_DECL;
DEBUG_r(if (!PL_colorset) reginitcolors());
#ifndef PERL_IN_XSUB_RE
- BEGIN_BLOCK
+ {
/* Dispatch a request to compile a regexp to correct
regexp engine. */
HV * const table = GvHV(PL_hintgv);
@@ -3991,9 +3988,15 @@
return CALLREGCOMP_ENG(eng, exp, xend, pm);
}
}
- END_BLOCK
+ }
#endif
- BEGIN_BLOCK
+ return Perl_re_compile(aTHX_ exp, xend, pm);
+}
+
+regexp *
+Perl_re_compile(pTHX_ char *exp, char *xend, PMOP *pm)
+{
+ dVAR;
register regexp *r;
register regexp_internal *ri;
regnode *scan;
@@ -4009,6 +4012,7 @@
int restudied= 0;
RExC_state_t copyRExC_state;
#endif
+ GET_RE_DEBUG_FLAGS_DECL;
if (exp == NULL)
FAIL("NULL regexp argument");
@@ -4594,11 +4598,9 @@
PerlIO_printf(Perl_debug_log, "\n");
});
return(r);
- END_BLOCK
}
#undef CORE_ONLY_BLOCK
-#undef END_BLOCK
#undef RE_ENGINE_PTR
#ifndef PERL_IN_XSUB_RE
End of Patch.
