FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

2008-07-31 Vincent Celier <celier@adacore.com>

Browse source 
* prj-nmsc.adb:
	(Record_Ada_Source): Do not set Data.Sources, component has been removed
	
	* prj.adb: Remove component Sources in record Project_Data
	
	* prj.ads: Remove component Sources in record Project_Data
	
	* sinput.ads, prj-util.ads: Minor reformatting

From-SVN: r138387
This commit is contained in:
Vincent Celier 2008-07-31 13:04:00 +02:00 • committed by Arnaud Charlet
parent 4f6e2c2422
commit 1d06f67ee2
5 changed files with 14 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gcc/ada/prj-nmsc.adb
View file

@ -4111,8 +4111,9 @@ package body Prj.Nmsc is
if Data.Library then
declare
Linker_Package_Id : constant Package_Id :=
Util.Value_Of (Name_Linker, Data.Decl.Packages, In_Tree);
Linker_Package : Package_Element;
Util.Value_Of
(Name_Linker, Data.Decl.Packages, In_Tree);
Linker_Package : Package_Element;
Switches : Array_Element_Id := No_Array_Element;
begin
@ -8843,7 +8844,6 @@ package body Prj.Nmsc is
if Current_Source = Nil_String then
Data.Ada_Sources :=
String_Element_Table.Last (In_Tree.String_Elements);
Data.Sources := Data.Ada_Sources;
else
In_Tree.String_Elements.Table (Current_Source).Next :=
String_Element_Table.Last (In_Tree.String_Elements);
@ -8918,7 +8918,6 @@ package body Prj.Nmsc is
then
if Previous_Source = Nil_String then
Data.Ada_Sources := Nil_String;
Data.Sources := Nil_String;
else
In_Tree.String_Elements.Table (Previous_Source).Next :=
Nil_String;

10
gcc/ada/prj-util.ads
View file

@ -146,14 +146,14 @@ package Prj.Util is
-- the last character of each line, if possible.
type Text_File is limited private;
-- Represents a text file. Default is invalid text file
-- Represents a text file (default is invalid text file)
function Is_Valid (File : Text_File) return Boolean;
-- Returns True if File designates an open text file that
-- has not yet been closed.
-- Returns True if File designates an open text file that has not yet been
-- closed.
procedure Open (File : out Text_File; Name : String);
-- Open a text file. If this procedure fails, File is invalid
-- Open a text file to read (file is invalid if text file cannot be opened)
function End_Of_File (File : Text_File) return Boolean;
-- Returns True if the end of the text file File has been reached. Fails if
@ -163,7 +163,7 @@ package Prj.Util is
(File : Text_File;
Line : out String;
Last : out Natural);
-- Reads a line from an open text file. Fails if File is invalid
-- Reads a line from an open text file (fails if file is invalid)
procedure Close (File : in out Text_File);
-- Close an open text file. File becomes invalid. Fails if File is already

1
gcc/ada/prj.adb
View file

@ -114,7 +114,6 @@ package body Prj is
Ada_Sources_Present => True,
Other_Sources_Present => True,
Ada_Sources => Nil_String,
Sources => Nil_String,
First_Source => No_Source,
Last_Source => No_Source,
Interfaces_Defined => False,

3
gcc/ada/prj.ads
View file

@ -1251,9 +1251,6 @@ package Prj is
Ada_Sources : String_List_Id := Nil_String;
-- The list of all the Ada source file names (gnatmake only)
Sources : String_List_Id := Nil_String;
-- Identical to Ada_Sources (for upward compatibility with GPS)
First_Source : Source_Id := No_Source;
Last_Source : Source_Id := No_Source;
-- Head and tail of the list of sources

12
gcc/ada/sinput.ads
View file

@ -565,12 +565,12 @@ package Sinput is
procedure Skip_Line_Terminators
(P : in out Source_Ptr;
Physical : out Boolean);
-- On entry, P points to a line terminator that has been encountered,
-- which is one of FF,LF,VT,CR or a wide character sequence whose value is
-- in category Separator,Line or Separator,Paragraph. The purpose of this
-- P points just past the character that was scanned. The purpose of this
-- routine is to distinguish physical and logical line endings. A physical
-- line ending is one of:
-- On entry, P points to a line terminator that has been encountered, which
-- is one of FF,LF,VT,CR or a wide character sequence whose value is in
-- category Separator,Line or Separator,Paragraph. P points just past the
-- character that was scanned. The purpose of this routine is to
-- distinguish physical and logical line endings. A physical line ending is
-- one of:
--
-- CR on its own (MAC System 7)
-- LF on its own (Unix and unix-like systems)