[Pcre-svn] [911] code/trunk: Fixing a wrong JIT test case

Revision: 911

          http://vcs.pcre.org/viewvc?view=rev&revision=911
Author:   zherczeg
Date:     2012-02-10 08:05:30 +0000 (Fri, 10 Feb 2012)

Log Message:
-----------
Fixing a wrong JIT test case

Modified Paths:
--------------
    code/trunk/ChangeLog
    code/trunk/pcre_jit_compile.c
    code/trunk/pcre_jit_test.c

Modified: code/trunk/ChangeLog
===================================================================
--- code/trunk/ChangeLog    2012-02-04 15:02:53 UTC (rev 910)
+++ code/trunk/ChangeLog    2012-02-10 08:05:30 UTC (rev 911)
@@ -1,6 +1,11 @@
 ChangeLog for PCRE
 ------------------

+Version 8.31
+-----------------------------
+1. Fixing a wrong JIT test case and some compiler warnings.
+
+
Version 8.30 04-February-2012
-----------------------------

Modified: code/trunk/pcre_jit_compile.c
===================================================================
--- code/trunk/pcre_jit_compile.c    2012-02-04 15:02:53 UTC (rev 910)
+++ code/trunk/pcre_jit_compile.c    2012-02-10 08:05:30 UTC (rev 911)
@@ -6504,14 +6504,14 @@
   mainloop = mainloop_entry(common, (re->flags & PCRE_HASCRORLF) != 0, (re->options & PCRE_FIRSTLINE) != 0);
   /* Forward search if possible. */
   if ((re->flags & PCRE_FIRSTSET) != 0)
-    fast_forward_first_char(common, re->first_char, (re->flags & PCRE_FCH_CASELESS) != 0, (re->options & PCRE_FIRSTLINE) != 0);
+    fast_forward_first_char(common, (pcre_uchar)re->first_char, (re->flags & PCRE_FCH_CASELESS) != 0, (re->options & PCRE_FIRSTLINE) != 0);
   else if ((re->flags & PCRE_STARTLINE) != 0)
     fast_forward_newline(common, (re->options & PCRE_FIRSTLINE) != 0);
   else if ((re->flags & PCRE_STARTLINE) == 0 && study != NULL && (study->flags & PCRE_STUDY_MAPPED) != 0)
     fast_forward_start_bits(common, (sljit_uw)study->start_bits, (re->options & PCRE_FIRSTLINE) != 0);
   }
 if ((re->flags & PCRE_REQCHSET) != 0)
-  reqbyte_notfound = search_requested_char(common, re->req_char, (re->flags & PCRE_RCH_CASELESS) != 0, (re->flags & PCRE_FIRSTSET) != 0);
+  reqbyte_notfound = search_requested_char(common, (pcre_uchar)re->req_char, (re->flags & PCRE_RCH_CASELESS) != 0, (re->flags & PCRE_FIRSTSET) != 0);

/* Store the current STR_PTR in OVECTOR(0). */
OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_LOCALS_REG), OVECTOR(0), STR_PTR, 0);

Modified: code/trunk/pcre_jit_test.c
===================================================================
--- code/trunk/pcre_jit_test.c    2012-02-04 15:02:53 UTC (rev 910)
+++ code/trunk/pcre_jit_test.c    2012-02-10 08:05:30 UTC (rev 911)
@@ -188,7 +188,8 @@
     { PCRE_MULTILINE | PCRE_UTF8 | PCRE_NEWLINE_ANY, 0, "^-", "a--\xe2\x80\xa8--" },
     { PCRE_MULTILINE | PCRE_UTF8 | PCRE_NEWLINE_ANY, 0, "^-", "a--\xc2\x85--" },
     { 0, 0, "ab$", "ab" },
-    { 0, 0 | F_NOMATCH, "ab$", "ab\r\n" },
+    { 0, 0 | F_NOMATCH, "ab$", "abab\n\n" },
+    { PCRE_DOLLAR_ENDONLY, 0 | F_NOMATCH, "ab$", "abab\r\n" },
     { PCRE_MULTILINE | PCRE_NEWLINE_CRLF, 0, "a$", "\r\raa\n\naa\r\naa" },
     { PCRE_MULTILINE | PCRE_NEWLINE_ANY, 0, "a$", "aaa" },
     { PCRE_MULTILINE | PCRE_UTF8 | PCRE_NEWLINE_ANYCRLF, 0, "#$", "#\xc2\x85###\r#" },
@@ -674,7 +675,7 @@
     static unsigned char *tables_copy;
     const char *errorptr;
     int erroroffset;
-    const unsigned char *default_tables;
+    unsigned char *default_tables;
 #ifdef SUPPORT_PCRE8
     pcre *regex;
     char null_str[1] = { 0 };
@@ -860,7 +861,7 @@
 {
     struct regression_test_case *current = regression_test_cases;
     const char *error;
-    const char *cpu_info;
+    char *cpu_info;
     int i, err_offs;
     int is_successful, is_ascii_pattern, is_ascii_input;
     int total = 0;