[latex3-commits] [git/LaTeX3-latex3-latex3] master: Back out one performance improvement (957c43a)

[Joseph Wright]

Repository : https://github.com/latex3/latex3
On branch  : master
Link       : https://github.com/latex3/latex3/commit/957c43a365794bcd2efbe7d7111e75b7ec73b8e1

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

commit 957c43a365794bcd2efbe7d7111e75b7ec73b8e1
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Sun Jan 13 18:05:31 2019 +0000

    Back out one performance improvement
    
    There was an unclosed \ifx here: the performance gain doesn't
    justify the required complexity.


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

957c43a365794bcd2efbe7d7111e75b7ec73b8e1
 l3kernel/CHANGELOG.md  |    4 ++++
 l3kernel/l3unicode.dtx |   27 +++++++++++++--------------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/l3kernel/CHANGELOG.md b/l3kernel/CHANGELOG.md
index 43fab4c..4db4ee2 100644
--- a/l3kernel/CHANGELOG.md
+++ b/l3kernel/CHANGELOG.md
@@ -7,6 +7,10 @@ this project uses date-based 'snapshot' version identifiers.
 
 ## [Unreleased]
 
+### Fixed
+
+- Unclosed conditional with Unicode engines
+
 ## [2019-01-12]
 
 ### Changed
diff --git a/l3kernel/l3unicode.dtx b/l3kernel/l3unicode.dtx
index 23a471d..a0c7d13 100644
--- a/l3kernel/l3unicode.dtx
+++ b/l3kernel/l3unicode.dtx
@@ -213,21 +213,20 @@
         }
       \ior_str_map_inline:Nn \g_@@_data_ior
         {
-          \cs_set_nopar:Npn \l_@@_tmpa_tl {#1}
-          \reverse_if:N \if_meaning:w \l_@@_tmpa_tl \c_empty_tl
-            \if:w \tl_head:n { #1 ? } \c_hash_str
-              \cs_set_nopar:Npx \l_@@_tmpb_tl
+          \tl_if_blank:nF {#1}
+            {
+              \str_if_eq:eeTF { \tl_head:n {#1} } { \c_hash_str }
                 {
-                  \c_hash_str \c_space_tl
-                  \tl_to_str:n { Conditional~Mappings }
-                }
-              \if_meaning:w \l_@@_tmpa_tl \l_@@_tmpb_tl
-                \exp_after:wN \exp_after:wN \exp_after:wN \ior_map_break:
-              \fi:
-            \else:
-              \@@_data_auxi:w #1 \q_stop
-            \fi:
-          \fi:
+                  \str_if_eq:eeT
+                    {#1}
+                    {
+                      \c_hash_str \c_space_tl
+                      \tl_to_str:n { Conditional~Mappings }
+                    }
+                    { \ior_map_break: }
+              }
+              { \@@_data_auxi:w #1 \q_stop }
+            }
         }
       \ior_close:N \g_@@_data_ior
    \group_end: