Make qlc generate andalso/orelse, not and/or

Author: richcarl

lib/stdlib/src/qlc.erl

@@ -2185,7 +2185,7 @@ join_merge_info(QNum, QInfo, Code, G, ExtraConstants) ->
                        A = anno0(),
                        Call = {call,A,{atom,A,element},[{integer,A,Col},EPV]},
                        F = list2op([{op,A,Op,abstract_term(Con),Call}
-                                      || {Con,Op} <- ConstOps], 'or', A),
+                                      || {Con,Op} <- ConstOps], 'orelse', A),
                        term_to_binary(F)
                    end ||
                       {Col,ConstOps} <- ExtraConstants],

lib/stdlib/src/qlc_pt.erl

@@ -951,7 +951,7 @@ join_handle(AP, Anno, [F, H, O, C], Constants) ->
             A = anno0(),
             G0 = [begin
                       Call = {call,A,{atom,A,element},[{integer,A,Col},O]},
-                      list2op([{op,A,Op,Con,Call} || {Con,Op} <- Cs], 'or')
+                      list2op([{op,A,Op,Con,Call} || {Con,Op} <- Cs], 'orelse')
                   end || {Col,Cs} <- Constants],
             G = if G0 =:= [] -> G0; true -> [G0] end,
             CC1 = {clause,Anno,[AP],G,
@@ -1714,10 +1714,9 @@ filter1({op, _, Op, L0, R0}, Fs, FS) when Op =:= '=:='; Op =:= '==' ->
                               F -> [F]
                           end
                   end, Fs);
-filter1({op, _, Op, L, R}, Fs, FS) when Op =:= 'and'; Op =:= 'andalso' ->
+filter1({op, _, Op, L, R}, Fs, FS) when Op =:= 'andalso' ->
     filter1(R, filter1(L, Fs, FS), FS);
-filter1({op, _, Op, L, R}, Fs, FS) when Op =:= 'or';
-                                        Op =:= 'orelse';
+filter1({op, _, Op, L, R}, Fs, FS) when Op =:= 'orelse';
                                         Op =:= 'xor' ->
     filter1(L, Fs, FS) ++ filter1(R, Fs, FS);
 filter1({atom,_,Atom}, _Fs, _FS) when Atom =/= true ->
@@ -1757,9 +1756,9 @@ safe_filter1({op, _, Op, L0, R0}, Fs, FS) when Op =:= '=:='; Op =:= '==' ->
                               F -> [F]
                           end
                   end, Fs);
-safe_filter1({op, _, Op, L, R}, Fs, FS) when Op =:= 'and'; Op =:= 'andalso' ->
+safe_filter1({op, _, Op, L, R}, Fs, FS) when Op =:= 'andalso' ->
     safe_filter1(R, safe_filter1(L, Fs, FS), FS);
-safe_filter1({op, _, Op, L, R}, Fs, FS) when Op =:= 'or'; Op =:= 'orelse' ->
+safe_filter1({op, _, Op, L, R}, Fs, FS) when Op =:= 'orelse' ->
     safe_filter1(L, Fs, FS) ++ safe_filter1(R, Fs, FS);
 safe_filter1({atom,_,true}, Fs, _FS) ->
     Fs;