Use full names in PcreConstants

Author: ltrzesniewski

src/PCRE.NET/Conversion/PcreConvert.cs

@@ -13,14 +13,14 @@ public static unsafe class PcreConvert
     /// </summary>
     /// <param name="pattern">The pattern to convert.</param>
     public static string FromPosixBasic(string pattern)
-        => BasicConvert(pattern, PcreConstants.CONVERT_POSIX_BASIC);
+        => BasicConvert(pattern, PcreConstants.PCRE2_CONVERT_POSIX_BASIC);
 
     /// <summary>
     /// Converts a POSIX extended pattern to a PCRE pattern.
     /// </summary>
     /// <param name="pattern">The pattern to convert.</param>
     public static string FromPosixExtended(string pattern)
-        => BasicConvert(pattern, PcreConstants.CONVERT_POSIX_EXTENDED);
+        => BasicConvert(pattern, PcreConstants.PCRE2_CONVERT_POSIX_EXTENDED);
 
     /// <summary>
     /// Converts a glob pattern to a PCRE pattern.
@@ -60,7 +60,7 @@ private static string Convert(string pattern, Native.convert_input* input)
         {
             input->pattern = pPattern;
             input->pattern_length = (uint)pattern.Length;
-            input->options |= PcreConstants.CONVERT_UTF;
+            input->options |= PcreConstants.PCRE2_CONVERT_UTF;
 
             Native.convert_result result;
             var errorCode = Native.convert(input, &result);

src/PCRE.NET/Conversion/PcreGlobConversionOptions.cs

@@ -61,13 +61,13 @@ internal void FillConvertInput(ref Native.convert_input input)
 
     private uint GetConvertOptions()
     {
-        var options = PcreConstants.CONVERT_GLOB;
+        var options = PcreConstants.PCRE2_CONVERT_GLOB;
 
         if (NoWildcardSeparator)
-            options |= PcreConstants.CONVERT_GLOB_NO_WILD_SEPARATOR;
+            options |= PcreConstants.PCRE2_CONVERT_GLOB_NO_WILD_SEPARATOR;
 
         if (NoStarStar)
-            options |= PcreConstants.CONVERT_GLOB_NO_STARSTAR;
+            options |= PcreConstants.PCRE2_CONVERT_GLOB_NO_STARSTAR;
 
         return options;
     }

src/PCRE.NET/Dfa/PcreDfaMatchOptions.cs

@@ -15,25 +15,25 @@ public enum PcreDfaMatchOptions : long
     None = 0,
 
     /// <inheritdoc cref="PcreMatchOptions.Anchored"/>
-    Anchored = PcreConstants.ANCHORED,
+    Anchored = PcreConstants.PCRE2_ANCHORED,
 
     /// <inheritdoc cref="PcreMatchOptions.EndAnchored"/>
-    EndAnchored = PcreConstants.ENDANCHORED,
+    EndAnchored = PcreConstants.PCRE2_ENDANCHORED,
 
     /// <inheritdoc cref="PcreMatchOptions.NotBol"/>
-    NotBol = PcreConstants.NOTBOL,
+    NotBol = PcreConstants.PCRE2_NOTBOL,
 
     /// <inheritdoc cref="PcreMatchOptions.NotEol"/>
-    NotEol = PcreConstants.NOTEOL,
+    NotEol = PcreConstants.PCRE2_NOTEOL,
 
     /// <inheritdoc cref="PcreMatchOptions.NotEmpty"/>
-    NotEmpty = PcreConstants.NOTEMPTY,
+    NotEmpty = PcreConstants.PCRE2_NOTEMPTY,
 
     /// <inheritdoc cref="PcreMatchOptions.NotEmptyAtStart"/>
-    NotEmptyAtStart = PcreConstants.NOTEMPTY_ATSTART,
+    NotEmptyAtStart = PcreConstants.PCRE2_NOTEMPTY_ATSTART,
 
     /// <inheritdoc cref="PcreMatchOptions.NoUtfCheck"/>
-    NoUtfCheck = PcreConstants.NO_UTF_CHECK,
+    NoUtfCheck = PcreConstants.PCRE2_NO_UTF_CHECK,
 
     /// <summary>
     /// <c>PCRE2_PARTIAL_SOFT</c> - Enable partial matching mode. Still try to find a complete match if a partial match is found first.
@@ -57,7 +57,7 @@ public enum PcreDfaMatchOptions : long
     /// </para>
     /// </remarks>
     /// <see cref="PcreMatchOptions.PartialSoft"/>
-    PartialSoft = PcreConstants.PARTIAL_SOFT,
+    PartialSoft = PcreConstants.PCRE2_PARTIAL_SOFT,
 
     /// <summary>
     /// <c>PCRE2_PARTIAL_HARD</c> - Enable partial matching mode. Stop looking for a complete match if a partial match is found first.
@@ -81,7 +81,7 @@ public enum PcreDfaMatchOptions : long
     /// </para>
     /// </remarks>
     /// <see cref="PcreMatchOptions.PartialHard"/>
-    PartialHard = PcreConstants.PARTIAL_HARD,
+    PartialHard = PcreConstants.PCRE2_PARTIAL_HARD,
 
     /// <summary>
     /// <c>PCRE2_DFA_SHORTEST</c> - Stop at the first (and therefore shortest) match.
@@ -90,5 +90,5 @@ public enum PcreDfaMatchOptions : long
     /// Setting the <see cref="DfaShortest"/> option causes the matching algorithm to stop as soon as it has found one match.
     /// Because of the way the alternative algorithm works, this is necessarily the shortest possible match at the first possible matching point in the subject string.
     /// </remarks>
-    DfaShortest = PcreConstants.DFA_SHORTEST
+    DfaShortest = PcreConstants.PCRE2_DFA_SHORTEST
 }

