Merge lp:~paul-lucas/zorba/bug-1075106 into lp:zorba

[Paul J. Lucas]

Fixed sign extension.

Fixed sign extension.

[Paul J. Lucas (paul-lucas)]

review: Approve

[David Graf (davidagraf)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1075106-2012-11-09T14-28-50.881Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug-1075106-2012-11-09T14-28-50.881Z is finished. The final status was:

All tests succeeded!

[Matthias Brantner (matthias-brantner)]

ChangeLog entry is missing.

review: Needs Fixing

=== modified file 'src/zorbatypes/integer.cpp'
--- src/zorbatypes/integer.cpp	2012-09-19 21:16:15 +0000
+++ src/zorbatypes/integer.cpp	2012-11-09 03:22:22 +0000
@@ -77,6 +77,14 @@
   value_ = ztd::itoa( n, buf );
 }
 
+#if ZORBA_SIZEOF_INT == ZORBA_SIZEOF_LONG
+TEMPLATE_DECL(T)
+INTEGER_IMPL(T)::IntegerImpl( unsigned int n ) {
+  ztd::itoa_buf_type buf;
+  value_ = ztd::itoa( n, buf );
+}
+#endif /* ZORBA_SIZEOF_INT == ZORBA_SIZEOF_LONG */
+
 IntegerImpl::IntegerImpl( unsigned long n ) {
   ztd::itoa_buf_type buf;
   value_ = ztd::itoa( n, buf );

=== modified file 'src/zorbatypes/integer.h'
--- src/zorbatypes/integer.h	2012-10-30 21:26:12 +0000
+++ src/zorbatypes/integer.h	2012-11-09 03:22:22 +0000
@@ -578,23 +578,31 @@
 
 TEMPLATE_DECL(I)
 inline INTEGER_IMPL(I)::IntegerImpl( unsigned char c ) :
-  value_( static_cast<long>( c ) )
+  value_( static_cast<long>( (unsigned long)c ) )
 {
 }
 
 TEMPLATE_DECL(I)
 inline INTEGER_IMPL(I)::IntegerImpl( unsigned short n ) :
-  value_( static_cast<long>( n ) )
+  value_( static_cast<long>( (unsigned long)n ) )
 {
 }
 
+#ifdef ZORBA_WITH_BIG_INTEGER
+#if ZORBA_SIZEOF_INT != ZORBA_SIZEOF_LONG
+TEMPLATE_DECL(T)
+inline INTEGER_IMPL(T)::IntegerImpl( unsigned int n ) :
+  value_( static_cast<long>( (unsigned long)n ) )
+{
+}
+#endif /* ZORBA_SIZEOF_INT == ZORBA_SIZEOF_LONG */
+#else /* ZORBA_WITH_BIG_INTEGER */
 TEMPLATE_DECL(I)
 inline INTEGER_IMPL(I)::IntegerImpl( unsigned int n ) :
-  value_( static_cast<long>( n ) )
+  value_( static_cast<value_type>( n ) )
 {
 }
 
-#ifndef ZORBA_WITH_BIG_INTEGER
 TEMPLATE_DECL(I)
 inline INTEGER_IMPL(I)::IntegerImpl( unsigned long n ) :
   value_( static_cast<value_type>( n ) )