From 2930745be3212a16a19b708c9d3e0ae33d9af224 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20B=C3=BChler?= <david.buhler@cea.fr>
Date: Wed, 18 Mar 2020 18:35:30 +0100
Subject: [PATCH] [Eva] Value_parameters: fixes the list of enabled domains.
To also include domains enabled by option -eva-domains-function.
---
src/plugins/value/value_parameters.ml | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/plugins/value/value_parameters.ml b/src/plugins/value/value_parameters.ml
index 597997dccc6..0258e4d77f6 100644
--- a/src/plugins/value/value_parameters.ml
+++ b/src/plugins/value/value_parameters.ml
@@ -193,12 +193,6 @@ let register_domain ~name ~descr =
Cmdline.replace_option_help
Domains.option_name "eva" domains (domains_help ())
-let enabled_domains () =
- let domains = Domains.get () in
- List.filter
- (fun (name, _) -> Datatype.String.Set.mem name domains)
- !domains_ref
-
(* Checks that a domain has been registered. *)
let check_domain domain =
if domain = "help" || domain = "list"
@@ -234,6 +228,13 @@ module DomainsFunction =
end)
let () = add_precision_dep DomainsFunction.parameter
+let enabled_domains () =
+ let domains = Domains.get () in
+ let domains_by_fct = DomainsFunction.get () in
+ List.filter
+ (fun (name, _) -> Datatype.String.Set.mem name domains
+ || Datatype.String.Map.mem name domains_by_fct)
+ !domains_ref
let () = Parameter_customize.set_group domains
module EqualityCall =
--
GitLab