Rename the (as yet unreleased) PCRE_NO_AUTO_POSSESSIFY option to

PCRE_NO_AUTO_POSSESS - no need to be so long - and to match (*NO_AUTO_POSSESS).


git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1398 2f5784b3-3f2a-0410-8824-cb99058d5e15

12 files changed, 28 insertions, 28 deletions

diff --git a/ChangeLog b/ChangeLog
index 6672f3f..5e79fa2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -85,7 +85,7 @@ Version 8.34 xx-xxxx-201x
 17. The compile-time code for auto-possessification has been refactored, based 
     on a patch by Zoltan Herczeg. It now happens after instead of during 
     compilation. The code is cleaner, and more cases are handled. The option 
-    PCRE_NO_AUTO_POSSESSIFY is added for testing purposes, and the -O and /O 
+    PCRE_NO_AUTO_POSSESS is added for testing purposes, and the -O and /O 
     options in pcretest are provided to set it. It can also be set by 
     (*NO_AUTO_POSSESS) at the start of a pattern.
     
diff --git a/doc/pcre_compile.3 b/doc/pcre_compile.3
index d293515..d4f1ba8 100644
--- a/doc/pcre_compile.3
+++ b/doc/pcre_compile.3
@@ -60,7 +60,7 @@ The option bits are:
   PCRE_NEWLINE_LF         Set LF as the newline sequence
   PCRE_NO_AUTO_CAPTURE    Disable numbered capturing paren-
                             theses (named ones available)
