gmp 0.4.3-x86-mingw32 → 0.4.7-x86-mingw32

data/ext/gmpq.c

@@ -159,17 +159,18 @@ VALUE r_gmpq_to_s(VALUE self)
   int sizeinbase;
   int offset;
 
-  Data_Get_Struct(self, MP_RAT, self_val);
+  //Data_Get_Struct (self, MP_RAT, self_val);
+  mpq_get_struct(self, self_val)
 
-  if (mpz_cmp_ui(mpq_denref(self_val), 1) == 0) {
-    str = mpz_get_str(NULL, 10, mpq_numref (self_val));
-    res = rb_str_new2(str);
+  if (mpz_cmp_ui (mpq_denref (self_val), 1) == 0) {
+    str = mpz_get_str (NULL, 10, mpq_numref (self_val));
+    res = rb_str_new2 (str);
     free (str);
     return res;
   }
 
-  self_val_num = mpq_numref(self_val);
-  self_val_den = mpq_denref(self_val);
+  self_val_num = mpq_numref (self_val);
+  self_val_den = mpq_denref (self_val);
 
   sizeinbase = mpz_sizeinbase (self_val_num, 10) + mpz_sizeinbase (self_val_den, 10) + 3;
   str = malloc (sizeinbase);

data/ext/gmpz.c

@@ -57,17 +57,30 @@
  *   remove         r_gmpz_remove           mpz_remove
  *   fac            r_gmpz_fac              mpz_fac_ui
  *   fib            r_gmpz_fib              mpz_fib_ui
+ *   <=>
+ *   <
+ *   <=
+ *   ==
+ *   >=
+ *   >
+ *   cmpabs
+ *   sgn
+ *   eql?           r_gmpz_eql              ------------
+ *   hash           r_gmpz_hash
+ *   and
+ *   ior
+ *   xor
  *   com            r_gmpz_com              mpz_com
  *   com!           r_gmpz_com_self         mpz_com
- *   []=            r_gmpz_setbit           mpz_setbit
- *   []             r_gmpz_getbit           mpz_tstbit
+ *   popcount       r_gmpz_popcount
  *   scan0          r_gmpz_scan0            mpz_scan0
  *   scan1          r_gmpz_scan1            mpz_scan1
+ *   []=            r_gmpz_setbit           mpz_setbit
+ *   []             r_gmpz_getbit           mpz_tstbit
  *   even?          r_gmpz_is_even          mpz_even
  *   odd?           r_gmpz_is_odd           mpz_odd
  *   sizeinbase     r_gmpz_sizeinbase       mpz_sizeinbase
  *   size_in_bin    r_gmpz_size_in_bin      mpz_sizeinbits
- *   ...
  */
 
 /**********************************************************************
@@ -233,7 +246,6 @@ VALUE r_gmpzsg_new(int argc, VALUE *argv, VALUE klass)
 {
   MP_INT *res_val;
   VALUE res;
-
   (void)klass;
 
   if (argc > 1)
@@ -1467,6 +1479,88 @@ VALUE r_gmpz_eq(VALUE self, VALUE arg)
   }
 }
 
+int mpz_cmp_value(MP_INT *OP, VALUE arg)
+{
+  MP_RAT *arg_val_q;
+  MP_INT *arg_val_z;
+  int res;
+
+  if (GMPZ_P(arg)) {
+    mpz_get_struct(arg,arg_val_z);
+    return mpz_cmp(OP,arg_val_z);
+  } else if (FIXNUM_P(arg)) {
+    return mpz_cmp_si(OP, FIX2INT(arg));
+  } else if (GMPQ_P(arg)) {
+    mpq_get_struct(arg,arg_val_q);
+    mpz_temp_alloc(arg_val_z);
+    mpz_init(arg_val_z);
+    mpz_mul(arg_val_z, OP, mpq_denref(arg_val_q));
+    res = mpz_cmp(arg_val_z, mpq_numref(arg_val_q));
+    mpz_temp_free(arg_val_z);
+    return res;
+  } else if (GMPF_P(arg)) {
+    not_yet;
+  } else if (BIGNUM_P(arg)) {
+    mpz_temp_from_bignum(arg_val_z, arg);
+    res = mpz_cmp(OP, arg_val_z);
+    mpz_temp_free(arg_val_z);
+    return res;
+  } else {
+    typeerror_as(ZQFXB, "exponent");
+  }
+}
+
+VALUE r_gmpz_cmp(VALUE self, VALUE arg)
+{
+  MP_INT *self_val;
+  int res;
+  mpz_get_struct(self,self_val);
+  res = mpz_cmp_value(self_val, arg);
+  if (res > 0)
+    return INT2FIX(1);
+  else if (res == 0)
+    return INT2FIX(0);
+  else
+    return INT2FIX(-1);
+}
+
+/*
+ * Document-method: <
+ *
+ * call-seq:
+ *   int1 < int2
+ * 
+ * Returns whether +int1+ is strictly less than +int2+.
+ */
+DEFUN_INT_CMP(lt,<)
+/*
+ * Document-method: <=
+ *
+ * call-seq:
+ *   int1 <= int2
+ * 
+ * Returns whether +int1+ is less than or equal to +int2+.
+ */
+DEFUN_INT_CMP(le,<=)
+/*
+ * Document-method: >
+ *
+ * call-seq:
+ *   int1 > int2
+ * 
+ * Returns whether +int1+ is strictly greater than +int2+.
+ */
+DEFUN_INT_CMP(gt,>)
+/*
+ * Document-method: >=
+ *
+ * call-seq:
+ *   int1 >= int2
+ *
+ * Returns whether +int1+ is greater than or equal to +int2+.
+ */
+DEFUN_INT_CMP(ge,>=)
+
 VALUE r_gmpz_cmpabs(VALUE self, VALUE arg)
 {
   MP_INT *arg_val_z, *self_val;
@@ -1503,6 +1597,47 @@ VALUE r_gmpz_cmpabs(VALUE self, VALUE arg)
   }
 }
 
