diff options
author | ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15> | 2012-06-20 15:15:27 +0000 |
---|---|---|
committer | ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15> | 2012-06-20 15:15:27 +0000 |
commit | 03ae083c6793d4105e479d1d9a30536fa3fbd28a (patch) | |
tree | 139d36cb7d1488d31c2151803cfee96cd6fd78ac | |
parent | 2d0b06301bb98c54b9859f54b2e4bee130f268fc (diff) | |
download | pcre-03ae083c6793d4105e479d1d9a30536fa3fbd28a.tar.gz |
Source tidies for 8.31-RC2.
git-svn-id: svn://vcs.exim.org/pcre/code/trunk@982 2f5784b3-3f2a-0410-8824-cb99058d5e15
-rw-r--r-- | ChangeLog | 16 | ||||
-rw-r--r-- | Makefile.am | 2 | ||||
-rw-r--r-- | NEWS | 2 | ||||
-rw-r--r-- | NON-AUTOTOOLS-BUILD | 2 | ||||
-rw-r--r-- | README | 10 | ||||
-rw-r--r-- | doc/html/pcreapi.html | 3 | ||||
-rw-r--r-- | doc/html/pcrepattern.html | 4 | ||||
-rw-r--r-- | doc/pcre.txt | 9 | ||||
-rw-r--r-- | doc/pcrepattern.3 | 2 | ||||
-rw-r--r-- | pcre_compile.c | 4 | ||||
-rw-r--r-- | pcre_dfa_exec.c | 8 | ||||
-rw-r--r-- | pcreposix.c | 2 |
12 files changed, 35 insertions, 29 deletions
@@ -1,7 +1,7 @@ ChangeLog for PCRE ------------------ -Version 8.31 02-June-2012 +Version 8.31 20-June-2012 ------------------------- 1. Fixing a wrong JIT test case and some compiler warnings. @@ -133,10 +133,10 @@ Version 8.31 02-June-2012 37. Optimizing single character iterators in JIT. 38. Wide characters specified with \uxxxx in JavaScript mode are now subject to - the same checks as \x{...} characters in non-JavaScript mode. Specifically, - codepoints that are too big for the mode are faulted, and in a UTF mode, - disallowed codepoints are also faulted. - + the same checks as \x{...} characters in non-JavaScript mode. Specifically, + codepoints that are too big for the mode are faulted, and in a UTF mode, + disallowed codepoints are also faulted. + 39. If PCRE was compiled with UTF support, in three places in the DFA matcher there was code that should only have been obeyed in UTF mode, but was being obeyed unconditionally. In 8-bit mode this could cause incorrect @@ -145,9 +145,9 @@ Version 8.31 02-June-2012 both cases the values are those that cannot be the first data item in a UTF character. The three items that might have provoked this were recursions, possessively repeated groups, and atomic groups. - -40. Ensure that libpcre is explicitly listed in the link commands for pcretest - and pcregrep, because some OS require shared objects to be explicitly + +40. Ensure that libpcre is explicitly listed in the link commands for pcretest + and pcregrep, because some OS require shared objects to be explicitly passed to ld, causing the link step to fail if they are not. diff --git a/Makefile.am b/Makefile.am index 61e0411..73b33ae 100644 --- a/Makefile.am +++ b/Makefile.am @@ -97,7 +97,7 @@ EXTRA_DIST = EXTRA_DIST += \ doc/perltest.txt \ NON-UNIX-USE \ - NON-AUTOTOOLS-BUILD \ + NON-AUTOTOOLS-BUILD \ HACKING # These files are used in the preparation of a release @@ -1,7 +1,7 @@ News about PCRE releases ------------------------ -Release 8.31 02-June-2012 +Release 8.31 20-June-2012 ------------------------- This is mainly a bug-fixing release, with a small number of developments: diff --git a/NON-AUTOTOOLS-BUILD b/NON-AUTOTOOLS-BUILD index ea739aa..5e36ab7 100644 --- a/NON-AUTOTOOLS-BUILD +++ b/NON-AUTOTOOLS-BUILD @@ -34,7 +34,7 @@ should compile successfully on any system that has a Standard C compiler and library. The C++ wrapper functions are a separate issue (see below). The PCRE distribution includes a "configure" file for use by the configure/make -(autotools) build system, as found in many Unix-like environments. The README +(autotools) build system, as found in many Unix-like environments. The README file contains information about the options for "configure". There is also support for CMake, which some users prefer, especially in Windows @@ -116,7 +116,7 @@ Building PCRE on non-Unix-like systems For a non-Unix-like system, please read the comments in the file NON-AUTOTOOLS-BUILD, though if your system supports the use of "configure" and "make" you may be able to build PCRE using autotools in the same way as for -many Unix-like systems. +many Unix-like systems. PCRE can also be configured using the GUI facility provided by CMake's cmake-gui command. This creates Makefiles, solution files, etc. The file @@ -615,9 +615,9 @@ tests. To run pcretest on just one or more specific test files, give their numbers as arguments to RunTest, for example: RunTest 2 7 11 - -You can also call RunTest with the single argument "list" to cause it to output -a list of tests. + +You can also call RunTest with the single argument "list" to cause it to output +a list of tests. The first test file can be fed directly into the perltest.pl script to check that Perl gives the same results. The only difference you should see is in the @@ -825,7 +825,7 @@ pcre_xxx and the other with the name pcre16_xxx. ) Makefile.in NEWS important changes in this release NON-UNIX-USE the previous name for NON-AUTOTOOLS-BUILD - NON-AUTOTOOLS-BUILD notes on building PCRE without using autotools + NON-AUTOTOOLS-BUILD notes on building PCRE without using autotools PrepareRelease script to make preparations for "make dist" README this file RunTest a Unix shell script for running tests diff --git a/doc/html/pcreapi.html b/doc/html/pcreapi.html index 0761118..87f7f64 100644 --- a/doc/html/pcreapi.html +++ b/doc/html/pcreapi.html @@ -917,6 +917,7 @@ fallen out of use. To avoid confusion, they have not been re-used. 73 disallowed Unicode code point (>= 0xd800 && <= 0xdfff) 74 invalid UTF-16 string (specifically UTF-16) 75 name is too long in (*MARK), (*PRUNE), (*SKIP), or (*THEN) + 76 character value in \u.... sequence is too large </pre> The numbers 32 and 10000 in errors 48 and 49 are defaults; different values may be used if the limits were changed when PCRE was built. @@ -2618,7 +2619,7 @@ Cambridge CB2 3QH, England. </P> <br><a name="SEC26" href="#TOC1">REVISION</a><br> <P> -Last updated: 04 May 2012 +Last updated: 17 June 2012 <br> Copyright © 1997-2012 University of Cambridge. <br> diff --git a/doc/html/pcrepattern.html b/doc/html/pcrepattern.html index a6c66ee..59619cc 100644 --- a/doc/html/pcrepattern.html +++ b/doc/html/pcrepattern.html @@ -307,6 +307,8 @@ as just described only when it is followed by two hexadecimal digits. Otherwise, it matches a literal "x" character. In JavaScript mode, support for code points greater than 256 is provided by \u, which must be followed by four hexadecimal digits; otherwise it matches a literal "u" character. +Character codes specified by \u in JavaScript mode are constrained in the same +was as those specified by \x in non-JavaScript mode. </P> <P> Characters whose value is less than 256 can be defined by either of the two @@ -2869,7 +2871,7 @@ Cambridge CB2 3QH, England. </P> <br><a name="SEC28" href="#TOC1">REVISION</a><br> <P> -Last updated: 01 June 2012 +Last updated: 17 June 2012 <br> Copyright © 1997-2012 University of Cambridge. <br> diff --git a/doc/pcre.txt b/doc/pcre.txt index a781dc1..19f04f2 100644 --- a/doc/pcre.txt +++ b/doc/pcre.txt @@ -1895,6 +1895,7 @@ COMPILATION ERROR CODES 73 disallowed Unicode code point (>= 0xd800 && <= 0xdfff) 74 invalid UTF-16 string (specifically UTF-16) 75 name is too long in (*MARK), (*PRUNE), (*SKIP), or (*THEN) + 76 character value in \u.... sequence is too large The numbers 32 and 10000 in errors 48 and 49 are defaults; different values may be used if the limits were changed when PCRE was built. @@ -3493,7 +3494,7 @@ AUTHOR REVISION - Last updated: 04 May 2012 + Last updated: 17 June 2012 Copyright (c) 1997-2012 University of Cambridge. ------------------------------------------------------------------------------ @@ -4141,7 +4142,9 @@ BACKSLASH its. Otherwise, it matches a literal "x" character. In JavaScript mode, support for code points greater than 256 is provided by \u, which must be followed by four hexadecimal digits; otherwise it matches a - literal "u" character. + literal "u" character. Character codes specified by \u in JavaScript + mode are constrained in the same was as those specified by \x in non- + JavaScript mode. Characters whose value is less than 256 can be defined by either of the two syntaxes for \x (or by \u in JavaScript mode). There is no differ- @@ -6492,7 +6495,7 @@ AUTHOR REVISION - Last updated: 01 June 2012 + Last updated: 17 June 2012 Copyright (c) 1997-2012 University of Cambridge. ------------------------------------------------------------------------------ diff --git a/doc/pcrepattern.3 b/doc/pcrepattern.3 index 0d19f6d..6e6cc23 100644 --- a/doc/pcrepattern.3 +++ b/doc/pcrepattern.3 @@ -277,7 +277,7 @@ as just described only when it is followed by two hexadecimal digits. Otherwise, it matches a literal "x" character. In JavaScript mode, support for code points greater than 256 is provided by \eu, which must be followed by four hexadecimal digits; otherwise it matches a literal "u" character. -Character codes specified by \eu in JavaScript mode are constrained in the same +Character codes specified by \eu in JavaScript mode are constrained in the same was as those specified by \ex in non-JavaScript mode. .P Characters whose value is less than 256 can be defined by either of the two diff --git a/pcre_compile.c b/pcre_compile.c index 30c2171..1ffa2c5 100644 --- a/pcre_compile.c +++ b/pcre_compile.c @@ -832,7 +832,7 @@ else c = (c << 4) + cc - ((cc >= CHAR_0)? CHAR_0 : (CHAR_A - 10)); #endif } - + #ifdef COMPILE_PCRE8 if (c > (utf ? 0x10ffff : 0xff)) #else @@ -841,7 +841,7 @@ else #endif #endif { - *errorcodeptr = ERR76; + *errorcodeptr = ERR76; } else if (utf && c >= 0xd800 && c <= 0xdfff) *errorcodeptr = ERR73; } diff --git a/pcre_dfa_exec.c b/pcre_dfa_exec.c index 140d85f..df38d10 100644 --- a/pcre_dfa_exec.c +++ b/pcre_dfa_exec.c @@ -2798,11 +2798,11 @@ for (;;) int charcount = local_offsets[rc+1] - local_offsets[rc]; #ifdef SUPPORT_UTF if (utf) - { + { const pcre_uchar *p = start_subject + local_offsets[rc]; const pcre_uchar *pp = start_subject + local_offsets[rc+1]; while (p < pp) if (NOT_FIRSTCHAR(*p++)) charcount--; - } + } #endif if (charcount > 0) { @@ -2984,11 +2984,11 @@ for (;;) { #ifdef SUPPORT_UTF if (utf) - { + { const pcre_uchar *p = start_subject + local_offsets[0]; const pcre_uchar *pp = start_subject + local_offsets[1]; while (p < pp) if (NOT_FIRSTCHAR(*p++)) charcount--; - } + } #endif ADD_NEW_DATA(-next_state_offset, 0, (charcount - 1)); if (repeat_state_offset >= 0) diff --git a/pcreposix.c b/pcreposix.c index b148f08..916deaf 100644 --- a/pcreposix.c +++ b/pcreposix.c @@ -161,7 +161,7 @@ static const int eint[] = { REG_BADPAT, /* invalid UTF-16 string (should not occur) */ /* 75 */ REG_BADPAT, /* overlong MARK name */ - REG_BADPAT /* character value in \u.... sequence is too large */ + REG_BADPAT /* character value in \u.... sequence is too large */ }; /* Table of texts corresponding to POSIX error codes */ |