To: vim_dev@googlegroups.com

Subject: Patch 7.3.992

Fcc: outbox

From: Bram Moolenaar <Bram@moolenaar.net>

Mime-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

------------

Patch 7.3.992

Problem:    Python: Too many type casts.

Solution:   Change argument types. (ZyX)

Files:	    src/if_py_both.h, src/if_python3.c, src/if_python.c

*** ../vim-7.3.991/src/if_py_both.h	2013-05-21 18:19:33.000000000 +0200

--- src/if_py_both.h	2013-05-21 18:22:03.000000000 +0200

***************

*** 76,82 ****

  } OutputObject;

      static int

! OutputSetattr(PyObject *self, char *name, PyObject *val)

  {

      if (val == NULL)

      {

--- 76,82 ----

  } OutputObject;

      static int

! OutputSetattr(OutputObject *self, char *name, PyObject *val)

  {

      if (val == NULL)

      {

***************

*** 93,99 ****

  	    return -1;

  	}

! 	((OutputObject *)(self))->softspace = PyInt_AsLong(val);

  	return 0;

      }

--- 93,99 ----

  	    return -1;

  	}

! 	self->softspace = PyInt_AsLong(val);

  	return 0;

      }

***************

*** 152,162 ****

  }

      static PyObject *

! OutputWrite(PyObject *self, PyObject *args)

  {

      Py_ssize_t len = 0;

      char *str = NULL;

!     int error = ((OutputObject *)(self))->error;

      if (!PyArg_ParseTuple(args, "et#", ENC_OPT, &str, &len))

  	return NULL;

--- 152,162 ----

  }

      static PyObject *

! OutputWrite(OutputObject *self, PyObject *args)

  {

      Py_ssize_t len = 0;

      char *str = NULL;

!     int error = self->error;

      if (!PyArg_ParseTuple(args, "et#", ENC_OPT, &str, &len))

  	return NULL;

***************

*** 173,184 ****

  }

      static PyObject *

! OutputWritelines(PyObject *self, PyObject *args)

  {

      PyInt n;

      PyInt i;

      PyObject *list;

!     int error = ((OutputObject *)(self))->error;

      if (!PyArg_ParseTuple(args, "O", &list))

  	return NULL;

--- 173,184 ----

  }

      static PyObject *

! OutputWritelines(OutputObject *self, PyObject *args)

  {

      PyInt n;

      PyInt i;

      PyObject *list;

!     int error = self->error;

      if (!PyArg_ParseTuple(args, "O", &list))

  	return NULL;

***************

*** 220,226 ****

  }

      static PyObject *

! OutputFlush(PyObject *self UNUSED, PyObject *args UNUSED)

  {

      /* do nothing */

      Py_INCREF(Py_None);

--- 220,226 ----

  }

      static PyObject *

