From 82ff32711723ad10bd4e0190e2e65fdd853aa084 Mon Sep 17 00:00:00 2001 From: MyApaulogies Date: Tue, 17 Sep 2024 22:42:59 +0000 Subject: [PATCH] Use Ada 2022 @ syntax --- ...active_component-implementation-tester.adb | 4 +- ...nt-background_component-implementation.adb | 2 +- ...-data_product_component-implementation.adb | 2 +- ...mponent-event_component-implementation.adb | 2 +- ...onent-example_component-implementation.adb | 2 +- .../last_chance_handler.adb | 2 +- doc/example_architecture/main/main.adb | 2 +- ...ponent-packet_component-implementation.adb | 2 +- ...ent-parameter_component-implementation.adb | 2 +- ...queued_component-implementation-tester.adb | 4 +- ...queued_component-implementation-tester.adb | 4 +- .../spark_package/spark_package.adb | 2 +- .../spark_package_no_config/spark_package.adb | 2 +- gen/templates/array/name-validation.adb | 6 +-- gen/templates/component/component-name.adb | 4 +- gen/templates/packets/name_packets.adb | 8 +-- gen/templates/record/name.adb | 8 +-- .../component-name-implementation-tester.adb | 2 +- gen/templates/tests/name.adb | 2 +- ...t-generic_queued-implementation-tester.adb | 2 +- redo/test/spark_compile/spark_fail.adb | 2 +- redo/test/spark_compile/spark_test.adb | 2 +- ...ds_command_depacketizer-implementation.adb | 6 +-- ...mand_depacketizer_tests-implementation.adb | 2 +- .../ccsds_downsampler/apid_tree/apid_tree.adb | 10 ++-- .../ccsds_packetizer_tests-implementation.adb | 36 ++++++------- ...ent-ccsds_router-implementation-tester.adb | 2 +- ...ent-ccsds_router-implementation-tester.adb | 2 +- ...-ccsds_serial_interface-implementation.adb | 6 +-- ...serial_interface-implementation-tester.adb | 2 +- ...serial_interface-implementation-tester.adb | 2 +- ...socket_interface-implementation-tester.adb | 2 +- ...socket_interface-implementation-tester.adb | 2 +- ...sds_subpacket_extractor-implementation.adb | 4 +- ...bpacket_extractor_tests-implementation.adb | 12 ++--- ...packet_extractor-implementation-tester.adb | 2 +- .../command_protector/arm_state/arm_state.adb | 2 +- ...onent-command_protector-implementation.adb | 4 +- ...ponent-command_rejector-implementation.adb | 2 +- ...omponent-command_router-implementation.adb | 2 +- ...t-command_router-implementation-tester.adb | 6 +-- ...onent-command_sequencer-implementation.adb | 14 +++--- .../seq/decode/seq_config.adb | 10 ++-- .../seq/decode/seq_runtime-decoder.adb | 4 +- .../command_sequencer/seq/engine/seq.adb | 6 +-- .../seq/runtime/seq_runtime.adb | 8 +-- .../seq/simulator/seq_simulator.adb | 4 +- .../seq/test/seq_tests-implementation.adb | 2 +- ...command_sequencer_tests-implementation.adb | 4 +- ...ommand_sequencer-implementation-tester.adb | 8 +-- ...connector_queuer-implementation-tester.adb | 2 +- .../component-cpu_monitor-implementation.adb | 6 +-- .../event_filter_entry/event_filter_entry.adb | 4 +- ...component-event_limiter-implementation.adb | 6 +-- .../two_counter_entry/two_counter_entry.adb | 12 ++--- ...ponent-event_packetizer-implementation.adb | 10 ++-- .../event_packetizer_tests-implementation.adb | 50 +++++++++---------- ...vent_text_logger-implementation-tester.adb | 2 +- ...omponent-event_producer-implementation.adb | 2 +- ...ponent-fault_correction-implementation.adb | 6 +-- ...fault_correction-implementation-tester.adb | 4 +- .../test/tester_interrupt_handler.adb | 2 +- .../test/tester_interrupt_handler.adb | 2 +- ...omponent-limiter-implementation-tester.adb | 2 +- ...omponent-limiter-implementation-tester.adb | 2 +- .../test/logger_tests-implementation.adb | 20 ++++---- .../variable_tests-implementation.adb | 10 ++-- ...nt-memory_copier-implementation-tester.adb | 2 +- .../memory_copier_tests-implementation.adb | 4 +- ...nt-memory_dumper-implementation-tester.adb | 2 +- ...omponent-memory_manager-implementation.adb | 2 +- ...t-memory_manager-implementation-tester.adb | 2 +- ...onent-memory_packetizer-implementation.adb | 8 +-- ...emory_packetizer-implementation-tester.adb | 4 +- ...ory_packetizer_fixed_id-implementation.adb | 6 +-- ...ketizer_fixed_id-implementation-tester.adb | 4 +- ...t-memory_stuffer-implementation-tester.adb | 6 +-- ...-parameter_store-implementation-tester.adb | 4 +- ...onent-parameters-implementation-tester.adb | 4 +- ...omponent-pid_controller-implementation.adb | 4 +- .../pid_controller_tests-implementation.adb | 2 +- ...on_time_protocol_master-implementation.adb | 12 ++--- ..._protocol_master-implementation-tester.adb | 8 +-- .../test/tests-implementation.adb | 10 ++-- ...nent-product_packetizer-implementation.adb | 10 ++-- ...oduct_packetizer-implementation-tester.adb | 2 +- ...component-queue_monitor-implementation.adb | 6 +-- .../component-rate_group-implementation.adb | 6 +-- ...onent-rate_group-implementation-tester.adb | 4 +- ...omponent-sequence_store-implementation.adb | 2 +- ...t-sequence_store-implementation-tester.adb | 4 +- .../sequence_store_tests-implementation.adb | 22 ++++---- ...component-stack_monitor-implementation.adb | 12 ++--- ...component-task_watchdog-implementation.adb | 2 +- .../watchdog_list/watchdog_list.adb | 2 +- .../component-tick_divider-implementation.adb | 4 +- ...component-tick_listener-implementation.adb | 2 +- .../component-ticker-implementation.adb | 4 +- ...ent-time_at_tone_master-implementation.adb | 2 +- ...ent-time_of_tone_master-implementation.adb | 4 +- .../interrupt_handlers/interrupt_handlers.adb | 2 +- src/core/task/task_synchronization.adb | 2 +- .../binary_tree/binary_tree.adb | 4 +- .../circular_buffer/circular_buffer.adb | 12 ++--- .../circular_buffer/test_circular/test.adb | 4 +- src/data_structures/database/database.adb | 2 +- .../test/database_tests-implementation.adb | 2 +- ...variable_database_tests-implementation.adb | 36 ++++++------- src/data_structures/fifo/fifo.adb | 6 +-- src/data_structures/heap/heap.adb | 12 ++--- .../priority_queue/priority_queue.adb | 4 +- .../protected_variables.adb | 10 ++-- src/types/tick/tick_interrupt_handler.adb | 2 +- src/unit_test/history/history.adb | 2 +- .../string_util/Linux/string_util.adb | 2 +- src/unit_test/string_util/bb/string_util.adb | 6 +-- src/util/byte_array_util/byte_array_util.adb | 10 ++-- src/util/crc/checksum_16.adb | 4 +- src/util/crc/xor_8.adb | 2 +- src/util/monitor/monitor.adb | 4 +- src/util/moving_average/moving_average.adb | 12 ++--- src/util/socket/socket.adb | 2 +- 122 files changed, 345 insertions(+), 345 deletions(-) diff --git a/doc/example_architecture/active_component/test/component-active_component-implementation-tester.adb b/doc/example_architecture/active_component/test/component-active_component-implementation-tester.adb index 18eb3d48..ea051dea 100644 --- a/doc/example_architecture/active_component/test/component-active_component-implementation-tester.adb +++ b/doc/example_architecture/active_component/test/component-active_component-implementation-tester.adb @@ -71,7 +71,7 @@ package body Component.Active_Component.Implementation.Tester is if not Self.Expect_Packed_Byte_T_Send_Dropped then pragma Assert (False, "The component's queue filled up when Packed_Byte_T_Send was called!"); else - Self.Packed_Byte_T_Send_Dropped_Count := Self.Packed_Byte_T_Send_Dropped_Count + 1; + Self.Packed_Byte_T_Send_Dropped_Count := @ + 1; Self.Expect_Packed_Byte_T_Send_Dropped := False; end if; end Packed_Byte_T_Send_Dropped; @@ -83,7 +83,7 @@ package body Component.Active_Component.Implementation.Tester is if not Self.Expect_Packed_U16_T_Send_Dropped then pragma Assert (False, "The component's queue filled up when Packed_U16_T_Send was called!"); else - Self.Packed_U16_T_Send_Dropped_Count := Self.Packed_U16_T_Send_Dropped_Count + 1; + Self.Packed_U16_T_Send_Dropped_Count := @ + 1; Self.Expect_Packed_U16_T_Send_Dropped := False; end if; end Packed_U16_T_Send_Dropped; diff --git a/doc/example_architecture/background_component/component-background_component-implementation.adb b/doc/example_architecture/background_component/component-background_component-implementation.adb index 5790e0ed..1ea0cdf4 100644 --- a/doc/example_architecture/background_component/component-background_component-implementation.adb +++ b/doc/example_architecture/background_component/component-background_component-implementation.adb @@ -62,7 +62,7 @@ package body Component.Background_Component.Implementation is end; -- Calculate the next wake up time as 500ms after this wake up time. - Self.Wake_Up_Time := Self.Wake_Up_Time + Ada.Real_Time.Microseconds (500_000); + Self.Wake_Up_Time := @ + Ada.Real_Time.Microseconds (500_000); end Cycle; end Component.Background_Component.Implementation; diff --git a/doc/example_architecture/data_product_component/component-data_product_component-implementation.adb b/doc/example_architecture/data_product_component/component-data_product_component-implementation.adb index 28160b1a..a727eced 100644 --- a/doc/example_architecture/data_product_component/component-data_product_component-implementation.adb +++ b/doc/example_architecture/data_product_component/component-data_product_component-implementation.adb @@ -19,7 +19,7 @@ package body Component.Data_Product_Component.Implementation is Self.Data_Product_T_Send (Self.Data_Products.Last_Tick_Received (Timestamp, Arg)); -- Increment the count: - Self.Count := Self.Count + 1; + Self.Count := @ + 1; end Tick_T_Recv_Sync; end Component.Data_Product_Component.Implementation; diff --git a/doc/example_architecture/event_component/component-event_component-implementation.adb b/doc/example_architecture/event_component/component-event_component-implementation.adb index 7c4d04fd..1e27c1bc 100644 --- a/doc/example_architecture/event_component/component-event_component-implementation.adb +++ b/doc/example_architecture/event_component/component-event_component-implementation.adb @@ -27,7 +27,7 @@ package body Component.Event_Component.Implementation is Self.Event_T_Send (Self.Events.Tick_Received (Timestamp, Arg)); -- Increment the count: - Self.Count := Self.Count + 1; + Self.Count := @ + 1; end Tick_T_Recv_Sync; end Component.Event_Component.Implementation; diff --git a/doc/example_architecture/example_component/component-example_component-implementation.adb b/doc/example_architecture/example_component/component-example_component-implementation.adb index 05e41094..b3c1f09e 100644 --- a/doc/example_architecture/example_component/component-example_component-implementation.adb +++ b/doc/example_architecture/example_component/component-example_component-implementation.adb @@ -36,7 +36,7 @@ package body Component.Example_Component.Implementation is end loop; -- Increment counter: - Self.Counter := Self.Counter + 1; + Self.Counter := @ + 1; end Tick_T_Recv_Sync; end Component.Example_Component.Implementation; diff --git a/doc/example_architecture/last_chance_handler.adb b/doc/example_architecture/last_chance_handler.adb index 0cfd2d78..8a1b9c6a 100644 --- a/doc/example_architecture/last_chance_handler.adb +++ b/doc/example_architecture/last_chance_handler.adb @@ -17,7 +17,7 @@ package body Last_Chance_Handler is GNAT.IO.Put ("LCH called => "); while Peek (A) /= Ascii.Nul loop GNAT.IO.Put (Peek (A)); - A := A + 1; + A := @ + 1; end loop; GNAT.IO.Put (": "); GNAT.IO.Put (Line); -- avoid the secondary stack for Line'Image diff --git a/doc/example_architecture/main/main.adb b/doc/example_architecture/main/main.adb index 940dd53b..ba5b3f76 100644 --- a/doc/example_architecture/main/main.adb +++ b/doc/example_architecture/main/main.adb @@ -46,6 +46,6 @@ begin loop -- Wait for time: delay until Next_Time; - Next_Time := Next_Time + Wait_Time; + Next_Time := @ + Wait_Time; end loop; end Main; diff --git a/doc/example_architecture/packet_component/component-packet_component-implementation.adb b/doc/example_architecture/packet_component/component-packet_component-implementation.adb index a3ce066c..1ec79d9b 100644 --- a/doc/example_architecture/packet_component/component-packet_component-implementation.adb +++ b/doc/example_architecture/packet_component/component-packet_component-implementation.adb @@ -24,7 +24,7 @@ package body Component.Packet_Component.Implementation is Self.Packet_T_Send (Self.Packets.Last_Tick_Received (Timestamp, Arg)); -- Increment the count: - Self.Count := Self.Count + 1; + Self.Count := @ + 1; end Tick_T_Recv_Sync; end Component.Packet_Component.Implementation; diff --git a/doc/example_architecture/parameter_component/component-parameter_component-implementation.adb b/doc/example_architecture/parameter_component/component-parameter_component-implementation.adb index bde5a603..0bc60739 100644 --- a/doc/example_architecture/parameter_component/component-parameter_component-implementation.adb +++ b/doc/example_architecture/parameter_component/component-parameter_component-implementation.adb @@ -31,7 +31,7 @@ package body Component.Parameter_Component.Implementation is end if; -- Increment the count: - Self.Count := Self.Count + 1; + Self.Count := @ + 1; end Tick_T_Recv_Sync; -- This procedure is called when the parameters of a component have been updated. The default implementation of this diff --git a/doc/example_architecture/queued_component/test/component-queued_component-implementation-tester.adb b/doc/example_architecture/queued_component/test/component-queued_component-implementation-tester.adb index e98fac16..c1941a2b 100644 --- a/doc/example_architecture/queued_component/test/component-queued_component-implementation-tester.adb +++ b/doc/example_architecture/queued_component/test/component-queued_component-implementation-tester.adb @@ -72,7 +72,7 @@ package body Component.Queued_Component.Implementation.Tester is if not Self.Expect_Packed_Byte_T_Send_Dropped then pragma Assert (False, "The component's queue filled up when Packed_Byte_T_Send was called!"); else - Self.Packed_Byte_T_Send_Dropped_Count := Self.Packed_Byte_T_Send_Dropped_Count + 1; + Self.Packed_Byte_T_Send_Dropped_Count := @ + 1; Self.Expect_Packed_Byte_T_Send_Dropped := False; end if; end Packed_Byte_T_Send_Dropped; @@ -84,7 +84,7 @@ package body Component.Queued_Component.Implementation.Tester is if not Self.Expect_Packed_U16_T_Send_Dropped then pragma Assert (False, "The component's queue filled up when Packed_U16_T_Send was called!"); else - Self.Packed_U16_T_Send_Dropped_Count := Self.Packed_U16_T_Send_Dropped_Count + 1; + Self.Packed_U16_T_Send_Dropped_Count := @ + 1; Self.Expect_Packed_U16_T_Send_Dropped := False; end if; end Packed_U16_T_Send_Dropped; diff --git a/doc/example_architecture/queued_component/test2/component-queued_component-implementation-tester.adb b/doc/example_architecture/queued_component/test2/component-queued_component-implementation-tester.adb index e98fac16..c1941a2b 100644 --- a/doc/example_architecture/queued_component/test2/component-queued_component-implementation-tester.adb +++ b/doc/example_architecture/queued_component/test2/component-queued_component-implementation-tester.adb @@ -72,7 +72,7 @@ package body Component.Queued_Component.Implementation.Tester is if not Self.Expect_Packed_Byte_T_Send_Dropped then pragma Assert (False, "The component's queue filled up when Packed_Byte_T_Send was called!"); else - Self.Packed_Byte_T_Send_Dropped_Count := Self.Packed_Byte_T_Send_Dropped_Count + 1; + Self.Packed_Byte_T_Send_Dropped_Count := @ + 1; Self.Expect_Packed_Byte_T_Send_Dropped := False; end if; end Packed_Byte_T_Send_Dropped; @@ -84,7 +84,7 @@ package body Component.Queued_Component.Implementation.Tester is if not Self.Expect_Packed_U16_T_Send_Dropped then pragma Assert (False, "The component's queue filled up when Packed_U16_T_Send was called!"); else - Self.Packed_U16_T_Send_Dropped_Count := Self.Packed_U16_T_Send_Dropped_Count + 1; + Self.Packed_U16_T_Send_Dropped_Count := @ + 1; Self.Expect_Packed_U16_T_Send_Dropped := False; end if; end Packed_U16_T_Send_Dropped; diff --git a/doc/example_architecture/spark_package/spark_package.adb b/doc/example_architecture/spark_package/spark_package.adb index 627667a6..ad8a41dd 100644 --- a/doc/example_architecture/spark_package/spark_package.adb +++ b/doc/example_architecture/spark_package/spark_package.adb @@ -4,7 +4,7 @@ is procedure Increment (X : in out Integer) is begin - X := X + 1; + X := @ + 1; end Increment; end Spark_Package; diff --git a/doc/example_architecture/spark_package_no_config/spark_package.adb b/doc/example_architecture/spark_package_no_config/spark_package.adb index 627667a6..ad8a41dd 100644 --- a/doc/example_architecture/spark_package_no_config/spark_package.adb +++ b/doc/example_architecture/spark_package_no_config/spark_package.adb @@ -4,7 +4,7 @@ is procedure Increment (X : in out Integer) is begin - X := X + 1; + X := @ + 1; end Increment; end Spark_Package; diff --git a/gen/templates/array/name-validation.adb b/gen/templates/array/name-validation.adb index 969359f2..4a07e697 100644 --- a/gen/templates/array/name-validation.adb +++ b/gen/templates/array/name-validation.adb @@ -57,7 +57,7 @@ package body {{ name }}.Validation is end if; {% endif %} {% endif %} - Count := Count + 1; + Count := @ + 1; end loop; {% endif %} @@ -127,7 +127,7 @@ package body {{ name }}.Validation is end if; {% endif %} {% endif %} - Count := Count + 1; + Count := @ + 1; end loop; {% endif %} @@ -198,7 +198,7 @@ package body {{ name }}.Validation is end if; {% endif %} {% endif %} - Count := Count + 1; + Count := @ + 1; end loop; {% endif %} diff --git a/gen/templates/component/component-name.adb b/gen/templates/component/component-name.adb index 3bc30868..b799571a 100644 --- a/gen/templates/component/component-name.adb +++ b/gen/templates/component/component-name.adb @@ -328,7 +328,7 @@ package body Component.{{ name }} is if Base_Instance'Class (Self).Dispatch_Nonblock = False then return Elements_Dispatched; end if; - Elements_Dispatched := Elements_Dispatched + 1; + Elements_Dispatched := @ + 1; end loop; return Elements_Dispatched; end Dispatch_N; @@ -419,7 +419,7 @@ package body Component.{{ name }} is -- However, to be safe, let's just sleep for a short amount of time -- to give up the processor so we don't end up hogging the CPU if this is a high priority -- task. - Count := Count + 1; + Count := @ + 1; if Count > 5 then -- We are still in an error condition after trying many time, something is terribly -- wrong, drop the message. diff --git a/gen/templates/packets/name_packets.adb b/gen/templates/packets/name_packets.adb index 635d1fa7..235655d2 100644 --- a/gen/templates/packets/name_packets.adb +++ b/gen/templates/packets/name_packets.adb @@ -84,7 +84,7 @@ package body {{ name }} is -- Update the packet length and sequence count: Pkt.Header.Buffer_Length := Num_Bytes_Serialized; - Self.{{ p.name }}_Sequence_Count := Self.{{ p.name }}_Sequence_Count + 1; + Self.{{ p.name }}_Sequence_Count := @ + 1; return Stat; end {{ p.name }}; @@ -122,7 +122,7 @@ package body {{ name }} is Num_Bytes_Copied : constant Natural := Safe_Left_Copy (P.Buffer, Overlay); begin P.Header.Buffer_Length := Num_Bytes_Copied; - Self.{{ p.name }}_Sequence_Count := Self.{{ p.name }}_Sequence_Count + 1; + Self.{{ p.name }}_Sequence_Count := @ + 1; end; return P; @@ -145,7 +145,7 @@ package body {{ name }} is ); begin P.Buffer (P.Buffer'First .. P.Buffer'First + Packet_Serializer.Serialized_Length - 1) := Packet_Serializer.To_Byte_Array (Item); - Self.{{ p.name }}_Sequence_Count := Self.{{ p.name }}_Sequence_Count + 1; + Self.{{ p.name }}_Sequence_Count := @ + 1; return P; end {{ p.name }}; {% endif %} @@ -192,7 +192,7 @@ package body {{ name }} is ); begin -- Increment the sequence count: - Self.{{ p.name }}_Sequence_Count := Self.{{ p.name }}_Sequence_Count + 1; + Self.{{ p.name }}_Sequence_Count := @ + 1; return P; end {{ p.name }}_Empty; {% endif %} diff --git a/gen/templates/record/name.adb b/gen/templates/record/name.adb index ef74f412..123dc6ec 100644 --- a/gen/templates/record/name.adb +++ b/gen/templates/record/name.adb @@ -113,7 +113,7 @@ package body {{ name }} is -- Size of variable sized field "{{ field.name }}": Length := (Integer (Src.{{ field.variable_length }}) + Integer ({{ field.variable_length_offset }})) * {{ field.name }}_Unit_Length; if Length > 0 then - Size_In_Bytes_To_Return := Size_In_Bytes_To_Return + Length; + Size_In_Bytes_To_Return := @ + Length; end if; {% else %} -- Add size of packed type for field "{{ field.name }}": @@ -121,7 +121,7 @@ package body {{ name }} is Num_Bytes_Serialized := Size_In_Bytes_To_Return; return Failure; end if; - Size_In_Bytes_To_Return := Size_In_Bytes_To_Return + Length; + Size_In_Bytes_To_Return := @ + Length; {% endif %} {% endfor %} @@ -189,7 +189,7 @@ package body {{ name }} is -- Size of variable sized field "{{ field.name }}": Length := (Integer (Src.{{ field.variable_length }}) + Integer ({{ field.variable_length_offset }})) * {{ field.name }}_Unit_Length; if Length > 0 then - Size_In_Bytes_To_Return := Size_In_Bytes_To_Return + Length; + Size_In_Bytes_To_Return := @ + Length; end if; {% else %} -- Add size of packed type for field "{{ field.name }}": @@ -197,7 +197,7 @@ package body {{ name }} is Num_Bytes_Serialized := Size_In_Bytes_To_Return; return Failure; end if; - Size_In_Bytes_To_Return := Size_In_Bytes_To_Return + Length; + Size_In_Bytes_To_Return := @ + Length; {% endif %} {% endfor %} diff --git a/gen/templates/tests/component-name-implementation-tester.adb b/gen/templates/tests/component-name-implementation-tester.adb index 4041e75c..c4110810 100644 --- a/gen/templates/tests/component-name-implementation-tester.adb +++ b/gen/templates/tests/component-name-implementation-tester.adb @@ -312,7 +312,7 @@ package body Component.{{ name }}.Implementation.Tester is pragma Assert (False, "The component's queue filled up when {{ connector.tester_name }} was called!"); {% endif %} else - Self.{{ connector.tester_name }}_Dropped_Count := Self.{{ connector.tester_name }}_Dropped_Count + 1; + Self.{{ connector.tester_name }}_Dropped_Count := @ + 1; Self.Expect_{{ connector.tester_name }}_Dropped := False; end if; end {{ connector.tester_name }}_Dropped; diff --git a/gen/templates/tests/name.adb b/gen/templates/tests/name.adb index 0a44354b..c8b080a6 100644 --- a/gen/templates/tests/name.adb +++ b/gen/templates/tests/name.adb @@ -87,7 +87,7 @@ package body {{ name }} is Self.Log (" Finishing Tear_Down for test " & Closing_Test); Self.End_Logging (Closing_Test); -- Increment counter for the next test name in the list and pass the log to close back up to the tear down (or component unit test) - Self.Test_Name_Index := Self.Test_Name_Index + 1; + Self.Test_Name_Index := @ + 1; {% if component and not component.generic %} -- Delete tester: Free_Tester (Self.Tester); diff --git a/gen/test/generic_queued/test/component-generic_queued-implementation-tester.adb b/gen/test/generic_queued/test/component-generic_queued-implementation-tester.adb index 18aa441c..c012bd7e 100644 --- a/gen/test/generic_queued/test/component-generic_queued-implementation-tester.adb +++ b/gen/test/generic_queued/test/component-generic_queued-implementation-tester.adb @@ -53,7 +53,7 @@ package body Component.Generic_Queued.Implementation.Tester is if not Self.Expect_Generic_Type_2_Send_Dropped then pragma Assert (False, "The component's queue filled up when Generic_Type_2_Send was called!"); else - Self.Generic_Type_2_Send_Dropped_Count := Self.Generic_Type_2_Send_Dropped_Count + 1; + Self.Generic_Type_2_Send_Dropped_Count := @ + 1; Self.Expect_Generic_Type_2_Send_Dropped := False; end if; end Generic_Type_2_Send_Dropped; diff --git a/redo/test/spark_compile/spark_fail.adb b/redo/test/spark_compile/spark_fail.adb index 03da2c17..3d25863c 100644 --- a/redo/test/spark_compile/spark_fail.adb +++ b/redo/test/spark_compile/spark_fail.adb @@ -6,7 +6,7 @@ is procedure Increment (X : in out Integer) is begin - X := X + 1 + Depends.Global_Var; + X := @ + 1 + Depends.Global_Var; end Increment; end Spark_Fail; diff --git a/redo/test/spark_compile/spark_test.adb b/redo/test/spark_compile/spark_test.adb index 6c6cba60..70dd0b05 100644 --- a/redo/test/spark_compile/spark_test.adb +++ b/redo/test/spark_compile/spark_test.adb @@ -5,7 +5,7 @@ is procedure Increment (X : in out Integer) is begin - X := X + 1; + X := @ + 1; end Increment; end Spark_Test; diff --git a/src/components/ccsds_command_depacketizer/component-ccsds_command_depacketizer-implementation.adb b/src/components/ccsds_command_depacketizer/component-ccsds_command_depacketizer-implementation.adb index 01ae58cd..b3e85274 100644 --- a/src/components/ccsds_command_depacketizer/component-ccsds_command_depacketizer-implementation.adb +++ b/src/components/ccsds_command_depacketizer/component-ccsds_command_depacketizer-implementation.adb @@ -74,7 +74,7 @@ package body Component.Ccsds_Command_Depacketizer.Implementation is -- First check the checksum. If the checksum is not zero, then it is invalid, since the checksum within -- the packet itself should zero out the rest of the computed checksum. Checksum := Xor_8.Compute_Xor_8 (Ccsds_Primary_Header.Serialization.To_Byte_Array (Arg.Header)); -- checksum header - Checksum := Xor_8.Compute_Xor_8 (Arg.Data (Arg.Data'First .. Arg.Data'First + Data_Length - 1), Checksum); -- checksum data + Checksum := Xor_8.Compute_Xor_8 (Arg.Data (Arg.Data'First .. Arg.Data'First + Data_Length - 1), @); -- checksum data if Checksum /= 0 then Self.Drop_Packet (Arg, Self.Events.Invalid_Packet_Checksum (Self.Sys_Time_T_Get, ( Ccsds_Header => ( @@ -111,14 +111,14 @@ package body Component.Ccsds_Command_Depacketizer.Implementation is else -- We don't need anything else out of the secondary header, unless an error -- occurs, so just skip right over it. - Next_Index := Next_Index + Ccsds_Command_Secondary_Header_Length; + Next_Index := @ + Ccsds_Command_Secondary_Header_Length; -- Set the command header arg buffer length: The_Command.Header.Arg_Buffer_Length := Argument_Data_Length; -- Extract command id: The_Command.Header.Id := Command_Id.Serialization.From_Byte_Array (Arg.Data (Next_Index .. Next_Index + Command_Id_Length - 1)).Id; - Next_Index := Next_Index + Command_Id_Length; + Next_Index := @ + Command_Id_Length; -- Copy argument buffer: The_Command.Arg_Buffer (The_Command.Arg_Buffer'First .. The_Command.Arg_Buffer'First + Argument_Data_Length - 1) := Arg.Data (Next_Index .. Next_Index + Argument_Data_Length - 1); diff --git a/src/components/ccsds_command_depacketizer/test/ccsds_command_depacketizer_tests-implementation.adb b/src/components/ccsds_command_depacketizer/test/ccsds_command_depacketizer_tests-implementation.adb index dfc2b7c7..e5204eac 100644 --- a/src/components/ccsds_command_depacketizer/test/ccsds_command_depacketizer_tests-implementation.adb +++ b/src/components/ccsds_command_depacketizer/test/ccsds_command_depacketizer_tests-implementation.adb @@ -67,7 +67,7 @@ package body Ccsds_Command_Depacketizer_Tests.Implementation is Packet : Ccsds_Space_Packet.T := Construct_Packet (Ccsds_Command_Secondary_Header.Serialization.To_Byte_Array (The_Secondary_Header) & Command_Id.Serialization.To_Byte_Array ((Id => Cmd_Id)) & Data & (1 .. Natural (Function_Code) => 0), Packet_Type, Secondary_Header, Apid, Sequence_Count); begin -- Adjust packet length if requested: - Packet.Header.Packet_Length := Unsigned_16 (Natural (Packet.Header.Packet_Length) + Packet_Length_Adjustment); + Packet.Header.Packet_Length := Unsigned_16 (Natural (@) + Packet_Length_Adjustment); declare -- Get packet header bytes: Header_Bytes : constant Byte_Array := Ccsds_Primary_Header.Serialization.To_Byte_Array (Packet.Header); diff --git a/src/components/ccsds_downsampler/apid_tree/apid_tree.adb b/src/components/ccsds_downsampler/apid_tree/apid_tree.adb index 684fea13..bcc3c019 100644 --- a/src/components/ccsds_downsampler/apid_tree/apid_tree.adb +++ b/src/components/ccsds_downsampler/apid_tree/apid_tree.adb @@ -43,7 +43,7 @@ package body Apid_Tree is -- If we couldn't find the packet, then increment the pass count and move on when False => -- Update the counter and return the status - Self.Num_Passed_Packets := Self.Num_Passed_Packets + 1; + Self.Num_Passed_Packets := @ + 1; Count := Self.Num_Passed_Packets; Return_Status := Invalid_Id; when True => @@ -52,24 +52,24 @@ package body Apid_Tree is -- When the factor is set to 0, we dont pass anything along. when 0 => -- Update counter - Self.Num_Filtered_Packets := Self.Num_Filtered_Packets + 1; + Self.Num_Filtered_Packets := @ + 1; Return_Status := Filter; Count := Self.Num_Filtered_Packets; -- Use the filter factor value for all other values to determine if it needs to be filtered or not when others => if (Fetched_Entry.Filter_Count mod Fetched_Entry.Filter_Factor) = 0 then - Self.Num_Passed_Packets := Self.Num_Passed_Packets + 1; + Self.Num_Passed_Packets := @ + 1; Return_Status := Pass; Count := Self.Num_Passed_Packets; else -- Filtered here - Self.Num_Filtered_Packets := Self.Num_Filtered_Packets + 1; + Self.Num_Filtered_Packets := @ + 1; Return_Status := Filter; Count := Self.Num_Filtered_Packets; end if; end case; -- If we found the entry in the tree, then make sure we update with the new count for that entry - Fetched_Entry.Filter_Count := Fetched_Entry.Filter_Count + 1; + Fetched_Entry.Filter_Count := @ + 1; Self.Downsample_Entry.Set (Tree_Index, Fetched_Entry); end case; diff --git a/src/components/ccsds_packetizer/test/ccsds_packetizer_tests-implementation.adb b/src/components/ccsds_packetizer/test/ccsds_packetizer_tests-implementation.adb index c7d425f6..180f3594 100644 --- a/src/components/ccsds_packetizer/test/ccsds_packetizer_tests-implementation.adb +++ b/src/components/ccsds_packetizer/test/ccsds_packetizer_tests-implementation.adb @@ -88,26 +88,26 @@ package body Ccsds_Packetizer_Tests.Implementation is P : Packet.T := (Header => (Time => (10, 55), Id => 77, Sequence_Count => 99, Buffer_Length => 5), Buffer => [1, 2, 3, 4, 5, others => 0]); begin -- Send a few packets: - P.Header.Sequence_Count := P.Header.Sequence_Count + 1; + P.Header.Sequence_Count := @ + 1; T.Packet_T_Send (P); Natural_Assert.Eq (T.Ccsds_Space_Packet_T_Recv_Sync_History.Get_Count, 1); - P.Header.Sequence_Count := P.Header.Sequence_Count + 1; + P.Header.Sequence_Count := @ + 1; T.Packet_T_Send (P); Natural_Assert.Eq (T.Ccsds_Space_Packet_T_Recv_Sync_History.Get_Count, 2); - P.Header.Sequence_Count := P.Header.Sequence_Count + 1; + P.Header.Sequence_Count := @ + 1; T.Packet_T_Send (P); Natural_Assert.Eq (T.Ccsds_Space_Packet_T_Recv_Sync_History.Get_Count, 3); - P.Header.Sequence_Count := P.Header.Sequence_Count + 1; + P.Header.Sequence_Count := @ + 1; T.Packet_T_Send (P); Natural_Assert.Eq (T.Ccsds_Space_Packet_T_Recv_Sync_History.Get_Count, 4); - P.Header.Sequence_Count := P.Header.Sequence_Count + 1; + P.Header.Sequence_Count := @ + 1; T.Packet_T_Send (P); Natural_Assert.Eq (T.Ccsds_Space_Packet_T_Recv_Sync_History.Get_Count, 5); -- Check packet contents: P.Header.Sequence_Count := 99; for Idx in 1 .. 5 loop - P.Header.Sequence_Count := P.Header.Sequence_Count + 1; + P.Header.Sequence_Count := @ + 1; Check_Packet (P, T.Ccsds_Space_Packet_T_Recv_Sync_History.Get (Idx)); end loop; end Test_Nominal_Packetization; @@ -120,26 +120,26 @@ package body Ccsds_Packetizer_Tests.Implementation is Buffer => [0 => 1, 1 => 2, 2 => 3, 3 => 4, 4 => 5, 5 .. Packet_Types.Packet_Buffer_Type'Last - 1 => 22, Packet_Types.Packet_Buffer_Type'Last => 9]); begin -- Send a few packets: - P.Header.Sequence_Count := P.Header.Sequence_Count + 1; + P.Header.Sequence_Count := @ + 1; T.Packet_T_Send (P); Natural_Assert.Eq (T.Ccsds_Space_Packet_T_Recv_Sync_History.Get_Count, 1); - P.Header.Sequence_Count := P.Header.Sequence_Count + 1; + P.Header.Sequence_Count := @ + 1; T.Packet_T_Send (P); Natural_Assert.Eq (T.Ccsds_Space_Packet_T_Recv_Sync_History.Get_Count, 2); - P.Header.Sequence_Count := P.Header.Sequence_Count + 1; + P.Header.Sequence_Count := @ + 1; T.Packet_T_Send (P); Natural_Assert.Eq (T.Ccsds_Space_Packet_T_Recv_Sync_History.Get_Count, 3); - P.Header.Sequence_Count := P.Header.Sequence_Count + 1; + P.Header.Sequence_Count := @ + 1; T.Packet_T_Send (P); Natural_Assert.Eq (T.Ccsds_Space_Packet_T_Recv_Sync_History.Get_Count, 4); - P.Header.Sequence_Count := P.Header.Sequence_Count + 1; + P.Header.Sequence_Count := @ + 1; T.Packet_T_Send (P); Natural_Assert.Eq (T.Ccsds_Space_Packet_T_Recv_Sync_History.Get_Count, 5); -- Check packet contents: P.Header.Sequence_Count := 13; for Idx in 1 .. 5 loop - P.Header.Sequence_Count := P.Header.Sequence_Count + 1; + P.Header.Sequence_Count := @ + 1; Check_Packet (P, T.Ccsds_Space_Packet_T_Recv_Sync_History.Get (Idx)); end loop; end Test_Max_Size_Packetization; @@ -150,26 +150,26 @@ package body Ccsds_Packetizer_Tests.Implementation is P : Packet.T := (Header => (Time => (10, 55), Id => 13, Sequence_Count => 77, Buffer_Length => 0), Buffer => [0 => 1, 1 => 2, 2 => 3, 3 => 4, 4 => 5, 5 .. Packet_Types.Packet_Buffer_Type'Last - 1 => 22, Packet_Types.Packet_Buffer_Type'Last => 9]); begin -- Send a few packets: - P.Header.Sequence_Count := P.Header.Sequence_Count + 1; + P.Header.Sequence_Count := @ + 1; T.Packet_T_Send (P); Natural_Assert.Eq (T.Ccsds_Space_Packet_T_Recv_Sync_History.Get_Count, 1); - P.Header.Sequence_Count := P.Header.Sequence_Count + 1; + P.Header.Sequence_Count := @ + 1; T.Packet_T_Send (P); Natural_Assert.Eq (T.Ccsds_Space_Packet_T_Recv_Sync_History.Get_Count, 2); - P.Header.Sequence_Count := P.Header.Sequence_Count + 1; + P.Header.Sequence_Count := @ + 1; T.Packet_T_Send (P); Natural_Assert.Eq (T.Ccsds_Space_Packet_T_Recv_Sync_History.Get_Count, 3); - P.Header.Sequence_Count := P.Header.Sequence_Count + 1; + P.Header.Sequence_Count := @ + 1; T.Packet_T_Send (P); Natural_Assert.Eq (T.Ccsds_Space_Packet_T_Recv_Sync_History.Get_Count, 4); - P.Header.Sequence_Count := P.Header.Sequence_Count + 1; + P.Header.Sequence_Count := @ + 1; T.Packet_T_Send (P); Natural_Assert.Eq (T.Ccsds_Space_Packet_T_Recv_Sync_History.Get_Count, 5); -- Check packet contents: P.Header.Sequence_Count := 77; for Idx in 1 .. 5 loop - P.Header.Sequence_Count := P.Header.Sequence_Count + 1; + P.Header.Sequence_Count := @ + 1; Check_Packet (P, T.Ccsds_Space_Packet_T_Recv_Sync_History.Get (Idx)); end loop; end Test_Min_Size_Packetization; diff --git a/src/components/ccsds_router/test/component-ccsds_router-implementation-tester.adb b/src/components/ccsds_router/test/component-ccsds_router-implementation-tester.adb index 2743c392..7ad77d83 100644 --- a/src/components/ccsds_router/test/component-ccsds_router-implementation-tester.adb +++ b/src/components/ccsds_router/test/component-ccsds_router-implementation-tester.adb @@ -196,7 +196,7 @@ package body Component.Ccsds_Router.Implementation.Tester is if not Self.Expect_Ccsds_Space_Packet_T_Send_2_Dropped then pragma Assert (False, "The component's queue filled up when Ccsds_Space_Packet_T_Send_2 was called!"); else - Self.Ccsds_Space_Packet_T_Send_2_Dropped_Count := Self.Ccsds_Space_Packet_T_Send_2_Dropped_Count + 1; + Self.Ccsds_Space_Packet_T_Send_2_Dropped_Count := @ + 1; Self.Expect_Ccsds_Space_Packet_T_Send_2_Dropped := False; end if; end Ccsds_Space_Packet_T_Send_2_Dropped; diff --git a/src/components/ccsds_router/test_unrecognized_apid/component-ccsds_router-implementation-tester.adb b/src/components/ccsds_router/test_unrecognized_apid/component-ccsds_router-implementation-tester.adb index 51b15c2d..891435e5 100644 --- a/src/components/ccsds_router/test_unrecognized_apid/component-ccsds_router-implementation-tester.adb +++ b/src/components/ccsds_router/test_unrecognized_apid/component-ccsds_router-implementation-tester.adb @@ -194,7 +194,7 @@ package body Component.Ccsds_Router.Implementation.Tester is if not Self.Expect_Ccsds_Space_Packet_T_Send_2_Dropped then pragma Assert (False, "The component's queue filled up when Ccsds_Space_Packet_T_Send_2 was called!"); else - Self.Ccsds_Space_Packet_T_Send_2_Dropped_Count := Self.Ccsds_Space_Packet_T_Send_2_Dropped_Count + 1; + Self.Ccsds_Space_Packet_T_Send_2_Dropped_Count := @ + 1; Self.Expect_Ccsds_Space_Packet_T_Send_2_Dropped := False; end if; end Ccsds_Space_Packet_T_Send_2_Dropped; diff --git a/src/components/ccsds_serial_interface/component-ccsds_serial_interface-implementation.adb b/src/components/ccsds_serial_interface/component-ccsds_serial_interface-implementation.adb index 7513142d..a81078f3 100644 --- a/src/components/ccsds_serial_interface/component-ccsds_serial_interface-implementation.adb +++ b/src/components/ccsds_serial_interface/component-ccsds_serial_interface-implementation.adb @@ -38,7 +38,7 @@ package body Component.Ccsds_Serial_Interface.Implementation is Num_Bytes_Serialized : Natural; Stat : Serialization_Status; begin - Self.Count := Self.Count + 1; + Self.Count := @ + 1; if Self.Count > 200 then -- Measure execution time of listener task. This is important because the execution percentage of this task, @@ -100,7 +100,7 @@ package body Component.Ccsds_Serial_Interface.Implementation is -- Check against the sync pattern: if A_Byte = Sync_Pattern (Count) then - Count := Count + 1; + Count := @ + 1; elsif A_Byte = Sync_Pattern (Sync_Pattern'First) then Count := Sync_Pattern'First + 1; else @@ -108,7 +108,7 @@ package body Component.Ccsds_Serial_Interface.Implementation is end if; -- Increment bytes without sync and send out an event with every 20 bytes: - Bytes_Without_Sync := Bytes_Without_Sync + 1; + Bytes_Without_Sync := @ + 1; if (Bytes_Without_Sync mod 20) = 0 then Self.Event_T_Send_If_Connected (Self.Events.Have_Not_Seen_Sync_Pattern (Self.Sys_Time_T_Get, (Value => Bytes_Without_Sync))); end if; diff --git a/src/components/ccsds_serial_interface/test_read/component-ccsds_serial_interface-implementation-tester.adb b/src/components/ccsds_serial_interface/test_read/component-ccsds_serial_interface-implementation-tester.adb index 63b6352e..d6946b72 100644 --- a/src/components/ccsds_serial_interface/test_read/component-ccsds_serial_interface-implementation-tester.adb +++ b/src/components/ccsds_serial_interface/test_read/component-ccsds_serial_interface-implementation-tester.adb @@ -92,7 +92,7 @@ package body Component.Ccsds_Serial_Interface.Implementation.Tester is if not Self.Expect_Ccsds_Space_Packet_T_Send_Dropped then pragma Assert (False, "The component's queue filled up when Ccsds_Space_Packet_T_Send was called!"); else - Self.Ccsds_Space_Packet_T_Send_Dropped_Count := Self.Ccsds_Space_Packet_T_Send_Dropped_Count + 1; + Self.Ccsds_Space_Packet_T_Send_Dropped_Count := @ + 1; Self.Expect_Ccsds_Space_Packet_T_Send_Dropped := False; end if; end Ccsds_Space_Packet_T_Send_Dropped; diff --git a/src/components/ccsds_serial_interface/test_write/component-ccsds_serial_interface-implementation-tester.adb b/src/components/ccsds_serial_interface/test_write/component-ccsds_serial_interface-implementation-tester.adb index 63b6352e..d6946b72 100644 --- a/src/components/ccsds_serial_interface/test_write/component-ccsds_serial_interface-implementation-tester.adb +++ b/src/components/ccsds_serial_interface/test_write/component-ccsds_serial_interface-implementation-tester.adb @@ -92,7 +92,7 @@ package body Component.Ccsds_Serial_Interface.Implementation.Tester is if not Self.Expect_Ccsds_Space_Packet_T_Send_Dropped then pragma Assert (False, "The component's queue filled up when Ccsds_Space_Packet_T_Send was called!"); else - Self.Ccsds_Space_Packet_T_Send_Dropped_Count := Self.Ccsds_Space_Packet_T_Send_Dropped_Count + 1; + Self.Ccsds_Space_Packet_T_Send_Dropped_Count := @ + 1; Self.Expect_Ccsds_Space_Packet_T_Send_Dropped := False; end if; end Ccsds_Space_Packet_T_Send_Dropped; diff --git a/src/components/ccsds_socket_interface/test_read/component-ccsds_socket_interface-implementation-tester.adb b/src/components/ccsds_socket_interface/test_read/component-ccsds_socket_interface-implementation-tester.adb index cf198a49..85338315 100644 --- a/src/components/ccsds_socket_interface/test_read/component-ccsds_socket_interface-implementation-tester.adb +++ b/src/components/ccsds_socket_interface/test_read/component-ccsds_socket_interface-implementation-tester.adb @@ -94,7 +94,7 @@ package body Component.Ccsds_Socket_Interface.Implementation.Tester is if not Self.Expect_Ccsds_Space_Packet_T_Send_Dropped then pragma Assert (False, "The component's queue filled up when Ccsds_Space_Packet_T_Send was called!"); else - Self.Ccsds_Space_Packet_T_Send_Dropped_Count := Self.Ccsds_Space_Packet_T_Send_Dropped_Count + 1; + Self.Ccsds_Space_Packet_T_Send_Dropped_Count := @ + 1; Self.Expect_Ccsds_Space_Packet_T_Send_Dropped := False; end if; end Ccsds_Space_Packet_T_Send_Dropped; diff --git a/src/components/ccsds_socket_interface/test_write/component-ccsds_socket_interface-implementation-tester.adb b/src/components/ccsds_socket_interface/test_write/component-ccsds_socket_interface-implementation-tester.adb index 47331790..dfc02d13 100644 --- a/src/components/ccsds_socket_interface/test_write/component-ccsds_socket_interface-implementation-tester.adb +++ b/src/components/ccsds_socket_interface/test_write/component-ccsds_socket_interface-implementation-tester.adb @@ -93,7 +93,7 @@ package body Component.Ccsds_Socket_Interface.Implementation.Tester is if not Self.Expect_Ccsds_Space_Packet_T_Send_Dropped then pragma Assert (False, "The component's queue filled up when Ccsds_Space_Packet_T_Send was called!"); else - Self.Ccsds_Space_Packet_T_Send_Dropped_Count := Self.Ccsds_Space_Packet_T_Send_Dropped_Count + 1; + Self.Ccsds_Space_Packet_T_Send_Dropped_Count := @ + 1; Self.Expect_Ccsds_Space_Packet_T_Send_Dropped := False; end if; end Ccsds_Space_Packet_T_Send_Dropped; diff --git a/src/components/ccsds_subpacket_extractor/component-ccsds_subpacket_extractor-implementation.adb b/src/components/ccsds_subpacket_extractor/component-ccsds_subpacket_extractor-implementation.adb index e05c17a7..9f376f23 100644 --- a/src/components/ccsds_subpacket_extractor/component-ccsds_subpacket_extractor-implementation.adb +++ b/src/components/ccsds_subpacket_extractor/component-ccsds_subpacket_extractor-implementation.adb @@ -76,13 +76,13 @@ package body Component.Ccsds_Subpacket_Extractor.Implementation is if Stat = Success then -- Send out subpacket: Self.Ccsds_Space_Packet_T_Send (Subpacket); - Idx := Idx + Num_Bytes_Deserialized; + Idx := @ + Num_Bytes_Deserialized; -- If the maximum number of packets is set positive, then we want to limit the number of packets extracted. -- If we have reached this limit, then stop extraction. If the max limit is negative, then we don't limit the -- number of packets extracted at all. if Self.Max_Subpackets_To_Extract > 0 then - Num_Subpackets_Sent := Num_Subpackets_Sent + 1; + Num_Subpackets_Sent := @ + 1; if Num_Subpackets_Sent >= Self.Max_Subpackets_To_Extract then exit; end if; diff --git a/src/components/ccsds_subpacket_extractor/test/ccsds_subpacket_extractor_tests-implementation.adb b/src/components/ccsds_subpacket_extractor/test/ccsds_subpacket_extractor_tests-implementation.adb index ab2f999e..41c293e6 100644 --- a/src/components/ccsds_subpacket_extractor/test/ccsds_subpacket_extractor_tests-implementation.adb +++ b/src/components/ccsds_subpacket_extractor/test/ccsds_subpacket_extractor_tests-implementation.adb @@ -50,7 +50,7 @@ package body Ccsds_Subpacket_Extractor_Tests.Implementation is for Packet of Packet_Array loop Stat := Ccsds_Space_Packet.Serialization.To_Byte_Array (To_Return.Data (Idx .. Last_Index), Packet, Num_Bytes_Serialized); pragma Assert (Stat = Success, "Failed to serialize CCSDS inside of another CCSDS"); - Idx := Idx + Num_Bytes_Serialized; + Idx := @ + Num_Bytes_Serialized; end loop; To_Return.Header.Packet_Length := Unsigned_16 (Idx) + Unsigned_16 (Stop_Offset) - 1; return To_Return; @@ -284,7 +284,7 @@ package body Ccsds_Subpacket_Extractor_Tests.Implementation is -- Send over the sync connector first: Packet := Create_Packet ([0 => Packet_1, 1 => Packet_3]); -- Override packet header to make it too small: - Packet.Header.Packet_Length := Packet.Header.Packet_Length - 1; + Packet.Header.Packet_Length := @ - 1; T.Ccsds_Space_Packet_T_Send (Packet); -- Expect event to be thrown and the last packet not extracted. @@ -307,7 +307,7 @@ package body Ccsds_Subpacket_Extractor_Tests.Implementation is -- Send over the sync connector first: Packet := Create_Packet ([0 => Packet_2]); -- Override packet header to make it way too small: - Packet.Header.Packet_Length := Packet.Header.Packet_Length - Unsigned_16 (Ccsds_Primary_Header.Size_In_Bytes); + Packet.Header.Packet_Length := @ - Unsigned_16 (Ccsds_Primary_Header.Size_In_Bytes); T.Ccsds_Space_Packet_T_Send_2 (Packet); Natural_Assert.Eq (Self.Tester.Dispatch_All, 1); @@ -335,7 +335,7 @@ package body Ccsds_Subpacket_Extractor_Tests.Implementation is -- Send over the sync connector first: Packet := Create_Packet ([0 => Packet_1, 1 => Packet_3]); -- Override packet header to make it too large by a little: - Packet.Header.Packet_Length := Packet.Header.Packet_Length + 1; + Packet.Header.Packet_Length := @ + 1; T.Ccsds_Space_Packet_T_Send (Packet); -- Expect 2 packets to be extracted correctly: @@ -355,7 +355,7 @@ package body Ccsds_Subpacket_Extractor_Tests.Implementation is Packet := Create_Packet ([0 => Packet_3]); -- Override packet header to make it too large by a lot: Packet.Data (Natural (Packet.Header.Packet_Length) + 1 .. Packet.Data'Last) := [others => 99]; - Packet.Header.Packet_Length := Packet.Header.Packet_Length + Unsigned_16 (Ccsds_Primary_Header.Size_In_Bytes); + Packet.Header.Packet_Length := @ + Unsigned_16 (Ccsds_Primary_Header.Size_In_Bytes); T.Ccsds_Space_Packet_T_Send_2 (Packet); Natural_Assert.Eq (Self.Tester.Dispatch_All, 1); @@ -445,7 +445,7 @@ package body Ccsds_Subpacket_Extractor_Tests.Implementation is -- Send over the sync connector first: Packet := Create_Packet ([0 => Packet_1, 1 => Packet_3], Start_Offset => 4, Stop_Offset => 6); -- Override packet header to make it too large by a little: - Packet.Header.Packet_Length := Packet.Header.Packet_Length + 1; + Packet.Header.Packet_Length := @ + 1; T.Ccsds_Space_Packet_T_Send (Packet); -- Expect 2 packets to be extracted correctly: diff --git a/src/components/ccsds_subpacket_extractor/test/component-ccsds_subpacket_extractor-implementation-tester.adb b/src/components/ccsds_subpacket_extractor/test/component-ccsds_subpacket_extractor-implementation-tester.adb index 2661e9c4..5ef92907 100644 --- a/src/components/ccsds_subpacket_extractor/test/component-ccsds_subpacket_extractor-implementation-tester.adb +++ b/src/components/ccsds_subpacket_extractor/test/component-ccsds_subpacket_extractor-implementation-tester.adb @@ -111,7 +111,7 @@ package body Component.Ccsds_Subpacket_Extractor.Implementation.Tester is if not Self.Expect_Ccsds_Space_Packet_T_Send_2_Dropped then pragma Assert (False, "The component's queue filled up when Ccsds_Space_Packet_T_Send_2 was called!"); else - Self.Ccsds_Space_Packet_T_Send_2_Dropped_Count := Self.Ccsds_Space_Packet_T_Send_2_Dropped_Count + 1; + Self.Ccsds_Space_Packet_T_Send_2_Dropped_Count := @ + 1; Self.Expect_Ccsds_Space_Packet_T_Send_2_Dropped := False; end if; end Ccsds_Space_Packet_T_Send_2_Dropped; diff --git a/src/components/command_protector/arm_state/arm_state.adb b/src/components/command_protector/arm_state/arm_state.adb index f095be42..77ef5514 100644 --- a/src/components/command_protector/arm_state/arm_state.adb +++ b/src/components/command_protector/arm_state/arm_state.adb @@ -48,7 +48,7 @@ package body Arm_State is -- If timeout is positive, then decrement it. if Timeout > Arm_Timeout_Type'First then -- Decrement: - Timeout := Timeout - 1; + Timeout := @ - 1; -- If timeout is now equal to zero, then we have -- timed out. diff --git a/src/components/command_protector/component-command_protector-implementation.adb b/src/components/command_protector/component-command_protector-implementation.adb index 626ca252..00ff52b6 100644 --- a/src/components/command_protector/component-command_protector-implementation.adb +++ b/src/components/command_protector/component-command_protector-implementation.adb @@ -131,7 +131,7 @@ package body Component.Command_Protector.Implementation is -- If this is a protected command, we need to increment a counter for telemetry. if Is_Protected_Command then - Self.Protected_Command_Forward_Count := Self.Protected_Command_Forward_Count + 1; + Self.Protected_Command_Forward_Count := @ + 1; Self.Data_Product_T_Send_If_Connected (Self.Data_Products.Protected_Command_Forward_Count (The_Time, (Value => Self.Protected_Command_Forward_Count))); -- Send info event: @@ -152,7 +152,7 @@ package body Component.Command_Protector.Implementation is The_Time : constant Sys_Time.T := Self.Sys_Time_T_Get; begin -- Increment the reject counter: - Self.Protected_Command_Reject_Count := Self.Protected_Command_Reject_Count + 1; + Self.Protected_Command_Reject_Count := @ + 1; Self.Data_Product_T_Send_If_Connected (Self.Data_Products.Protected_Command_Reject_Count (The_Time, (Value => Self.Protected_Command_Reject_Count))); -- Send info event: diff --git a/src/components/command_rejector/component-command_rejector-implementation.adb b/src/components/command_rejector/component-command_rejector-implementation.adb index 9430abae..98dfbdee 100644 --- a/src/components/command_rejector/component-command_rejector-implementation.adb +++ b/src/components/command_rejector/component-command_rejector-implementation.adb @@ -78,7 +78,7 @@ package body Component.Command_Rejector.Implementation is The_Time : constant Sys_Time.T := Self.Sys_Time_T_Get; begin -- Increment the reject counter: - Self.Command_Reject_Counter := Self.Command_Reject_Counter + 1; + Self.Command_Reject_Counter := @ + 1; Self.Data_Product_T_Send_If_Connected (Self.Data_Products.Rejected_Command_Count (The_Time, (Value => Self.Command_Reject_Counter))); -- Send info event: diff --git a/src/components/command_router/component-command_router-implementation.adb b/src/components/command_router/component-command_router-implementation.adb index fc7adb42..e0ec3dc5 100644 --- a/src/components/command_router/component-command_router-implementation.adb +++ b/src/components/command_router/component-command_router-implementation.adb @@ -194,7 +194,7 @@ package body Component.Command_Router.Implementation is if Self.Is_Data_Product_T_Send_Connected and then Arg.Command_Id /= Self.Commands.Get_Reset_Data_Products_Id then - Self.Command_Success_Count := Self.Command_Success_Count + 1; + Self.Command_Success_Count := @ + 1; Self.Data_Product_T_Send (Self.Data_Products.Command_Success_Count (The_Time, (Value => Self.Command_Success_Count))); Self.Data_Product_T_Send (Self.Data_Products.Last_Successful_Command (The_Time, (Id => Arg.Command_Id))); end if; diff --git a/src/components/command_router/test/component-command_router-implementation-tester.adb b/src/components/command_router/test/component-command_router-implementation-tester.adb index 8c9fcaed..b67783e0 100644 --- a/src/components/command_router/test/component-command_router-implementation-tester.adb +++ b/src/components/command_router/test/component-command_router-implementation-tester.adb @@ -187,7 +187,7 @@ package body Component.Command_Router.Implementation.Tester is if not Self.Expect_Command_T_To_Route_Send_Dropped then pragma Assert (False, "The component's queue filled up when Command_T_To_Route_Send was called!"); else - Self.Command_T_To_Route_Send_Dropped_Count := Self.Command_T_To_Route_Send_Dropped_Count + 1; + Self.Command_T_To_Route_Send_Dropped_Count := @ + 1; Self.Expect_Command_T_To_Route_Send_Dropped := False; end if; end Command_T_To_Route_Send_Dropped; @@ -199,7 +199,7 @@ package body Component.Command_Router.Implementation.Tester is if not Self.Expect_Command_Response_T_Send_Dropped then pragma Assert (False, "The component's queue filled up when Command_Response_T_Send was called!"); else - Self.Command_Response_T_Send_Dropped_Count := Self.Command_Response_T_Send_Dropped_Count + 1; + Self.Command_Response_T_Send_Dropped_Count := @ + 1; Self.Expect_Command_Response_T_Send_Dropped := False; end if; end Command_Response_T_Send_Dropped; @@ -211,7 +211,7 @@ package body Component.Command_Router.Implementation.Tester is if not Self.Expect_Command_T_Send_Dropped then pragma Assert (False, "The component's queue filled up when Command_T_Send was called!"); else - Self.Command_T_Send_Dropped_Count := Self.Command_T_Send_Dropped_Count + 1; + Self.Command_T_Send_Dropped_Count := @ + 1; Self.Expect_Command_T_Send_Dropped := False; end if; end Command_T_Send_Dropped; diff --git a/src/components/command_sequencer/component-command_sequencer-implementation.adb b/src/components/command_sequencer/component-command_sequencer-implementation.adb index 897e8840..d84f3e1b 100644 --- a/src/components/command_sequencer/component-command_sequencer-implementation.adb +++ b/src/components/command_sequencer/component-command_sequencer-implementation.adb @@ -322,7 +322,7 @@ package body Component.Command_Sequencer.Implementation is if Self.Timeout_Limit /= Natural'First then -- Increment up to maximum. if Timeout_Counter < Natural'Last then - Timeout_Counter := Timeout_Counter + 1; + Timeout_Counter := @ + 1; end if; -- Check against limit: @@ -653,7 +653,7 @@ package body Component.Command_Sequencer.Implementation is )); -- Increment the index: - Idx := Idx + Engine_Summary_Type.Size_In_Bytes; + Idx := @ + Engine_Summary_Type.Size_In_Bytes; end loop; -- Fill in packet length: @@ -688,7 +688,7 @@ package body Component.Command_Sequencer.Implementation is )); -- Increment the index: - Idx := Idx + Engine_Details_Type.Size_In_Bytes; + Idx := @ + Engine_Details_Type.Size_In_Bytes; for Stack_Index in Seq_Types.Max_Seq_Num'First .. Seq_Types.Max_Seq_Num'First + Stack_Depth - 1 loop Pkt.Buffer (Idx .. Idx + Sequence_Details_Type.Size_In_Bytes - 1) := @@ -702,7 +702,7 @@ package body Component.Command_Sequencer.Implementation is )); -- Increment the index: - Idx := Idx + Sequence_Details_Type.Size_In_Bytes; + Idx := @ + Sequence_Details_Type.Size_In_Bytes; end loop; -- Fill in packet length: @@ -777,7 +777,7 @@ package body Component.Command_Sequencer.Implementation is declare Error_Counter : Interfaces.Unsigned_16 renames Self.Engine_Aux_Data.all (Engine.Get_Engine_Id).Command_Error_Counter; begin - Error_Counter := Error_Counter + 1; + Error_Counter := @ + 1; end; -- If we were waiting on a command or this engine triggered a load into another engine, then we just execute the next command in our sequence @@ -851,7 +851,7 @@ package body Component.Command_Sequencer.Implementation is end if; -- Increment the packet counter: - Self.Packet_Counter := Self.Packet_Counter + 1; + Self.Packet_Counter := @ + 1; end if; end Tick_T_Recv_Async; @@ -900,7 +900,7 @@ package body Component.Command_Sequencer.Implementation is declare Error_Counter : Interfaces.Unsigned_16 renames Self.Engine_Aux_Data.all (Engine_Id).Command_Error_Counter; begin - Error_Counter := Error_Counter + 1; + Error_Counter := @ + 1; end; -- If we are configured to continue on a command failure then keep going, otherwise diff --git a/src/components/command_sequencer/seq/decode/seq_config.adb b/src/components/command_sequencer/seq/decode/seq_config.adb index 3b96112d..8878c241 100644 --- a/src/components/command_sequencer/seq/decode/seq_config.adb +++ b/src/components/command_sequencer/seq/decode/seq_config.adb @@ -15,7 +15,7 @@ package body Seq_Config is begin for Char of Str loop exit when Char = ASCII.NUL; - Idx := Idx + 1; + Idx := @ + 1; end loop; return Str (Str'First .. Idx - 1); end Strip_Nul; @@ -37,7 +37,7 @@ package body Seq_Config is End_Idx := I - 1; exit; end if; - I := I + 1; + I := @ + 1; end loop; -- Iterate through all words: @@ -62,7 +62,7 @@ package body Seq_Config is -- Store word in return array: To_Return (Words_Parsed) (1 .. L - F + 1) := S (F .. L); - Words_Parsed := Words_Parsed + 1; + Words_Parsed := @ + 1; I := L + 1; end loop; @@ -132,8 +132,8 @@ package body Seq_Config is -- Transform pattern string into an an array of bytes while Pattern_Str (Pattern_Idx) /= ASCII.NUL loop Command_Bytes (Command_Bytes_Idx) := Basic_Types.Byte'Value ("16#" & Pattern_Str (Pattern_Idx .. Pattern_Idx + 1) & "#"); - Command_Bytes_Idx := Command_Bytes_Idx + 1; - Pattern_Idx := Pattern_Idx + 2; + Command_Bytes_Idx := @ + 1; + Pattern_Idx := @ + 2; end loop; -- Deserialize array of bytes into command record diff --git a/src/components/command_sequencer/seq/decode/seq_runtime-decoder.adb b/src/components/command_sequencer/seq/decode/seq_runtime-decoder.adb index 21f77375..be7cf862 100644 --- a/src/components/command_sequencer/seq/decode/seq_runtime-decoder.adb +++ b/src/components/command_sequencer/seq/decode/seq_runtime-decoder.adb @@ -197,7 +197,7 @@ package body Seq_Runtime.Decoder is while not End_Of_File (File) loop Read (File, Data); Buffer (Sequence_Size) := Data; - Sequence_Size := Sequence_Size + 1; + Sequence_Size := @ + 1; end loop; Sequence := (Address => (Buffer (0)'Address), Length => Sequence_Size); Close (File); @@ -265,7 +265,7 @@ package body Seq_Runtime.Decoder is raise Program_Error with "Command Serialization Failure."; end if; - Self.Next_Position := Self.Next_Position + Seq_Position (Bytes_Serialized); + Self.Next_Position := @ + Seq_Position (Bytes_Serialized); -- Read off the end of the sequence if Self.Next_Position > Seq_Position (Self.Seq_Header.Length) then diff --git a/src/components/command_sequencer/seq/engine/seq.adb b/src/components/command_sequencer/seq/engine/seq.adb index 38b160ef..107cc188 100644 --- a/src/components/command_sequencer/seq/engine/seq.adb +++ b/src/components/command_sequencer/seq/engine/seq.adb @@ -208,7 +208,7 @@ package body Seq is Self.Set_Engine_Error (Load); return Failure; else - Self.Current := Self.Current + 1; + Self.Current := @ + 1; end if; end if; @@ -260,7 +260,7 @@ package body Seq is -- Unload the current runtime stack entry Self.Stack.all (Self.Current).Unload; -- Pop the finished sequence off the stack - Self.Current := Self.Current - 1; + Self.Current := @ - 1; -- Continue executing the caller sequence. return Self.Execute (Instruction_Limit, Timestamp); else @@ -297,7 +297,7 @@ package body Seq is return Self.Last_Execute_State; when Seq_Runtime_State.Wait_Command => Self.Last_Command_Id := Self.Stack.all (Self.Current).Get_Command_Id; - Self.Commands_Sent := Self.Commands_Sent + 1; + Self.Commands_Sent := @ + 1; Self.Last_Execute_State := Seq_Execute_State.Wait_Command; return Self.Last_Execute_State; when Seq_Runtime_State.Wait_Telemetry_Set => diff --git a/src/components/command_sequencer/seq/runtime/seq_runtime.adb b/src/components/command_sequencer/seq/runtime/seq_runtime.adb index 14312189..aac5de71 100644 --- a/src/components/command_sequencer/seq/runtime/seq_runtime.adb +++ b/src/components/command_sequencer/seq/runtime/seq_runtime.adb @@ -127,7 +127,7 @@ package body Seq_Runtime is -- Increment the instruction counter -- Then check if we have hit the instruction limit. -- If we have, return with a READY state so we can resume execution during the next cycle. - Instruction_Counter := Instruction_Counter + 1; + Instruction_Counter := @ + 1; if Instruction_Counter >= Instruction_Limit then declare Ignore : Seq_Position := Self.Process_Error (Limit); @@ -228,14 +228,14 @@ package body Seq_Runtime is -- Sets the engines wake time. This is only called for relative waits to transform them into absolute waits. procedure Change_Relative_Wait_To_Absolute (Self : in out Instance; Current_Time : in Sys_Time.T) is begin - Self.Wake_Time.Seconds := Self.Wake_Time.Seconds + Current_Time.Seconds; + Self.Wake_Time.Seconds := @ + Current_Time.Seconds; Self.Set_State_Blocking (Wait_Absolute); end Change_Relative_Wait_To_Absolute; -- Telemetry timeouts come in as relative, so must change to absolute. procedure Change_Relative_Timeout_To_Absolute (Self : in out Instance; Current_Time : in Sys_Time.T) is begin - Self.Telemetry_Timeout.Seconds := Self.Telemetry_Timeout.Seconds + Current_Time.Seconds; + Self.Telemetry_Timeout.Seconds := @ + Current_Time.Seconds; Self.Set_State_Blocking (Wait_Telemetry_Value); end Change_Relative_Timeout_To_Absolute; @@ -795,7 +795,7 @@ package body Seq_Runtime is return Self.Process_Error (Command_Parse); end if; - Self.Next_Position := Self.Next_Position + Seq_Position (Bytes_Serialized); + Self.Next_Position := @ + Seq_Position (Bytes_Serialized); -- Read off the end of the sequence if Self.Next_Position > Seq_Position (Self.Seq_Header.Length) then diff --git a/src/components/command_sequencer/seq/simulator/seq_simulator.adb b/src/components/command_sequencer/seq/simulator/seq_simulator.adb index eeb0bba3..9d86068f 100644 --- a/src/components/command_sequencer/seq/simulator/seq_simulator.adb +++ b/src/components/command_sequencer/seq/simulator/seq_simulator.adb @@ -28,7 +28,7 @@ package body Seq_Simulator is -- Provide engine its stack size and engine identifier: Self.Seq_Engines (Id).Initialize (Stack_Depth => Stack_Size, Engine_Id => Id); Self.Seq_Engines (Id).Set_Source_Id (The_Source_Id); - The_Source_Id := The_Source_Id + 1; + The_Source_Id := @ + 1; end loop; return True; exception @@ -47,7 +47,7 @@ package body Seq_Simulator is while not End_Of_File (File) loop Read (File, Data); Buffer (Sequence_Size) := Data; - Sequence_Size := Sequence_Size + 1; + Sequence_Size := @ + 1; end loop; Sequence := (Address => (Buffer (0)'Address), Length => Sequence_Size); Close (File); diff --git a/src/components/command_sequencer/seq/test/seq_tests-implementation.adb b/src/components/command_sequencer/seq/test/seq_tests-implementation.adb index 1a914bdc..417de00c 100644 --- a/src/components/command_sequencer/seq/test/seq_tests-implementation.adb +++ b/src/components/command_sequencer/seq/test/seq_tests-implementation.adb @@ -81,7 +81,7 @@ package body Seq_Tests.Implementation is Read (File, Data); -- Put_Line (sequence_size'Image&" "&data'Image); Buffer (Sequence_Size) := Data; - Sequence_Size := Sequence_Size + 1; + Sequence_Size := @ + 1; end loop; --Put_Line ("Size: "&sequence_size'Image&" bytes"); Sequence := (Address => (Buffer (0)'Address), Length => Sequence_Size); diff --git a/src/components/command_sequencer/test/command_sequencer_tests-implementation.adb b/src/components/command_sequencer/test/command_sequencer_tests-implementation.adb index 28405e30..9a1eaeb6 100644 --- a/src/components/command_sequencer/test/command_sequencer_tests-implementation.adb +++ b/src/components/command_sequencer/test/command_sequencer_tests-implementation.adb @@ -166,7 +166,7 @@ package body Command_Sequencer_Tests.Implementation is while not End_Of_File (File) loop Read (File, Data); Buffer (Sequence_Size) := Data; - Sequence_Size := Sequence_Size + 1; + Sequence_Size := @ + 1; end loop; Put_Line ("Loaded " & Sequence_Size'Image & " bytes."); Close (File); @@ -1936,7 +1936,7 @@ package body Command_Sequencer_Tests.Implementation is Natural_Assert.Eq (T.Event_T_Recv_Sync_History.Get_Count, 0); -- Modify the memory region size so it is one byte too small. - Sequence_Region.Length := Sequence_Region.Length - 1; + Sequence_Region.Length := @ - 1; -- Load a simple sequence: T.Sequence_Load_T_Send ((Engine_Request => Specific_Engine, Engine_Id => 0, Sequence_Region => Sequence_Region)); diff --git a/src/components/command_sequencer/test/component-command_sequencer-implementation-tester.adb b/src/components/command_sequencer/test/component-command_sequencer-implementation-tester.adb index 1cb8601b..033845c3 100644 --- a/src/components/command_sequencer/test/component-command_sequencer-implementation-tester.adb +++ b/src/components/command_sequencer/test/component-command_sequencer-implementation-tester.adb @@ -280,7 +280,7 @@ package body Component.Command_Sequencer.Implementation.Tester is if not Self.Expect_Tick_T_Send_Dropped then pragma Assert (False, "The component's queue filled up when Tick_T_Send was called!"); else - Self.Tick_T_Send_Dropped_Count := Self.Tick_T_Send_Dropped_Count + 1; + Self.Tick_T_Send_Dropped_Count := @ + 1; Self.Expect_Tick_T_Send_Dropped := False; end if; end Tick_T_Send_Dropped; @@ -292,7 +292,7 @@ package body Component.Command_Sequencer.Implementation.Tester is if not Self.Expect_Command_Response_T_Send_Dropped then pragma Assert (False, "The component's queue filled up when Command_Response_T_Send was called!"); else - Self.Command_Response_T_Send_Dropped_Count := Self.Command_Response_T_Send_Dropped_Count + 1; + Self.Command_Response_T_Send_Dropped_Count := @ + 1; Self.Expect_Command_Response_T_Send_Dropped := False; end if; end Command_Response_T_Send_Dropped; @@ -304,7 +304,7 @@ package body Component.Command_Sequencer.Implementation.Tester is if not Self.Expect_Command_T_Send_Dropped then pragma Assert (False, "The component's queue filled up when Command_T_Send was called!"); else - Self.Command_T_Send_Dropped_Count := Self.Command_T_Send_Dropped_Count + 1; + Self.Command_T_Send_Dropped_Count := @ + 1; Self.Expect_Command_T_Send_Dropped := False; end if; end Command_T_Send_Dropped; @@ -316,7 +316,7 @@ package body Component.Command_Sequencer.Implementation.Tester is if not Self.Expect_Sequence_Load_T_Send_Dropped then pragma Assert (False, "The component's queue filled up when Sequence_Load_T_Send was called!"); else - Self.Sequence_Load_T_Send_Dropped_Count := Self.Sequence_Load_T_Send_Dropped_Count + 1; + Self.Sequence_Load_T_Send_Dropped_Count := @ + 1; Self.Expect_Sequence_Load_T_Send_Dropped := False; end if; end Sequence_Load_T_Send_Dropped; diff --git a/src/components/connector_queuer/test/component-connector_queuer-implementation-tester.adb b/src/components/connector_queuer/test/component-connector_queuer-implementation-tester.adb index bdcdb6fc..34fac8af 100644 --- a/src/components/connector_queuer/test/component-connector_queuer-implementation-tester.adb +++ b/src/components/connector_queuer/test/component-connector_queuer-implementation-tester.adb @@ -88,7 +88,7 @@ package body Component.Connector_Queuer.Implementation.Tester is if not Self.Expect_T_Send_Dropped then pragma Assert (False, "The component's queue filled up when T_Send was called!"); else - Self.T_Send_Dropped_Count := Self.T_Send_Dropped_Count + 1; + Self.T_Send_Dropped_Count := @ + 1; Self.Expect_T_Send_Dropped := False; end if; end T_Send_Dropped; diff --git a/src/components/cpu_monitor/component-cpu_monitor-implementation.adb b/src/components/cpu_monitor/component-cpu_monitor-implementation.adb index 560af2b5..c3d107cd 100644 --- a/src/components/cpu_monitor/component-cpu_monitor-implementation.adb +++ b/src/components/cpu_monitor/component-cpu_monitor-implementation.adb @@ -71,7 +71,7 @@ package body Component.Cpu_Monitor.Implementation is -- Ignore zero entries, since this special value means that the connector index -- is disabled, thus it should not be included in the calculation. Period := Self.Execution_Periods (Index); - Self.Max_Count := Self.Max_Count * Period; + Self.Max_Count := @ * Period; end loop; end Init; @@ -165,7 +165,7 @@ package body Component.Cpu_Monitor.Implementation is if Self.Packet_Counter.Is_Count_At_Period then Self.Packet_To_Send.Header.Time := Self.Sys_Time_T_Get; Self.Packet_T_Send_If_Connected (Self.Packet_To_Send); - Self.Packet_To_Send.Header.Sequence_Count := Self.Packet_To_Send.Header.Sequence_Count + 1; + Self.Packet_To_Send.Header.Sequence_Count := @ + 1; end if; -- Increment the packet count: @@ -175,7 +175,7 @@ package body Component.Cpu_Monitor.Implementation is -- product of the divisors. -- Note: this will fail with a divide by zero error if init is -- never called. This behavior is by design. - Self.Count := (Self.Count + 1) mod Self.Max_Count; + Self.Count := (@ + 1) mod Self.Max_Count; end Tick_T_Recv_Sync; -- This is the command receive connector. diff --git a/src/components/event_filter/event_filter_entry/event_filter_entry.adb b/src/components/event_filter/event_filter_entry/event_filter_entry.adb index c29c5f06..2601892e 100644 --- a/src/components/event_filter/event_filter_entry/event_filter_entry.adb +++ b/src/components/event_filter/event_filter_entry/event_filter_entry.adb @@ -137,10 +137,10 @@ package body Event_Filter_Entry is end case; if Event_State = Event_Filter_State.Filtered then - Self.Num_Events_Filtered := Self.Num_Events_Filtered + 1; + Self.Num_Events_Filtered := @ + 1; return Filtered; else - Self.Num_Events_Unfiltered := Self.Num_Events_Unfiltered + 1; + Self.Num_Events_Unfiltered := @ + 1; return Unfiltered; end if; end; diff --git a/src/components/event_limiter/component-event_limiter-implementation.adb b/src/components/event_limiter/component-event_limiter-implementation.adb index afeda614..ba6d73d5 100644 --- a/src/components/event_limiter/component-event_limiter-implementation.adb +++ b/src/components/event_limiter/component-event_limiter-implementation.adb @@ -151,7 +151,7 @@ package body Component.Event_Limiter.Implementation is when Event_Max_Limit => if Num_Event_Limited_Event.Num_Event_Ids <= Num_Event_Limited_Event.Event_Id_Limited_Array'Length then Num_Event_Limited_Event.Event_Id_Limited_Array (Integer (Num_Event_Limited_Event.Num_Event_Ids)) := Dec_Event_Id; - Num_Event_Limited_Event.Num_Event_Ids := Num_Event_Limited_Event.Num_Event_Ids + 1; + Num_Event_Limited_Event.Num_Event_Ids := @ + 1; end if; -- Assert on the status. We know the range so we shouldn't get an invalid_Id error when Invalid_Id => @@ -201,7 +201,7 @@ package body Component.Event_Limiter.Implementation is when 7 => Event_Bitmap.State_7 := Event_State; Event_State_Array (Byte_Num) := Event_Id_Limiter_State_Type.Serialization.To_Byte_Array (Event_Bitmap) (0); - Byte_Num := Byte_Num + 1; + Byte_Num := @ + 1; end case; when Invalid_Id => pragma Assert (False, "Invalid_Id found when decrementing all event limiter counters which should not be possible: " & Natural'Image (Natural (Id))); @@ -231,7 +231,7 @@ package body Component.Event_Limiter.Implementation is end if; -- If the number of events limited is not 0, then update the total number of events limited for the component lifetime and reset the number since last tick count if Num_Events_Limited > 0 then - Self.Total_Event_Limited_Count := Self.Total_Event_Limited_Count + Unsigned_32 (Num_Events_Limited); + Self.Total_Event_Limited_Count := @ + Unsigned_32 (Num_Events_Limited); Self.Data_Product_T_Send_If_Connected (Self.Data_Products.Total_Events_Limited (Timestamp, ((Value => Self.Total_Event_Limited_Count)))); Self.Event_Array.Reset_Event_Limited_Count; diff --git a/src/components/event_limiter/two_counter_entry/two_counter_entry.adb b/src/components/event_limiter/two_counter_entry/two_counter_entry.adb index 1fe666ca..48ef6ef2 100644 --- a/src/components/event_limiter/two_counter_entry/two_counter_entry.adb +++ b/src/components/event_limiter/two_counter_entry/two_counter_entry.adb @@ -72,11 +72,11 @@ package body Two_Counter_Entry is -- Check if the event was at the max persistence and should be limited if Event_Info.Top_Event_Count >= Self.Persistence then -- Increment our number of limited event counter if the event is enabled here (so that its protected in the component) - Self.Num_Events_Limited := Self.Num_Events_Limited + 1; + Self.Num_Events_Limited := @ + 1; Increment_Status := Event_Max_Limit; -- Increment if we are less than the persistence else - Event_Info.Top_Event_Count := Event_Info.Top_Event_Count + 1; + Event_Info.Top_Event_Count := @ + 1; end if; -- Nothing to do if disabled when Event_State_Type.Disabled => @@ -95,11 +95,11 @@ package body Two_Counter_Entry is -- Check if the event was at the max persistence and limited if Event_Info.Bottom_Event_Count >= Self.Persistence then -- Increment our number of limited event counter if the event is enabled here (so that its protected in the component) - Self.Num_Events_Limited := Self.Num_Events_Limited + 1; + Self.Num_Events_Limited := @ + 1; Increment_Status := Event_Max_Limit; -- Increment if we are less than the persistence else - Event_Info.Bottom_Event_Count := Event_Info.Bottom_Event_Count + 1; + Event_Info.Bottom_Event_Count := @ + 1; end if; -- Nothing to do if disabled when Event_State_Type.Disabled => @@ -143,7 +143,7 @@ package body Two_Counter_Entry is end if; -- Decrement the count if needed if Event_Info.Top_Event_Count > 0 then - Event_Info.Top_Event_Count := Event_Info.Top_Event_Count - 1; + Event_Info.Top_Event_Count := @ - 1; end if; -- Nothing to do if disabled when Disabled => @@ -164,7 +164,7 @@ package body Two_Counter_Entry is end if; -- Decrement count if needed if Event_Info.Bottom_Event_Count > 0 then - Event_Info.Bottom_Event_Count := Event_Info.Bottom_Event_Count - 1; + Event_Info.Bottom_Event_Count := @ - 1; end if; -- Nothing to do if disabled when Disabled => diff --git a/src/components/event_packetizer/component-event_packetizer-implementation.adb b/src/components/event_packetizer/component-event_packetizer-implementation.adb index 98544378..397bf322 100644 --- a/src/components/event_packetizer/component-event_packetizer-implementation.adb +++ b/src/components/event_packetizer/component-event_packetizer-implementation.adb @@ -93,7 +93,7 @@ package body Component.Event_Packetizer.Implementation is -- Helper procedure to increment the dropped event counter: procedure Increment_Events_Dropped is begin - Events_Dropped := Events_Dropped + 1; + Events_Dropped := @ + 1; New_Packets_Dropped := True; end Increment_Events_Dropped; @@ -101,11 +101,11 @@ package body Component.Event_Packetizer.Implementation is procedure Next_Packet is begin -- Increment full count: - Num_Packets_Full := Num_Packets_Full + 1; + Num_Packets_Full := @ + 1; pragma Assert (Num_Packets_Full <= Packets'Length); -- Increment index: if Index < Packet_Array_Index'Last then - Index := Index + 1; + Index := @ + 1; end if; -- Check for roll over: if Index > Packets'Last then @@ -212,7 +212,7 @@ package body Component.Event_Packetizer.Implementation is when Full => Do_Pop_Packet (Idx, The_Packet); -- Decrement the packet full count: - Num_Packets_Full := Num_Packets_Full - 1; + Num_Packets_Full := @ - 1; Status := Success; when Partial => if Allow_Partial_Packet then @@ -334,7 +334,7 @@ package body Component.Event_Packetizer.Implementation is -- is requested, but not available. when Packet_Partially_Full => if Self.Partial_Packet_Count < Natural'Last then - Self.Partial_Packet_Count := Self.Partial_Packet_Count + 1; + Self.Partial_Packet_Count := @ + 1; end if; when Packet_Empty => null; diff --git a/src/components/event_packetizer/test/event_packetizer_tests-implementation.adb b/src/components/event_packetizer/test/event_packetizer_tests-implementation.adb index c5a4b828..5ba1125c 100644 --- a/src/components/event_packetizer/test/event_packetizer_tests-implementation.adb +++ b/src/components/event_packetizer/test/event_packetizer_tests-implementation.adb @@ -62,7 +62,7 @@ package body Event_Packetizer_Tests.Implementation is -- Grab the event parameters: if Extracted_Event.Header.Param_Buffer_Length > 0 then - Next_Index := Next_Index + Extracted_Event.Header.Param_Buffer_Length; + Next_Index := @ + Extracted_Event.Header.Param_Buffer_Length; Extracted_Event.Param_Buffer (Extracted_Event.Param_Buffer'First .. Extracted_Event.Param_Buffer'First + Extracted_Event.Header.Param_Buffer_Length - 1) := The_Packet.Buffer (Param_Index .. Next_Index - 1); end if; @@ -103,7 +103,7 @@ package body Event_Packetizer_Tests.Implementation is -- Send an event: T.Event_T_Send (Event_3); - Bytes_Sent := Bytes_Sent + (Event_Header.Serialization.Serialized_Length + Event_3.Header.Param_Buffer_Length); + Bytes_Sent := @ + (Event_Header.Serialization.Serialized_Length + Event_3.Header.Param_Buffer_Length); -- Send some ticks and expect no packets: T.Tick_T_Send (A_Tick); @@ -120,7 +120,7 @@ package body Event_Packetizer_Tests.Implementation is -- OK, now fill up a packet: for Idx in 1 .. ((Packet_Types.Packet_Buffer_Type'Length / (Event_Header.T'Object_Size / 8 + Event_3.Header.Param_Buffer_Length)) - 1) loop T.Event_T_Send (Event_3); - Bytes_Sent := Bytes_Sent + (Event_Header.Serialization.Serialized_Length + Event_3.Header.Param_Buffer_Length); + Bytes_Sent := @ + (Event_Header.Serialization.Serialized_Length + Event_3.Header.Param_Buffer_Length); T.Tick_T_Send (A_Tick); Boolean_Assert.Eq (T.Packet_T_Recv_Sync_History.Is_Empty, True); -- Some data products should have been send out however: @@ -146,7 +146,7 @@ package body Event_Packetizer_Tests.Implementation is -- Check the packet contents: P_Idx := Packet_Types.Packet_Buffer_Type'First; while P_Idx <= Packet_Types.Packet_Buffer_Type'First + Expected_Packet_Header.Buffer_Length - 1 loop - P_Idx := Check_Event (The_Packet, Event_3, P_Idx); + P_Idx := Check_Event (The_Packet, Event_3, @); end loop; Natural_Assert.Eq (P_Idx, Packet_Types.Packet_Buffer_Type'First + Expected_Packet_Header.Buffer_Length); @@ -167,13 +167,13 @@ package body Event_Packetizer_Tests.Implementation is -- Check the packet header: The_Packet := T.Events_Packet_History.Get (2); Expected_Packet_Header.Buffer_Length := (Packet_Types.Packet_Buffer_Type'Length / (Event_Header.T'Object_Size / 8 + Event_1.Header.Param_Buffer_Length)) * (Event_Header.T'Object_Size / 8 + Event_1.Header.Param_Buffer_Length); - Expected_Packet_Header.Sequence_Count := Expected_Packet_Header.Sequence_Count + 1; + Expected_Packet_Header.Sequence_Count := @ + 1; Packet_Header_Assert.Eq (The_Packet.Header, Expected_Packet_Header); -- Check the packet contents: P_Idx := Packet_Types.Packet_Buffer_Type'First; while P_Idx <= Packet_Types.Packet_Buffer_Type'First + Expected_Packet_Header.Buffer_Length - 1 loop - P_Idx := Check_Event (The_Packet, Event_1, P_Idx); + P_Idx := Check_Event (The_Packet, Event_1, @); end loop; Natural_Assert.Eq (P_Idx, Packet_Types.Packet_Buffer_Type'First + Expected_Packet_Header.Buffer_Length); @@ -194,13 +194,13 @@ package body Event_Packetizer_Tests.Implementation is -- Check the packet header: The_Packet := T.Events_Packet_History.Get (3); Expected_Packet_Header.Buffer_Length := (Packet_Types.Packet_Buffer_Type'Length / (Event_Header.T'Object_Size / 8 + Event_2.Header.Param_Buffer_Length)) * (Event_Header.T'Object_Size / 8 + Event_2.Header.Param_Buffer_Length); - Expected_Packet_Header.Sequence_Count := Expected_Packet_Header.Sequence_Count + 1; + Expected_Packet_Header.Sequence_Count := @ + 1; Packet_Header_Assert.Eq (The_Packet.Header, Expected_Packet_Header); -- Check the packet contents: P_Idx := Packet_Types.Packet_Buffer_Type'First; while P_Idx <= Packet_Types.Packet_Buffer_Type'First + Expected_Packet_Header.Buffer_Length - 1 loop - P_Idx := Check_Event (The_Packet, Event_2, P_Idx); + P_Idx := Check_Event (The_Packet, Event_2, @); end loop; Natural_Assert.Eq (P_Idx, Packet_Types.Packet_Buffer_Type'First + Expected_Packet_Header.Buffer_Length); @@ -245,7 +245,7 @@ package body Event_Packetizer_Tests.Implementation is -- Check the packet contents: P_Idx := Packet_Types.Packet_Buffer_Type'First; while P_Idx <= Packet_Types.Packet_Buffer_Type'First + Expected_Packet_Header.Buffer_Length - 1 loop - P_Idx := Check_Event (The_Packet, Event_3, P_Idx); + P_Idx := Check_Event (The_Packet, Event_3, @); end loop; Natural_Assert.Eq (P_Idx, Packet_Types.Packet_Buffer_Type'First + Expected_Packet_Header.Buffer_Length); @@ -277,13 +277,13 @@ package body Event_Packetizer_Tests.Implementation is -- Check the packet header: The_Packet := T.Events_Packet_History.Get (2); Expected_Packet_Header.Buffer_Length := (Event_Header.T'Object_Size / 8 + Event_2.Header.Param_Buffer_Length) * 2; - Expected_Packet_Header.Sequence_Count := Expected_Packet_Header.Sequence_Count + 1; + Expected_Packet_Header.Sequence_Count := @ + 1; Packet_Header_Assert.Eq (The_Packet.Header, Expected_Packet_Header); -- Check the packet contents: P_Idx := Packet_Types.Packet_Buffer_Type'First; while P_Idx <= Packet_Types.Packet_Buffer_Type'First + Expected_Packet_Header.Buffer_Length - 1 loop - P_Idx := Check_Event (The_Packet, Event_2, P_Idx); + P_Idx := Check_Event (The_Packet, Event_2, @); end loop; Natural_Assert.Eq (P_Idx, Packet_Types.Packet_Buffer_Type'First + Expected_Packet_Header.Buffer_Length); @@ -324,7 +324,7 @@ package body Event_Packetizer_Tests.Implementation is -- Check the packet contents: P_Idx := Packet_Types.Packet_Buffer_Type'First; while P_Idx <= Packet_Types.Packet_Buffer_Type'First + Expected_Packet_Header.Buffer_Length - 1 loop - P_Idx := Check_Event (The_Packet, Event_3, P_Idx); + P_Idx := Check_Event (The_Packet, Event_3, @); end loop; Natural_Assert.Eq (P_Idx, Packet_Types.Packet_Buffer_Type'First + Expected_Packet_Header.Buffer_Length); @@ -352,13 +352,13 @@ package body Event_Packetizer_Tests.Implementation is -- Check the packet header: The_Packet := T.Events_Packet_History.Get (2); Expected_Packet_Header.Buffer_Length := (Event_Header.T'Object_Size / 8 + Event_2.Header.Param_Buffer_Length) * 2; - Expected_Packet_Header.Sequence_Count := Expected_Packet_Header.Sequence_Count + 1; + Expected_Packet_Header.Sequence_Count := @ + 1; Packet_Header_Assert.Eq (The_Packet.Header, Expected_Packet_Header); -- Check the packet contents: P_Idx := Packet_Types.Packet_Buffer_Type'First; while P_Idx <= Packet_Types.Packet_Buffer_Type'First + Expected_Packet_Header.Buffer_Length - 1 loop - P_Idx := Check_Event (The_Packet, Event_2, P_Idx); + P_Idx := Check_Event (The_Packet, Event_2, @); end loop; Natural_Assert.Eq (P_Idx, Packet_Types.Packet_Buffer_Type'First + Expected_Packet_Header.Buffer_Length); @@ -435,7 +435,7 @@ package body Event_Packetizer_Tests.Implementation is -- Check the packet contents: P_Idx := Packet_Types.Packet_Buffer_Type'First; while P_Idx <= Packet_Types.Packet_Buffer_Type'First + Expected_Packet_Header.Buffer_Length - 1 loop - P_Idx := Check_Event (The_Packet, Event_3, P_Idx); + P_Idx := Check_Event (The_Packet, Event_3, @); end loop; Natural_Assert.Eq (P_Idx, Packet_Types.Packet_Buffer_Type'First + Expected_Packet_Header.Buffer_Length); @@ -471,13 +471,13 @@ package body Event_Packetizer_Tests.Implementation is -- Check the packet header: The_Packet := T.Events_Packet_History.Get (2); Expected_Packet_Header.Buffer_Length := Event_Header.T'Object_Size / 8 + Event_2.Header.Param_Buffer_Length; - Expected_Packet_Header.Sequence_Count := Expected_Packet_Header.Sequence_Count + 1; + Expected_Packet_Header.Sequence_Count := @ + 1; Packet_Header_Assert.Eq (The_Packet.Header, Expected_Packet_Header); -- Check the packet contents: P_Idx := Packet_Types.Packet_Buffer_Type'First; while P_Idx <= Packet_Types.Packet_Buffer_Type'First + Expected_Packet_Header.Buffer_Length - 1 loop - P_Idx := Check_Event (The_Packet, Event_2, P_Idx); + P_Idx := Check_Event (The_Packet, Event_2, @); end loop; Natural_Assert.Eq (P_Idx, Packet_Types.Packet_Buffer_Type'First + Expected_Packet_Header.Buffer_Length); @@ -499,7 +499,7 @@ package body Event_Packetizer_Tests.Implementation is -- OK, fill up a packet, and make sure that no packets are dropped: for Idx in 1 .. ((Packet_Types.Packet_Buffer_Type'Length / (Event_Header.T'Object_Size / 8 + Event_3.Header.Param_Buffer_Length))) loop T.Event_T_Send (Event_3); - Bytes_Sent := Bytes_Sent + (Event_Header.Serialization.Serialized_Length + Event_3.Header.Param_Buffer_Length); + Bytes_Sent := @ + (Event_Header.Serialization.Serialized_Length + Event_3.Header.Param_Buffer_Length); Boolean_Assert.Eq (T.Data_Product_T_Recv_Sync_History.Is_Empty, True); end loop; @@ -534,7 +534,7 @@ package body Event_Packetizer_Tests.Implementation is -- Check the packet contents: P_Idx := Packet_Types.Packet_Buffer_Type'First; while P_Idx <= Packet_Types.Packet_Buffer_Type'First + Expected_Packet_Header.Buffer_Length - 1 loop - P_Idx := Check_Event (The_Packet, Event_3, P_Idx); + P_Idx := Check_Event (The_Packet, Event_3, @); end loop; Natural_Assert.Eq (P_Idx, Packet_Types.Packet_Buffer_Type'First + Expected_Packet_Header.Buffer_Length); @@ -547,13 +547,13 @@ package body Event_Packetizer_Tests.Implementation is -- Check the packet header: Natural_Assert.Eq (T.Events_Packet_History.Get_Count, 2); The_Packet := T.Events_Packet_History.Get (2); - Expected_Packet_Header.Sequence_Count := Expected_Packet_Header.Sequence_Count + 1; + Expected_Packet_Header.Sequence_Count := @ + 1; Packet_Header_Assert.Eq (The_Packet.Header, Expected_Packet_Header); -- Check the packet contents: P_Idx := Packet_Types.Packet_Buffer_Type'First; while P_Idx <= Packet_Types.Packet_Buffer_Type'First + Expected_Packet_Header.Buffer_Length - 1 loop - P_Idx := Check_Event (The_Packet, Event_3, P_Idx); + P_Idx := Check_Event (The_Packet, Event_3, @); end loop; Natural_Assert.Eq (P_Idx, Packet_Types.Packet_Buffer_Type'First + Expected_Packet_Header.Buffer_Length); @@ -585,13 +585,13 @@ package body Event_Packetizer_Tests.Implementation is -- Check the packet header: Natural_Assert.Eq (T.Events_Packet_History.Get_Count, 3); The_Packet := T.Events_Packet_History.Get (3); - Expected_Packet_Header.Sequence_Count := Expected_Packet_Header.Sequence_Count + 1; + Expected_Packet_Header.Sequence_Count := @ + 1; Packet_Header_Assert.Eq (The_Packet.Header, Expected_Packet_Header); -- Check the packet contents: P_Idx := Packet_Types.Packet_Buffer_Type'First; while P_Idx <= Packet_Types.Packet_Buffer_Type'First + Expected_Packet_Header.Buffer_Length - 1 loop - P_Idx := Check_Event (The_Packet, Event_3, P_Idx); + P_Idx := Check_Event (The_Packet, Event_3, @); end loop; Natural_Assert.Eq (P_Idx, Packet_Types.Packet_Buffer_Type'First + Expected_Packet_Header.Buffer_Length); @@ -602,13 +602,13 @@ package body Event_Packetizer_Tests.Implementation is -- Check the packet header: Natural_Assert.Eq (T.Events_Packet_History.Get_Count, 4); The_Packet := T.Events_Packet_History.Get (4); - Expected_Packet_Header.Sequence_Count := Expected_Packet_Header.Sequence_Count + 1; + Expected_Packet_Header.Sequence_Count := @ + 1; Packet_Header_Assert.Eq (The_Packet.Header, Expected_Packet_Header); -- Check the packet contents: P_Idx := Packet_Types.Packet_Buffer_Type'First; while P_Idx <= Packet_Types.Packet_Buffer_Type'First + Expected_Packet_Header.Buffer_Length - 1 loop - P_Idx := Check_Event (The_Packet, Event_3, P_Idx); + P_Idx := Check_Event (The_Packet, Event_3, @); end loop; Natural_Assert.Eq (P_Idx, Packet_Types.Packet_Buffer_Type'First + Expected_Packet_Header.Buffer_Length); diff --git a/src/components/event_text_logger/test/component-event_text_logger-implementation-tester.adb b/src/components/event_text_logger/test/component-event_text_logger-implementation-tester.adb index 7d96b914..460d805c 100644 --- a/src/components/event_text_logger/test/component-event_text_logger-implementation-tester.adb +++ b/src/components/event_text_logger/test/component-event_text_logger-implementation-tester.adb @@ -43,7 +43,7 @@ package body Component.Event_Text_Logger.Implementation.Tester is if not Self.Expect_Event_T_Send_Dropped then pragma Assert (False, "The component's queue filled up when Event_T_Send was called!"); else - Self.Event_T_Send_Dropped_Count := Self.Event_T_Send_Dropped_Count + 1; + Self.Event_T_Send_Dropped_Count := @ + 1; Self.Expect_Event_T_Send_Dropped := False; end if; end Event_T_Send_Dropped; diff --git a/src/components/event_text_logger/test/event_producer/component-event_producer-implementation.adb b/src/components/event_text_logger/test/event_producer/component-event_producer-implementation.adb index 0275b787..cacb609f 100644 --- a/src/components/event_text_logger/test/event_producer/component-event_producer-implementation.adb +++ b/src/components/event_text_logger/test/event_producer/component-event_producer-implementation.adb @@ -21,7 +21,7 @@ package body Component.Event_Producer.Implementation is when others => pragma Assert (False); end case; - Self.Count := Self.Count + 1; + Self.Count := @ + 1; end Tick_T_Recv_Sync; end Component.Event_Producer.Implementation; diff --git a/src/components/fault_correction/component-fault_correction-implementation.adb b/src/components/fault_correction/component-fault_correction-implementation.adb index 6d8d4636..b6b939c6 100644 --- a/src/components/fault_correction/component-fault_correction-implementation.adb +++ b/src/components/fault_correction/component-fault_correction-implementation.adb @@ -69,7 +69,7 @@ package body Component.Fault_Correction.Implementation is -- OK, now add response entry to table: Self.Fault_Response_Table.all (Table_Index) := Response_Entry; - Table_Index := Table_Index + 1; + Table_Index := @ + 1; end; end loop; end Init; @@ -163,7 +163,7 @@ package body Component.Fault_Correction.Implementation is -- Note: We won't overflow this based on assertions in Init. To_Send.Buffer (Product_Buffer_Index) := Status_Byte; if Product_Buffer_Index < Data_Product_Types.Data_Product_Buffer_Length_Type'Last then - Product_Buffer_Index := Product_Buffer_Index + 1; + Product_Buffer_Index := @ + 1; end if; Status_Byte := 0; end if; @@ -264,7 +264,7 @@ package body Component.Fault_Correction.Implementation is end if; -- Send data products if necessary: - Self.Fault_Counter := Self.Fault_Counter + 1; + Self.Fault_Counter := @ + 1; Self.Data_Product_T_Send_If_Connected (Self.Data_Products.Fault_Counter (The_Time, (Value => Self.Fault_Counter))); Self.Data_Product_T_Send_If_Connected (Self.Data_Products.Last_Fault_Id_Received (The_Time, (Id => Arg.Header.Id))); Self.Data_Product_T_Send_If_Connected (Self.Data_Products.Time_Of_Last_Fault_Received (The_Time, Arg.Header.Time)); diff --git a/src/components/fault_correction/test/component-fault_correction-implementation-tester.adb b/src/components/fault_correction/test/component-fault_correction-implementation-tester.adb index 1abb0f86..192d749a 100644 --- a/src/components/fault_correction/test/component-fault_correction-implementation-tester.adb +++ b/src/components/fault_correction/test/component-fault_correction-implementation-tester.adb @@ -140,7 +140,7 @@ package body Component.Fault_Correction.Implementation.Tester is if not Self.Expect_Command_T_Send_Dropped then pragma Assert (False, "The component's queue filled up when Command_T_Send was called!"); else - Self.Command_T_Send_Dropped_Count := Self.Command_T_Send_Dropped_Count + 1; + Self.Command_T_Send_Dropped_Count := @ + 1; Self.Expect_Command_T_Send_Dropped := False; end if; end Command_T_Send_Dropped; @@ -152,7 +152,7 @@ package body Component.Fault_Correction.Implementation.Tester is if not Self.Expect_Fault_T_Send_Dropped then pragma Assert (False, "The component's queue filled up when Fault_T_Send was called!"); else - Self.Fault_T_Send_Dropped_Count := Self.Fault_T_Send_Dropped_Count + 1; + Self.Fault_T_Send_Dropped_Count := @ + 1; Self.Expect_Fault_T_Send_Dropped := False; end if; end Fault_T_Send_Dropped; diff --git a/src/components/interrupt_listener/test/tester_interrupt_handler.adb b/src/components/interrupt_listener/test/tester_interrupt_handler.adb index e68d80fc..bc0dcb5d 100644 --- a/src/components/interrupt_listener/test/tester_interrupt_handler.adb +++ b/src/components/interrupt_listener/test/tester_interrupt_handler.adb @@ -7,7 +7,7 @@ package body Tester_Interrupt_Handler is use Interfaces; begin -- Increment the count: - Data.Count := Data.Count + 1; + Data.Count := @ + 1; -- Increment the time: Data.Time := (0, 0); end Handler; diff --git a/src/components/interrupt_pender/test/tester_interrupt_handler.adb b/src/components/interrupt_pender/test/tester_interrupt_handler.adb index e68d80fc..bc0dcb5d 100644 --- a/src/components/interrupt_pender/test/tester_interrupt_handler.adb +++ b/src/components/interrupt_pender/test/tester_interrupt_handler.adb @@ -7,7 +7,7 @@ package body Tester_Interrupt_Handler is use Interfaces; begin -- Increment the count: - Data.Count := Data.Count + 1; + Data.Count := @ + 1; -- Increment the time: Data.Time := (0, 0); end Handler; diff --git a/src/components/limiter/test/component-limiter-implementation-tester.adb b/src/components/limiter/test/component-limiter-implementation-tester.adb index 86bcf93e..3842b9f3 100644 --- a/src/components/limiter/test/component-limiter-implementation-tester.adb +++ b/src/components/limiter/test/component-limiter-implementation-tester.adb @@ -125,7 +125,7 @@ package body Component.Limiter.Implementation.Tester is if not Self.Expect_T_Send_Dropped then pragma Assert (False, "The component's queue filled up when T_Send was called!"); else - Self.T_Send_Dropped_Count := Self.T_Send_Dropped_Count + 1; + Self.T_Send_Dropped_Count := @ + 1; Self.Expect_T_Send_Dropped := False; end if; end T_Send_Dropped; diff --git a/src/components/limiter/test_variable/component-limiter-implementation-tester.adb b/src/components/limiter/test_variable/component-limiter-implementation-tester.adb index 86bcf93e..3842b9f3 100644 --- a/src/components/limiter/test_variable/component-limiter-implementation-tester.adb +++ b/src/components/limiter/test_variable/component-limiter-implementation-tester.adb @@ -125,7 +125,7 @@ package body Component.Limiter.Implementation.Tester is if not Self.Expect_T_Send_Dropped then pragma Assert (False, "The component's queue filled up when T_Send was called!"); else - Self.T_Send_Dropped_Count := Self.T_Send_Dropped_Count + 1; + Self.T_Send_Dropped_Count := @ + 1; Self.Expect_T_Send_Dropped := False; end if; end T_Send_Dropped; diff --git a/src/components/logger/test/logger_tests-implementation.adb b/src/components/logger/test/logger_tests-implementation.adb index 2298eb21..c80768d4 100644 --- a/src/components/logger/test/logger_tests-implementation.adb +++ b/src/components/logger/test/logger_tests-implementation.adb @@ -104,23 +104,23 @@ package body Logger_Tests.Implementation is The_Tick := ((1, 2), 3); T.T_Send (The_Tick); Bytes_To_Compare (Idx .. Idx + Tick.Serialization.Serialized_Length - 1) := Tick.Serialization.To_Byte_Array (The_Tick); - Idx := Idx + Tick.Serialization.Serialized_Length; + Idx := @ + Tick.Serialization.Serialized_Length; The_Tick := ((4, 5), 6); T.T_Send (The_Tick); Bytes_To_Compare (Idx .. Idx + Tick.Serialization.Serialized_Length - 1) := Tick.Serialization.To_Byte_Array (The_Tick); - Idx := Idx + Tick.Serialization.Serialized_Length; + Idx := @ + Tick.Serialization.Serialized_Length; The_Tick := ((7, 8), 9); T.T_Send (The_Tick); Bytes_To_Compare (Idx .. Idx + Tick.Serialization.Serialized_Length - 1) := Tick.Serialization.To_Byte_Array (The_Tick); - Idx := Idx + Tick.Serialization.Serialized_Length; + Idx := @ + Tick.Serialization.Serialized_Length; The_Tick := ((10, 11), 12); T.T_Send (The_Tick); Bytes_To_Compare (Idx .. Idx + Tick.Serialization.Serialized_Length - 1) := Tick.Serialization.To_Byte_Array (The_Tick); - Idx := Idx + Tick.Serialization.Serialized_Length; + Idx := @ + Tick.Serialization.Serialized_Length; The_Tick := ((13, 14), 15); T.T_Send (The_Tick); Bytes_To_Compare (Idx .. Idx + Tick.Serialization.Serialized_Length - 1) := Tick.Serialization.To_Byte_Array (The_Tick); - Idx := Idx + Tick.Serialization.Serialized_Length; + Idx := @ + Tick.Serialization.Serialized_Length; -- Make sure no events were thrown: Natural_Assert.Eq (T.Event_T_Recv_Sync_History.Get_Count, 0); @@ -350,23 +350,23 @@ package body Logger_Tests.Implementation is The_Tick := ((1, 2), 3); T.T_Send (The_Tick); Bytes_To_Compare (Idx .. Idx + Tick.Serialization.Serialized_Length - 1) := Tick.Serialization.To_Byte_Array (The_Tick); - Idx := Idx + Tick.Serialization.Serialized_Length; + Idx := @ + Tick.Serialization.Serialized_Length; The_Tick := ((4, 5), 6); T.T_Send (The_Tick); Bytes_To_Compare (Idx .. Idx + Tick.Serialization.Serialized_Length - 1) := Tick.Serialization.To_Byte_Array (The_Tick); - Idx := Idx + Tick.Serialization.Serialized_Length; + Idx := @ + Tick.Serialization.Serialized_Length; The_Tick := ((7, 8), 9); T.T_Send (The_Tick); Bytes_To_Compare (Idx .. Idx + Tick.Serialization.Serialized_Length - 1) := Tick.Serialization.To_Byte_Array (The_Tick); - Idx := Idx + Tick.Serialization.Serialized_Length; + Idx := @ + Tick.Serialization.Serialized_Length; The_Tick := ((10, 11), 12); T.T_Send (The_Tick); Bytes_To_Compare (Idx .. Idx + Tick.Serialization.Serialized_Length - 1) := Tick.Serialization.To_Byte_Array (The_Tick); - Idx := Idx + Tick.Serialization.Serialized_Length; + Idx := @ + Tick.Serialization.Serialized_Length; The_Tick := ((13, 14), 15); T.T_Send (The_Tick); Bytes_To_Compare (Idx .. Idx + Tick.Serialization.Serialized_Length - 1) := Tick.Serialization.To_Byte_Array (The_Tick); - Idx := Idx + Tick.Serialization.Serialized_Length; + Idx := @ + Tick.Serialization.Serialized_Length; -- Make sure no events were thrown: Natural_Assert.Eq (T.Event_T_Recv_Sync_History.Get_Count, 0); diff --git a/src/components/logger/test_variable/variable_tests-implementation.adb b/src/components/logger/test_variable/variable_tests-implementation.adb index 79491893..fa2c2517 100644 --- a/src/components/logger/test_variable/variable_tests-implementation.adb +++ b/src/components/logger/test_variable/variable_tests-implementation.adb @@ -103,31 +103,31 @@ package body Variable_Tests.Implementation is Put_Line (Basic_Types.Representation.Image (Log_Bytes)); pragma Assert (Simple_Variable.Serialized_Length (Var, Len) = Success); pragma Assert (Simple_Variable.Serialization.To_Byte_Array (Bytes_To_Compare (Idx .. Idx + Len - 1), Var) = Success); - Idx := Idx + Len; + Idx := @ + Len; Var := (1, [0 => 1, others => 9]); T.T_Send (Var); Put_Line (Basic_Types.Representation.Image (Log_Bytes)); pragma Assert (Simple_Variable.Serialized_Length (Var, Len) = Success); pragma Assert (Simple_Variable.Serialization.To_Byte_Array (Bytes_To_Compare (Idx .. Idx + Len - 1), Var) = Success); - Idx := Idx + Len; + Idx := @ + Len; Var := (2, [0 => 2, 1 => 3, others => 9]); T.T_Send (Var); Put_Line (Basic_Types.Representation.Image (Log_Bytes)); pragma Assert (Simple_Variable.Serialized_Length (Var, Len) = Success); pragma Assert (Simple_Variable.Serialization.To_Byte_Array (Bytes_To_Compare (Idx .. Idx + Len - 1), Var) = Success); - Idx := Idx + Len; + Idx := @ + Len; Var := (3, [0 => 4, 1 => 5, 2 => 6, others => 9]); T.T_Send (Var); Put_Line (Basic_Types.Representation.Image (Log_Bytes)); pragma Assert (Simple_Variable.Serialized_Length (Var, Len) = Success); pragma Assert (Simple_Variable.Serialization.To_Byte_Array (Bytes_To_Compare (Idx .. Idx + Len - 1), Var) = Success); - Idx := Idx + Len; + Idx := @ + Len; Var := (4, [0 => 7, 1 => 8, 2 => 9, 3 => 10, others => 9]); T.T_Send (Var); Put_Line (Basic_Types.Representation.Image (Log_Bytes)); pragma Assert (Simple_Variable.Serialized_Length (Var, Len) = Success); pragma Assert (Simple_Variable.Serialization.To_Byte_Array (Bytes_To_Compare (Idx .. Idx + Len - 1), Var) = Success); - Idx := Idx + Len; + Idx := @ + Len; -- Make sure no events were thrown: Natural_Assert.Eq (T.Event_T_Recv_Sync_History.Get_Count, 0); diff --git a/src/components/memory_copier/test/component-memory_copier-implementation-tester.adb b/src/components/memory_copier/test/component-memory_copier-implementation-tester.adb index e059522c..668b5513 100644 --- a/src/components/memory_copier/test/component-memory_copier-implementation-tester.adb +++ b/src/components/memory_copier/test/component-memory_copier-implementation-tester.adb @@ -136,7 +136,7 @@ package body Component.Memory_Copier.Implementation.Tester is if not Self.Expect_Command_T_Send_Dropped then pragma Assert (False, "The component's queue filled up when Command_T_Send was called!"); else - Self.Command_T_Send_Dropped_Count := Self.Command_T_Send_Dropped_Count + 1; + Self.Command_T_Send_Dropped_Count := @ + 1; Self.Expect_Command_T_Send_Dropped := False; end if; end Command_T_Send_Dropped; diff --git a/src/components/memory_copier/test/memory_copier_tests-implementation.adb b/src/components/memory_copier/test/memory_copier_tests-implementation.adb index e026e0f2..088e6873 100644 --- a/src/components/memory_copier/test/memory_copier_tests-implementation.adb +++ b/src/components/memory_copier/test/memory_copier_tests-implementation.adb @@ -83,7 +83,7 @@ package body Memory_Copier_Tests.Implementation is while not Task_Exit.all and then Cnt < 2_000 loop -- Increment variables: - Cnt := Cnt + 1; + Cnt := @ + 1; if Task_Send_Response then -- Send a valid response: @@ -95,7 +95,7 @@ package body Memory_Copier_Tests.Implementation is -- Send a valid response: Sleep (4); Class_Self.all.Tester.Timeout_Tick_Send (((0, 0), 0)); - Tick_Count := Tick_Count + 1; + Tick_Count := @ + 1; if Tick_Count > 4 then Tick_Count := 0; Task_Send_Timeout := False; diff --git a/src/components/memory_dumper/test/component-memory_dumper-implementation-tester.adb b/src/components/memory_dumper/test/component-memory_dumper-implementation-tester.adb index 074337b3..649fd6e4 100644 --- a/src/components/memory_dumper/test/component-memory_dumper-implementation-tester.adb +++ b/src/components/memory_dumper/test/component-memory_dumper-implementation-tester.adb @@ -125,7 +125,7 @@ package body Component.Memory_Dumper.Implementation.Tester is if not Self.Expect_Command_T_Send_Dropped then pragma Assert (False, "The component's queue filled up when Command_T_Send was called!"); else - Self.Command_T_Send_Dropped_Count := Self.Command_T_Send_Dropped_Count + 1; + Self.Command_T_Send_Dropped_Count := @ + 1; Self.Expect_Command_T_Send_Dropped := False; end if; end Command_T_Send_Dropped; diff --git a/src/components/memory_manager/component-memory_manager-implementation.adb b/src/components/memory_manager/component-memory_manager-implementation.adb index d1959a58..1aa5d999 100644 --- a/src/components/memory_manager/component-memory_manager-implementation.adb +++ b/src/components/memory_manager/component-memory_manager-implementation.adb @@ -24,7 +24,7 @@ package body Component.Memory_Manager.Implementation is Status := Success; -- Set the ID: Id := Current_Id; - Current_Id := Current_Id + 1; + Current_Id := @ + 1; -- Set the new state, the memory is now in use. Current_State := In_Use; -- Update the data product. This needs to be done inside the protected diff --git a/src/components/memory_manager/test/component-memory_manager-implementation-tester.adb b/src/components/memory_manager/test/component-memory_manager-implementation-tester.adb index 61e4e1f8..cd9dfb9a 100644 --- a/src/components/memory_manager/test/component-memory_manager-implementation-tester.adb +++ b/src/components/memory_manager/test/component-memory_manager-implementation-tester.adb @@ -145,7 +145,7 @@ package body Component.Memory_Manager.Implementation.Tester is if not Self.Expect_Command_T_Send_Dropped then pragma Assert (False, "The component's queue filled up when Command_T_Send was called!"); else - Self.Command_T_Send_Dropped_Count := Self.Command_T_Send_Dropped_Count + 1; + Self.Command_T_Send_Dropped_Count := @ + 1; Self.Expect_Command_T_Send_Dropped := False; end if; end Command_T_Send_Dropped; diff --git a/src/components/memory_packetizer/component-memory_packetizer-implementation.adb b/src/components/memory_packetizer/component-memory_packetizer-implementation.adb index 5a34713d..5afb020d 100644 --- a/src/components/memory_packetizer/component-memory_packetizer-implementation.adb +++ b/src/components/memory_packetizer/component-memory_packetizer-implementation.adb @@ -120,7 +120,7 @@ package body Component.Memory_Packetizer.Implementation is delay until Self.Next_Period_Start; -- Set the next period relative to the current one to avoid period drift -- during high packet load. - Self.Next_Period_Start := Self.Next_Period_Start + Self.Time_Period; + Self.Next_Period_Start := @ + Self.Time_Period; Self.Num_Packets_Sent := 0; end if; @@ -164,17 +164,17 @@ package body Component.Memory_Packetizer.Implementation is -- Send the packet: Self.Packet_T_Send_If_Connected (Packet_To_Send); -- Increment the memory index: - Memory_Index := Memory_Index + Buffer_Length; + Memory_Index := @ + Buffer_Length; end; -- Increment the number of packets: - Self.Num_Packets_Sent := Self.Num_Packets_Sent + 1; + Self.Num_Packets_Sent := @ + 1; -- Increment the sequence count, only if we are tracking this id's sequence count: if Sequence_Count_Entry_Index >= Self.Sequence_Count_List'First and then Sequence_Count_Entry_Index <= Self.Sequence_Count_List'Last then - Sequence_Count := Sequence_Count + 1; + Sequence_Count := @ + 1; end if; end; end loop; diff --git a/src/components/memory_packetizer/test/component-memory_packetizer-implementation-tester.adb b/src/components/memory_packetizer/test/component-memory_packetizer-implementation-tester.adb index 7c0ca12b..3c409d78 100644 --- a/src/components/memory_packetizer/test/component-memory_packetizer-implementation-tester.adb +++ b/src/components/memory_packetizer/test/component-memory_packetizer-implementation-tester.adb @@ -126,7 +126,7 @@ package body Component.Memory_Packetizer.Implementation.Tester is if not Self.Expect_Memory_Dump_Send_Dropped then pragma Assert (False, "The component's queue filled up when Memory_Dump_Send was called!"); else - Self.Memory_Dump_Send_Dropped_Count := Self.Memory_Dump_Send_Dropped_Count + 1; + Self.Memory_Dump_Send_Dropped_Count := @ + 1; Self.Expect_Memory_Dump_Send_Dropped := False; end if; end Memory_Dump_Send_Dropped; @@ -138,7 +138,7 @@ package body Component.Memory_Packetizer.Implementation.Tester is if not Self.Expect_Command_T_Send_Dropped then pragma Assert (False, "The component's queue filled up when Command_T_Send was called!"); else - Self.Command_T_Send_Dropped_Count := Self.Command_T_Send_Dropped_Count + 1; + Self.Command_T_Send_Dropped_Count := @ + 1; Self.Expect_Command_T_Send_Dropped := False; end if; end Command_T_Send_Dropped; diff --git a/src/components/memory_packetizer_fixed_id/component-memory_packetizer_fixed_id-implementation.adb b/src/components/memory_packetizer_fixed_id/component-memory_packetizer_fixed_id-implementation.adb index 718091ac..25e12720 100644 --- a/src/components/memory_packetizer_fixed_id/component-memory_packetizer_fixed_id-implementation.adb +++ b/src/components/memory_packetizer_fixed_id/component-memory_packetizer_fixed_id-implementation.adb @@ -69,7 +69,7 @@ package body Component.Memory_Packetizer_Fixed_Id.Implementation is delay until Self.Next_Period_Start; -- Set the next period relative to the current one to avoid period drift -- during high packet load. - Self.Next_Period_Start := Self.Next_Period_Start + Self.Time_Period; + Self.Next_Period_Start := @ + Self.Time_Period; Self.Num_Packets_Sent := 0; end if; @@ -107,11 +107,11 @@ package body Component.Memory_Packetizer_Fixed_Id.Implementation is -- Send the packet: Self.Packet_T_Send_If_Connected (Packet_To_Send); -- Increment the memory index: - Memory_Index := Memory_Index + Buffer_Length; + Memory_Index := @ + Buffer_Length; end; -- Increment the number of packets: - Self.Num_Packets_Sent := Self.Num_Packets_Sent + 1; + Self.Num_Packets_Sent := @ + 1; end; end loop; end Memory_Dump_Recv_Async; diff --git a/src/components/memory_packetizer_fixed_id/test/component-memory_packetizer_fixed_id-implementation-tester.adb b/src/components/memory_packetizer_fixed_id/test/component-memory_packetizer_fixed_id-implementation-tester.adb index c37fc4cb..851665be 100644 --- a/src/components/memory_packetizer_fixed_id/test/component-memory_packetizer_fixed_id-implementation-tester.adb +++ b/src/components/memory_packetizer_fixed_id/test/component-memory_packetizer_fixed_id-implementation-tester.adb @@ -130,7 +130,7 @@ package body Component.Memory_Packetizer_Fixed_Id.Implementation.Tester is if not Self.Expect_Memory_Dump_Send_Dropped then pragma Assert (False, "The component's queue filled up when Memory_Dump_Send was called!"); else - Self.Memory_Dump_Send_Dropped_Count := Self.Memory_Dump_Send_Dropped_Count + 1; + Self.Memory_Dump_Send_Dropped_Count := @ + 1; Self.Expect_Memory_Dump_Send_Dropped := False; end if; end Memory_Dump_Send_Dropped; @@ -142,7 +142,7 @@ package body Component.Memory_Packetizer_Fixed_Id.Implementation.Tester is if not Self.Expect_Command_T_Send_Dropped then pragma Assert (False, "The component's queue filled up when Command_T_Send was called!"); else - Self.Command_T_Send_Dropped_Count := Self.Command_T_Send_Dropped_Count + 1; + Self.Command_T_Send_Dropped_Count := @ + 1; Self.Expect_Command_T_Send_Dropped := False; end if; end Command_T_Send_Dropped; diff --git a/src/components/memory_stuffer/test/component-memory_stuffer-implementation-tester.adb b/src/components/memory_stuffer/test/component-memory_stuffer-implementation-tester.adb index cf6d3671..dbbd9381 100644 --- a/src/components/memory_stuffer/test/component-memory_stuffer-implementation-tester.adb +++ b/src/components/memory_stuffer/test/component-memory_stuffer-implementation-tester.adb @@ -137,7 +137,7 @@ package body Component.Memory_Stuffer.Implementation.Tester is if not Self.Expect_Tick_T_Send_Dropped then pragma Assert (False, "The component's queue filled up when Tick_T_Send was called!"); else - Self.Tick_T_Send_Dropped_Count := Self.Tick_T_Send_Dropped_Count + 1; + Self.Tick_T_Send_Dropped_Count := @ + 1; Self.Expect_Tick_T_Send_Dropped := False; end if; end Tick_T_Send_Dropped; @@ -149,7 +149,7 @@ package body Component.Memory_Stuffer.Implementation.Tester is if not Self.Expect_Command_T_Send_Dropped then pragma Assert (False, "The component's queue filled up when Command_T_Send was called!"); else - Self.Command_T_Send_Dropped_Count := Self.Command_T_Send_Dropped_Count + 1; + Self.Command_T_Send_Dropped_Count := @ + 1; Self.Expect_Command_T_Send_Dropped := False; end if; end Command_T_Send_Dropped; @@ -161,7 +161,7 @@ package body Component.Memory_Stuffer.Implementation.Tester is if not Self.Expect_Memory_Region_Copy_T_Send_Dropped then pragma Assert (False, "The component's queue filled up when Memory_Region_Copy_T_Send was called!"); else - Self.Memory_Region_Copy_T_Send_Dropped_Count := Self.Memory_Region_Copy_T_Send_Dropped_Count + 1; + Self.Memory_Region_Copy_T_Send_Dropped_Count := @ + 1; Self.Expect_Memory_Region_Copy_T_Send_Dropped := False; end if; end Memory_Region_Copy_T_Send_Dropped; diff --git a/src/components/parameter_store/test/component-parameter_store-implementation-tester.adb b/src/components/parameter_store/test/component-parameter_store-implementation-tester.adb index 731793e0..098f8739 100644 --- a/src/components/parameter_store/test/component-parameter_store-implementation-tester.adb +++ b/src/components/parameter_store/test/component-parameter_store-implementation-tester.adb @@ -131,7 +131,7 @@ package body Component.Parameter_Store.Implementation.Tester is if not Self.Expect_Command_T_Send_Dropped then pragma Assert (False, "The component's queue filled up when Command_T_Send was called!"); else - Self.Command_T_Send_Dropped_Count := Self.Command_T_Send_Dropped_Count + 1; + Self.Command_T_Send_Dropped_Count := @ + 1; Self.Expect_Command_T_Send_Dropped := False; end if; end Command_T_Send_Dropped; @@ -143,7 +143,7 @@ package body Component.Parameter_Store.Implementation.Tester is if not Self.Expect_Parameters_Memory_Region_T_Send_Dropped then pragma Assert (False, "The component's queue filled up when Parameters_Memory_Region_T_Send was called!"); else - Self.Parameters_Memory_Region_T_Send_Dropped_Count := Self.Parameters_Memory_Region_T_Send_Dropped_Count + 1; + Self.Parameters_Memory_Region_T_Send_Dropped_Count := @ + 1; Self.Expect_Parameters_Memory_Region_T_Send_Dropped := False; end if; end Parameters_Memory_Region_T_Send_Dropped; diff --git a/src/components/parameters/test/component-parameters-implementation-tester.adb b/src/components/parameters/test/component-parameters-implementation-tester.adb index d5e7a331..c315ec8a 100644 --- a/src/components/parameters/test/component-parameters-implementation-tester.adb +++ b/src/components/parameters/test/component-parameters-implementation-tester.adb @@ -176,7 +176,7 @@ package body Component.Parameters.Implementation.Tester is if not Self.Expect_Command_T_Send_Dropped then pragma Assert (False, "The component's queue filled up when Command_T_Send was called!"); else - Self.Command_T_Send_Dropped_Count := Self.Command_T_Send_Dropped_Count + 1; + Self.Command_T_Send_Dropped_Count := @ + 1; Self.Expect_Command_T_Send_Dropped := False; end if; end Command_T_Send_Dropped; @@ -188,7 +188,7 @@ package body Component.Parameters.Implementation.Tester is if not Self.Expect_Parameters_Memory_Region_T_Send_Dropped then pragma Assert (False, "The component's queue filled up when Parameters_Memory_Region_T_Send was called!"); else - Self.Parameters_Memory_Region_T_Send_Dropped_Count := Self.Parameters_Memory_Region_T_Send_Dropped_Count + 1; + Self.Parameters_Memory_Region_T_Send_Dropped_Count := @ + 1; Self.Expect_Parameters_Memory_Region_T_Send_Dropped := False; end if; end Parameters_Memory_Region_T_Send_Dropped; diff --git a/src/components/pid_controller/component-pid_controller-implementation.adb b/src/components/pid_controller/component-pid_controller-implementation.adb index c02434ac..2f547a15 100644 --- a/src/components/pid_controller/component-pid_controller-implementation.adb +++ b/src/components/pid_controller/component-pid_controller-implementation.adb @@ -180,7 +180,7 @@ package body Component.Pid_Controller.Implementation is Self.Packet_T_Send_If_Connected (Self.Diagnostic_Packet); -- Increment sequence count: - Self.Diagnostic_Packet.Header.Sequence_Count := Self.Diagnostic_Packet.Header.Sequence_Count + 1; + Self.Diagnostic_Packet.Header.Sequence_Count := @ + 1; -- Reset diagnostic subpacket counter: Self.Diagnostic_Subpacket_Count := 0; @@ -206,7 +206,7 @@ package body Component.Pid_Controller.Implementation is Pid_Diagnostic_Subpacket.Serialization.To_Byte_Array ((Measured_Angle => Arg.Measured_Value, Reference_Angle => Arg.Commanded_Value, Current_Out_Angle => Pid_Control_Output)); -- Increment the diagnostic subpacket count: - Self.Diagnostic_Subpacket_Count := Self.Diagnostic_Subpacket_Count + 1; + Self.Diagnostic_Subpacket_Count := @ + 1; -- Decrement the count. If it is 0 here (is. was equal to 1) we will not return here so we need to send what we have of the packet. Self.Diagnostic_Counter.Decrement_Count (1); diff --git a/src/components/pid_controller/test/pid_controller_tests-implementation.adb b/src/components/pid_controller/test/pid_controller_tests-implementation.adb index cb50b211..f198550e 100644 --- a/src/components/pid_controller/test/pid_controller_tests-implementation.adb +++ b/src/components/pid_controller/test/pid_controller_tests-implementation.adb @@ -100,7 +100,7 @@ package body Pid_Controller_Tests.Implementation is -- Induce the packet to send while Subpacket_Duration > Extra_Packets loop - Subpacket_Duration := Subpacket_Duration - 1; + Subpacket_Duration := @ - 1; T.Control_Input_U_Send (((0, 0), 1.0, 1.0, 1.0, False)); Natural_Assert.Eq (T.Packet_T_Recv_Sync_History.Get_Count, 1); diff --git a/src/components/precision_time_protocol_master/component-precision_time_protocol_master-implementation.adb b/src/components/precision_time_protocol_master/component-precision_time_protocol_master-implementation.adb index e49de4d3..c546b8c0 100644 --- a/src/components/precision_time_protocol_master/component-precision_time_protocol_master-implementation.adb +++ b/src/components/precision_time_protocol_master/component-precision_time_protocol_master-implementation.adb @@ -52,7 +52,7 @@ package body Component.Precision_Time_Protocol_Master.Implementation is begin -- We increment the transaction count number prior to sending out the message. -- Transaction_Number data product is defined as the last sent sequence number. - Self.Transaction_Count := Self.Transaction_Count + 1; + Self.Transaction_Count := @ + 1; -- Send out sync message: Self.Ptp_Time_Message_T_Send ((Message_Type => Sync, Transaction_Count => Self.Transaction_Count, Time_Stamp => Time_Stamp)); @@ -66,7 +66,7 @@ package body Component.Precision_Time_Protocol_Master.Implementation is end if; -- Increment cycle count. - Self.Cycle_Count := (Self.Cycle_Count + 1) mod Self.Sync_Period; + Self.Cycle_Count := (@ + 1) mod Self.Sync_Period; end Tick_T_Recv_Async; -- The command receive connector. @@ -106,14 +106,14 @@ package body Component.Precision_Time_Protocol_Master.Implementation is Self.Ptp_Time_Message_T_Send ((Message_Type => Delay_Response, Transaction_Count => Self.Transaction_Count, Time_Stamp => Receive_Time)); -- Update data products: - Self.Delay_Request_Message_Count := Self.Delay_Request_Message_Count + 1; + Self.Delay_Request_Message_Count := @ + 1; Self.Data_Product_T_Send_If_Connected (Self.Data_Products.Delay_Request_Messages_Received (Receive_Time, (Value => Self.Delay_Request_Message_Count))); else -- This is an old or out of order transaction. Report it and do not send a delay response. Self.Event_T_Send_If_Connected (Self.Events.Unexpected_Transaction_Count (Receive_Time, (Message => Message, Expected_Transaction_Count => Self.Transaction_Count))); -- Update data product: - Self.Unexpected_Message_Count := Self.Unexpected_Message_Count + 1; + Self.Unexpected_Message_Count := @ + 1; Self.Data_Product_T_Send_If_Connected (Self.Data_Products.Unexpected_Messages_Received (Receive_Time, (Value => Self.Unexpected_Message_Count))); end if; -- These should only be sent by the master, thus we should not be getting any of these. @@ -122,7 +122,7 @@ package body Component.Precision_Time_Protocol_Master.Implementation is Self.Event_T_Send_If_Connected (Self.Events.Unexpected_Message_Type (Receive_Time, Message)); -- Update data product: - Self.Unexpected_Message_Count := Self.Unexpected_Message_Count + 1; + Self.Unexpected_Message_Count := @ + 1; Self.Data_Product_T_Send_If_Connected (Self.Data_Products.Unexpected_Messages_Received (Receive_Time, (Value => Self.Unexpected_Message_Count))); end case; end Ptp_Time_Message_Receive_T_Recv_Async; @@ -135,7 +135,7 @@ package body Component.Precision_Time_Protocol_Master.Implementation is Self.Ptp_Time_Message_T_Send ((Message_Type => Follow_Up, Transaction_Count => Self.Transaction_Count, Time_Stamp => Arg)); -- Update data products: - Self.Follow_Up_Message_Count := Self.Follow_Up_Message_Count + 1; + Self.Follow_Up_Message_Count := @ + 1; Self.Data_Product_T_Send_If_Connected (Self.Data_Products.Follow_Up_Messages_Sent (Arg, (Value => Self.Follow_Up_Message_Count))); end Follow_Up_Sys_Time_T_Recv_Async; diff --git a/src/components/precision_time_protocol_master/test/component-precision_time_protocol_master-implementation-tester.adb b/src/components/precision_time_protocol_master/test/component-precision_time_protocol_master-implementation-tester.adb index 61af16f6..a96f1ede 100644 --- a/src/components/precision_time_protocol_master/test/component-precision_time_protocol_master-implementation-tester.adb +++ b/src/components/precision_time_protocol_master/test/component-precision_time_protocol_master-implementation-tester.adb @@ -137,7 +137,7 @@ package body Component.Precision_Time_Protocol_Master.Implementation.Tester is if not Self.Expect_Tick_T_Send_Dropped then pragma Assert (False, "The component's queue filled up when Tick_T_Send was called!"); else - Self.Tick_T_Send_Dropped_Count := Self.Tick_T_Send_Dropped_Count + 1; + Self.Tick_T_Send_Dropped_Count := @ + 1; Self.Expect_Tick_T_Send_Dropped := False; end if; end Tick_T_Send_Dropped; @@ -149,7 +149,7 @@ package body Component.Precision_Time_Protocol_Master.Implementation.Tester is if not Self.Expect_Command_T_Send_Dropped then pragma Assert (False, "The component's queue filled up when Command_T_Send was called!"); else - Self.Command_T_Send_Dropped_Count := Self.Command_T_Send_Dropped_Count + 1; + Self.Command_T_Send_Dropped_Count := @ + 1; Self.Expect_Command_T_Send_Dropped := False; end if; end Command_T_Send_Dropped; @@ -161,7 +161,7 @@ package body Component.Precision_Time_Protocol_Master.Implementation.Tester is if not Self.Expect_Ptp_Time_Message_Receive_T_Send_Dropped then pragma Assert (False, "The component's queue filled up when Ptp_Time_Message_Receive_T_Send was called!"); else - Self.Ptp_Time_Message_Receive_T_Send_Dropped_Count := Self.Ptp_Time_Message_Receive_T_Send_Dropped_Count + 1; + Self.Ptp_Time_Message_Receive_T_Send_Dropped_Count := @ + 1; Self.Expect_Ptp_Time_Message_Receive_T_Send_Dropped := False; end if; end Ptp_Time_Message_Receive_T_Send_Dropped; @@ -173,7 +173,7 @@ package body Component.Precision_Time_Protocol_Master.Implementation.Tester is if not Self.Expect_Follow_Up_Sys_Time_T_Send_Dropped then pragma Assert (False, "The component's queue filled up when Follow_Up_Sys_Time_T_Send was called!"); else - Self.Follow_Up_Sys_Time_T_Send_Dropped_Count := Self.Follow_Up_Sys_Time_T_Send_Dropped_Count + 1; + Self.Follow_Up_Sys_Time_T_Send_Dropped_Count := @ + 1; Self.Expect_Follow_Up_Sys_Time_T_Send_Dropped := False; end if; end Follow_Up_Sys_Time_T_Send_Dropped; diff --git a/src/components/product_database/test/tests-implementation.adb b/src/components/product_database/test/tests-implementation.adb index b59acc66..fc16e022 100644 --- a/src/components/product_database/test/tests-implementation.adb +++ b/src/components/product_database/test/tests-implementation.adb @@ -398,7 +398,7 @@ package body Tests.Implementation is Natural_Assert.Eq (T.Packet_T_Recv_Sync_History.Get_Count, Cnt); Natural_Assert.Eq (T.Dump_Packet_History.Get_Count, Cnt); Data_Product_Assert.Eq (T.Dump_Packet_History.Get (Cnt), D_Prod); - Cnt := Cnt + 1; + Cnt := @ + 1; end loop; end Test_Nominal_Dump; @@ -438,7 +438,7 @@ package body Tests.Implementation is Natural_Assert.Eq (T.Data_Product_T_Recv_Sync_History.Get_Count, Cnt); Natural_Assert.Eq (T.Data_Product_Poly_Type_Dump_History.Get_Count, Cnt); Data_Product_Poly_Type_Assert.Eq (T.Data_Product_Poly_Type_Dump_History.Get (Cnt), (Time => D_Prod.Header.Time, Id => Id, Data => [0, 0, 0, Basic_Types.Byte (Id)])); - Cnt := Cnt + 1; + Cnt := @ + 1; end loop; -- Induce an extraction failure. @@ -475,7 +475,7 @@ package body Tests.Implementation is Natural_Assert.Eq (T.Event_T_Recv_Sync_History.Get_Count, Cnt); Natural_Assert.Eq (T.Data_Product_Fetch_Id_Not_Available_History.Get_Count, Cnt); Data_Product_Id_Assert.Eq (T.Data_Product_Fetch_Id_Not_Available_History.Get (Cnt), (Id => Id)); - Cnt := Cnt + 1; + Cnt := @ + 1; end loop; -- Make sure events were thrown: @@ -492,7 +492,7 @@ package body Tests.Implementation is Natural_Assert.Eq (T.Event_T_Recv_Sync_History.Get_Count, Cnt + 10); Natural_Assert.Eq (T.Data_Product_Dump_Id_Not_Available_History.Get_Count, Cnt); Data_Product_Id_Assert.Eq (T.Data_Product_Dump_Id_Not_Available_History.Get (Cnt), (Id => Id)); - Cnt := Cnt + 1; + Cnt := @ + 1; end loop; -- Try to dump some data products poly types that are not available: @@ -507,7 +507,7 @@ package body Tests.Implementation is -- Poly info event ignored here, checked in nominal test. Natural_Assert.Eq (T.Data_Product_Dump_Poly_Id_Not_Available_History.Get_Count, Cnt); Data_Product_Id_Assert.Eq (T.Data_Product_Dump_Poly_Id_Not_Available_History.Get (Cnt), (Id => Id)); - Cnt := Cnt + 1; + Cnt := @ + 1; end loop; -- Store some data: diff --git a/src/components/product_packetizer/component-product_packetizer-implementation.adb b/src/components/product_packetizer/component-product_packetizer-implementation.adb index 302c55c3..a7ef0a74 100644 --- a/src/components/product_packetizer/component-product_packetizer-implementation.adb +++ b/src/components/product_packetizer/component-product_packetizer-implementation.adb @@ -46,7 +46,7 @@ package body Component.Product_Packetizer.Implementation is -- If there is not a duplicate period, then multiply into our product: if not Duplicate_Period then - Common_Multiple := Common_Multiple * Current_Period; + Common_Multiple := @ * Current_Period; end if; end if; end loop; @@ -159,7 +159,7 @@ package body Component.Product_Packetizer.Implementation is end if; -- Increment the current index: - Curr_Index := Curr_Index + Sys_Time.Serialization.Serialized_Length; + Curr_Index := @ + Sys_Time.Serialization.Serialized_Length; end if; -- If the status was such that we need to copy the data to the packet then @@ -189,7 +189,7 @@ package body Component.Product_Packetizer.Implementation is end if; -- Increment the index by the size of the data product: - Curr_Index := Curr_Index + Item.Size; + Curr_Index := @ + Item.Size; end loop; -- If the packet time has not been set, then set it: @@ -221,7 +221,7 @@ package body Component.Product_Packetizer.Implementation is -- Build and send packet: Self.Packet_T_Send_If_Connected (Self.Build_Packet (Arg.Time, Packet_Desc)); -- Increment sequence count: - Packet_Desc.Count := Packet_Desc.Count + 1; + Packet_Desc.Count := @ + 1; end Send_Packet; begin -- Handle any commands in queue. Service up to N commands per tick: @@ -244,7 +244,7 @@ package body Component.Product_Packetizer.Implementation is end loop; -- Increment internal counter: - Self.Count := Self.Count + 1; + Self.Count := @ + 1; -- Check roll over: if Self.Count > Self.Roll_Over_Value then diff --git a/src/components/product_packetizer/test/component-product_packetizer-implementation-tester.adb b/src/components/product_packetizer/test/component-product_packetizer-implementation-tester.adb index 04a85f30..34088afe 100644 --- a/src/components/product_packetizer/test/component-product_packetizer-implementation-tester.adb +++ b/src/components/product_packetizer/test/component-product_packetizer-implementation-tester.adb @@ -169,7 +169,7 @@ package body Component.Product_Packetizer.Implementation.Tester is if not Self.Expect_Command_T_Send_Dropped then pragma Assert (False, "The component's queue filled up when Command_T_Send was called!"); else - Self.Command_T_Send_Dropped_Count := Self.Command_T_Send_Dropped_Count + 1; + Self.Command_T_Send_Dropped_Count := @ + 1; Self.Expect_Command_T_Send_Dropped := False; end if; end Command_T_Send_Dropped; diff --git a/src/components/queue_monitor/component-queue_monitor-implementation.adb b/src/components/queue_monitor/component-queue_monitor-implementation.adb index 4a49ed54..fe4ac973 100644 --- a/src/components/queue_monitor/component-queue_monitor-implementation.adb +++ b/src/components/queue_monitor/component-queue_monitor-implementation.adb @@ -59,16 +59,16 @@ package body Component.Queue_Monitor.Implementation is -- Dispatching call to component's overridden method, because the type of -- comp is Component.Instance'Class: Self.Packet_To_Send.Buffer (Idx) := Comp.all.Get_Queue_Current_Percent_Used; - Idx := Idx + 1; + Idx := @ + 1; Self.Packet_To_Send.Buffer (Idx) := Comp.all.Get_Queue_Maximum_Percent_Used; - Idx := Idx + 1; + Idx := @ + 1; end loop; pragma Assert (Idx = Self.Packet_To_Send.Header.Buffer_Length, "Length calculation is wrong."); -- Send packet; Self.Packet_To_Send.Header.Time := Self.Sys_Time_T_Get; Self.Packet_T_Send (Self.Packet_To_Send); - Self.Packet_To_Send.Header.Sequence_Count := Self.Packet_To_Send.Header.Sequence_Count + 1; + Self.Packet_To_Send.Header.Sequence_Count := @ + 1; end if; -- Increment the packet count: diff --git a/src/components/rate_group/component-rate_group-implementation.adb b/src/components/rate_group/component-rate_group-implementation.adb index 306c7866..895690b8 100644 --- a/src/components/rate_group/component-rate_group-implementation.adb +++ b/src/components/rate_group/component-rate_group-implementation.adb @@ -105,7 +105,7 @@ package body Component.Rate_Group.Implementation is -- data product periodically. if Self.Ticks_Per_Timing_Report > 0 then -- Increment the number of ticks. - Self.Num_Ticks := Self.Num_Ticks + 1; + Self.Num_Ticks := @ + 1; -- If we are at the period then send out the data product: if Self.Num_Ticks >= Self.Ticks_Per_Timing_Report then @@ -131,7 +131,7 @@ package body Component.Rate_Group.Implementation is end if; end if; else - Self.Ticks_Since_Startup := Self.Ticks_Since_Startup + 1; + Self.Ticks_Since_Startup := @ + 1; end if; -- Check for cycle slip. @@ -140,7 +140,7 @@ package body Component.Rate_Group.Implementation is -- been put on our queue before we have finished executing the last Tick then -- our rate group has slipped. Sad day :( if Self.Queue.Num_Elements > 0 then - Self.Num_Cycle_Slips := Self.Num_Cycle_Slips + 1; + Self.Num_Cycle_Slips := @ + 1; Self.Event_T_Send_If_Connected (Self.Events.Cycle_Slip (Stop_Wall_Time, (Slipped_Tick => Arg, Num_Slips => Self.Num_Cycle_Slips))); end if; diff --git a/src/components/rate_group/test/component-rate_group-implementation-tester.adb b/src/components/rate_group/test/component-rate_group-implementation-tester.adb index 0b2d03cc..1d4e5135 100644 --- a/src/components/rate_group/test/component-rate_group-implementation-tester.adb +++ b/src/components/rate_group/test/component-rate_group-implementation-tester.adb @@ -76,7 +76,7 @@ package body Component.Rate_Group.Implementation.Tester is overriding procedure Tick_T_Recv_Sync (Self : in out Instance; Arg : in Tick.T) is begin -- Increment the system time to simulate an executing component: - Self.System_Time := (Self.System_Time.Seconds + Self.Seconds_Delta, Self.System_Time.Subseconds + Self.Subseconds_Delta); + Self.System_Time := (@.Seconds + Self.Seconds_Delta, @.Subseconds + Self.Subseconds_Delta); -- Push the argument onto the test history for looking at later: Self.Tick_T_Recv_Sync_History.Push (Arg); end Tick_T_Recv_Sync; @@ -126,7 +126,7 @@ package body Component.Rate_Group.Implementation.Tester is if not Self.Expect_Tick_T_Send_Dropped then pragma Assert (False, "The component's queue filled up when Tick_T_Send was called!"); else - Self.Tick_T_Send_Dropped_Count := Self.Tick_T_Send_Dropped_Count + 1; + Self.Tick_T_Send_Dropped_Count := @ + 1; Self.Expect_Tick_T_Send_Dropped := False; end if; end Tick_T_Send_Dropped; diff --git a/src/components/sequence_store/component-sequence_store-implementation.adb b/src/components/sequence_store/component-sequence_store-implementation.adb index 5b1a5474..c7b42d38 100644 --- a/src/components/sequence_store/component-sequence_store-implementation.adb +++ b/src/components/sequence_store/component-sequence_store-implementation.adb @@ -239,7 +239,7 @@ package body Component.Sequence_Store.Implementation is Sequence_Length => Slot_Header.Seq_Header.Length )); -- Increment the index: - Idx := Idx + Packed_Slot_Summary.Size_In_Bytes; + Idx := @ + Packed_Slot_Summary.Size_In_Bytes; end; end loop; diff --git a/src/components/sequence_store/test/component-sequence_store-implementation-tester.adb b/src/components/sequence_store/test/component-sequence_store-implementation-tester.adb index 000bb9ff..65804b83 100644 --- a/src/components/sequence_store/test/component-sequence_store-implementation-tester.adb +++ b/src/components/sequence_store/test/component-sequence_store-implementation-tester.adb @@ -145,7 +145,7 @@ package body Component.Sequence_Store.Implementation.Tester is if not Self.Expect_Command_T_Send_Dropped then pragma Assert (False, "The component's queue filled up when Command_T_Send was called!"); else - Self.Command_T_Send_Dropped_Count := Self.Command_T_Send_Dropped_Count + 1; + Self.Command_T_Send_Dropped_Count := @ + 1; Self.Expect_Command_T_Send_Dropped := False; end if; end Command_T_Send_Dropped; @@ -157,7 +157,7 @@ package body Component.Sequence_Store.Implementation.Tester is if not Self.Expect_Sequence_Store_Memory_Region_Store_T_Send_Dropped then pragma Assert (False, "The component's queue filled up when Sequence_Store_Memory_Region_Store_T_Send was called!"); else - Self.Sequence_Store_Memory_Region_Store_T_Send_Dropped_Count := Self.Sequence_Store_Memory_Region_Store_T_Send_Dropped_Count + 1; + Self.Sequence_Store_Memory_Region_Store_T_Send_Dropped_Count := @ + 1; Self.Expect_Sequence_Store_Memory_Region_Store_T_Send_Dropped := False; end if; end Sequence_Store_Memory_Region_Store_T_Send_Dropped; diff --git a/src/components/sequence_store/test/sequence_store_tests-implementation.adb b/src/components/sequence_store/test/sequence_store_tests-implementation.adb index 6ab71b67..02248afd 100644 --- a/src/components/sequence_store/test/sequence_store_tests-implementation.adb +++ b/src/components/sequence_store/test/sequence_store_tests-implementation.adb @@ -110,7 +110,7 @@ package body Sequence_Store_Tests.Implementation is Id => Slot_0_Header.Seq_Header.Id, Sequence_Length => Slot_0_Header.Seq_Header.Length )); - Idx := Idx + Packed_Slot_Summary.Size_In_Bytes; + Idx := @ + Packed_Slot_Summary.Size_In_Bytes; -- Serialize slot 2 data: Pkt.Buffer (Idx .. Idx + Packed_Slot_Summary.Size_In_Bytes - 1) := @@ -119,7 +119,7 @@ package body Sequence_Store_Tests.Implementation is Id => Slot_1_Header.Seq_Header.Id, Sequence_Length => Slot_1_Header.Seq_Header.Length )); - Idx := Idx + Packed_Slot_Summary.Size_In_Bytes; + Idx := @ + Packed_Slot_Summary.Size_In_Bytes; -- Serialize slot 3 data: Pkt.Buffer (Idx .. Idx + Packed_Slot_Summary.Size_In_Bytes - 1) := @@ -128,7 +128,7 @@ package body Sequence_Store_Tests.Implementation is Id => Slot_2_Header.Seq_Header.Id, Sequence_Length => Slot_2_Header.Seq_Header.Length )); - Idx := Idx + Packed_Slot_Summary.Size_In_Bytes; + Idx := @ + Packed_Slot_Summary.Size_In_Bytes; -- Serialize slot 4 data: Pkt.Buffer (Idx .. Idx + Packed_Slot_Summary.Size_In_Bytes - 1) := @@ -137,7 +137,7 @@ package body Sequence_Store_Tests.Implementation is Id => Slot_3_Header.Seq_Header.Id, Sequence_Length => Slot_3_Header.Seq_Header.Length )); - Idx := Idx + Packed_Slot_Summary.Size_In_Bytes; + Idx := @ + Packed_Slot_Summary.Size_In_Bytes; return Pkt; end Create_Summary_Packet; @@ -1045,7 +1045,7 @@ package body Sequence_Store_Tests.Implementation is Validity => Undefined), Seq_Header => (Crc => [0, 0], Version => 0, Category => 0, Id => 54, Length => 12)); -- Corrupt CRC - Seq_Header.Crc (1) := Seq_Header.Crc (1) + 1; + Seq_Header.Crc (1) := @ + 1; -- OK, first let's try to send a sequence: T.Sequence_Store_Memory_Region_Store_T_Send ((Slot => 1, Sequence_Region => Seq_Region)); @@ -1077,10 +1077,10 @@ package body Sequence_Store_Tests.Implementation is -- Again -- Fix CRC - Seq_Header.Crc (1) := Seq_Header.Crc (1) - 1; + Seq_Header.Crc (1) := @ - 1; -- Set length to bad, this will show up as a CRC error. - Seq_Header.Length := Seq_Header.Length + 1; - Seq_Region.Length := Seq_Region.Length + 1; + Seq_Header.Length := @ + 1; + Seq_Region.Length := @ + 1; -- OK, first let's try to send a sequence : T.Sequence_Store_Memory_Region_Store_T_Send ((Slot => 1, Sequence_Region => Seq_Region)); @@ -1115,13 +1115,13 @@ package body Sequence_Store_Tests.Implementation is -- -- Reset lengths: - Seq_Header.Length := Seq_Header.Length - 1; - Seq_Region.Length := Seq_Region.Length - 1; + Seq_Header.Length := @ - 1; + Seq_Region.Length := @ - 1; -- OK, now if the region is too small to hold the entire sequence we -- should get an error thrown. So let's make the region too small -- by a single byte. - Seq_Region.Length := Seq_Region.Length - 1; + Seq_Region.Length := @ - 1; -- OK, first let's try to send a sequence: T.Sequence_Store_Memory_Region_Store_T_Send ((Slot => 1, Sequence_Region => Seq_Region)); diff --git a/src/components/stack_monitor/component-stack_monitor-implementation.adb b/src/components/stack_monitor/component-stack_monitor-implementation.adb index d1a578dc..f852edc3 100644 --- a/src/components/stack_monitor/component-stack_monitor-implementation.adb +++ b/src/components/stack_monitor/component-stack_monitor-implementation.adb @@ -95,7 +95,7 @@ package body Component.Stack_Monitor.Implementation is -- to save execution time. while not Start_Found loop -- Move the stack index back 100 bytes. - Start_Index := Start_Index - 100; + Start_Index := @ - 100; -- If the start index went negative then reset it to zero and we we will start from there. if Start_Index <= 0 then @@ -114,7 +114,7 @@ package body Component.Stack_Monitor.Implementation is Start_Found := True; end if; - Start_Index := Start_Index + 1; + Start_Index := @ + 1; end loop; end loop; @@ -128,7 +128,7 @@ package body Component.Stack_Monitor.Implementation is if Stack_Bytes (Index) /= 16#CC# then exit; end if; - Index := Index + 1; + Index := @ + 1; end loop; -- Ok, we found the first bye not matching the pattern. Save the index we found to speed up this @@ -167,9 +167,9 @@ package body Component.Stack_Monitor.Implementation is -- Calculate the task usage for each task in our list: for Task_Info_Idx in Self.Tasks'Range loop Self.Packet_To_Send.Buffer (Idx) := Calculate_Stack_Percent_Usage (Self.Tasks (Task_Info_Idx), Self.Stack_Indexes.all (Task_Info_Idx)); - Idx := Idx + 1; + Idx := @ + 1; Self.Packet_To_Send.Buffer (Idx) := Calculate_Secondary_Stack_Percent_Usage (Self.Tasks (Task_Info_Idx)); - Idx := Idx + 1; + Idx := @ + 1; end loop; -- Make sure the right number of bytes were filled in in the packet. pragma Assert (Idx - Self.Packet_To_Send.Buffer'First = Self.Packet_To_Send.Header.Buffer_Length); @@ -177,7 +177,7 @@ package body Component.Stack_Monitor.Implementation is -- Timestamp and send the packet: Self.Packet_To_Send.Header.Time := Self.Sys_Time_T_Get; Self.Packet_T_Send_If_Connected (Self.Packet_To_Send); - Self.Packet_To_Send.Header.Sequence_Count := Self.Packet_To_Send.Header.Sequence_Count + 1; + Self.Packet_To_Send.Header.Sequence_Count := @ + 1; end if; -- Increment the count: diff --git a/src/components/task_watchdog/component-task_watchdog-implementation.adb b/src/components/task_watchdog/component-task_watchdog-implementation.adb index 3d635df5..1ef78ad7 100644 --- a/src/components/task_watchdog/component-task_watchdog-implementation.adb +++ b/src/components/task_watchdog/component-task_watchdog-implementation.adb @@ -147,7 +147,7 @@ package body Component.Task_Watchdog.Implementation is -- Note: We won't overflow this based on assertions in Init. To_Send.Buffer (Product_Buffer_Index) := State_Byte; if Product_Buffer_Index < Data_Product_Types.Data_Product_Buffer_Length_Type'Last then - Product_Buffer_Index := Product_Buffer_Index + 1; + Product_Buffer_Index := @ + 1; end if; State_Byte := 0; end if; diff --git a/src/components/task_watchdog/watchdog_list/watchdog_list.adb b/src/components/task_watchdog/watchdog_list/watchdog_list.adb index f2953c70..10237d4b 100644 --- a/src/components/task_watchdog/watchdog_list/watchdog_list.adb +++ b/src/components/task_watchdog/watchdog_list/watchdog_list.adb @@ -72,7 +72,7 @@ package body Watchdog_List is -- Increment the count if needed if Self.Task_Watchdog_Pet_Connections (Index).Missed_Pet_Count <= Self.Task_Watchdog_Pet_Connections (Index).Missed_Pet_Limit then - Self.Task_Watchdog_Pet_Connections (Index).Missed_Pet_Count := Self.Task_Watchdog_Pet_Connections (Index).Missed_Pet_Count + 1; + Self.Task_Watchdog_Pet_Connections (Index).Missed_Pet_Count := @ + 1; end if; return Return_Status; end Check_Watchdog_Pets; diff --git a/src/components/tick_divider/component-tick_divider-implementation.adb b/src/components/tick_divider/component-tick_divider-implementation.adb index d0411b09..5d454576 100644 --- a/src/components/tick_divider/component-tick_divider-implementation.adb +++ b/src/components/tick_divider/component-tick_divider-implementation.adb @@ -29,7 +29,7 @@ package body Component.Tick_Divider.Implementation is -- is disabled, thus it should not be included in the calculation. Divider := Self.Dividers (Index); if Divider > 0 then - Self.Max_Count := Self.Max_Count * Divider; + Self.Max_Count := @ * Divider; end if; end loop; @@ -62,7 +62,7 @@ package body Component.Tick_Divider.Implementation is -- never called. This behavior is by design. -- This increment will overflow because Self.Max_Count < Natural'Last -- according to check in the Init. - Self.Count := (Self.Count + 1) mod Self.Max_Count; + Self.Count := (@ + 1) mod Self.Max_Count; end Tick_T_Recv_Sync; overriding procedure Tick_T_Send_Dropped (Self : in out Instance; Index : in Tick_T_Send_Index; Arg : in Tick.T) is diff --git a/src/components/tick_listener/component-tick_listener-implementation.adb b/src/components/tick_listener/component-tick_listener-implementation.adb index b0225b43..4b06b173 100644 --- a/src/components/tick_listener/component-tick_listener-implementation.adb +++ b/src/components/tick_listener/component-tick_listener-implementation.adb @@ -30,7 +30,7 @@ package body Component.Tick_Listener.Implementation is begin -- Increment the count: if Count /= Natural'Last then - Count := Count + 1; + Count := @ + 1; end if; end Increment_Count; diff --git a/src/components/ticker/component-ticker-implementation.adb b/src/components/ticker/component-ticker-implementation.adb index 8d98203c..7300601d 100644 --- a/src/components/ticker/component-ticker-implementation.adb +++ b/src/components/ticker/component-ticker-implementation.adb @@ -20,10 +20,10 @@ package body Component.Ticker.Implementation is -- Send the tick and update the count: Self.Tick_T_Send ((Time => Self.Sys_Time_T_Get, Count => Self.Count)); - Self.Count := Self.Count + 1; + Self.Count := @ + 1; -- Calculate the next wake-up time: - Self.Next_Period := Self.Next_Period + Self.Period; + Self.Next_Period := @ + Self.Period; end Cycle; end Component.Ticker.Implementation; diff --git a/src/components/time_at_tone_master/component-time_at_tone_master-implementation.adb b/src/components/time_at_tone_master/component-time_at_tone_master-implementation.adb index a94e27ac..a6627fa1 100644 --- a/src/components/time_at_tone_master/component-time_at_tone_master-implementation.adb +++ b/src/components/time_at_tone_master/component-time_at_tone_master-implementation.adb @@ -85,7 +85,7 @@ package body Component.Time_At_Tone_Master.Implementation is Self.Tone_Message_Send_If_Connected (Message); -- Increment the transaction count: - Self.Transaction_Count := Self.Transaction_Count + 1; + Self.Transaction_Count := @ + 1; -- Send out data products: Self.Data_Product_T_Send_If_Connected (Self.Data_Products.Tone_Messages_Sent (Time_Message_Time, (Value => Self.Transaction_Count))); diff --git a/src/components/time_of_tone_master/component-time_of_tone_master-implementation.adb b/src/components/time_of_tone_master/component-time_of_tone_master-implementation.adb index 6eab8564..236d4416 100644 --- a/src/components/time_of_tone_master/component-time_of_tone_master-implementation.adb +++ b/src/components/time_of_tone_master/component-time_of_tone_master-implementation.adb @@ -56,7 +56,7 @@ package body Component.Time_Of_Tone_Master.Implementation is if Self.Send_Counter.Is_Count_At_Period or else Do_Once then -- Increment the transaction count: - Self.Tone_Message_Count := Self.Tone_Message_Count + 1; + Self.Tone_Message_Count := @ + 1; declare -- Grab the current time: @@ -85,7 +85,7 @@ package body Component.Time_Of_Tone_Master.Implementation is overriding procedure Tone_Message_Sys_Time_T_Recv_Sync (Self : in out Instance; Arg : in Sys_Time.T) is begin -- Increment the transaction count: - Self.Time_Message_Count := Self.Time_Message_Count + 1; + Self.Time_Message_Count := @ + 1; declare -- Grab the current time: diff --git a/src/core/interrupt_handlers/interrupt_handlers.adb b/src/core/interrupt_handlers/interrupt_handlers.adb index c7a07f68..2c593da5 100644 --- a/src/core/interrupt_handlers/interrupt_handlers.adb +++ b/src/core/interrupt_handlers/interrupt_handlers.adb @@ -65,7 +65,7 @@ package body Interrupt_Handlers is Custom_Procedure.all (Internal_Data); -- Increment the count: if Count /= Natural'Last then - Count := Count + 1; + Count := @ + 1; end if; end Handler; diff --git a/src/core/task/task_synchronization.adb b/src/core/task/task_synchronization.adb index 382beec6..8942518c 100644 --- a/src/core/task/task_synchronization.adb +++ b/src/core/task/task_synchronization.adb @@ -94,7 +94,7 @@ package body Task_Synchronization is Timeout_Count := 0; else -- Increment the timeout counter. - Timeout_Count := Timeout_Count + 1; + Timeout_Count := @ + 1; end if; else -- If no task is waiting, then reset the diff --git a/src/data_structures/binary_tree/binary_tree.adb b/src/data_structures/binary_tree/binary_tree.adb index 83d287b6..ceae0e46 100644 --- a/src/data_structures/binary_tree/binary_tree.adb +++ b/src/data_structures/binary_tree/binary_tree.adb @@ -48,7 +48,7 @@ package body Binary_Tree is end loop; -- Increment size: - Self.Size := Self.Size + 1; + Self.Size := @ + 1; -- Move the last element into the new last slot. pragma Assert (Self.Size >= Self.Tree'First, "Size is greater than or equal to 1 at this point."); @@ -74,7 +74,7 @@ package body Binary_Tree is end loop; -- Decrement size: - Self.Size := Self.Size - 1; + Self.Size := @ - 1; return True; end Remove; diff --git a/src/data_structures/circular_buffer/circular_buffer.adb b/src/data_structures/circular_buffer/circular_buffer.adb index bbc62238..f82b0bb7 100644 --- a/src/data_structures/circular_buffer/circular_buffer.adb +++ b/src/data_structures/circular_buffer/circular_buffer.adb @@ -234,11 +234,11 @@ package body Circular_Buffer is end if; -- Set the and count: - Self.Count := Self.Count + Bytes_Length; + Self.Count := @ + Bytes_Length; if Overwrite and then Self.Count > Self.Bytes'Length then -- We need to move head if an overwrite actually occurs, since we are -- basically "popping" old data by doing the overwrite. - Self.Head := (Self.Head + (Self.Count - Self.Bytes'Length)) mod Self.Bytes'Length; + Self.Head := (@ + (Self.Count - Self.Bytes'Length)) mod Self.Bytes'Length; -- The count should never be greater than the length of the buffer. Self.Count := Self.Bytes'Length; end if; @@ -326,8 +326,8 @@ package body Circular_Buffer is -- Set the new head and count if we removed any bytes. if Self.Bytes'Length > 0 and then Num_Bytes_Returned > 0 then - Self.Head := (Self.Head + Num_Bytes_Returned) mod Self.Bytes'Length; - Self.Count := Self.Count - Num_Bytes_Returned; + Self.Head := (@ + Num_Bytes_Returned) mod Self.Bytes'Length; + Self.Count := @ - Num_Bytes_Returned; end if; -- Optimization: set head to zero if count is zero, this @@ -405,7 +405,7 @@ package body Circular_Buffer is pragma Assert (Num_Bytes_Popped = Bytes_To_Pop, "Popping bytes returned too few bytes. This can only be false if there is a software bug."); -- Decrement the counter: - Self.Item_Count := Self.Item_Count - 1; + Self.Item_Count := @ - 1; end Do_Pop; function Pop (Self : in out Queue_Base) return Pop_Status is @@ -443,7 +443,7 @@ package body Circular_Buffer is end; -- Increment the counters: - Self.Item_Count := Self.Item_Count + 1; + Self.Item_Count := @ + 1; if Self.Item_Count > Self.Item_Max_Count then Self.Item_Max_Count := Self.Item_Count; end if; diff --git a/src/data_structures/circular_buffer/test_circular/test.adb b/src/data_structures/circular_buffer/test_circular/test.adb index d2f0fde6..aff37d5a 100644 --- a/src/data_structures/circular_buffer/test_circular/test.adb +++ b/src/data_structures/circular_buffer/test_circular/test.adb @@ -36,7 +36,7 @@ procedure Test is Natural_Assert.Eq (Num_Bytes, Expected_Cnt - Cnt, "num_Bytes_Returned wrong!", Filename, Line); -- Put_Line(Basic_Types.Representation.Image(bytes(0 .. num_Bytes - 1))); Byte_Array_Assert.Eq (Bytes (0 .. Num_Bytes - 1), Bytes_To_Compare (Bytes_To_Compare'First + Cnt .. Bytes_To_Compare'First + Cnt + Num_Bytes - 1), "byte compare failed at iteration: " & Natural'Image (Idx), Filename, Line); - Cnt := Cnt + 1; + Cnt := @ + 1; end loop; Pop_Assert.Eq (Buf.Peek (Bytes, Num_Bytes, Offset => Cnt), Empty); Pop_Assert.Eq (Buf.Peek (Bytes, Num_Bytes, Offset => 0), Success, "Pop not successful!", Filename, Line); @@ -54,7 +54,7 @@ procedure Test is -- Copy pointers to bytes_To_Compare: if (not Is_Null (D)) and then Length (D) > 0 then Bytes_To_Compare (Cnt .. Cnt + Length (D) - 1) := To_Byte_Array (D); - Cnt := Cnt + Length (D); + Cnt := @ + Length (D); end if; end loop; return Cnt; diff --git a/src/data_structures/database/database.adb b/src/data_structures/database/database.adb index 740678e3..738f6e68 100644 --- a/src/data_structures/database/database.adb +++ b/src/data_structures/database/database.adb @@ -59,7 +59,7 @@ package body Database is Self.Index_Table (Id) := Db_Index; -- Increment the head: - Self.Head := Self.Head + 1; + Self.Head := @ + 1; end if; -- The index should ALWAYS be less than head. diff --git a/src/data_structures/database/test/database_tests-implementation.adb b/src/data_structures/database/test/database_tests-implementation.adb index b64691c4..b9334e39 100644 --- a/src/data_structures/database/test/database_tests-implementation.adb +++ b/src/data_structures/database/test/database_tests-implementation.adb @@ -59,7 +59,7 @@ package body Database_Tests.Implementation is U_Status := Self.Db.Update (Id, Natural (Id) + 60); Update_Status_Assert.Eq (U_Status, My_Database.Success); Natural_Assert.Eq (Self.Db.Get_Count, Cnt); - Cnt := Cnt + 1; + Cnt := @ + 1; Boolean_Assert.Eq (Self.Db.Is_Empty, False); if Id /= Id_Type ((Natural (Id_Range'First) + Database_Size - 1)) then Boolean_Assert.Eq (Self.Db.Is_Full, False); diff --git a/src/data_structures/database/variable_test/variable_database_tests-implementation.adb b/src/data_structures/database/variable_test/variable_database_tests-implementation.adb index e7b984d4..b1af8149 100644 --- a/src/data_structures/database/variable_test/variable_database_tests-implementation.adb +++ b/src/data_structures/database/variable_test/variable_database_tests-implementation.adb @@ -54,7 +54,7 @@ package body Variable_Database_Tests.Implementation is for Id in Start_Id .. Stop_Id loop Value.Length := Cnt; Value.Buffer := [others => Cnt + 7]; - Cnt := Cnt + 1; + Cnt := @ + 1; Put_Line ("inserting " & Natural'Image (Natural (Id)) & " => " & Simple_Variable.Representation.To_Tuple_String (Value)); U_Status := Self.Db.Update (Id, Value); Update_Status_Assert.Eq (U_Status, My_Database.Success); @@ -68,7 +68,7 @@ package body Variable_Database_Tests.Implementation is Fetch_Status_Assert.Eq (F_Status, My_Database.Success); Simple_Variable_Assert.Eq (Value, (Cnt, [others => Cnt + 7])); Put_Line ("fetching " & Natural'Image (Natural (Id)) & " => " & Simple_Variable.Representation.To_Tuple_String (Value)); - Cnt := Cnt + 1; + Cnt := @ + 1; end loop; -- Add items to database: @@ -76,7 +76,7 @@ package body Variable_Database_Tests.Implementation is for Id in reverse Start_Id .. Stop_Id loop Value.Length := Cnt; Value.Buffer := [others => Cnt + 11]; - Cnt := Cnt + 1; + Cnt := @ + 1; Put_Line ("inserting " & Natural'Image (Natural (Id)) & " => " & Simple_Variable.Representation.To_Tuple_String (Value)); U_Status := Self.Db.Update (Id, Value); Update_Status_Assert.Eq (U_Status, My_Database.Success); @@ -90,7 +90,7 @@ package body Variable_Database_Tests.Implementation is Fetch_Status_Assert.Eq (F_Status, My_Database.Success); Simple_Variable_Assert.Eq (Value, (Cnt, [others => Cnt + 11])); Put_Line ("fetching " & Natural'Image (Natural (Id)) & " => " & Simple_Variable.Representation.To_Tuple_String (Value)); - Cnt := Cnt + 1; + Cnt := @ + 1; end loop; end Test_Nominal_Update_Fetch; @@ -133,7 +133,7 @@ package body Variable_Database_Tests.Implementation is for Id in Start_Id .. Stop_Id - 1 loop Value.Length := Cnt; Value.Buffer := [others => Cnt + 12]; - Cnt := Cnt + 1; + Cnt := @ + 1; U_Status := Self.Db.Update (Id, Value); Update_Status_Assert.Eq (U_Status, My_Database.Success); end loop; @@ -145,7 +145,7 @@ package body Variable_Database_Tests.Implementation is F_Status := Self.Db.Fetch (Id, Value); Fetch_Status_Assert.Eq (F_Status, My_Database.Success); Simple_Variable_Assert.Eq (Value, (Cnt, [others => Cnt + 12])); - Cnt := Cnt + 1; + Cnt := @ + 1; end loop; -- Fetching the last item should still be unavailable: @@ -165,7 +165,7 @@ package body Variable_Database_Tests.Implementation is for Id in Start_Id .. Stop_Id loop Value.Length := Cnt; Value.Buffer := [others => Cnt + 7]; - Cnt := Cnt + 1; + Cnt := @ + 1; U_Status := Self.Db.Update (Id, Value); Update_Status_Assert.Eq (U_Status, My_Database.Success); end loop; @@ -185,7 +185,7 @@ package body Variable_Database_Tests.Implementation is F_Status := Self.Db.Fetch (Id, Value); Fetch_Status_Assert.Eq (F_Status, My_Database.Success); Simple_Variable_Assert.Eq (Value, (Cnt, [others => Cnt + 7])); - Cnt := Cnt + 1; + Cnt := @ + 1; end loop; end Test_Serialization_Failure; @@ -200,7 +200,7 @@ package body Variable_Database_Tests.Implementation is for Id in Start_Id .. Stop_Id loop Value.Length := Cnt; Value.Buffer := [others => Cnt + 7]; - Cnt := Cnt + 1; + Cnt := @ + 1; Put_Line ("inserting " & Natural'Image (Natural (Id)) & " => " & Simple_Variable.Representation.To_Tuple_String (Value)); U_Status := Self.Db.Update (Id, Value); Update_Status_Assert.Eq (U_Status, My_Database.Success); @@ -214,7 +214,7 @@ package body Variable_Database_Tests.Implementation is Fetch_Status_Assert.Eq (F_Status, My_Database.Success); Simple_Variable_Assert.Eq (Value, (Cnt, [others => Cnt + 7])); Put_Line ("fetching " & Natural'Image (Natural (Id)) & " => " & Simple_Variable.Representation.To_Tuple_String (Value)); - Cnt := Cnt + 1; + Cnt := @ + 1; end loop; -- Override items in database: @@ -223,7 +223,7 @@ package body Variable_Database_Tests.Implementation is for Id in Start_Id .. Stop_Id loop Value.Length := Cnt; Value.Buffer := [others => Cnt]; - Cnt := Cnt + 1; + Cnt := @ + 1; Put_Line ("overriding " & Natural'Image (Natural (Id)) & " => " & Simple_Variable.Representation.To_Tuple_String (Value)); U_Status := Self.Db.Override (Id, Value); Update_Status_Assert.Eq (U_Status, My_Database.Success); @@ -238,7 +238,7 @@ package body Variable_Database_Tests.Implementation is Fetch_Status_Assert.Eq (F_Status, My_Database.Success); Simple_Variable_Assert.Eq (Value, (Cnt, [others => Cnt])); Put_Line ("fetching " & Natural'Image (Natural (Id)) & " => " & Simple_Variable.Representation.To_Tuple_String (Value)); - Cnt := Cnt + 1; + Cnt := @ + 1; pragma Assert (Self.Db.Any_Overridden = True); end loop; @@ -247,7 +247,7 @@ package body Variable_Database_Tests.Implementation is for Id in Start_Id .. Stop_Id loop Value.Length := Cnt; Value.Buffer := [others => Cnt + 7]; - Cnt := Cnt + 1; + Cnt := @ + 1; Put_Line ("inserting " & Natural'Image (Natural (Id)) & " => " & Simple_Variable.Representation.To_Tuple_String (Value)); U_Status := Self.Db.Update (Id, Value); Update_Status_Assert.Eq (U_Status, My_Database.Success); @@ -261,7 +261,7 @@ package body Variable_Database_Tests.Implementation is Fetch_Status_Assert.Eq (F_Status, My_Database.Success); Simple_Variable_Assert.Eq (Value, (Cnt, [others => Cnt])); Put_Line ("fetching " & Natural'Image (Natural (Id)) & " => " & Simple_Variable.Representation.To_Tuple_String (Value)); - Cnt := Cnt + 1; + Cnt := @ + 1; pragma Assert (Self.Db.Any_Overridden = True); end loop; @@ -279,7 +279,7 @@ package body Variable_Database_Tests.Implementation is for Id in Start_Id .. Stop_Id loop Value.Length := Cnt; Value.Buffer := [others => Cnt + 7]; - Cnt := Cnt + 1; + Cnt := @ + 1; Put_Line ("inserting " & Natural'Image (Natural (Id)) & " => " & Simple_Variable.Representation.To_Tuple_String (Value)); U_Status := Self.Db.Update (Id, Value); Update_Status_Assert.Eq (U_Status, My_Database.Success); @@ -297,7 +297,7 @@ package body Variable_Database_Tests.Implementation is Simple_Variable_Assert.Eq (Value, (Cnt, [others => Cnt])); end if; Put_Line ("fetching " & Natural'Image (Natural (Id)) & " => " & Simple_Variable.Representation.To_Tuple_String (Value)); - Cnt := Cnt + 1; + Cnt := @ + 1; pragma Assert (Self.Db.Any_Overridden = True); end loop; @@ -310,7 +310,7 @@ package body Variable_Database_Tests.Implementation is for Id in Start_Id .. Stop_Id loop Value.Length := Cnt; Value.Buffer := [others => Cnt + 10]; - Cnt := Cnt + 1; + Cnt := @ + 1; Put_Line ("inserting " & Natural'Image (Natural (Id)) & " => " & Simple_Variable.Representation.To_Tuple_String (Value)); U_Status := Self.Db.Update (Id, Value); Update_Status_Assert.Eq (U_Status, My_Database.Success); @@ -324,7 +324,7 @@ package body Variable_Database_Tests.Implementation is Fetch_Status_Assert.Eq (F_Status, My_Database.Success); Simple_Variable_Assert.Eq (Value, (Cnt, [others => Cnt + 10])); Put_Line ("fetching " & Natural'Image (Natural (Id)) & " => " & Simple_Variable.Representation.To_Tuple_String (Value)); - Cnt := Cnt + 1; + Cnt := @ + 1; pragma Assert (Self.Db.Any_Overridden = False); end loop; end Test_Override; diff --git a/src/data_structures/fifo/fifo.adb b/src/data_structures/fifo/fifo.adb index c7786425..9ae78629 100644 --- a/src/data_structures/fifo/fifo.adb +++ b/src/data_structures/fifo/fifo.adb @@ -49,7 +49,7 @@ package body Fifo is Self.Items (Index) := Value; -- Increment the buffer count: - Self.Count := Self.Count + 1; + Self.Count := @ + 1; -- Update high water mark: if Self.Count > Self.Max_Count then @@ -67,8 +67,8 @@ package body Fifo is end if; -- Increment the start index and count: - Self.Head := (Self.Head + 1) mod Self.Items'Length; - Self.Count := Self.Count - 1; + Self.Head := (@ + 1) mod Self.Items'Length; + Self.Count := @ - 1; return Success; end Pop; diff --git a/src/data_structures/heap/heap.adb b/src/data_structures/heap/heap.adb index 5cb30be0..5266757f 100644 --- a/src/data_structures/heap/heap.adb +++ b/src/data_structures/heap/heap.adb @@ -147,12 +147,12 @@ package body Heap is Largest := Index; -- Which is larger, the current node of the left node?: - Largest := Max (Left, Largest); + Largest := Max (Left, @); -- Make sure the right node exists before checking it: if Right < Self.Count then -- Which is larger, the current node of the left node?: - Largest := Max (Right, Largest); + Largest := Max (Right, @); end if; -- If the largest node is the current node then we are @@ -217,7 +217,7 @@ package body Heap is end if; end; -- Increment our safety valve: - Iter := Iter + 1; + Iter := @ + 1; end loop; -- OK, index now contains the correct place to insert our new @@ -230,8 +230,8 @@ package body Heap is Self.Tree (Index) := (Order => Self.Order, Element => Element); -- Increment the count and the order: - Self.Count := Self.Count + 1; - Self.Order := Self.Order + 1; + Self.Count := @ + 1; + Self.Order := @ + 1; -- Update the high water mark if necessary: if Self.Count > Self.Max_Count then @@ -252,7 +252,7 @@ package body Heap is -- Place the last element on the heap in the root -- position and resize the heap. This will put the smallest -- value in the heap on the top, violating the heap property. - Self.Count := Self.Count - 1; -- This should never underflow + Self.Count := @ - 1; -- This should never underflow -- because of the check above. Self.Tree (Self.Tree.all'First) := Self.Tree (Self.Count); diff --git a/src/data_structures/priority_queue/priority_queue.adb b/src/data_structures/priority_queue/priority_queue.adb index 92c958d6..6e1fcd97 100644 --- a/src/data_structures/priority_queue/priority_queue.adb +++ b/src/data_structures/priority_queue/priority_queue.adb @@ -156,7 +156,7 @@ package body Priority_Queue is -- Increment the start index: if Self.Index_Pool_Start < Self.Index_Pool.all'Last then - Self.Index_Pool_Start := Self.Index_Pool_Start + 1; + Self.Index_Pool_Start := @ + 1; else Self.Index_Pool_Start := Self.Index_Pool.all'First; end if; @@ -172,7 +172,7 @@ package body Priority_Queue is Self.Index_Pool.all (Self.Index_Pool_Stop) := Index; -- Increment the stop index: if Self.Index_Pool_Stop < Self.Index_Pool.all'Last then - Self.Index_Pool_Stop := Self.Index_Pool_Stop + 1; + Self.Index_Pool_Stop := @ + 1; else Self.Index_Pool_Stop := Self.Index_Pool.all'First; end if; diff --git a/src/data_structures/protected_variables/protected_variables.adb b/src/data_structures/protected_variables/protected_variables.adb index 32a5adb1..0dad1653 100644 --- a/src/data_structures/protected_variables/protected_variables.adb +++ b/src/data_structures/protected_variables/protected_variables.adb @@ -33,13 +33,13 @@ package body Protected_Variables is procedure Increment_Count (To_Add : in T := 1) is begin - Count := Count + To_Add; + Count := @ + To_Add; end Increment_Count; procedure Increment_Count_And_Return_Previous (Prev_Count : out T; To_Add : in T := 1) is begin Prev_Count := Count; - Count := Count + To_Add; + Count := @ + To_Add; end Increment_Count_And_Return_Previous; end Counter; end Generic_Protected_Counter; @@ -63,13 +63,13 @@ package body Protected_Variables is procedure Decrement_Count (To_Subtract : in T := 1) is begin - Count := Count - To_Subtract; + Count := @ - To_Subtract; end Decrement_Count; procedure Decrement_Count_And_Return_Previous (Prev_Count : out T; To_Subtract : in T := 1) is begin Prev_Count := Count; - Count := Count - To_Subtract; + Count := @ - To_Subtract; end Decrement_Count_And_Return_Previous; end Counter; end Generic_Protected_Counter_Decrement; @@ -100,7 +100,7 @@ package body Protected_Variables is procedure Increment_Count (To_Add : in T := 1) is begin if Period > 0 then - Count := (Count + To_Add) mod Period; + Count := (@ + To_Add) mod Period; end if; end Increment_Count; diff --git a/src/types/tick/tick_interrupt_handler.adb b/src/types/tick/tick_interrupt_handler.adb index c2dad5be..a051f4e2 100644 --- a/src/types/tick/tick_interrupt_handler.adb +++ b/src/types/tick/tick_interrupt_handler.adb @@ -6,7 +6,7 @@ package body Tick_Interrupt_Handler is use Interfaces; begin -- Increment the count: - Data.Count := Data.Count + 1; + Data.Count := @ + 1; end Handler; procedure Set_Tick_Time (Data : in out Tick.T; Time : in Sys_Time.T) is diff --git a/src/unit_test/history/history.adb b/src/unit_test/history/history.adb index 0271ff2f..1e6c1447 100644 --- a/src/unit_test/history/history.adb +++ b/src/unit_test/history/history.adb @@ -25,7 +25,7 @@ package body History is Self.Buffer (Index) := Value; -- Increment the buffer count: - Self.Count := Self.Count + 1; + Self.Count := @ + 1; end if; end Push; diff --git a/src/unit_test/string_util/Linux/string_util.adb b/src/unit_test/string_util/Linux/string_util.adb index 6d063507..9782917e 100644 --- a/src/unit_test/string_util/Linux/string_util.adb +++ b/src/unit_test/string_util/Linux/string_util.adb @@ -25,7 +25,7 @@ package body String_Util is begin for Indx in Bytes'Range loop Toreturn ((Cnt * 3 + 1) .. (Cnt * 3 + 3)) := " " & String_Util.Natural_2_Hex_String (Natural (Bytes (Indx)), 2); - Cnt := Cnt + 1; + Cnt := @ + 1; end loop; return Prefix & Trim_Both (Toreturn) & Postfix; end Bytes_To_String; diff --git a/src/unit_test/string_util/bb/string_util.adb b/src/unit_test/string_util/bb/string_util.adb index 62bded16..0ab093bd 100644 --- a/src/unit_test/string_util/bb/string_util.adb +++ b/src/unit_test/string_util/bb/string_util.adb @@ -28,7 +28,7 @@ package body String_Util is begin for Indx in Bytes'Range loop Toreturn ((Cnt * 4 + 1) .. (Cnt * 4 + 4)) := " " & Get_Number (Indx); - Cnt := Cnt + 1; + Cnt := @ + 1; end loop; return Prefix & Trim_Both (Toreturn) & Postfix; end Bytes_To_String; @@ -64,12 +64,12 @@ package body String_Util is begin -- Find the first non-space character while Start_Index <= End_Index and then Input (Start_Index) = ' ' loop - Start_Index := Start_Index + 1; + Start_Index := @ + 1; end loop; -- Find the last non-space character while End_Index >= Start_Index and then Input (End_Index) = ' ' loop - End_Index := End_Index - 1; + End_Index := @ - 1; end loop; -- Return the trimmed substring diff --git a/src/util/byte_array_util/byte_array_util.adb b/src/util/byte_array_util/byte_array_util.adb index 0d57b0e4..3d58159f 100644 --- a/src/util/byte_array_util/byte_array_util.adb +++ b/src/util/byte_array_util/byte_array_util.adb @@ -116,14 +116,14 @@ package body Byte_Array_Util is -- If we didn't just copy over the last destination byte then peek ahead... if Src_Idx > First_Src_Idx then -- Combine with relevant bits from the next byte to copy. - Value (Dest_Idx) := Value (Dest_Idx) or (Shift_Left (Src (Src_Idx - 1), Left_Shift) and Left_Mask); + Value (Dest_Idx) := @ or (Shift_Left (Src (Src_Idx - 1), Left_Shift) and Left_Mask); -- Decrement the source index: - Src_Idx := Src_Idx - 1; + Src_Idx := @ - 1; end if; end loop; -- Apply the appropriate mask to the last byte copied: - Value (First_Dest_Idx) := Value (First_Dest_Idx) and Last_Mask; + Value (First_Dest_Idx) := @ and Last_Mask; end; -- If the value we extracted is signed, then we need to handle the case where the value is @@ -146,7 +146,7 @@ package body Byte_Array_Util is Value (Idx) := Byte'Last; end loop; -- Set the lead of any partial byte to 1. - Value (Byte_Idx) := Value (Byte_Idx) or (Bit_Mask (Bit_Idx + 1) xor Byte'Last); + Value (Byte_Idx) := @ or (Bit_Mask (Bit_Idx + 1) xor Byte'Last); end if; end; end if; @@ -238,7 +238,7 @@ package body Byte_Array_Util is if Dest_Idx > First_Dest_Idx then Dest (Dest_Idx - 1) := Shift_Right (Value_To_Set (Src_Idx), Right_Shift) and Right_Mask; -- Decrement the source index: - Dest_Idx := Dest_Idx - 1; + Dest_Idx := @ - 1; end if; end loop; diff --git a/src/util/crc/checksum_16.adb b/src/util/crc/checksum_16.adb index 1bb209b3..7f121714 100644 --- a/src/util/crc/checksum_16.adb +++ b/src/util/crc/checksum_16.adb @@ -12,9 +12,9 @@ package body Checksum_16 is -- left shifted by 8-bits and each odd byte does not in the addition. for Idx in Bytes'Range loop if ((Idx - Bytes'First) mod 2) = 0 then - To_Return := To_Return + Unsigned_16 (Bytes (Idx)) * 16#100#; + To_Return := @ + Unsigned_16 (Bytes (Idx)) * 16#100#; else - To_Return := To_Return + Unsigned_16 (Bytes (Idx)); + To_Return := @ + Unsigned_16 (Bytes (Idx)); end if; end loop; diff --git a/src/util/crc/xor_8.adb b/src/util/crc/xor_8.adb index b9d3c1e3..435664ea 100644 --- a/src/util/crc/xor_8.adb +++ b/src/util/crc/xor_8.adb @@ -6,7 +6,7 @@ package body Xor_8 is To_Return : Xor_8_Type := Seed; begin for B of Bytes loop - To_Return := To_Return xor B; + To_Return := @ xor B; end loop; return To_Return; end Compute_Xor_8; diff --git a/src/util/monitor/monitor.adb b/src/util/monitor/monitor.adb index 837ee010..d697062e 100644 --- a/src/util/monitor/monitor.adb +++ b/src/util/monitor/monitor.adb @@ -67,7 +67,7 @@ package body Monitor is else -- Increment counter: if Self.Persistence_Count < Natural'Last then - Self.Persistence_Count := Self.Persistence_Count + 1; + Self.Persistence_Count := @ + 1; end if; -- Transition if counter is at the threshold: @@ -85,7 +85,7 @@ package body Monitor is if Predicate then -- Increment counter: if Self.Persistence_Count < Natural'Last then - Self.Persistence_Count := Self.Persistence_Count + 1; + Self.Persistence_Count := @ + 1; end if; -- Transition if counter is at the threshold: diff --git a/src/util/moving_average/moving_average.adb b/src/util/moving_average/moving_average.adb index f02e9c0b..0b9de6f7 100644 --- a/src/util/moving_average/moving_average.adb +++ b/src/util/moving_average/moving_average.adb @@ -34,9 +34,9 @@ package body Moving_Average is procedure Add_New_Sample (Self : in out Instance; New_Sample : in T) is begin -- Start by adding the sample since we have to do this regardless if we are wrapping yet or not - Self.Sum := Self.Sum + New_Sample; + Self.Sum := @ + New_Sample; if Self.Calculate_Variance then - Self.Sum_Squared := Self.Sum_Squared + (New_Sample * New_Sample); + Self.Sum_Squared := @ + (New_Sample * New_Sample); end if; -- Determine if we have a full buffer so that we know if we need to increment the count @@ -44,13 +44,13 @@ package body Moving_Average is declare Prev_Sample : constant T := Self.Items (Self.Head); begin - Self.Sum := Self.Sum - Prev_Sample; + Self.Sum := @ - Prev_Sample; if Self.Calculate_Variance then - Self.Sum_Squared := Self.Sum_Squared - (Prev_Sample * Prev_Sample); + Self.Sum_Squared := @ - (Prev_Sample * Prev_Sample); end if; end; else - Self.Count := Self.Count + 1; + Self.Count := @ + 1; end if; -- Determine if we have a new max value to store @@ -67,7 +67,7 @@ package body Moving_Average is -- Now update our structures and statistics Self.Items (Self.Head) := New_Sample; - Self.Head := (Self.Head + 1) mod (Self.Items_Length); + Self.Head := (@ + 1) mod (Self.Items_Length); end Add_New_Sample; procedure Calculate_Mean_Variance_Max (Self : in out Instance; Mean : out T; Variance : out T; Max : out T) is diff --git a/src/util/socket/socket.adb b/src/util/socket/socket.adb index 1993fe11..51af2bbe 100644 --- a/src/util/socket/socket.adb +++ b/src/util/socket/socket.adb @@ -18,7 +18,7 @@ package body Socket is if Last_Char = '.' then return False; end if; - Num_Periods := Num_Periods + 1; + Num_Periods := @ + 1; else return False; end if;