Skip to content

Commit 017ce32

Browse files
committed
Enhance 'forbidden in project file' error messages
1 parent 4a854d1 commit 017ce32

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

lkql_checker/src/gnatcheck-projects.adb

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1254,15 +1254,16 @@ package body Gnatcheck.Projects is
12541254
-- loop
12551255
if Args_From_Project then
12561256
declare
1257-
In_Project_Msg : constant String := "forbidden in project file";
1257+
In_Project_Msg : constant String :=
1258+
" is forbidden in project file";
12581259
begin
1259-
Disallow (Arg.Aggregate_Subproject.This, In_Project_Msg);
1260-
Disallow (Arg.Project_File.This, In_Project_Msg);
1261-
Disallow (Arg.Transitive_Closure.This, In_Project_Msg);
1262-
Disallow (Arg.Scenario_Vars.This, In_Project_Msg);
1263-
Disallow (Arg.Follow_Symbolic_Links.This, In_Project_Msg);
1264-
Disallow (Arg.Rules.This, In_Project_Msg);
1265-
Disallow (Arg.Rule_File.This, In_Project_Msg);
1260+
Disallow (Arg.Aggregate_Subproject.This, "-A" & In_Project_Msg);
1261+
Disallow (Arg.Project_File.This, "-P" & In_Project_Msg);
1262+
Disallow (Arg.Transitive_Closure.This, "-U" & In_Project_Msg);
1263+
Disallow (Arg.Scenario_Vars.This, "-Xname=val" & In_Project_Msg);
1264+
Disallow (Arg.Follow_Symbolic_Links.This, "-eL" & In_Project_Msg);
1265+
Disallow (Arg.Rules.This, "-r" & In_Project_Msg);
1266+
Disallow (Arg.Rule_File.This, "--rule-file" & In_Project_Msg);
12661267
end;
12671268
end if;
12681269

testsuite/tests/gnatcheck/check_package/switches_attr/test.out

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ main.adb:3:04: goto statement [goto_statements]
66
With a disallowed switch
77
========================
88

9-
gnatcheck: for option RULE - forbidden in project file
9+
gnatcheck: for option RULE - -r is forbidden in project file
1010
try "gnatcheck --help" for more information.
1111
>>>program returned status code 2
1212

0 commit comments

Comments
 (0)