+/*
+ * call-seq:
+ *   integer.sgn
+ *
+ * From the GMP Manual:
+ * 
+ * Returns +1 if +integer+ > 0, 0 if +integer+ == 0, and -1 if +integer+ < 0.
+ */
+VALUE r_gmpz_sgn(VALUE self)
+{
+  MP_INT *self_val;
+  mpz_get_struct(self, self_val);
+  return INT2FIX(mpz_sgn(self_val));
+}
+
+
+/*
+ * eql? and hash are defined so that GMP::Z objects can be used as keys in
+ * hashes.
+ */
+VALUE r_gmpz_eql(VALUE self, VALUE arg)
+{
+  MP_INT *self_val, *arg_val;
+  mpz_get_struct(self,self_val);
+  
+  if (GMPZ_P(arg)) {
+    mpz_get_struct(arg, arg_val);
+    return (mpz_cmp (self_val, arg_val) == 0) ? Qtrue : Qfalse;
+  }
+  else {
+    return Qfalse;
+  }
+}
+
+VALUE r_gmpz_hash(VALUE self)
+{
+  ID to_s_sym = rb_intern("to_s");
+  ID hash_sym = rb_intern("hash");
+  return rb_funcall(rb_funcall(self, to_s_sym, 0), hash_sym, 0);
+}
+
 
 /**********************************************************************
  *    Integer Logic and Bit Fiddling                                  *
@@ -1542,6 +1677,48 @@ DEFUN_INT_LOGIC(or, mpz_ior)
  */
 DEFUN_INT_LOGIC(xor, mpz_xor)
 
