File 4811-Remove-and-or-in-xmerl.patch of Package erlang
From 14093ed31bdb28fbc8aee94d6ef2f051e750e3be Mon Sep 17 00:00:00 2001
From: Maria Scott <maria-12648430@hnc-agency.org>
Date: Tue, 17 Feb 2026 10:55:18 +0100
Subject: [PATCH] Remove and/or in xmerl
---
lib/xmerl/src/xmerl_scan.erl | 6 ++----
lib/xmerl/src/xmerl_xpath_pred.erl | 6 ++----
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/lib/xmerl/src/xmerl_scan.erl b/lib/xmerl/src/xmerl_scan.erl
index 1e04ad137b..60dda6b9e6 100644
--- a/lib/xmerl/src/xmerl_scan.erl
+++ b/lib/xmerl/src/xmerl_scan.erl
@@ -1199,8 +1197,8 @@ scan_pi(Str = [H1,H2,H3 | T],S0=#xmerl_scanner{line = L, col = C}, Pos, Ps)
%% names beginning with [xX][mM][lL] are reserved for future use.
?bump_col(3),
if
- ((H2==$m) or (H2==$M)) and
- ((H3==$l) or (H3==$L)) ->
+ H2==$m orelse H2==$M,
+ H3==$l orelse H3==$L ->
scan_wellknown_pi(T,S,Pos,Ps);
true ->
{Target, _NamespaceInfo, T1, S1} = scan_name(Str, S),
diff --git a/lib/xmerl/src/xmerl_xpath_pred.erl b/lib/xmerl/src/xmerl_xpath_pred.erl
index a3f83fb44a..67de793542 100644
--- a/lib/xmerl/src/xmerl_xpath_pred.erl
+++ b/lib/xmerl/src/xmerl_xpath_pred.erl
@@ -181,9 +179,9 @@ comp_expr('!=', E1, E2, C) ->
?boolean(compare_eq_format(N1,N2,C) /= compare_eq_format(N2,N1,C)).
bool_expr('or', E1, E2, C) ->
- ?boolean(mk_boolean(C, E1) or mk_boolean(C, E2));
+ ?boolean(mk_boolean(C, E1) orelse mk_boolean(C, E2));
bool_expr('and', E1, E2, C) ->
- ?boolean(mk_boolean(C, E1) and mk_boolean(C, E2)).
+ ?boolean(mk_boolean(C, E1) andalso mk_boolean(C, E2)).
%% According to chapter 3.4 in XML Path Language ver 1.0 the format of
%% the compared objects are depending on the type of the other
--
2.51.0