[RFA] Renam sutruct using_direct members

[Sami Wagiaalla <swagiaal@redhat.com>]

[-- Attachment #1: Type: text/plain, Size: 4155 bytes --]

struct using_direct
{
    char *inner;
    char *outer;
    struct using_direct *next;
};

The names inner and outer are not very clear. I certainly found it
unintuitive while working on namespace support. This patch renames them
no import_src and import_dest respectively


2009-05-25  Sami Wagiaalla  <swagiaal@redhat.com>

	* cp-support.h (struct using_direct): renamed members inner, and
          outer to import_src, and import_dest respectively.
	Updated all reverences.


diff --git a/gdb/cp-namespace.c b/gdb/cp-namespace.c
index c6c5617..05776e5 100644
--- a/gdb/cp-namespace.c
+++ b/gdb/cp-namespace.c
@@ -172,9 +172,9 @@ cp_add_using_directive (const char *name, unsigned
int outer_length,

     for (current = using_list; current != NULL; current = current->next)
       {
-      if ((strncmp (current->inner, name, inner_length) == 0)
-	  && (strlen (current->inner) == inner_length)
-	  && (strlen (current->outer) == outer_length))
+      if ((strncmp (current->import_src, name, inner_length) == 0)
+	  && (strlen (current->import_src) == inner_length)
+	  && (strlen (current->import_dest) == outer_length))
   	return;
       }

@@ -248,8 +248,8 @@ cp_add_using (const char *name,
     gdb_assert (outer_len < inner_len);

     retval = xmalloc (sizeof (struct using_direct));
-  retval->inner = savestring (name, inner_len);
-  retval->outer = savestring (name, outer_len);
+  retval->import_src = savestring (name, inner_len);
+  retval->import_dest = savestring (name, outer_len);
     retval->next = next;

     return retval;
@@ -271,14 +271,14 @@ cp_copy_usings (struct using_direct *using,
       {
         struct using_direct *retval
   	= obstack_alloc (obstack, sizeof (struct using_direct));
-      retval->inner = obsavestring (using->inner, strlen (using->inner),
+      retval->import_src = obsavestring (using->import_src, strlen
(using->import_src),
   				    obstack);
-      retval->outer = obsavestring (using->outer, strlen (using->outer),
+      retval->import_dest = obsavestring (using->import_dest, strlen
(using->import_dest),
   				    obstack);
         retval->next = cp_copy_usings (using->next, obstack);

-      xfree (using->inner);
-      xfree (using->outer);
+      xfree (using->import_src);
+      xfree (using->import_dest);
         xfree (using);

         return retval;
@@ -380,9 +380,9 @@ cp_lookup_symbol_namespace (const char *namespace,
          current != NULL;
          current = current->next)
       {
-      if (strcmp (namespace, current->outer) == 0)
+      if (strcmp (namespace, current->import_dest) == 0)
   	{
-	  sym = cp_lookup_symbol_namespace (current->inner,
+	  sym = cp_lookup_symbol_namespace (current->import_src,
   					    name,
   					    linkage_name,
   					    block,
diff --git a/gdb/cp-support.c b/gdb/cp-support.c
index bf42636..f12d785 100644
--- a/gdb/cp-support.c
+++ b/gdb/cp-support.c
@@ -716,10 +716,10 @@ make_symbol_overload_list_using (const char
*func_name,
          current != NULL;
          current = current->next)
       {
-      if (strcmp (namespace, current->outer) == 0)
+      if (strcmp (namespace, current->import_dest) == 0)
   	{
   	  make_symbol_overload_list_using (func_name,
-					   current->inner);
+					   current->import_src);
   	}
       }

diff --git a/gdb/cp-support.h b/gdb/cp-support.h
index 837ca6c..bd86638 100644
--- a/gdb/cp-support.h
+++ b/gdb/cp-support.h
@@ -37,15 +37,15 @@ struct type;
   struct demangle_component;

   /* This struct is designed to store data from using directives.  It
-   says that names from namespace INNER should be visible within
-   namespace OUTER.  OUTER should always be a strict initial substring
-   of INNER.  These form a linked list; NEXT is the next element of
-   the list.  */
+   says that names from namespace IMPORT_SRC should be visible within
+   namespace IMPORT_DEST. IMPORT_DEST should always be a strict initial
+   substring of IMPORT_SRC. These form a linked list; NEXT is the next
element
+   of the list.  */

   struct using_direct
   {
-  char *inner;
-  char *outer;
+  char *import_src;
+  char *import_dest;
     struct using_direct *next;
   };



[-- Attachment #2: using_diret-rename.patch --]
[-- Type: text/plain, Size: 3613 bytes --]

diff --git a/gdb/cp-namespace.c b/gdb/cp-namespace.c
index c6c5617..05776e5 100644
--- a/gdb/cp-namespace.c
+++ b/gdb/cp-namespace.c
@@ -172,9 +172,9 @@ cp_add_using_directive (const char *name, unsigned int outer_length,
 
   for (current = using_list; current != NULL; current = current->next)
     {
-      if ((strncmp (current->inner, name, inner_length) == 0)
-	  && (strlen (current->inner) == inner_length)
-	  && (strlen (current->outer) == outer_length))
+      if ((strncmp (current->import_src, name, inner_length) == 0)
+	  && (strlen (current->import_src) == inner_length)
+	  && (strlen (current->import_dest) == outer_length))
 	return;
     }
 
@@ -248,8 +248,8 @@ cp_add_using (const char *name,
   gdb_assert (outer_len < inner_len);
 
   retval = xmalloc (sizeof (struct using_direct));
-  retval->inner = savestring (name, inner_len);
-  retval->outer = savestring (name, outer_len);
+  retval->import_src = savestring (name, inner_len);
+  retval->import_dest = savestring (name, outer_len);
   retval->next = next;
 
   return retval;
@@ -271,14 +271,14 @@ cp_copy_usings (struct using_direct *using,
     {
       struct using_direct *retval
 	= obstack_alloc (obstack, sizeof (struct using_direct));
-      retval->inner = obsavestring (using->inner, strlen (using->inner),
+      retval->import_src = obsavestring (using->import_src, strlen (using->import_src),
 				    obstack);
-      retval->outer = obsavestring (using->outer, strlen (using->outer),
+      retval->import_dest = obsavestring (using->import_dest, strlen (using->import_dest),
 				    obstack);
       retval->next = cp_copy_usings (using->next, obstack);
 
-      xfree (using->inner);
-      xfree (using->outer);
+      xfree (using->import_src);
+      xfree (using->import_dest);
       xfree (using);
 
       return retval;
@@ -380,9 +380,9 @@ cp_lookup_symbol_namespace (const char *namespace,
        current != NULL;
        current = current->next)
     {
-      if (strcmp (namespace, current->outer) == 0)
+      if (strcmp (namespace, current->import_dest) == 0)
 	{
-	  sym = cp_lookup_symbol_namespace (current->inner,
+	  sym = cp_lookup_symbol_namespace (current->import_src,
 					    name,
 					    linkage_name,
 					    block,
diff --git a/gdb/cp-support.c b/gdb/cp-support.c
index bf42636..f12d785 100644
--- a/gdb/cp-support.c
+++ b/gdb/cp-support.c
@@ -716,10 +716,10 @@ make_symbol_overload_list_using (const char *func_name,
        current != NULL;
        current = current->next)
     {
-      if (strcmp (namespace, current->outer) == 0)
+      if (strcmp (namespace, current->import_dest) == 0)
 	{
 	  make_symbol_overload_list_using (func_name,
-					   current->inner);
+					   current->import_src);
 	}
     }
 
diff --git a/gdb/cp-support.h b/gdb/cp-support.h
index 837ca6c..bd86638 100644
--- a/gdb/cp-support.h
+++ b/gdb/cp-support.h
@@ -37,15 +37,15 @@ struct type;
 struct demangle_component;
 
 /* This struct is designed to store data from using directives.  It
-   says that names from namespace INNER should be visible within
-   namespace OUTER.  OUTER should always be a strict initial substring
-   of INNER.  These form a linked list; NEXT is the next element of
-   the list.  */
+   says that names from namespace IMPORT_SRC should be visible within
+   namespace IMPORT_DEST. IMPORT_DEST should always be a strict initial
+   substring of IMPORT_SRC. These form a linked list; NEXT is the next element
+   of the list.  */
 
 struct using_direct
 {
-  char *inner;
-  char *outer;
+  char *import_src;
+  char *import_dest;
   struct using_direct *next;
 };