Skip to content

Commit 4e4f273

Browse files
committed
Final file tidies for 10.33.
1 parent 4acee00 commit 4e4f273

16 files changed

+94
-85
lines changed

ChangeLog

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Change Log for PCRE2
22
--------------------
33

44

5-
Version 10.33 11-March-2019
5+
Version 10.33 16-April-2019
66
---------------------------
77

88
1. Added "allvector" to pcre2test to make it easy to check the part of the
@@ -149,9 +149,14 @@ from Ross Burton.
149149
36. Disable SSE2 JIT optimizations in x86 CPUs when SSE2 is not available.
150150
Patch by Guillem Jover.
151151

152-
37. Changed expressions such as 1<<10 to 1u<<10 in many places because compiler
152+
37. Changed expressions such as 1<<10 to 1u<<10 in many places because compiler
153153
warnings were reported.
154154

155+
38. Using the clang compiler with sanitizing options causes runtime complaints
156+
about truncation for statments such as x = ~x when x is an 8-bit value; it
157+
seems to compute ~x as a 32-bit value. Changing such statements to x = 255 ^ x
158+
gets rid of the warnings. There were also two missing casts in pcre2test.
159+
155160

156161
Version 10.32 10-September-2018
157162
-------------------------------

NEWS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ News about PCRE2 releases
22
-------------------------
33

44

5-
Version 10.33-RC1 03-March-2019
5+
Version 10.33-RC1 16-April-2019
66
-------------------------------
77

