From 33daa3a50a57e3de862a1f030c6b064a95a07217 Mon Sep 17 00:00:00 2001 From: Karl Williamson Date: Sun, 24 Feb 2013 17:23:15 -0700 Subject: Don't refer to U+XXXX when mean native These messages say the output number is Unicode, but it is really native, so change to saying is 0xXXXX. --- regen/regcharclass_multi_char_folds.pl | 2 +- regexec.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/regen/regcharclass_multi_char_folds.pl b/regen/regcharclass_multi_char_folds.pl index f04be85c58..7a4c2a6d96 100644 --- a/regen/regcharclass_multi_char_folds.pl +++ b/regen/regcharclass_multi_char_folds.pl @@ -71,7 +71,7 @@ sub multi_char_folds ($) { # for ascii chars in EXACTFA (and EXACTFL) nodes. But I (khw) doubt # that there will ever be such a fold created by Unicode, so the code # isn't there to occupy space and time; instead there is this check. - die sprintf("regcomp.c can't cope with a latin1 multi-char fold (found in the fold of U+%X", $cp_ref->[$i]) if grep { $_ < 256 && chr($_) !~ /[[:ascii:]]/ } @{$folds_ref->[$i]}; + die sprintf("regcomp.c can't cope with a latin1 multi-char fold (found in the fold of 0x%X", $cp_ref->[$i]) if grep { $_ < 256 && chr($_) !~ /[[:ascii:]]/ } @{$folds_ref->[$i]}; # Create a line that looks like "\x{foo}\x{bar}\x{baz}" of the code # points that make up the fold. diff --git a/regexec.c b/regexec.c index ce22a00ed1..b83272d593 100644 --- a/regexec.c +++ b/regexec.c @@ -5908,7 +5908,7 @@ NULL /* simulate B failing */ DEBUG_OPTIMISE_r( PerlIO_printf(Perl_debug_log, - "%*s CURLYM Fast bail next target=U+%"UVXf" c1=U+%"UVXf" c2=U+%"UVXf"\n", + "%*s CURLYM Fast bail next target=0x%"UVXf" c1=0x%"UVXf" c2=0x%"UVXf"\n", (int)(REPORT_CODE_OFF+(depth*2)),"", valid_utf8_to_uvchr((U8 *) locinput, NULL), valid_utf8_to_uvchr(ST.c1_utf8, NULL), @@ -5922,7 +5922,7 @@ NULL /* simulate B failing */ DEBUG_OPTIMISE_r( PerlIO_printf(Perl_debug_log, - "%*s CURLYM Fast bail next target=U+%X c1=U+%X c2=U+%X\n", + "%*s CURLYM Fast bail next target=0x%X c1=0x%X c2=0x%X\n", (int)(REPORT_CODE_OFF+(depth*2)),"", (int) nextchr, ST.c1, ST.c2) ); -- cgit v1.2.1