Commit 30fc80cf by Arnaud Charlet

[multiple changes]

2015-05-22  Ed Schonberg  <schonberg@adacore.com>

	* sem_ch13.adb: Minor reformatting.

2015-05-22  Jose Ruiz  <ruiz@adacore.com>

	* a-reatim.adb: Minor change, fix typo.

From-SVN: r223533
parent 90d6b7bc
2015-05-22 Ed Schonberg <schonberg@adacore.com>
* sem_ch13.adb: Minor reformatting.
2015-05-22 Jose Ruiz <ruiz@adacore.com>
* a-reatim.adb: Minor change, fix typo.
2015-05-22 Robert Dewar <dewar@adacore.com> 2015-05-22 Robert Dewar <dewar@adacore.com>
* sem_util.ads: Minor addition of ??? comment. * sem_util.ads: Minor addition of ??? comment.
......
...@@ -330,7 +330,7 @@ package body Ada.Real_Time is ...@@ -330,7 +330,7 @@ package body Ada.Real_Time is
Out_Of_Range; Out_Of_Range;
end if; end if;
-- Same for negative values of seconds, fundge up and check low bound -- Same for negative values of seconds, fudge up and check low bound
else else
Fudged_Result := Duration (Result_SC + Fudge) + TS_Fraction; Fudged_Result := Duration (Result_SC + Fudge) + TS_Fraction;
......
...@@ -3893,8 +3893,8 @@ package body Sem_Ch13 is ...@@ -3893,8 +3893,8 @@ package body Sem_Ch13 is
("indexing function must have at least two parameters"); ("indexing function must have at least two parameters");
return; return;
-- For a derived type, check that no indexing aspect is -- For a derived type, check that no indexing aspect is specified
-- specified for the type if it is also inherited -- for the type if it is also inherited
elsif Is_Derived_Type (Ent) then elsif Is_Derived_Type (Ent) then
declare declare
...@@ -3904,8 +3904,7 @@ package body Sem_Ch13 is ...@@ -3904,8 +3904,7 @@ package body Sem_Ch13 is
if Attr = Name_Constant_Indexing then if Attr = Name_Constant_Indexing then
Inherited := Inherited :=
Find_Aspect (Etype (Ent), Aspect_Constant_Indexing); Find_Aspect (Etype (Ent), Aspect_Constant_Indexing);
else pragma Assert (Attr = Name_Variable_Indexing);
elsif Attr = Name_Variable_Indexing then
Inherited := Inherited :=
Find_Aspect (Etype (Ent), Aspect_Variable_Indexing); Find_Aspect (Etype (Ent), Aspect_Variable_Indexing);
end if; end if;
...@@ -3914,15 +3913,15 @@ package body Sem_Ch13 is ...@@ -3914,15 +3913,15 @@ package body Sem_Ch13 is
if Debug_Flag_Dot_XX then if Debug_Flag_Dot_XX then
null; null;
-- Indicate the operation that must be overridden, -- Indicate the operation that must be overridden, rather
-- rather than redefining the indexing aspect -- than redefining the indexing aspect
else else
Illegal_Indexing Illegal_Indexing
("indexing function already inherited " ("indexing function already inherited "
& "from parent type"); & "from parent type");
Error_Msg_NE Error_Msg_NE
("!override& instead", ("!override & instead",
N, Entity (Expression (Inherited))); N, Entity (Expression (Inherited)));
return; return;
end if; end if;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment