fixed operator overloading problem

Author: tiberius

cpp4j/rationalnumber.cpp

@@ -8,40 +8,40 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-bool rnum::CPP_RationalNumber::isValid (void){
+bool rnum::CPP_RationalNumber::isValid (void) const {
     return rnIsValid(this->rn);
 }
 
-bool rnum::CPP_RationalNumber::isNaN (void){
+bool rnum::CPP_RationalNumber::isNaN (void)const {
     return rnIsNaN(this->rn);
 }
 
 bool rnum::CPP_RationalNumber::operator==
-(const rnum::CPP_RationalNumber &right){
+(const rnum::CPP_RationalNumber &right) const {
     return rnEqual(this->rn,right.rn);
 }
 
 bool rnum::CPP_RationalNumber::operator<
-(const rnum::CPP_RationalNumber &right){
+(const rnum::CPP_RationalNumber &right) const {
     return rnLessThan(this->rn,right.rn);
 }
 
 const rnum::CPP_RationalNumber rnum::CPP_RationalNumber::operator+
-(const rnum::CPP_RationalNumber &right) const{
+(const rnum::CPP_RationalNumber &right) const {
     rnum::CPP_RationalNumber result = *this;
     result.rn = rnAdd(this->rn, right.rn);
     return result;
 }
 
 const rnum::CPP_RationalNumber rnum::CPP_RationalNumber::operator-
-(const rnum::CPP_RationalNumber &right) const{
+(const rnum::CPP_RationalNumber &right) const {
     rnum::CPP_RationalNumber result = *this;
     result.rn = rnSubtract(this->rn, right.rn);
     return result;
 }
 
-const rnum::CPP_RationalNumber rnum::CPP_RationalNumber::operator -()
-const{
+const rnum::CPP_RationalNumber rnum::CPP_RationalNumber::operator-
+() const {
     rnum::CPP_RationalNumber result = *this;
     const RationalNumber kaiSucks = { -1,1};
     result.rn = rnMultiply( this->rn , kaiSucks  );

cpp4j/rationalnumber.h

@@ -60,43 +60,37 @@ RationalNumber rnDivide
 namespace rnum {
 class CPP_RationalNumber {
 public :
-    CPP_RationalNumber
-    (int nom, int denom)
-    {
-        rn.nominator = nom;
-        rn.denominator = denom;
-    }
 
     CPP_RationalNumber
-    (int nom)
+    ()
     {
-        rn.nominator = nom;
+        rn.nominator = 0;
         rn.denominator = 1;
     }
 
     CPP_RationalNumber
-    ()
+    (int nom)
     {
-        rn.nominator = 0;
+        rn.nominator = nom;
         rn.denominator = 1;
     }
 
-    CPP_RationalNumber& operator= (const int &right)
+    explicit CPP_RationalNumber
+    (int nom, int denom)
     {
-        this->rn.nominator = right;
-        this->rn.denominator = 1;
-        return *this;
+        rn.nominator = nom;
+        rn.denominator = denom;
     }
 
-    bool isValid (void);
+    bool isValid (void) const;
 
-    bool isNaN (void);
+    bool isNaN (void) const;
 
     bool operator==
-    (const CPP_RationalNumber &right);
+    (const CPP_RationalNumber &right) const;
 
     bool operator<
-    (const CPP_RationalNumber &right);
+    (const CPP_RationalNumber &right) const;
 
     const CPP_RationalNumber operator+
      (const CPP_RationalNumber &right) const;
@@ -113,7 +107,6 @@ public :
     CPP_RationalNumber & operator*=
     (const CPP_RationalNumber &right);
 
-
     const CPP_RationalNumber operator/
     (const CPP_RationalNumber &right) const;
 
@@ -125,13 +118,13 @@ public :
     RationalNumber rn;
 };
 
-CPP_RationalNumber operator*(const int left, const CPP_RationalNumber &right){
+/*CPP_RationalNumber operator*(const int left, const CPP_RationalNumber &right){
     return CPP_RationalNumber(left) * right;
 }
 
-CPP_RationalNumber operator/( const CPP_RationalNumber &left, const int right){
+CPP_RationalNumber operator/(const CPP_RationalNumber &left, const int right){
     return left / CPP_RationalNumber(right);
-}
+}*/
 
 }
 #endif // RATIONALNUMBER_H

cpp4j/rationalnumberarray.cpp

@@ -143,7 +143,7 @@ void rnaResize(RationalNumberArray * rna, const unsigned int newSize) {
     if (rna->size == newSize) // nothing to do
         return;
 
-    RationalNumber * newData = (RationalNumber*) realloc(rna->data, computeSizeForData(newSize));
+    RationalNumber * newData = (RationalNumber*) realloc((RationalNumber *)rna->data, computeSizeForData(newSize));
 
     if (rna->size > newSize) {
         // size decreases, ptr returned by realloc should always be equal to the old ptr

cpp4j/testCPP_RN.cpp

@@ -24,7 +24,7 @@ void testCPP_RN(void)
 
     int i=5, j=4;
     CPP_RationalNumber g(1,2), h(7,3);
-    //CPP_RationalNumber aa = i*g, bb = h/j;
+    CPP_RationalNumber aa = g*i, bb = h/j;
     CPP_RationalNumber ia (i);
     CPP_RationalNumber ja = j;