released 2.3.1 - context matching enhancements and -G fix

Genivia · Jun 22, 2020 · b754d30 · b754d30
1 parent daa5bed
commit b754d30
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -4080,7 +4080,7 @@ in markdown:
 
 
 
-    ugrep 2.3.0                      June 21, 2020                        UGREP(1)
+    ugrep 2.3.1                      June 21, 2020                        UGREP(1)
 
 🔝 [Back to table of contents](#toc)
 

diff --git a/bin/win32/ugrep.exe b/bin/win32/ugrep.exe
diff --git a/bin/win64/ugrep.exe b/bin/win64/ugrep.exe
diff --git a/lib/convert.cpp b/lib/convert.cpp
@@ -1921,7 +1921,7 @@ std::string convert(const char *pattern, const char *signature, convert_flag_typ
           throw regex_error(regex_error::invalid_syntax, pattern, pos);
         if (beg)
           throw regex_error(regex_error::empty_expression, pattern, pos);
-        if (pos + 1 < len && (pattern[pos + 1] == '?' || pattern[pos + 1] == '+') && !supports_escape(signature, pattern[pos + 1]))
+        if (pos + 1 < len && !(flags & convert_flag::basic) && (pattern[pos + 1] == '?' || pattern[pos + 1] == '+') && !supports_escape(signature, pattern[pos + 1]))
           throw regex_error(regex_error::invalid_quantifier, pattern, pos + 1);
         break;
       case '\t':

diff --git a/man/ugrep.1 b/man/ugrep.1
@@ -1,4 +1,4 @@
-.TH UGREP "1" "June 21, 2020" "ugrep 2.3.0" "User Commands"
+.TH UGREP "1" "June 21, 2020" "ugrep 2.3.1" "User Commands"
 .SH NAME
 \fBugrep\fR -- file pattern searcher
 .SH SYNOPSIS

diff --git a/src/ugrep.cpp b/src/ugrep.cpp
@@ -67,7 +67,7 @@ After this, you may want to test ugrep and install it (optional):
 */
 
 // ugrep version
-#define UGREP_VERSION "2.3.0"
+#define UGREP_VERSION "2.3.1"
 
 #include "ugrep.hpp"
 #include "glob.hpp"