[Pcre-svn] [493] code/trunk/src: JIT style fixes.

Revision: 493

          http://www.exim.org/viewvc/pcre2?view=rev&revision=493
Author:   zherczeg
Date:     2016-02-24 10:17:10 +0000 (Wed, 24 Feb 2016)
Log Message:
-----------
JIT style fixes.

Modified Paths:
--------------
    code/trunk/src/pcre2_jit_compile.c
    code/trunk/src/pcre2_jit_test.c

Modified: code/trunk/src/pcre2_jit_compile.c
===================================================================
--- code/trunk/src/pcre2_jit_compile.c    2016-02-16 10:23:06 UTC (rev 492)
+++ code/trunk/src/pcre2_jit_compile.c    2016-02-24 10:17:10 UTC (rev 493)
@@ -3603,7 +3603,8 @@

     case OP_CLASS:
 #if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH == 8
-    if (common->utf && !is_char7_bitset((const sljit_ub *)(cc + 1), FALSE)) return consumed;
+    if (common->utf && !is_char7_bitset((const sljit_ub *)(cc + 1), FALSE))
+      return consumed;
 #endif
     class = TRUE;
     break;
@@ -4548,7 +4549,6 @@
 }

#undef MAX_N_CHARS
-#undef MAX_N_BYTES

static SLJIT_INLINE void fast_forward_first_char(compiler_common *common, PCRE2_UCHAR first_char, BOOL caseless)
{
@@ -11194,10 +11194,8 @@
OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), common->match_end_ptr);
}

-if (common->fast_forward_bc_ptr != NULL)
-  OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(SLJIT_SP), PRIVATE_DATA(common->fast_forward_bc_ptr + 1));
-else
-  OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(SLJIT_SP), common->start_ptr);
+OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(SLJIT_SP),
+    (common->fast_forward_bc_ptr != NULL) ? (PRIVATE_DATA(common->fast_forward_bc_ptr + 1)) : common->start_ptr);

 if ((re->overall_options & PCRE2_ANCHORED) == 0)
   {
@@ -11218,9 +11216,7 @@
       }
     }
   else
-    {
     CMPTO(SLJIT_LESS, STR_PTR, 0, (common->match_end_ptr == 0) ? STR_END : TMP1, 0, mainloop_label);
-    }
   }

/* No more remaining characters. */

Modified: code/trunk/src/pcre2_jit_test.c
===================================================================
--- code/trunk/src/pcre2_jit_test.c    2016-02-16 10:23:06 UTC (rev 492)
+++ code/trunk/src/pcre2_jit_test.c    2016-02-24 10:17:10 UTC (rev 493)
@@ -140,7 +140,6 @@
 #define F_DIFF        0x080000
 #define F_FORCECONV    0x100000
 #define F_PROPERTY    0x200000
-#define F_STUDY        0x400000

 struct regression_test_case {
     int compile_options;
@@ -779,11 +778,11 @@
     { MU, A, 0, 0, "(?(DEFINE)(a(*:aa)))a(?1)b|aac", "aac" },
     { MU, A, 0, 0, "(a(*:aa)){0}(?:b(?1)b|c)+c", "babbab cc" },
     { MU, A, 0, 0, "(a(*:aa)){0}(?:b(?1)b)+", "babba" },
-    { MU, A, 0, 0 | F_NOMATCH | F_STUDY, "(a(*:aa)){0}(?:b(?1)b)+", "ba" },
+    { MU, A, 0, 0 | F_NOMATCH, "(a(*:aa)){0}(?:b(?1)b)+", "ba" },
     { MU, A, 0, 0, "(a\\K(*:aa)){0}(?:b(?1)b|c)+c", "babbab cc" },
     { MU, A, 0, 0, "(a\\K(*:aa)){0}(?:b(?1)b)+", "babba" },
-    { MU, A, 0, 0 | F_NOMATCH | F_STUDY, "(a\\K(*:aa)){0}(?:b(?1)b)+", "ba" },
-    { MU, A, 0, 0 | F_NOMATCH | F_STUDY, "(*:mark)m", "a" },
+    { MU, A, 0, 0 | F_NOMATCH, "(a\\K(*:aa)){0}(?:b(?1)b)+", "ba" },
+    { MU, A, 0, 0 | F_NOMATCH, "(*:mark)m", "a" },

     /* (*COMMIT) verb. */
     { MU, A, 0, 0 | F_NOMATCH, "a(*COMMIT)b", "ac" },