src/PCRE.NET/Dfa/PcreDfaRegex.Match.cs

@@ -124,7 +124,7 @@ private IEnumerable<PcreDfaMatchResult> MatchesIterator(string subject, PcreDfaM
 
         yield return match;
 
-        additionalOptions |= PcreConstants.NO_UTF_CHECK;
+        additionalOptions |= PcreConstants.PCRE2_NO_UTF_CHECK;
 
         while (true)
         {

src/PCRE.NET/Internal/CalloutInterop.cs

@@ -291,7 +291,7 @@ public int Call(Native.pcre2_callout_block* callout)
             catch (Exception ex)
             {
                 Exception = ex;
-                return PcreConstants.ERROR_CALLOUT;
+                return PcreConstants.PCRE2_ERROR_CALLOUT;
             }
         }
     }

src/PCRE.NET/Internal/InternalRegex.cs

@@ -160,10 +160,10 @@ public PcreMatch Match(string subject,
             GC.KeepAlive(jitStack);
         }
 
-        if (result.result_code == PcreConstants.ERROR_NOMATCH)
+        if (result.result_code == PcreConstants.PCRE2_ERROR_NOMATCH)
             return _noMatch ??= new PcreMatch(this);
 
-        if (result.result_code < PcreConstants.ERROR_PARTIAL)
+        if (result.result_code < PcreConstants.PCRE2_ERROR_PARTIAL)
             HandleError(result, ref calloutInterop);
 
         oVectorArray ??= oVector.ToArray();
@@ -212,10 +212,10 @@ public void Match(ref PcreRefMatch match,
             GC.KeepAlive(jitStack);
         }
 
-        if (result.result_code < PcreConstants.ERROR_PARTIAL)
+        if (result.result_code < PcreConstants.PCRE2_ERROR_PARTIAL)
             HandleError(result, ref calloutInterop);
 
-        if (result.result_code != PcreConstants.ERROR_NOMATCH && oVector != match.OutputVector)
+        if (result.result_code != PcreConstants.PCRE2_ERROR_NOMATCH && oVector != match.OutputVector)
             oVectorArray ??= oVector.ToArray();
 
         match.Update(subject, result, oVectorArray);
@@ -253,7 +253,7 @@ public void BufferMatch(ref PcreRefMatch match,
             GC.KeepAlive(buffer); // The buffer keeps alive all the other required stuff
         }
 
-        if (result.result_code < PcreConstants.ERROR_PARTIAL)
+        if (result.result_code < PcreConstants.PCRE2_ERROR_PARTIAL)
             HandleError(result, ref calloutInterop);
 
         match.Update(subject, result, null);
@@ -287,7 +287,7 @@ public PcreDfaMatchResult DfaMatch(string subject, PcreDfaMatchSettings settings
             GC.KeepAlive(this);
         }
 
-        if (result.result_code < PcreConstants.ERROR_PARTIAL)
+        if (result.result_code < PcreConstants.PCRE2_ERROR_PARTIAL)
             HandleError(result, ref calloutInterop);
 
         return new PcreDfaMatchResult(subject, ref result, oVector);
@@ -343,7 +343,7 @@ public string Substitute(ReadOnlySpan<char> subject,
         {
             if (calloutInterop.Exception is { } ex)
             {
-                if (result.result_code == PcreConstants.ERROR_REPLACECASE)
+                if (result.result_code == PcreConstants.PCRE2_ERROR_REPLACECASE)
                     throw new PcreCalloutException(PcreErrorCode.ReplaceCase, "An exception was thrown by the case-transformation callout: " + ex.Message, ex);
 
                 throw new PcreCalloutException("An exception was thrown by the callout: " + ex.Message, ex);
@@ -355,7 +355,7 @@ public string Substitute(ReadOnlySpan<char> subject,
                     throw new PcreSubstituteException((PcreErrorCode)result.result_code);
 
                 case 0: // No substitution was made, avoid allocating a new string if possible
-                    if ((additionalOptions & PcreConstants.SUBSTITUTE_REPLACEMENT_ONLY) != 0)
+                    if ((additionalOptions & PcreConstants.PCRE2_SUBSTITUTE_REPLACEMENT_ONLY) != 0)
                         return string.Empty;
 
                     return subjectAsString ?? subject.ToString();
@@ -378,11 +378,11 @@ private static void HandleError(in Native.match_result result, ref CalloutIntero
     {
         switch (result.result_code)
         {
-            case PcreConstants.ERROR_NOMATCH:
-            case PcreConstants.ERROR_PARTIAL:
+            case PcreConstants.PCRE2_ERROR_NOMATCH:
+            case PcreConstants.PCRE2_ERROR_PARTIAL:
                 break;
 
-            case PcreConstants.ERROR_CALLOUT:
+            case PcreConstants.PCRE2_ERROR_CALLOUT:
                 throw new PcreCalloutException("An exception was thrown by the callout: " + calloutInterop.Exception?.Message, calloutInterop.Exception);
 
             default: