lkql_checker: make gnatcheck and gnatkp separate objects

Author: thvnx

lkql_checker/lkql_checker.gpr

@@ -10,7 +10,7 @@ project LKQL_Checker is
    for Source_Dirs use ("src");
    for Object_Dir use "obj/" & Build_Mode;
    for Exec_Dir use "bin";
-   for Main use ("main.adb");
+   for Main use ("gnatcheck.adb", "gnatkp.adb");
 
    package Binder is
       case Build_Mode is
@@ -22,7 +22,6 @@ project LKQL_Checker is
    end Binder;
 
    package Builder is
-      for Executable ("main.adb") use "gnatcheck";
       for Switches ("Ada") use ("-j0");
    end Builder;
 

lkql_checker/src/gnatcheck.adb

@@ -0,0 +1,13 @@
+--
+--  Copyright (C) 2005-2025, AdaCore
+--  SPDX-License-Identifier: GPL-3.0-or-later
+--
+
+with Lkql_Checker; use Lkql_Checker;
+
+with Main;
+
+procedure Gnatcheck is
+begin
+   Main (Gnatcheck_Mode);
+end Gnatcheck;

lkql_checker/src/gnatcheck.ads

@@ -0,0 +1,6 @@
+--
+--  Copyright (C) 2005-2025, AdaCore
+--  SPDX-License-Identifier: GPL-3.0-or-later
+--
+
+procedure Gnatcheck;

lkql_checker/src/gnatkp.adb

@@ -0,0 +1,13 @@
+--
+--  Copyright (C) 2005-2025, AdaCore
+--  SPDX-License-Identifier: GPL-3.0-or-later
+--
+
+with Lkql_Checker; use Lkql_Checker;
+
+with Main;
+
+procedure Gnatkp is
+begin
+   Main (Gnatkp_Mode);
+end Gnatkp;

lkql_checker/src/gnatkp.ads

@@ -0,0 +1,6 @@
+--
+--  Copyright (C) 2005-2025, AdaCore
+--  SPDX-License-Identifier: GPL-3.0-or-later
+--
+
+procedure Gnatkp;

lkql_checker/src/lkql_checker-diagnoses.adb

@@ -1695,7 +1695,7 @@ package body Lkql_Checker.Diagnoses is
 
    procedure Print_Out_Diagnoses is
       Max_Diagnoses      : constant Natural :=
-        (if Gnatkp_Mode then 0 else Arg.Max_Diagnoses.Get);
+        (if Options.Mode = Gnatkp_Mode then 0 else Arg.Max_Diagnoses.Get);
       Diagnoses_Reported : Natural := 0;
       Limit_Exceeded     : Boolean := False;
 
@@ -1923,7 +1923,7 @@ package body Lkql_Checker.Diagnoses is
       Pragma_Name : constant Text_Type := To_Lower (El.F_Id.Text);
       Pragma_Args : constant LAL.Analysis.Base_Assoc_List := El.F_Args;
       Tool_Name   : constant Text_Type :=
-        (if Gnatkp_Mode then "gnatkp" else "gnatcheck");
+        (if Options.Mode = Gnatkp_Mode then "gnatkp" else "gnatcheck");
    begin
       return
         Pragma_Name in "annotate" | "gnat_annotate"
@@ -2270,7 +2270,7 @@ package body Lkql_Checker.Diagnoses is
          return;
       end if;
 
-      if Gnatkp_Mode then
+      if Options.Mode = Gnatkp_Mode then
          Match (Match_Kp_Exempt_Comment, Text, Matches);
       else
          Match (Match_Rule_Exempt_Comment, Text, Matches);

lkql_checker/src/lkql_checker-options.ads

@@ -69,10 +69,8 @@ package Lkql_Checker.Options is
    --  tool (includes both wrong parameters and wrong combinations of correct
    --  parameters).
 
-   Gnatkp_Mode : Boolean := Executable = "gnatkp";
-   --  Whether we are running in KP detection mode
-   --  Set either when the executable is called gnatkp or with the debug switch
-   --  '-dkp'
+   Mode : Lkql_Checker_Mode := Gnatcheck_Mode;
+   --  Set the mode of the driver, either GNATcheck or GNATkp modes.
 
    Legacy : Boolean := False;
    --  If True, run in legacy mode, with no support for additional rule files.
@@ -679,7 +677,7 @@ package Lkql_Checker.Options is
       function XML_Report_File_Path return String;
 
       function Ignore_Project_Switches return Boolean
-      is (Ignore_Project_Switches_Opt.Get or Gnatkp_Mode);
+      is (Ignore_Project_Switches_Opt.Get or Mode = Gnatkp_Mode);
 
       function Source_Files_Specified return Boolean
       is (Source_Files.Get /= Null_Unbounded_String);

lkql_checker/src/lkql_checker-output.adb

@@ -432,7 +432,7 @@ package body Lkql_Checker.Output is
    begin
       pragma Style_Checks ("M200"); -- Allow long lines
 
-      if Gnatkp_Mode then
+      if Options.Mode = Gnatkp_Mode then
          Put_Line ("gnatkp: the GNAT known problem detector");
          Put_Line
            ("usage: gnatkp -Pproject [options] [-rules [-from=file] {+Rkp_id[:param]}]");

lkql_checker/src/lkql_checker-projects.adb

@@ -1169,7 +1169,9 @@ package body Lkql_Checker.Projects is
       --  If GNATcheck is in KP mode and there is a command line specified KP
       --  version, we have to iterate over all implemented rules to enable
       --  those which match the version.
-      if Gnatkp_Mode and then Arg.KP_Version.Get /= Null_Unbounded_String then
+      if Options.Mode = Gnatkp_Mode
+        and then Arg.KP_Version.Get /= Null_Unbounded_String
+      then
          for Rule_Cursor in All_Rules.Iterate loop
             declare
                Id       : constant Rule_Id := Rule_Map.Key (Rule_Cursor);
@@ -1209,7 +1211,8 @@ package body Lkql_Checker.Projects is
       Active_Rule_Present := not All_Rule_Instances.Is_Empty;
 
       if not (Active_Rule_Present or else Analyze_Compiler_Output) then
-         if Gnatkp_Mode and then Arg.KP_Version.Get /= Null_Unbounded_String
+         if Options.Mode = Gnatkp_Mode
+           and then Arg.KP_Version.Get /= Null_Unbounded_String
          then
             Error ("no rule for the given kp-version");
             No_Detectors_For_KP_Version := True;

lkql_checker/src/lkql_checker-rules-rule_table.adb

@@ -1556,7 +1556,7 @@ package body Lkql_Checker.Rules.Rule_Table is
       Set : Rule_Sets.Set;
 
    begin
-      if Gnatkp_Mode then
+      if Options.Mode = Gnatkp_Mode then
          Print ("gnatkp currently implements the following detectors:");
 
          if Arg.KP_Version.Get /= Null_Unbounded_String then