From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 10654 invoked by alias); 19 Mar 2005 03:55:58 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 10467 invoked from network); 19 Mar 2005 03:55:40 -0000 Received: from unknown (HELO viper.snap.net.nz) (202.37.101.8) by sourceware.org with SMTP; 19 Mar 2005 03:55:40 -0000 Received: from farnswood.snap.net.nz (p5-tnt1.snap.net.nz [202.124.110.5]) by viper.snap.net.nz (Postfix) with ESMTP id F3D7D4999B9; Sat, 19 Mar 2005 16:55:33 +1300 (NZDT) Received: by farnswood.snap.net.nz (Postfix, from userid 501) id 0949C631C7; Sat, 19 Mar 2005 03:44:57 +0000 (GMT) From: Nick Roberts MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-ID: <16955.41017.161288.832646@farnswood.snap.net.nz> Date: Sat, 19 Mar 2005 03:55:00 -0000 To: Andrew Cagney , gdb-patches@sources.redhat.com Subject: Re: [PATCH: gdb/mi + doco] -var-update In-Reply-To: <16929.8147.933720.246602@farnswood.snap.net.nz> References: <16919.7660.144228.334687@farnswood.snap.net.nz> <01c5167f$Blat.v2.4$9a7a6f60@zahav.net.il> <16919.53411.753668.336933@farnswood.snap.net.nz> <01c51709$Blat.v2.4$4a3292a0@zahav.net.il> <16921.18627.457594.938060@farnswood.snap.net.nz> <01c517d0$Blat.v2.4$09a26040@zahav.net.il> <16922.43915.346792.973282@farnswood.snap.net.nz> <01c51898$Blat.v2.4$f6fd05c0@zahav.net.il> <16929.8147.933720.246602@farnswood.snap.net.nz> X-SW-Source: 2005-03/txt/msg00246.txt.bz2 I would like to commit this (source code) patch from last month. I accidently reverted some of changes last time I presented it so I attach it here in its proper form. As Andrew doesn't appear to around is there any chance a global maintainer can look at it? Its pretty lightweight. Nick *** /home/nick/src/gdb/mi/mi-cmd-var.c.~1.21.~ 2005-02-13 00:36:20.000000000 +1300 --- /home/nick/src/gdb/mi/mi-cmd-var.c 2005-03-01 14:03:45.000000000 +1300 *************** *** 30,38 **** #include #include "gdb_string.h" extern int varobjdebug; /* defined in varobj.c */ ! static int varobj_update_one (struct varobj *var); /* VAROBJ operations */ --- 30,44 ---- #include #include "gdb_string.h" + const char novalues[] = "\"--no-values\""; + const char withvalues[] = "\"--with-values\""; + const char simplevalues[] = "\"--simple-values\""; + const char allvalues[] = "\"--all-values\""; + extern int varobjdebug; /* defined in varobj.c */ ! static int varobj_update_one (struct varobj *var, ! enum print_values print_values); /* VAROBJ operations */ *************** *** 262,284 **** error (_("mi_cmd_var_list_children: Usage: [PRINT_VALUES] NAME")); /* Get varobj handle, if a valid var obj name was specified */ ! if (argc == 1) var = varobj_get_handle (argv[0]); ! else var = varobj_get_handle (argv[1]); if (var == NULL) error (_("Variable object not found")); numchild = varobj_list_children (var, &childlist); ui_out_field_int (uiout, "numchild", numchild); if (argc == 2) ! if (strcmp (argv[0], "0") == 0 ! || strcmp (argv[0], "--no-values") == 0) ! print_values = PRINT_NO_VALUES; ! else if (strcmp (argv[0], "1") == 0 ! || strcmp (argv[0], "--all-values") == 0) ! print_values = PRINT_ALL_VALUES; ! else ! error (_("Unknown value for PRINT_VALUES: must be: 0 or \"--no-values\", 1 or \"--all-values\"")); ! else print_values = PRINT_NO_VALUES; if (numchild <= 0) return MI_CMD_DONE; --- 268,296 ---- error (_("mi_cmd_var_list_children: Usage: [PRINT_VALUES] NAME")); /* Get varobj handle, if a valid var obj name was specified */ ! if (argc == 1) ! var = varobj_get_handle (argv[0]); ! else ! var = varobj_get_handle (argv[1]); if (var == NULL) error (_("Variable object not found")); numchild = varobj_list_children (var, &childlist); ui_out_field_int (uiout, "numchild", numchild); if (argc == 2) ! { ! if (strcmp (argv[0], "0") == 0 ! || strcmp (argv[0], "--no-values") == 0) ! print_values = PRINT_NO_VALUES; ! else if (strcmp (argv[0], "1") == 0 ! || strcmp (argv[0], "--with-values") == 0) ! print_values = PRINT_ALL_VALUES; ! else ! error (_("Unknown value for PRINT_VALUES: must be: 0 or %s, 1 or %s"), ! novalues, withvalues); ! } ! else ! print_values = PRINT_NO_VALUES; if (numchild <= 0) return MI_CMD_DONE; *************** *** 426,436 **** struct cleanup *cleanup; char *name; int nv; ! if (argc != 1) ! error (_("mi_cmd_var_update: Usage: NAME.")); ! name = argv[0]; /* Check if the parameter is a "*" which means that we want to update all variables */ --- 438,467 ---- struct cleanup *cleanup; char *name; int nv; + enum print_values print_values; ! if (argc != 1 && argc != 2) ! error (_("mi_cmd_var_update: Usage: [PRINT_VALUES] NAME.")); ! if (argc == 1) ! name = argv[0]; ! else ! name = (argv[1]); ! ! if (argc == 2) ! { ! if (strcmp (argv[0], "0") == 0 ! || strcmp (argv[0], "--no-values") == 0) ! print_values = PRINT_NO_VALUES; ! else if (strcmp (argv[0], "1") == 0 ! || strcmp (argv[0], "--with-values") == 0) ! print_values = PRINT_ALL_VALUES; ! else ! error (_("Unknown value for PRINT_VALUES: must be: 0 or %s, 1 or %s"), ! novalues, withvalues); ! } ! else ! print_values = PRINT_NO_VALUES; /* Check if the parameter is a "*" which means that we want to update all variables */ *************** *** 450,456 **** cr = rootlist; while (*cr != NULL) { ! varobj_update_one (*cr); cr++; } xfree (rootlist); --- 481,487 ---- cr = rootlist; while (*cr != NULL) { ! varobj_update_one (*cr, print_values); cr++; } xfree (rootlist); *************** *** 467,473 **** 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); do_cleanups (cleanup); } return MI_CMD_DONE; --- 498,504 ---- 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); do_cleanups (cleanup); } return MI_CMD_DONE; *************** *** 478,484 **** scope), and 1 if it succeeds. */ static int ! varobj_update_one (struct varobj *var) { struct varobj **changelist; struct varobj **cc; --- 509,515 ---- scope), and 1 if it succeeds. */ static int ! varobj_update_one (struct varobj *var, enum print_values print_values) { struct varobj **changelist; struct varobj **cc; *************** *** 524,529 **** --- 555,562 ---- if (mi_version (uiout) > 1) cleanup = make_cleanup_ui_out_tuple_begin_end (uiout, NULL); ui_out_field_string (uiout, "name", varobj_get_objname (*cc)); + if (print_values) + ui_out_field_string (uiout, "value", varobj_get_value (*cc)); ui_out_field_string (uiout, "in_scope", "true"); ui_out_field_string (uiout, "type_changed", "false"); if (mi_version (uiout) > 1) Diff finished. Sat Mar 19 16:37:30 2005