-  PCRE_NO_AUTO_POSSESSIFY Disable auto-possessification
+  PCRE_NO_AUTO_POSSESS    Disable auto-possessification
   PCRE_NO_START_OPTIMIZE  Disable match-time start optimizations 
   PCRE_NO_UTF16_CHECK     Do not check the pattern for UTF-16
                             validity (only relevant if
diff --git a/doc/pcre_compile2.3 b/doc/pcre_compile2.3
index 32e1211..5e46a17 100644
--- a/doc/pcre_compile2.3
+++ b/doc/pcre_compile2.3
@@ -65,7 +65,7 @@ The option bits are:
   PCRE_NEWLINE_LF         Set LF as the newline sequence
   PCRE_NO_AUTO_CAPTURE    Disable numbered capturing paren-
                             theses (named ones available)
-  PCRE_NO_AUTO_POSSESSIFY Disable auto-possessification
+  PCRE_NO_AUTO_POSSESS    Disable auto-possessification
   PCRE_NO_START_OPTIMIZE  Disable match-time start optimizations 
   PCRE_NO_UTF16_CHECK     Do not check the pattern for UTF-16
                             validity (only relevant if
diff --git a/doc/pcreapi.3 b/doc/pcreapi.3
index 1ec0760..f78d195 100644
--- a/doc/pcreapi.3
+++ b/doc/pcreapi.3
@@ -1,4 +1,4 @@
-.TH PCREAPI 3 "09 November 2013" "PCRE 8.34"
+.TH PCREAPI 3 "12 November 2013" "PCRE 8.34"
 .SH NAME
 PCRE - Perl-compatible regular expressions
 .sp
@@ -812,7 +812,7 @@ were followed by ?: but named parentheses can still be used for capturing (and
 they acquire numbers in the usual way). There is no equivalent of this option
 in Perl.
 .sp
-  PCRE_NO_AUTO_POSSESSIFY
+  PCRE_NO_AUTO_POSSESS
 .sp
 If this option is set, it disables "auto-possessification". This is an 
 optimization that, for example, turns a+b into a++b in order to avoid
@@ -2812,7 +2812,7 @@ pattern "a\ed+" is compiled as if it were "a\ed++" because there is no point
 even considering the possibility of backtracking into the repeated digits. For
 DFA matching, this means that only one possible match is found. If you really
 do want multiple matches in such cases, either use an ungreedy repeat
-("a\ed+?") or set the PCRE_NO_AUTO_POSSESSIFY option when compiling.
+("a\ed+?") or set the PCRE_NO_AUTO_POSSESS option when compiling.
 .
 .
 .SS "Error returns from \fBpcre_dfa_exec()\fP"
@@ -2889,6 +2889,6 @@ Cambridge CB2 3QH, England.
 .rs
 .sp
 .nf
-Last updated: 09 November 2013
+Last updated: 12 November 2013
 Copyright (c) 1997-2013 University of Cambridge.
 .fi
diff --git a/doc/pcrecallout.3 b/doc/pcrecallout.3
index 65eef76..8ebc995 100644
--- a/doc/pcrecallout.3
+++ b/doc/pcrecallout.3
@@ -1,4 +1,4 @@
-.TH PCRECALLOUT 3 "09 November 2013" "PCRE 8.34"
+.TH PCRECALLOUT 3 "12 November 2013" "PCRE 8.34"
 .SH NAME
 PCRE - Perl-compatible regular expressions
 .SH SYNOPSIS
@@ -80,7 +80,7 @@ then applied with automatic callouts to the string "aaaa" is:
 .sp
 This indicates that when matching [bc] fails, there is no backtracking into a+
 and therefore the callouts that would be taken for the backtracks do not occur.
-You can disable the auto-possessify feature by passing PCRE_NO_AUTO_POSSESSIFY
+You can disable the auto-possessify feature by passing PCRE_NO_AUTO_POSSESS
 to \fBpcre_compile()\fP, or starting the pattern with (*NO_AUTO_POSSESS). If
 this is done in \fBpcretest\fP (using the /O qualifier), the output changes to
 this:
@@ -250,6 +250,6 @@ Cambridge CB2 3QH, England.
 .rs
 .sp
 .nf
-Last updated: 09 November 2013
+Last updated: 12 November 2013
 Copyright (c) 1997-2013 University of Cambridge.
 .fi
diff --git a/doc/pcrematching.3 b/doc/pcrematching.3
index ea92cc9..268baf9 100644
--- a/doc/pcrematching.3
+++ b/doc/pcrematching.3
@@ -1,4 +1,4 @@
-.TH PCREMATCHING 3 "01 October 2013" "PCRE 8.34"
+.TH PCREMATCHING 3 "12 November 2013" "PCRE 8.34"
 .SH NAME
 PCRE - Perl-compatible regular expressions
 .SH "PCRE MATCHING ALGORITHMS"
@@ -112,7 +112,7 @@ pattern "a\ed+" is compiled as if it were "a\ed++" because there is no point
 even considering the possibility of backtracking into the repeated digits. For
 DFA matching, this means that only one possible match is found. If you really
 do want multiple matches in such cases, either use an ungreedy repeat
-("a\ed+?") or set the PCRE_NO_AUTO_POSSESSIFY option when compiling.
+("a\ed+?") or set the PCRE_NO_AUTO_POSSESS option when compiling.
 .P
 There are a number of features of PCRE regular expressions that are not
 supported by the alternative matching algorithm. They are as follows:
@@ -209,6 +209,6 @@ Cambridge CB2 3QH, England.
 .rs
 .sp
 .nf
-Last updated: 01 October 2013
+Last updated: 12 November 2013
 Copyright (c) 1997-2012 University of Cambridge.
 .fi
diff --git a/doc/pcrepattern.3 b/doc/pcrepattern.3
index 367f622..4d6df70 100644
--- a/doc/pcrepattern.3
+++ b/doc/pcrepattern.3
@@ -1,4 +1,4 @@
-.TH PCREPATTERN 3 "09 November 2013" "PCRE 8.34"
+.TH PCREPATTERN 3 "12 November 2013" "PCRE 8.34"
 .SH NAME
 PCRE - Perl-compatible regular expressions
 .SH "PCRE REGULAR EXPRESSION DETAILS"
@@ -91,7 +91,7 @@ table.
 .rs
 .sp
 If a pattern starts with (*NO_AUTO_POSSESS), it has the same effect as setting 
-the PCRE_NO_AUTO_POSSESSIFY option at compile time. This stops PCRE from making
+the PCRE_NO_AUTO_POSSESS option at compile time. This stops PCRE from making
 quantifiers possessive when what follows cannot match the repeated item. For
 example, by default a+b is treated as a++b. For more details, see the
 .\" HREF
@@ -3223,6 +3223,6 @@ Cambridge CB2 3QH, England.
 .rs
 .sp
 .nf
-Last updated: 09 November 2013
+Last updated: 12 November 2013
 Copyright (c) 1997-2013 University of Cambridge.
 .fi
diff --git a/doc/pcretest.1 b/doc/pcretest.1
index d177613..6718349 100644
--- a/doc/pcretest.1
+++ b/doc/pcretest.1
@@ -1,4 +1,4 @@
-.TH PCRETEST 1 "05 November 2013" "PCRE 8.34"
+.TH PCRETEST 1 "12 November 2013" "PCRE 8.34"
 .SH NAME
 pcretest - a program for testing Perl-compatible regular expressions.
 .SH SYNOPSIS
@@ -328,7 +328,7 @@ sections.
   \fB/M\fP              show compiled memory size
   \fB/m\fP              set PCRE_MULTILINE
   \fB/N\fP              set PCRE_NO_AUTO_CAPTURE
-  \fB/O\fP              set PCRE_NO_AUTO_POSSESSIFY 
+  \fB/O\fP              set PCRE_NO_AUTO_POSSESS
   \fB/P\fP              use the POSIX wrapper
   \fB/S\fP              study the pattern after compilation
   \fB/s\fP              set PCRE_DOTALL
@@ -385,7 +385,7 @@ options that do not correspond to anything in Perl:
   \fB/f\fP              PCRE_FIRSTLINE
   \fB/J\fP              PCRE_DUPNAMES
   \fB/N\fP              PCRE_NO_AUTO_CAPTURE
-  \fB/O\fP              PCRE_NO_AUTO_POSSESSIFY 
+  \fB/O\fP              PCRE_NO_AUTO_POSSESS
   \fB/U\fP              PCRE_UNGREEDY
   \fB/W\fP              PCRE_UCP
   \fB/X\fP              PCRE_EXTRA
@@ -1135,6 +1135,6 @@ Cambridge CB2 3QH, England.
 .rs
 .sp
 .nf
-Last updated: 05 November 2013
+Last updated: 12 November 2013
 Copyright (c) 1997-2013 University of Cambridge.
 .fi
diff --git a/pcre.h.in b/pcre.h.in
index a96d3e1..4e84a69 100644
--- a/pcre.h.in
+++ b/pcre.h.in
@@ -151,7 +151,7 @@ with J. */
 #define PCRE_DFA_SHORTEST       0x00010000  /*      D    ) Overlaid */
 
 /* This pair use the same bit. */
-#define PCRE_NO_AUTO_POSSESSIFY 0x00020000  /* C1        ) Overlaid */
+#define PCRE_NO_AUTO_POSSESS    0x00020000  /* C1        ) Overlaid */
 #define PCRE_DFA_RESTART        0x00020000  /*      D    ) Overlaid */
 
 #define PCRE_FIRSTLINE          0x00040000  /* C3       */
diff --git a/pcre_compile.c b/pcre_compile.c
index 688efe5..f1834c0 100644
--- a/pcre_compile.c
+++ b/pcre_compile.c
@@ -8778,7 +8778,7 @@ PCRE_UTF8 == PCRE_UTF16 == PCRE_UTF32. */
   else if (STRNCMP_UC_C8(ptr+skipatstart+2, STRING_UCP_RIGHTPAR, 4) == 0)
     { skipatstart += 6; options |= PCRE_UCP; continue; }
   else if (STRNCMP_UC_C8(ptr+skipatstart+2, STRING_NO_AUTO_POSSESS_RIGHTPAR, 16) == 0)
-    { skipatstart += 18; options |= PCRE_NO_AUTO_POSSESSIFY; continue; }
+    { skipatstart += 18; options |= PCRE_NO_AUTO_POSSESS; continue; }
   else if (STRNCMP_UC_C8(ptr+skipatstart+2, STRING_NO_START_OPT_RIGHTPAR, 13) == 0)
     { skipatstart += 15; options |= PCRE_NO_START_OPTIMIZE; continue; }
 
@@ -9166,7 +9166,7 @@ if (errorcode == 0 && re->top_backref > re->top_bracket) errorcode = ERR15;
 /* Unless disabled, check whether single character iterators can be
 auto-possessified. The function overwrites the appropriate opcode values. */
 
-if ((options & PCRE_NO_AUTO_POSSESSIFY) == 0)
+if ((options & PCRE_NO_AUTO_POSSESS) == 0)
   auto_possessify((pcre_uchar *)codestart, utf, cd);
 
 /* If there were any lookbehind assertions that contained OP_RECURSE
diff --git a/pcre_internal.h b/pcre_internal.h
index 7c80185..f09ecc8 100644
--- a/pcre_internal.h
+++ b/pcre_internal.h
@@ -1174,7 +1174,7 @@ time, run time, or study time, respectively. */
 #define PUBLIC_COMPILE_OPTIONS \
   (PCRE_CASELESS|PCRE_EXTENDED|PCRE_ANCHORED|PCRE_MULTILINE| \
    PCRE_DOTALL|PCRE_DOLLAR_ENDONLY|PCRE_EXTRA|PCRE_UNGREEDY|PCRE_UTF8| \
-   PCRE_NO_AUTO_CAPTURE|PCRE_NO_AUTO_POSSESSIFY| \
+   PCRE_NO_AUTO_CAPTURE|PCRE_NO_AUTO_POSSESS| \
    PCRE_NO_UTF8_CHECK|PCRE_AUTO_CALLOUT|PCRE_FIRSTLINE| \
    PCRE_DUPNAMES|PCRE_NEWLINE_BITS|PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE| \
    PCRE_JAVASCRIPT_COMPAT|PCRE_UCP|PCRE_NO_START_OPTIMIZE|PCRE_NEVER_UTF)
diff --git a/pcretest.c b/pcretest.c
index a6d0055..2ce0d01 100644
--- a/pcretest.c
+++ b/pcretest.c
@@ -2901,7 +2901,7 @@ printf("  -help    show usage information\n");
 printf("  -i       show information about compiled patterns\n"
        "  -M       find MATCH_LIMIT minimum for each subject\n"
        "  -m       output memory used information\n"
-       "  -O       set PCRE_NO_AUTO_POSSESSIFY on each pattern\n" 
+       "  -O       set PCRE_NO_AUTO_POSSESS on each pattern\n" 
        "  -o <n>   set size of offsets vector to <n>\n");
 #if !defined NOPOSIX
 printf("  -p       use POSIX interface\n");
@@ -3086,7 +3086,7 @@ while (argc > 1 && argv[op][0] == '-')
   else if (strcmp(arg, "-i") == 0) showinfo = 1;
   else if (strcmp(arg, "-d") == 0) showinfo = debug = 1;
   else if (strcmp(arg, "-M") == 0) default_find_match_limit = TRUE;
-  else if (strcmp(arg, "-O") == 0) default_options |= PCRE_NO_AUTO_POSSESSIFY;
+  else if (strcmp(arg, "-O") == 0) default_options |= PCRE_NO_AUTO_POSSESS;
 #if !defined NODFA
   else if (strcmp(arg, "-dfa") == 0) all_use_dfa = 1;
 #endif
@@ -3734,7 +3734,7 @@ while (!done)
       case 'K': do_mark = 1; break;
       case 'M': log_store = 1; break;
       case 'N': options |= PCRE_NO_AUTO_CAPTURE; break;
-      case 'O': options |= PCRE_NO_AUTO_POSSESSIFY; break;
+      case 'O': options |= PCRE_NO_AUTO_POSSESS; break;
 
 #if !defined NOPOSIX
       case 'P': do_posix = 1; break;
@@ -4180,7 +4180,7 @@ while (!done)
           ((get_options & PCRE_EXTRA) != 0)? " extra" : "",
           ((get_options & PCRE_UNGREEDY) != 0)? " ungreedy" : "",
           ((get_options & PCRE_NO_AUTO_CAPTURE) != 0)? " no_auto_capture" : "",
-          ((get_options & PCRE_NO_AUTO_POSSESSIFY) != 0)? " no_auto_possessify" : "",
+          ((get_options & PCRE_NO_AUTO_POSSESS) != 0)? " no_auto_possessify" : "",
           ((get_options & PCRE_UTF8) != 0)? " utf" : "",
           ((get_options & PCRE_UCP) != 0)? " ucp" : "",
           ((get_options & PCRE_NO_UTF8_CHECK) != 0)? " no_utf_check" : "",