Migrate the '--kp-version' switch to Opt_Parse

Author: HugoGGuerrier

lkql_checker/src/gnatcheck-options.adb

@@ -261,7 +261,7 @@ package body Gnatcheck.Options is
       end if;
 
       loop
-         Initial_Char := Getopt ("-kp-version= ", Parser => Parser);
+         Initial_Char := Getopt (" ", Parser => Parser);
 
          case Initial_Char is
             when ASCII.NUL =>
@@ -291,14 +291,6 @@ package body Gnatcheck.Options is
 
                exit when not Success;
 
-            when '-'       =>
-               if not First_Pass then
-                  if Full_Switch (Parser => Parser) = "-kp-version" then
-                     Free (KP_Version);
-                     KP_Version := new String'(Parameter (Parser => Parser));
-                  end if;
-               end if;
-
             when others    =>
                Error
                  ("unrecognized switch: " & Full_Switch (Parser => Parser));

lkql_checker/src/gnatcheck-options.ads

@@ -75,9 +75,6 @@ package Gnatcheck.Options is
    Legacy : Boolean := False;
    --  If True, run in legacy mode, with no support for additional rule files.
 
-   KP_Version : GNAT.OS_Lib.String_Access;
-   --  If set, the relevant GNAT version to check when running gnatkp.
-
    Exempted_Units : GNAT.OS_Lib.String_Access := null;
    --  '--ignore=<filename>
    --  File containing a list of units to be exempted. (Depending on a tool,
@@ -279,6 +276,15 @@ package Gnatcheck.Options is
              "specify the charset of the source files (default is "
              & "latin-1)");
 
+      package KP_Version is new
+        Parse_Option
+          (Parser      => Parser,
+           Long        => "--kp-version",
+           Name        => "KP version",
+           Arg_Type    => Unbounded_String,
+           Default_Val => Null_Unbounded_String,
+           Help        => "enable all KP detectors matching GNAT <version>");
+
       package Lkql_Path is new
         Parse_Option_List
           (Parser     => Parser,

lkql_checker/src/gnatcheck-projects.adb

@@ -1206,15 +1206,16 @@ package body Gnatcheck.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 KP_Version /= null then
+      if 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);
                Rule     : constant Rule_Info := All_Rules (Rule_Cursor);
                Instance : Rule_Instance_Access;
             begin
                if Rule.Impact /= null
-                 and then Match (KP_Version.all, Rule.Impact.all)
+                 and then Match
+                            (To_String (Arg.KP_Version.Get), Rule.Impact.all)
                then
                   if Rule.Target /= null
                     and then Target /= Null_Unbounded_String
@@ -1245,7 +1246,8 @@ package body Gnatcheck.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 KP_Version /= null then
+         if 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;
             return;

lkql_checker/src/gnatcheck-rules-rule_table.adb

@@ -1559,10 +1559,12 @@ package body Gnatcheck.Rules.Rule_Table is
       if Gnatkp_Mode then
          Print ("gnatkp currently implements the following detectors:");
 
-         if KP_Version /= null then
+         if Arg.KP_Version.Get /= Null_Unbounded_String then
             for Rule in All_Rules.Iterate loop
                if All_Rules (Rule).Impact = null
-                 or else (Match (KP_Version.all, All_Rules (Rule).Impact.all)
+                 or else (Match
+                            (To_String (Arg.KP_Version.Get),
+                             All_Rules (Rule).Impact.all)
                           and then (All_Rules (Rule).Target = null
                                     or else To_String (Target) = ""
                                     or else Match