Overview
Comment: | s_expressions-templates-generic_integers: use ranges instead of discrete values for image maps |
---|---|
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
c0da1058a5a531c34e203580c15629a0 |
User & Date: | nat on 2014-09-25 21:29:47 |
Other Links: | manifest | tags |
Context
2014-09-26
| ||
21:13 | s_expressions-templates-generic_integers: add prefixes and suffixes to rendered numbers check-in: b0204e546f user: nat tags: trunk | |
2014-09-25
| ||
21:29 | s_expressions-templates-generic_integers: use ranges instead of discrete values for image maps check-in: c0da1058a5 user: nat tags: trunk | |
2014-09-24
| ||
18:55 | s_expressions-templates-tests-integers: test the new explicit images from templates check-in: 674fc9e953 user: nat tags: trunk | |
Changes
Modified src/natools-s_expressions-templates-generic_integers.adb from [6f9a793c86] to [d3dad2b3da].
︙ | ︙ | |||
28 29 30 31 32 33 34 | procedure Insert_Image (State : in out Format; Context : in Meaningless_Type; Image : in Atom); | < < < < < < | 28 29 30 31 32 33 34 35 36 37 38 39 40 41 | procedure Insert_Image (State : in out Format; Context : in Meaningless_Type; Image : in Atom); procedure Update_Format (State : in out Format; Context : in Meaningless_Type; Name : in Atom; Arguments : in out Lockable.Descriptor'Class); |
︙ | ︙ | |||
55 56 57 58 59 60 61 | Image : in Atom) is pragma Unreferenced (Context); begin State.Append_Image (Image); end Insert_Image; | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 49 50 51 52 53 54 55 56 57 58 59 60 61 62 | Image : in Atom) is pragma Unreferenced (Context); begin State.Append_Image (Image); end Insert_Image; procedure Update_Format (State : in out Format; Context : in Meaningless_Type; Name : in Atom; Arguments : in out Lockable.Descriptor'Class) is |
︙ | ︙ | |||
131 132 133 134 135 136 137 | when Commands.Align_Right => State.Set_Align (Right_Aligned); when Commands.Base => State.Set_Symbols (Arguments); when Commands.Images => | | | 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 | when Commands.Align_Right => State.Set_Align (Right_Aligned); when Commands.Base => State.Set_Symbols (Arguments); when Commands.Images => Parse (State.Images, Arguments); when Commands.Padding => case Arguments.Current_Event is when Events.Add_Atom => State.Left_Padding := Create (Arguments.Current_Atom); State.Right_Padding := State.Left_Padding; when others => |
︙ | ︙ | |||
319 320 321 322 323 324 325 326 327 328 329 330 331 332 | Length := Length + 1; Output.Append (Symbols (Digit).Query.Data.all); exit when Remainder = 0; end loop; end Reverse_Render; ---------------------- -- Public Interface -- ---------------------- function Render (Value : T; Template : Format) return Atom is function "*" (Count : Width; Symbol : Atom) return Atom; | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 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 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 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 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 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 484 485 486 487 488 489 | Length := Length + 1; Output.Append (Symbols (Digit).Query.Data.all); exit when Remainder = 0; end loop; end Reverse_Render; ----------------------- -- Dynamic Atom Maps -- ----------------------- procedure Exclude (Map : in out Atom_Maps.Map; Values : in Interval) is procedure Delete_And_Next (Target : in out Atom_Maps.Map; Cursor : in out Atom_Maps.Cursor); procedure Delete_And_Next (Target : in out Atom_Maps.Map; Cursor : in out Atom_Maps.Cursor) is Next : constant Atom_Maps.Cursor := Atom_Maps.Next (Cursor); begin Target.Delete (Cursor); Cursor := Next; end Delete_And_Next; Cursor : Atom_Maps.Cursor := Map.Ceiling ((Values.First, Values.First)); begin if not Atom_Maps.Has_Element (Cursor) then return; end if; pragma Assert (not (Atom_Maps.Key (Cursor).Last < Values.First)); if Atom_Maps.Key (Cursor).First < Values.First then declare Old_Key : constant Interval := Atom_Maps.Key (Cursor); Prefix_Key : constant Interval := (Old_Key.First, T'Pred (Values.First)); Prefix_Image : constant Atom_Refs.Immutable_Reference := Atom_Maps.Element (Cursor); begin Delete_And_Next (Map, Cursor); Map.Insert (Prefix_Key, Prefix_Image); if Values.Last < Old_Key.Last then Map.Insert ((T'Succ (Values.Last), Old_Key.Last), Prefix_Image); return; end if; end; end if; while Atom_Maps.Has_Element (Cursor) and then not (Values.Last < Atom_Maps.Key (Cursor).Last) loop Delete_And_Next (Map, Cursor); end loop; if Atom_Maps.Has_Element (Cursor) and then not (Values.Last < Atom_Maps.Key (Cursor).First) then declare Old_Key : constant Interval := Atom_Maps.Key (Cursor); Suffix_Key : constant Interval := (T'Succ (Values.Last), Old_Key.Last); Suffix_Image : constant Atom_Refs.Immutable_Reference := Atom_Maps.Element (Cursor); begin Delete_And_Next (Map, Cursor); Map.Insert (Suffix_Key, Suffix_Image); end; end if; end Exclude; procedure Include (Map : in out Atom_Maps.Map; Values : in Interval; Image : in Atom_Refs.Immutable_Reference) is begin Exclude (Map, Values); Map.Insert (Values, Image); end Include; procedure Parse (Map : in out Atom_Maps.Map; Expression : in out Lockable.Descriptor'Class) is Event : Events.Event := Expression.Current_Event; Lock : Lockable.Lock_State; begin loop case Event is when Events.Add_Atom => declare Index : constant T := Next_Index (Map); begin Include (Map, (Index, Index), Create (Expression.Current_Atom)); end; when Events.Open_List => Expression.Lock (Lock); begin Expression.Next; Parse_Single_Image (Map, Expression); exception when others => Expression.Unlock (Lock, False); raise; end; Expression.Unlock (Lock); Event := Expression.Current_Event; exit when Event in Events.Error | Events.End_Of_Input; when Events.Close_List | Events.Error | Events.End_Of_Input => exit; end case; Expression.Next (Event); end loop; end Parse; procedure Parse_Single_Image (Map : in out Atom_Maps.Map; Expression : in out Lockable.Descriptor'Class) is Event : Events.Event := Expression.Current_Event; Lock : Lockable.Lock_State; First, Last : T; begin case Event is when Events.Add_Atom => begin First := T'Value (To_String (Expression.Current_Atom)); Last := First; exception when Constraint_Error => return; end; when Events.Open_List => Expression.Lock (Lock); begin Expression.Next (Event); if Event = Events.Add_Atom then First := T'Value (To_String (Expression.Current_Atom)); else Expression.Unlock (Lock, False); return; end if; Expression.Next (Event); if Event = Events.Add_Atom then Last := T'Value (To_String (Expression.Current_Atom)); else Expression.Unlock (Lock, False); return; end if; exception when Constraint_Error => Expression.Unlock (Lock, False); return; when others => Expression.Unlock (Lock, False); raise; end; Expression.Unlock (Lock); when others => return; end case; if Last < First then return; end if; Expression.Next (Event); if Event = Events.Add_Atom then Include (Map, (First, Last), Create (Expression.Current_Atom)); else Exclude (Map, (First, Last)); end if; end Parse_Single_Image; ---------------------- -- Public Interface -- ---------------------- function Render (Value : T; Template : Format) return Atom is function "*" (Count : Width; Symbol : Atom) return Atom; |
︙ | ︙ | |||
366 367 368 369 370 371 372 | Has_Sign : Boolean := True; Length : Width; Symbols : constant Atom_Arrays.Immutable_Reference := (if Template.Symbols.Is_Empty then Decimal else Template.Symbols); begin Check_Explicit_Image : declare | | > | 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 | Has_Sign : Boolean := True; Length : Width; Symbols : constant Atom_Arrays.Immutable_Reference := (if Template.Symbols.Is_Empty then Decimal else Template.Symbols); begin Check_Explicit_Image : declare Cursor : constant Atom_Maps.Cursor := Template.Images.Find ((Value, Value)); begin if Atom_Maps.Has_Element (Cursor) then return Atom_Maps.Element (Cursor).Query.Data.all; end if; end Check_Explicit_Image; if Value < 0 then |
︙ | ︙ | |||
477 478 479 480 481 482 483 | begin Append_Image (Object, Create (Image)); end Append_Image; procedure Remove_Image (Object : in out Format; Value : in T) is begin | | | | 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 | begin Append_Image (Object, Create (Image)); end Append_Image; procedure Remove_Image (Object : in out Format; Value : in T) is begin Exclude (Object.Images, (Value, Value)); end Remove_Image; procedure Set_Align (Object : in out Format; Value : in Alignment) is begin Object.Align := Value; end Set_Align; procedure Set_Image (Object : in out Format; Value : in T; Image : in Atom_Refs.Immutable_Reference) is begin Include (Object.Images, (Value, Value), Image); end Set_Image; procedure Set_Image (Object : in out Format; Value : in T; Image : in Atom) is |
︙ | ︙ |
Modified src/natools-s_expressions-templates-generic_integers.ads from [cc73e0eb79] to [2f1d14a3f5].
︙ | ︙ | |||
106 107 108 109 110 111 112 113 | -- consecutive atoms found in Atom_List. function Decimal return Atom_Arrays.Immutable_Reference with Post => not Decimal'Result.Is_Empty; -- Return a reference to usual decimal representation package Atom_Maps is new Ada.Containers.Ordered_Maps | > > > > > > > > > | | > > > > > > > > > > > > > > > > > > > > > | 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 | -- consecutive atoms found in Atom_List. function Decimal return Atom_Arrays.Immutable_Reference with Post => not Decimal'Result.Is_Empty; -- Return a reference to usual decimal representation type Interval is record First, Last : T; end record with Dynamic_Predicate => not (Interval.Last < Interval.First); function "<" (Left, Right : Interval) return Boolean is (Left.Last < Right.First); -- Strict non-overlap comparison package Atom_Maps is new Ada.Containers.Ordered_Maps (Interval, Atom_Refs.Immutable_Reference, "<", Atom_Refs."="); function Next_Index (Map : Atom_Maps.Map) return T is (if Map.Is_Empty then T'First else Map.Last_Key.Last + 1); -- Index of the next element to insert in sequential lists procedure Exclude (Map : in out Atom_Maps.Map; Values : in Interval); -- Remove the given interval from the map procedure Include (Map : in out Atom_Maps.Map; Values : in Interval; Image : in Atom_Refs.Immutable_Reference); -- Add Image to the given interval, overwriting any existing values procedure Parse_Single_Image (Map : in out Atom_Maps.Map; Expression : in out Lockable.Descriptor'Class); -- Parse Expression to match `value image` or `(first last) image`, -- and include it to Map. procedure Parse (Map : in out Atom_Maps.Map; Expression : in out Lockable.Descriptor'Class); -- Parse Expression as a list of single image expression (see above) --------------------- -- Format Mutators -- --------------------- procedure Set_Align (Object : in out Format; Value : in Alignment); |
︙ | ︙ |