Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
git2
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lvzhengyang
git2
Commits
722c01b6
Commit
722c01b6
authored
Oct 04, 2020
by
Edward Thomson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pcre: upgrade to 8.44
parent
dccfaa41
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
26 additions
and
25 deletions
+26
-25
deps/pcre/LICENCE
+3
-3
deps/pcre/pcre.h
+2
-2
deps/pcre/pcre_compile.c
+16
-14
deps/pcre/pcre_jit_compile.c
+3
-3
deps/pcre/pcreposix.c
+2
-3
No files found.
deps/pcre/LICENCE
View file @
722c01b6
...
@@ -25,7 +25,7 @@ Email domain: cam.ac.uk
...
@@ -25,7 +25,7 @@ Email domain: cam.ac.uk
University of Cambridge Computing Service,
University of Cambridge Computing Service,
Cambridge, England.
Cambridge, England.
Copyright (c) 1997-20
19
University of Cambridge
Copyright (c) 1997-20
20
University of Cambridge
All rights reserved.
All rights reserved.
...
@@ -36,7 +36,7 @@ Written by: Zoltan Herczeg
...
@@ -36,7 +36,7 @@ Written by: Zoltan Herczeg
Email local part: hzmester
Email local part: hzmester
Email domain: freemail.hu
Email domain: freemail.hu
Copyright(c) 2010-20
19
Zoltan Herczeg
Copyright(c) 2010-20
20
Zoltan Herczeg
All rights reserved.
All rights reserved.
...
@@ -47,7 +47,7 @@ Written by: Zoltan Herczeg
...
@@ -47,7 +47,7 @@ Written by: Zoltan Herczeg
Email local part: hzmester
Email local part: hzmester
Email domain: freemail.hu
Email domain: freemail.hu
Copyright(c) 2009-20
19
Zoltan Herczeg
Copyright(c) 2009-20
20
Zoltan Herczeg
All rights reserved.
All rights reserved.
...
...
deps/pcre/pcre.h
View file @
722c01b6
...
@@ -42,9 +42,9 @@ POSSIBILITY OF SUCH DAMAGE.
...
@@ -42,9 +42,9 @@ POSSIBILITY OF SUCH DAMAGE.
/* The current PCRE version information. */
/* The current PCRE version information. */
#define PCRE_MAJOR 8
#define PCRE_MAJOR 8
#define PCRE_MINOR 4
3
#define PCRE_MINOR 4
4
#define PCRE_PRERELEASE
#define PCRE_PRERELEASE
#define PCRE_DATE 20
19-02-23
#define PCRE_DATE 20
20-02-12
#define PCRE_EXP_DECL extern
#define PCRE_EXP_DECL extern
...
...
deps/pcre/pcre_compile.c
View file @
722c01b6
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
and semantics are as close as possible to those of the Perl 5 language.
and semantics are as close as possible to those of the Perl 5 language.
Written by Philip Hazel
Written by Philip Hazel
Copyright (c) 1997-20
18
University of Cambridge
Copyright (c) 1997-20
20
University of Cambridge
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
Redistribution and use in source and binary forms, with or without
Redistribution and use in source and binary forms, with or without
...
@@ -68,7 +68,7 @@ COMPILE_PCREx macro will already be appropriately set. */
...
@@ -68,7 +68,7 @@ COMPILE_PCREx macro will already be appropriately set. */
/* Macro for setting individual bits in class bitmaps. */
/* Macro for setting individual bits in class bitmaps. */
#define SETBIT(a,b) a[(b)/8] |= (1 << ((b)&7))
#define SETBIT(a,b) a[(b)/8] |= (1
U
<< ((b)&7))
/* Maximum length value to check against when making sure that the integer that
/* Maximum length value to check against when making sure that the integer that
holds the compiled pattern length does not overflow. We make it a bit less than
holds the compiled pattern length does not overflow. We make it a bit less than
...
@@ -129,8 +129,8 @@ overrun before it actually does run off the end of the data block. */
...
@@ -129,8 +129,8 @@ overrun before it actually does run off the end of the data block. */
/* Private flags added to firstchar and reqchar. */
/* Private flags added to firstchar and reqchar. */
#define REQ_CASELESS (1 << 0)
/* Indicates caselessness */
#define REQ_CASELESS (1
U
<< 0)
/* Indicates caselessness */
#define REQ_VARY (1 << 1)
/* Reqchar followed non-literal item */
#define REQ_VARY (1
U
<< 1)
/* Reqchar followed non-literal item */
/* Negative values for the firstchar and reqchar flags */
/* Negative values for the firstchar and reqchar flags */
#define REQ_UNSET (-2)
#define REQ_UNSET (-2)
#define REQ_NONE (-1)
#define REQ_NONE (-1)
...
@@ -3611,7 +3611,7 @@ for(;;)
...
@@ -3611,7 +3611,7 @@ for(;;)
if
(
chr
>
255
)
break
;
if
(
chr
>
255
)
break
;
class_bitset
=
(
pcre_uint8
*
)
class_bitset
=
(
pcre_uint8
*
)
((
list_ptr
==
list
?
code
:
base_end
)
-
list_ptr
[
2
]);
((
list_ptr
==
list
?
code
:
base_end
)
-
list_ptr
[
2
]);
if
((
class_bitset
[
chr
>>
3
]
&
(
1
<<
(
chr
&
7
)))
!=
0
)
return
FALSE
;
if
((
class_bitset
[
chr
>>
3
]
&
(
1
U
<<
(
chr
&
7
)))
!=
0
)
return
FALSE
;
break
;
break
;
#if defined SUPPORT_UTF || !defined COMPILE_PCRE8
#if defined SUPPORT_UTF || !defined COMPILE_PCRE8
...
@@ -7135,17 +7135,19 @@ for (;; ptr++)
...
@@ -7135,17 +7135,19 @@ for (;; ptr++)
int
n
=
0
;
int
n
=
0
;
ptr
++
;
ptr
++
;
while
(
IS_DIGIT
(
*
ptr
))
while
(
IS_DIGIT
(
*
ptr
))
{
n
=
n
*
10
+
*
ptr
++
-
CHAR_0
;
n
=
n
*
10
+
*
ptr
++
-
CHAR_0
;
if
(
n
>
255
)
{
*
errorcodeptr
=
ERR38
;
goto
FAILED
;
}
}
if
(
*
ptr
!=
CHAR_RIGHT_PARENTHESIS
)
if
(
*
ptr
!=
CHAR_RIGHT_PARENTHESIS
)
{
{
*
errorcodeptr
=
ERR39
;
*
errorcodeptr
=
ERR39
;
goto
FAILED
;
goto
FAILED
;
}
}
if
(
n
>
255
)
{
*
errorcodeptr
=
ERR38
;
goto
FAILED
;
}
*
code
++
=
n
;
*
code
++
=
n
;
PUT
(
code
,
0
,
(
int
)(
ptr
-
cd
->
start_pattern
+
1
));
/* Pattern offset */
PUT
(
code
,
0
,
(
int
)(
ptr
-
cd
->
start_pattern
+
1
));
/* Pattern offset */
PUT
(
code
,
LINK_SIZE
,
0
);
/* Default length */
PUT
(
code
,
LINK_SIZE
,
0
);
/* Default length */
...
@@ -7461,7 +7463,7 @@ for (;; ptr++)
...
@@ -7461,7 +7463,7 @@ for (;; ptr++)
{
{
open_capitem
*
oc
;
open_capitem
*
oc
;
recno
=
GET2
(
slot
,
0
);
recno
=
GET2
(
slot
,
0
);
cd
->
backref_map
|=
(
recno
<
32
)
?
(
1
<<
recno
)
:
1
;
cd
->
backref_map
|=
(
recno
<
32
)
?
(
1
U
<<
recno
)
:
1
;
if
(
recno
>
cd
->
top_backref
)
cd
->
top_backref
=
recno
;
if
(
recno
>
cd
->
top_backref
)
cd
->
top_backref
=
recno
;
/* Check to see if this back reference is recursive, that it, it
/* Check to see if this back reference is recursive, that it, it
...
@@ -8072,7 +8074,7 @@ for (;; ptr++)
...
@@ -8072,7 +8074,7 @@ for (;; ptr++)
item_hwm_offset
=
cd
->
hwm
-
cd
->
start_workspace
;
item_hwm_offset
=
cd
->
hwm
-
cd
->
start_workspace
;
*
code
++
=
((
options
&
PCRE_CASELESS
)
!=
0
)
?
OP_REFI
:
OP_REF
;
*
code
++
=
((
options
&
PCRE_CASELESS
)
!=
0
)
?
OP_REFI
:
OP_REF
;
PUT2INC
(
code
,
0
,
recno
);
PUT2INC
(
code
,
0
,
recno
);
cd
->
backref_map
|=
(
recno
<
32
)
?
(
1
<<
recno
)
:
1
;
cd
->
backref_map
|=
(
recno
<
32
)
?
(
1
U
<<
recno
)
:
1
;
if
(
recno
>
cd
->
top_backref
)
cd
->
top_backref
=
recno
;
if
(
recno
>
cd
->
top_backref
)
cd
->
top_backref
=
recno
;
/* Check to see if this back reference is recursive, that it, it
/* Check to see if this back reference is recursive, that it, it
...
@@ -8685,7 +8687,7 @@ do {
...
@@ -8685,7 +8687,7 @@ do {
op
==
OP_SCBRA
||
op
==
OP_SCBRAPOS
)
op
==
OP_SCBRA
||
op
==
OP_SCBRAPOS
)
{
{
int
n
=
GET2
(
scode
,
1
+
LINK_SIZE
);
int
n
=
GET2
(
scode
,
1
+
LINK_SIZE
);
int
new_map
=
bracket_map
|
((
n
<
32
)
?
(
1
<<
n
)
:
1
);
int
new_map
=
bracket_map
|
((
n
<
32
)
?
(
1
U
<<
n
)
:
1
);
if
(
!
is_anchored
(
scode
,
new_map
,
cd
,
atomcount
))
return
FALSE
;
if
(
!
is_anchored
(
scode
,
new_map
,
cd
,
atomcount
))
return
FALSE
;
}
}
...
@@ -8813,7 +8815,7 @@ do {
...
@@ -8813,7 +8815,7 @@ do {
op
==
OP_SCBRA
||
op
==
OP_SCBRAPOS
)
op
==
OP_SCBRA
||
op
==
OP_SCBRAPOS
)
{
{
int
n
=
GET2
(
scode
,
1
+
LINK_SIZE
);
int
n
=
GET2
(
scode
,
1
+
LINK_SIZE
);
int
new_map
=
bracket_map
|
((
n
<
32
)
?
(
1
<<
n
)
:
1
);
int
new_map
=
bracket_map
|
((
n
<
32
)
?
(
1
U
<<
n
)
:
1
);
if
(
!
is_startline
(
scode
,
new_map
,
cd
,
atomcount
,
inassert
))
return
FALSE
;
if
(
!
is_startline
(
scode
,
new_map
,
cd
,
atomcount
,
inassert
))
return
FALSE
;
}
}
...
...
deps/pcre/pcre_jit_compile.c
View file @
722c01b6
...
@@ -3938,10 +3938,10 @@ static sljit_s32 character_to_int32(pcre_uchar chr)
...
@@ -3938,10 +3938,10 @@ static sljit_s32 character_to_int32(pcre_uchar chr)
sljit_s32
value
=
(
sljit_s32
)
chr
;
sljit_s32
value
=
(
sljit_s32
)
chr
;
#if defined COMPILE_PCRE8
#if defined COMPILE_PCRE8
#define SSE2_COMPARE_TYPE_INDEX 0
#define SSE2_COMPARE_TYPE_INDEX 0
return
(
value
<<
24
)
|
(
value
<<
16
)
|
(
value
<<
8
)
|
value
;
return
(
(
unsigned
int
)
value
<<
24
)
|
((
unsigned
int
)
value
<<
16
)
|
((
unsigned
int
)
value
<<
8
)
|
(
unsigned
int
)
value
;
#elif defined COMPILE_PCRE16
#elif defined COMPILE_PCRE16
#define SSE2_COMPARE_TYPE_INDEX 1
#define SSE2_COMPARE_TYPE_INDEX 1
return
(
value
<<
16
)
|
value
;
return
(
(
unsigned
int
)
value
<<
16
)
|
value
;
#elif defined COMPILE_PCRE32
#elif defined COMPILE_PCRE32
#define SSE2_COMPARE_TYPE_INDEX 2
#define SSE2_COMPARE_TYPE_INDEX 2
return
value
;
return
value
;
...
@@ -8507,7 +8507,7 @@ if (opcode == OP_ONCE)
...
@@ -8507,7 +8507,7 @@ if (opcode == OP_ONCE)
/* We temporarily encode the needs_control_head in the lowest bit.
/* We temporarily encode the needs_control_head in the lowest bit.
Note: on the target architectures of SLJIT the ((x << 1) >> 1) returns
Note: on the target architectures of SLJIT the ((x << 1) >> 1) returns
the same value for small signed numbers (including negative numbers). */
the same value for small signed numbers (including negative numbers). */
BACKTRACK_AS
(
bracket_backtrack
)
->
u
.
framesize
=
(
BACKTRACK_AS
(
bracket_backtrack
)
->
u
.
framesize
<<
1
)
|
(
needs_control_head
?
1
:
0
);
BACKTRACK_AS
(
bracket_backtrack
)
->
u
.
framesize
=
(
(
unsigned
int
)
BACKTRACK_AS
(
bracket_backtrack
)
->
u
.
framesize
<<
1
)
|
(
needs_control_head
?
1
:
0
);
}
}
return
cc
+
repeat_length
;
return
cc
+
repeat_length
;
}
}
...
...
deps/pcre/pcreposix.c
View file @
722c01b6
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
and semantics are as close as possible to those of the Perl 5 language.
and semantics are as close as possible to those of the Perl 5 language.
Written by Philip Hazel
Written by Philip Hazel
Copyright (c) 1997-20
18
University of Cambridge
Copyright (c) 1997-20
20
University of Cambridge
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
Redistribution and use in source and binary forms, with or without
Redistribution and use in source and binary forms, with or without
...
@@ -287,6 +287,7 @@ if (preg->re_pcre == NULL)
...
@@ -287,6 +287,7 @@ if (preg->re_pcre == NULL)
(
void
)
pcre_fullinfo
((
const
pcre
*
)
preg
->
re_pcre
,
NULL
,
PCRE_INFO_CAPTURECOUNT
,
(
void
)
pcre_fullinfo
((
const
pcre
*
)
preg
->
re_pcre
,
NULL
,
PCRE_INFO_CAPTURECOUNT
,
&
re_nsub
);
&
re_nsub
);
preg
->
re_nsub
=
(
size_t
)
re_nsub
;
preg
->
re_nsub
=
(
size_t
)
re_nsub
;
preg
->
re_erroffset
=
(
size_t
)(
-
1
);
/* No meaning after successful compile */
return
0
;
return
0
;
}
}
...
@@ -324,8 +325,6 @@ if ((eflags & PCRE_REG_NOTBOL) != 0) options |= PCRE_NOTBOL;
...
@@ -324,8 +325,6 @@ if ((eflags & PCRE_REG_NOTBOL) != 0) options |= PCRE_NOTBOL;
if
((
eflags
&
PCRE_REG_NOTEOL
)
!=
0
)
options
|=
PCRE_NOTEOL
;
if
((
eflags
&
PCRE_REG_NOTEOL
)
!=
0
)
options
|=
PCRE_NOTEOL
;
if
((
eflags
&
PCRE_REG_NOTEMPTY
)
!=
0
)
options
|=
PCRE_NOTEMPTY
;
if
((
eflags
&
PCRE_REG_NOTEMPTY
)
!=
0
)
options
|=
PCRE_NOTEMPTY
;
((
pcre_regex_t
*
)
preg
)
->
re_erroffset
=
(
size_t
)(
-
1
);
/* Only has meaning after compile */
/* When no string data is being returned, or no vector has been passed in which
/* When no string data is being returned, or no vector has been passed in which
to put it, ensure that nmatch is zero. Otherwise, ensure the vector for holding
to put it, ensure that nmatch is zero. Otherwise, ensure the vector for holding
the return data is large enough. */
the return data is large enough. */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment