summaryrefslogtreecommitdiff
path: root/regcomp.c
diff options
context:
space:
mode:
authorJarkko Hietaniemi <jhi@iki.fi>1999-10-02 23:05:50 +0000
committerJarkko Hietaniemi <jhi@iki.fi>1999-10-02 23:05:50 +0000
commit57def98fcb6c98601beaf31e3c48ad681bfdc2a3 (patch)
tree1c2ca5d1ae7bb4508bf076e61eda828a50a82f9d /regcomp.c
parentac8eabc1ebb57d426c973b83f7ee5241b2084b4e (diff)
downloadperl-57def98fcb6c98601beaf31e3c48ad681bfdc2a3.tar.gz
Untangle the IV_IS_QUAD jungle by introduding
macros to be used when doing formatted printing: IVdf, UVuf, UVxf, UVof. Also introduce Uid_t_SIGN. p4raw-id: //depot/cfgperl@4288
Diffstat (limited to 'regcomp.c')
-rw-r--r--regcomp.c20
1 files changed, 3 insertions, 17 deletions
diff --git a/regcomp.c b/regcomp.c
index 64c06f0027..921472a373 100644
--- a/regcomp.c
+++ b/regcomp.c
@@ -702,11 +702,7 @@ S_study_chunk(pTHX_ regnode **scanp, I32 *deltap, regnode *last, scan_data_t *da
FAIL("variable length lookbehind not implemented");
}
else if (minnext > U8_MAX) {
-#ifdef UV_IS_QUAD
- FAIL2("lookbehind longer than %" PERL_PRIu64 " not implemented", (UV)U8_MAX);
-#else
- FAIL2("lookbehind longer than %d not implemented", U8_MAX);
-#endif
+ FAIL2("lookbehind longer than %"UVuf" not implemented", (UV)U8_MAX);
}
scan->flags = minnext;
}
@@ -2840,13 +2836,8 @@ S_regclassutf8(pTHX)
if (range) {
if (lastvalue > value)
FAIL("invalid [] range in regexp"); /* [b-a] */
-#ifdef UV_IS_QUAD
- if (!SIZE_ONLY)
- Perl_sv_catpvf(aTHX_ listsv, "%04" PERL_PRIx64 "\t%04" PERL_PRIx64 "\n", (UV)lastvalue, (UV)value);
-#else
if (!SIZE_ONLY)
- Perl_sv_catpvf(aTHX_ listsv, "%04x\t%04x\n", lastvalue, value);
-#endif
+ Perl_sv_catpvf(aTHX_ listsv, "%04"UVxf"\t%04"UVxf"\n", (UV)lastvalue, (UV)value);
range = 0;
}
else {
@@ -2861,13 +2852,8 @@ S_regclassutf8(pTHX)
}
}
/* now is the next time */
-#ifdef UV_IS_QUAD
- if (!SIZE_ONLY)
- Perl_sv_catpvf(aTHX_ listsv, "%04" PERL_PRIx64 "\n", (UV)value);
-#else
if (!SIZE_ONLY)
- Perl_sv_catpvf(aTHX_ listsv, "%04x\n", value);
-#endif
+ Perl_sv_catpvf(aTHX_ listsv, "%04"UVxf"\n", (UV)value);
range = 0;
}