Skip to content

Commit 0d188e3

Browse files
committed
regcomp.c - change how we show flags in panic messages
use "flags:" instead of "flags=" as this makes it easier to distinguish cases where we are debugging the value of flags versus assigning to it.
1 parent 31e9c4b commit 0d188e3

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

Diff for: regcomp.c

+12-12
Original file line numberDiff line numberDiff line change
@@ -1792,7 +1792,7 @@ Perl_re_op_compile(pTHX_ SV ** const patternp, int pat_count,
17921792
}
17931793
else if (! MUST_RESTART(flags)) {
17941794
ReREFCNT_dec(Rx);
1795-
Perl_croak(aTHX_ "panic: reg returned failure to re_op_compile, flags=%#" UVxf, (UV) flags);
1795+
Perl_croak(aTHX_ "panic: reg returned failure to re_op_compile, flags: %#" UVxf, (UV) flags);
17961796
}
17971797

17981798
/* Here, we either have success, or we have to redo the parse for some reason */
@@ -4040,7 +4040,7 @@ S_reg(pTHX_ RExC_state_t *pRExC_state, I32 paren, I32 *flagp, U32 depth)
40404040
br = regbranch(pRExC_state, &flags, 1, depth+1);
40414041
if (br == 0) {
40424042
RETURN_FAIL_ON_RESTART(flags,flagp);
4043-
FAIL2("panic: regbranch returned failure, flags=%#" UVxf,
4043+
FAIL2("panic: regbranch returned failure, flags: %#" UVxf,
40444044
(UV) flags);
40454045
} else
40464046
if (! REGTAIL(pRExC_state, br, reg1node(pRExC_state,
@@ -4061,7 +4061,7 @@ S_reg(pTHX_ RExC_state_t *pRExC_state, I32 paren, I32 *flagp, U32 depth)
40614061

40624062
if (!regbranch(pRExC_state, &flags, 1, depth+1)) {
40634063
RETURN_FAIL_ON_RESTART(flags, flagp);
4064-
FAIL2("panic: regbranch returned failure, flags=%#" UVxf,
4064+
FAIL2("panic: regbranch returned failure, flags: %#" UVxf,
40654065
(UV) flags);
40664066
}
40674067
if (! REGTAIL(pRExC_state, ret, lastbr)) {
@@ -4240,7 +4240,7 @@ S_reg(pTHX_ RExC_state_t *pRExC_state, I32 paren, I32 *flagp, U32 depth)
42404240

42414241
if (br == 0) {
42424242
RETURN_FAIL_ON_RESTART(flags, flagp);
4243-
FAIL2("panic: regbranch returned failure, flags=%#" UVxf, (UV) flags);
4243+
FAIL2("panic: regbranch returned failure, flags: %#" UVxf, (UV) flags);
42444244
}
42454245
if (*RExC_parse == '|') {
42464246
if (RExC_use_BRANCHJ) {
@@ -4289,7 +4289,7 @@ S_reg(pTHX_ RExC_state_t *pRExC_state, I32 paren, I32 *flagp, U32 depth)
42894289

42904290
if (br == 0) {
42914291
RETURN_FAIL_ON_RESTART(flags, flagp);
4292-
FAIL2("panic: regbranch returned failure, flags=%#" UVxf, (UV) flags);
4292+
FAIL2("panic: regbranch returned failure, flags: %#" UVxf, (UV) flags);
42934293
}
42944294
if (! REGTAIL(pRExC_state, lastbr, br)) { /* BRANCH -> BRANCH. */
42954295
REQUIRE_BRANCHJ(flagp, 0);
@@ -4567,7 +4567,7 @@ S_regbranch(pTHX_ RExC_state_t *pRExC_state, I32 *flagp, I32 first, U32 depth)
45674567
if (flags & TRYAGAIN)
45684568
continue;
45694569
RETURN_FAIL_ON_RESTART(flags, flagp);
4570-
FAIL2("panic: regpiece returned failure, flags=%#" UVxf, (UV) flags);
4570+
FAIL2("panic: regpiece returned failure, flags: %#" UVxf, (UV) flags);
45714571
}
45724572
else if (ret == 0)
45734573
ret = latest;
@@ -4800,7 +4800,7 @@ S_regpiece(pTHX_ RExC_state_t *pRExC_state, I32 *flagp, U32 depth)
48004800
ret = regatom(pRExC_state, &flags, depth+1);
48014801
if (ret == 0) {
48024802
RETURN_FAIL_ON_RESTART_OR_FLAGS(flags, flagp, TRYAGAIN);
4803-
FAIL2("panic: regatom returned failure, flags=%#" UVxf, (UV) flags);
4803+
FAIL2("panic: regatom returned failure, flags: %#" UVxf, (UV) flags);
48044804
}
48054805
I32 npar_after = RExC_npar-1;
48064806

@@ -5474,7 +5474,7 @@ S_grok_bslash_N(pTHX_ RExC_state_t *pRExC_state,
54745474

54755475
if (! *node_p) {
54765476
RETURN_FAIL_ON_RESTART(flags, flagp);
5477-
FAIL2("panic: reg returned failure to grok_bslash_N, flags=%#" UVxf,
5477+
FAIL2("panic: reg returned failure to grok_bslash_N, flags: %#" UVxf,
54785478
(UV) flags);
54795479
}
54805480
*flagp |= flags&(HASWIDTH|SIMPLE|POSTPONED);
@@ -5649,7 +5649,7 @@ S_regatom(pTHX_ RExC_state_t *pRExC_state, I32 *flagp, U32 depth)
56495649
NULL);
56505650
if (ret == 0) {
56515651
RETURN_FAIL_ON_RESTART_FLAGP(flagp);
5652-
FAIL2("panic: regclass returned failure to regatom, flags=%#" UVxf,
5652+
FAIL2("panic: regclass returned failure to regatom, flags: %#" UVxf,
56535653
(UV) *flagp);
56545654
}
56555655
if (*RExC_parse != ']') {
@@ -5672,7 +5672,7 @@ S_regatom(pTHX_ RExC_state_t *pRExC_state, I32 *flagp, U32 depth)
56725672
goto tryagain;
56735673
}
56745674
RETURN_FAIL_ON_RESTART(flags, flagp);
5675-
FAIL2("panic: reg returned failure to regatom, flags=%#" UVxf,
5675+
FAIL2("panic: reg returned failure to regatom, flags: %#" UVxf,
56765676
(UV) flags);
56775677
}
56785678
*flagp |= flags&(HASWIDTH|SIMPLE|POSTPONED);
@@ -5931,7 +5931,7 @@ S_regatom(pTHX_ RExC_state_t *pRExC_state, I32 *flagp, U32 depth)
59315931
/* regclass() can only return RESTART_PARSE and NEED_UTF8 if
59325932
* multi-char folds are allowed. */
59335933
if (!ret)
5934-
FAIL2("panic: regclass returned failure to regatom, flags=%#" UVxf,
5934+
FAIL2("panic: regclass returned failure to regatom, flags: %#" UVxf,
59355935
(UV) *flagp);
59365936

59375937
RExC_parse--; /* regclass() leaves this one too far ahead */
@@ -9178,7 +9178,7 @@ S_handle_regex_sets(pTHX_ RExC_state_t *pRExC_state, SV** return_invlist,
91789178
return node;
91799179

91809180
regclass_failed:
9181-
FAIL2("panic: regclass returned failure to handle_sets, " "flags=%#" UVxf,
9181+
FAIL2("panic: regclass returned failure to handle_sets, " "flags: %#" UVxf,
91829182
(UV) *flagp);
91839183
}
91849184

0 commit comments

Comments
 (0)