From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 12983 invoked by alias); 27 Oct 2013 12:04:21 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 12969 invoked by uid 89); 27 Oct 2013 12:04:20 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=1.3 required=5.0 tests=AWL,BAYES_00,GARBLED_BODY autolearn=no version=3.3.2 X-HELO: relay1.mentorg.com Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sun, 27 Oct 2013 12:04:19 +0000 Received: from svr-orw-exc-10.mgc.mentorg.com ([147.34.98.58]) by relay1.mentorg.com with esmtp id 1VaP4p-0001B3-LC from Yao_Qi@mentor.com ; Sun, 27 Oct 2013 05:04:15 -0700 Received: from SVR-ORW-FEM-05.mgc.mentorg.com ([147.34.97.43]) by SVR-ORW-EXC-10.mgc.mentorg.com with Microsoft SMTPSVC(6.0.3790.4675); Sun, 27 Oct 2013 05:04:15 -0700 Received: from qiyao.dyndns.org (147.34.91.1) by svr-orw-fem-05.mgc.mentorg.com (147.34.97.43) with Microsoft SMTP Server id 14.2.247.3; Sun, 27 Oct 2013 05:04:14 -0700 Message-ID: <526D00E9.7040407@codesourcery.com> Date: Sun, 27 Oct 2013 12:04:00 -0000 From: Yao Qi User-Agent: Mozilla/5.0 (X11; Linux i686; rv:17.0) Gecko/20130110 Thunderbird/17.0.2 MIME-Version: 1.0 To: Joel Brobecker CC: Subject: Rename field 'lang' to 'lang_ops' ([PATCH 1/2] New field la_varobj_ops in struct language_defn) References: <1382057576-19148-1-git-send-email-yao@codesourcery.com> <20131025033415.GB4769@adacore.com> In-Reply-To: <20131025033415.GB4769@adacore.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-IsSubscribed: yes X-SW-Source: 2013-10/txt/msg00843.txt.bz2 On 10/25/2013 11:34 AM, Joel Brobecker wrote: > Also, as a followup, I think it would be beneficial if we renamed > field "lang" in the varobj_root into "lang_ops". I think it's more > descriptive, especially since "lang" is used elsewhere with different > meanings (and types). Here is the patch to rename 'lang' to 'lang_ops'. Committed as obvious. -- Yao (齐尧) gdb: 2013-10-27 Yao Qi * varobj.c (struct varobj_root) : Rename to 'lang_ops'. (varobj_create, varobj_get_path_expr): Update. (varobj_value_has_mutated, varobj_update): Likewise. (create_child_with_value, new_root_variable): Likewise. (number_of_children, name_of_variable): Likewise. (value_of_child, my_value_of_variable): Likewise. (varobj_value_is_changeable_p): Likewise. --- gdb/varobj.c | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/gdb/varobj.c b/gdb/varobj.c index 60ed810..e1b9909 100644 --- a/gdb/varobj.c +++ b/gdb/varobj.c @@ -102,7 +102,7 @@ struct varobj_root /* Language-related operations for this variable and its children. */ - const struct lang_varobj_ops *lang; + const struct lang_varobj_ops *lang_ops; /* The varobj for this root node. */ struct varobj *rootvar; @@ -432,7 +432,7 @@ varobj_create (char *objname, } /* Set language info */ - var->root->lang = var->root->exp->language_defn->la_varobj_ops; + var->root->lang_ops = var->root->exp->language_defn->la_varobj_ops; install_new_value (var, value, 1 /* Initial assignment */); @@ -1122,7 +1122,7 @@ varobj_get_path_expr (struct varobj *var) when creating varobj, so here it should be child varobj. */ gdb_assert (!is_root_p (var)); - return (*var->root->lang->path_expr_of_child) (var); + return (*var->root->lang_ops->path_expr_of_child) (var); } } @@ -1661,8 +1661,8 @@ varobj_value_has_mutated (struct varobj *var, struct value *new_value, if (var->num_children < 0) return 0; - if (var->root->lang->value_has_mutated) - return var->root->lang->value_has_mutated (var, new_value, new_type); + if (var->root->lang_ops->value_has_mutated) + return var->root->lang_ops->value_has_mutated (var, new_value, new_type); else return 0; } @@ -1770,7 +1770,7 @@ varobj_update (struct varobj **varp, int explicit) if (new) new_type = value_type (new); else - new_type = v->root->lang->type_of_child (v->parent, v->index); + new_type = v->root->lang_ops->type_of_child (v->parent, v->index); if (varobj_value_has_mutated (v, new, new_type)) { @@ -2146,8 +2146,8 @@ create_child_with_value (struct varobj *parent, int index, char *name, child->type = value_actual_type (value, 0, NULL); else /* Otherwise, we must compute the type. */ - child->type = (*child->root->lang->type_of_child) (child->parent, - child->index); + child->type = (*child->root->lang_ops->type_of_child) (child->parent, + child->index); install_new_value (child, value, 1); return child; @@ -2200,7 +2200,7 @@ new_root_variable (void) struct varobj *var = new_variable (); var->root = (struct varobj_root *) xmalloc (sizeof (struct varobj_root)); - var->root->lang = NULL; + var->root->lang_ops = NULL; var->root->exp = NULL; var->root->valid_block = NULL; var->root->frame = null_frame_id; @@ -2366,7 +2366,7 @@ variable_language (struct varobj *var) static int number_of_children (struct varobj *var) { - return (*var->root->lang->number_of_children) (var); + return (*var->root->lang_ops->number_of_children) (var); } /* What is the expression for the root varobj VAR? Returns a malloc'd @@ -2374,7 +2374,7 @@ number_of_children (struct varobj *var) static char * name_of_variable (struct varobj *var) { - return (*var->root->lang->name_of_variable) (var); + return (*var->root->lang_ops->name_of_variable) (var); } /* What is the name of the INDEX'th child of VAR? Returns a malloc'd @@ -2382,7 +2382,7 @@ name_of_variable (struct varobj *var) static char * name_of_child (struct varobj *var, int index) { - return (*var->root->lang->name_of_child) (var, index); + return (*var->root->lang_ops->name_of_child) (var, index); } /* If frame associated with VAR can be found, switch @@ -2569,7 +2569,7 @@ value_of_child (struct varobj *parent, int index) { struct value *value; - value = (*parent->root->lang->value_of_child) (parent, index); + value = (*parent->root->lang_ops->value_of_child) (parent, index); return value; } @@ -2582,7 +2582,7 @@ my_value_of_variable (struct varobj *var, enum varobj_display_formats format) { if (var->dynamic->pretty_printer != NULL) return varobj_value_get_print_value (var->value, var->format, var); - return (*var->root->lang->value_of_variable) (var, format); + return (*var->root->lang_ops->value_of_variable) (var, format); } else return NULL; @@ -2761,7 +2761,7 @@ varobj_editable_p (struct varobj *var) int varobj_value_is_changeable_p (struct varobj *var) { - return var->root->lang->value_is_changeable_p (var); + return var->root->lang_ops->value_is_changeable_p (var); } /* Return 1 if that varobj is floating, that is is always evaluated in the -- 1.7.7.6