88
Yet more bugfixes, tidies, and a few enhancements, summarized here (see

README

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
README file for PCRE2 (Perl-compatible regular expression library)
22
------------------------------------------------------------------
33

4-
PCRE2 is a re-working of the original PCRE library to provide an entirely new
5-
API. The latest release of PCRE2 is always available in three alternative
6-
formats from:
4+
PCRE2 is a re-working of the original PCRE1 library to provide an entirely new
5+
API. Since its initial release in 2015, there has been further development of
6+
the code and it now differs from PCRE1 in more than just the API. There are new
7+
features and the internals have been improved. The latest release of PCRE2 is
8+
always available in three alternative formats from:
79

810
ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre2-xxx.tar.gz
911
ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre2-xxx.tar.bz2
@@ -39,15 +41,15 @@ The PCRE2 APIs
3941
PCRE2 is written in C, and it has its own API. There are three sets of
4042
functions, one for the 8-bit library, which processes strings of bytes, one for
4143
the 16-bit library, which processes strings of 16-bit values, and one for the
42-
32-bit library, which processes strings of 32-bit values. There are no C++
43-
wrappers.
44+
32-bit library, which processes strings of 32-bit values. Unlike PCRE1, there
45+
are no C++ wrappers.
4446

45-
In addition, the distribution contains a set of C wrapper functions for the
46-
8-bit library that are based on the POSIX regular expression API (see the
47-
pcre2posix man page). These are built into a library called libpcre2-posix.
48-
Note that this just provides a POSIX calling interface to PCRE2; the regular
49-
expressions themselves still follow Perl syntax and semantics. The POSIX API is
50-
restricted, and does not give full access to all of PCRE2's facilities.
47+
The distribution does contain a set of C wrapper functions for the 8-bit
48+
library that are based on the POSIX regular expression API (see the pcre2posix
49+
man page). These are built into a library called libpcre2-posix. Note that this
50+
just provides a POSIX calling interface to PCRE2; the regular expressions
51+
themselves still follow Perl syntax and semantics. The POSIX API is restricted,
52+
and does not give full access to all of PCRE2's facilities.
5153

5254
The header file for the POSIX-style functions is called pcre2posix.h. The
5355
official POSIX name is regex.h, but I did not want to risk possible problems
@@ -890,4 +892,4 @@ The distribution should contain the files listed below.
890892
Philip Hazel
891893
Email local part: ph10
892894
Email domain: cam.ac.uk
893-
Last updated: 03 March 2019
895+
Last updated: 16 April 2019

configure.ac

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ dnl be defined as -RC2, for example. For real releases, it should be empty.
1010

1111
m4_define(pcre2_major, [10])
1212
m4_define(pcre2_minor, [33])
13-
m4_define(pcre2_prerelease, [-RC1])
14-
m4_define(pcre2_date, [2019-03-03])
13+
m4_define(pcre2_prerelease, [])
14+
m4_define(pcre2_date, [2019-04-16])
1515

1616
# NOTE: The CMakeLists.txt file searches for the above variables in the first
1717
# 50 lines of this file. Please update that if the variables above are moved.

doc/html/README.txt

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
README file for PCRE2 (Perl-compatible regular expression library)
22
------------------------------------------------------------------
33

4-
PCRE2 is a re-working of the original PCRE library to provide an entirely new
5-
API. The latest release of PCRE2 is always available in three alternative
6-
formats from:
4+
PCRE2 is a re-working of the original PCRE1 library to provide an entirely new
5+
API. Since its initial release in 2015, there has been further development of
6+
the code and it now differs from PCRE1 in more than just the API. There are new
7+
features and the internals have been improved. The latest release of PCRE2 is
8+
always available in three alternative formats from:
79

810
ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre2-xxx.tar.gz
911
ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre2-xxx.tar.bz2
@@ -39,15 +41,15 @@ The PCRE2 APIs
3941
PCRE2 is written in C, and it has its own API. There are three sets of
4042
functions, one for the 8-bit library, which processes strings of bytes, one for
4143
the 16-bit library, which processes strings of 16-bit values, and one for the
42-
32-bit library, which processes strings of 32-bit values. There are no C++
43-
wrappers.
44+
32-bit library, which processes strings of 32-bit values. Unlike PCRE1, there
45+
are no C++ wrappers.
4446

45-
In addition, the distribution contains a set of C wrapper functions for the
46-
8-bit library that are based on the POSIX regular expression API (see the
47-
pcre2posix man page). These are built into a library called libpcre2-posix.
48-
Note that this just provides a POSIX calling interface to PCRE2; the regular
49-
expressions themselves still follow Perl syntax and semantics. The POSIX API is
50-
restricted, and does not give full access to all of PCRE2's facilities.
47+
The distribution does contain a set of C wrapper functions for the 8-bit
48+
library that are based on the POSIX regular expression API (see the pcre2posix
49+
man page). These are built into a library called libpcre2-posix. Note that this
50+
just provides a POSIX calling interface to PCRE2; the regular expressions
51+
themselves still follow Perl syntax and semantics. The POSIX API is restricted,
52+
and does not give full access to all of PCRE2's facilities.
5153

5254
The header file for the POSIX-style functions is called pcre2posix.h. The
5355
official POSIX name is regex.h, but I did not want to risk possible problems
@@ -890,4 +892,4 @@ The distribution should contain the files listed below.
890892
Philip Hazel
891893
Email local part: ph10
892894
Email domain: cam.ac.uk
893-
Last updated: 03 March 2019
895+
Last updated: 16 April 2019

doc/html/pcre2_jit_compile.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ <h1>pcre2_jit_compile man page</h1>
4040
PCRE2_JIT_COMPLETE compile code for full matching
4141
PCRE2_JIT_PARTIAL_SOFT compile code for soft partial matching
4242
PCRE2_JIT_PARTIAL_HARD compile code for hard partial matching
43-
PCRE2_JIT_INVALID_UTF compile code to handle invalid UTF
43+
PCRE2_JIT_INVALID_UTF compile code to handle invalid UTF
4444
</pre>
4545
The yield of the function is 0 for success, or a negative error code otherwise.
4646
In particular, PCRE2_ERROR_JIT_BADOPTION is returned if JIT is not supported or

doc/html/pcre2jit.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -155,11 +155,11 @@ <h1>pcre2jit man page</h1>
155155
UTF is compiled.
156156
</P>
157157
<P>
158-
In this mode, an invalid code unit sequence never matches any pattern item. It
159-
does not match dot, it does not match \p{Any}, it does not even match negative
158+
In this mode, an invalid code unit sequence never matches any pattern item. It
159+
does not match dot, it does not match \p{Any}, it does not even match negative
160160
items such as [^X]. A lookbehind assertion fails if it encounters an invalid
161-
sequence while moving the current point backwards. In other words, an invalid
162-
UTF code unit sequence acts as a barrier which no match can cross. Reaching an
161+
sequence while moving the current point backwards. In other words, an invalid
162+
UTF code unit sequence acts as a barrier which no match can cross. Reaching an
163163
invalid sequence causes an immediate backtrack.
164164
</P>
165165
<P>

doc/html/pcre2unicode.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -263,9 +263,9 @@ <h1>pcre2unicode man page</h1>
263263
</P>
264264
<P>
265265
If you pass an invalid UTF string when PCRE2_NO_UTF_CHECK is set, the result
266-
is usually undefined and your program may crash or loop indefinitely. There is,
266+
is usually undefined and your program may crash or loop indefinitely. There is,
267267
however, one mode of matching that can handle invalid UTF subject strings. This
268-
is matching via the JIT optimization using the PCRE2_JIT_INVALID_UTF option
268+
is matching via the JIT optimization using the PCRE2_JIT_INVALID_UTF option
269269
when calling <b>pcre2_jit_compile()</b>. For details, see the
270270
<a href="pcre2jit.html"><b>pcre2jit</b></a>
271271
documentation.

doc/pcre2.txt

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,8 @@ REVISION
180180
Last updated: 17 September 2018
181181
Copyright (c) 1997-2018 University of Cambridge.
182182
------------------------------------------------------------------------------
183-
184-
183+
184+
185185
PCRE2API(3) Library Functions Manual PCRE2API(3)
186186

187187

@@ -3681,8 +3681,8 @@ REVISION
36813681
Last updated: 14 February 2019
36823682
Copyright (c) 1997-2019 University of Cambridge.
36833683
------------------------------------------------------------------------------
3684-
3685-
3684+
3685+
36863686
PCRE2BUILD(3) Library Functions Manual PCRE2BUILD(3)
36873687

36883688

@@ -4254,8 +4254,8 @@ REVISION
42544254
Last updated: 03 March 2019
42554255
Copyright (c) 1997-2019 University of Cambridge.
42564256
------------------------------------------------------------------------------
4257-
4258-
4257+
4258+
42594259
PCRE2CALLOUT(3) Library Functions Manual PCRE2CALLOUT(3)
42604260

42614261

@@ -4685,8 +4685,8 @@ REVISION
46854685
Last updated: 03 February 2019
46864686
Copyright (c) 1997-2019 University of Cambridge.
46874687
------------------------------------------------------------------------------
4688-
4689-
4688+
4689+
46904690
PCRE2COMPAT(3) Library Functions Manual PCRE2COMPAT(3)
46914691

46924692

@@ -4890,8 +4890,8 @@ REVISION
48904890
Last updated: 12 February 2019
48914891
Copyright (c) 1997-2019 University of Cambridge.
48924892
------------------------------------------------------------------------------
4893-
4894-
4893+
4894+
48954895
PCRE2JIT(3) Library Functions Manual PCRE2JIT(3)
48964896

48974897

@@ -5313,8 +5313,8 @@ REVISION
53135313
Last updated: 06 March 2019
53145314
Copyright (c) 1997-2019 University of Cambridge.
53155315
------------------------------------------------------------------------------
5316-
5317-
5316+
5317+
53185318
PCRE2LIMITS(3) Library Functions Manual PCRE2LIMITS(3)
53195319

53205320

@@ -5383,8 +5383,8 @@ REVISION
53835383
Last updated: 02 February 2019
53845384
Copyright (c) 1997-2019 University of Cambridge.
53855385
------------------------------------------------------------------------------
5386-
5387-
5386+
5387+
53885388
PCRE2MATCHING(3) Library Functions Manual PCRE2MATCHING(3)
53895389

53905390

@@ -5604,8 +5604,8 @@ REVISION
56045604
Last updated: 10 October 2018
56055605
Copyright (c) 1997-2018 University of Cambridge.
56065606
------------------------------------------------------------------------------
5607-
5608-
5607+
5608+
56095609
PCRE2PARTIAL(3) Library Functions Manual PCRE2PARTIAL(3)
56105610

56115611

@@ -6044,8 +6044,8 @@ REVISION
60446044
Last updated: 22 December 2014
60456045
Copyright (c) 1997-2014 University of Cambridge.
60466046
------------------------------------------------------------------------------
6047-
6048-
6047+
6048+
60496049
PCRE2PATTERN(3) Library Functions Manual PCRE2PATTERN(3)
60506050

60516051

@@ -9388,8 +9388,8 @@ REVISION
93889388
Last updated: 12 February 2019
93899389
Copyright (c) 1997-2019 University of Cambridge.
93909390
------------------------------------------------------------------------------
9391-
9392-
9391+
9392+
93939393
PCRE2PERFORM(3) Library Functions Manual PCRE2PERFORM(3)
93949394

93959395

@@ -9623,8 +9623,8 @@ REVISION
96239623
Last updated: 03 February 2019
96249624
Copyright (c) 1997-2019 University of Cambridge.
96259625
------------------------------------------------------------------------------
9626-
9627-
9626+
9627+
96289628
PCRE2POSIX(3) Library Functions Manual PCRE2POSIX(3)
96299629

96309630

@@ -9953,8 +9953,8 @@ REVISION
99539953
Last updated: 30 January 2019
99549954
Copyright (c) 1997-2019 University of Cambridge.
99559955
------------------------------------------------------------------------------
9956-
9957-
9956+
9957+
99589958
PCRE2SAMPLE(3) Library Functions Manual PCRE2SAMPLE(3)
99599959

99609960

@@ -10232,8 +10232,8 @@ REVISION
1023210232
Last updated: 27 June 2018
1023310233
Copyright (c) 1997-2018 University of Cambridge.
1023410234
------------------------------------------------------------------------------
10235-
10236-
10235+
10236+
1023710237
PCRE2SYNTAX(3) Library Functions Manual PCRE2SYNTAX(3)
1023810238

1023910239

@@ -10733,8 +10733,8 @@ REVISION
1073310733
Last updated: 11 February 2019
1073410734
Copyright (c) 1997-2019 University of Cambridge.
1073510735
------------------------------------------------------------------------------
10736-
10737-
10736+
10737+
1073810738
PCRE2UNICODE(3) Library Functions Manual PCRE2UNICODE(3)
1073910739

1074010740

@@ -11109,5 +11109,5 @@ REVISION
1110911109
Last updated: 06 March 2019
1111011110
Copyright (c) 1997-2019 University of Cambridge.
1111111111
------------------------------------------------------------------------------
11112-
11113-
11112+
11113+

doc/pcre2_jit_compile.3

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ bits:
2929
PCRE2_JIT_COMPLETE compile code for full matching
3030
PCRE2_JIT_PARTIAL_SOFT compile code for soft partial matching
3131
PCRE2_JIT_PARTIAL_HARD compile code for hard partial matching
32-
PCRE2_JIT_INVALID_UTF compile code to handle invalid UTF
32+
PCRE2_JIT_INVALID_UTF compile code to handle invalid UTF
3333
.sp
3434
The yield of the function is 0 for success, or a negative error code otherwise.
3535
In particular, PCRE2_ERROR_JIT_BADOPTION is returned if JIT is not supported or

0 commit comments

Comments
 (0)