/* Python pretty-printing
- Copyright (C) 2008-2019 Free Software Foundation, Inc.
+ Copyright (C) 2008-2022 Free Software Foundation, Inc.
This file is part of GDB.
#include "extension-priv.h"
#include "python.h"
#include "python-internal.h"
+#include "cli/cli-style.h"
/* Return type of print_string_repr. */
gdbpy_ref<> result;
*out_value = NULL;
- TRY
+ try
{
if (!PyObject_HasAttr (printer, gdbpy_to_string_cst))
result = gdbpy_ref<>::new_reference (Py_None);
}
}
}
- CATCH (except, RETURN_MASK_ALL)
+ catch (const gdb_exception &except)
{
}
- END_CATCH
return result;
}
gdb::unique_xmalloc_ptr<char> msg = fetched_error.to_string ();
if (msg == NULL || *msg == '\0')
- fprintf_filtered (stream, _("<error reading variable>"));
+ fprintf_styled (stream, metadata_style.style (),
+ _("<error reading variable>"));
else
- fprintf_filtered (stream, _("<error reading variable: %s>"),
- msg.get ());
+ fprintf_styled (stream, metadata_style.style (),
+ _("<error reading variable: %s>"), msg.get ());
}
else
gdbpy_print_stack ();
long length;
struct type *type;
-#ifdef IS_PY3K
output = PyBytes_AS_STRING (string.get ());
length = PyBytes_GET_SIZE (string.get ());
-#else
- output = PyString_AsString (string.get ());
- length = PyString_Size (string.get ());
-#endif
type = builtin_type (gdbarch)->builtin_char;
if (hint && !strcmp (hint, "string"))
- LA_PRINT_STRING (stream, type, (gdb_byte *) output,
- length, NULL, 0, options);
+ language->printstr (stream, type, (gdb_byte *) output,
+ length, NULL, 0, options);
else
- fputs_filtered (output, stream);
+ gdb_puts (output, stream);
}
else
{
return result;
}
-#ifndef IS_PY3K
-
-/* Create a dummy PyFrameObject, needed to work around
- a Python-2.4 bug with generators. */
-class dummy_python_frame
-{
- public:
-
- dummy_python_frame ();
-
- ~dummy_python_frame ()
- {
- if (m_valid)
- m_tstate->frame = m_saved_frame;
- }
-
- bool failed () const
- {
- return !m_valid;
- }
-
- private:
-
- bool m_valid;
- PyFrameObject *m_saved_frame;
- gdbpy_ref<> m_frame;
- PyThreadState *m_tstate;
-};
-
-dummy_python_frame::dummy_python_frame ()
-: m_valid (false),
- m_saved_frame (NULL),
- m_tstate (NULL)
-{
- PyCodeObject *code;
- PyFrameObject *frame;
-
- gdbpy_ref<> empty_string (PyString_FromString (""));
- if (empty_string == NULL)
- return;
-
- gdbpy_ref<> null_tuple (PyTuple_New (0));
- if (null_tuple == NULL)
- return;
-
- code = PyCode_New (0, /* argcount */
- 0, /* locals */
- 0, /* stacksize */
- 0, /* flags */
- empty_string.get (), /* code */
- null_tuple.get (), /* consts */
- null_tuple.get (), /* names */
- null_tuple.get (), /* varnames */
-#if PYTHON_API_VERSION >= 1010
- null_tuple.get (), /* freevars */
- null_tuple.get (), /* cellvars */
-#endif
- empty_string.get (), /* filename */
- empty_string.get (), /* name */
- 1, /* firstlineno */
- empty_string.get () /* lnotab */
- );
- if (code == NULL)
- return;
- gdbpy_ref<> code_holder ((PyObject *) code);
-
- gdbpy_ref<> globals (PyDict_New ());
- if (globals == NULL)
- return;
-
- m_tstate = PyThreadState_GET ();
- frame = PyFrame_New (m_tstate, code, globals.get (), NULL);
- if (frame == NULL)
- return;
-
- m_frame.reset ((PyObject *) frame);
- m_tstate->frame = frame;
- m_saved_frame = frame->f_back;
- m_valid = true;
-}
-#endif
-
/* Helper for gdbpy_apply_val_pretty_printer that formats children of the
printer, if any exist. If is_py_none is true, then nothing has
been printed by to_string, and format output accordingly. */
pretty = options->prettyformat_structs;
}
- /* Manufacture a dummy Python frame to work around Python 2.4 bug,
- where it insists on having a non-NULL tstate->frame when
- a generator is called. */
-#ifndef IS_PY3K
- dummy_python_frame frame;
- if (frame.failed ())
- {
- gdbpy_print_stack ();
- return;
- }
-#endif
-
done_flag = 0;
for (i = 0; i < options->print_max; ++i)
{
/* The user won't necessarily get a stack trace here, so provide
more context. */
if (gdbpy_print_python_errors_p ())
- fprintf_unfiltered (gdb_stderr,
- _("Bad result from children iterator.\n"));
+ gdb_printf (gdb_stderr,
+ _("Bad result from children iterator.\n"));
gdbpy_print_stack ();
continue;
}
- /* Print initial "{". For other elements, there are three
- cases:
+ /* Print initial "=" to separate print_string_repr output and
+ children. For other elements, there are three cases:
1. Maps. Print a "," after each value element.
2. Arrays. Always print a ",".
3. Other. Always print a ",". */
if (i == 0)
{
- if (is_py_none)
- fputs_filtered ("{", stream);
- else
- fputs_filtered (" = {", stream);
- }
-
+ if (!is_py_none)
+ gdb_puts (" = ", stream);
+ }
else if (! is_map || i % 2 == 0)
- fputs_filtered (pretty ? "," : ", ", stream);
+ gdb_puts (pretty ? "," : ", ", stream);
+
+ /* Skip printing children if max_depth has been reached. This check
+ is performed after print_string_repr and the "=" separator so that
+ these steps are not skipped if the variable is located within the
+ permitted depth. */
+ if (val_print_check_max_depth (stream, recurse, options, language))
+ return;
+ else if (i == 0)
+ /* Print initial "{" to bookend children. */
+ gdb_puts ("{", stream);
/* In summary mode, we just want to print "= {...}" if there is
a value. */
{
if (pretty)
{
- fputs_filtered ("\n", stream);
- print_spaces_filtered (2 + 2 * recurse, stream);
+ gdb_puts ("\n", stream);
+ print_spaces (2 + 2 * recurse, stream);
}
else
- wrap_here (n_spaces (2 + 2 *recurse));
+ stream->wrap_here (2 + 2 *recurse);
}
if (is_map && i % 2 == 0)
- fputs_filtered ("[", stream);
+ gdb_puts ("[", stream);
else if (is_array)
{
/* We print the index, not whatever the child method
returned as the name. */
if (options->print_array_indexes)
- fprintf_filtered (stream, "[%d] = ", i);
+ gdb_printf (stream, "[%d] = ", i);
}
else if (! is_map)
{
- fputs_filtered (name, stream);
- fputs_filtered (" = ", stream);
+ gdb_puts (name, stream);
+ gdb_puts (" = ", stream);
}
if (gdbpy_is_lazy_string (py_v))
if (!output)
gdbpy_print_stack ();
else
- fputs_filtered (output.get (), stream);
+ gdb_puts (output.get (), stream);
}
else
{
error (_("Error while executing Python code."));
}
else
- common_val_print (value, stream, recurse + 1, options, language);
+ {
+ /* When printing the key of a map we allow one additional
+ level of depth. This means the key will print before the
+ value does. */
+ struct value_print_options opt = *options;
+ if (is_map && i % 2 == 0
+ && opt.max_depth != -1
+ && opt.max_depth < INT_MAX)
+ ++opt.max_depth;
+ common_val_print (value, stream, recurse + 1, &opt, language);
+ }
}
if (is_map && i % 2 == 0)
- fputs_filtered ("] = ", stream);
+ gdb_puts ("] = ", stream);
}
if (i)
{
if (pretty)
{
- fputs_filtered ("\n", stream);
- print_spaces_filtered (2 + 2 * recurse, stream);
+ gdb_puts ("\n", stream);
+ print_spaces (2 + 2 * recurse, stream);
}
- fputs_filtered ("...", stream);
+ gdb_puts ("...", stream);
}
if (pretty)
{
- fputs_filtered ("\n", stream);
- print_spaces_filtered (2 * recurse, stream);
+ gdb_puts ("\n", stream);
+ print_spaces (2 * recurse, stream);
}
- fputs_filtered ("}", stream);
+ gdb_puts ("}", stream);
}
}
enum ext_lang_rc
gdbpy_apply_val_pretty_printer (const struct extension_language_defn *extlang,
- struct type *type,
- LONGEST embedded_offset, CORE_ADDR address,
+ struct value *value,
struct ui_file *stream, int recurse,
- struct value *val,
const struct value_print_options *options,
const struct language_defn *language)
{
- struct gdbarch *gdbarch = get_type_arch (type);
- struct value *value;
+ struct type *type = value_type (value);
+ struct gdbarch *gdbarch = type->arch ();
enum string_repr_result print_result;
- if (value_lazy (val))
- value_fetch_lazy (val);
+ if (value_lazy (value))
+ value_fetch_lazy (value);
/* No pretty-printer support for unavailable values. */
- if (!value_bytes_available (val, embedded_offset, TYPE_LENGTH (type)))
+ if (!value_bytes_available (value, 0, TYPE_LENGTH (type)))
return EXT_LANG_RC_NOP;
if (!gdb_python_initialized)
gdbpy_enter enter_py (gdbarch, language);
- /* Instantiate the printer. */
- value = value_from_component (val, type, embedded_offset);
-
- gdbpy_ref<> val_obj (value_to_value_object (value));
+ gdbpy_ref<> val_obj (value_to_value_object_no_release (value));
if (val_obj == NULL)
{
print_stack_unless_memory_error (stream);
gdbpy_ref<>
gdbpy_get_varobj_pretty_printer (struct value *value)
{
- TRY
+ try
{
value = value_copy (value);
}
- CATCH (except, RETURN_MASK_ALL)
+ catch (const gdb_exception &except)
{
GDB_PY_HANDLE_EXCEPTION (except);
}
- END_CATCH
gdbpy_ref<> val_obj (value_to_value_object (value));
if (val_obj == NULL)