ncurses 6.1 - patch 20181110

[ncurses.git] / Ada95 / src / terminal_interface-curses-forms-field_types.adb

diff --git a/Ada95/src/terminal_interface-curses-forms-field_types.adb b/Ada95/src/terminal_interface-curses-forms-field_types.adb
index 47efa4c249f43f9c8e46cf7cbe120b444777fc06..bda6e51b088f73a80485207208ff61f09698f2c6 100644 (file)
--- a/Ada95/src/terminal_interface-curses-forms-field_types.adb
+++ b/Ada95/src/terminal_interface-curses-forms-field_types.adb
@@ -7,7 +7,7 @@
 --                                 B O D Y                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
 --                                 B O D Y                                  --
 --                                                                          --
 ------------------------------------------------------------------------------

--- Copyright (c) 1998,2004 Free Software Foundation, Inc.                   --
+-- Copyright (c) 1998-2011,2014 Free Software Foundation, Inc.              --

 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --


@@ -35,14 +35,14 @@
 ------------------------------------------------------------------------------
 --  Author:  Juergen Pfeifer, 1996
 --  Version Control:
 ------------------------------------------------------------------------------
 --  Author:  Juergen Pfeifer, 1996
 --  Version Control:

---  $Revision: 1.17 $
---  $Date: 2004/08/21 21:37:00 $
+--  $Revision: 1.28 $
+--  $Date: 2014/09/13 19:00:47 $

 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 --  Binding Version 01.00
 ------------------------------------------------------------------------------

-with Interfaces.C;

 with Terminal_Interface.Curses.Aux; use Terminal_Interface.Curses.Aux;
 with Ada.Unchecked_Deallocation;
 with Terminal_Interface.Curses.Aux; use Terminal_Interface.Curses.Aux;
 with Ada.Unchecked_Deallocation;

-with Ada.Unchecked_Conversion;
+with System.Address_To_Access_Conversions;
+

 --  |
 --  |=====================================================================
 --  | man page form_fieldtype.3x
 --  |
 --  |=====================================================================
 --  | man page form_fieldtype.3x


@@ -50,11 +50,10 @@ with Ada.Unchecked_Conversion;
 --  |
 package body Terminal_Interface.Curses.Forms.Field_Types is
 
 --  |
 package body Terminal_Interface.Curses.Forms.Field_Types is
 

-   use type Interfaces.C.int;

    use type System.Address;
 
    use type System.Address;
 

-   function To_Argument_Access is new Ada.Unchecked_Conversion
-     (System.Address, Argument_Access);
+   package Argument_Conversions is
+      new System.Address_To_Access_Conversions (Argument);

 
    function Get_Fieldtype (F : Field) return C_Field_Type;
    pragma Import (C, Get_Fieldtype, "field_type");
 
    function Get_Fieldtype (F : Field) return C_Field_Type;
    pragma Import (C, Get_Fieldtype, "field_type");


@@ -68,7 +67,7 @@ package body Terminal_Interface.Curses.Forms.Field_Types is
    --  |
    --  |
    --  |
    --  |
    --  |
    --  |

-   function Get_Type (Fld : in Field) return Field_Type_Access
+   function Get_Type (Fld : Field) return Field_Type_Access

    is
       Low_Level : constant C_Field_Type := Get_Fieldtype (Fld);
       Arg : Argument_Access;
    is
       Low_Level : constant C_Field_Type := Get_Fieldtype (Fld);
       Arg : Argument_Access;


@@ -77,14 +76,16 @@ package body Terminal_Interface.Curses.Forms.Field_Types is
          return null;
       else
          if Low_Level = M_Builtin_Router or else
          return null;
       else
          if Low_Level = M_Builtin_Router or else

-           Low_Level = M_Generic_Type or else
-           Low_Level = M_Choice_Router or else
-           Low_Level = M_Generic_Choice then
-            Arg := To_Argument_Access (Get_Arg (Fld));
+            Low_Level = M_Generic_Type or else
+            Low_Level = M_Choice_Router or else
+            Low_Level = M_Generic_Choice
+         then
+            Arg := Argument_Access
+         (Argument_Conversions.To_Pointer (Get_Arg (Fld)));

             if Arg = null then
                raise Form_Exception;
             else
             if Arg = null then
                raise Form_Exception;
             else