! OutputFlush(PyObject *self UNUSED)

  {

      /* do nothing */

      Py_INCREF(Py_None);

***************

*** 230,240 ****

  /***************/

  static struct PyMethodDef OutputMethods[] = {

!     /* name,	    function,		calling,    documentation */

!     {"write",	    OutputWrite,	1,	    ""},

!     {"writelines",  OutputWritelines,	1,	    ""},

!     {"flush",	    OutputFlush,	1,	    ""},

!     { NULL,	    NULL,		0,	    NULL}

  };

  static OutputObject Output =

--- 230,240 ----

  /***************/

  static struct PyMethodDef OutputMethods[] = {

!     /* name,	    function,				calling,	doc */

!     {"write",	    (PyCFunction)OutputWrite,		METH_VARARGS,	""},

!     {"writelines",  (PyCFunction)OutputWritelines,	METH_VARARGS,	""},

!     {"flush",	    (PyCFunction)OutputFlush,		METH_NOARGS,	""},

!     { NULL,	    NULL,				0,		NULL}

  };

  static OutputObject Output =

***************

*** 533,544 ****

   */

  static struct PyMethodDef VimMethods[] = {

!     /* name,	     function,		calling,    documentation */

!     {"command",	     VimCommand,	1,	    "Execute a Vim ex-mode command" },

!     {"eval",	     VimEval,		1,	    "Evaluate an expression using Vim evaluator" },

!     {"bindeval",     VimEvalPy,		1,	    "Like eval(), but returns objects attached to vim ones"},

!     {"strwidth",     VimStrwidth,	1,	    "Screen string width, counts <Tab> as having width 1"},

!     { NULL,	     NULL,		0,	    NULL }

  };

  /*

--- 533,544 ----

   */

  static struct PyMethodDef VimMethods[] = {

!     /* name,	     function,		calling,	documentation */

!     {"command",	     VimCommand,	METH_VARARGS,	"Execute a Vim ex-mode command" },

!     {"eval",	     VimEval,		METH_VARARGS,	"Evaluate an expression using Vim evaluator" },

!     {"bindeval",     VimEvalPy,		METH_VARARGS,	"Like eval(), but returns objects attached to vim ones"},

!     {"strwidth",     VimStrwidth,	METH_VARARGS,	"Screen string width, counts <Tab> as having width 1"},

!     { NULL,	     NULL,		0,		NULL }

  };

  /*

***************

*** 583,604 ****

  }

      static void

! IterDestructor(PyObject *self)

  {

!     IterObject *this = (IterObject *)(self);

! 

!     this->destruct(this->cur);

      DESTRUCTOR_FINISH(self);

  }

      static int

! IterTraverse(PyObject *self, visitproc visit, void *arg)

  {

!     IterObject *this = (IterObject *)(self);

! 

!     if (this->traverse != NULL)

! 	return this->traverse(this->cur, visit, arg);

      else

  	return 0;

  }

--- 583,600 ----

  }

      static void

! IterDestructor(IterObject *self)

  {

!     self->destruct(self->cur);

      DESTRUCTOR_FINISH(self);

  }

      static int

! IterTraverse(IterObject *self, visitproc visit, void *arg)

  {

!     if (self->traverse != NULL)

! 	return self->traverse(self->cur, visit, arg);

      else

  	return 0;

  }

***************

*** 609,630 ****

  #endif

      static int

! IterClear(PyObject *self)

  {

!     IterObject *this = (IterObject *)(self);

! 

!     if (this->clear != NULL)

! 	return this->clear(&this->cur);

      else

  	return 0;

  }

      static PyObject *

! IterNext(PyObject *self)

  {

!     IterObject *this = (IterObject *)(self);

! 

!     return this->next(&this->cur);

  }

      static PyObject *

--- 605,622 ----

  #endif

      static int

! IterClear(IterObject *self)

  {

!     if (self->clear != NULL)

! 	return self->clear(&self->cur);

      else

  	return 0;

  }

      static PyObject *

! IterNext(IterObject *self)

  {

!     return self->next(&self->cur);

  }

      static PyObject *

***************

*** 711,731 ****

  }

      static void

! DictionaryDestructor(PyObject *self)

  {

!     DictionaryObject	*this = ((DictionaryObject *) (self));

! 

!     pyll_remove(&this->ref, &lastdict);

!     dict_unref(this->dict);

      DESTRUCTOR_FINISH(self);

  }

      static int

! DictionarySetattr(PyObject *self, char *name, PyObject *val)

  {

-     DictionaryObject *this = (DictionaryObject *)(self);

- 

      if (val == NULL)

      {

  	PyErr_SetString(PyExc_AttributeError, _("Cannot delete DictionaryObject attributes"));

--- 703,719 ----

  }

      static void

! DictionaryDestructor(DictionaryObject *self)

  {

!     pyll_remove(&self->ref, &lastdict);

!     dict_unref(self->dict);

      DESTRUCTOR_FINISH(self);

  }

      static int

! DictionarySetattr(DictionaryObject *self, char *name, PyObject *val)

  {

      if (val == NULL)

      {

  	PyErr_SetString(PyExc_AttributeError, _("Cannot delete DictionaryObject attributes"));

***************

*** 734,740 ****

      if (strcmp(name, "locked") == 0)

      {

! 	if (this->dict->dv_lock == VAR_FIXED)

  	{

  	    PyErr_SetString(PyExc_TypeError, _("Cannot modify fixed dictionary"));

  	    return -1;

--- 722,728 ----

      if (strcmp(name, "locked") == 0)

      {

! 	if (self->dict->dv_lock == VAR_FIXED)

  	{

  	    PyErr_SetString(PyExc_TypeError, _("Cannot modify fixed dictionary"));

  	    return -1;

***************

*** 745,753 ****

  	    if (istrue == -1)

  		return -1;

  	    else if (istrue)

! 		this->dict->dv_lock = VAR_LOCKED;

  	    else

! 		this->dict->dv_lock = 0;

  	}

  	return 0;

      }

--- 733,741 ----

  	    if (istrue == -1)

  		return -1;

  	    else if (istrue)

! 		self->dict->dv_lock = VAR_LOCKED;

  	    else

! 		self->dict->dv_lock = 0;

  	}

  	return 0;

      }

***************

*** 759,771 ****

  }

      static PyInt

! DictionaryLength(PyObject *self)

  {

!     return ((PyInt) ((((DictionaryObject *)(self))->dict->dv_hashtab.ht_used)));

  }

      static PyObject *

! DictionaryItem(PyObject *self, PyObject *keyObject)

  {

      char_u	*key;

      dictitem_T	*di;

--- 747,759 ----

  }

      static PyInt

! DictionaryLength(DictionaryObject *self)

  {

!     return ((PyInt) (self->dict->dv_hashtab.ht_used));

  }

      static PyObject *

! DictionaryItem(DictionaryObject *self, PyObject *keyObject)

  {

      char_u	*key;

      dictitem_T	*di;

***************

*** 773,779 ****

      DICTKEY_GET_NOTEMPTY(NULL)

!     di = dict_find(((DictionaryObject *) (self))->dict, key, -1);

      DICTKEY_UNREF

--- 761,767 ----

      DICTKEY_GET_NOTEMPTY(NULL)

!     di = dict_find(self->dict, key, -1);

      DICTKEY_UNREF

***************

*** 787,797 ****

  }

      static PyInt

! DictionaryAssItem(PyObject *self, PyObject *keyObject, PyObject *valObject)

  {

      char_u	*key;

      typval_T	tv;

!     dict_T	*d = ((DictionaryObject *)(self))->dict;

      dictitem_T	*di;

      DICTKEY_DECL

--- 775,785 ----

  }

      static PyInt

! DictionaryAssItem(DictionaryObject *self, PyObject *keyObject, PyObject *valObject)

  {

      char_u	*key;

      typval_T	tv;

!     dict_T	*d = self->dict;

      dictitem_T	*di;

      DICTKEY_DECL

***************

*** 852,860 ****

  }

      static PyObject *

! DictionaryListKeys(PyObject *self UNUSED)

  {

!     dict_T	*dict = ((DictionaryObject *)(self))->dict;

      long_u	todo = dict->dv_hashtab.ht_used;

      Py_ssize_t	i = 0;

      PyObject	*r;

--- 840,848 ----

  }

      static PyObject *

! DictionaryListKeys(DictionaryObject *self)

  {

!     dict_T	*dict = self->dict;

      long_u	todo = dict->dv_hashtab.ht_used;

      Py_ssize_t	i = 0;

      PyObject	*r;

***************

*** 880,887 ****

  };

  static struct PyMethodDef DictionaryMethods[] = {

!     {"keys", (PyCFunction)DictionaryListKeys, METH_NOARGS, ""},

!     { NULL,	    NULL,		0,	    NULL }

  };

  static PyTypeObject ListType;

--- 868,875 ----

  };

  static struct PyMethodDef DictionaryMethods[] = {

!     {"keys",	(PyCFunction)DictionaryListKeys,	METH_NOARGS,	""},

!     { NULL,	NULL,					0,		NULL }

  };

  static PyTypeObject ListType;

***************

*** 912,923 ****

  }

      static void

! ListDestructor(PyObject *self)

  {

!     ListObject *this = (ListObject *)(self);

! 

!     pyll_remove(&this->ref, &lastlist);

!     list_unref(this->list);

      DESTRUCTOR_FINISH(self);

  }

--- 900,909 ----

  }

      static void

! ListDestructor(ListObject *self)

  {

!     pyll_remove(&self->ref, &lastlist);

!     list_unref(self->list);

      DESTRUCTOR_FINISH(self);

  }

***************

*** 952,973 ****

  }

      static PyInt

! ListLength(PyObject *self)

  {

!     return ((PyInt) (((ListObject *) (self))->list->lv_len));

  }

      static PyObject *

! ListItem(PyObject *self, Py_ssize_t index)

  {

      listitem_T	*li;

!     if (index>=ListLength(self))

      {

  	PyErr_SetString(PyExc_IndexError, _("list index out of range"));

  	return NULL;

      }

!     li = list_find(((ListObject *) (self))->list, (long) index);

      if (li == NULL)

      {

  	PyErr_SetVim(_("internal error: failed to get vim list item"));

--- 938,959 ----

  }

      static PyInt

! ListLength(ListObject *self)

  {

!     return ((PyInt) (self->list->lv_len));

  }

      static PyObject *

! ListItem(ListObject *self, Py_ssize_t index)

  {

      listitem_T	*li;

!     if (index >= ListLength(self))

      {

  	PyErr_SetString(PyExc_IndexError, _("list index out of range"));

  	return NULL;

      }

!     li = list_find(self->list, (long) index);

      if (li == NULL)

      {

  	PyErr_SetVim(_("internal error: failed to get vim list item"));

***************

*** 991,997 ****

  	last = size;

      static PyObject *

! ListSlice(PyObject *self, Py_ssize_t first, Py_ssize_t last)

  {

      PyInt	i;

      PyInt	size = ListLength(self);

--- 977,983 ----

  	last = size;

      static PyObject *

! ListSlice(ListObject *self, Py_ssize_t first, Py_ssize_t last)

  {

      PyInt	i;

      PyInt	size = ListLength(self);

***************

*** 1058,1067 ****

  }

      static PyObject *

! ListIter(PyObject *self)

  {

      listiterinfo_T	*lii;

!     list_T	*l = ((ListObject *) (self))->list;

      if (!(lii = PyMem_New(listiterinfo_T, 1)))

      {

--- 1044,1053 ----

  }

      static PyObject *

! ListIter(ListObject *self)

  {

      listiterinfo_T	*lii;

!     list_T	*l = self->list;

      if (!(lii = PyMem_New(listiterinfo_T, 1)))

      {

***************

*** 1079,1088 ****

  }

      static int

! ListAssItem(PyObject *self, Py_ssize_t index, PyObject *obj)

  {

      typval_T	tv;

!     list_T	*l = ((ListObject *) (self))->list;

      listitem_T	*li;

      Py_ssize_t	length = ListLength(self);

--- 1065,1074 ----

  }

      static int

! ListAssItem(ListObject *self, Py_ssize_t index, PyObject *obj)

  {

      typval_T	tv;

!     list_T	*l = self->list;

      listitem_T	*li;

      Py_ssize_t	length = ListLength(self);

***************

*** 1127,1133 ****

  }

      static int

! ListAssSlice(PyObject *self, Py_ssize_t first, Py_ssize_t last, PyObject *obj)

  {

      PyInt	size = ListLength(self);

      Py_ssize_t	i;

--- 1113,1119 ----

  }

      static int

! ListAssSlice(ListObject *self, Py_ssize_t first, Py_ssize_t last, PyObject *obj)

  {

      PyInt	size = ListLength(self);

      Py_ssize_t	i;

***************

*** 1136,1142 ****

      listitem_T	*li;

      listitem_T	*next;

      typval_T	v;

!     list_T	*l = ((ListObject *) (self))->list;

      if (l->lv_lock)

      {

--- 1122,1128 ----

      listitem_T	*li;

      listitem_T	*next;

      typval_T	v;

!     list_T	*l = self->list;

      if (l->lv_lock)

      {

***************

*** 1196,1204 ****

  }

      static PyObject *

! ListConcatInPlace(PyObject *self, PyObject *obj)

  {

!     list_T	*l = ((ListObject *) (self))->list;

      PyObject	*lookup_dict;

      if (l->lv_lock)

--- 1182,1190 ----

  }

      static PyObject *

! ListConcatInPlace(ListObject *self, PyObject *obj)

  {

!     list_T	*l = self->list;

      PyObject	*lookup_dict;

      if (l->lv_lock)

***************

*** 1222,1235 ****

      Py_DECREF(lookup_dict);

      Py_INCREF(self);

!     return self;

  }

      static int

! ListSetattr(PyObject *self, char *name, PyObject *val)

  {

-     ListObject *this = (ListObject *)(self);

- 

      if (val == NULL)

      {

  	PyErr_SetString(PyExc_AttributeError,

--- 1208,1219 ----

      Py_DECREF(lookup_dict);

      Py_INCREF(self);

!     return (PyObject *)(self);

  }

      static int

! ListSetattr(ListObject *self, char *name, PyObject *val)

  {

      if (val == NULL)

      {

  	PyErr_SetString(PyExc_AttributeError,

***************

*** 1239,1245 ****

      if (strcmp(name, "locked") == 0)

      {

! 	if (this->list->lv_lock == VAR_FIXED)

  	{

  	    PyErr_SetString(PyExc_TypeError, _("cannot modify fixed list"));

  	    return -1;

--- 1223,1229 ----

      if (strcmp(name, "locked") == 0)

      {

! 	if (self->list->lv_lock == VAR_FIXED)

  	{

  	    PyErr_SetString(PyExc_TypeError, _("cannot modify fixed list"));

  	    return -1;

***************

*** 1250,1258 ****

  	    if (istrue == -1)

  		return -1;

  	    else if (istrue)

! 		this->list->lv_lock = VAR_LOCKED;

  	    else

! 		this->list->lv_lock = 0;

  	}

  	return 0;

      }

--- 1234,1242 ----

  	    if (istrue == -1)

  		return -1;

  	    else if (istrue)

! 		self->list->lv_lock = VAR_LOCKED;

  	    else

! 		self->list->lv_lock = 0;

  	}

  	return 0;

      }

***************

*** 1264,1271 ****

  }

  static struct PyMethodDef ListMethods[] = {

!     {"extend", (PyCFunction)ListConcatInPlace, METH_O, ""},

!     { NULL,	    NULL,		0,	    NULL }

  };

  typedef struct

--- 1248,1255 ----

  }

  static struct PyMethodDef ListMethods[] = {

!     {"extend",	(PyCFunction)ListConcatInPlace,	METH_O,	""},

!     { NULL,	NULL,				0,	NULL }

  };

  typedef struct

***************

*** 1296,1316 ****

  }

      static void

! FunctionDestructor(PyObject *self)

  {

!     FunctionObject	*this = (FunctionObject *) (self);

! 

!     func_unref(this->name);

!     PyMem_Free(this->name);

      DESTRUCTOR_FINISH(self);

  }

      static PyObject *

! FunctionCall(PyObject *self, PyObject *argsObject, PyObject *kwargs)

  {

!     FunctionObject	*this = (FunctionObject *)(self);

!     char_u	*name = this->name;

      typval_T	args;

      typval_T	selfdicttv;

      typval_T	rettv;

--- 1280,1297 ----

  }

      static void

! FunctionDestructor(FunctionObject *self)

  {

!     func_unref(self->name);

!     PyMem_Free(self->name);

      DESTRUCTOR_FINISH(self);

  }

      static PyObject *

! FunctionCall(FunctionObject *self, PyObject *argsObject, PyObject *kwargs)

  {

!     char_u	*name = self->name;

      typval_T	args;

      typval_T	selfdicttv;

      typval_T	rettv;

***************

*** 1368,1375 ****

  }

  static struct PyMethodDef FunctionMethods[] = {

!     {"__call__",    (PyCFunction)FunctionCall, METH_VARARGS|METH_KEYWORDS, ""},

!     { NULL,	    NULL,		0,	    NULL }

  };

  /*

--- 1349,1356 ----

  }

  static struct PyMethodDef FunctionMethods[] = {

!     {"__call__",    (PyCFunction)FunctionCall,	METH_VARARGS|METH_KEYWORDS, ""},

!     { NULL,	    NULL,			0,			   NULL}

  };

  /*

***************

*** 1415,1443 ****

  }

      static void

! OptionsDestructor(PyObject *self)

  {

!     if (((OptionsObject *)(self))->fromObj)

! 	Py_DECREF(((OptionsObject *)(self))->fromObj);

      DESTRUCTOR_FINISH(self);

  }

      static int

! OptionsTraverse(PyObject *self, visitproc visit, void *arg)

  {

!     Py_VISIT(((OptionsObject *)(self))->fromObj);

      return 0;

  }

      static int

! OptionsClear(PyObject *self)

  {

!     Py_CLEAR(((OptionsObject *)(self))->fromObj);

      return 0;

  }

      static PyObject *

! OptionsItem(OptionsObject *this, PyObject *keyObject)

  {

      char_u	*key;

      int		flags;

--- 1396,1424 ----

  }

      static void

! OptionsDestructor(OptionsObject *self)

  {

!     if (self->fromObj)

! 	Py_DECREF(self->fromObj);

      DESTRUCTOR_FINISH(self);

  }

      static int

! OptionsTraverse(OptionsObject *self, visitproc visit, void *arg)

  {

!     Py_VISIT(self->fromObj);

      return 0;

  }

      static int

! OptionsClear(OptionsObject *self)

  {

!     Py_CLEAR(self->fromObj);

      return 0;

  }

      static PyObject *

! OptionsItem(OptionsObject *self, PyObject *keyObject)

  {

      char_u	*key;

      int		flags;

***************

*** 1445,1457 ****

      char_u	*stringval;

      DICTKEY_DECL

!     if (this->Check(this->from))

  	return NULL;

      DICTKEY_GET_NOTEMPTY(NULL)

      flags = get_option_value_strict(key, &numval, &stringval,

! 				    this->opt_type, this->from);

      DICTKEY_UNREF

--- 1426,1438 ----

      char_u	*stringval;

      DICTKEY_DECL

!     if (self->Check(self->from))

  	return NULL;

      DICTKEY_GET_NOTEMPTY(NULL)

      flags = get_option_value_strict(key, &numval, &stringval,

! 				    self->opt_type, self->from);

      DICTKEY_UNREF

***************

*** 1532,1538 ****

  }