aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/files_map.adb6
-rw-r--r--src/files_map.ads2
-rw-r--r--src/ghdldrv/ghdllocal.adb6
-rw-r--r--src/ghdldrv/ghdlprint.adb10
-rw-r--r--src/ghdldrv/ghdlxml.adb2
-rw-r--r--src/libraries.adb6
6 files changed, 16 insertions, 16 deletions
diff --git a/src/files_map.adb b/src/files_map.adb
index 198c272d5..7d7676c81 100644
--- a/src/files_map.adb
+++ b/src/files_map.adb
@@ -791,7 +791,7 @@ package body Files_Map is
-- Return an entry for a filename.
-- Load the filename if necessary.
- function Load_Source_File (Directory : Name_Id; Name: Name_Id)
+ function Read_Source_File (Directory : Name_Id; Name: Name_Id)
return Source_File_Entry
is
use GNAT.OS_Lib;
@@ -839,7 +839,7 @@ package body Files_Map is
Buffer (Source_Ptr_Org + Length + 1) := EOT;
Close (Fd);
- -- Load_Source_File call must follow its Create_Source_File.
+ -- Read_Source_File call must follow its Create_Source_File.
pragma Assert (Source_Files.Table (Res).First_Location = Next_Location);
-- Compute the SHA1.
@@ -871,7 +871,7 @@ package body Files_Map is
Source_Files.Table (Res).File_Length := Integer (Length);
return Res;
- end Load_Source_File;
+ end Read_Source_File;
procedure Free_Source_File (File : Source_File_Entry)
is
diff --git a/src/files_map.ads b/src/files_map.ads
index a29159db2..b6054c906 100644
--- a/src/files_map.ads
+++ b/src/files_map.ads
@@ -45,7 +45,7 @@ package Files_Map is
-- current directory.
-- Load the filename if necessary.
-- Return No_Source_File_Entry if the file does not exist.
- function Load_Source_File (Directory : Name_Id; Name : Name_Id)
+ function Read_Source_File (Directory : Name_Id; Name : Name_Id)
return Source_File_Entry;
-- Each file in memory has two terminal EOT.
diff --git a/src/ghdldrv/ghdllocal.adb b/src/ghdldrv/ghdllocal.adb
index 1b34af41e..88c887418 100644
--- a/src/ghdldrv/ghdllocal.adb
+++ b/src/ghdldrv/ghdllocal.adb
@@ -1201,7 +1201,7 @@ package body Ghdllocal is
File := Get_Design_File_Chain (Lib);
while File /= Null_Iir loop
Next_File := Get_Chain (File);
- Fe := Load_Source_File (Get_Design_File_Directory (File),
+ Fe := Read_Source_File (Get_Design_File_Directory (File),
Get_Design_File_Filename (File));
if Fe = No_Source_File_Entry then
-- FIXME: should remove all the design file from the library.
@@ -1327,7 +1327,7 @@ package body Ghdllocal is
File := Get_Design_File_Chain (Libraries.Work_Library);
while File /= Null_Iir loop
Next_File := Get_Chain (File);
- Fe := Load_Source_File (Get_Design_File_Directory (File),
+ Fe := Read_Source_File (Get_Design_File_Directory (File),
Get_Design_File_Filename (File));
if Fe = No_Source_File_Entry then
-- FIXME: should remove all the design file from
@@ -1408,7 +1408,7 @@ package body Ghdllocal is
Fe : Source_File_Entry;
begin
-- 2) file has been modified.
- Fe := Load_Source_File (Get_Design_File_Directory (File),
+ Fe := Read_Source_File (Get_Design_File_Directory (File),
Get_Design_File_Filename (File));
if not Is_Eq (Get_File_Checksum (Fe),
Get_File_Checksum (File))
diff --git a/src/ghdldrv/ghdlprint.adb b/src/ghdldrv/ghdlprint.adb
index 9aac16824..97689082a 100644
--- a/src/ghdldrv/ghdlprint.adb
+++ b/src/ghdldrv/ghdlprint.adb
@@ -886,7 +886,7 @@ package body Ghdlprint is
for I in Args'Range loop
-- Load the file.
Id := Get_Identifier (Args (I).all);
- Fe := Files_Map.Load_Source_File (Local_Id, Id);
+ Fe := Files_Map.Read_Source_File (Local_Id, Id);
if Fe = No_Source_File_Entry then
Error ("cannot open file " & Args (I).all);
raise Compile_Error;
@@ -1080,7 +1080,7 @@ package body Ghdlprint is
for I in Args'Range loop
-- Load the file.
Id := Get_Identifier (Args (I).all);
- Fe := Files_Map.Load_Source_File (Local_Id, Id);
+ Fe := Files_Map.Read_Source_File (Local_Id, Id);
if Fe = No_Source_File_Entry then
Error ("cannot open file " & Args (I).all);
raise Compile_Error;
@@ -1206,7 +1206,7 @@ package body Ghdlprint is
for I in Files'Range loop
Id := Get_Identifier (Files (I).all);
- Fe := Files_Map.Load_Source_File (Local_Id, Id);
+ Fe := Files_Map.Read_Source_File (Local_Id, Id);
if Fe = No_Source_File_Entry then
Error ("cannot open file " & Files (I).all);
raise Compile_Error;
@@ -1350,7 +1350,7 @@ package body Ghdlprint is
-- Parse all files.
for I in Files'Range loop
Id := Get_Identifier (Files_Name (I).all);
- File := Files_Map.Load_Source_File (Libraries.Local_Directory, Id);
+ File := Files_Map.Read_Source_File (Libraries.Local_Directory, Id);
if File = No_Source_File_Entry then
Error ("cannot open " & Image (Id));
return;
@@ -1583,7 +1583,7 @@ package body Ghdlprint is
-- Parse all files.
for I in Files'Range loop
Id := Get_Identifier (Files_Name (I).all);
- File := Load_Source_File (Libraries.Local_Directory, Id);
+ File := Read_Source_File (Libraries.Local_Directory, Id);
if File = No_Source_File_Entry then
Error ("cannot open " & Image (Id));
return;
diff --git a/src/ghdldrv/ghdlxml.adb b/src/ghdldrv/ghdlxml.adb
index 96356ddf2..de2e383ba 100644
--- a/src/ghdldrv/ghdlxml.adb
+++ b/src/ghdldrv/ghdlxml.adb
@@ -491,7 +491,7 @@ package body Ghdlxml is
-- Parse all files.
for I in Files'Range loop
Id := Get_Identifier (Files_Name (I).all);
- File := Load_Source_File (Libraries.Local_Directory, Id);
+ File := Read_Source_File (Libraries.Local_Directory, Id);
if File = No_Source_File_Entry then
Error ("cannot open " & Image (Id));
return;
diff --git a/src/libraries.adb b/src/libraries.adb
index 4186fd4da..b4b631f07 100644
--- a/src/libraries.adb
+++ b/src/libraries.adb
@@ -422,7 +422,7 @@ package body Libraries is
(" from " & Image (Dir) & Image (File_Id));
end if;
- File := Files_Map.Load_Source_File (Dir, File_Id);
+ File := Files_Map.Read_Source_File (Dir, File_Id);
if File = No_Source_File_Entry then
-- Not found.
Set_Date (Library, Date_Valid'First);
@@ -1637,7 +1637,7 @@ package body Libraries is
is
Fe : Source_File_Entry;
begin
- Fe := Files_Map.Load_Source_File (Local_Directory, File_Name);
+ Fe := Files_Map.Read_Source_File (Local_Directory, File_Name);
if Fe = No_Source_File_Entry then
Error_Msg_Option ("cannot open " & Image (File_Name));
return Null_Iir;
@@ -1732,7 +1732,7 @@ package body Libraries is
-- Load the file in memory.
Design_File := Get_Design_File (Design_Unit);
- Fe := Files_Map.Load_Source_File
+ Fe := Files_Map.Read_Source_File
(Get_Design_File_Directory (Design_File),
Get_Design_File_Filename (Design_File));
if Fe = No_Source_File_Entry then