diff options
| author | Robert Dewar <dewar@adacore.com> | 2008-04-14 15:01:42 +0000 |
|---|---|---|
| committer | Samuel Tardieu <sam@gcc.gnu.org> | 2008-04-14 15:01:42 +0000 |
| commit | 8f3723e0ae9d77ba02984c0dec5eaf03cd034437 (patch) | |
| tree | a26f7a75cc77544bd925c95757227fa017e98c90 /gcc/ada | |
| parent | 32f7efe1a5140f2b95f62009c2a0315a1ada2c5f (diff) | |
| download | gcc-8f3723e0ae9d77ba02984c0dec5eaf03cd034437.tar.gz | |
sem_util.ads, [...] (In_Subprogram): Remove.
2008-04-14 Robert Dewar <dewar@adacore.com>
gcc/ada/
* sem_util.ads, sem_util.adb (In_Subprogram): Remove.
* sem_attr.adb (Anayze_Attribute): Check for Current_Subprogram
directly.
From-SVN: r134273
Diffstat (limited to 'gcc/ada')
| -rw-r--r-- | gcc/ada/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/ada/sem_attr.adb | 2 | ||||
| -rw-r--r-- | gcc/ada/sem_util.adb | 9 | ||||
| -rw-r--r-- | gcc/ada/sem_util.ads | 6 |
4 files changed, 7 insertions, 16 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 5d37a15830a..199fe294a83 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,9 @@ +2008-04-14 Robert Dewar <dewar@adacore.com> + + * sem_util.ads, sem_util.adb (In_Subprogram): Remove. + * sem_attr.adb (Anayze_Attribute): Check for Current_Subprogram + directly. + 2008-04-14 Samuel Tardieu <sam@rfc1149.net> PR ada/18680 diff --git a/gcc/ada/sem_attr.adb b/gcc/ada/sem_attr.adb index ed52023e716..7550d90655d 100644 --- a/gcc/ada/sem_attr.adb +++ b/gcc/ada/sem_attr.adb @@ -3472,7 +3472,7 @@ package body Sem_Attr is Check_E0; Set_Etype (N, P_Type); - if not In_Subprogram then + if No (Current_Subprogram) then Error_Attr ("attribute % can only appear within subprogram", N); end if; diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb index e7a6658e88d..fd797ca6079 100644 --- a/gcc/ada/sem_util.adb +++ b/gcc/ada/sem_util.adb @@ -5374,15 +5374,6 @@ package body Sem_Util is return False; end In_Package_Body; - ------------------- - -- In_Subprogram -- - ------------------- - - function In_Subprogram return Boolean is - begin - return Current_Subprogram /= Empty; - end In_Subprogram; - -------------------------------------- -- In_Subprogram_Or_Concurrent_Unit -- -------------------------------------- diff --git a/gcc/ada/sem_util.ads b/gcc/ada/sem_util.ads index 291e230f430..a5cb1db6694 100644 --- a/gcc/ada/sem_util.ads +++ b/gcc/ada/sem_util.ads @@ -590,12 +590,6 @@ package Sem_Util is function In_Package_Body return Boolean; -- Returns True if current scope is within a package body - function In_Subprogram return Boolean; - -- Determines if the current scope is within a subprogram compilation - -- unit (inside a subprogram declaration, subprogram body, or generic - -- subprogram declaration). The test is for appearing anywhere within - -- such a construct (that is it does not need to be directly within). - function In_Subprogram_Or_Concurrent_Unit return Boolean; -- Determines if the current scope is within a subprogram compilation -- unit (inside a subprogram declaration, subprogram body, or generic |