+/*
+ * Document-method: com
+ *
+ * call-seq:
+ *   integer.com
+ *
+ * From the GMP Manual:
+ * 
+ * Returns the one's complement of +integer+.
+ */
+/*
+ * Document-method: com!
+ *
+ * call-seq:
+ *   integer.com!
+ *
+ * From the GMP Manual:
+ * 
+ * Sets +integer+ to its one's complement.
+ */
+DEFUN_INT2INT(com, mpz_com)
+
+/*
+ * Document-method: popcount
+ *
+ * call-seq:
+ *   integer.popcount
+ *
+ * From the GMP Manual:
+ * 
+ * If <tt>integer>=0</tt>, return the population count of <tt>integer</tt>,
+ * which is the number of 1 bits in the binary representation. If
+ * <tt>op<0</tt>, the number of 1s is infinite, and the return value is
+ * INT2FIX(ULONG_MAX), the largest possible unsigned long.
+ */
+VALUE r_gmpz_popcount(VALUE self)
+{
+  MP_INT *self_val;
+  mpz_get_struct(self, self_val);
+  return INT2FIX(mpz_popcount(self_val));
+}
+
 /*
  * call-seq:
  *   integer.scan0(starting_bit)
@@ -1601,26 +1778,6 @@ VALUE r_gmpz_scan1(VALUE self, VALUE bitnr)
   return INT2FIX(mpz_scan1(self_val, bitnr_val));
 }
 
-/*
- * Document-method: popcount
- *
- * call-seq:
- *   integer.popcount
- *
- * From the GMP Manual:
- * 
- * If <tt>integer>=0</tt>, return the population count of <tt>integer</tt>,
- * which is the number of 1 bits in the binary representation. If
- * <tt>op<0</tt>, the number of 1s is infinite, and the return value is
- * INT2FIX(ULONG_MAX), the largest possible unsigned long.
- */
-VALUE r_gmpz_popcount(VALUE self)
-{
-  MP_INT *self_val;
-  mpz_get_struct(self, self_val);
-  return INT2FIX(mpz_popcount(self_val));
-}
-
 /*
  * call-seq:
  *   integer[index] = x &rarr; nil
@@ -1671,54 +1828,6 @@ VALUE r_gmpz_getbit(VALUE self, VALUE bitnr)
  *    Miscellaneous Integer Functions                                 *
  **********************************************************************/
 
-VALUE r_gmpz_sizeinbase(VALUE self, VALUE base)
-{
-  MP_INT *self_val;
-  int base_val;
-  mpz_get_struct (self, self_val);
-  base_val = FIX2INT (base);
-  return INT2FIX (mpz_sizeinbase (self_val, base_val));
-}
-
-VALUE r_gmpz_size_in_bin(VALUE self)
-{
-  MP_INT *self_val;
-  mpz_get_struct (self, self_val);
-  return INT2FIX (mpz_sizeinbase (self_val, 2));
-}
-
-
-/**********************************************************************
- *    Integer Special Functions                                       *
- **********************************************************************/
-
-
-/**********************************************************************
- *    _unsorted_                                                      *
- **********************************************************************/
-
-/*
- * Document-method: com
- *
- * call-seq:
- *   integer.com
- *
- * From the GMP Manual:
- * 
- * Returns the one's complement of +integer+.
- */
-/*
- * Document-method: com!
- *
- * call-seq:
- *   integer.com!
- *
- * From the GMP Manual:
- * 
- * Sets +integer+ to its one's complement.
- */
-DEFUN_INT2INT(com, mpz_com)
-
 /*
  * Document-method: even?
  *
@@ -1742,107 +1851,36 @@ DEFUN_INT_COND_P(is_even,mpz_even_p)
  */
 DEFUN_INT_COND_P(is_odd,mpz_odd_p)
 
