File 2591-Remove-and-or-from-syntax_tools.patch of Package erlang
From 18ce6947fd3ce1082a6866942a5ae91aa8822c48 Mon Sep 17 00:00:00 2001
From: Maria Scott <maria-12648430@hnc-agency.org>
Date: Fri, 23 Jan 2026 12:51:21 +0100
Subject: [PATCH] Remove and/or from syntax_tools
---
lib/syntax_tools/src/erl_prettypr.erl | 3 +--
lib/syntax_tools/src/erl_syntax.erl | 3 +--
lib/syntax_tools/src/erl_syntax_lib.erl | 9 ++++-----
lib/syntax_tools/src/prettypr.erl | 8 +++-----
4 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/lib/syntax_tools/src/erl_prettypr.erl b/lib/syntax_tools/src/erl_prettypr.erl
index 88edc6f089..b1b441d952 100644
--- a/lib/syntax_tools/src/erl_prettypr.erl
+++ b/lib/syntax_tools/src/erl_prettypr.erl
@@ -1565,7 +1564,7 @@ is_last_and_before_empty_line(H, [], #ctxt{empty_lines = EmptyLines}) ->
catch error:badarith -> false
end;
is_last_and_before_empty_line(H, [H2 | _], #ctxt{empty_lines = EmptyLines}) ->
- try ((get_line(H2) - get_line(H)) >= 2) and sets:is_element(get_line(H) + 1, EmptyLines)
+ try get_line(H2) - get_line(H) >= 2 andalso sets:is_element(get_line(H) + 1, EmptyLines)
catch error:badarith -> false
end.
diff --git a/lib/syntax_tools/src/erl_syntax.erl b/lib/syntax_tools/src/erl_syntax.erl
index ba4eafc9de..a24d7570c1 100644
--- a/lib/syntax_tools/src/erl_syntax.erl
+++ b/lib/syntax_tools/src/erl_syntax.erl
@@ -8450,7 +8449,7 @@ fold_function_names(Ns) ->
fold_function_name(N) ->
Name = arity_qualifier_body(N),
Arity = arity_qualifier_argument(N),
- true = ((type(Name) =:= atom) and (type(Arity) =:= integer)),
+ true = type(Name) =:= atom andalso type(Arity) =:= integer,
{concrete(Name), concrete(Arity)}.
fold_variable_names(Vs) ->
diff --git a/lib/syntax_tools/src/erl_syntax_lib.erl b/lib/syntax_tools/src/erl_syntax_lib.erl
index ce66c8d7e5..6f81631e05 100644
--- a/lib/syntax_tools/src/erl_syntax_lib.erl
+++ b/lib/syntax_tools/src/erl_syntax_lib.erl
@@ -1532,8 +1531,8 @@ analyze_type_name(Node) ->
A = erl_syntax:arity_qualifier_argument(Node),
N = erl_syntax:arity_qualifier_body(Node),
- case ((erl_syntax:type(A) =:= integer)
- and (erl_syntax:type(N) =:= atom))
+ case erl_syntax:type(A) =:= integer
+ andalso erl_syntax:type(N) =:= atom
of
true ->
append_arity(erl_syntax:integer_value(A),
@@ -1784,8 +1783,8 @@ analyze_file_attribute(Node) ->
attribute ->
case erl_syntax:attribute_arguments(Node) of
[F, N] ->
- case (erl_syntax:type(F) =:= string)
- and (erl_syntax:type(N) =:= integer) of
+ case erl_syntax:type(F) =:= string
+ andalso erl_syntax:type(N) =:= integer of
true ->
{erl_syntax:string_value(F),
erl_syntax:integer_value(N)};
diff --git a/lib/syntax_tools/src/prettypr.erl b/lib/syntax_tools/src/prettypr.erl
index cb94470e3a..72476326a4 100644
--- a/lib/syntax_tools/src/prettypr.erl
+++ b/lib/syntax_tools/src/prettypr.erl
@@ -791,7 +789,7 @@ rewrite(#text{s = S}, C) ->
end;
#c_best_nest_or{w = W, r = R, i = N, d = D} ->
L = width(S),
- case ((L + N) > W) or (L > R) of
+ case L + N > W orelse L > R of
true ->
%% The first line of the LHS layout is
%% not nice, so select the RHS.
@@ -861,7 +859,7 @@ rewrite(#text{s = S}, C) ->
end;
#c_best_nest_or{w = W, r = R, i = N, d = D} ->
L = width(S),
- case ((L + N) > W) or (L > R) of
+ case L + N > W orelse L > R of
true ->
%% The first line of the LHS layout is
%% not nice, so select the RHS.
@@ -913,7 +911,7 @@ rewrite(#text{s = S}, C) ->
end;
#c_best_nest_or{w = W, r = R, i = N, d = D} ->
L = width(S),
- case ((L + N) > W) or (L > R) of
+ case L + N > W orelse L > R of
true ->
%% The first line of the LHS layout is not
%% nice, so select the RHS (which contains
--
2.51.0
