This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
Simplify code in pp_formline, removing a goto and localising and
authorNicholas Clark <nick@ccl4.org>
Fri, 11 Jul 2008 11:20:04 +0000 (11:20 +0000)
committerNicholas Clark <nick@ccl4.org>
Fri, 11 Jul 2008 11:20:04 +0000 (11:20 +0000)
consting a variable.

p4raw-id: //depot/perl@34125

pp_ctl.c

index 93bfbb4..3c6ab23 100644 (file)
--- a/pp_ctl.c
+++ b/pp_ctl.c
@@ -438,7 +438,6 @@ PP(pp_formline)
     SV * nsv = NULL;
     OP * parseres = NULL;
     const char *fmt;
-    bool oneline;
 
     if (!SvMAGICAL(tmpForm) || !SvCOMPILED(tmpForm)) {
        if (SvREADONLY(tmpForm)) {
@@ -764,12 +763,9 @@ PP(pp_formline)
 
        case FF_LINESNGL:
            chopspace = 0;
-           oneline = TRUE;
-           goto ff_line;
        case FF_LINEGLOB:
-           oneline = FALSE;
-       ff_line:
            {
+               const bool oneline = fpc[-1] == FF_LINESNGL;
                const char *s = item = SvPV_const(sv, len);
                itemsize = len;
                if ((item_is_utf8 = DO_UTF8(sv)))