X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Farbint.h;h=4b819b9f18ddbc3e0ffe1c74308f3463035dfbe4;hp=1507ba7a4e90d003330c81c1d9e07ec4e1a50da8;hb=a7da45c62d5a0604785479f5dfeb1c2a65d0f9de;hpb=ee5287fabfb214e8f7b483cde424108270525fd7

diff --git a/src/arbint.h b/src/arbint.h
index 1507ba7..4b819b9 100644
--- a/src/arbint.h
+++ b/src/arbint.h
@@ -1,3 +1,9 @@
+/**
+ * @file arbint.h
+ * @brief Arbitrary sized integer declarations
+ * @see arbint.cpp
+ */
+ 
 #ifndef _ARBINT_H
 #define _ARBINT_H
 
@@ -11,11 +17,17 @@ namespace IPDF
 			typedef int64_t digit_t;
 		
 			Arbint(digit_t i);
+			Arbint(const std::vector<digit_t> & digits);
 			Arbint(unsigned n, digit_t d0, ...);
 			Arbint(const std::string & str, const std::string & base="0123456789");
 			~Arbint() {}
 			Arbint(const Arbint & cpy);
 			
+			digit_t AsDigit() const 
+			{
+				digit_t digit = (m_digits.size() == 1) ? m_digits[0] : 0xFFFFFFFFFFFFFFFF;
+				return (m_sign) ? -digit : digit;
+			}
 			
 			inline bool Sign() const {return m_sign;}
 			inline char SignChar() const {return (m_sign) ? '-' : '+';}
@@ -30,10 +42,8 @@ namespace IPDF
 			Arbint & operator=(const Arbint & equ);
 			Arbint & operator+=(const Arbint & add);
 			Arbint & operator-=(const Arbint & sub);
-	
-			
-			bool operator==(const Arbint & equ) const;
-			
+			Arbint & operator*=(const Arbint & mul);
+			void Division(const Arbint & div, Arbint & result, Arbint & modulo) const;
 			
 			inline Arbint operator+(const Arbint & add) const 
 			{
@@ -46,12 +56,64 @@ namespace IPDF
 				Arbint a(*this);
 				a -= add;
 				return a;
-			}	
+			}
+			
+			inline Arbint operator*(const Arbint & mul) const
+			{
+				Arbint a(*this);
+				a *= mul;
+				return a;
+			}
+			
+			inline Arbint & operator/=(const Arbint & div)
+			{
+				Arbint result(0L);
+				Arbint remainder(0L);
+				this->Division(div, result, remainder);
+				this->operator=(result);
+				return *this;
+			}
+			inline Arbint operator/(const Arbint & div)
+			{
+				Arbint cpy(*this);
+				cpy /= div;
+				return cpy;
+			}
+			inline Arbint operator%(const Arbint & div)
+			{
+				Arbint result(0L);
+				Arbint remainder(0L);
+				this->Division(div, result, remainder);
+				return remainder;
+			}
+			
+			bool operator==(const Arbint & equ) const;
+			bool operator<(const Arbint & less) const;
+
 			inline bool operator!=(const Arbint & equ) const 
 			{
-				return !this->operator==(equ);
+				return !(this->operator==(equ));
+			}
+			inline bool operator<=(const Arbint & leq) const 
+			{
+				return (this->operator==(leq) || this->operator<(leq));
 			}
 			
+			inline bool operator>=(const Arbint & leq) const 
+			{
+				return (this->operator==(leq) || this->operator>(leq));
+			}
+			inline bool operator>(const Arbint & grea) const
+			{
+				return !(this->operator<=(grea));
+			}
+			
+			bool IsZero() const;
+			
+			//inline operator double() const {return double(AsDigit());}
+			inline operator digit_t() const {return AsDigit();}
+			//inline operator int() const {return int(AsDigit());}
+			
 			unsigned Shrink();
 		private:		
 				
@@ -61,9 +123,6 @@ namespace IPDF
 			std::vector<digit_t> m_digits;
 			bool m_sign;
 			void Zero();
-
-			
-			
 			
 	};	
 
@@ -72,6 +131,7 @@ extern "C"
 	typedef int64_t digit_t;
 	digit_t add_digits(digit_t * dst, digit_t * add, digit_t size);
 	digit_t sub_digits(digit_t * dst, digit_t * add, digit_t size);
+	digit_t mul_digits(digit_t * dst, digit_t mul, digit_t size);
 }
 
 }