Skip to content
Snippets Groups Projects
Commit 2e5e9e62 authored by François Bobot's avatar François Bobot
Browse files

Remove some warnings in 4.14

parent cb6afb0d
No related branches found
No related tags found
1 merge request!24Release helpers
Pipeline #46185 passed
...@@ -79,7 +79,6 @@ module Def = struct ...@@ -79,7 +79,6 @@ module Def = struct
saved_repr : Node.t Node.M.t; saved_repr : Node.t Node.M.t;
saved_rang : int Node.M.t; saved_rang : int Node.M.t;
saved_event_repr : event_node Bag.t Node.M.t; saved_event_repr : event_node Bag.t Node.M.t;
saved_event_any_repr : event_node Bag.t;
saved_event_value : (ro delayed_t -> Node.t -> Value.t -> Events.enqueue) Bag.t Node.M.t; saved_event_value : (ro delayed_t -> Node.t -> Value.t -> Events.enqueue) Bag.t Node.M.t;
saved_event_reg : event_node Bag.t Node.M.t; saved_event_reg : event_node Bag.t Node.M.t;
saved_event_any_reg : event_node Bag.t; saved_event_any_reg : event_node Bag.t;
...@@ -215,7 +214,6 @@ module Hidden = Context.Make(struct ...@@ -215,7 +214,6 @@ module Hidden = Context.Make(struct
saved_repr = t.repr; saved_repr = t.repr;
saved_rang = t.rang; saved_rang = t.rang;
saved_event_repr = t.event_repr; saved_event_repr = t.event_repr;
saved_event_any_repr = t.event_any_repr;
saved_event_value = t.event_value; saved_event_value = t.event_value;
saved_event_reg = t.event_reg; saved_event_reg = t.event_reg;
saved_event_any_reg = t.event_any_reg; saved_event_any_reg = t.event_any_reg;
......
...@@ -22,18 +22,6 @@ ...@@ -22,18 +22,6 @@
module Dem = Keys.Make_key () module Dem = Keys.Make_key ()
module Print = struct
(** Cutting the knot for pp *)
type pdem_runable = {
mutable pdem_runable : 'd. 'd Dem.t -> 'd Format.printer;
}
(** called too early *)
let pdem_runable : pdem_runable =
{ pdem_runable = (fun _ _ _ -> assert false) }
end
type delay = type delay =
| Immediate | Immediate
| Delayed_by of int | Delayed_by of int
...@@ -62,22 +50,15 @@ module Wait = struct ...@@ -62,22 +50,15 @@ module Wait = struct
type runable type runable
val print_runable : runable Format.printer val print_runable : runable Format.printer
val run : delayed -> runable -> unit val run : delayed -> runable -> unit
val key : runable Dem.t val key : runable Dem.t
val delay : delay val delay : delay
end end
val register_dem : (module Dem with type runable = 'd) -> unit val register_dem : (module Dem with type runable = 'd) -> unit
val get_dem : 'd Dem.t -> (module Dem with type runable = 'd) val get_dem : 'd Dem.t -> (module Dem with type runable = 'd)
val get_priority : daemon_key -> delay val get_priority : daemon_key -> delay
val print_dem_runable : 'b Dem.t -> 'b Format.printer val print_dem_runable : 'b Dem.t -> 'b Format.printer
val is_well_initialized : unit -> bool val is_well_initialized : unit -> bool
end end
...@@ -90,11 +71,8 @@ module Wait = struct ...@@ -90,11 +71,8 @@ module Wait = struct
type runable type runable
val print_runable : runable Format.printer val print_runable : runable Format.printer
val run : delayed -> runable -> unit val run : delayed -> runable -> unit
val key : runable Dem.t val key : runable Dem.t
val delay : delay val delay : delay
end end
...@@ -111,7 +89,6 @@ module Wait = struct ...@@ -111,7 +89,6 @@ module Wait = struct
end) end)
let register_dem = Registry.register let register_dem = Registry.register
let get_dem = Registry.get let get_dem = Registry.get
let get_priority = function let get_priority = function
...@@ -120,9 +97,6 @@ module Wait = struct ...@@ -120,9 +97,6 @@ module Wait = struct
Dem.delay Dem.delay
let print_dem_runable = Registry.print let print_dem_runable = Registry.print
let () = Print.pdem_runable.Print.pdem_runable <- print_dem_runable
let is_well_initialized = Registry.is_well_initialized let is_well_initialized = Registry.is_well_initialized
end end
end end
...@@ -152,7 +152,7 @@ module MakeSeeded(H: SeededHashedType) = ...@@ -152,7 +152,7 @@ module MakeSeeded(H: SeededHashedType) =
type 'b t = type 'b t =
{ mutable size: int; (* number of entries *) { mutable size: int; (* number of entries *)
mutable data: 'b bucketlist array; (* the buckets *) mutable data: 'b bucketlist array; (* the buckets *)
mutable seed: int; (* for randomization *) seed: int; (* for randomization *)
initial_size: int; (* initial array size *) initial_size: int; (* initial array size *)
} }
......
...@@ -40,26 +40,19 @@ let debug_dotgui = ...@@ -40,26 +40,19 @@ let debug_dotgui =
"sched_dotgui" "sched_dotgui"
let var_decay = 1. /. 0.95 let var_decay = 1. /. 0.95
let stats_propa = Debug.register_stats_int "Scheduler.daemon" let stats_propa = Debug.register_stats_int "Scheduler.daemon"
let stats_lasteffort = Debug.register_stats_int "Scheduler.lasteffort" let stats_lasteffort = Debug.register_stats_int "Scheduler.lasteffort"
let stats_lasteffort_propa = let stats_lasteffort_propa =
Debug.register_stats_int "Scheduler.lasteffort_propa" Debug.register_stats_int "Scheduler.lasteffort_propa"
let stats_dec = Debug.register_stats_int "Scheduler.decision" let stats_dec = Debug.register_stats_int "Scheduler.decision"
let stats_con = Debug.register_stats_int "Scheduler.conflict" let stats_con = Debug.register_stats_int "Scheduler.conflict"
let stats_con_fix = Debug.register_stats_int "Scheduler.conflict_fix_model" let stats_con_fix = Debug.register_stats_int "Scheduler.conflict_fix_model"
let stats_step = Debug.register_stats_int "Scheduler.step" let stats_step = Debug.register_stats_int "Scheduler.step"
let stats_fix_model = Debug.register_stats_int "Scheduler.fix_model" let stats_fix_model = Debug.register_stats_int "Scheduler.fix_model"
exception Contradiction exception Contradiction
exception ReachStepLimit exception ReachStepLimit
type last_effort_limit = Time of float | Steps of int type last_effort_limit = Time of float | Steps of int
...@@ -73,6 +66,8 @@ struct ...@@ -73,6 +66,8 @@ struct
module Att = struct module Att = struct
type t = { id : int; v : S.t; added_at : int } type t = { id : int; v : S.t; added_at : int }
let _f x = x.added_at
type prio = float type prio = float
let equal_prio = ( = ) let equal_prio = ( = )
...@@ -208,11 +203,10 @@ type t = { ...@@ -208,11 +203,10 @@ type t = {
solve_step : solve_step Context.Ref.t; solve_step : solve_step Context.Ref.t;
last_effort_limit : last_effort_limit option; last_effort_limit : last_effort_limit option;
mutable steps : int; mutable steps : int;
mutable stepsl : int;
mutable last_todo : (Egraph.wt -> unit) * bp_kind; mutable last_todo : (Egraph.wt -> unit) * bp_kind;
last_effort_learnt : Events.daemon_key Context.Clicket.t; last_effort_learnt : Events.daemon_key Context.Clicket.t;
allow_learning : bool; (** Learning *) allow_learning : bool; (** Learning *)
mutable learning_htbl : int ThTerm.H.t; learning_htbl : int ThTerm.H.t;
mutable learning_tbl : bool array; mutable learning_tbl : bool array;
(* last before contradiction *) (* last before contradiction *)
mutable last_effort_made : PrioLastEffort.Att.t option; mutable last_effort_made : PrioLastEffort.Att.t option;
...@@ -257,7 +251,6 @@ let new_solver ~learning ?last_effort_limit ...@@ -257,7 +251,6 @@ let new_solver ~learning ?last_effort_limit
level = 0; level = 0;
solve_step = Context.Ref.create creator Propagate; solve_step = Context.Ref.create creator Propagate;
steps = 0; steps = 0;
stepsl = 0;
last_todo = ((fun _ -> ()), External); last_todo = ((fun _ -> ()), External);
last_effort_learnt = Context.Clicket.create creator; last_effort_learnt = Context.Clicket.create creator;
last_effort_limit; last_effort_limit;
...@@ -719,7 +712,5 @@ let run ?nodec ?step_limit ?last_effort_limit ?options ~theories f = ...@@ -719,7 +712,5 @@ let run ?nodec ?step_limit ?last_effort_limit ?options ~theories f =
with Contradiction -> `Contradiction with Contradiction -> `Contradiction
let pop_to st bp = ignore (pop_to st bp) let pop_to st bp = ignore (pop_to st bp)
let push st = push External st let push st = push External st
let get_context t = Context.creator t.context let get_context t = Context.creator t.context
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