[Python-checkins] CVS: python/dist/src/Objects typeobject.c,2.23,2.24

Jack Jansen jackjansen@users.sourceforge.net
Wed, 08 Aug 2001 08:29:51 -0700


Update of /cvsroot/python/python/dist/src/Objects
In directory usw-pr-cvs1:/tmp/cvs-serv5676/python/Objects

Modified Files:
	typeobject.c 
Log Message:
Removed extraneous semicolons that caused a gazzilion "empty declaration" warnings in the MetroWerks compiler.

Index: typeobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/typeobject.c,v
retrieving revision 2.23
retrieving revision 2.24
diff -C2 -d -r2.23 -r2.24
*** typeobject.c	2001/08/07 17:24:28	2.23
--- typeobject.c	2001/08/08 15:29:49	2.24
***************
*** 1732,1741 ****
  }
  
! RICHCMP_WRAPPER(lt, Py_LT);
! RICHCMP_WRAPPER(le, Py_LE);
! RICHCMP_WRAPPER(eq, Py_EQ);
! RICHCMP_WRAPPER(ne, Py_NE);
! RICHCMP_WRAPPER(gt, Py_GT);
! RICHCMP_WRAPPER(ge, Py_GE);
  
  #undef RICHCMP_ENTRY
--- 1732,1741 ----
  }
  
! RICHCMP_WRAPPER(lt, Py_LT)
! RICHCMP_WRAPPER(le, Py_LE)
! RICHCMP_WRAPPER(eq, Py_EQ)
! RICHCMP_WRAPPER(ne, Py_NE)
! RICHCMP_WRAPPER(gt, Py_GT)
! RICHCMP_WRAPPER(ge, Py_GE)
  
  #undef RICHCMP_ENTRY
***************
*** 2046,2053 ****
  }
  
! SLOT1(sq_concat, add, PyObject *, O);
! SLOT1(sq_repeat, mul, int, i);
! SLOT1(sq_item, getitem, int, i);
! SLOT2(sq_slice, getslice, int, int, ii);
  
  static int
--- 2046,2053 ----
  }
  
! SLOT1(sq_concat, add, PyObject *, O)
! SLOT1(sq_repeat, mul, int, i)
! SLOT1(sq_item, getitem, int, i)
! SLOT2(sq_slice, getslice, int, int, ii)
  
  static int
***************
*** 2096,2105 ****
  }
  
! SLOT1(sq_inplace_concat, iadd, PyObject *, O);
! SLOT1(sq_inplace_repeat, imul, int, i);
  
  #define slot_mp_length slot_sq_length
  
! SLOT1(mp_subscript, getitem, PyObject *, O);
  
  static int
--- 2096,2105 ----
  }
  
! SLOT1(sq_inplace_concat, iadd, PyObject *, O)
! SLOT1(sq_inplace_repeat, imul, int, i)
  
  #define slot_mp_length slot_sq_length
  
! SLOT1(mp_subscript, getitem, PyObject *, O)
  
  static int
***************
*** 2121,2134 ****
  /* XXX the numerical slots should call the reverse operators too;
     but how do they know their type? */
! SLOT1(nb_add, add, PyObject *, O);
! SLOT1(nb_subtract, sub, PyObject *, O);
! SLOT1(nb_multiply, mul, PyObject *, O);
! SLOT1(nb_divide, div, PyObject *, O);
! SLOT1(nb_remainder, mod, PyObject *, O);
! SLOT1(nb_divmod, divmod, PyObject *, O);
! SLOT2(nb_power, pow, PyObject *, PyObject *, OO);
! SLOT0(nb_negative, neg);
! SLOT0(nb_positive, pos);
! SLOT0(nb_absolute, abs);
  
  static int
--- 2121,2134 ----
  /* XXX the numerical slots should call the reverse operators too;
     but how do they know their type? */
! SLOT1(nb_add, add, PyObject *, O)
! SLOT1(nb_subtract, sub, PyObject *, O)
! SLOT1(nb_multiply, mul, PyObject *, O)
! SLOT1(nb_divide, div, PyObject *, O)
! SLOT1(nb_remainder, mod, PyObject *, O)
! SLOT1(nb_divmod, divmod, PyObject *, O)
! SLOT2(nb_power, pow, PyObject *, PyObject *, OO)
! SLOT0(nb_negative, neg)
! SLOT0(nb_positive, pos)
! SLOT0(nb_absolute, abs)
  
  static int
