Allow use of Pygments to colorize source code

While GNU Source Highlight is good, it's also difficult to build and
distribute.  For one thing, it needs Boost.  For another, it has an
unusual configuration and installation setup.

Pygments, a Python library, doesn't suffer from these issues, and so I
thought it would be a reasonable fallback.

This patch implements this idea.  GNU Source Highlight is preferred,
but if it is unavailable (or fails), the extension languages are
tried.  This patch also implements support for Pygments.

Something similar could be done for Guile, using:

    https://dthompson.us/projects/guile-syntax-highlight.html

However, I don't know enough about Guile internals to make this
happen, so I have not done it here.

gdb/ChangeLog
2020-01-21  Tom Tromey  <tromey@adacore.com>

	* source-cache.c (source_cache::ensure): Call ext_lang_colorize.
	* python/python.c (python_extension_ops): Update.
	(gdbpy_colorize): New function.
	* python/lib/gdb/__init__.py (colorize): New function.
	* extension.h (ext_lang_colorize): Declare.
	* extension.c (ext_lang_colorize): New function.
	* extension-priv.h (struct extension_language_ops) <colorize>: New
	member.
	* cli/cli-style.c (_initialize_cli_style): Update help text.

Change-Id: I5e21623ee05f1f66baaa6deaeca78b578c031bf4
This commit is contained in:
Tom Tromey 2020-01-03 13:59:27 -07:00
parent b4654b109b
commit f6474de9aa
8 changed files with 150 additions and 4 deletions

View file

@ -149,6 +149,8 @@ static void gdbpy_set_quit_flag (const struct extension_language_defn *);
static int gdbpy_check_quit_flag (const struct extension_language_defn *);
static enum ext_lang_rc gdbpy_before_prompt_hook
(const struct extension_language_defn *, const char *current_gdb_prompt);
static gdb::optional<std::string> gdbpy_colorize
(const std::string &filename, const std::string &contents);
/* The interface between gdb proper and loading of python scripts. */
@ -188,6 +190,8 @@ const struct extension_language_ops python_extension_ops =
gdbpy_before_prompt_hook,
gdbpy_get_matching_xmethod_workers,
gdbpy_colorize,
};
/* Architecture and language to be used in callbacks from
@ -1104,6 +1108,74 @@ gdbpy_before_prompt_hook (const struct extension_language_defn *extlang,
return EXT_LANG_RC_NOP;
}
/* This is the extension_language_ops.colorize "method". */
static gdb::optional<std::string>
gdbpy_colorize (const std::string &filename, const std::string &contents)
{
if (!gdb_python_initialized)
return {};
gdbpy_enter enter_py (get_current_arch (), current_language);
if (gdb_python_module == nullptr
|| !PyObject_HasAttrString (gdb_python_module, "colorize"))
return {};
gdbpy_ref<> hook (PyObject_GetAttrString (gdb_python_module, "colorize"));
if (hook == nullptr)
{
gdbpy_print_stack ();
return {};
}
if (!PyCallable_Check (hook.get ()))
return {};
gdbpy_ref<> fname_arg (PyString_FromString (filename.c_str ()));
if (fname_arg == nullptr)
{
gdbpy_print_stack ();
return {};
}
gdbpy_ref<> contents_arg (PyString_FromString (contents.c_str ()));
if (contents_arg == nullptr)
{
gdbpy_print_stack ();
return {};
}
gdbpy_ref<> result (PyObject_CallFunctionObjArgs (hook.get (),
fname_arg.get (),
contents_arg.get (),
nullptr));
if (result == nullptr)
{
gdbpy_print_stack ();
return {};
}
if (!gdbpy_is_string (result.get ()))
return {};
gdbpy_ref<> unic = python_string_to_unicode (result.get ());
if (unic == nullptr)
{
gdbpy_print_stack ();
return {};
}
gdbpy_ref<> host_str (PyUnicode_AsEncodedString (unic.get (),
host_charset (),
nullptr));
if (host_str == nullptr)
{
gdbpy_print_stack ();
return {};
}
return std::string (PyBytes_AsString (host_str.get ()));
}
/* Printing. */