Revision: 831
http://vcs.pcre.org/viewvc?view=rev&revision=831
Author: ph10
Date: 2011-12-27 16:53:09 +0000 (Tue, 27 Dec 2011)
Log Message:
-----------
Update ManyConfigTests script and fix RunGrepTest bug and --disable-stack-
for-recursion bug in 16-bit mode.
Modified Paths:
--------------
code/branches/pcre16/RunGrepTest
code/branches/pcre16/maint/ManyConfigTests
code/branches/pcre16/pcre_exec.c
Modified: code/branches/pcre16/RunGrepTest
===================================================================
--- code/branches/pcre16/RunGrepTest 2011-12-27 15:37:13 UTC (rev 830)
+++ code/branches/pcre16/RunGrepTest 2011-12-27 16:53:09 UTC (rev 831)
@@ -66,7 +66,7 @@
# Check for the availability of UTF-8 support
-./pcretest -C | ./pcregrep "No UTF-8 support" >/dev/null
+./pcretest -C utf >/dev/null
utf8=$?
echo "---------------------------- Test 1 ------------------------------" >testtry
Modified: code/branches/pcre16/maint/ManyConfigTests
===================================================================
--- code/branches/pcre16/maint/ManyConfigTests 2011-12-27 15:37:13 UTC (rev 830)
+++ code/branches/pcre16/maint/ManyConfigTests 2011-12-27 16:53:09 UTC (rev 831)
@@ -163,7 +163,14 @@
"--enable-utf8 --enable-newline-is-any --enable-unicode-properties --disable-stack-for-recursion --disable-static --disable-cpp" \
"--enable-jit --disable-shared" \
"--enable-jit --enable-unicode-properties --disable-shared" \
- "--enable-jit --enable-unicode-properties --with-link-size=3 --disable-shared"
+ "--enable-jit --enable-unicode-properties --with-link-size=3 --disable-shared" \
+ "--enable-pcre16" \
+ "--enable-pcre16 --enable-jit --enable-utf --disable-shared" \
+ "--enable-pcre16 --enable-jit --enable-unicode-properties --disable-shared" \
+ "--enable-pcre16 --enable-jit --disable-pcre8 --disable-shared" \
+ "--enable-pcre16 --enable-jit --disable-pcre8 --enable-utf --disable-shared" \
+ "--enable-pcre16 --disable-stack-for-recursion --disable-shared" \
+ "--enable-pcre16 --enable-unicode-properties --disable-stack-for-recursion --disable-shared"
do
runtest
done
@@ -178,7 +185,8 @@
for opts in \
"--enable-unicode-properties --disable-stack-for-recursion --disable-shared" \
"--enable-unicode-properties --with-link-size=3 --disable-shared" \
- "--enable-jit --enable-unicode-properties --disable-shared"
+ "--enable-jit --enable-unicode-properties --disable-shared" \
+ "--enable-pcre16 --enable-jit --enable-unicode-properties --disable-shared"
do
runtest
done
Modified: code/branches/pcre16/pcre_exec.c
===================================================================
--- code/branches/pcre16/pcre_exec.c 2011-12-27 15:37:13 UTC (rev 830)
+++ code/branches/pcre16/pcre_exec.c 2011-12-27 16:53:09 UTC (rev 831)
@@ -6025,8 +6025,12 @@
LBL(35) LBL(43) LBL(47) LBL(48) LBL(49) LBL(50) LBL(51) LBL(52)
LBL(53) LBL(54) LBL(55) LBL(56) LBL(57) LBL(58) LBL(63) LBL(64)
LBL(65) LBL(66)
-#ifdef SUPPORT_UTF
- LBL(16) LBL(18) LBL(20) LBL(21) LBL(22) LBL(23) LBL(28) LBL(30)
+#if defined SUPPORT_UTF || !defined COMPILE_PCRE8
+ LBL(21)
+#endif
+#ifdef SUPPORT_UTF
+ LBL(16) LBL(18) LBL(20)
+ LBL(22) LBL(23) LBL(28) LBL(30)
LBL(32) LBL(34) LBL(42) LBL(46)
#ifdef SUPPORT_UCP
LBL(36) LBL(37) LBL(38) LBL(39) LBL(40) LBL(41) LBL(44) LBL(45)
@@ -6035,6 +6039,9 @@
#endif /* SUPPORT_UTF */
default:
DPRINTF(("jump error in pcre match: label %d non-existent\n", frame->Xwhere));
+
+printf("+++jump error in pcre match: label %d non-existent\n", frame->Xwhere);
+
return PCRE_ERROR_INTERNAL;
}
#undef LBL
