[FarGroup/FarManager] master: once more correction for 6592 (73768c382)

[farg...@farmanager.com]

Repository : https://github.com/FarGroup/FarManager
On branch : master
Link : https://github.com/FarGroup/FarManager/commit/73768c3821c07c0e8dcdfde9644999c875ada0e3

>---------------------------------------------------------------

commit 73768c3821c07c0e8dcdfde9644999c875ada0e3
Author: w17 <vladimir....@gmail.com>
Date: Mon Nov 10 23:51:54 2025 +0300

once more correction for 6592


>---------------------------------------------------------------

73768c3821c07c0e8dcdfde9644999c875ada0e3
far/RegExp.cpp | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/far/RegExp.cpp b/far/RegExp.cpp
index b5c5629f3..d5d3bd204 100644
--- a/far/RegExp.cpp
+++ b/far/RegExp.cpp
@@ -344,7 +344,7 @@ enum REOp

opAlternative, // |

- opBackRef, // \number \-number \g{number|-number|name} \p{number|-number|name}
+ opBackRef, // \number \g{number|-number|name} \p{number|-number|name}

//opNamedBracket, // (?{name}
//opNamedBackRef, // \p{name} \g{name} -- resolved as opBackRef
@@ -556,8 +556,8 @@ static string_view get_NamedGroup(string_view src, int& pos, const int shift)
return src.substr(b_pos, e_pos - b_pos);
}

-// \num \-num \pnum \p{num} \p-num \p{-num} \p{name} \gnum ... \g{name}
-// ^ ^ ^ ^ ^ ^ ^ ^ ^
+// \num \pnum \p{num} \p-num \p{-num} \p{name} \gnum ... \g{name}
+// ^ ^ ^ ^ ^ ^ ^ ^
static string_view get_BackRef(string_view src, int& pos, const int shift)
{
auto c = src[pos];
@@ -666,10 +666,10 @@ int RegExp::CalcLength(string_view src, const int shift)
continue;
}

- // \n \-n
+ // \n
// \pn \p-n \p{n} \p{-n} \p{name}
// \gn \g-n \g{n} \g{-n} \g{name}
- if (c && wcschr(L"pg-", c) || ISDIGIT(c))
+ if (c == L'p' || c == L'g' || ISDIGIT(c))
{
back_ref(i);
}
@@ -1071,7 +1071,7 @@ void RegExp::InnerCompile(const wchar_t* src, const int srclength, const int shi

default:
{
- if (c && wcschr(L"pg-", c) || ISDIGIT(c)) // \n \-n \p{n} \p{-n} \p{name} \g{n} \g{-n} \g{name}
+ if (c == L'p' || c == L'g' || ISDIGIT(c)) // \n \p{n} \p{-n} \p{name} \g{n} \g{-n} \g{name}
{
const auto bref = back_ref(i);
const auto b_pos = static_cast<int>(bref.data() - src);