From c0ab680648a1d803d9e1d7f5e51988a70e5be41a Mon Sep 17 00:00:00 2001 From: Tristan Gingold Date: Tue, 18 Dec 2018 06:32:47 +0100 Subject: files_map: rename Get_Source_File_Directory to Get_Directory_Name. --- src/files_map.adb | 5 ++--- src/files_map.ads | 3 +-- src/ghdldrv/ghdlprint.adb | 2 +- src/vhdl/python/libghdl/thin.py | 2 ++ 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/files_map.adb b/src/files_map.adb index ba6573513..df083d13b 100644 --- a/src/files_map.adb +++ b/src/files_map.adb @@ -909,12 +909,11 @@ package body Files_Map is return Source_Files.Table (File).Checksum; end Get_File_Checksum; - function Get_Source_File_Directory (File : Source_File_Entry) - return Name_Id is + function Get_Directory_Name (File : Source_File_Entry) return Name_Id is begin Check_File (File); return Source_Files.Table (File).Directory; - end Get_Source_File_Directory; + end Get_Directory_Name; function File_Line_To_Position (File : Source_File_Entry; Line : Positive) return Source_Ptr diff --git a/src/files_map.ads b/src/files_map.ads index db6a3969a..d7e14082f 100644 --- a/src/files_map.ads +++ b/src/files_map.ads @@ -109,8 +109,7 @@ package Files_Map is function Get_File_Name (File : Source_File_Entry) return Name_Id; -- Return the directory of the file. - function Get_Source_File_Directory (File : Source_File_Entry) - return Name_Id; + function Get_Directory_Name (File : Source_File_Entry) return Name_Id; -- Return the entry of the last known file. -- This allow the user to create a table of Source_File_Entry. diff --git a/src/ghdldrv/ghdlprint.adb b/src/ghdldrv/ghdlprint.adb index 513e68baa..63acd06f3 100644 --- a/src/ghdldrv/ghdlprint.adb +++ b/src/ghdldrv/ghdlprint.adb @@ -1640,7 +1640,7 @@ package body Ghdlprint is if Loc_File /= Cur_File then Cur_File := Loc_File; Put ("XFILE: "); - Dir := Get_Source_File_Directory (Cur_File); + Dir := Get_Directory_Name (Cur_File); if Dir /= Null_Identifier then Put (Image (Dir)); end if; diff --git a/src/vhdl/python/libghdl/thin.py b/src/vhdl/python/libghdl/thin.py index 3071eaee0..f03d2488d 100644 --- a/src/vhdl/python/libghdl/thin.py +++ b/src/vhdl/python/libghdl/thin.py @@ -106,6 +106,8 @@ class Files_Map: Get_File_Name = libghdl.files_map__get_file_name + Get_Directory_Name = libghdl.files_map__get_directory_name + Get_File_Buffer = libghdl.files_map__get_file_buffer Get_File_Buffer.restype = c_void_p -- cgit v1.2.3