Skip to content
Snippets Groups Projects
Commit 30647a21 authored by Julien Signoles's avatar Julien Signoles
Browse files

Merge branch 'revert-d8f5df30' into 'stable/argon'

Revert "Merge branch 'fix/andre/typos' into 'master'"

See merge request frama-c/e-acsl!271
parents 790f8b9a b240343a
No related branches found
No related tags found
No related merge requests found
...@@ -205,7 +205,7 @@ let coerce ~arith_operand ~ctx ~op ty = ...@@ -205,7 +205,7 @@ let coerce ~arith_operand ~ctx ~op ty =
end else end else
(* only add an explicit cast if the context is [Gmp] and [ty] is not; (* only add an explicit cast if the context is [Gmp] and [ty] is not;
or if the term corresponding to [ty] is an operand of an arithmetic or if the term corresponding to [ty] is an operand of an arithmetic
operation which must be explicitly coerced in order to force the operation which must be explicitely coerced in order to force the
operation to be of the expected type. *) operation to be of the expected type. *)
if (ctx = Gmp && ty <> Gmp) || arith_operand if (ctx = Gmp && ty <> Gmp) || arith_operand
then { ty; op; cast = Some ctx } then { ty; op; cast = Some ctx }
...@@ -340,7 +340,7 @@ let rec type_term ~use_gmp_opt ?(arith_operand=false) ?ctx t = ...@@ -340,7 +340,7 @@ let rec type_term ~use_gmp_opt ?(arith_operand=false) ?ctx t =
with Interval.Not_an_integer -> with Interval.Not_an_integer ->
dup Other (* real *) dup Other (* real *)
in in
(* it is enough to explicitly coerce when required one operand to [ctx] (* it is enough to explicitely coerce when required one operand to [ctx]
(through [arith_operand]) in order to force the type of the operation. (through [arith_operand]) in order to force the type of the operation.
Heuristic: coerce the operand which is not a lval in order to lower Heuristic: coerce the operand which is not a lval in order to lower
the number of explicit casts *) the number of explicit casts *)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment