summaryrefslogtreecommitdiff
path: root/src/pcre2test.c
diff options
context:
space:
mode:
authorph10 <ph10@6239d852-aaf2-0410-a92c-79f79f948069>2018-07-21 14:34:51 +0000
committerph10 <ph10@6239d852-aaf2-0410-a92c-79f79f948069>2018-07-21 14:34:51 +0000
commit1ad8a5e6add80b53753a4b78589ff41fc58dad18 (patch)
tree0f98c3150bddb2e2e6e617bfacd337369cd23061 /src/pcre2test.c
parent8d3008803ffa16d46260e7e1ad087f62e1ca0a28 (diff)
downloadpcre2-1ad8a5e6add80b53753a4b78589ff41fc58dad18.tar.gz
Allow :NAME on (*ACCEPT), (*FAIL), and (*COMMIT) and fix bug with (*MARK)
followed by (*ACCEPT) in an assertion. More small updates to perltest.sh. git-svn-id: svn://vcs.exim.org/pcre2/code/trunk@968 6239d852-aaf2-0410-a92c-79f79f948069
Diffstat (limited to 'src/pcre2test.c')
-rw-r--r--src/pcre2test.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/pcre2test.c b/src/pcre2test.c
index 216283e..43bd5c5 100644
--- a/src/pcre2test.c
+++ b/src/pcre2test.c
@@ -4678,12 +4678,6 @@ uint16_t first_listed_newline;
const char *cmdname;
uint8_t *argptr, *serial;
-if (restrict_for_perl_test)
- {
- fprintf(outfile, "** #-commands are not allowed after #perltest\n");
- return PR_ABEND;
- }
-
yield = PR_OK;
cmd = CMD_UNKNOWN;
cmdlen = 0;
@@ -4702,6 +4696,12 @@ for (i = 0; i < cmdlistcount; i++)
argptr = buffer + cmdlen + 1;
+if (restrict_for_perl_test && cmd != CMD_PATTERN && cmd != CMD_SUBJECT)
+ {
+ fprintf(outfile, "** #%s is not allowed after #perltest\n", cmdname);
+ return PR_ABEND;
+ }
+
switch(cmd)
{
case CMD_UNKNOWN: