#include "gdb-events.h"
#include "gdb_assert.h"
#include "top.h" /* For command_loop. */
+#include "exceptions.h"
struct interp
{
&& !current_interpreter->procs->suspend_proc (current_interpreter->
data))
{
- error ("Could not suspend interpreter \"%s\"\n",
+ error (_("Could not suspend interpreter \"%s\"."),
current_interpreter->name);
}
}
interp->inited = 1;
}
- /* Clear out any installed interpreter hooks/event handlers. */
+ /* Clear out any installed interpreter hooks/event handlers. */
clear_interpreter_hooks ();
if (interp->procs->resume_proc != NULL
current_interp_command_loop (void)
{
/* Somewhat messy. For the moment prop up all the old ways of
- selecting the command loop. `command_loop_hook' should be
- deprecated. */
- if (command_loop_hook != NULL)
- command_loop_hook ();
+ selecting the command loop. `deprecated_command_loop_hook'
+ should be deprecated. */
+ if (deprecated_command_loop_hook != NULL)
+ deprecated_command_loop_hook ();
else if (current_interpreter != NULL
&& current_interpreter->procs->command_loop_proc != NULL)
current_interpreter->procs->command_loop_proc (current_interpreter->data);
- else if (event_loop_p)
- cli_command_loop ();
else
- command_loop ();
+ cli_command_loop ();
}
int
return interp->procs->exec_proc != NULL;
}
-int
+struct exception
interp_exec (struct interp *interp, const char *command_str)
{
if (interp->procs->exec_proc != NULL)
{
return interp->procs->exec_proc (interp->data, command_str);
}
- return 0;
+ return exception_none;
}
-/* A convenience routine that nulls out all the
- common command hooks. Use it when removing your interpreter in its
- suspend proc. */
+/* A convenience routine that nulls out all the common command hooks.
+ Use it when removing your interpreter in its suspend proc. */
void
clear_interpreter_hooks (void)
{
- init_ui_hook = 0;
- print_frame_info_listing_hook = 0;
+ deprecated_init_ui_hook = 0;
+ deprecated_print_frame_info_listing_hook = 0;
/*print_frame_more_info_hook = 0; */
- query_hook = 0;
- warning_hook = 0;
- create_breakpoint_hook = 0;
- delete_breakpoint_hook = 0;
- modify_breakpoint_hook = 0;
- interactive_hook = 0;
- registers_changed_hook = 0;
- readline_begin_hook = 0;
- readline_hook = 0;
- readline_end_hook = 0;
- register_changed_hook = 0;
- memory_changed_hook = 0;
- context_hook = 0;
- target_wait_hook = 0;
- call_command_hook = 0;
- error_hook = 0;
- error_begin_hook = 0;
- command_loop_hook = 0;
+ deprecated_query_hook = 0;
+ deprecated_warning_hook = 0;
+ deprecated_create_breakpoint_hook = 0;
+ deprecated_delete_breakpoint_hook = 0;
+ deprecated_modify_breakpoint_hook = 0;
+ deprecated_interactive_hook = 0;
+ deprecated_registers_changed_hook = 0;
+ deprecated_readline_begin_hook = 0;
+ deprecated_readline_hook = 0;
+ deprecated_readline_end_hook = 0;
+ deprecated_register_changed_hook = 0;
+ deprecated_memory_changed_hook = 0;
+ deprecated_context_hook = 0;
+ deprecated_target_wait_hook = 0;
+ deprecated_call_command_hook = 0;
+ deprecated_error_hook = 0;
+ deprecated_error_begin_hook = 0;
+ deprecated_command_loop_hook = 0;
clear_gdb_event_hooks ();
}
-/* This is a lazy init routine, called the first time
- the interpreter module is used. I put it here just in case, but I haven't
- thought of a use for it yet. I will probably bag it soon, since I don't
- think it will be necessary. */
+/* This is a lazy init routine, called the first time the interpreter
+ module is used. I put it here just in case, but I haven't thought
+ of a use for it yet. I will probably bag it soon, since I don't
+ think it will be necessary. */
static void
initialize_interps (void)
{
prules = buildargv (args);
if (prules == NULL)
{
- error ("unable to parse arguments");
+ error (_("unable to parse arguments"));
}
nrules = 0;
}
if (nrules < 2)
- error ("usage: interpreter-exec <interpreter> [ <command> ... ]");
+ error (_("usage: interpreter-exec <interpreter> [ <command> ... ]"));
old_interp = current_interpreter;
interp_to_use = interp_lookup (prules[0]);
if (interp_to_use == NULL)
- error ("Could not find interpreter \"%s\".", prules[0]);
+ error (_("Could not find interpreter \"%s\"."), prules[0]);
/* Temporarily set interpreters quiet */
old_quiet = interp_set_quiet (old_interp, 1);
use_quiet = interp_set_quiet (interp_to_use, 1);
if (!interp_set (interp_to_use))
- error ("Could not switch to interpreter \"%s\".", prules[0]);
+ error (_("Could not switch to interpreter \"%s\"."), prules[0]);
for (i = 1; i < nrules; i++)
{
- if (!interp_exec (interp_to_use, prules[i]))
+ struct exception e = interp_exec (interp_to_use, prules[i]);
+ if (e.reason < 0)
{
interp_set (old_interp);
interp_set_quiet (interp_to_use, old_quiet);
- error ("error in command: \"%s\".", prules[i]);
+ error (_("error in command: \"%s\"."), prules[i]);
break;
}
}