From 4548fd43d5c63708d84e7d17e94d1f8cba61739b Mon Sep 17 00:00:00 2001
From: Virgile Prevosto <virgile.prevosto@m4x.org>
Date: Tue, 4 Aug 2020 08:54:14 +0200
Subject: [PATCH] [kernel-API] update against suppression of Transitioning in
Frama-C core
---
class.ml | 2 +-
fclang_datatype.ml | 6 +++---
reorder_defs.ml | 6 +++---
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/class.ml b/class.ml
index 94b544fe..0f16ed6d 100644
--- a/class.ml
+++ b/class.ml
@@ -27,7 +27,7 @@ module Inheritance_graph =
(Fclang_datatype.Qualified_name)
(struct
type t = int * access_kind * vkind
- let compare = Transitioning.Stdlib.compare
+ let compare = Stdlib.compare
let default = (0, Private, VStandard)
end)
diff --git a/fclang_datatype.ml b/fclang_datatype.ml
index ff752821..ce0b9617 100644
--- a/fclang_datatype.ml
+++ b/fclang_datatype.ml
@@ -216,7 +216,7 @@ module Template_parameter =
type t = template_parameter
let name = "Fclang_datatype.Template_parameter"
let reprs = [TPConstant (IntCst (IInt,ICLiteral,Int64.of_int 0))]
- let compare = Transitioning.Stdlib.compare
+ let compare = Stdlib.compare
let equal = Datatype.from_compare
let copy = Datatype.identity
let hash = Hashtbl.hash
@@ -230,7 +230,7 @@ module Qualified_name =
let reprs = [({prequalification = [QNamespace "foo"]; decl_name = "bar"},
TStandard)]
let name = "Fclang_datatype.Qualified_name"
- let compare = Transitioning.Stdlib.compare
+ let compare = Stdlib.compare
let equal = Datatype.from_compare
let copy = Datatype.identity
let hash = Hashtbl.hash
@@ -265,7 +265,7 @@ module Qual_type =
let reprs = [ { qualifier = [Const]; plain_type = Int IInt } ]
let name = "Fclang_datatype.Qual_type"
let copy = Datatype.identity
- let compare = Transitioning.Stdlib.compare
+ let compare = Stdlib.compare
let equal = Datatype.from_compare
let hash = Hashtbl.hash
let pretty = pretty_qual_type
diff --git a/reorder_defs.ml b/reorder_defs.ml
index 96e2c8a1..cb31302c 100644
--- a/reorder_defs.ml
+++ b/reorder_defs.ml
@@ -54,10 +54,10 @@ module Dep_node = struct
let compare x y =
if x.id = -1 || y.id = -1 then begin
- let res = Transitioning.Stdlib.compare x.kind y.kind in
+ let res = Stdlib.compare x.kind y.kind in
if res = 0 then begin
- let res = Transitioning.Stdlib.compare x.name y.name in
- if res = 0 then Transitioning.Stdlib.compare x.is_def y.is_def else res
+ let res = Stdlib.compare x.name y.name in
+ if res = 0 then Stdlib.compare x.is_def y.is_def else res
end else res
end else begin
let res = compare y.id x.id in
--
GitLab