zorba-coders team mailing list archive

Thread
Date

[Merge] lp:~paul-lucas/zorba/bug-966355 into lp:zorba

To: mp+99608@xxxxxxxxxxxxxxxxxx
From: "Paul J. Lucas" <paul@xxxxxxxxxxxxx>
Date: Tue, 27 Mar 2012 20:22:17 -0000
Reply-to: mp+99608@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

Paul J. Lucas has proposed merging lp:~paul-lucas/zorba/bug-966355 into lp:zorba.

Requested reviews:
  Paul J. Lucas (paul-lucas)
Related bugs:
  Bug #966355 in Zorba: "Compiler chooses wrong overload for some Integer operators"
  https://bugs.launchpad.net/zorba/+bug/966355

For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/bug-966355/+merge/99608

Added operators for built-in types (when ZORBA_WITH_BIG_INTEGER=OFF).
-- 
https://code.launchpad.net/~paul-lucas/zorba/bug-966355/+merge/99608
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'src/zorbatypes/integer.h'
--- src/zorbatypes/integer.h	2012-03-27 00:56:11 +0000
+++ src/zorbatypes/integer.h	2012-03-27 20:21:19 +0000
@@ -147,11 +147,166 @@
   ZORBA_INTEGER_OP(%);
 #undef ZORBA_INTEGER_OP
 
