Skip to content

Commit

Permalink
Merge branch 'topic/gpr2_external_names' into 'master'
Browse files Browse the repository at this point in the history
Adapt GNATcheck to the new GPR2 external names

Closes #318

See merge request eng/libadalang/langkit-query-language!281
  • Loading branch information
raph-amiard committed Aug 13, 2024
2 parents 5f94f13 + 21cd9e1 commit 06fa9ee
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions lkql_checker/src/gnatcheck-projects.adb
Original file line number Diff line number Diff line change
Expand Up @@ -380,8 +380,8 @@ package body Gnatcheck.Projects is
for C in Agg_Context.Iterate loop
Project_Options.Add_Switch
(GPR2.Options.X,
String (Name_Value_Map_Package.Key (C)) & "=" &
Name_Value_Map_Package.Element (C));
String (External_Name_Value_Map_Package.Key (C)) & "=" &
External_Name_Value_Map_Package.Element (C));
end loop;

if not My_Project.Tree.Load (Project_Options,
Expand Down Expand Up @@ -678,7 +678,9 @@ package body Gnatcheck.Projects is
-- Set GPR_TOOL, if needed

for Cursor in Project_Options.Context.Iterate loop
if Containers.Name_Value_Map_Package.Key (Cursor) = "GPR_TOOL" then
if
Containers.External_Name_Value_Map_Package.Key (Cursor) = "GPR_TOOL"
then
GPR_TOOL_Set := True;
exit;
end if;
Expand Down

0 comments on commit 06fa9ee

Please sign in to comment.