diff options
| author | Robert Dewar <dewar@adacore.com> | 2009-07-22 10:25:32 +0000 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2009-07-22 12:25:32 +0200 |
| commit | d1ced162c2d0525032df4c98d4d14dbcc7980de7 (patch) | |
| tree | 01d9b239998961b74425ecccd67bdd82369dfd29 /gcc/ada/s-regexp.adb | |
| parent | ac3cbee587c9d65ba8d5be751c8c74ad9ba4c930 (diff) | |
| download | gcc-d1ced162c2d0525032df4c98d4d14dbcc7980de7.zip gcc-d1ced162c2d0525032df4c98d4d14dbcc7980de7.tar.gz gcc-d1ced162c2d0525032df4c98d4d14dbcc7980de7.tar.bz2 | |
s-stchop.adb, [...]: Make sure sources obey short-circuit style rule.
2009-07-22 Robert Dewar <dewar@adacore.com>
* s-stchop.adb, a-direct.adb, a-ztexio.adb, gnatchop.adb, prj-proc.adb,
make.adb, s-regpat.adb, ali-util.adb, a-ngcefu.adb, prep.adb,
s-tassta.adb, a-tifiio.adb, a-textio.adb, prj.adb, uintp.adb,
s-valrea.adb, a-ngelfu.adb, prepcomp.adb, sinput-l.adb, vms_conv.adb,
errout.adb, g-alleve.adb, repinfo.adb, a-wtedit.adb, ali.adb,
a-witeio.adb, prj-dect.adb, prj-nmsc.adb, sinput-c.adb, binde.adb,
s-regexp.adb, s-imgrea.adb, a-teioed.adb, errutil.adb, prj-util.adb,
a-ztedit.adb, gnatls.adb, prj-conf.adb, bcheck.adb, s-scaval.adb,
erroutc.adb, osint.adb, a-strfix.adb, s-fileio.adb: Make sure sources
obey short-circuit style rule.
From-SVN: r149921
Diffstat (limited to 'gcc/ada/s-regexp.adb')
| -rwxr-xr-x | gcc/ada/s-regexp.adb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gcc/ada/s-regexp.adb b/gcc/ada/s-regexp.adb index 37c189a..48ebd44 100755 --- a/gcc/ada/s-regexp.adb +++ b/gcc/ada/s-regexp.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 1999-2008, AdaCore -- +-- Copyright (C) 1999-2009, AdaCore -- -- -- -- 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- -- @@ -218,7 +218,7 @@ package body System.Regexp is J := J + 1; end if; - if S (J) = ']' or S (J) = '-' then + if S (J) = ']' or else S (J) = '-' then J := J + 1; end if; @@ -619,7 +619,7 @@ package body System.Regexp is -- Automatically add the first character - if S (J) = '-' or S (J) = ']' then + if S (J) = '-' or else S (J) = ']' then Set (Table, Current_State, Map (S (J)), Value => Next_State); J := J + 1; @@ -899,7 +899,7 @@ package body System.Regexp is -- Automatically add the first character - if S (J) = '-' or S (J) = ']' then + if S (J) = '-' or else S (J) = ']' then Set (Table, Current_State, Map (S (J)), Value => Current_State); J := J + 1; |