-  IntegerImpl& operator+=( IntegerImpl const& );
-  IntegerImpl& operator-=( IntegerImpl const& );
-  IntegerImpl& operator*=( IntegerImpl const& );
-  IntegerImpl& operator/=( IntegerImpl const& );
-  IntegerImpl& operator%=( IntegerImpl const& );
+#ifndef ZORBA_WITH_BIG_INTEGER
+#define ZORBA_INTEGER_OP(OP,TYPE)                               \
+  TEMPLATE_DECL(T) friend                                       \
+  INTEGER_IMPL(T) operator OP( INTEGER_IMPL(T) const&, TYPE );  \
+  TEMPLATE_DECL(T) friend                                       \
+  INTEGER_IMPL(T) operator OP( TYPE, INTEGER_IMPL(T) const& )
+
+  ZORBA_INTEGER_OP(+,char);
+  ZORBA_INTEGER_OP(+,signed char);
+  ZORBA_INTEGER_OP(+,short);
+  ZORBA_INTEGER_OP(+,int);
+  ZORBA_INTEGER_OP(+,long);
+  ZORBA_INTEGER_OP(+,long long);
+  ZORBA_INTEGER_OP(+,unsigned char);
+  ZORBA_INTEGER_OP(+,unsigned short);
+  ZORBA_INTEGER_OP(+,unsigned int);
+  ZORBA_INTEGER_OP(+,unsigned long);
+  ZORBA_INTEGER_OP(+,unsigned long long);
+  ZORBA_INTEGER_OP(+,float);
+  ZORBA_INTEGER_OP(+,double);
+
+  ZORBA_INTEGER_OP(-,char);
+  ZORBA_INTEGER_OP(-,signed char);
+  ZORBA_INTEGER_OP(-,short);
+  ZORBA_INTEGER_OP(-,int);
+  ZORBA_INTEGER_OP(-,long);
+  ZORBA_INTEGER_OP(-,long long);
+  ZORBA_INTEGER_OP(-,unsigned char);
+  ZORBA_INTEGER_OP(-,unsigned short);
+  ZORBA_INTEGER_OP(-,unsigned int);
+  ZORBA_INTEGER_OP(-,unsigned long);
+  ZORBA_INTEGER_OP(-,unsigned long long);
+  ZORBA_INTEGER_OP(-,float);
+  ZORBA_INTEGER_OP(-,double);
+
+  ZORBA_INTEGER_OP(*,char);
+  ZORBA_INTEGER_OP(*,signed char);
+  ZORBA_INTEGER_OP(*,short);
+  ZORBA_INTEGER_OP(*,int);
+  ZORBA_INTEGER_OP(*,long);
+  ZORBA_INTEGER_OP(*,long long);
+  ZORBA_INTEGER_OP(*,unsigned char);
+  ZORBA_INTEGER_OP(*,unsigned short);
+  ZORBA_INTEGER_OP(*,unsigned int);
+  ZORBA_INTEGER_OP(*,unsigned long);
+  ZORBA_INTEGER_OP(*,unsigned long long);
+  ZORBA_INTEGER_OP(*,float);
+  ZORBA_INTEGER_OP(*,double);
+
+  ZORBA_INTEGER_OP(/,char);
+  ZORBA_INTEGER_OP(/,signed char);
+  ZORBA_INTEGER_OP(/,short);
+  ZORBA_INTEGER_OP(/,int);
+  ZORBA_INTEGER_OP(/,long);
+  ZORBA_INTEGER_OP(/,long long);
+  ZORBA_INTEGER_OP(/,unsigned char);
+  ZORBA_INTEGER_OP(/,unsigned short);
+  ZORBA_INTEGER_OP(/,unsigned int);
+  ZORBA_INTEGER_OP(/,unsigned long);
+  ZORBA_INTEGER_OP(/,unsigned long long);
+  ZORBA_INTEGER_OP(/,float);
+  ZORBA_INTEGER_OP(/,double);
+
+  ZORBA_INTEGER_OP(%,char);
+  ZORBA_INTEGER_OP(%,signed char);
+  ZORBA_INTEGER_OP(%,short);
+  ZORBA_INTEGER_OP(%,int);
+  ZORBA_INTEGER_OP(%,long);
+  ZORBA_INTEGER_OP(%,long long);
+  ZORBA_INTEGER_OP(%,unsigned char);
+  ZORBA_INTEGER_OP(%,unsigned short);
+  ZORBA_INTEGER_OP(%,unsigned int);
+  ZORBA_INTEGER_OP(%,unsigned long);
+  ZORBA_INTEGER_OP(%,unsigned long long);
+  ZORBA_INTEGER_OP(%,float);
+  ZORBA_INTEGER_OP(%,double);
+#undef ZORBA_INTEGER_OP
+#endif /* ZORBA_WITH_BIG_INTEGER */
+
+#define ZORBA_INTEGER_OP(OP,TYPE) \
+  IntegerImpl& operator OP( TYPE )
+
+  ZORBA_INTEGER_OP(+=,IntegerImpl const&);
+  ZORBA_INTEGER_OP(-=,IntegerImpl const&);
+  ZORBA_INTEGER_OP(*=,IntegerImpl const&);
+  ZORBA_INTEGER_OP(/=,IntegerImpl const&);
+  ZORBA_INTEGER_OP(%=,IntegerImpl const&);
+#ifndef ZORBA_WITH_BIG_INTEGER
+  ZORBA_INTEGER_OP(+=,char);
+  ZORBA_INTEGER_OP(+=,signed char);
+  ZORBA_INTEGER_OP(+=,short);
+  ZORBA_INTEGER_OP(+=,int);
+  ZORBA_INTEGER_OP(+=,long);
+  ZORBA_INTEGER_OP(+=,long long);
+  ZORBA_INTEGER_OP(+=,unsigned char);
+  ZORBA_INTEGER_OP(+=,unsigned short);
+  ZORBA_INTEGER_OP(+=,unsigned int);
+  ZORBA_INTEGER_OP(+=,unsigned long);
+  ZORBA_INTEGER_OP(+=,unsigned long long);
+  ZORBA_INTEGER_OP(+=,float);
+  ZORBA_INTEGER_OP(+=,double);
+
+  ZORBA_INTEGER_OP(-=,char);
+  ZORBA_INTEGER_OP(-=,signed char);
+  ZORBA_INTEGER_OP(-=,short);
+  ZORBA_INTEGER_OP(-=,int);
+  ZORBA_INTEGER_OP(-=,long);
+  ZORBA_INTEGER_OP(-=,long long);
+  ZORBA_INTEGER_OP(-=,unsigned char);
+  ZORBA_INTEGER_OP(-=,unsigned short);
+  ZORBA_INTEGER_OP(-=,unsigned int);
+  ZORBA_INTEGER_OP(-=,unsigned long);
+  ZORBA_INTEGER_OP(-=,unsigned long long);
+  ZORBA_INTEGER_OP(-=,float);
+  ZORBA_INTEGER_OP(-=,double);
+
+  ZORBA_INTEGER_OP(*=,char);
+  ZORBA_INTEGER_OP(*=,signed char);
+  ZORBA_INTEGER_OP(*=,short);
+  ZORBA_INTEGER_OP(*=,int);
+  ZORBA_INTEGER_OP(*=,long);
+  ZORBA_INTEGER_OP(*=,long long);
+  ZORBA_INTEGER_OP(*=,unsigned char);
+  ZORBA_INTEGER_OP(*=,unsigned short);
+  ZORBA_INTEGER_OP(*=,unsigned int);
+  ZORBA_INTEGER_OP(*=,unsigned long);
+  ZORBA_INTEGER_OP(*=,unsigned long long);
+  ZORBA_INTEGER_OP(*=,float);
+  ZORBA_INTEGER_OP(*=,double);
+
+  ZORBA_INTEGER_OP(/=,char);
+  ZORBA_INTEGER_OP(/=,signed char);
+  ZORBA_INTEGER_OP(/=,short);
+  ZORBA_INTEGER_OP(/=,int);
+  ZORBA_INTEGER_OP(/=,long);
+  ZORBA_INTEGER_OP(/=,long long);
+  ZORBA_INTEGER_OP(/=,unsigned char);
+  ZORBA_INTEGER_OP(/=,unsigned short);
+  ZORBA_INTEGER_OP(/=,unsigned int);
+  ZORBA_INTEGER_OP(/=,unsigned long);
+  ZORBA_INTEGER_OP(/=,unsigned long long);
+  ZORBA_INTEGER_OP(/=,float);
+  ZORBA_INTEGER_OP(/=,double);
+
+  ZORBA_INTEGER_OP(%=,char);
+  ZORBA_INTEGER_OP(%=,signed char);
+  ZORBA_INTEGER_OP(%=,short);
+  ZORBA_INTEGER_OP(%=,int);
+  ZORBA_INTEGER_OP(%=,long);
+  ZORBA_INTEGER_OP(%=,long long);
+  ZORBA_INTEGER_OP(%=,unsigned char);
+  ZORBA_INTEGER_OP(%=,unsigned short);
+  ZORBA_INTEGER_OP(%=,unsigned int);
+  ZORBA_INTEGER_OP(%=,unsigned long);
+  ZORBA_INTEGER_OP(%=,unsigned long long);
+  ZORBA_INTEGER_OP(%=,float);
+  ZORBA_INTEGER_OP(%=,double);
+#endif /* ZORBA_WITH_BIG_INTEGER */
+
+#undef ZORBA_INTEGER_OP
 
   IntegerImpl operator-() const;
 