-/*
- * call-seq:
- *   integer.sgn
- *
- * From the GMP Manual:
- * 
- * Returns +1 if +integer+ > 0, 0 if +integer+ == 0, and -1 if +integer+ < 0.
- */
-VALUE r_gmpz_sgn(VALUE self)
+VALUE r_gmpz_sizeinbase(VALUE self, VALUE base)
 {
   MP_INT *self_val;
-  mpz_get_struct(self, self_val);
-  return INT2FIX(mpz_sgn(self_val));
-}
-
-DEFUN_INT_F_UL(fshr,mpz_fdiv_q_2exp,"shift size")
-DEFUN_INT_F_UL(tshr,mpz_tdiv_q_2exp,"shift size")
-DEFUN_INT_F_UL(fshrm,mpz_fdiv_r_2exp,"mark size")
-DEFUN_INT_F_UL(tshrm,mpz_tdiv_r_2exp,"mark size")
-
-int mpz_cmp_value(MP_INT *OP, VALUE arg)
-{
-  MP_RAT *arg_val_q;
-  MP_INT *arg_val_z;
-  int res;
-
-  if (GMPZ_P(arg)) {
-    mpz_get_struct(arg,arg_val_z);
-    return mpz_cmp(OP,arg_val_z);
-  } else if (FIXNUM_P(arg)) {
-    return mpz_cmp_si(OP, FIX2INT(arg));
-  } else if (GMPQ_P(arg)) {
-    mpq_get_struct(arg,arg_val_q);
-    mpz_temp_alloc(arg_val_z);
-    mpz_init(arg_val_z);
-    mpz_mul(arg_val_z, OP, mpq_denref(arg_val_q));
-    res = mpz_cmp(arg_val_z, mpq_numref(arg_val_q));
-    mpz_temp_free(arg_val_z);
-    return res;
-  } else if (GMPF_P(arg)) {
-    not_yet;
-  } else if (BIGNUM_P(arg)) {
-    mpz_temp_from_bignum(arg_val_z, arg);
-    res = mpz_cmp(OP, arg_val_z);
-    mpz_temp_free(arg_val_z);
-    return res;
-  } else {
-    typeerror_as(ZQFXB, "exponent");
-  }
+  int base_val;
+  mpz_get_struct (self, self_val);
+  base_val = FIX2INT (base);
+  return INT2FIX (mpz_sizeinbase (self_val, base_val));
 }
 
-VALUE r_gmpz_cmp(VALUE self, VALUE arg)
+VALUE r_gmpz_size_in_bin(VALUE self)
 {
   MP_INT *self_val;
-  int res;
-  mpz_get_struct(self,self_val);
-  res = mpz_cmp_value(self_val, arg);
-  if (res > 0)
-    return INT2FIX(1);
-  else if (res == 0)
-    return INT2FIX(0);
-  else
-    return INT2FIX(-1);
+  mpz_get_struct (self, self_val);
+  return INT2FIX (mpz_sizeinbase (self_val, 2));
 }
 
