Re: [PATCH]

[Sergio Durigan Junior <sergiodj at redhat dot com>]

On Wednesday, January 18 2012, Joel Brobecker wrote:

>> >> 2012-01-18  Sergio Durigan Junior  <sergiodj@redhat.com>
>> >> 
>> >> 	* parse.c (initialize_expout): New function.
>> >> 	(reallocate_expout): Likewise.
>> >> 	(parse_exp_in_context): Use `initialize_expout' and
>> >> 	`reallocate_expout' when appropriate.
>> >
>> > FWIW, it seems OK to me on its own. I like the fact that you made
>> > the initial_size and gdbarch parameters.
>
> Sorry for nit-picking, but since it's very minor and can easily
> be deal with...

No problem, that's why I sent the patch :-).

>> +/* Helper function used to initialize an struct expression that is going
>> +   to be used to store expression elements.  The arguments are the
>> +   INITIAL_SIZE of the expression, the language LANG parsed to build this
>> +   expression, and the GDBARCH pointer.  */
>
> Suggested re-phrasing:
>
> /* Helper function to initialize the expout, expout_size, expout_ptr
>    trio before it is used to store expression elements created during
>    the parsing of an expression.  INITIAL_SIZE is the initial size of
>    the expout array.  LANG is the language used to parse the expression.
>    And GDBARCH is the gdbarch to use during parsing.  */
>
>> +/* Helper function that reallocates the EXPOUT in order to eliminate any
>> +   unused space.  It is generally used when the expression has just been
>> +   parsed and created.  */
>
> Suggest:
>
> /* Helper function that frees any unsed space in the expout array.
>    It is generally used when the parser has just been parsed and
>    created.  */
>
> (otherwise, remove "the" before "EXPOUT").
>
> Ok with those fixes.

Fixed and committed the version below.
      http://sourceware.org/ml/gdb-cvs/2012-01/msg00153.html

Thanks.

-- 
Sergio

2012-01-18  Sergio Durigan Junior  <sergiodj@redhat.com>

	* parse.c (initialize_expout): New function.
	(reallocate_expout): Likewise.
	(parse_exp_in_context): Use `initialize_expout' and
	`reallocate_expout' when appropriate.

diff --git a/gdb/parse.c b/gdb/parse.c
index f405dc5..32a3bd6 100644
--- a/gdb/parse.c
+++ b/gdb/parse.c
@@ -182,6 +182,41 @@ free_funcalls (void *ignore)
 /* This page contains the functions for adding data to the struct expression
    being constructed.  */
 
+/* Helper function to initialize the expout, expout_size, expout_ptr
+   trio before it is used to store expression elements created during
+   the parsing of an expression.  INITIAL_SIZE is the initial size of
+   the expout array.  LANG is the language used to parse the expression.
+   And GDBARCH is the gdbarch to use during parsing.  */
+
+static void
+initialize_expout (int initial_size, const struct language_defn *lang,
+		   struct gdbarch *gdbarch)
+{
+  expout_size = initial_size;
+  expout_ptr = 0;
+  expout = xmalloc (sizeof (struct expression)
+		    + EXP_ELEM_TO_BYTES (expout_size));
+  expout->language_defn = lang;
+  expout->gdbarch = gdbarch;
+}
+
+/* Helper function that frees any unsed space in the expout array.
+   It is generally used when the parser has just been parsed and
+   created.  */
+
+static void
+reallocate_expout (void)
+{
+  /* Record the actual number of expression elements, and then
+     reallocate the expression memory so that we free up any
+     excess elements.  */
+
+  expout->nelts = expout_ptr;
+  expout = xrealloc ((char *) expout,
+		     sizeof (struct expression)
+		     + EXP_ELEM_TO_BYTES (expout_ptr));
+}
+
 /* Add one element to the end of the expression.  */
 
 /* To avoid a bug in the Sun 4 compiler, we pass things that can fit into
@@ -1156,12 +1191,7 @@ parse_exp_in_context (char **stringptr, struct block *block, int comma,
   else
     lang = current_language;
 
-  expout_size = 10;
-  expout_ptr = 0;
-  expout = (struct expression *)
-    xmalloc (sizeof (struct expression) + EXP_ELEM_TO_BYTES (expout_size));
-  expout->language_defn = lang;
-  expout->gdbarch = get_current_arch ();
+  initialize_expout (10, lang, get_current_arch ());
 
   TRY_CATCH (except, RETURN_MASK_ALL)
     {
@@ -1179,14 +1209,7 @@ parse_exp_in_context (char **stringptr, struct block *block, int comma,
 
   discard_cleanups (old_chain);
 
-  /* Record the actual number of expression elements, and then
-     reallocate the expression memory so that we free up any
-     excess elements.  */
-
-  expout->nelts = expout_ptr;
-  expout = (struct expression *)
-    xrealloc ((char *) expout,
-	      sizeof (struct expression) + EXP_ELEM_TO_BYTES (expout_ptr));
+  reallocate_expout ();
 
   /* Convert expression from postfix form as generated by yacc
      parser, to a prefix form.  */