Skip to content

Commit

Permalink
Remove support for GNAT Community 2019
Browse files Browse the repository at this point in the history
Ref. #911
  • Loading branch information
treiher committed Jan 26, 2022
1 parent e7fb0a9 commit f262cbc
Show file tree
Hide file tree
Showing 22 changed files with 1 addition and 103 deletions.
1 change: 0 additions & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,6 @@ jobs:
gnat-distrib:
- "community"
gnat-version:
- "2019"
- "2020"
- "2021"
include:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ if parse_message(b"\x01\x00\x04\x01\x02\x03\x04") != create_message():
As a prerequisite, the following dependencies need to be installed:

- For compiling the generated code, one of the following versions of GNAT is required:
- [GNAT Community](https://www.adacore.com/download) 2019, 2020 or 2021
- [GNAT Community](https://www.adacore.com/download) 2020 or 2021
- [GNAT Pro](https://www.adacore.com/gnatpro) 20.2 or 21.2
- [FSF GNAT](https://www.gnu.org/software/gnat/) 11.2 [![GNAT Alire Crate](https://img.shields.io/endpoint?url=https://alire.ada.dev/badges/gnat_native.json)](https://alire.ada.dev/crates/gnat_native.html)
- [GNATcoll iconv binding](https://github.com/AdaCore/gnatcoll-bindings/tree/master/iconv) [![GNATcoll iconv binding Alire Crate](https://img.shields.io/endpoint?url=https://alire.ada.dev/badges/gnatcoll_iconv.json)](https://alire.ada.dev/crates/gnatcoll_iconv.html) must be installed separately if FSF GNAT is used.
Expand Down
5 changes: 0 additions & 5 deletions defaults.gpr
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,6 @@ abstract project Defaults is
GNATVI := "";
GNATVO := "";
GNATEV := "";
when "community2019" =>
GNATVI := "";
GNATVO := "";
GNATEV := "";
GNATA := "";
when others =>
end case;

Expand Down
20 changes: 0 additions & 20 deletions rflx/generator/generator.py
Original file line number Diff line number Diff line change
Expand Up @@ -3682,27 +3682,7 @@ def __create_refinement(self, refinement: Refinement) -> None:
if not null_sdu:
unit += UnitPart(
[
# ISSUE: Componolit/Workarounds#45
# Suppress warning for backward compatibility to GNAT Community 2019.
Pragma(
"Warnings",
[
Variable("Off"),
String(
'"Field_Cursors" is already use-visible through package use clause'
),
],
),
UseTypeClause(f"{pdu_identifier}.Field_Cursors"),
Pragma(
"Warnings",
[
Variable("On"),
String(
'"Field_Cursors" is already use-visible through package use clause'
),
],
),
]
)
unit += self.__create_switch_procedure(refinement, condition_fields)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,8 @@ is
(RFLX.Universal.Message.Has_Buffer (Ctx)
and then RFLX.Universal.Message.Present (Ctx, RFLX.Universal.Message.F_Data));

pragma Warnings (Off, """Field_Cursors"" is already use-visible through package use clause");

use type RFLX.Universal.Message.Field_Cursors;

pragma Warnings (On, """Field_Cursors"" is already use-visible through package use clause");

procedure Switch_To_Data (Universal_Message_PDU_Context : in out RFLX.Universal.Message.Context; Universal_Option_SDU_Context : out RFLX.Universal.Option.Context) with
Pre =>
not Universal_Message_PDU_Context'Constrained
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,8 @@ is
(RFLX.Universal.Message.Has_Buffer (Ctx)
and then RFLX.Universal.Message.Present (Ctx, RFLX.Universal.Message.F_Data));

pragma Warnings (Off, """Field_Cursors"" is already use-visible through package use clause");

use type RFLX.Universal.Message.Field_Cursors;

pragma Warnings (On, """Field_Cursors"" is already use-visible through package use clause");

procedure Switch_To_Data (Universal_Message_PDU_Context : in out RFLX.Universal.Message.Context; Universal_Option_SDU_Context : out RFLX.Universal.Option.Context) with
Pre =>
not Universal_Message_PDU_Context'Constrained
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,8 @@ is
(RFLX.Universal.Message.Has_Buffer (Ctx)
and then RFLX.Universal.Message.Present (Ctx, RFLX.Universal.Message.F_Data));

pragma Warnings (Off, """Field_Cursors"" is already use-visible through package use clause");

use type RFLX.Universal.Message.Field_Cursors;

pragma Warnings (On, """Field_Cursors"" is already use-visible through package use clause");

procedure Switch_To_Data (Universal_Message_PDU_Context : in out RFLX.Universal.Message.Context; Universal_Option_SDU_Context : out RFLX.Universal.Option.Context) with
Pre =>
not Universal_Message_PDU_Context'Constrained
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,8 @@ is
(RFLX.Universal.Message.Has_Buffer (Ctx)
and then RFLX.Universal.Message.Present (Ctx, RFLX.Universal.Message.F_Data));

pragma Warnings (Off, """Field_Cursors"" is already use-visible through package use clause");

use type RFLX.Universal.Message.Field_Cursors;

pragma Warnings (On, """Field_Cursors"" is already use-visible through package use clause");

procedure Switch_To_Data (Universal_Message_PDU_Context : in out RFLX.Universal.Message.Context; Universal_Option_SDU_Context : out RFLX.Universal.Option.Context) with
Pre =>
not Universal_Message_PDU_Context'Constrained
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,8 @@ is
(RFLX.Universal.Message.Has_Buffer (Ctx)
and then RFLX.Universal.Message.Present (Ctx, RFLX.Universal.Message.F_Data));

pragma Warnings (Off, """Field_Cursors"" is already use-visible through package use clause");

use type RFLX.Universal.Message.Field_Cursors;

pragma Warnings (On, """Field_Cursors"" is already use-visible through package use clause");

procedure Switch_To_Data (Universal_Message_PDU_Context : in out RFLX.Universal.Message.Context; Universal_Option_SDU_Context : out RFLX.Universal.Option.Context) with
Pre =>
not Universal_Message_PDU_Context'Constrained
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,8 @@ is
(RFLX.Universal.Message.Has_Buffer (Ctx)
and then RFLX.Universal.Message.Present (Ctx, RFLX.Universal.Message.F_Data));

pragma Warnings (Off, """Field_Cursors"" is already use-visible through package use clause");

use type RFLX.Universal.Message.Field_Cursors;

pragma Warnings (On, """Field_Cursors"" is already use-visible through package use clause");

procedure Switch_To_Data (Universal_Message_PDU_Context : in out RFLX.Universal.Message.Context; Universal_Option_SDU_Context : out RFLX.Universal.Option.Context) with
Pre =>
not Universal_Message_PDU_Context'Constrained
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,8 @@ is
(RFLX.Universal.Message.Has_Buffer (Ctx)
and then RFLX.Universal.Message.Present (Ctx, RFLX.Universal.Message.F_Data));

pragma Warnings (Off, """Field_Cursors"" is already use-visible through package use clause");

use type RFLX.Universal.Message.Field_Cursors;

pragma Warnings (On, """Field_Cursors"" is already use-visible through package use clause");

procedure Switch_To_Data (Universal_Message_PDU_Context : in out RFLX.Universal.Message.Context; Universal_Option_SDU_Context : out RFLX.Universal.Option.Context) with
Pre =>
not Universal_Message_PDU_Context'Constrained
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,8 @@ is
(RFLX.Universal.Message.Has_Buffer (Ctx)
and then RFLX.Universal.Message.Present (Ctx, RFLX.Universal.Message.F_Data));

pragma Warnings (Off, """Field_Cursors"" is already use-visible through package use clause");

use type RFLX.Universal.Message.Field_Cursors;

pragma Warnings (On, """Field_Cursors"" is already use-visible through package use clause");

procedure Switch_To_Data (Universal_Message_PDU_Context : in out RFLX.Universal.Message.Context; Universal_Option_SDU_Context : out RFLX.Universal.Option.Context) with
Pre =>
not Universal_Message_PDU_Context'Constrained
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,8 @@ is
(RFLX.Universal.Message.Has_Buffer (Ctx)
and then RFLX.Universal.Message.Present (Ctx, RFLX.Universal.Message.F_Data));

pragma Warnings (Off, """Field_Cursors"" is already use-visible through package use clause");

use type RFLX.Universal.Message.Field_Cursors;

pragma Warnings (On, """Field_Cursors"" is already use-visible through package use clause");

procedure Switch_To_Data (Universal_Message_PDU_Context : in out RFLX.Universal.Message.Context; Universal_Option_SDU_Context : out RFLX.Universal.Option.Context) with
Pre =>
not Universal_Message_PDU_Context'Constrained
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,8 @@ is
(RFLX.Universal.Message.Has_Buffer (Ctx)
and then RFLX.Universal.Message.Present (Ctx, RFLX.Universal.Message.F_Data));

pragma Warnings (Off, """Field_Cursors"" is already use-visible through package use clause");

use type RFLX.Universal.Message.Field_Cursors;

pragma Warnings (On, """Field_Cursors"" is already use-visible through package use clause");

procedure Switch_To_Data (Universal_Message_PDU_Context : in out RFLX.Universal.Message.Context; Universal_Option_SDU_Context : out RFLX.Universal.Option.Context) with
Pre =>
not Universal_Message_PDU_Context'Constrained
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,8 @@ is
(RFLX.Universal.Message.Has_Buffer (Ctx)
and then RFLX.Universal.Message.Present (Ctx, RFLX.Universal.Message.F_Data));

pragma Warnings (Off, """Field_Cursors"" is already use-visible through package use clause");

use type RFLX.Universal.Message.Field_Cursors;

pragma Warnings (On, """Field_Cursors"" is already use-visible through package use clause");

procedure Switch_To_Data (Universal_Message_PDU_Context : in out RFLX.Universal.Message.Context; Universal_Option_SDU_Context : out RFLX.Universal.Option.Context) with
Pre =>
not Universal_Message_PDU_Context'Constrained
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,8 @@ is
(RFLX.Universal.Message.Has_Buffer (Ctx)
and then RFLX.Universal.Message.Present (Ctx, RFLX.Universal.Message.F_Data));

pragma Warnings (Off, """Field_Cursors"" is already use-visible through package use clause");

use type RFLX.Universal.Message.Field_Cursors;

pragma Warnings (On, """Field_Cursors"" is already use-visible through package use clause");

procedure Switch_To_Data (Universal_Message_PDU_Context : in out RFLX.Universal.Message.Context; Universal_Option_SDU_Context : out RFLX.Universal.Option.Context) with
Pre =>
not Universal_Message_PDU_Context'Constrained
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,8 @@ is
(RFLX.Universal.Message.Has_Buffer (Ctx)
and then RFLX.Universal.Message.Present (Ctx, RFLX.Universal.Message.F_Data));

pragma Warnings (Off, """Field_Cursors"" is already use-visible through package use clause");

use type RFLX.Universal.Message.Field_Cursors;

pragma Warnings (On, """Field_Cursors"" is already use-visible through package use clause");

procedure Switch_To_Data (Universal_Message_PDU_Context : in out RFLX.Universal.Message.Context; Universal_Option_SDU_Context : out RFLX.Universal.Option.Context) with
Pre =>
not Universal_Message_PDU_Context'Constrained
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,8 @@ is
(RFLX.Universal.Message.Has_Buffer (Ctx)
and then RFLX.Universal.Message.Present (Ctx, RFLX.Universal.Message.F_Data));

pragma Warnings (Off, """Field_Cursors"" is already use-visible through package use clause");

use type RFLX.Universal.Message.Field_Cursors;

pragma Warnings (On, """Field_Cursors"" is already use-visible through package use clause");

procedure Switch_To_Data (Universal_Message_PDU_Context : in out RFLX.Universal.Message.Context; Universal_Option_SDU_Context : out RFLX.Universal.Option.Context) with
Pre =>
not Universal_Message_PDU_Context'Constrained
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,8 @@ is
(RFLX.Universal.Message.Has_Buffer (Ctx)
and then RFLX.Universal.Message.Present (Ctx, RFLX.Universal.Message.F_Data));

pragma Warnings (Off, """Field_Cursors"" is already use-visible through package use clause");

use type RFLX.Universal.Message.Field_Cursors;

pragma Warnings (On, """Field_Cursors"" is already use-visible through package use clause");

procedure Switch_To_Data (Universal_Message_PDU_Context : in out RFLX.Universal.Message.Context; Universal_Option_SDU_Context : out RFLX.Universal.Option.Context) with
Pre =>
not Universal_Message_PDU_Context'Constrained
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,8 @@ is
(RFLX.Universal.Message.Has_Buffer (Ctx)
and then RFLX.Universal.Message.Present (Ctx, RFLX.Universal.Message.F_Data));

pragma Warnings (Off, """Field_Cursors"" is already use-visible through package use clause");

use type RFLX.Universal.Message.Field_Cursors;

pragma Warnings (On, """Field_Cursors"" is already use-visible through package use clause");

procedure Switch_To_Data (Universal_Message_PDU_Context : in out RFLX.Universal.Message.Context; Universal_Option_SDU_Context : out RFLX.Universal.Option.Context) with
Pre =>
not Universal_Message_PDU_Context'Constrained
Expand Down
4 changes: 0 additions & 4 deletions tests/spark/generated/rflx-in_ethernet-contains.ads
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,8 @@ is
and then RFLX.Ethernet.Frame.Valid (Ctx, RFLX.Ethernet.Frame.F_Type_Length)
and then RFLX.Ethernet.Frame.Get_Type_Length (Ctx) = 16#800#);

pragma Warnings (Off, """Field_Cursors"" is already use-visible through package use clause");

use type RFLX.Ethernet.Frame.Field_Cursors;

pragma Warnings (On, """Field_Cursors"" is already use-visible through package use clause");

procedure Switch_To_Payload (Ethernet_Frame_PDU_Context : in out RFLX.Ethernet.Frame.Context; IPv4_Packet_SDU_Context : out RFLX.IPv4.Packet.Context) with
Pre =>
not Ethernet_Frame_PDU_Context'Constrained
Expand Down
8 changes: 0 additions & 8 deletions tests/spark/generated/rflx-in_ipv4-contains.ads
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,8 @@ is
and then RFLX.IPv4.Packet.Get_Protocol (Ctx).Known
and then RFLX.IPv4.Packet.Get_Protocol (Ctx).Enum = IPv4.P_UDP);

pragma Warnings (Off, """Field_Cursors"" is already use-visible through package use clause");

use type RFLX.IPv4.Packet.Field_Cursors;

pragma Warnings (On, """Field_Cursors"" is already use-visible through package use clause");

procedure Switch_To_Payload (IPv4_Packet_PDU_Context : in out RFLX.IPv4.Packet.Context; UDP_Datagram_SDU_Context : out RFLX.UDP.Datagram.Context) with
Pre =>
not IPv4_Packet_PDU_Context'Constrained
Expand Down Expand Up @@ -77,10 +73,6 @@ is
and then RFLX.IPv4.Packet.Get_Protocol (Ctx).Known
and then RFLX.IPv4.Packet.Get_Protocol (Ctx).Enum = IPv4.P_ICMP);

pragma Warnings (Off, """Field_Cursors"" is already use-visible through package use clause");

pragma Warnings (On, """Field_Cursors"" is already use-visible through package use clause");

procedure Switch_To_Payload (IPv4_Packet_PDU_Context : in out RFLX.IPv4.Packet.Context; ICMP_Message_SDU_Context : out RFLX.ICMP.Message.Context) with
Pre =>
not IPv4_Packet_PDU_Context'Constrained
Expand Down

0 comments on commit f262cbc

Please sign in to comment.