Skip to content
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

make cil_exp_of_linexpr1 work with fractional expressions #1493

Merged
merged 11 commits into from
Jul 2, 2024
Merged

make cil_exp_of_linexpr1 work with fractional expressions #1493

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ab78123
[skip ci] int_of_scalar now returning Q.t
DrMichaelPetter May 28, 2024
bde040e
frac_of_scalar instead of int_of_scalar
DrMichaelPetter Jun 11, 2024
8920200
next try
DrMichaelPetter Jun 17, 2024
8eb76d0
Merge branch 'master' into issue_1328
DrMichaelPetter Jun 17, 2024
a7e4ff1
Update src/cdomains/apron/sharedFunctions.apron.ml
DrMichaelPetter Jun 18, 2024
7876d6b
Update src/cdomains/apron/sharedFunctions.apron.ml
DrMichaelPetter Jun 18, 2024
e4cd4df
Update src/cdomains/apron/sharedFunctions.apron.ml
DrMichaelPetter Jun 18, 2024
4fe33dc
make sure that exact division is possible
DrMichaelPetter Jun 28, 2024
4d5a408
removed unused parameter
DrMichaelPetter Jul 2, 2024
05dfb9f
pulled out product
DrMichaelPetter Jul 2, 2024
44e9549
Merge branch 'master' into issue_1328
DrMichaelPetter Jul 2, 2024
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
14 changes: 7 additions & 7 deletions src/cdomains/apron/sharedFunctions.apron.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,21 +20,21 @@ let int_of_scalar ?round (scalar: Scalar.t) =
| None when Stdlib.Float.is_integer f -> Some f
| None -> None
in
Z.of_float f
Q.make (Z.of_float f) Z.one
| Mpqf scalar -> (* octMPQ, boxMPQ, polkaMPQ *)
let n = Mpqf.get_num scalar in
let d = Mpqf.get_den scalar in
let+ z =
let+ (n,d) =
if Mpzf.cmp_int d 1 = 0 then (* exact integer (denominator 1) *)
Some n
Some (n,Mpzf.of_int 1)
else
begin match round with
| Some `Floor -> Some (Mpzf.fdiv_q n d) (* floor division *)
| Some `Ceil -> Some (Mpzf.cdiv_q n d) (* ceiling division *)
| None -> None
| Some `Floor -> Some (Mpzf.fdiv_q n d, Mpzf.of_int 1) (* floor division *)
| Some `Ceil -> Some (Mpzf.cdiv_q n d, Mpzf.of_int 1) (* ceiling division *)
| None -> Some (n,d)
end
in
Z_mlgmpidl.z_of_mpzf z
Q.make (Z_mlgmpidl.z_of_mpzf n) (Z_mlgmpidl.z_of_mpzf d)
| _ ->
failwith ("int_of_scalar: unsupported: " ^ Scalar.to_string scalar)

Expand Down