@@ -178,6 +333,99 @@
   ZORBA_INTEGER_OP(>=);
 #undef ZORBA_INTEGER_OP
 
+#ifndef ZORBA_WITH_BIG_INTEGER
+#define ZORBA_INTEGER_OP(OP,TYPE)                   \
+  TEMPLATE_DECL(T) friend                           \
+  bool operator OP( INTEGER_IMPL(T) const&, TYPE ); \
+  TEMPLATE_DECL(T) friend                           \
+  bool operator OP( TYPE, INTEGER_IMPL(T) const& )
+
+  ZORBA_INTEGER_OP(==,char);
+  ZORBA_INTEGER_OP(==,signed char);
+  ZORBA_INTEGER_OP(==,short);
+  ZORBA_INTEGER_OP(==,int);
+  ZORBA_INTEGER_OP(==,long);
+  ZORBA_INTEGER_OP(==,long long);
+  ZORBA_INTEGER_OP(==,unsigned char);
+  ZORBA_INTEGER_OP(==,unsigned short);
+  ZORBA_INTEGER_OP(==,unsigned int);
+  ZORBA_INTEGER_OP(==,unsigned long);
+  ZORBA_INTEGER_OP(==,unsigned long long);
+  ZORBA_INTEGER_OP(==,float);
+  ZORBA_INTEGER_OP(==,double);
+
+  ZORBA_INTEGER_OP(!=,char);
+  ZORBA_INTEGER_OP(!=,signed char);
+  ZORBA_INTEGER_OP(!=,short);
+  ZORBA_INTEGER_OP(!=,int);
+  ZORBA_INTEGER_OP(!=,long);
+  ZORBA_INTEGER_OP(!=,long long);
+  ZORBA_INTEGER_OP(!=,unsigned char);
+  ZORBA_INTEGER_OP(!=,unsigned short);
+  ZORBA_INTEGER_OP(!=,unsigned int);
+  ZORBA_INTEGER_OP(!=,unsigned long);
+  ZORBA_INTEGER_OP(!=,unsigned long long);
+  ZORBA_INTEGER_OP(!=,float);
+  ZORBA_INTEGER_OP(!=,double);
+
+  ZORBA_INTEGER_OP(< ,char);
+  ZORBA_INTEGER_OP(< ,signed char);
+  ZORBA_INTEGER_OP(< ,short);
+  ZORBA_INTEGER_OP(< ,int);
+  ZORBA_INTEGER_OP(< ,long);
+  ZORBA_INTEGER_OP(< ,long long);
+  ZORBA_INTEGER_OP(< ,unsigned char);
+  ZORBA_INTEGER_OP(< ,unsigned short);
+  ZORBA_INTEGER_OP(< ,unsigned int);
+  ZORBA_INTEGER_OP(< ,unsigned long);
+  ZORBA_INTEGER_OP(< ,unsigned long long);
+  ZORBA_INTEGER_OP(< ,float);
+  ZORBA_INTEGER_OP(< ,double);
+
+  ZORBA_INTEGER_OP(<=,char);
+  ZORBA_INTEGER_OP(<=,signed char);
+  ZORBA_INTEGER_OP(<=,short);
+  ZORBA_INTEGER_OP(<=,int);
+  ZORBA_INTEGER_OP(<=,long);
+  ZORBA_INTEGER_OP(<=,long long);
+  ZORBA_INTEGER_OP(<=,unsigned char);
+  ZORBA_INTEGER_OP(<=,unsigned short);
+  ZORBA_INTEGER_OP(<=,unsigned int);
+  ZORBA_INTEGER_OP(<=,unsigned long);
+  ZORBA_INTEGER_OP(<=,unsigned long long);
+  ZORBA_INTEGER_OP(<=,float);
+  ZORBA_INTEGER_OP(<=,double);
+
+  ZORBA_INTEGER_OP(> ,char);
+  ZORBA_INTEGER_OP(> ,signed char);
+  ZORBA_INTEGER_OP(> ,short);
+  ZORBA_INTEGER_OP(> ,int);
+  ZORBA_INTEGER_OP(> ,long);
+  ZORBA_INTEGER_OP(> ,long long);
+  ZORBA_INTEGER_OP(> ,unsigned char);
+  ZORBA_INTEGER_OP(> ,unsigned short);
+  ZORBA_INTEGER_OP(> ,unsigned int);
+  ZORBA_INTEGER_OP(> ,unsigned long);
+  ZORBA_INTEGER_OP(> ,unsigned long long);
+  ZORBA_INTEGER_OP(> ,float);
+  ZORBA_INTEGER_OP(> ,double);
+
+  ZORBA_INTEGER_OP(>=,char);
+  ZORBA_INTEGER_OP(>=,signed char);
+  ZORBA_INTEGER_OP(>=,short);
+  ZORBA_INTEGER_OP(>=,int);
+  ZORBA_INTEGER_OP(>=,long);
+  ZORBA_INTEGER_OP(>=,long long);
+  ZORBA_INTEGER_OP(>=,unsigned char);
+  ZORBA_INTEGER_OP(>=,unsigned short);
+  ZORBA_INTEGER_OP(>=,unsigned int);
+  ZORBA_INTEGER_OP(>=,unsigned long);
+  ZORBA_INTEGER_OP(>=,unsigned long long);
+  ZORBA_INTEGER_OP(>=,float);
+  ZORBA_INTEGER_OP(>=,double);
+#undef ZORBA_INTEGER_OP
+#endif /* ZORBA_WITH_BIG_INTEGER */
+
   ////////// math functions ///////////////////////////////////////////////////
 
   Double pow( IntegerImpl const &power ) const;
