From 7b7c5ed5558469bb066bc5ad8b21b6a588af2eed Mon Sep 17 00:00:00 2001
From: Patrick Baudin <patrick.baudin@cea.fr>
Date: Wed, 29 Jun 2022 13:58:07 +0200
Subject: [PATCH] [Pdg] API: Pdg.Register -> Pdg.Marks
---
.git-blame-ignore-revs | 1 +
src/plugins/pdg/Pdg.ml | 4 ++--
src/plugins/pdg/Pdg.mli | 4 ++--
src/plugins/pdg/register.ml | 5 -----
src/plugins/pdg/register.mli | 2 +-
src/plugins/slicing/fct_slice.ml | 6 +++---
6 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 2fc410f59d4..b6ef39a6785 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -39,3 +39,4 @@ aef808e15e4dcc02dcee7004add8530083d33474
6ead6d862f1960e6baca64d335b811c954cf8430
7955ef2039b2010cc30b88da7a47d4f07e298042
8353ff71c9958169cf27c589b678f183cca63a9c
+fe98b40c209dbe13fdc2069e26c42d4062fda3f0
diff --git a/src/plugins/pdg/Pdg.ml b/src/plugins/pdg/Pdg.ml
index 4838045256c..2472224ae4c 100644
--- a/src/plugins/pdg/Pdg.ml
+++ b/src/plugins/pdg/Pdg.ml
@@ -22,6 +22,6 @@
(** Program Dependences Graph. *)
-module Register = Register
-
module Api = Api
+
+module Marks = Marks
diff --git a/src/plugins/pdg/Pdg.mli b/src/plugins/pdg/Pdg.mli
index 1ba848dc619..aaaefb329d9 100644
--- a/src/plugins/pdg/Pdg.mli
+++ b/src/plugins/pdg/Pdg.mli
@@ -22,6 +22,6 @@
(** Program Dependences Graph. *)
-module Register : module type of Marks
-
module Api : module type of Api
+
+module Marks : module type of Marks
diff --git a/src/plugins/pdg/register.ml b/src/plugins/pdg/register.ml
index ccce4b10491..7f0f281e193 100644
--- a/src/plugins/pdg/register.ml
+++ b/src/plugins/pdg/register.ml
@@ -27,11 +27,6 @@ let () =
~onto:Pdg_tbl.self
[ !Db.From.self ])
-(* This module contains polymorphic functions : cannot be registered in Db.
- Can be used through Pdg.Register instead (see Pdg.mli) *)
-include Marks
-
-
let deps =
[Pdg_tbl.self; Pdg_parameters.BuildAll.self; Pdg_parameters.BuildFct.self]
diff --git a/src/plugins/pdg/register.mli b/src/plugins/pdg/register.mli
index a99bfbabb26..a7f49285d29 100644
--- a/src/plugins/pdg/register.mli
+++ b/src/plugins/pdg/register.mli
@@ -20,4 +20,4 @@
(* *)
(**************************************************************************)
-include module type of Marks
+(* empty *)
diff --git a/src/plugins/slicing/fct_slice.ml b/src/plugins/slicing/fct_slice.ml
index 0a25e41fe18..7e03ac911d0 100644
--- a/src/plugins/slicing/fct_slice.ml
+++ b/src/plugins/slicing/fct_slice.ml
@@ -452,7 +452,7 @@ end = struct
None
in
let new_input_marks =
- Pdg.Register.in_marks_to_caller pdg_caller call m2m in_info in
+ Pdg.Marks.in_marks_to_caller pdg_caller call m2m in_info in
new_input_marks, !new_input
let marks_for_call_outputs (_, out_info) = out_info
@@ -524,7 +524,7 @@ end = struct
(if new_out then "(new out)" else "");
m_opt
in let new_called_marks =
- Pdg.Register.call_out_marks_to_called ff_pdg m2m new_call_marks
+ Pdg.Marks.call_out_marks_to_called ff_pdg m2m new_call_marks
in new_called_marks, !new_output
let persistent_in_marks_to_prop fi to_prop =
@@ -537,7 +537,7 @@ end = struct
in
let pdg = SlicingMacros.get_fi_pdg fi in
let pdg_node_marks =
- Pdg.Register.translate_in_marks pdg ~m2m in_info [] in
+ Pdg.Marks.translate_in_marks pdg ~m2m in_info [] in
pdg_node_marks
let get_new_marks ff nodes_marks =
--
GitLab