From 5172aecbd2b65e71aedbd21c46253ca6a20227aa Mon Sep 17 00:00:00 2001 From: Joel Brobecker Date: Wed, 9 Sep 2009 17:45:42 +0000 Subject: Checking in this patch for Thiago: Rename python-* files into py-*, more 8+3 friendly. gdb/ * Makefile.in (py-cmd.o): Renamed from python-cmd.o. Updated references. (py-frame.o): Renamed from python-frame.o. Updated references. (py-function.o): Renamed from python-function.o. Updated references. (py-objfile.o): Renamed from python-objfile.o. Updated references. (py-prettyprint.o): Renamed from python-prettyprint.o. Updated +references. (py-type.o): Renamed from python-type.o. Updated references. (py-utils.o): Renamed from python-utils.o. Updated references. (py-value.o): Renamed from python-value.o. Updated references. * py-cmd.o: Renamed from python-cmd.o. * py-frame.o: Renamed from python-frame.o. * py-function.o: Renamed from python-function.o. * py-objfile.o: Renamed from python-objfile.o. * py-prettyprint.o: Renamed from python-prettyprint.o. * py-type.o: Renamed from python-type.o. * py-utils.o: Renamed from python-utils.o. * py-value.o: Renamed from python-value.o. gdb/testsuite/ * gdb.python/Makefile.in (EXECUTABLES): Adjust to new executable names, add missing ones. * gdb.python/py-cmd.exp: Rename from python-cmd.exp. * gdb.python/py-frame.c: Rename from python-frame.c. * gdb.python/py-frame.exp: Rename from python-frame.exp. Adjust testfile name. * gdb.python/py-function.exp: Rename from python-function.exp. * gdb.python/py-mi.exp: Rename from python-mi.exp. Adjust testfile name. * gdb.python/py-prettyprint.c: Rename from python-prettyprint.c. * gdb.python/py-prettyprint.exp: Rename from python-prettyprint.exp. Adjust testfile name. * gdb.python/py-prettyprint.py: Rename from python-prettyprint.py. * gdb.python/py-template.cc: Rename from python-template.cc. * gdb.python/py-template.exp: Rename from python-template.exp. Adjust testfile name. * gdb.python/py-value.c: Rename from python-value.c. * gdb.python/py-value.exp: Rename from python-value.exp. Adjust testfile name. --- gdb/python/python-function.c | 180 ------------------------------------------- 1 file changed, 180 deletions(-) delete mode 100644 gdb/python/python-function.c (limited to 'gdb/python/python-function.c') diff --git a/gdb/python/python-function.c b/gdb/python/python-function.c deleted file mode 100644 index 8a5abaf..0000000 --- a/gdb/python/python-function.c +++ /dev/null @@ -1,180 +0,0 @@ -/* Convenience functions implemented in Python. - - Copyright (C) 2008, 2009 Free Software Foundation, Inc. - - This file is part of GDB. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . */ - - -#include "defs.h" -#include "value.h" -#include "exceptions.h" -#include "python-internal.h" -#include "charset.h" -#include "gdbcmd.h" -#include "cli/cli-decode.h" -#include "completer.h" -#include "expression.h" -#include "language.h" - -static PyTypeObject fnpy_object_type; - - - -static PyObject * -convert_values_to_python (int argc, struct value **argv) -{ - int i; - PyObject *result = PyTuple_New (argc); - for (i = 0; i < argc; ++i) - { - PyObject *elt = value_to_value_object (argv[i]); - if (! elt) - { - Py_DECREF (result); - error (_("Could not convert value to Python object.")); - } - PyTuple_SetItem (result, i, elt); - } - return result; -} - -/* Call a Python function object's invoke method. */ - -static struct value * -fnpy_call (struct gdbarch *gdbarch, const struct language_defn *language, - void *cookie, int argc, struct value **argv) -{ - int i; - struct value *value = NULL; - PyObject *result, *callable, *args; - struct cleanup *cleanup; - - cleanup = ensure_python_env (gdbarch, language); - - args = convert_values_to_python (argc, argv); - - callable = PyObject_GetAttrString ((PyObject *) cookie, "invoke"); - if (! callable) - { - Py_DECREF (args); - error (_("No method named 'invoke' in object.")); - } - - result = PyObject_Call (callable, args, NULL); - Py_DECREF (callable); - Py_DECREF (args); - - if (!result) - { - gdbpy_print_stack (); - error (_("Error while executing Python code.")); - } - - value = convert_value_from_python (result); - if (value == NULL) - { - Py_DECREF (result); - gdbpy_print_stack (); - error (_("Error while executing Python code.")); - } - - Py_DECREF (result); - do_cleanups (cleanup); - - return value; -} - -/* Initializer for a Function object. It takes one argument, the name - of the function. */ - -static int -fnpy_init (PyObject *self, PyObject *args, PyObject *kwds) -{ - char *name, *docstring = NULL; - if (! PyArg_ParseTuple (args, "s", &name)) - return -1; - Py_INCREF (self); - - if (PyObject_HasAttrString (self, "__doc__")) - { - PyObject *ds_obj = PyObject_GetAttrString (self, "__doc__"); - if (ds_obj && gdbpy_is_string (ds_obj)) - /* Nothing ever frees this. */ - docstring = python_string_to_host_string (ds_obj); - } - if (! docstring) - docstring = _("This function is not documented."); - - add_internal_function (name, docstring, fnpy_call, self); - return 0; -} - -/* Initialize internal function support. */ - -void -gdbpy_initialize_functions (void) -{ - if (PyType_Ready (&fnpy_object_type) < 0) - return; - - Py_INCREF (&fnpy_object_type); - PyModule_AddObject (gdb_module, "Function", (PyObject *) &fnpy_object_type); -} - - - -static PyTypeObject fnpy_object_type = -{ - PyObject_HEAD_INIT (NULL) - 0, /*ob_size*/ - "gdb.Function", /*tp_name*/ - sizeof (PyObject), /*tp_basicsize*/ - 0, /*tp_itemsize*/ - 0, /*tp_dealloc*/ - 0, /*tp_print*/ - 0, /*tp_getattr*/ - 0, /*tp_setattr*/ - 0, /*tp_compare*/ - 0, /*tp_repr*/ - 0, /*tp_as_number*/ - 0, /*tp_as_sequence*/ - 0, /*tp_as_mapping*/ - 0, /*tp_hash */ - 0, /*tp_call*/ - 0, /*tp_str*/ - 0, /*tp_getattro*/ - 0, /*tp_setattro*/ - 0, /*tp_as_buffer*/ - Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /*tp_flags*/ - "GDB function object", /* tp_doc */ - 0, /* tp_traverse */ - 0, /* tp_clear */ - 0, /* tp_richcompare */ - 0, /* tp_weaklistoffset */ - 0, /* tp_iter */ - 0, /* tp_iternext */ - 0, /* tp_methods */ - 0, /* tp_members */ - 0, /* tp_getset */ - 0, /* tp_base */ - 0, /* tp_dict */ - 0, /* tp_descr_get */ - 0, /* tp_descr_set */ - 0, /* tp_dictoffset */ - fnpy_init, /* tp_init */ - 0, /* tp_alloc */ - PyType_GenericNew /* tp_new */ -}; -- cgit v1.1