X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=doc%2Fhtml%2Fada%2Fterminal_interface-curses-forms-field_types__adb.htm;h=2a48f9c5410c30fecd90b42147efee6478acbd45;hp=21606641c4be75f5d97e204ed14b38260b86cc1d;hb=2b635f090ec43c82958cef9369464aee4dd8975f;hpb=9776951416d7fb862b9dca1f4c9f8031a5c9059b
diff --git a/doc/html/ada/terminal_interface-curses-forms-field_types__adb.htm b/doc/html/ada/terminal_interface-curses-forms-field_types__adb.htm
index 21606641..2a48f9c5 100644
--- a/doc/html/ada/terminal_interface-curses-forms-field_types__adb.htm
+++ b/doc/html/ada/terminal_interface-curses-forms-field_types__adb.htm
@@ -40,31 +40,30 @@
------------------------------------------------------------------------------
-- Author: Juergen Pfeifer, 1996
-- Version Control:
--- @Revision: 1.22 @
--- @Date: 2011/03/08 01:16:49 @
+-- @Revision: 1.25 @
+-- @Date: 2011/03/22 23:22:27 @
-- Binding Version 01.00
------------------------------------------------------------------------------
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
-- |=====================================================================
-- |
-package body Terminal_Interface.Curses.Forms.Field_Types is
+package body Terminal_Interface.Curses.Forms.Field_Types is
use type System.Address;
- pragma Warnings (Off);
- function To_Argument_Access is new Ada.Unchecked_Conversion
- (System.Address, Argument_Access);
- pragma Warnings (On);
+ package Argument_Conversions is
+ new System.Address_To_Access_Conversions (Argument);
- function Get_Fieldtype (F : Field) return C_Field_Type;
+ function Get_Fieldtype (F : Field) return C_Field_Type;
pragma Import (C, Get_Fieldtype, "field_type");
- function Get_Arg (F : Field) return System.Address;
+ function Get_Arg (F : Field) return System.Address;
pragma Import (C, Get_Arg, "field_arg");
-- |
-- |=====================================================================
@@ -73,23 +72,24 @@
-- |
-- |
-- |
- function Get_Type (Fld : 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;
+ Low_Level : constant C_Field_Type := Get_Fieldtype (Fld);
+ Arg : Argument_Access;
begin
- if Low_Level = Null_Field_Type then
+ if Low_Level = Null_Field_Type then
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));
- if Arg = null then
+ 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 := Argument_Access
+ (Argument_Conversions.To_Pointer (Get_Arg (Fld)));
+ if Arg = null then
raise Form_Exception;
else
- return Arg.Typ;
+ return Arg.all.Typ;
end if;
else
raise Form_Exception;
@@ -110,110 +110,115 @@
procedure Freeargs is new Ada.Unchecked_Deallocation
(Argument, Argument_Access);
- To_Be_Free : Argument_Access := To_Argument_Access (Usr);
- Low_Level : C_Field_Type;
+ To_Be_Free : Argument_Access
+ := Argument_Access (Argument_Conversions.To_Pointer (Usr));
+ 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;
- 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;
- 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)
is
- 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;
- Arg1 : Argument_Access) return C_Int;
+ 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;
+ Arg1 : Argument_Access) return C_Int;
pragma Import (C, Set_Fld_Type, "set_field_type_user");
begin
- pragma Assert (Low_Level /= Null_Field_Type);
+ pragma Assert (Low_Level /= Null_Field_Type);
if Cft /= C_Builtin_Router and then Cft /= C_Choice_Router then
raise Form_Exception;
else
- Arg := new Argument'(Usr => System.Null_Address,
+ Arg := new Argument'(Usr => System.Null_Address,
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);
+ Cft => Get_Fieldtype (Fld));
+ if Usr_Arg /= System.Null_Address then
+ if Low_Level.all.Copyarg /= null then
+ Arg.all.Usr := Low_Level.all.Copyarg (Usr_Arg);
else
- Arg.Usr := Usr_Arg;
+ Arg.all.Usr := Usr_Arg;
end if;
end if;
- Res := Set_Fld_Type (Arg1 => Arg);
- if Res /= E_Ok then
- Eti_Exception (Res);
+ Res := Set_Fld_Type (Arg1 => Arg);
+ if Res /= E_Ok then
+ Eti_Exception (Res);
end if;
end if;
end Wrap_Builtin;
- function Field_Check_Router (Fld : Field;
- Usr : System.Address) return Curses_Bool
+ function Field_Check_Router (Fld : Field;
+ Usr : System.Address) return Curses_Bool
is
- Arg : constant Argument_Access := To_Argument_Access (Usr);
+ Arg : constant Argument_Access
+ := Argument_Access (Argument_Conversions.To_Pointer (Usr));
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;
- Usr : System.Address) return Curses_Bool
+ function Char_Check_Router (Ch : C_Int;
+ Usr : System.Address) return Curses_Bool
is
- Arg : constant Argument_Access := To_Argument_Access (Usr);
+ Arg : constant Argument_Access
+ := Argument_Access (Argument_Conversions.To_Pointer (Usr));
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;
- Usr : System.Address) return Curses_Bool
+ function Next_Router (Fld : Field;
+ Usr : System.Address) return Curses_Bool
is
- Arg : constant Argument_Access := To_Argument_Access (Usr);
+ Arg : constant Argument_Access
+ := Argument_Access (Argument_Conversions.To_Pointer (Usr));
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;
- Usr : System.Address) return Curses_Bool
+ function Prev_Router (Fld : Field;
+ Usr : System.Address) return Curses_Bool
is
- Arg : constant Argument_Access := To_Argument_Access (Usr);
+ Arg : constant Argument_Access :=
+ Argument_Access (Argument_Conversions.To_Pointer (Usr));
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;
@@ -221,26 +226,26 @@
-- -----------------------------------------------------------------------
--
- function C_Builtin_Router return C_Field_Type
+ function C_Builtin_Router return C_Field_Type
is
- Res : Eti_Error;
- T : C_Field_Type;
+ Res : Eti_Error;
+ T : C_Field_Type;
begin
if M_Builtin_Router = Null_Field_Type then
- T := New_Fieldtype (Field_Check_Router'Access,
+ T := New_Fieldtype (Field_Check_Router'Access,
Char_Check_Router'Access);
- if T = Null_Field_Type then
+ if T = Null_Field_Type then
raise Form_Exception;
else
- Res := Set_Fieldtype_Arg (T,
+ Res := Set_Fieldtype_Arg (T,
Make_Arg'Access,
Copy_Arg'Access,
Free_Arg'Access);
- if Res /= E_Ok then
- Eti_Exception (Res);
+ if Res /= E_Ok then
+ Eti_Exception (Res);
end if;
end if;
- M_Builtin_Router := T;
+ M_Builtin_Router := T;
end if;
pragma Assert (M_Builtin_Router /= Null_Field_Type);
return M_Builtin_Router;
@@ -248,33 +253,33 @@
-- -----------------------------------------------------------------------
--
- function C_Choice_Router return C_Field_Type
+ function C_Choice_Router return C_Field_Type
is
- Res : Eti_Error;
- T : C_Field_Type;
+ Res : Eti_Error;
+ T : C_Field_Type;
begin
if M_Choice_Router = Null_Field_Type then
- T := New_Fieldtype (Field_Check_Router'Access,
+ T := New_Fieldtype (Field_Check_Router'Access,
Char_Check_Router'Access);
- if T = Null_Field_Type then
+ if T = Null_Field_Type then
raise Form_Exception;
else
- Res := Set_Fieldtype_Arg (T,
+ Res := Set_Fieldtype_Arg (T,
Make_Arg'Access,
Copy_Arg'Access,
Free_Arg'Access);
- if Res /= E_Ok then
- Eti_Exception (Res);
+ if Res /= E_Ok then
+ Eti_Exception (Res);
end if;
- Res := Set_Fieldtype_Choice (T,
+ Res := Set_Fieldtype_Choice (T,
Next_Router'Access,
Prev_Router'Access);
- if Res /= E_Ok then
- Eti_Exception (Res);
+ if Res /= E_Ok then
+ Eti_Exception (Res);
end if;
end if;
- M_Choice_Router := T;
+ M_Choice_Router := T;
end if;
pragma Assert (M_Choice_Router /= Null_Field_Type);
return M_Choice_Router;