-               return Arg.Typ;
+               return Arg.all.Typ;

             end if;
          else
             raise Form_Exception;
             end if;
          else
             raise Form_Exception;


@@ -92,55 +93,37 @@ package body Terminal_Interface.Curses.Forms.Field_Types is
       end if;
    end Get_Type;
 
       end if;
    end Get_Type;
 

-   function Make_Arg (Args : System.Address) return System.Address
-   is
-      --  Actually args is a double indirected pointer to the arguments
-      --  of a C variable argument list. In theory it is now quite
-      --  complicated to write portable routine that reads the arguments,
-      --  because one has to know the growth direction of the stack and
-      --  the sizes of the individual arguments.
-      --  Fortunately we are only interested in the first argument (#0),
-      --  we know its size and for the first arg we don't care about
-      --  into which stack direction we have to proceed. We simply
-      --  resolve the double indirection and thats it.
-      type V is access all System.Address;
-      function To_Access is new Ada.Unchecked_Conversion (System.Address,
-                                                          V);
-   begin
-      return To_Access (To_Access (Args).all).all;
-   end Make_Arg;
-

    function Copy_Arg (Usr : System.Address) return System.Address
    is
    begin
       return Usr;
    end Copy_Arg;
 
    function Copy_Arg (Usr : System.Address) return System.Address
    is
    begin
       return Usr;
    end Copy_Arg;
 

-   procedure Free_Arg (Usr : in System.Address)
+   procedure Free_Arg (Usr : System.Address)

    is
       procedure Free_Type is new Ada.Unchecked_Deallocation
         (Field_Type'Class, Field_Type_Access);
       procedure Freeargs is new Ada.Unchecked_Deallocation
         (Argument, Argument_Access);
 
    is
       procedure Free_Type is new Ada.Unchecked_Deallocation
         (Field_Type'Class, Field_Type_Access);
       procedure Freeargs is new Ada.Unchecked_Deallocation
         (Argument, Argument_Access);
 

-      To_Be_Free : Argument_Access := To_Argument_Access (Usr);
+      To_Be_Free : Argument_Access
+   := Argument_Access (Argument_Conversions.To_Pointer (Usr));

       Low_Level  : C_Field_Type;
    begin
       if To_Be_Free /= null then
       Low_Level  : C_Field_Type;
    begin
       if To_Be_Free /= null then

-         if To_Be_Free.Usr /= System.Null_Address then
-            Low_Level := To_Be_Free.Cft;
-            if Low_Level.Freearg /= null then
-               Low_Level.Freearg (To_Be_Free.Usr);
+         if To_Be_Free.all.Usr /= System.Null_Address then
+            Low_Level := To_Be_Free.all.Cft;
+            if Low_Level.all.Freearg /= null then
+               Low_Level.all.Freearg (To_Be_Free.all.Usr);

             end if;
          end if;
             end if;
          end if;

-         if To_Be_Free.Typ /= null then
-            Free_Type (To_Be_Free.Typ);
+         if To_Be_Free.all.Typ /= null then
+            Free_Type (To_Be_Free.all.Typ);

          end if;
          Freeargs (To_Be_Free);
       end if;
    end Free_Arg;
 
          end if;
          Freeargs (To_Be_Free);
       end if;
    end Free_Arg;
 

-

    procedure Wrap_Builtin (Fld : Field;
                            Typ : Field_Type'Class;
                            Cft : C_Field_Type := C_Builtin_Router)
    procedure Wrap_Builtin (Fld : Field;
                            Typ : Field_Type'Class;
                            Cft : C_Field_Type := C_Builtin_Router)


@@ -148,11 +131,10 @@ package body Terminal_Interface.Curses.Forms.Field_Types is
       Usr_Arg   : constant System.Address := Get_Arg (Fld);
       Low_Level : constant C_Field_Type := Get_Fieldtype (Fld);
       Arg : Argument_Access;
       Usr_Arg   : constant System.Address := Get_Arg (Fld);
       Low_Level : constant C_Field_Type := Get_Fieldtype (Fld);
       Arg : Argument_Access;

-      Res : Eti_Error;

       function Set_Fld_Type (F    : Field := Fld;
                              Cf   : C_Field_Type := Cft;
       function Set_Fld_Type (F    : Field := Fld;
                              Cf   : C_Field_Type := Cft;

-                             Arg1 : Argument_Access) return C_Int;
-      pragma Import (C, Set_Fld_Type, "set_field_type");
+                             Arg1 : Argument_Access) return Eti_Error;
+      pragma Import (C, Set_Fld_Type, "set_field_type_user");

 
    begin
       pragma Assert (Low_Level /= Null_Field_Type);
 
    begin
       pragma Assert (Low_Level /= Null_Field_Type);


@@ -163,71 +145,72 @@ package body Terminal_Interface.Curses.Forms.Field_Types is
                               Typ => new Field_Type'Class'(Typ),
                               Cft => Get_Fieldtype (Fld));
          if Usr_Arg /= System.Null_Address then
                               Typ => new Field_Type'Class'(Typ),
                               Cft => Get_Fieldtype (Fld));
          if Usr_Arg /= System.Null_Address then

-            if Low_Level.Copyarg /= null then
-               Arg.Usr := Low_Level.Copyarg (Usr_Arg);
+            if Low_Level.all.Copyarg /= null then
+               Arg.all.Usr := Low_Level.all.Copyarg (Usr_Arg);

             else
             else

-               Arg.Usr := Usr_Arg;
+               Arg.all.Usr := Usr_Arg;

             end if;
          end if;
 
             end if;
          end if;
 

-         Res := Set_Fld_Type (Arg1 => Arg);
-         if Res /= E_Ok then
-            Eti_Exception (Res);
-         end if;
+         Eti_Exception (Set_Fld_Type (Arg1 => Arg));

       end if;
    end Wrap_Builtin;
 
    function Field_Check_Router (Fld : Field;
       end if;
    end Wrap_Builtin;
 
    function Field_Check_Router (Fld : Field;

-                                Usr : System.Address) return C_Int
+                                Usr : System.Address) return Curses_Bool

    is
    is

-      Arg  : constant Argument_Access := To_Argument_Access (Usr);
+      Arg  : constant Argument_Access
+   := Argument_Access (Argument_Conversions.To_Pointer (Usr));

    begin
    begin

-      pragma Assert (Arg /= null and then Arg.Cft /= Null_Field_Type
-                     and then Arg.Typ /= null);
-      if Arg.Cft.Fcheck /= null then
-         return Arg.Cft.Fcheck (Fld, Arg.Usr);
+      pragma Assert (Arg /= null and then Arg.all.Cft /= Null_Field_Type
+                     and then Arg.all.Typ /= null);
+      if Arg.all.Cft.all.Fcheck /= null then
+         return Arg.all.Cft.all.Fcheck (Fld, Arg.all.Usr);

       else
          return 1;
       end if;
    end Field_Check_Router;
 
    function Char_Check_Router (Ch  : C_Int;
       else
          return 1;
       end if;
    end Field_Check_Router;
 
    function Char_Check_Router (Ch  : C_Int;

-                               Usr : System.Address) return C_Int
+                               Usr : System.Address) return Curses_Bool

    is
    is

-      Arg  : constant Argument_Access := To_Argument_Access (Usr);
+      Arg  : constant Argument_Access
+   := Argument_Access (Argument_Conversions.To_Pointer (Usr));

    begin
    begin

-      pragma Assert (Arg /= null and then Arg.Cft /= Null_Field_Type
-                     and then Arg.Typ /= null);
-      if Arg.Cft.Ccheck /= null then
-         return Arg.Cft.Ccheck (Ch, Arg.Usr);
+      pragma Assert (Arg /= null and then Arg.all.Cft /= Null_Field_Type
+                     and then Arg.all.Typ /= null);
+      if Arg.all.Cft.all.Ccheck /= null then
+         return Arg.all.Cft.all.Ccheck (Ch, Arg.all.Usr);

       else
          return 1;
       end if;
    end Char_Check_Router;
 
    function Next_Router (Fld : Field;
       else
          return 1;
       end if;
    end Char_Check_Router;
 
    function Next_Router (Fld : Field;

-                         Usr : System.Address) return C_Int
+                         Usr : System.Address) return Curses_Bool

    is
    is

-      Arg  : constant Argument_Access := To_Argument_Access (Usr);
+      Arg  : constant Argument_Access
+   := Argument_Access (Argument_Conversions.To_Pointer (Usr));

    begin
    begin

-      pragma Assert (Arg /= null and then Arg.Cft /= Null_Field_Type
-                     and then Arg.Typ /= null);
-      if Arg.Cft.Next /= null then
-         return Arg.Cft.Next (Fld, Arg.Usr);
+      pragma Assert (Arg /= null and then Arg.all.Cft /= Null_Field_Type
+                     and then Arg.all.Typ /= null);
+      if Arg.all.Cft.all.Next /= null then
+         return Arg.all.Cft.all.Next (Fld, Arg.all.Usr);

       else
          return 1;
       end if;
    end Next_Router;
 
    function Prev_Router (Fld : Field;
       else
          return 1;
       end if;
    end Next_Router;
 
    function Prev_Router (Fld : Field;

-                         Usr : System.Address) return C_Int
+                         Usr : System.Address) return Curses_Bool

    is
    is

-      Arg  : constant Argument_Access := To_Argument_Access (Usr);
+      Arg  : constant Argument_Access :=
+               Argument_Access (Argument_Conversions.To_Pointer (Usr));

    begin
    begin

-      pragma Assert (Arg /= null and then Arg.Cft /= Null_Field_Type
-                     and then Arg.Typ /= null);
-      if Arg.Cft.Prev /= null then
-         return Arg.Cft.Prev (Fld, Arg.Usr);
+      pragma Assert (Arg /= null and then Arg.all.Cft /= Null_Field_Type
+                     and then Arg.all.Typ /= null);
+      if Arg.all.Cft.all.Prev /= null then
+         return Arg.all.Cft.all.Prev (Fld, Arg.all.Usr);

       else
          return 1;
       end if;
       else
          return 1;
       end if;


@@ -237,7 +220,6 @@ package body Terminal_Interface.Curses.Forms.Field_Types is
    --
    function C_Builtin_Router return C_Field_Type
    is
    --
    function C_Builtin_Router return C_Field_Type
    is

-      Res : Eti_Error;

       T   : C_Field_Type;
    begin
       if M_Builtin_Router = Null_Field_Type then
       T   : C_Field_Type;
    begin
       if M_Builtin_Router = Null_Field_Type then


@@ -246,13 +228,10 @@ package body Terminal_Interface.Curses.Forms.Field_Types is
          if T = Null_Field_Type then
             raise Form_Exception;
          else
          if T = Null_Field_Type then
             raise Form_Exception;
          else

-            Res := Set_Fieldtype_Arg (T,
-                                      Make_Arg'Access,
-                                      Copy_Arg'Access,
-                                      Free_Arg'Access);
-            if Res /= E_Ok then
-               Eti_Exception (Res);
-            end if;
+            Eti_Exception (Set_Fieldtype_Arg (T,
+                                              Make_Arg'Access,
+                                              Copy_Arg'Access,
+                                              Free_Arg'Access));

          end if;
          M_Builtin_Router := T;
       end if;
          end if;
          M_Builtin_Router := T;
       end if;


@@ -264,7 +243,6 @@ package body Terminal_Interface.Curses.Forms.Field_Types is
    --
    function C_Choice_Router return C_Field_Type
    is
    --
    function C_Choice_Router return C_Field_Type
    is

-      Res : Eti_Error;

       T   : C_Field_Type;
    begin
       if M_Choice_Router = Null_Field_Type then
       T   : C_Field_Type;
    begin
       if M_Choice_Router = Null_Field_Type then


@@ -273,20 +251,14 @@ package body Terminal_Interface.Curses.Forms.Field_Types is
          if T = Null_Field_Type then
             raise Form_Exception;
          else
          if T = Null_Field_Type then
             raise Form_Exception;
          else

-            Res := Set_Fieldtype_Arg (T,
-                                      Make_Arg'Access,
-                                      Copy_Arg'Access,
-                                      Free_Arg'Access);
-            if Res /= E_Ok then
-               Eti_Exception (Res);
-            end if;
+            Eti_Exception (Set_Fieldtype_Arg (T,
+                                              Make_Arg'Access,
+                                              Copy_Arg'Access,
+                                              Free_Arg'Access));

 
 

-            Res := Set_Fieldtype_Choice (T,
-                                         Next_Router'Access,
-                                         Prev_Router'Access);
-            if Res /= E_Ok then
-               Eti_Exception (Res);
-            end if;
+            Eti_Exception (Set_Fieldtype_Choice (T,
+                                                 Next_Router'Access,
+                                                 Prev_Router'Access));

          end if;
          M_Choice_Router := T;
       end if;
          end if;
          M_Choice_Router := T;
       end if;