Merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba

[Paul J. Lucas]

Better float-to-int-overflow checking -- fixes two FOTS tests.
Better string-to-integer conversion exception catching -- fixes 3 FOTS tests.

Better float-to-int-overflow checking -- fixes two FOTS tests.
Better string-to-integer conversion exception catching -- fixes 3 FOTS tests.

[Paul J. Lucas (paul-lucas)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/pjl-misc-2013-05-16T00-26-40.553Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job pjl-misc-2013-05-16T00-26-40.553Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1, Needs Information < 1, Resubmit < 1. Got: 1 Approve.

[Matthias Brantner (matthias-brantner)]

If it fixes 5 FOTS tests, why don't they have to be removed from the expected failures?

review: Needs Information

[Paul J. Lucas (paul-lucas)]

3 are wrong errors; the other two -- good question.

[Paul J. Lucas (paul-lucas)]

Oh I think it's because the other two fail only with BIG_INTEGER=OFF whereas the RQ runs with it ON.

[Matthias Brantner (matthias-brantner)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/pjl-misc-2013-05-16T01-08-38.308Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job pjl-misc-2013-05-16T01-08-38.308Z is finished. The final status was:

All tests succeeded!

=== modified file 'src/zorbatypes/integer.cpp'
--- src/zorbatypes/integer.cpp	2013-05-15 23:22:01 +0000
+++ src/zorbatypes/integer.cpp	2013-05-16 00:22:26 +0000
@@ -56,12 +56,13 @@
 #ifndef ZORBA_WITH_BIG_INTEGER
 template<class T>
 typename IntegerImpl<T>::value_type IntegerImpl<T>::ftoi( double d ) {
-  value_type const v( d >= 0 ? floor( d ) : ceil( d ) );
-  if ( v < 0 && d > 0 )
+  d = d >= 0 ? floor( d ) : ceil( d );
+  value_type const i = d;
+  if ( i != d )
     throw range_error(
       BUILD_STRING( '"', d, "\": value too large for integer" )
     );
-  return v;
+  return i;
 }
 #endif /* ZORBA_WITH_BIG_INTEGER */