diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-08-25 19:29:43 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-08-25 19:29:43 +0000 |
| commit | 46dfcc3ee85a4a02abce4d45ee619f240c116af6 (patch) | |
| tree | 6c3dc3d53cd17d62447673b81abbcfc69bacd2f3 /gcc/ada/get_scos.adb | |
| parent | 2a8624373adc103f943e22e781c2d6fadb828eae (diff) | |
| download | gcc-46dfcc3ee85a4a02abce4d45ee619f240c116af6.tar.gz | |
2011-08-25 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk rev 178073 using svnmerge.
2011-08-25 Basile Starynkevitch <basile@starynkevitch.net>
* gcc/melt-runtime.c (melt_linemap_compute_current_location): Use the
linemap_position_for_column function for GCC 4.7 when merging with
GCC trunk rev 178073.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@178087 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada/get_scos.adb')
| -rw-r--r-- | gcc/ada/get_scos.adb | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/gcc/ada/get_scos.adb b/gcc/ada/get_scos.adb index 70d77c80b6a..e9c17bd07aa 100644 --- a/gcc/ada/get_scos.adb +++ b/gcc/ada/get_scos.adb @@ -2,11 +2,11 @@ -- -- -- GNAT COMPILER COMPONENTS -- -- -- --- G E T _ S C O S -- +-- G E T _ S C O S -- -- -- -- B o d y -- -- -- --- Copyright (C) 2009, Free Software Foundation, Inc. -- +-- Copyright (C) 2009-2011, Free Software Foundation, Inc. -- -- -- -- GNAT is free software; you can redistribute it and/or modify it under -- -- terms of the GNU General Public License as published by the Free Soft- -- @@ -307,7 +307,7 @@ begin -- Decision entry - when 'I' | 'E' | 'P' | 'W' | 'X' => + when 'I' | 'E' | 'G' | 'P' | 'W' | 'X' => Dtyp := C; Skip_Spaces; @@ -315,7 +315,6 @@ begin declare Loc : Source_Location; - C2v : Character; begin -- Acquire location information @@ -326,18 +325,9 @@ begin Get_Source_Location (Loc); end if; - -- C2 is a space except for pragmas where it is 'e' since - -- clearly the pragma is enabled if it was written out. - - if C = 'P' then - C2v := 'e'; - else - C2v := ' '; - end if; - Add_SCO (C1 => Dtyp, - C2 => C2v, + C2 => ' ', From => Loc, To => No_Source_Location, Last => False); |