From cda4780fb6f35e40139e899f02e9ffc32f18ff45 Mon Sep 17 00:00:00 2001
From: "Philip.Hazel" <Philip.Hazel@gmail.com>
Date: Wed, 3 Oct 2018 15:41:47 +0000
Subject: [PATCH] Fix bugs of omission in new script run code.

---
 src/pcre2_compile.c  |  3 +++
 testdata/testinput4  | 10 ++++++++++
 testdata/testinput5  |  5 +++++
 testdata/testoutput4 | 12 ++++++++++++
 testdata/testoutput5 | 33 +++++++++++++++++++++++++++++++++
 5 files changed, 63 insertions(+)

diff --git a/src/pcre2_compile.c b/src/pcre2_compile.c
index 88e581f..e372eac 100644
--- a/src/pcre2_compile.c
+++ b/src/pcre2_compile.c
@@ -8640,6 +8640,7 @@ for (;; pptr++)
     case META_LOOKBEHIND:
     case META_LOOKBEHINDNOT:
     case META_NOCAPTURE:
+    case META_SCRIPT_RUN: 
     nestlevel++;
     break;
 
@@ -9052,6 +9053,7 @@ for (;; pptr++)
 
     case META_ATOMIC:
     case META_NOCAPTURE:
+    case META_SCRIPT_RUN: 
     pptr++;
     CHECK_GROUP:
     grouplength = get_grouplength(&pptr, TRUE, errcodeptr, lcptr, group,
@@ -9231,6 +9233,7 @@ for (pptr = cb->parsed_pattern; *pptr != META_END; pptr++)
     case META_QUERY_QUERY:
     case META_RANGE_ESCAPED:
     case META_RANGE_LITERAL:
+    case META_SCRIPT_RUN: 
     case META_SKIP:
     case META_THEN:
     break;
diff --git a/testdata/testinput4 b/testdata/testinput4
index eea087d..c2d16d5 100644
--- a/testdata/testinput4
+++ b/testdata/testinput4
@@ -2395,6 +2395,16 @@
 \= Expect no match
     \x{1100}\x{2e80}\x{3041}\x{1101}   Hangul Han Hiragana Hangul
 
+/(?<!)(*sr:)/
+
+/(?<!X(*sr:B)C)/
+
+/(?<=abc(?=X(*sr:BCY)Z)XBCYZ)./
+    abcXBCYZ!
+
+/(?<=abc(?=X(*sr:BXY)CCC)XBXYCCC)./
+   abcXBXYCCC!
+
 # Test loop breaking for empty string match
 
 /^(*sr:A|)*BCD/utf
diff --git a/testdata/testinput5 b/testdata/testinput5
index 9730e0b..d559324 100644
--- a/testdata/testinput5
+++ b/testdata/testinput5
@@ -2116,6 +2116,11 @@
 
 /^(*sr:\x{2e80}*)\x{2e80}/B,utf
 
+/(?<!)(*sr:)/B
+
+/(?<=abc(?=X(*sr:BXY)CCC)XBXYCCC)./B
+   abcXBXYCCC!
+
 # Some script run patterns are broken in Perl 5.28.0. These can be moved into
 # test 4 when a mended version of Perl is released.
 
diff --git a/testdata/testoutput4 b/testdata/testoutput4
index 8a53cf7..3b745e1 100644
--- a/testdata/testoutput4
+++ b/testdata/testoutput4
@@ -3873,6 +3873,18 @@ No match
     \x{1100}\x{2e80}\x{3041}\x{1101}   Hangul Han Hiragana Hangul
 No match
 
+/(?<!)(*sr:)/
+
+/(?<!X(*sr:B)C)/
+
+/(?<=abc(?=X(*sr:BCY)Z)XBCYZ)./
+    abcXBCYZ!
+ 0: !
+
+/(?<=abc(?=X(*sr:BXY)CCC)XBXYCCC)./
+   abcXBXYCCC!
+ 0: !
+
 # Test loop breaking for empty string match
 
 /^(*sr:A|)*BCD/utf
diff --git a/testdata/testoutput5 b/testdata/testoutput5
index 406db22..17fac3a 100644
--- a/testdata/testoutput5
+++ b/testdata/testoutput5
@@ -4814,6 +4814,39 @@ MK: ABC
         End
 ------------------------------------------------------------------
 
+/(?<!)(*sr:)/B
+------------------------------------------------------------------
+        Bra
+        AssertB not
+        Ket
+        Script run
+        Ket
+        Ket
+        End
+------------------------------------------------------------------
+
+/(?<=abc(?=X(*sr:BXY)CCC)XBXYCCC)./B
+------------------------------------------------------------------
+        Bra
+        AssertB
+        Reverse
+        abc
+        Assert
+        X
+        Script run
+        BXY
+        Ket
+        CCC
+        Ket
+        XBXYCCC
+        Ket
+        Any
+        Ket
+        End
+------------------------------------------------------------------
+   abcXBXYCCC!
+ 0: !
+
 # Some script run patterns are broken in Perl 5.28.0. These can be moved into
 # test 4 when a mended version of Perl is released.