@@ -474,6 +722,99 @@
   return INTEGER_IMPL(T)::ftoi( i.value_ / j.value_ );
 }
 
+#ifndef ZORBA_WITH_BIG_INTEGER
+#define ZORBA_INTEGER_OP(OP,TYPE)                                   \
+  TEMPLATE_DECL(T) inline                                           \
+  INTEGER_IMPL(T) operator OP( INTEGER_IMPL(T) const& i, TYPE n ) { \
+    return i.value_ OP static_cast<long>( n );                      \
+  }                                                                 \
+  TEMPLATE_DECL(T) inline                                           \
+  INTEGER_IMPL(T) operator OP( TYPE n, INTEGER_IMPL(T) const &i ) { \
+    return static_cast<long>( n ) OP i.value_;                      \
+  }
+
+ZORBA_INTEGER_OP(+,char)
+ZORBA_INTEGER_OP(+,signed char)
+ZORBA_INTEGER_OP(+,short)
+ZORBA_INTEGER_OP(+,int)
+ZORBA_INTEGER_OP(+,long)
+ZORBA_INTEGER_OP(+,long long)
+ZORBA_INTEGER_OP(+,unsigned char)
+ZORBA_INTEGER_OP(+,unsigned short)
+ZORBA_INTEGER_OP(+,unsigned int)
+ZORBA_INTEGER_OP(+,unsigned long)
+ZORBA_INTEGER_OP(+,unsigned long long)
+ZORBA_INTEGER_OP(+,float)
+ZORBA_INTEGER_OP(+,double)
+
+ZORBA_INTEGER_OP(-,char)
+ZORBA_INTEGER_OP(-,signed char)
+ZORBA_INTEGER_OP(-,short)
+ZORBA_INTEGER_OP(-,int)
+ZORBA_INTEGER_OP(-,long)
+ZORBA_INTEGER_OP(-,long long)
+ZORBA_INTEGER_OP(-,unsigned char)
+ZORBA_INTEGER_OP(-,unsigned short)
+ZORBA_INTEGER_OP(-,unsigned int)
+ZORBA_INTEGER_OP(-,unsigned long)
+ZORBA_INTEGER_OP(-,unsigned long long)
+ZORBA_INTEGER_OP(-,float)
+ZORBA_INTEGER_OP(-,double)
+
+ZORBA_INTEGER_OP(*,char)
+ZORBA_INTEGER_OP(*,signed char)
+ZORBA_INTEGER_OP(*,short)
+ZORBA_INTEGER_OP(*,int)
+ZORBA_INTEGER_OP(*,long)
+ZORBA_INTEGER_OP(*,long long)
+ZORBA_INTEGER_OP(*,unsigned char)
+ZORBA_INTEGER_OP(*,unsigned short)
+ZORBA_INTEGER_OP(*,unsigned int)
+ZORBA_INTEGER_OP(*,unsigned long)
+ZORBA_INTEGER_OP(*,unsigned long long)
+ZORBA_INTEGER_OP(*,float)
+ZORBA_INTEGER_OP(*,double)
+
+ZORBA_INTEGER_OP(%,char)
+ZORBA_INTEGER_OP(%,signed char)
+ZORBA_INTEGER_OP(%,short)
+ZORBA_INTEGER_OP(%,int)
+ZORBA_INTEGER_OP(%,long)
+ZORBA_INTEGER_OP(%,long long)
+ZORBA_INTEGER_OP(%,unsigned char)
+ZORBA_INTEGER_OP(%,unsigned short)
+ZORBA_INTEGER_OP(%,unsigned int)
+ZORBA_INTEGER_OP(%,unsigned long)
+ZORBA_INTEGER_OP(%,unsigned long long)
+ZORBA_INTEGER_OP(%,float)
+ZORBA_INTEGER_OP(%,double)
+#undef ZORBA_INTEGER_OP
+
+#define ZORBA_INTEGER_DIV(TYPE)                                         \
+  TEMPLATE_DECL(T) inline                                               \
+  INTEGER_IMPL(T) operator/( INTEGER_IMPL(T) const& i, TYPE n ) {       \
+    return INTEGER_IMPL(T)::ftoi( i.value_ / static_cast<long>( n ) );  \
+  }                                                                     \
+  TEMPLATE_DECL(T) inline                                               \
+  INTEGER_IMPL(T) operator/( TYPE n, INTEGER_IMPL(T) const &i ) {       \
+    return INTEGER_IMPL(T)::ftoi( static_cast<long>( n ) / i.value_ );  \
+  }
+ZORBA_INTEGER_DIV(char)
+ZORBA_INTEGER_DIV(signed char)
+ZORBA_INTEGER_DIV(short)
+ZORBA_INTEGER_DIV(int)
+ZORBA_INTEGER_DIV(long)
+ZORBA_INTEGER_DIV(long long)
+ZORBA_INTEGER_DIV(unsigned char)
+ZORBA_INTEGER_DIV(unsigned short)
+ZORBA_INTEGER_DIV(unsigned int)
+ZORBA_INTEGER_DIV(unsigned long)
+ZORBA_INTEGER_DIV(unsigned long long)
+ZORBA_INTEGER_DIV(float)
+ZORBA_INTEGER_DIV(double)
+#undef ZORBA_INTEGER_DIV
+#endif /* ZORBA_WITH_BIG_INTEGER */
+
 #define ZORBA_INTEGER_OP(OP)                                              \
   TEMPLATE_DECL(T) inline                                                 \
   INTEGER_IMPL(T)& INTEGER_IMPL(T)::operator OP( IntegerImpl const &i ) { \
@@ -493,6 +834,94 @@
   return *this;
 }
 
