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

sem_ch4.adb: Fix typos in comments.

Browse Source 
2016-04-20  Yannick Moy  <moy@adacore.com>

	* sem_ch4.adb: Fix typos in comments.
	* sem_res.adb (Resolve_Case_Expression): Fix type of case alternatives.

From-SVN: r235263
This commit is contained in:
Yannick Moy 2016-04-20 10:44:17 +00:00 committed by Arnaud Charlet
parent d493941584
commit bc795e3e03
3 changed files with 28 additions and 8 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 @@
2016-04-20 Yannick Moy <moy@adacore.com>
* sem_ch4.adb: Fix typos in comments.
* sem_res.adb (Resolve_Case_Expression): Fix type of case alternatives.
2016-04-20 Ed Schonberg <schonberg@adacore.com>
* sem_ch4.adb (Analyze_Selected_Component): A reference to the

4
gcc/ada/sem_ch4.adb
View File

@ -2175,12 +2175,12 @@ package body Sem_Ch4 is
begin
Set_Etype (N, Any_Type);
-- Loop through intepretations of Then_Expr
-- Loop through interpretations of Then_Expr
Get_First_Interp (Then_Expr, I, It);
while Present (It.Nam) loop
-- Add possible intepretation of Then_Expr if no Else_Expr, or
-- Add possible interpretation of Then_Expr if no Else_Expr, or
-- Else_Expr is present and has a compatible type.
if No (Else_Expr)

27
gcc/ada/sem_res.adb
View File

@ -6509,13 +6509,27 @@ package body Sem_Res is
-----------------------------
procedure Resolve_Case_Expression (N : Node_Id; Typ : Entity_Id) is
Alt : Node_Id;
Is_Dyn : Boolean;
Alt : Node_Id;
Alt_Expr : Node_Id;
Alt_Typ : Entity_Id;
Is_Dyn : Boolean;
begin
Alt := First (Alternatives (N));
while Present (Alt) loop
Resolve (Expression (Alt), Typ);
Alt_Expr := Expression (Alt);
Resolve (Alt_Expr, Typ);
Alt_Typ := Etype (Alt_Expr);
-- When the expression is of a scalar subtype different from the
-- result subtype, then insert a conversion to ensure the generation
-- of a constraint check.
if Is_Scalar_Type (Alt_Typ) and then Alt_Typ /= Typ then
Rewrite (Alt_Expr, Convert_To (Typ, Alt_Expr));
Analyze_And_Resolve (Alt_Expr, Typ);
end if;
Next (Alt);
end loop;
@ -6523,13 +6537,14 @@ package body Sem_Res is
-- dynamically tagged must be known statically.
if Is_Tagged_Type (Typ) and then not Is_Class_Wide_Type (Typ) then
Alt := First (Alternatives (N));
Alt := First (Alternatives (N));
Is_Dyn := Is_Dynamically_Tagged (Expression (Alt));
while Present (Alt) loop
if Is_Dynamically_Tagged (Expression (Alt)) /= Is_Dyn then
Error_Msg_N ("all or none of the dependent expressions "
& "can be dynamically tagged", N);
Error_Msg_N
("all or none of the dependent expressions can be "
& "dynamically tagged", N);
end if;
Next (Alt);