Skip to content

Prefer casting rhs to lhs when unifying equality operators #12190

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: development
Choose a base branch
from
+6 −1
Open

Prefer casting rhs to lhs when unifying equality operators #12190

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/typing/operators.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,9 +335,14 @@ let make_binop ctx op e1 e2 is_assign_op p =
let e1,e2 = try
(* we only have to check one type here, because unification fails if one is Void and the other is not *)
(match follow e2.etype with TAbstract({a_path=[],"Void"},_) -> raise_typing_error "Cannot compare Void" p | _ -> ());
(* Try casting the rhs to the lhs first *)
e1,AbstractCast.cast_or_unify_raise ctx e1.etype e2 p
with Error ({ err_message = Unify _ } as err) -> try
AbstractCast.cast_or_unify_raise ctx e2.etype e1 p,e2
with Error { err_message = Unify _ } ->
e1,AbstractCast.cast_or_unify ctx e1.etype e2 p
(* If both fail we want to report the first one because that's more natural *)
raise_or_display_error ctx err;
e1,e2
in
begin match e1.eexpr, e2.eexpr with
| TConst TNull , _ | _ , TConst TNull -> ()
Expand Down
Loading