From 2a013ffc5ba6b349908b63f40847d91e2594a2b1 Mon Sep 17 00:00:00 2001 From: guojunding Date: Tue, 30 Jul 2024 16:47:04 +0800 Subject: [PATCH] Fix pattern documentation for case-insensitive ranges (cherry picked from commit 9a81e91f8c16ad036ad738799c003cdfbf33f0d0) (cherry picked from commit 51aed53bbb3b746a02d627778a525effd93c8d76) --- ...entation-for-case-insensitive-ranges.patch | 33 +++++++++++++++++++ flex.spec | 6 +++- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 0003-backport-Fix-pattern-documentation-for-case-insensitive-ranges.patch diff --git a/0003-backport-Fix-pattern-documentation-for-case-insensitive-ranges.patch b/0003-backport-Fix-pattern-documentation-for-case-insensitive-ranges.patch new file mode 100644 index 0000000..00edfd8 --- /dev/null +++ b/0003-backport-Fix-pattern-documentation-for-case-insensitive-ranges.patch @@ -0,0 +1,33 @@ +From 38389534dabcf98bcbda70ef516c2b00f9ec67e9 Mon Sep 17 00:00:00 2001 +From: Martin Joerg +Date: Mon, 27 Mar 2023 10:20:18 +0200 +Subject: [PATCH] Fix pattern documentation for case-insensitive ranges + +--- + doc/flex.texi | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/doc/flex.texi b/doc/flex.texi +index bccab1e..acdd04c 100644 +--- a/doc/flex.texi ++++ b/doc/flex.texi +@@ -952,13 +952,13 @@ character range such as @samp{[a-z]} or @samp{[S-W]} where it is obvious that yo + want case-folding to occur. Here are some examples with the @samp{-i} flag + enabled: + +-@multitable {@samp{[a-zA-Z]}} {ambiguous} {@samp{[A-Z\[\\\]_`a-t]}} {@samp{[@@A-Z\[\\\]_`abc]}} ++@multitable {@samp{[a-zA-Z]}} {ambiguous} {@samp{[A-Z\[\\\]^_`a-t]}} {@samp{[@@A-Z\[\\\]^_`abc]}} + @item Range @tab Result @tab Literal Range @tab Alternate Range + @item @samp{[a-t]} @tab ok @tab @samp{[a-tA-T]} @tab + @item @samp{[A-T]} @tab ok @tab @samp{[a-tA-T]} @tab +-@item @samp{[A-t]} @tab ambiguous @tab @samp{[A-Z\[\\\]_`a-t]} @tab @samp{[a-tA-T]} ++@item @samp{[A-t]} @tab ambiguous @tab @samp{[A-Z\[\\\]^_`a-t]} @tab @samp{[a-tA-T]} + @item @samp{[_-@{]} @tab ambiguous @tab @samp{[_`a-z@{]} @tab @samp{[_`a-zA-Z@{]} +-@item @samp{[@@-C]} @tab ambiguous @tab @samp{[@@ABC]} @tab @samp{[@@A-Z\[\\\]_`abc]} ++@item @samp{[@@-C]} @tab ambiguous @tab @samp{[@@ABC]} @tab @samp{[@@A-Z\[\\\]^_`abc]} + @end multitable + + @cindex end of line, in negated character classes +-- +2.9.3.windows.1 + diff --git a/flex.spec b/flex.spec index 82c1c07..a90d708 100644 --- a/flex.spec +++ b/flex.spec @@ -1,6 +1,6 @@ Name: flex Version: 2.6.4 -Release: 5 +Release: 6 Summary: A fast lexical analyzer generator License: BSD URL: https://github.com/westes/flex @@ -17,6 +17,7 @@ Patch0007: scanner-temporarily-protect-against-ccl-overflow-ove.patch Patch0008: scanner-prevent-overflow-in-add_action.patch Patch0009: 0001-scanner-fix-default-of-yy_top_state.patch Patch0010: 0002-scanner-fix-default-of-yy_top_state.patch +Patch0011: 0003-backport-Fix-pattern-documentation-for-case-insensitive-ranges.patch BuildRequires: gcc gcc-c++ gettext help2man m4 bison texinfo automake autoconf Requires: m4 @@ -105,6 +106,9 @@ fi %{_mandir}/man1/* %changelog +* Tue Jul 30 2024 guojunding - 2.6.4-6 +- Fix pattern documentation for case-insensitive ranges + * Tue Jul 12 2022 panxiaohe - 2.6.4-5 - enable check test suite - delete duplicate package files: NEWS,README.md -- Gitee