diff options
| author | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-07-22 10:25:32 +0000 |
|---|---|---|
| committer | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-07-22 10:25:32 +0000 |
| commit | fbc89b916a7a004f25857943a4795a618a460ea4 (patch) | |
| tree | 01d9b239998961b74425ecccd67bdd82369dfd29 /gcc/ada/s-regpat.adb | |
| parent | 660c48c497a8e4e98d0430fbe584092e45350968 (diff) | |
| download | gcc-fbc89b916a7a004f25857943a4795a618a460ea4.tar.gz | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@149921 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada/s-regpat.adb')
| -rwxr-xr-x | gcc/ada/s-regpat.adb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gcc/ada/s-regpat.adb b/gcc/ada/s-regpat.adb index 8d83b93e1a3..dec4c1fcef0 100755 --- a/gcc/ada/s-regpat.adb +++ b/gcc/ada/s-regpat.adb @@ -905,7 +905,7 @@ package body System.Regpat is Flags.Has_Width := False; end if; - Flags.SP_Start := Flags.SP_Start or New_Flags.SP_Start; + Flags.SP_Start := Flags.SP_Start or else New_Flags.SP_Start; while Parse_Pos <= Parse_End and then (E (Parse_Pos) = '|') @@ -924,7 +924,7 @@ package body System.Regpat is Flags.Has_Width := False; end if; - Flags.SP_Start := Flags.SP_Start or New_Flags.SP_Start; + Flags.SP_Start := Flags.SP_Start or else New_Flags.SP_Start; end loop; -- Make a closing node, and hook it on the end @@ -1026,9 +1026,9 @@ package body System.Regpat is end if; Expr_Flags.Has_Width := - Expr_Flags.Has_Width or New_Flags.Has_Width; + Expr_Flags.Has_Width or else New_Flags.Has_Width; Expr_Flags.SP_Start := - Expr_Flags.SP_Start or New_Flags.SP_Start; + Expr_Flags.SP_Start or else New_Flags.SP_Start; end; when '|' | ASCII.LF | ')' => @@ -1155,10 +1155,10 @@ package body System.Regpat is return; end if; - Flags.Has_Width := Flags.Has_Width or New_Flags.Has_Width; + Flags.Has_Width := Flags.Has_Width or else New_Flags.Has_Width; if Chain = 0 then -- First piece - Flags.SP_Start := Flags.SP_Start or New_Flags.SP_Start; + Flags.SP_Start := Flags.SP_Start or else New_Flags.SP_Start; else Link_Tail (Chain, Last); end if; |