-- --
-- B o d y --
-- --
--- Copyright (C) 1992-2005, Free Software Foundation, Inc. --
+-- Copyright (C) 1992-2007, Free Software Foundation, Inc. --
-- --
-- GNAT is free software; you can redistribute it and/or modify it under --
-- terms of the GNU General Public License as published by the Free Soft- --
-- --
------------------------------------------------------------------------------
+with Gnatvsn; use Gnatvsn;
with System; use System;
with Tree_IO; use Tree_IO;
package body Opt is
- Immediate_Errors : Boolean := True;
- -- This is an obsolete flag that is no longer present in opt.ads. We
- -- retain it here because this flag was written to the tree and there
- -- is no point in making trees incomaptible just for the sake of saving
- -- one byte of data. The value written is ignored.
+ SU : constant := Storage_Unit;
+ -- Shorthand for System.Storage_Unit
----------------------------------
-- Register_Opt_Config_Switches --
-- Case of internal unit
if Internal_Unit then
+
+ -- Set standard switches. Note we do NOT set Ada_Version_Explicit
+ -- since the whole point of this is that it still properly indicates
+ -- the configuration setting even in a run time unit.
+
Ada_Version := Ada_Version_Runtime;
Dynamic_Elaboration_Checks := False;
Extensions_Allowed := True;
-- is the main unit and they were explicitly enabled.
if Main_Unit then
- Assertions_Enabled := Assertions_Enabled_Config;
+ Assertions_Enabled := Assertions_Enabled_Config;
Debug_Pragmas_Enabled := Debug_Pragmas_Enabled_Config;
else
- Assertions_Enabled := False;
+ Assertions_Enabled := False;
Debug_Pragmas_Enabled := False;
end if;
else
Ada_Version := Ada_Version_Config;
+ Ada_Version_Explicit := Ada_Version_Explicit_Config;
Assertions_Enabled := Assertions_Enabled_Config;
Debug_Pragmas_Enabled := Debug_Pragmas_Enabled_Config;
Dynamic_Elaboration_Checks := Dynamic_Elaboration_Checks_Config;
Exception_Locations_Suppressed := Exception_Locations_Suppressed_Config;
Polling_Required := Polling_Required_Config;
- Ada_Version_Explicit := Ada_Version_Explicit_Config;
end Set_Opt_Config_Switches;
---------------
Tree_Read_Char (Identifier_Character_Set);
Tree_Read_Int (Maximum_File_Name_Length);
Tree_Read_Data (Suppress_Options'Address,
- Suppress_Array'Object_Size / Storage_Unit);
+ (Suppress_Options'Size + SU - 1) / SU);
Tree_Read_Bool (Verbose_Mode);
Tree_Read_Data (Warning_Mode'Address,
- Warning_Mode_Type'Object_Size / Storage_Unit);
+ (Warning_Mode'Size + SU - 1) / SU);
Tree_Read_Int (Ada_Version_Config_Val);
Tree_Read_Int (Ada_Version_Explicit_Config_Val);
Tree_Read_Int (Assertions_Enabled_Config_Val);
Assertions_Enabled_Config :=
Boolean'Val (Assertions_Enabled_Config_Val);
- -- Read version string: we have to check the length first
+ -- Read version string: we have to get the length first
Tree_Read_Int (Tree_Version_String_Len);
- if Tree_Version_String_Len = Tree_Version_String'Length then
+ declare
+ Tmp : String (1 .. Integer (Tree_Version_String_Len));
+ begin
Tree_Read_Data
- (Tree_Version_String'Address, Tree_Version_String_Len);
- else
- Tree_Version_String := (others => '?');
-
- declare
- Tmp : String (1 .. Integer (Tree_Version_String_Len));
- begin
- Tree_Read_Data
- (Tmp'Address, Tree_Version_String_Len);
- end;
-
- end if;
+ (Tmp'Address, Tree_Version_String_Len);
+ System.Strings.Free (Tree_Version_String);
+ Free (Tree_Version_String);
+ Tree_Version_String := new String'(Tmp);
+ end;
Tree_Read_Data (Distribution_Stub_Mode'Address,
- Distribution_Stub_Mode_Type'Object_Size / Storage_Unit);
- Tree_Read_Bool (Immediate_Errors);
+ (Distribution_Stub_Mode'Size + SU - 1) / Storage_Unit);
Tree_Read_Bool (Inline_Active);
Tree_Read_Bool (Inline_Processing_Required);
Tree_Read_Bool (List_Units);
Tree_Read_Bool (Configurable_Run_Time_Mode);
Tree_Read_Data (Operating_Mode'Address,
- Operating_Mode_Type'Object_Size / Storage_Unit);
+ (Operating_Mode'Size + SU - 1) / Storage_Unit);
Tree_Read_Bool (Suppress_Checks);
Tree_Read_Bool (Try_Semantics);
Tree_Read_Data (Wide_Character_Encoding_Method'Address,
- WC_Encoding_Method'Object_Size / Storage_Unit);
+ (Wide_Character_Encoding_Method'Size + SU - 1) / SU);
Tree_Read_Bool (Upper_Half_Encoding);
Tree_Read_Bool (Force_ALI_Tree_File);
end Tree_Read;
procedure Tree_Write is
Version_String : String := Gnat_Version_String;
+
begin
Tree_Write_Int (ASIS_Version_Number);
Tree_Write_Bool (Brief_Output);
Tree_Write_Char (Identifier_Character_Set);
Tree_Write_Int (Maximum_File_Name_Length);
Tree_Write_Data (Suppress_Options'Address,
- Suppress_Array'Object_Size / Storage_Unit);
+ (Suppress_Options'Size + SU - 1) / SU);
Tree_Write_Bool (Verbose_Mode);
Tree_Write_Data (Warning_Mode'Address,
- Warning_Mode_Type'Object_Size / Storage_Unit);
+ (Warning_Mode'Size + SU - 1) / Storage_Unit);
Tree_Write_Int (Ada_Version_Type'Pos (Ada_Version_Config));
Tree_Write_Int (Ada_Version_Type'Pos (Ada_Version_Explicit_Config));
Tree_Write_Int (Boolean'Pos (Assertions_Enabled_Config));
Tree_Write_Bool (Enable_Overflow_Checks);
Tree_Write_Bool (Full_List);
Tree_Write_Int (Int (Version_String'Length));
- Tree_Write_Data (Version_String'Address,
- Version_String'Length);
+ Tree_Write_Data (Version_String'Address, Version_String'Length);
Tree_Write_Data (Distribution_Stub_Mode'Address,
- Distribution_Stub_Mode_Type'Object_Size / Storage_Unit);
- Tree_Write_Bool (Immediate_Errors);
+ (Distribution_Stub_Mode'Size + SU - 1) / SU);
Tree_Write_Bool (Inline_Active);
Tree_Write_Bool (Inline_Processing_Required);
Tree_Write_Bool (List_Units);
Tree_Write_Bool (Configurable_Run_Time_Mode);
Tree_Write_Data (Operating_Mode'Address,
- Operating_Mode_Type'Object_Size / Storage_Unit);
+ (Operating_Mode'Size + SU - 1) / SU);
Tree_Write_Bool (Suppress_Checks);
Tree_Write_Bool (Try_Semantics);
Tree_Write_Data (Wide_Character_Encoding_Method'Address,
- WC_Encoding_Method'Object_Size / Storage_Unit);
+ (Wide_Character_Encoding_Method'Size + SU - 1) / SU);
Tree_Write_Bool (Upper_Half_Encoding);
Tree_Write_Bool (Force_ALI_Tree_File);
end Tree_Write;
OSDN Git Service
