Received: by 10.68.248.34 with SMTP id yj2mr7087131pbc.2.1351247403655;
Fri, 26 Oct 2012 03:30:03 -0700 (PDT)
MIME-Version: 1.0
Newsgroups: perl.perl5.changes
Path: 6ni29426pbd.1!nntp.google.com!npeer02.iad.highwinds-media.com!feed-me.highwinds-media.com!cyclone02.ams2.highwinds-media.com!news.highwinds-media.com!voer-me.highwinds-media.com!goblin2!goblin3!goblin.stu.neva.ru!nntp.develooper.com!nntp.perl.org
Return-Path: <demer...@gmail.com>
Mailing-List: contact perl5-changes-h...@perl.org; run by ezmlm
Delivered-To: mailing list perl5-chan...@perl.org
Received: (qmail 29640 invoked from network); 26 Oct 2012 10:23:52 -0000
Received: from x1.develooper.com (207.171.7.70)
by x6.develooper.com with SMTP; 26 Oct 2012 10:23:52 -0000
Received: (qmail 22503 invoked by uid 225); 26 Oct 2012 10:23:52 -0000
Delivered-To: perl5-chan...@perl.org
Received: (qmail 22499 invoked by alias); 26 Oct 2012 10:23:52 -0000
X-Spam-Status: No, hits=-0.9 required=8.0
tests=BAYES_00,DKIM_ADSP_CUSTOM_MED,FREEMAIL_FROM,NML_ADSP_CUSTOM_MED,RCVD_IN_DNSWL_LOW,SPF_NEUTRAL
X-Spam-Check-By: la.mx.develooper.com
Received: from vicugna.booking.com (HELO vicugna.ams6.corp.booking.com) (87.233.215.178)
by la.mx.develooper.com (qpsmtpd/0.28) with ESMTP; Fri, 26 Oct 2012 03:23:49 -0700
Received: from camel.ams6.corp.booking.com ([10.43.1.2])
by vicugna.ams6.corp.booking.com with esmtp (Exim 4.63)
(envelope-from <demer...@gmail.com>)
id 1TRh4r-0001e1-4t
for perl5-chan...@perl.org; Fri, 26 Oct 2012 12:23:45 +0200
Received: from demerphq by camel.ams6.corp.booking.com with local (Exim 4.63)
(envelope-from <demer...@gmail.com>)
id 1TRh4r-00049P-0q
for perl5-chan...@perl.org; Fri, 26 Oct 2012 12:23:45 +0200
To: perl5-chan...@perl.org
Subject: [perl.git] branch blead, updated. v5.17.5-66-g6b54ddc
Reply-To: "Perl5 Porters" <perl5-port...@perl.org>
X-Git-Refname: refs/heads/blead
X-Git-Refname-SHA1: 6b54ddc5f039cda5c3fd0fa36516955199bdb957
X-Git-Reftype: branch
X-Git-Oldrev: 9493bd02dc3e10bea1209cd27f5c6a7603b1f521
X-Git-Newrev: 6b54ddc5f039cda5c3fd0fa36516955199bdb957
Message-ID: <E1TRh4r-00049P...@camel.ams6.corp.booking.com>
Date: Fri, 26 Oct 2012 12:23:45 +0200
X-Spam-Helo: camel.ams6.corp.booking.com
Approved: n...@nntp.perl.org
From: demer...@gmail.com ("Yves Orton")
X-Received-Bytes: 6164
In perl.git, the branch blead has been updated
<http://perl5.git.perl.org/perl.git/commitdiff/6b54ddc5f039cda5c3fd0fa36516955199bdb957?hp=9493bd02dc3e10bea1209cd27f5c6a7603b1f521>
- Log -----------------------------------------------------------------
commit 6b54ddc5f039cda5c3fd0fa36516955199bdb957
Author: Yves Orton <demer...@gmail.com>
Date: Sun Oct 21 15:04:47 2012 +0200
fix a compile warning and refactor some diagnostics in regexec.c
-----------------------------------------------------------------------
Summary of changes:
regexec.c | 25 ++++++++++---------------
1 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/regexec.c b/regexec.c
index 4029f1e..c499cd2 100644
--- a/regexec.c
+++ b/regexec.c
@@ -42,6 +42,11 @@
const char* const non_utf8_target_but_utf8_required
= "Can't match, because target string needs to be in UTF-8\n";
+#define NON_UTF8_TARGET_BUT_UTF8_REQUIRED(target) STMT_START { \
+ DEBUG_EXECUTE_r(PerlIO_printf(Perl_debug_log, "%s", non_utf8_target_but_utf8_required));\
+ goto target; \
+} STMT_END
+
/*
* pregcomp and pregexec -- regsub and regerror are not used in perl
*
@@ -639,9 +644,7 @@ Perl_re_intuit_start(pTHX_ REGEXP * const rx, SV *sv, char *strpos,
} else {
if (!prog->check_substr && prog->check_utf8) {
if (! to_byte_substr(prog)) {
- DEBUG_EXECUTE_r(PerlIO_printf(Perl_debug_log,
- non_utf8_target_but_utf8_required));
- goto fail;
+ NON_UTF8_TARGET_BUT_UTF8_REQUIRED(fail);
}
}
check = prog->check_substr;
@@ -2345,9 +2348,7 @@ Perl_regexec_flags(pTHX_ REGEXP * const rx, char *stringarg, register char *stre
else {
if (! prog->anchored_substr) {
if (! to_byte_substr(prog)) {
- DEBUG_EXECUTE_r(PerlIO_printf(Perl_debug_log,
- non_utf8_target_but_utf8_required));
- goto phooey;
+ NON_UTF8_TARGET_BUT_UTF8_REQUIRED(phooey);
}
}
ch = SvPVX_const(prog->anchored_substr)[0];
@@ -2388,9 +2389,7 @@ Perl_regexec_flags(pTHX_ REGEXP * const rx, char *stringarg, register char *stre
else {
if (! prog->anchored_substr) {
if (! to_byte_substr(prog)) {
- DEBUG_EXECUTE_r(PerlIO_printf(Perl_debug_log,
- non_utf8_target_but_utf8_required));
- goto phooey;
+ NON_UTF8_TARGET_BUT_UTF8_REQUIRED(phooey);
}
}
must = prog->anchored_substr;
@@ -2406,9 +2405,7 @@ Perl_regexec_flags(pTHX_ REGEXP * const rx, char *stringarg, register char *stre
else {
if (! prog->float_substr) {
if (! to_byte_substr(prog)) {
- DEBUG_EXECUTE_r(PerlIO_printf(Perl_debug_log,
- non_utf8_target_but_utf8_required));
- goto phooey;
+ NON_UTF8_TARGET_BUT_UTF8_REQUIRED(phooey);
}
}
must = prog->float_substr;
@@ -2519,9 +2516,7 @@ Perl_regexec_flags(pTHX_ REGEXP * const rx, char *stringarg, register char *stre
else {
if (! prog->float_substr) {
if (! to_byte_substr(prog)) {
- DEBUG_EXECUTE_r(PerlIO_printf(Perl_debug_log,
- non_utf8_target_but_utf8_required));
- goto phooey;
+ NON_UTF8_TARGET_BUT_UTF8_REQUIRED(phooey);
}
}
float_real = prog->float_substr;
--
Perl5 Master Repository
Message from discussion branch blead, updated. v5.17.5-66-g6b54ddc
| Create a group - Google Groups - Google Home - Terms of Service - Privacy Policy |
| ©2013 Google |