OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[multiple changes] 

2009-04-09  Robert Dewar  <dewar@adacore.com>

	* g-comver.adb: Minor reformatting.

2009-04-09  Thomas Quinot  <quinot@adacore.com>

	* lib-load.ads (Load_Unit): Update documentation.

2009-04-09  Ed Schonberg  <schonberg@adacore.com>

	* lib-load.adb (Load_Unit): When loading the parent of a child unit
	named in a with_clause, retain the with_clause to preserve a
	limited_with indication.

From-SVN: r145829
This commit is contained in:
Arnaud Charlet 2009-04-09 14:10:15 +02:00
parent 4a77c72b6b
commit 1c383b4cd4
4 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gcc/ada/ChangeLog
View File

@ -1,3 +1,17 @@
2009-04-09 Robert Dewar <dewar@adacore.com>
* g-comver.adb: Minor reformatting.
2009-04-09 Thomas Quinot <quinot@adacore.com>
* lib-load.ads (Load_Unit): Update documentation.
2009-04-09 Ed Schonberg <schonberg@adacore.com>
* lib-load.adb (Load_Unit): When loading the parent of a child unit
named in a with_clause, retain the with_clause to preserve a
limited_with indication.
2009-04-09 Robert Dewar <dewar@adacore.com>
* sem_ch7.adb, sem_ch10.adb, sem_prag.adb, sem_ch12.adb, sem_util.adb,

3
gcc/ada/g-comver.adb
View File

@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
-- Copyright (C) 2002-2005,2008 AdaCore --
-- Copyright (C) 2002-2008, AdaCore --
-- --
-- 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- --
@ -59,6 +59,7 @@ package body GNAT.Compiler_Version is
if GNAT_Version (J) = ')' then
return GNAT_Version (Ver_Prefix'Length + 1 .. J);
end if;
if GNAT_Version (J) = Character'Val (0) then
return GNAT_Version (Ver_Prefix'Length + 1 .. J - 1);
end if;

5
gcc/ada/lib-load.adb
View File

@ -358,6 +358,8 @@ package body Lib.Load is
begin
-- If renamings are allowed and we have a child unit name, then we
-- must first load the parent to deal with finding the real name.
-- Retain the with_clause that names the child, so that if it is
-- limited, the parent is loaded under the same condition.
if Renamings and then Is_Child_Name (Load_Name) then
Unump :=
@ -366,7 +368,8 @@ package body Lib.Load is
Required => Required,
Subunit => False,
Renamings => True,
Error_Node => Error_Node);
Error_Node => Error_Node,
With_Node => With_Node);
if Unump = No_Unit then
return No_Unit;

8
gcc/ada/lib-load.ads
View File

@ -6,7 +6,7 @@
-- --
-- S p e c --
-- --
-- Copyright (C) 1992-2007, Free Software Foundation, Inc. --
-- Copyright (C) 1992-2008, 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- --
@ -148,9 +148,9 @@ package Lib.Load is
-- set to True, then Load_Name may not be the real unit name and it
-- is necessary to load parents to find the real name.
--
-- From_Limited_With is True if we are loading a unit X found in a
-- limited-with clause, or some unit in the context of X. It is used to
-- avoid the check on circular dependency (Ada 2005, AI-50217)
-- With_Node is set to the with_clause or limited_with_clause causing
-- the unit to be loaded, and is used to bypass the circular dependency
-- check in the case of a limited_with_clause (Ada 2005, AI-50217).
procedure Change_Main_Unit_To_Spec;
-- This procedure is called if the main unit file contains a No_Body pragma