[latex3-commits] [git/LaTeX3-latex3-latex3] main: Correct defn. for \str_case:Nn(TF) (3c321ef83)

[Joseph Wright]

Repository : https://github.com/latex3/latex3
On branch  : main
Link       : https://github.com/latex3/latex3/commit/3c321ef83531894ebe9f4adec34ac5cc6ba02cd9

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

commit 3c321ef83531894ebe9f4adec34ac5cc6ba02cd9
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Mon May 9 12:35:45 2022 +0100

    Correct defn. for \str_case:Nn(TF)


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

3c321ef83531894ebe9f4adec34ac5cc6ba02cd9
 l3kernel/CHANGELOG.md | 1 +
 l3kernel/l3str.dtx    | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/l3kernel/CHANGELOG.md b/l3kernel/CHANGELOG.md
index 4f1fb04f6..56151b230 100644
--- a/l3kernel/CHANGELOG.md
+++ b/l3kernel/CHANGELOG.md
@@ -9,6 +9,7 @@ this project uses date-based 'snapshot' version identifiers.
 
 ### Fixed
 - Typo in implemenation of titlecase `hy-x-yiwn`
+- Definition order issue with `\str_case:Nn(TF)`
 
 ## [2022-05-04]
 
diff --git a/l3kernel/l3str.dtx b/l3kernel/l3str.dtx
index 1070c6e7f..f5a61a14a 100644
--- a/l3kernel/l3str.dtx
+++ b/l3kernel/l3str.dtx
@@ -1234,12 +1234,12 @@
 \cs_new:Npn \@@_case:nnTF #1#2#3#4
   { \@@_case:nw {#1} #2 {#1} { } \s_@@_mark {#3} \s_@@_mark {#4} \s_@@_stop }
 \cs_generate_variant:Nn \str_case:nn   { V , o , nV , nv }
+\prg_generate_conditional_variant:Nnn \str_case:nn
+  { V , o , nV , nv } { T , F , TF }
 \cs_new_eq:NN \str_case:Nn   \str_case:Vn
 \cs_new_eq:NN \str_case:NnT  \str_case:VnT
 \cs_new_eq:NN \str_case:NnF  \str_case:VnF
 \cs_new_eq:NN \str_case:NnTF \str_case:VnTF
-\prg_generate_conditional_variant:Nnn \str_case:nn
-  { V , o , nV , nv } { T , F , TF }
 \cs_new:Npn \@@_case:nw #1#2#3
   {
     \str_if_eq:nnTF {#1} {#2}