aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2017-08-31 14:34:58 +0200
committerRickard Green <[email protected]>2017-08-31 14:34:58 +0200
commit4958cc06969277b74f36daf25e8fa031114143a4 (patch)
tree9a0d1c3c9722735d35281ffa560faf51708d4610 /lib
parentf0b2ac51019181cc765b55e95b2723f5ed03d3fa (diff)
parent919ddb608125db223f43b328e53fae37cab312ce (diff)
downloadotp-4958cc06969277b74f36daf25e8fa031114143a4.tar.gz
otp-4958cc06969277b74f36daf25e8fa031114143a4.tar.bz2
otp-4958cc06969277b74f36daf25e8fa031114143a4.zip
Merge branch 'maint'
* maint: Upgrade to PCRE 8.41 from PCRE 8.40
Diffstat (limited to 'lib')
-rw-r--r--lib/stdlib/test/re_SUITE_data/testoutput14
-rw-r--r--lib/stdlib/test/re_SUITE_data/testoutput84
2 files changed, 8 insertions, 0 deletions
diff --git a/lib/stdlib/test/re_SUITE_data/testoutput1 b/lib/stdlib/test/re_SUITE_data/testoutput1
index a2b3cffe9d..eff8ecc948 100644
--- a/lib/stdlib/test/re_SUITE_data/testoutput1
+++ b/lib/stdlib/test/re_SUITE_data/testoutput1
@@ -9442,4 +9442,8 @@ No match
\ X
0: X
+/X+(?#comment)?/
+ >XXX<
+ 0: X
+
/-- End of testinput1 --/
diff --git a/lib/stdlib/test/re_SUITE_data/testoutput8 b/lib/stdlib/test/re_SUITE_data/testoutput8
index 17b667a980..4984376d3c 100644
--- a/lib/stdlib/test/re_SUITE_data/testoutput8
+++ b/lib/stdlib/test/re_SUITE_data/testoutput8
@@ -7801,4 +7801,8 @@ No match
** Show all captures ignored after DFA matching
0: a
+/(02-)?[0-9]{3}-[0-9]{3}/
+ 02-123-123
+ 0: 02-123-123
+
/-- End of testinput8 --/