diff options
| author | Eric Botcazou <ebotcazou@adacore.com> | 2009-04-29 23:10:21 +0000 |
|---|---|---|
| committer | Eric Botcazou <ebotcazou@gcc.gnu.org> | 2009-04-29 23:10:21 +0000 |
| commit | 3cebfcc5c66e5337e8551a30cd6d29edc9aae9c8 (patch) | |
| tree | 1eb925fe9ac0daa64343cebeedf8d15f314f4a29 /gcc/ada/scans.ads | |
| parent | 9933b56afffcf56331c8818f729e97c1acf1ab59 (diff) | |
| download | gcc-3cebfcc5c66e5337e8551a30cd6d29edc9aae9c8.zip gcc-3cebfcc5c66e5337e8551a30cd6d29edc9aae9c8.tar.gz gcc-3cebfcc5c66e5337e8551a30cd6d29edc9aae9c8.tar.bz2 | |
Revert
2009-04-29 Vincent Celier <celier@adacore.com>
* sinput-l.adb (Load_File): When preprocessing, set temporarily the
Source_File_Index_Table entries for the source, to avoid crash when
reporting an error.
* gnatcmd.adb (Test_If_Relative_Path): Use
Makeutl.Test_If_Relative_Path.
* makeutl.adb:(Test_If_Relative_Path): Process switches --RTS= only if
Including_RTS is True.
* makeutl.ads (Test_If_Relative_Path): New Boolean parameter
Including_RTS defaulted to False.
* sinput.ads, scans.ads, err_vars.ads: Initialize some variables with
a default value.
From-SVN: r146991
Diffstat (limited to 'gcc/ada/scans.ads')
| -rw-r--r-- | gcc/ada/scans.ads | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/gcc/ada/scans.ads b/gcc/ada/scans.ads index 6f9bcb8..1120f06 100644 --- a/gcc/ada/scans.ads +++ b/gcc/ada/scans.ads @@ -345,43 +345,36 @@ package Scans is -- Note: these variables can only be referenced during the parsing of a -- file. Reference to any of them from Sem or the expander is wrong. - -- These variables are initialized as required by Scn.Initialize_Scanner, - -- and should not be referenced before such a call. However, there are - -- situations in which these variables are saved and restored, and this - -- may happen before the first Initialize_Scanner call, resulting in the - -- assignment of invalid values. To avoid this, and allow building with - -- the -gnatVa switch, we initialize some variables to known valid values. - - Scan_Ptr : Source_Ptr := No_Location; -- init for -gnatVa + Scan_Ptr : Source_Ptr; -- Current scan pointer location. After a call to Scan, this points -- just past the end of the token just scanned. - Token : Token_Type := No_Token; -- init for -gnatVa + Token : Token_Type; -- Type of current token - Token_Ptr : Source_Ptr := No_Location; -- init for -gnatVa + Token_Ptr : Source_Ptr; -- Pointer to first character of current token - Current_Line_Start : Source_Ptr := No_Location; -- init for -gnatVa - -- Pointer to first character of line containing current token. + Current_Line_Start : Source_Ptr; + -- Pointer to first character of line containing current token - Start_Column : Column_Number := No_Column_Number; -- init for -gnatVa + Start_Column : Column_Number; -- Starting column number (zero origin) of the first non-blank character -- on the line containing the current token. This is used for error -- recovery circuits which depend on looking at the column line up. - Type_Token_Location : Source_Ptr := No_Location; -- init for -gnatVa + Type_Token_Location : Source_Ptr; -- Within a type declaration, gives the location of the TYPE keyword that -- opened the type declaration. Used in checking the end column of a record -- declaration, which can line up either with the TYPE keyword, or with the -- start of the line containing the RECORD keyword. - Checksum : Word := 0; -- init for -gnatVa + Checksum : Word; -- Used to accumulate a CRC representing the tokens in the source -- file being compiled. This CRC includes only program tokens, and -- excludes comments. - First_Non_Blank_Location : Source_Ptr := No_Location; -- init for -gnatVa + First_Non_Blank_Location : Source_Ptr; -- Location of first non-blank character on the line containing the -- current token (i.e. the location of the character whose column number -- is stored in Start_Column). |