From 605bb55fcdaecb677c075ee439ff1e1062d4173a Mon Sep 17 00:00:00 2001 From: Karl Williamson Date: Thu, 20 Dec 2012 10:22:26 -0700 Subject: [PATCH] regcomp.c: Reorder some case: statements so can FALL THROUGH --- regcomp.c | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/regcomp.c b/regcomp.c index c9551b8..43c6c94 100644 --- a/regcomp.c +++ b/regcomp.c @@ -10151,33 +10151,6 @@ tryagain: *flagp |= SIMPLE; goto finish_meta_pat; - case 'S': - invert = 1; - /* FALLTHROUGH */ - case 's': - arg = ANYOF_SPACE; - - join_posix: - - op = POSIXD + get_regex_charset(RExC_flags); - if (op > POSIXA) { /* /aa is same as /a */ - op = POSIXA; - } - - join_posix_op_known: - - if (invert) { - op += NPOSIXD - POSIXD; - } - - ret = reg_node(pRExC_state, op); - if (! SIZE_ONLY) { - FLAGS(ret) = namedclass_to_classnum(arg); - } - - *flagp |= HASWIDTH|SIMPLE; - goto finish_meta_pat; - case 'D': invert = 1; /* FALLTHROUGH */ @@ -10206,6 +10179,33 @@ tryagain: op = POSIXU; goto join_posix_op_known; + case 'S': + invert = 1; + /* FALLTHROUGH */ + case 's': + arg = ANYOF_SPACE; + + join_posix: + + op = POSIXD + get_regex_charset(RExC_flags); + if (op > POSIXA) { /* /aa is same as /a */ + op = POSIXA; + } + + join_posix_op_known: + + if (invert) { + op += NPOSIXD - POSIXD; + } + + ret = reg_node(pRExC_state, op); + if (! SIZE_ONLY) { + FLAGS(ret) = namedclass_to_classnum(arg); + } + + *flagp |= HASWIDTH|SIMPLE; + /* FALL THROUGH */ + finish_meta_pat: nextchar(pRExC_state); Set_Node_Length(ret, 2); /* MJD */ -- 2.7.4