diff options
| author | Robert Dewar <dewar@adacore.com> | 2009-07-23 08:49:47 +0000 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2009-07-23 10:49:47 +0200 |
| commit | 839de535711edea848b1b0ca8a98f3e59e7af4f0 (patch) | |
| tree | 65912726df43d818fa552dc808db711ee5f6ec1f /gcc/ada | |
| parent | 81d93365629ad47565d86a5b09835c33bd8274e1 (diff) | |
| download | gcc-839de535711edea848b1b0ca8a98f3e59e7af4f0.zip gcc-839de535711edea848b1b0ca8a98f3e59e7af4f0.tar.gz gcc-839de535711edea848b1b0ca8a98f3e59e7af4f0.tar.bz2 | |
get_scos.adb (Skip_EOL): Fix error of mishandling end of line after complex condition.
2009-07-23 Robert Dewar <dewar@adacore.com>
* get_scos.adb (Skip_EOL): Fix error of mishandling end of line after
complex condition.
From-SVN: r149975
Diffstat (limited to 'gcc/ada')
| -rw-r--r-- | gcc/ada/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/ada/get_scos.adb | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index a681c65..bbd2fa4 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,8 @@ +2009-07-23 Robert Dewar <dewar@adacore.com> + + * get_scos.adb (Skip_EOL): Fix error of mishandling end of line after + complex condition. + 2009-07-23 Gary Dismukes <dismukes@adacore.com> * sem_ch6.adb (Check_Return_Subtype_Indication): Replace type equality diff --git a/gcc/ada/get_scos.adb b/gcc/ada/get_scos.adb index 14d4256..733263a 100644 --- a/gcc/ada/get_scos.adb +++ b/gcc/ada/get_scos.adb @@ -56,7 +56,7 @@ procedure Get_SCOs is procedure Skip_EOL; -- Called with the current character about to be read being LF or CR. Skips - -- past LR/CR characters until either a non-CR/LF character is found, or + -- past CR/LF characters until either a non-CR/LF character is found, or -- the end of file is encountered. procedure Skip_Spaces; @@ -274,6 +274,7 @@ begin while C /= CR and then C /= LF loop if C = 'c' or else C = 't' or else C = 'f' then Cond := C; + Skipc; Get_Sloc_Range (Loc1, Loc2); Add_SCO (C2 => Cond, @@ -286,6 +287,7 @@ begin C = '&' or else C = '|' then + Skipc; Add_SCO (C1 => C, Last => False); elsif C = ' ' then @@ -295,7 +297,7 @@ begin raise Data_Error; end if; - C := Getc; + C := Nextc; end loop; -- Reset Last indication to True for last entry |