+#ifndef ZORBA_WITH_BIG_INTEGER
+#define ZORBA_INTEGER_OP(OP,TYPE)                           \
+  TEMPLATE_DECL(T) inline                                   \
+  INTEGER_IMPL(T)& INTEGER_IMPL(T)::operator OP( TYPE n ) { \
+    value_ OP static_cast<long>( n );                       \
+    return *this;                                           \
+  }
+
+ZORBA_INTEGER_OP(+=,char)
+ZORBA_INTEGER_OP(+=,signed char)
+ZORBA_INTEGER_OP(+=,short)
+ZORBA_INTEGER_OP(+=,int)
+ZORBA_INTEGER_OP(+=,long)
+ZORBA_INTEGER_OP(+=,long long)
+ZORBA_INTEGER_OP(+=,unsigned char)
+ZORBA_INTEGER_OP(+=,unsigned short)
+ZORBA_INTEGER_OP(+=,unsigned int)
+ZORBA_INTEGER_OP(+=,unsigned long)
+ZORBA_INTEGER_OP(+=,unsigned long long)
+ZORBA_INTEGER_OP(+=,float)
+ZORBA_INTEGER_OP(+=,double)
+
+ZORBA_INTEGER_OP(-=,char)
+ZORBA_INTEGER_OP(-=,signed char)
+ZORBA_INTEGER_OP(-=,short)
+ZORBA_INTEGER_OP(-=,int)
+ZORBA_INTEGER_OP(-=,long)
+ZORBA_INTEGER_OP(-=,long long)
+ZORBA_INTEGER_OP(-=,unsigned char)
+ZORBA_INTEGER_OP(-=,unsigned short)
+ZORBA_INTEGER_OP(-=,unsigned int)
+ZORBA_INTEGER_OP(-=,unsigned long)
+ZORBA_INTEGER_OP(-=,unsigned long long)
+ZORBA_INTEGER_OP(-=,float)
+ZORBA_INTEGER_OP(-=,double)
+
+ZORBA_INTEGER_OP(*=,char)
+ZORBA_INTEGER_OP(*=,signed char)
+ZORBA_INTEGER_OP(*=,short)
+ZORBA_INTEGER_OP(*=,int)
+ZORBA_INTEGER_OP(*=,long)
+ZORBA_INTEGER_OP(*=,long long)
+ZORBA_INTEGER_OP(*=,unsigned char)
+ZORBA_INTEGER_OP(*=,unsigned short)
+ZORBA_INTEGER_OP(*=,unsigned int)
+ZORBA_INTEGER_OP(*=,unsigned long)
+ZORBA_INTEGER_OP(*=,unsigned long long)
+ZORBA_INTEGER_OP(*=,float)
+ZORBA_INTEGER_OP(*=,double)
+
+ZORBA_INTEGER_OP(%=,char)
+ZORBA_INTEGER_OP(%=,signed char)
+ZORBA_INTEGER_OP(%=,short)
+ZORBA_INTEGER_OP(%=,int)
+ZORBA_INTEGER_OP(%=,long)
+ZORBA_INTEGER_OP(%=,long long)
+ZORBA_INTEGER_OP(%=,unsigned char)
+ZORBA_INTEGER_OP(%=,unsigned short)
+ZORBA_INTEGER_OP(%=,unsigned int)
+ZORBA_INTEGER_OP(%=,unsigned long)
+ZORBA_INTEGER_OP(%=,unsigned long long)
+ZORBA_INTEGER_OP(%=,float)
+ZORBA_INTEGER_OP(%=,double)
+#undef ZORBA_INTEGER_OP
+
+#define ZORBA_INTEGER_DIV(TYPE)                             \
+  TEMPLATE_DECL(T) inline                                   \
+  INTEGER_IMPL(T)& INTEGER_IMPL(T)::operator/=( TYPE n ) {  \
+    value_ = ftoi( value_ / static_cast<long>( n ) );       \
+    return *this;                                           \
+  }
+
+ZORBA_INTEGER_DIV(char)
+ZORBA_INTEGER_DIV(signed char)
+ZORBA_INTEGER_DIV(short)
+ZORBA_INTEGER_DIV(int)
+ZORBA_INTEGER_DIV(long)
+ZORBA_INTEGER_DIV(long long)
+ZORBA_INTEGER_DIV(unsigned char)
+ZORBA_INTEGER_DIV(unsigned short)
+ZORBA_INTEGER_DIV(unsigned int)
+ZORBA_INTEGER_DIV(unsigned long)
+ZORBA_INTEGER_DIV(unsigned long long)
+ZORBA_INTEGER_DIV(float)
+ZORBA_INTEGER_DIV(double)
+#undef ZORBA_INTEGER_DIV
+#endif /* ZORBA_WITH_BIG_INTEGER */
+
 TEMPLATE_DECL(T)
 inline INTEGER_IMPL(T) INTEGER_IMPL(T)::operator-() const {
   return -value_;
@@ -540,6 +969,103 @@
 ZORBA_INTEGER_OP(>=)
 #undef ZORBA_INTEGER_OP
 
+#ifndef ZORBA_WITH_BIG_INTEGER
+#define ZORBA_INTEGER_OP(OP,TYPE)                         \
+  TEMPLATE_DECL(T) inline                                 \
+  bool operator OP( INTEGER_IMPL(T) const &i, TYPE n ) {  \
+    return i.value_ OP static_cast<long>( n );            \
+  }                                                       \
+  TEMPLATE_DECL(T) inline                                 \
+  bool operator OP( TYPE n, INTEGER_IMPL(T) const &i ) {  \
+    return static_cast<long>( n ) OP i.value_;            \
+  }                                                       \
+
+  ZORBA_INTEGER_OP(==,char);
+  ZORBA_INTEGER_OP(==,signed char);
+  ZORBA_INTEGER_OP(==,short);
+  ZORBA_INTEGER_OP(==,int);
+  ZORBA_INTEGER_OP(==,long);
+  ZORBA_INTEGER_OP(==,long long);
+  ZORBA_INTEGER_OP(==,unsigned char);
+  ZORBA_INTEGER_OP(==,unsigned short);
+  ZORBA_INTEGER_OP(==,unsigned int);
+  ZORBA_INTEGER_OP(==,unsigned long);
+  ZORBA_INTEGER_OP(==,unsigned long long);
+  ZORBA_INTEGER_OP(==,float);
+  ZORBA_INTEGER_OP(==,double);
+
+  ZORBA_INTEGER_OP(!=,char);
+  ZORBA_INTEGER_OP(!=,signed char);
+  ZORBA_INTEGER_OP(!=,short);
+  ZORBA_INTEGER_OP(!=,int);
+  ZORBA_INTEGER_OP(!=,long);
+  ZORBA_INTEGER_OP(!=,long long);
+  ZORBA_INTEGER_OP(!=,unsigned char);
+  ZORBA_INTEGER_OP(!=,unsigned short);
+  ZORBA_INTEGER_OP(!=,unsigned int);
+  ZORBA_INTEGER_OP(!=,unsigned long);
+  ZORBA_INTEGER_OP(!=,unsigned long long);
+  ZORBA_INTEGER_OP(!=,float);
+  ZORBA_INTEGER_OP(!=,double);
+
+  ZORBA_INTEGER_OP(< ,char);
+  ZORBA_INTEGER_OP(< ,signed char);
+  ZORBA_INTEGER_OP(< ,short);
+  ZORBA_INTEGER_OP(< ,int);
+  ZORBA_INTEGER_OP(< ,long);
+  ZORBA_INTEGER_OP(< ,long long);
+  ZORBA_INTEGER_OP(< ,unsigned char);
+  ZORBA_INTEGER_OP(< ,unsigned short);
+  ZORBA_INTEGER_OP(< ,unsigned int);
+  ZORBA_INTEGER_OP(< ,unsigned long);
+  ZORBA_INTEGER_OP(< ,unsigned long long);
+  ZORBA_INTEGER_OP(< ,float);
+  ZORBA_INTEGER_OP(< ,double);
+
+  ZORBA_INTEGER_OP(<=,char);
+  ZORBA_INTEGER_OP(<=,signed char);
+  ZORBA_INTEGER_OP(<=,short);
+  ZORBA_INTEGER_OP(<=,int);
+  ZORBA_INTEGER_OP(<=,long);
+  ZORBA_INTEGER_OP(<=,long long);
+  ZORBA_INTEGER_OP(<=,unsigned char);
+  ZORBA_INTEGER_OP(<=,unsigned short);
+  ZORBA_INTEGER_OP(<=,unsigned int);
+  ZORBA_INTEGER_OP(<=,unsigned long);
+  ZORBA_INTEGER_OP(<=,unsigned long long);
+  ZORBA_INTEGER_OP(<=,float);
+  ZORBA_INTEGER_OP(<=,double);
+
+  ZORBA_INTEGER_OP(> ,char);
+  ZORBA_INTEGER_OP(> ,signed char);
+  ZORBA_INTEGER_OP(> ,short);
+  ZORBA_INTEGER_OP(> ,int);
+  ZORBA_INTEGER_OP(> ,long);
+  ZORBA_INTEGER_OP(> ,long long);
+  ZORBA_INTEGER_OP(> ,unsigned char);
+  ZORBA_INTEGER_OP(> ,unsigned short);
+  ZORBA_INTEGER_OP(> ,unsigned int);
+  ZORBA_INTEGER_OP(> ,unsigned long);
+  ZORBA_INTEGER_OP(> ,unsigned long long);
+  ZORBA_INTEGER_OP(> ,float);
+  ZORBA_INTEGER_OP(> ,double);
+
+  ZORBA_INTEGER_OP(>=,char);
+  ZORBA_INTEGER_OP(>=,signed char);
+  ZORBA_INTEGER_OP(>=,short);
+  ZORBA_INTEGER_OP(>=,int);
+  ZORBA_INTEGER_OP(>=,long);
+  ZORBA_INTEGER_OP(>=,long long);
+  ZORBA_INTEGER_OP(>=,unsigned char);
+  ZORBA_INTEGER_OP(>=,unsigned short);
+  ZORBA_INTEGER_OP(>=,unsigned int);
+  ZORBA_INTEGER_OP(>=,unsigned long);
+  ZORBA_INTEGER_OP(>=,unsigned long long);
+  ZORBA_INTEGER_OP(>=,float);
+  ZORBA_INTEGER_OP(>=,double);
+#undef ZORBA_INTEGER_OP
+#endif /* ZORBA_WITH_BIG_INTEGER */
+
 ////////// miscellaneous //////////////////////////////////////////////////////
 
 #ifdef ZORBA_WITH_BIG_INTEGER

Follow ups

Re: [Merge] lp:~paul-lucas/zorba/bug-966355 into lp:zorba
From: Paul J. Lucas, 2012-03-27
[Merge] lp:~paul-lucas/zorba/bug-966355 into lp:zorba
From: Zorba Build Bot, 2012-03-27
Re: [Merge] lp:~paul-lucas/zorba/bug-966355 into lp:zorba
From: Zorba Build Bot, 2012-03-27
[Merge] lp:~paul-lucas/zorba/bug-966355 into lp:zorba
From: Zorba Build Bot, 2012-03-27
[Merge] lp:~paul-lucas/zorba/bug-966355 into lp:zorba
From: Zorba Build Bot, 2012-03-27
[Merge] lp:~paul-lucas/zorba/bug-966355 into lp:zorba
From: Paul J. Lucas, 2012-03-27