***************
*** 2142,2168 ****
  }
  
! SLOT0(nb_invert, invert);
! SLOT1(nb_lshift, lshift, PyObject *, O);
! SLOT1(nb_rshift, rshift, PyObject *, O);
! SLOT1(nb_and, and, PyObject *, O);
! SLOT1(nb_xor, xor, PyObject *, O);
! SLOT1(nb_or, or, PyObject *, O);
  /* Not coerce() */
! SLOT0(nb_int, int);
! SLOT0(nb_long, long);
! SLOT0(nb_float, float);
! SLOT0(nb_oct, oct);
! SLOT0(nb_hex, hex);
! SLOT1(nb_inplace_add, iadd, PyObject *, O);
! SLOT1(nb_inplace_subtract, isub, PyObject *, O);
! SLOT1(nb_inplace_multiply, imul, PyObject *, O);
! SLOT1(nb_inplace_divide, idiv, PyObject *, O);
! SLOT1(nb_inplace_remainder, imod, PyObject *, O);
! SLOT2(nb_inplace_power, ipow, PyObject *, PyObject *, OO);
! SLOT1(nb_inplace_lshift, ilshift, PyObject *, O);
! SLOT1(nb_inplace_rshift, irshift, PyObject *, O);
! SLOT1(nb_inplace_and, iand, PyObject *, O);
! SLOT1(nb_inplace_xor, ixor, PyObject *, O);
! SLOT1(nb_inplace_or, ior, PyObject *, O);
  
  static int
--- 2142,2168 ----
  }
  
! SLOT0(nb_invert, invert)
! SLOT1(nb_lshift, lshift, PyObject *, O)
! SLOT1(nb_rshift, rshift, PyObject *, O)
! SLOT1(nb_and, and, PyObject *, O)
! SLOT1(nb_xor, xor, PyObject *, O)
! SLOT1(nb_or, or, PyObject *, O)
  /* Not coerce() */
! SLOT0(nb_int, int)
! SLOT0(nb_long, long)
! SLOT0(nb_float, float)
! SLOT0(nb_oct, oct)
! SLOT0(nb_hex, hex)
! SLOT1(nb_inplace_add, iadd, PyObject *, O)
! SLOT1(nb_inplace_subtract, isub, PyObject *, O)
! SLOT1(nb_inplace_multiply, imul, PyObject *, O)
! SLOT1(nb_inplace_divide, idiv, PyObject *, O)
! SLOT1(nb_inplace_remainder, imod, PyObject *, O)
! SLOT2(nb_inplace_power, ipow, PyObject *, PyObject *, OO)
! SLOT1(nb_inplace_lshift, ilshift, PyObject *, O)
! SLOT1(nb_inplace_rshift, irshift, PyObject *, O)
! SLOT1(nb_inplace_and, iand, PyObject *, O)
! SLOT1(nb_inplace_xor, ixor, PyObject *, O)
! SLOT1(nb_inplace_or, ior, PyObject *, O)
  
  static int
***************
*** 2179,2183 ****
  }
  
! SLOT0(tp_repr, repr);
  
  static long
--- 2179,2183 ----
  }
  
! SLOT0(tp_repr, repr)
  
  static long
***************
*** 2208,2212 ****
  }
  
! SLOT0(tp_str, str);
  
  static PyObject *
--- 2208,2212 ----
  }
  
! SLOT0(tp_str, str)
  
  static PyObject *
***************
*** 2272,2276 ****
  }
  
! SLOT0(tp_iter, iter);
  
  static PyObject *
--- 2272,2276 ----
  }
  
! SLOT0(tp_iter, iter)
  
  static PyObject *
***************
*** 2280,2284 ****
  }
  
! SLOT2(tp_descr_get, get, PyObject *, PyObject *, OO);
  
  static int
--- 2280,2284 ----
  }
  
! SLOT2(tp_descr_get, get, PyObject *, PyObject *, OO)
  
  static int