diff options
| author | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-07-13 08:39:28 +0000 |
|---|---|---|
| committer | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-07-13 08:39:28 +0000 |
| commit | 7f2cf564eba680b23a70b5a610426d6a993a7f4a (patch) | |
| tree | 164176c7f48023bea63ede90147c01010044b3fa /gcc/ada/s-scaval.adb | |
| parent | 91a6416d693639c33d0b59006a77f8cd81949337 (diff) | |
| download | ppe42-gcc-7f2cf564eba680b23a70b5a610426d6a993a7f4a.tar.gz ppe42-gcc-7f2cf564eba680b23a70b5a610426d6a993a7f4a.zip | |
2009-07-13 Robert Dewar <dewar@adacore.com>
* gnat_ugn.texi: The gnatf switch no longer is needed to get full
details on unsupported constructs.
* rtsfind.adb: Remove references to All_Errors_Mode, give errors
unconditionally.
* s-trafor-default.adb: Correct some warnings
* s-valwch.adb, a-calend.adb, freeze.adb, prj.ads, s-vmexta.adb,
sem.adb, sem_ch10.adb, sem_ch6.adb, sem_disp.adb, vxaddr2line.adb:
Minor reformatting.
* par-ch4.adb (Conditional_Expression): Capture proper location for
conditional expression, should point to IF.
* s-tassta.adb, a-wtdeau.adb, s-tasren.adb, s-arit64.adb, s-imgdec.adb,
s-direio.adb, s-tpobop.adb, g-socket.adb, s-tposen.adb, s-taskin.adb,
g-calend.adb, s-regpat.adb, s-scaval.adb, g-catiio.adb: Minor code
reorganization (use conditional expressions).
2009-07-13 Ed Schonberg <schonberg@adacore.com>
* exp_util.adb (Remove_Side_Effects): If the expression is a call to a
build-in-place function that returns an inherently limited type (not
just a task type) create proper object declaration so that extra
build-in-place actuals are properly added to the call.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@149551 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada/s-scaval.adb')
| -rw-r--r-- | gcc/ada/s-scaval.adb | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/gcc/ada/s-scaval.adb b/gcc/ada/s-scaval.adb index 415763c3e6b..f1742a72a38 100644 --- a/gcc/ada/s-scaval.adb +++ b/gcc/ada/s-scaval.adb @@ -270,17 +270,14 @@ package body System.Scalar_Values is else -- Convert the two hex digits (we know they are valid here) - if C1 in '0' .. '9' then - B := Character'Pos (C1) - Character'Pos ('0'); - else - B := Character'Pos (C1) - (Character'Pos ('A') - 10); - end if; - - if C2 in '0' .. '9' then - B := B * 16 + Character'Pos (C2) - Character'Pos ('0'); - else - B := B * 16 + Character'Pos (C2) - (Character'Pos ('A') - 10); - end if; + B := 16 * (Character'Pos (C1) + - (if C1 in '0' .. '9' + then Character'Pos ('0') + else Character'Pos ('A') - 10)) + + (Character'Pos (C2) + - (if C2 in '0' .. '9' + then Character'Pos ('0') + else Character'Pos ('A') - 10)); -- Initialize data values from the hex value |
