Re: ANN: Ahven 1.8

[Simon Wright <simon@pushface.org>]

[-- Attachment #1: Type: text/plain, Size: 833 bytes --]

Tero Koskinen <tero.koskinen@iki.fi> writes:

>  * AUnit is Ada 2005 code only and I think it can be compiled
>    only with GNAT (not 100% sure since I haven't tried it with
>    other Ada 2005 compilers)

The 2005-ness occurs because AUnit uses a private copy of
Ada.Containers.Lists with some 05 constructs removed so that it can be
compiled with "an" Ada 95 compiler.

Unfortunately, what they mean is "with an Ada 95 compiler that
recognises pragma Ada_2005 to mean that some Ada 2005 constructs are
permitted even when compiling in Ada 95 mode".

This doesn't include older GNATs, and certainly won't include compilers
from other vendors.

These patches update the current SVN source of AUnit to work with older
GNATs. Ask me if you need a copy and the news system has mangled them or
I've failed to drive Emacs correctly ...


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Allow use of AUnit 3 with Ada 95-only compiler --]
[-- Type: text/x-patch, Size: 1617 bytes --]

Index: aunit/containers/ada_containers-aunit_lists.adb
===================================================================
--- aunit/containers/ada_containers-aunit_lists.adb	(revision 164273)
+++ aunit/containers/ada_containers-aunit_lists.adb	(working copy)
@@ -23,8 +23,6 @@
 -- This unit was originally developed by Matthew J Heaney.                  --
 ------------------------------------------------------------------------------
 
-pragma Ada_2005;
-
 with System;  use type System.Address;
 
 with AUnit.Memory;       use AUnit.Memory;
@@ -726,7 +724,7 @@
 
    procedure Iterate
      (Container : List;
-      Process   : not null access procedure (Position : Cursor))
+      Process   : Processor)
    is
       C : List renames Container'Unrestricted_Access.all;
       B : Natural renames C.Busy;
Index: aunit/containers/ada_containers-aunit_lists.ads
===================================================================
--- aunit/containers/ada_containers-aunit_lists.ads	(revision 164273)
+++ aunit/containers/ada_containers-aunit_lists.ads	(working copy)
@@ -35,8 +35,6 @@
 --  Some Ada2005 constructs have also been removed so that user tests can be
 --  compiled in Ada95.
 
-pragma Ada_2005;
-
 generic
    type Element_Type is private;
 
@@ -181,9 +179,11 @@
 
    function Has_Element (Position : Cursor) return Boolean;
 
+   type Processor is access procedure (Position : Cursor);
+
    procedure Iterate
      (Container : List;
-      Process   : not null access procedure (Position : Cursor));
+      Process   : Processor);
 
 --     procedure Reverse_Iterate
 --       (Container : List;