diff options
| author | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-04-11 10:52:33 +0000 |
|---|---|---|
| committer | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-04-11 10:52:33 +0000 |
| commit | f95eae4796421a7fa0f2a96a718bdd5edac3b9c1 (patch) | |
| tree | 0cd18bc76b9356903ed69ddcf5c366358e91c993 /gcc/ada/sem_res.adb | |
| parent | bb7e7eb9f61aba25138147aa30d2f9e9f5d04566 (diff) | |
| download | gcc-f95eae4796421a7fa0f2a96a718bdd5edac3b9c1.tar.gz | |
2013-04-11 Robert Dewar <dewar@adacore.com>
* sem_res.adb: Minor code reorganization and comment fixes.
* sem_type.adb: Minor reformatting.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@197768 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada/sem_res.adb')
| -rw-r--r-- | gcc/ada/sem_res.adb | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/gcc/ada/sem_res.adb b/gcc/ada/sem_res.adb index 338ff78185d..e60f91161dd 100644 --- a/gcc/ada/sem_res.adb +++ b/gcc/ada/sem_res.adb @@ -2060,16 +2060,17 @@ package body Sem_Res is Analyze_Dimension (N); return; - -- A Raise_Expression takes its type from context. The expression - -- itself does not specify any possible interpretation. - - -- Seems confusing to set the Etype to Typ here, only to be overwritten - -- and set to Ctx_Type in the big case statement??? + -- A Raise_Expression takes its type from context. The Etype was set + -- to Any_Type, reflecting the fact that the expression itself does + -- not specify any possible interpretation. So we set the type to the + -- resolution type here and now. We need to do this before Resolve sees + -- the Any_Type value. elsif Nkind (N) = N_Raise_Expression then Set_Etype (N, Typ); - -- Return if type = Any_Type (previous error encountered). + -- Any other case of Any_Type as the Etype value means that we had + -- a previous error. elsif Etype (N) = Any_Type then Debug_A_Exit ("resolving ", N, " (done, Etype = Any_Type)"); @@ -2815,10 +2816,14 @@ package body Sem_Res is -- Why is the following null, needs a comment ??? - when N_Quantified_Expression => null; + when N_Quantified_Expression + => null; + + -- Nothing to do for Raise_Expression, since we took care of + -- setting the Etype earlier, and no other processing is needed. when N_Raise_Expression - => Set_Etype (N, Ctx_Type); + => null; when N_Raise_xxx_Error => Set_Etype (N, Ctx_Type); @@ -4480,7 +4485,7 @@ package body Sem_Res is if In_Instance_Body then Error_Msg_N ("??type in allocator has deeper level than " - & " designated class-wide type", E); + & "designated class-wide type", E); Error_Msg_N ("\??Program_Error will be raised at run time", E); Rewrite (N, @@ -10662,7 +10667,7 @@ package body Sem_Res is then if In_Instance_Body then Conversion_Error_N - ("??source array type has deeper accesibility " + ("??source array type has deeper accessibility " & "level than target", Operand); Conversion_Error_N ("\??Program_Error will be raised at run time", |