Overview
Comment: | getopt_long: rename Option_Definitions type to Configuration |
---|---|
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
5564c1c2565e38a614274fc5834b613f |
User & Date: | nat on 2011-12-09 12:50:29 |
Other Links: | manifest | tags |
Context
2011-12-09
| ||
16:10 | getopt_long: move Posixly_Correct and Long_Only into Configuration objects check-in: 60174b5c09 user: nat tags: trunk | |
12:50 | getopt_long: rename Option_Definitions type to Configuration check-in: 5564c1c256 user: nat tags: trunk | |
2011-12-08
| ||
18:17 | natools-getopt_long: callback mechanism changed from access-to-subprograms to dispatching calls check-in: 4d813ad137 user: nat tags: trunk | |
Changes
Modified natools-getopt_long.adb from [13a3dc667c] to [7692854d6a].
︙ | ︙ | |||
104 105 106 107 108 109 110 | ---------------------------- -- Option list management -- ---------------------------- procedure Add_Option | | | | | | | | | | | | | | | | | | | | | | | | | | 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 | ---------------------------- -- Option list management -- ---------------------------- procedure Add_Option (Config : in out Configuration; Long_Name : String; Short_Name : Character; Has_Arg : Argument_Requirement; Id : Option_Id) is New_Option : constant Option := (Long_Name_Length => Long_Name'Length, Id => Id, Has_Arg => Has_Arg, Long_Name => Long_Name, Short_Name => Short_Name); begin if Long_Name = Null_Long_Name or Short_Name = Null_Short_Name then raise Constraint_Error; end if; Config.By_Long_Name.Insert (Long_Name, New_Option); Config.By_Short_Name.Insert (Short_Name, New_Option); end Add_Option; procedure Add_Option (Config : in out Configuration; Long_Name : String; Has_Arg : Argument_Requirement; Id : Option_Id) is New_Option : constant Option := (Long_Name_Length => Long_Name'Length, Id => Id, Has_Arg => Has_Arg, Long_Name => Long_Name, Short_Name => Null_Short_Name); begin if Long_Name = Null_Long_Name then raise Constraint_Error; end if; Config.By_Long_Name.Insert (Long_Name, New_Option); end Add_Option; procedure Add_Option (Config : in out Configuration; Short_Name : Character; Has_Arg : Argument_Requirement; Id : Option_Id) is New_Option : constant Option := (Long_Name_Length => 0, Id => Id, Has_Arg => Has_Arg, Long_Name => Null_Long_Name, Short_Name => Short_Name); begin if Short_Name = Null_Short_Name then raise Constraint_Error; end if; Config.By_Short_Name.Insert (Short_Name, New_Option); end Add_Option; procedure Del_Option (Config : in out Configuration; Id : Option_Id) is Short_Name_Cursor : Short_Option_Maps.Cursor := Config.By_Short_Name.First; Long_Name_Cursor : Long_Option_Maps.Cursor := Config.By_Long_Name.First; begin while Short_Option_Maps.Has_Element (Short_Name_Cursor) loop declare Next : constant Short_Option_Maps.Cursor := Short_Option_Maps.Next (Short_Name_Cursor); begin if Short_Option_Maps.Element (Short_Name_Cursor).Id = Id then Config.By_Short_Name.Delete (Short_Name_Cursor); end if; Short_Name_Cursor := Next; end; end loop; while Long_Option_Maps.Has_Element (Long_Name_Cursor) loop declare Next : constant Long_Option_Maps.Cursor := Long_Option_Maps.Next (Long_Name_Cursor); begin if Long_Option_Maps.Element (Long_Name_Cursor).Id = Id then Config.By_Long_Name.Delete (Long_Name_Cursor); end if; Long_Name_Cursor := Next; end; end loop; end Del_Option; procedure Del_Option (Config : in out Configuration; Long_Name : String) is begin Config.By_Long_Name.Delete (Long_Name); end Del_Option; procedure Del_Option (Config : in out Configuration; Short_Name : Character) is begin Config.By_Short_Name.Delete (Short_Name); end Del_Option; ---------------------------- -- Formatting subprograms -- ---------------------------- function Format_Long_Names (Config : Configuration; Id : Option_Id; Separator : String := ", "; Name_Prefix : String := "--") return String is Long_Name_Count : constant Natural := Get_Long_Name_Count (Config, Id); Space_Per_Name : constant Positive := Name_Prefix'Length + 1 + Separator'Length; Result : String (1 .. Long_Name_Count * Space_Per_Name); begin if Long_Name_Count = 0 then return ""; end if; for J in 1 .. Long_Name_Count loop declare First : constant Positive := Result'First + (J - 1) * Space_Per_Name; Name : constant String := Get_Long_Name (Config, Id, J); begin Result (First .. First + Name_Prefix'Length - 1) := Name_Prefix; Result (First + Name_Prefix'Length .. First + Name_Prefix'Length + Name'Length - 1) := Name; Result (First + Name_Prefix'Length + Name'Length .. First + Space_Per_Name - 1) := Separator; end; end loop; return Result (1 .. Long_Name_Count * Space_Per_Name - Separator'Length); end Format_Long_Names; function Format_Names (Config : Configuration; Id : Option_Id; Separator : String := ", "; Long_Name_Prefix : String := "--"; Short_Name_Prefix : String := "-"; Short_First : Boolean := True) return String is Long_Names : constant String := Format_Long_Names (Config, Id, Separator, Long_Name_Prefix); Short_Names : constant String := Format_Short_Names (Config, Id, Separator, Short_Name_Prefix); begin if Long_Names = "" then return Short_Names; elsif Short_Names = "" then return Long_Names; elsif Short_First then return Short_Names & Separator & Long_Names; else return Long_Names & Separator & Short_Names; end if; end Format_Names; function Format_Short_Names (Config : Configuration; Id : Option_Id; Separator : String := ", "; Name_Prefix : String := "-") return String is Short_Names : constant String := Get_Short_Names (Config, Id); Space_Per_Name : constant Positive := Name_Prefix'Length + 1 + Separator'Length; Result : String (1 .. Short_Names'Length * Space_Per_Name); begin if Short_Names = "" then return ""; end if; |
︙ | ︙ | |||
312 313 314 315 316 317 318 | end loop; return Result (Result'First .. Result'Last - Separator'Length); end Format_Short_Names; function Get_Long_Name | | | | | 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 | end loop; return Result (Result'First .. Result'Last - Separator'Length); end Format_Short_Names; function Get_Long_Name (Config : Configuration; Id : Option_Id; Index : Positive := 1) return String is Seen : Natural := 0; Cursor : Long_Option_Maps.Cursor := Config.By_Long_Name.First; begin while Long_Option_Maps.Has_Element (Cursor) loop declare Opt : constant Option := Long_Option_Maps.Element (Cursor); begin if Opt.Id = Id then Seen := Seen + 1; if Seen = Index then return Opt.Long_Name; end if; end if; end; Long_Option_Maps.Next (Cursor); end loop; raise Constraint_Error; end Get_Long_Name; function Get_Long_Name_Count (Config : Configuration; Id : Option_Id) return Natural is procedure Process (Key : String; Element : Option); procedure Process (Cursor : Long_Option_Maps.Cursor); Result : Natural := 0; |
︙ | ︙ | |||
360 361 362 363 364 365 366 | end Process; procedure Process (Cursor : Long_Option_Maps.Cursor) is begin Long_Option_Maps.Query_Element (Cursor, Process'Access); end Process; begin | | | | 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 | end Process; procedure Process (Cursor : Long_Option_Maps.Cursor) is begin Long_Option_Maps.Query_Element (Cursor, Process'Access); end Process; begin Config.By_Long_Name.Iterate (Process'Access); return Result; end Get_Long_Name_Count; function Get_Short_Name_Count (Config : Configuration; Id : Option_Id) return Natural is procedure Process (Key : Character; Element : Option); procedure Process (Cursor : Short_Option_Maps.Cursor); Result : Natural := 0; |
︙ | ︙ | |||
388 389 390 391 392 393 394 | end Process; procedure Process (Cursor : Short_Option_Maps.Cursor) is begin Short_Option_Maps.Query_Element (Cursor, Process'Access); end Process; begin | | | | | | | 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 | end Process; procedure Process (Cursor : Short_Option_Maps.Cursor) is begin Short_Option_Maps.Query_Element (Cursor, Process'Access); end Process; begin Config.By_Short_Name.Iterate (Process'Access); return Result; end Get_Short_Name_Count; function Get_Short_Names (Config : Configuration; Id : Option_Id) return String is procedure Process (Key : Character; Element : Option); procedure Process (Cursor : Short_Option_Maps.Cursor); Result : String (1 .. Config.Get_Short_Name_Count (Id)); J : Positive := Result'First; procedure Process (Key : Character; Element : Option) is begin if Element.Id = Id then Result (J) := Key; J := J + 1; end if; end Process; procedure Process (Cursor : Short_Option_Maps.Cursor) is begin Short_Option_Maps.Query_Element (Cursor, Process'Access); end Process; begin Config.By_Short_Name.Iterate (Process'Access); return Result; end Get_Short_Names; procedure Iterate (Config : Configuration; Process : not null access procedure (Id : Option_Id; Long_Name : String; Short_Name : Character; Has_Arg : Argument_Requirement)) is procedure Long_Process (Key : String; Opt : Option); procedure Long_Query (C : Long_Option_Maps.Cursor); |
︙ | ︙ | |||
458 459 460 461 462 463 464 | end Short_Process; procedure Short_Query (C : Short_Option_Maps.Cursor) is begin Short_Option_Maps.Query_Element (C, Short_Process'Access); end Short_Query; begin | | | | | 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 | end Short_Process; procedure Short_Query (C : Short_Option_Maps.Cursor) is begin Short_Option_Maps.Query_Element (C, Short_Process'Access); end Short_Query; begin Config.By_Short_Name.Iterate (Short_Query'Access); Config.By_Long_Name.Iterate (Long_Query'Access); end Iterate; ----------------------------- -- Command-line processing -- ----------------------------- procedure Process (Config : Configuration; Handler : in out Handlers.Callback'Class; Posixly_Correct : Boolean := True; Long_Only : Boolean := False; Argument_Count : not null access function return Natural := Ada.Command_Line.Argument_Count'Access; Argument : not null access function (Number : Positive) return String := Ada.Command_Line.Argument'Access) |
︙ | ︙ | |||
507 508 509 510 511 512 513 | if Equal /= 0 then Arg_Name_Last := Equal - 1; end if; declare Arg_Name : String renames Arg (Arg'First .. Arg_Name_Last); begin -- Looking for an exact match | | | | 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 | if Equal /= 0 then Arg_Name_Last := Equal - 1; end if; declare Arg_Name : String renames Arg (Arg'First .. Arg_Name_Last); begin -- Looking for an exact match Cursor := Config.By_Long_Name.Find (Arg_Name); if not Long_Option_Maps.Has_Element (Cursor) then -- Looking for a unique partial match Cursor := Config.By_Long_Name.Ceiling (Arg_Name); if not Long_Option_Maps.Has_Element (Cursor) or else not Has_Prefix (Cursor, Arg_Name) or else Has_Prefix (Long_Option_Maps.Next (Cursor), Arg_Name) then Handler.Unknown_Option (To_Name (Arg_Name)); return; end if; |
︙ | ︙ | |||
588 589 590 591 592 593 594 | Arg_N := Arg_N + 1; else -- Process a list of short options, until one with required -- argument is encountered (and the rest is its argument). for Arg_I in Arg'First + 1 .. Arg'Last loop declare Cursor : constant Short_Option_Maps.Cursor | | | 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 | Arg_N := Arg_N + 1; else -- Process a list of short options, until one with required -- argument is encountered (and the rest is its argument). for Arg_I in Arg'First + 1 .. Arg'Last loop declare Cursor : constant Short_Option_Maps.Cursor := Config.By_Short_Name.Find (Arg (Arg_I)); begin if Short_Option_Maps.Has_Element (Cursor) then declare Opt : constant Option := Short_Option_Maps.Element (Cursor); begin if Opt.Has_Arg = Required_Argument then |
︙ | ︙ |
Modified natools-getopt_long.ads from [ba41b2949f] to [21b9a936b8].
︙ | ︙ | |||
17 18 19 20 21 22 23 | ------------------------------------------------------------------------------ -- Natools.Getopt_Long is a native Ada implementation of getopt_long() -- -- processor for command line arguments. -- -- -- -- This package is generic, and its only formal parameter is a descrete -- -- type supposed to cover all command-line options. -- -- -- | | | | | | | 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 | ------------------------------------------------------------------------------ -- Natools.Getopt_Long is a native Ada implementation of getopt_long() -- -- processor for command line arguments. -- -- -- -- This package is generic, and its only formal parameter is a descrete -- -- type supposed to cover all command-line options. -- -- -- -- Configuration objects hold the list of recognized options and parameters -- -- about how to process them. Options can have a single-character short -- -- name or a multiple-character long name. Moreover, there is no limit to -- -- the number of flag names referring to the same Option_Id value. -- -- -- -- Once the Configuration object has been filled with flags recognized -- -- by the client, the actual command-line arguments can be processed, -- -- using the handler callbacks from a Handlers.Callback'Class object. -- -- -- -- Callback subprograms for normal operation are Option, for command-line -- -- flags identified by their Option_Id, and Argument, for top-level command -- -- line arguments. There are also callbacks for error conditions (missing -- -- or unexpected argument, unknown option), whose implementation in -- |
︙ | ︙ | |||
115 116 117 118 119 120 121 | Name : Any_Name); -- Raise Option_Error (default error handler). end Handlers; | | | | | | | | | | | | | | | | | | | | | | 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 | Name : Any_Name); -- Raise Option_Error (default error handler). end Handlers; ---------------------------- -- Configuration database -- ---------------------------- type Argument_Requirement is (No_Argument, Required_Argument, Optional_Argument); type Configuration is tagged private; procedure Add_Option (Config : in out Configuration; Long_Name : String; Short_Name : Character; Has_Arg : Argument_Requirement; Id : Option_Id); -- Add an option with both a short and a long name to the database. procedure Add_Option (Config : in out Configuration; Long_Name : String; Has_Arg : Argument_Requirement; Id : Option_Id); -- Add an option with only a long name to the database. procedure Add_Option (Config : in out Configuration; Short_Name : Character; Has_Arg : Argument_Requirement; Id : Option_Id); -- Add an option with only a short name to the database. procedure Del_Option (Config : in out Configuration; Id : Option_Id); -- Remove from the database an option identified by its id. procedure Del_Option (Config : in out Configuration; Long_Name : String); -- Remove from the database an option identified by its long name. procedure Del_Option (Config : in out Configuration; Short_Name : Character); -- Remove from the database an option identified by its short name. function Format_Long_Names (Config : Configuration; Id : Option_Id; Separator : String := ", "; Name_Prefix : String := "--") return String; -- Return a human-readable list of long names for the given option. function Format_Names (Config : Configuration; Id : Option_Id; Separator : String := ", "; Long_Name_Prefix : String := "--"; Short_Name_Prefix : String := "-"; Short_First : Boolean := True) return String; -- Return a human-readable list of all names for the given option. function Format_Short_Names (Config : Configuration; Id : Option_Id; Separator : String := ", "; Name_Prefix : String := "-") return String; -- Return a human-readable list of short names for the given option. function Get_Long_Name (Config : Configuration; Id : Option_Id; Index : Positive := 1) return String; -- Return the "Index"th long name for the given option id. -- Raise Constraint_Error when Index is not -- in range 1 .. Get_Long_Name_Count (Config, Id) function Get_Long_Name_Count (Config : Configuration; Id : Option_Id) return Natural; -- Return the number of long names for the given option id. function Get_Short_Name_Count (Config : Configuration; Id : Option_Id) return Natural; -- Return the number of short names for the given option id. function Get_Short_Names (Config : Configuration; Id : Option_Id) return String; -- Return a string containing the characters for short names for -- the given option id. procedure Iterate (Config : Configuration; Process : not null access procedure (Id : Option_Id; Long_Name : String; Short_Name : Character; Has_Arg : Argument_Requirement)); -- Iterate over all options, starting with options having a short name, -- followed by options having only a long name, sorted respectively by -- short and long name. -- Process is called for each option; for options lacking a long name, -- Long_Name is "", and for options lacking a short name, Short_Name -- is Character'Val (0). -------------------------------------- -- Command line argument processing -- -------------------------------------- procedure Process (Config : Configuration; Handler : in out Handlers.Callback'Class; Posixly_Correct : Boolean := True; Long_Only : Boolean := False; Argument_Count : not null access function return Natural := Ada.Command_Line.Argument_Count'Access; Argument : not null access function (Number : Positive) return String := Ada.Command_Line.Argument'Access); |
︙ | ︙ | |||
261 262 263 264 265 266 267 | package Long_Option_Maps is new Ada.Containers.Indefinite_Ordered_Maps (String, Option); package Short_Option_Maps is new Ada.Containers.Indefinite_Ordered_Maps (Character, Option); | | | 261 262 263 264 265 266 267 268 269 270 271 272 273 | package Long_Option_Maps is new Ada.Containers.Indefinite_Ordered_Maps (String, Option); package Short_Option_Maps is new Ada.Containers.Indefinite_Ordered_Maps (Character, Option); type Configuration is tagged record By_Long_Name : Long_Option_Maps.Map; By_Short_Name : Short_Option_Maps.Map; end record; end Natools.Getopt_Long; |
Modified natools-getopt_long_tests.adb from [8e0d54499f] to [8533326941].
︙ | ︙ | |||
63 64 65 66 67 68 69 | type Flag_Argument_Array is array (Option_Id) of US.Unbounded_String; Separator : constant Character := ';'; package Getopt is new Natools.Getopt_Long (Option_Id); | | | | | | | 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 | type Flag_Argument_Array is array (Option_Id) of US.Unbounded_String; Separator : constant Character := ';'; package Getopt is new Natools.Getopt_Long (Option_Id); function Getopt_Config return Getopt.Configuration; -- Create the Getopt.Configuration object used for these tests. function Getopt_Config return Getopt.Configuration is begin return OD : Getopt.Configuration do OD.Add_Option ('a', Getopt.No_Argument, Short_No_Arg); OD.Add_Option ('q', Getopt.No_Argument, Short_No_Arg_2); OD.Add_Option ('f', Getopt.Required_Argument, Short_Arg); OD.Add_Option ('v', Getopt.Optional_Argument, Short_Opt_Arg); OD.Add_Option ("aq", Getopt.No_Argument, Long_Ambiguous); OD.Add_Option ("aquatic", Getopt.No_Argument, Long_No_Arg); OD.Add_Option ("color", Getopt.Optional_Argument, Long_Opt_Arg); OD.Add_Option ("input", Getopt.Required_Argument, Long_Arg); OD.Add_Option ("execute", 'e', Getopt.Required_Argument, Mixed_Arg); OD.Add_Option ("ignore-case", 'i', Getopt.No_Argument, Mixed_No_Arg); OD.Add_Option ("write", 'w', Getopt.Optional_Argument, Mixed_Opt_Arg); end return; end Getopt_Config; ------------------- -- Test Handlers -- ------------------- |
︙ | ︙ | |||
284 285 286 287 288 289 290 | Expected_Seen : Flag_Seen_Array; Expected_Argument : Flag_Argument_Array; Expected_Error : String_Vectors.Vector := String_Vectors.Empty_Vector; Posixly_Correct : Boolean := True; Long_Only : Boolean := False) is use type String_Vectors.Vector; | | | > | | 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 | Expected_Seen : Flag_Seen_Array; Expected_Argument : Flag_Argument_Array; Expected_Error : String_Vectors.Vector := String_Vectors.Empty_Vector; Posixly_Correct : Boolean := True; Long_Only : Boolean := False) is use type String_Vectors.Vector; Config : constant Getopt.Configuration := Getopt_Config; Handler : Handlers.Basic; begin begin Getopt.Process (Config => Config, Handler => Handler, Posixly_Correct => Posixly_Correct, Long_Only => Long_Only, Argument_Count => Argument_Count'Access, Argument => Argument'Access); exception when Error : Getopt.Option_Error => Handler.Flag_Error.Append |
︙ | ︙ | |||
384 385 386 387 388 389 390 | procedure Local_Test (Name : String; Expected_Seen : Flag_Seen_Array; Expected_Argument : Flag_Argument_Array; Expected_Count : Handlers.Error_Count) is use type Handlers.Error_Count; | | | > | | 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 | procedure Local_Test (Name : String; Expected_Seen : Flag_Seen_Array; Expected_Argument : Flag_Argument_Array; Expected_Count : Handlers.Error_Count) is use type Handlers.Error_Count; Config : constant Getopt.Configuration := Getopt_Config; Handler : Handlers.Recovering; begin Getopt.Process (Config => Config, Handler => Handler, Argument_Count => Argument_Count'Access, Argument => Argument'Access); if Handler.Count /= Expected_Count then Report.Item (Name, NT.Fail); if Handler.Count.Missing_Argument_Long /= Expected_Count.Missing_Argument_Long then |
︙ | ︙ |