diff options
| -rw-r--r-- | src/libraries.adb | 17 | ||||
| -rw-r--r-- | src/libraries.ads | 3 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/libraries.adb b/src/libraries.adb index b4b631f07..ef140db8d 100644 --- a/src/libraries.adb +++ b/src/libraries.adb @@ -42,9 +42,6 @@ package body Libraries is Libraries_Chain : Iir_Library_Declaration := Null_Iir; Libraries_Chain_Last : Iir_Library_Declaration := Null_Iir; - -- A location for any implicit declarations (such as library WORK). - Implicit_Location: Location_Type; - -- Table of library paths. package Paths is new Tables (Table_Index_Type => Integer, @@ -623,15 +620,15 @@ package body Libraries is procedure Create_Virtual_Locations is use Files_Map; - Implicit_Source_File : Source_File_Entry; + Library_Source_File : Source_File_Entry; Command_Source_File : Source_File_Entry; begin - Implicit_Source_File := Create_Virtual_Source_File - (Get_Identifier ("*implicit*")); + Library_Source_File := Create_Virtual_Source_File + (Get_Identifier ("*libraries*")); Command_Source_File := Create_Virtual_Source_File (Get_Identifier ("*command line*")); Command_Line_Location := Source_File_To_Location (Command_Source_File); - Implicit_Location := Source_File_To_Location (Implicit_Source_File); + Library_Location := Source_File_To_Location (Library_Source_File); end Create_Virtual_Locations; -- Note: the scanner shouldn't be in use, since this procedure uses it. @@ -653,7 +650,7 @@ package body Libraries is -- Create the library. Std_Library := Create_Iir (Iir_Kind_Library_Declaration); Set_Identifier (Std_Library, Std_Names.Name_Std); - Set_Location (Std_Library, Implicit_Location); + Set_Location (Std_Library, Library_Location); Libraries_Chain := Std_Library; Libraries_Chain_Last := Std_Library; @@ -701,7 +698,7 @@ package body Libraries is Work_Library := Std_Library; else Work_Library := Create_Iir (Iir_Kind_Library_Declaration); - Set_Location (Work_Library, Implicit_Location); + Set_Location (Work_Library, Library_Location); Set_Library_Directory (Work_Library, Work_Directory); Set_Identifier (Work_Library, Work_Library_Name); @@ -745,7 +742,7 @@ package body Libraries is end if; Library := Create_Iir (Iir_Kind_Library_Declaration); - Set_Location (Library, Loc); + Set_Location (Library, Library_Location); Set_Library_Directory (Library, Null_Identifier); Set_Identifier (Library, Ident); if Load_Library (Library) = False then diff --git a/src/libraries.ads b/src/libraries.ads index edaf74292..e8060c522 100644 --- a/src/libraries.ads +++ b/src/libraries.ads @@ -36,6 +36,9 @@ package Libraries is -- Location for a command line. Command_Line_Location : Location_Type; + -- A location for library declarations (such as library WORK). + Library_Location: Location_Type; + -- Library declaration for the std library. -- This is also the first library of the libraries chain. Std_Library : Iir_Library_Declaration := Null_Iir; |