-/*
- * Document-method: <
- *
- * call-seq:
- *   int1 < int2
- * 
- * Returns whether +int1+ is strictly less than +int2+.
- */
-DEFUN_INT_CMP(lt,<)
-/*
- * Document-method: <=
- *
- * call-seq:
- *   int1 <= int2
- * 
- * Returns whether +int1+ is less than or equal to +int2+.
- */
-DEFUN_INT_CMP(le,<=)
-/*
- * Document-method: >
- *
- * call-seq:
- *   int1 > int2
- * 
- * Returns whether +int1+ is strictly greater than +int2+.
- */
-DEFUN_INT_CMP(gt,>)
-/*
- * Document-method: >=
- *
- * call-seq:
- *   int1 >= int2
- *
- * Returns whether +int1+ is greater than or equal to +int2+.
- */
-DEFUN_INT_CMP(ge,>=)
+
+/**********************************************************************
+ *    Integer Special Functions                                       *
+ **********************************************************************/
+
+
+/**********************************************************************
+ *    _unsorted_                                                      *
+ **********************************************************************/
+
+DEFUN_INT_F_UL(fshr,mpz_fdiv_q_2exp,"shift size")
+DEFUN_INT_F_UL(tshr,mpz_tdiv_q_2exp,"shift size")
+DEFUN_INT_F_UL(fshrm,mpz_fdiv_r_2exp,"mark size")
+DEFUN_INT_F_UL(tshrm,mpz_tdiv_r_2exp,"mark size")
 
 VALUE r_gmpzsg_pow(VALUE klass, VALUE base, VALUE exp)
 {
@@ -1931,38 +1969,41 @@ void init_gmpz()
   rb_define_singleton_method(cGMP_Z, "fib",           r_gmpzsg_fib, 1);
   
   // Integer Comparisons
-  rb_define_method(cGMP_Z, "<=>", r_gmpz_cmp, 1);
-  rb_define_method(cGMP_Z, ">",   r_gmpz_cmp_gt, 1);
-  rb_define_method(cGMP_Z, ">=",  r_gmpz_cmp_ge, 1);
-  rb_define_method(cGMP_Z, "<",   r_gmpz_cmp_lt, 1);
-  rb_define_method(cGMP_Z, "<=",  r_gmpz_cmp_le, 1);
+  rb_define_method(cGMP_Z, "<=>",     r_gmpz_cmp, 1);
+  rb_define_method(cGMP_Z, ">",       r_gmpz_cmp_gt, 1);
+  rb_define_method(cGMP_Z, ">=",      r_gmpz_cmp_ge, 1);
+  rb_define_method(cGMP_Z, "==",      r_gmpz_eq, 1);
+  rb_define_method(cGMP_Z, "<",       r_gmpz_cmp_lt, 1);
+  rb_define_method(cGMP_Z, "<=",      r_gmpz_cmp_le, 1);
   rb_define_method(cGMP_Z, "cmpabs",  r_gmpz_cmpabs, 1);
+  rb_define_method(cGMP_Z, "sgn",     r_gmpz_sgn, 0);
+  
+  rb_define_method(cGMP_Z, "eql?",    r_gmpz_eql, 1);
+  rb_define_method(cGMP_Z, "hash",    r_gmpz_hash, 0);
   
   // Integer Logic and Bit Fiddling
-  rb_define_method(cGMP_Z, "com", r_gmpz_com, 0);
-  rb_define_method(cGMP_Z, "com!", r_gmpz_com_self, 0);
   rb_define_method(cGMP_Z, "&", r_gmpz_and, 1);
   rb_define_method(cGMP_Z, "|", r_gmpz_or, 1);
   rb_define_method(cGMP_Z, "^", r_gmpz_xor, 1);
-  rb_define_method(cGMP_Z, "[]=", r_gmpz_setbit, 2);
-  rb_define_method(cGMP_Z, "[]", r_gmpz_getbit, 1);
+  rb_define_method(cGMP_Z, "com", r_gmpz_com, 0);
+  rb_define_method(cGMP_Z, "com!", r_gmpz_com_self, 0);
+  rb_define_method(cGMP_Z, "popcount",  r_gmpz_popcount, 0);
   rb_define_method(cGMP_Z, "scan0", r_gmpz_scan0, 1);
   rb_define_method(cGMP_Z, "scan1", r_gmpz_scan1, 1);
+  rb_define_method(cGMP_Z, "[]=", r_gmpz_setbit, 2);
+  rb_define_method(cGMP_Z, "[]", r_gmpz_getbit, 1);
   
   //Miscellaneous Integer Functions
+  rb_define_method(cGMP_Z, "even?", r_gmpz_is_even, 0);
+  rb_define_method(cGMP_Z, "odd?", r_gmpz_is_odd, 0);
   rb_define_method(cGMP_Z, "sizeinbase", r_gmpz_sizeinbase, 1);
   rb_define_alias( cGMP_Z, "size_in_base", "sizeinbase");
   rb_define_method(cGMP_Z, "size_in_bin", r_gmpz_size_in_bin, 0);
   
   // _unsorted_
-  rb_define_method(cGMP_Z, "even?", r_gmpz_is_even, 0);
-  rb_define_method(cGMP_Z, "odd?", r_gmpz_is_odd, 0);
-  rb_define_method(cGMP_Z, "sgn", r_gmpz_sgn, 0);
-  rb_define_method(cGMP_Z, "==",  r_gmpz_eq, 1);
   rb_define_method(cGMP_Z, ">>",  r_gmpz_fshr, 1);
   rb_define_method(cGMP_Z, "tshr",  r_gmpz_tshr, 1);
   rb_define_method(cGMP_Z, "lastbits_sgn",  r_gmpz_tshrm, 1);
   rb_define_method(cGMP_Z, "lastbits_pos",  r_gmpz_fshrm, 1);
-  rb_define_method(cGMP_Z, "popcount",  r_gmpz_popcount, 0);
 
 }