diff options
| author | Arnaud Charlet <charlet@gcc.gnu.org> | 2014-07-18 11:44:45 +0200 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2014-07-18 11:44:45 +0200 |
| commit | 8b034336be00989bcc51e37559da7dae4be43658 (patch) | |
| tree | d355b5a341e9f34ee86e2ce0bd6eba032a30a100 /gcc/ada/lib-writ.adb | |
| parent | 47a98b977df3ea48f658acfcce0f3cfb0d7db6b0 (diff) | |
| download | gcc-8b034336be00989bcc51e37559da7dae4be43658.zip gcc-8b034336be00989bcc51e37559da7dae4be43658.tar.gz gcc-8b034336be00989bcc51e37559da7dae4be43658.tar.bz2 | |
[multiple changes]
2014-07-18 Ed Schonberg <schonberg@adacore.com>
* sem_ch13.adb (Replace_Type_References_Generic): Use type entity
as a parameter, rather than its Chars field, in order to locate
freeze node of type. If the predicate or invariant has references
to types other than the one to which the contract applies, these
types must be frozen, and the corresponding predicate functions
created, before that freeze node.
2014-07-18 Robert Dewar <dewar@adacore.com>
* freeze.adb, einfo.ads, einfo.adb: Minor code reorganization.
* par_sco.adb: Minor reformatting.
2014-07-18 Gary Dismukes <dismukes@adacore.com>
* exp_ch4.adb (Real_Range_Check): Turn off
the Do_Range_Check flag on the conversion's current Expression
argument rather than on the originally captured Operand node,
as Expression may reflect a rewriting (as in conversions to a
fixed-point type).
2014-07-18 Vincent Celier <celier@adacore.com>
* ali.adb (Scan_ALI): Set Sdep_Record.Unit_Name, when the unit
is not a subunit.
* ali.ads (Sdep_Record): New component Unit_Name.
* lib-writ.adb (Write_ALI): Write the unit name in D lines.
* makeutl.adb (Check_Source_Info_In_ALI): Return False if a
dependent unit is in a project and the source file name is not
one of its sources.
From-SVN: r212795
Diffstat (limited to 'gcc/ada/lib-writ.adb')
| -rw-r--r-- | gcc/ada/lib-writ.adb | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/gcc/ada/lib-writ.adb b/gcc/ada/lib-writ.adb index df57c65..1240032 100644 --- a/gcc/ada/lib-writ.adb +++ b/gcc/ada/lib-writ.adb @@ -1429,12 +1429,15 @@ package body Lib.Writ is -- If subunit, add unit name, omitting the %b at the end - if Present (Cunit (Unum)) - and then Nkind (Unit (Cunit (Unum))) = N_Subunit - then + if Present (Cunit (Unum)) then Get_Decoded_Name_String (Unit_Name (Unum)); Write_Info_Char (' '); - Write_Info_Str (Name_Buffer (1 .. Name_Len - 2)); + + if Nkind (Unit (Cunit (Unum))) = N_Subunit then + Write_Info_Str (Name_Buffer (1 .. Name_Len - 2)); + else + Write_Info_Str (Name_Buffer (1 .. Name_Len)); + end if; end if; -- If Source_Reference pragma used, output information |