From 2b6d74f802c49a8f8d9413c4fc525f3e9150c52c Mon Sep 17 00:00:00 2001 From: Emmanuel Briot Date: Wed, 27 Jan 2016 09:43:15 +0100 Subject: [PATCH] Minor renamings --- src/bdd/bdd-asserts.ads | 12 ++++++------ src/bdd/bdd-asserts_generic.adb | 20 ++++++++++---------- src/bdd/bdd-asserts_generic.ads | 4 ++-- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/bdd/bdd-asserts.ads b/src/bdd/bdd-asserts.ads index b350090..36e1c78 100644 --- a/src/bdd/bdd-asserts.ads +++ b/src/bdd/bdd-asserts.ads @@ -49,12 +49,12 @@ package BDD.Asserts is package Integers is new BAG.Asserts_Simple (Integer, Integer'Image); - procedure Assert + procedure Assert_Equal (Val1, Val2 : Integer; Msg : String := ""; Location : String := GNAT.Source_Info.Source_Location; Entity : String := GNAT.Source_Info.Enclosing_Entity) - renames Integers.Assert; + renames Integers.Assert_Equal; procedure Assert_Not_Equal (Val1, Val2 : Integer; Msg : String := ""; @@ -92,12 +92,12 @@ package BDD.Asserts is package Floats is new BAG.Asserts_Simple (Float, Float'Image); - procedure Assert + procedure Assert_Equal (Val1, Val2 : Float; Msg : String := ""; Location : String := GNAT.Source_Info.Source_Location; Entity : String := GNAT.Source_Info.Enclosing_Entity) - renames Floats.Assert; + renames Floats.Assert_Equal; procedure Assert_Not_Equal (Val1, Val2 : Float; Msg : String := ""; @@ -136,12 +136,12 @@ package BDD.Asserts is function Identity (Str : String) return String is (Str); package Strings is new BAG.Asserts_Simple (String, Identity); - procedure Assert + procedure Assert_Equal (Val1, Val2 : String; Msg : String := ""; Location : String := GNAT.Source_Info.Source_Location; Entity : String := GNAT.Source_Info.Enclosing_Entity) - renames Strings.Assert; + renames Strings.Assert_Equal; procedure Assert_Not_Equal (Val1, Val2 : String; Msg : String := ""; diff --git a/src/bdd/bdd-asserts_generic.adb b/src/bdd/bdd-asserts_generic.adb index e957105..0684415 100644 --- a/src/bdd/bdd-asserts_generic.adb +++ b/src/bdd/bdd-asserts_generic.adb @@ -166,11 +166,11 @@ package body BDD.Asserts_Generic is package body Asserts is - ------------ - -- Assert -- - ------------ + ------------------ + -- Assert_Equal -- + ------------------ - procedure Assert + procedure Assert_Equal (Val1, Val2 : T; Msg : String := ""; Location : String := GNAT.Source_Info.Source_Location; @@ -185,7 +185,7 @@ package body BDD.Asserts_Generic is Location => Location, Entity => Entity); end if; - end Assert; + end Assert_Equal; end Asserts; -------------------- @@ -194,11 +194,11 @@ package body BDD.Asserts_Generic is package body Asserts_Simple is - ------------ - -- Assert -- - ------------ + ------------------ + -- Assert_Equal -- + ------------------ - procedure Assert + procedure Assert_Equal (Val1, Val2 : T; Msg : String := ""; Location : String := GNAT.Source_Info.Source_Location; @@ -212,7 +212,7 @@ package body BDD.Asserts_Generic is Location => Location, Entity => Entity); end if; - end Assert; + end Assert_Equal; ---------------------- -- Assert_Not_Equal -- diff --git a/src/bdd/bdd-asserts_generic.ads b/src/bdd/bdd-asserts_generic.ads index 27fbf04..56fc43e 100644 --- a/src/bdd/bdd-asserts_generic.ads +++ b/src/bdd/bdd-asserts_generic.ads @@ -135,7 +135,7 @@ package BDD.Asserts_Generic is Not_Operator_Image : String; package Asserts is - procedure Assert + procedure Assert_Equal (Val1, Val2 : T; Msg : String := ""; Location : String := GNAT.Source_Info.Source_Location; @@ -156,7 +156,7 @@ package BDD.Asserts_Generic is with function "<" (V1, V2 : T) return Boolean is <>; with function "<=" (V1, V2 : T) return Boolean is <>; package Asserts_Simple is - procedure Assert + procedure Assert_Equal (Val1, Val2 : T; Msg : String := ""; Location : String := GNAT.Source_Info.Source_Location;