/* MI Command Set - varobj commands.
- Copyright (C) 2000, 2002, 2004, 2005, 2007 Free Software Foundation, Inc.
+ Copyright (C) 2000, 2002, 2004, 2005, 2007, 2008
+ Free Software Foundation, Inc.
Contributed by Cygnus Solutions (a Red Hat company).
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 2 of the License, or
+ 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,
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, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "defs.h"
#include "mi-cmds.h"
extern int varobjdebug; /* defined in varobj.c. */
static void varobj_update_one (struct varobj *var,
- enum print_values print_values);
+ enum print_values print_values,
+ int explicit);
static int mi_print_value_p (struct type *type, enum print_values print_values);
print_varobj (struct varobj *var, enum print_values print_values,
int print_expression)
{
+ struct type *gdb_type;
char *type;
ui_out_field_string (uiout, "name", varobj_get_objname (var));
ui_out_field_string (uiout, "type", type);
xfree (type);
}
+
+ if (varobj_get_frozen (var))
+ ui_out_field_int (uiout, "frozen", 1);
}
/* VAROBJ operations */
mi_cmd_var_delete (char *command, char **argv, int argc)
{
char *name;
- char *expr;
struct varobj *var;
int numdel;
int children_only_p = 0;
which would be the variable name. */
if (argc == 2)
{
- expr = xstrdup (argv[1]);
if (strcmp (name, "-c") != 0)
error (_("mi_cmd_var_delete: Invalid option."));
children_only_p = 1;
- xfree (name);
- name = xstrdup (expr);
- xfree (expr);
+ do_cleanups (old_cleanups);
+ name = xstrdup (argv[1]);
+ make_cleanup (free_current_contents, &name);
}
/* If we didn't error out, now NAME contains the name of the
if (var == NULL)
error (_("mi_cmd_var_set_format: Variable object not found"));
- formspec = xstrdup (argv[1]);
+ formspec = argv[1];
if (formspec == NULL)
error (_("mi_cmd_var_set_format: Must specify the format as: \"natural\", \"binary\", \"decimal\", \"hexadecimal\", or \"octal\""));
return MI_CMD_DONE;
}
+enum mi_cmd_result
+mi_cmd_var_set_frozen (char *command, char **argv, int argc)
+{
+ struct varobj *var;
+ int frozen;
+
+ if (argc != 2)
+ error (_("-var-set-format: Usage: NAME FROZEN_FLAG."));
+
+ var = varobj_get_handle (argv[0]);
+ if (var == NULL)
+ error (_("Variable object not found"));
+
+ if (strcmp (argv[1], "0") == 0)
+ frozen = 0;
+ else if (strcmp (argv[1], "1") == 0)
+ frozen = 1;
+ else
+ error (_("Invalid flag value"));
+
+ varobj_set_frozen (var, frozen);
+
+ /* We don't automatically return the new value, or what varobjs got new
+ values during unfreezing. If this information is required, client
+ should call -var-update explicitly. */
+ return MI_CMD_DONE;
+}
+
+
enum mi_cmd_result
mi_cmd_var_show_format (char *command, char **argv, int argc)
{
static int
mi_print_value_p (struct type *type, enum print_values print_values)
{
- if (type != NULL)
- type = check_typedef (type);
if (print_values == PRINT_NO_VALUES)
return 0;
if (print_values == PRINT_ALL_VALUES)
return 1;
- /* For PRINT_SIMPLE_VALUES, only print the value if it has a type
- and that type is not a compound type. */
+ if (type == NULL)
+ return 1;
+ else
+ {
+ type = check_typedef (type);
- return (TYPE_CODE (type) != TYPE_CODE_ARRAY
- && TYPE_CODE (type) != TYPE_CODE_STRUCT
- && TYPE_CODE (type) != TYPE_CODE_UNION);
+ /* For PRINT_SIMPLE_VALUES, only print the value if it has a type
+ and that type is not a compound type. */
+ return (TYPE_CODE (type) != TYPE_CODE_ARRAY
+ && TYPE_CODE (type) != TYPE_CODE_STRUCT
+ && TYPE_CODE (type) != TYPE_CODE_UNION);
+ }
}
enum mi_cmd_result
print_values = PRINT_NO_VALUES;
if (numchild <= 0)
- return MI_CMD_DONE;
+ {
+ xfree (childlist);
+ return MI_CMD_DONE;
+ }
if (mi_version (uiout) == 1)
cleanup_children = make_cleanup_ui_out_tuple_begin_end (uiout, "children");
return MI_CMD_DONE;
}
+enum mi_cmd_result
+mi_cmd_var_info_path_expression (char *command, char **argv, int argc)
+{
+ struct varobj *var;
+ char *path_expr;
+
+ if (argc != 1)
+ error (_("Usage: NAME."));
+
+ /* Get varobj handle, if a valid var obj name was specified. */
+ var = varobj_get_handle (argv[0]);
+ if (var == NULL)
+ error (_("Variable object not found"));
+
+ path_expr = varobj_get_path_expr (var);
+
+ ui_out_field_string (uiout, "path_expr", path_expr);
+
+ return MI_CMD_DONE;
+}
+
enum mi_cmd_result
mi_cmd_var_info_expression (char *command, char **argv, int argc)
{
if (var == NULL)
error (_("mi_cmd_var_assign: Variable object not found"));
- /* FIXME: define masks for attributes */
- if (!(varobj_get_attributes (var) & 0x00000001))
+ if (!varobj_editable_p (var))
error (_("mi_cmd_var_assign: Variable object is not editable"));
expression = xstrdup (argv[1]);
if (!varobj_set_value (var, expression))
- error (_("mi_cmd_var_assign: Could not assign expression to varible object"));
+ error (_("mi_cmd_var_assign: Could not assign expression to variable object"));
ui_out_field_string (uiout, "value", varobj_get_value (var));
return MI_CMD_DONE;
cr = rootlist;
while (*cr != NULL)
{
- varobj_update_one (*cr, print_values);
+ varobj_update_one (*cr, print_values, 0 /* implicit */);
cr++;
}
do_cleanups (cleanup);
cleanup = make_cleanup_ui_out_tuple_begin_end (uiout, "changelist");
else
cleanup = make_cleanup_ui_out_list_begin_end (uiout, "changelist");
- varobj_update_one (var, print_values);
+ varobj_update_one (var, print_values, 1 /* explicit */);
do_cleanups (cleanup);
}
return MI_CMD_DONE;
/* Helper for mi_cmd_var_update(). */
static void
-varobj_update_one (struct varobj *var, enum print_values print_values)
+varobj_update_one (struct varobj *var, enum print_values print_values,
+ int explicit)
{
struct varobj **changelist;
struct varobj **cc;
struct cleanup *cleanup = NULL;
int nc;
- nc = varobj_update (&var, &changelist);
+ nc = varobj_update (&var, &changelist, explicit);
/* nc >= 0 represents the number of changes reported into changelist.
nc < 0 means that an error occured or the the variable has
switch (nc)
{
case NOT_IN_SCOPE:
- case WRONG_PARAM:
ui_out_field_string (uiout, "in_scope", "false");
break;
case INVALID:
projects / deliverable / binutils-gdb.git / blobdiff