Skip to content

Separate rounding modes into their own type #271

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
hra687261 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Separate rounding modes into their own type #271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a8c7b3
Separate rounding modes into their own type
hra687261 Aug 17, 2026
1550554
Upd Changes.md
hra687261 Aug 20, 2026
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
3 changes: 3 additions & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,9 @@ next
match on builtins, especially wrt to completeness of pattern matching.
Also is likely to have a small performance improvement. (PR#240)

- Separate floating-point rounding modes into their own
`Builtin.Float.rounding_mode` type, so that pattern matching over
rounding modes can be exhaustive on its own (PR#271)

v0.10
-----
Expand Down
10 changes: 5 additions & 5 deletions src/languages/smtlib2/print/print.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -842,11 +842,11 @@ module Make(Config : Config)(Lexer : Lexer with type token := Config.token) = st
begin match blt with
| T _ | RoundingMode -> assert false (* cannot occur in terms *)
| Fp _ -> simple "fp"
| RoundNearestTiesToEven -> simple "RNE"
| RoundNearestTiesToAway -> simple "RNA"
| RoundTowardPositive -> simple "RTP"
| RoundTowardNegative -> simple "RTN"
| RoundTowardZero -> simple "RTZ"
| RM RoundNearestTiesToEven -> simple "RNE"
| RM RoundNearestTiesToAway -> simple "RNA"
| RM RoundTowardPositive -> simple "RTP"
| RM RoundTowardNegative -> simple "RTN"
| RM RoundTowardZero -> simple "RTZ"
| Abs _ -> simple "fp.abs"
| Neg _ -> simple "fp.neg"
| Add _ -> simple "fp.add"
Expand Down
10 changes: 5 additions & 5 deletions src/model/fp.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,11 +123,11 @@ let builtins ~eval env (cst : Dolmen.Std.Expr.Term.Const.t) =
| Dolmen.Std.Builtin.Float blt ->
begin match blt with
| T _ | RoundingMode -> assert false (* Types are not evaluated *)
| RoundNearestTiesToEven -> Some (Value.mk ~ops:ops_rm Mode.NE)
| RoundNearestTiesToAway -> Some (Value.mk ~ops:ops_rm Mode.NA)
| RoundTowardPositive -> Some (Value.mk ~ops:ops_rm Mode.UP)
| RoundTowardNegative -> Some (Value.mk ~ops:ops_rm Mode.DN)
| RoundTowardZero -> Some (Value.mk ~ops:ops_rm Mode.ZR)
| RM RoundNearestTiesToEven -> Some (Value.mk ~ops:ops_rm Mode.NE)
| RM RoundNearestTiesToAway -> Some (Value.mk ~ops:ops_rm Mode.NA)
| RM RoundTowardPositive -> Some (Value.mk ~ops:ops_rm Mode.UP)
| RM RoundTowardNegative -> Some (Value.mk ~ops:ops_rm Mode.DN)
| RM RoundTowardZero -> Some (Value.mk ~ops:ops_rm Mode.ZR)
| Of_real { e = ew; s = prec; } ->
Some (Fun.mk_clos @@ Fun.fun_2 ~cst (fun m r ->
check ~ew ~mw:(prec - 1);
Expand Down
12 changes: 8 additions & 4 deletions src/standard/builtin.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,15 +175,19 @@ type 'a t += Bitv of 'a Bitv.t
(* ************************************************************************* *)

module Float = struct
type _ t =
| T of { e : int; s : int; }
| RoundingMode
| Fp of { e : int; s : int; }

type rounding_mode =
| RoundNearestTiesToEven
| RoundNearestTiesToAway
| RoundTowardPositive
| RoundTowardNegative
| RoundTowardZero

type _ t =
| T of { e : int; s : int; }
| RoundingMode
| RM of rounding_mode
| Fp of { e : int; s : int; }
| Plus_infinity of { e : int; s : int; }
| Minus_infinity of { e : int; s : int; }
| Plus_zero of { e : int; s : int; }
Expand Down
25 changes: 15 additions & 10 deletions src/standard/builtin.mli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,27 +543,32 @@ type 'a t += Bitv of 'a Bitv.t
(* ************************************************************************* *)

module Float : sig

type rounding_mode =
| RoundNearestTiesToEven
(** [RoundNearestTiesToEven : RoundingMode]: *)
| RoundNearestTiesToAway
(** [RoundNearestTiesToAway : RoundingMode]: *)
| RoundTowardPositive
(** [RoundTowardPositive : RoundingMode *)
| RoundTowardNegative
(** [RoundTowardNegative : RoundingMode *)
| RoundTowardZero
(** [RoundTowardZero : RoundingMode *)

type _ t =
| T of { e : int; s : int; }
(** [Float(e,s): ttype]: type constructor for floating point of exponent of
size [e] and significand of size [s] (hidden bit included). Those size are
greater than 1 *)
| RoundingMode
(** [RoundingMode: ttype]: type for enumerated type of rounding modes. *)
| RM of rounding_mode
(** [RM r: RoundingMode]: rounding mode literals. *)
| Fp of { e : int; s : int; }
(** [Fp(e, s): Bitv.T{1} -> Bitv.T{e} -> Bitv.T{s-1} -> Fp(e,s)]: bitvector literal.
The IEEE-format is used for the conversion [sb^se^ss].
All the NaN are converted to the same value. *)
| RoundNearestTiesToEven
(** [RoundNearestTiesToEven : RoundingMode]: *)
| RoundNearestTiesToAway
(** [RoundNearestTiesToAway : RoundingMode]: *)
| RoundTowardPositive
(** [RoundTowardPositive : RoundingMode *)
| RoundTowardNegative
(** [RoundTowardNegative : RoundingMode *)
| RoundTowardZero
(** [RoundTowardZero : RoundingMode *)
| Plus_infinity of { e: int; s : int; }
(** [Plus_infinity{e;s} : Fp{e;s}] *)
| Minus_infinity of { e : int; s : int; }
Expand Down
10 changes: 5 additions & 5 deletions src/standard/expr.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2620,19 +2620,19 @@ module Term = struct
)

let roundNearestTiesToEven =
mk' ~builtin:(Builtin.Float RoundNearestTiesToEven) "RoundNearestTiesToEven" [] [] Ty.roundingMode
mk' ~builtin:(Builtin.Float (RM RoundNearestTiesToEven)) "RoundNearestTiesToEven" [] [] Ty.roundingMode

let roundNearestTiesToAway =
mk' ~builtin:(Builtin.Float RoundNearestTiesToAway) "RoundNearestTiesToAway" [] [] Ty.roundingMode
mk' ~builtin:(Builtin.Float (RM RoundNearestTiesToAway)) "RoundNearestTiesToAway" [] [] Ty.roundingMode

let roundTowardPositive =
mk' ~builtin:(Builtin.Float RoundTowardPositive) "RoundTowardPositive" [] [] Ty.roundingMode
mk' ~builtin:(Builtin.Float (RM RoundTowardPositive)) "RoundTowardPositive" [] [] Ty.roundingMode

let roundTowardNegative =
mk' ~builtin:(Builtin.Float RoundTowardNegative) "RoundTowardNegative" [] [] Ty.roundingMode
mk' ~builtin:(Builtin.Float (RM RoundTowardNegative)) "RoundTowardNegative" [] [] Ty.roundingMode

let roundTowardZero =
mk' ~builtin:(Builtin.Float RoundTowardZero) "RoundTowardZero" [] [] Ty.roundingMode
mk' ~builtin:(Builtin.Float (RM RoundTowardZero)) "RoundTowardZero" [] [] Ty.roundingMode

(** Generic function for creating functions primarily on the same floating
point format with optionally a rounding mode and a particular result
Expand Down
Loading