From 839de535711edea848b1b0ca8a98f3e59e7af4f0 Mon Sep 17 00:00:00 2001 From: Robert Dewar Date: Thu, 23 Jul 2009 08:49:47 +0000 Subject: get_scos.adb (Skip_EOL): Fix error of mishandling end of line after complex condition. 2009-07-23 Robert Dewar * get_scos.adb (Skip_EOL): Fix error of mishandling end of line after complex condition. From-SVN: r149975 --- gcc/ada/ChangeLog | 5 +++++ gcc/ada/get_scos.adb | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'gcc') 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 + + * get_scos.adb (Skip_EOL): Fix error of mishandling end of line after + complex condition. + 2009-07-23 Gary Dismukes * 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 -- cgit v1.1