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

sem_ch5.adb, [...]: Minor reformatting.

Browse Source 
2014-10-17  Robert Dewar  <dewar@adacore.com>

	* sem_ch5.adb, sem_ch7.adb, prj-nmsc.adb, sem_ch13.adb, exp_ch3.adb:
	Minor reformatting.

From-SVN: r216381
This commit is contained in:
Robert Dewar 2014-10-17 09:12:56 +00:00 committed by Arnaud Charlet
parent ac2ea5c513
commit 2e21557397
6 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/ada/ChangeLog
View File

@ -1,3 +1,8 @@
2014-10-17 Robert Dewar <dewar@adacore.com>
* sem_ch5.adb, sem_ch7.adb, prj-nmsc.adb, sem_ch13.adb, exp_ch3.adb:
Minor reformatting.
2014-10-17 Ed Schonberg <schonberg@adacore.com>
* exp_ch3.adb (Build_Component_Invariant_Call): Retrieve Invariant

2
gcc/ada/exp_ch3.adb
View File

@ -3720,7 +3720,7 @@ package body Exp_Ch3 is
end if;
end if;
-- The aspect is type-specific, so retrieve it from the base type.
-- The aspect is type-specific, so retrieve it from the base type
Call :=
Make_Procedure_Call_Statement (Loc,

30
gcc/ada/prj-nmsc.adb
View File

@ -5032,7 +5032,8 @@ package body Prj.Nmsc is
if OK then
for J in 1 .. Name_Len loop
if Name_Buffer (J) = '/'
or else Name_Buffer (J) = Directory_Separator
or else
Name_Buffer (J) = Directory_Separator
then
OK := False;
exit;
@ -5498,15 +5499,16 @@ package body Prj.Nmsc is
Dir_Exists : Boolean;
No_Sources : constant Boolean :=
Project.Qualifier = Abstract_Project
or else
(((not Source_Files.Default
and then Source_Files.Values = Nil_String)
or else (not Source_Dirs.Default
and then Source_Dirs.Values = Nil_String)
or else (not Languages.Default
and then Languages.Values = Nil_String))
and then Project.Extends = No_Project);
Project.Qualifier = Abstract_Project
or else (((not Source_Files.Default
and then Source_Files.Values = Nil_String)
or else
(not Source_Dirs.Default
and then Source_Dirs.Values = Nil_String)
or else
(not Languages.Default
and then Languages.Values = Nil_String))
and then Project.Extends = No_Project);
-- Start of processing for Get_Directories
@ -6305,7 +6307,7 @@ package body Prj.Nmsc is
Dir_Exists := Is_Directory (Full_Path_Name.all);
if not Must_Exist or else Dir_Exists then
if not Must_Exist or Dir_Exists then
declare
Normed : constant String :=
Normalize_Pathname
@ -6484,7 +6486,8 @@ package body Prj.Nmsc is
for J in 1 .. Last loop
if Line (J) = '/'
or else Line (J) = Directory_Separator
or else
Line (J) = Directory_Separator
then
Error_Msg_File_1 := Name;
Error_Msg
@ -6598,7 +6601,8 @@ package body Prj.Nmsc is
for J in 1 .. Name_Len loop
if Name_Buffer (J) = '/'
or else Name_Buffer (J) = Directory_Separator
or else
Name_Buffer (J) = Directory_Separator
then
Error_Msg_File_1 := Name;
Error_Msg

8
gcc/ada/sem_ch13.adb
View File

@ -3903,15 +3903,13 @@ package body Sem_Ch13 is
if Ctrl = Ent
or else Ctrl = Class_Wide_Type (Ent)
or else
(Ekind (Ctrl) = E_Anonymous_Access_Type
and then
(Designated_Type (Ctrl) = Ent
or else Designated_Type (Ctrl) = Class_Wide_Type (Ent)))
and then (Designated_Type (Ctrl) = Ent
or else
Designated_Type (Ctrl) = Class_Wide_Type (Ent)))
then
null;
else
return False;
end if;

4
gcc/ada/sem_ch5.adb
View File

@ -1839,7 +1839,7 @@ package body Sem_Ch5 is
else
Typ := Etype (Iter_Name);
-- Verify that the expression produces an iterator.
-- Verify that the expression produces an iterator
if not Of_Present (N) and then not Is_Iterator (Typ)
and then not Is_Array_Type (Typ)
@ -1847,7 +1847,7 @@ package body Sem_Ch5 is
then
Error_Msg_N
("expect object that implements iterator interface",
Iter_Name);
Iter_Name);
end if;
end if;

3
gcc/ada/sem_ch7.adb
View File

@ -1383,6 +1383,9 @@ package body Sem_Ch7 is
Inherit_Default_Init_Cond_Procedure (E);
end if;
-- If invariants are present, build the invariant procedure for a
-- private type, but not any of its subtypes.
if Has_Invariants (E) then
if Ekind (E) = E_Private_Subtype then
null;