[SCM] archer-jankratochvil-fortran-module2: Merge branch 'obconcat-importalias' into archer-jankratochvil-fortran-module2

[SCM] archer-jankratochvil-fortran-module2: Merge branch 'obconcat-importalias' into archer-jankratochvil-fortran-module2

[jkratoch]

The branch, archer-jankratochvil-fortran-module2 has been updated
       via  c3b1b23b356a1dbcd9853a2fee5371982b5988a6 (commit)
       via  fa09a4ee8d9cab1a04816383e277f352b1cf1eec (commit)
       via  ca3efc2cc479cec04393b2e99be414ac66fced6d (commit)
      from  a853d0f7df3003bc3d90e4359a5f1442c3f24fd8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit c3b1b23b356a1dbcd9853a2fee5371982b5988a6
Merge: a853d0f7df3003bc3d90e4359a5f1442c3f24fd8 fa09a4ee8d9cab1a04816383e277f352b1cf1eec
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Fri Apr 30 20:49:29 2010 +0200

    Merge branch 'obconcat-importalias' into archer-jankratochvil-fortran-module2

commit fa09a4ee8d9cab1a04816383e277f352b1cf1eec
Merge: 2cb51b1a9f5b15bef9a9fc2948a0224b0754b5f5 ca3efc2cc479cec04393b2e99be414ac66fced6d
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Fri Apr 30 20:49:20 2010 +0200

    Merge branch 'obconcat' into obconcat-importalias

commit ca3efc2cc479cec04393b2e99be414ac66fced6d
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Fri Apr 30 20:49:10 2010 +0200

    simplify

-----------------------------------------------------------------------

Summary of changes:
 gdb/symfile.c |   24 +++---------------------
 1 files changed, 3 insertions(+), 21 deletions(-)

First 500 lines of diff:
diff --git a/gdb/symfile.c b/gdb/symfile.c
index 79e6c95..5d8cbec 100644
--- a/gdb/symfile.c
+++ b/gdb/symfile.c
@@ -219,8 +219,6 @@ char *
 obconcat (struct obstack *obstackp, ...)
 {
   va_list ap;
-  size_t len = 1;
-  char *retval, *dest;
 
   va_start (ap, obstackp);
   for (;;)
@@ -229,29 +227,13 @@ obconcat (struct obstack *obstackp, ...)
 
       if (s == NULL)
 	break;
-      len += strlen (s);
-    }
-  va_end (ap);
-
-  retval = (char *) obstack_alloc (obstackp, len);
-  dest = retval;
-
-  va_start (ap, obstackp);
-  for (;;)
-    {
-      const char *s = va_arg (ap, const char *);
-      size_t l;
 
-      if (s == NULL)
-	break;
-      l = strlen (s);
-      memcpy (dest, s, l);
-      dest += l;
+      obstack_grow (obstackp, s, strlen (s));
     }
   va_end (ap);
-  *dest = 0;
+  obstack_1grow (obstackp, 0);
 
-  return retval;
+  return obstack_finish (obstackp);
 }
 
 /* True if we are reading a symbol table. */


hooks/post-receive
--
Repository for Project Archer.

[SCM] archer-jankratochvil-fortran-module2: Merge branch 'obconcat-importalias' into archer-jankratochvil-fortran-module2

[jkratoch]

The branch, archer-jankratochvil-fortran-module2 has been updated
       via  e69807cab5d46886f581ec87a29c26788256d5e7 (commit)
       via  dc36fd3664c0946ccbdc02c86d558c871ed86476 (commit)
      from  7cde4cc5c5fd9cb3ad9700c6cdc69c159af1366b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit e69807cab5d46886f581ec87a29c26788256d5e7
Merge: 7cde4cc5c5fd9cb3ad9700c6cdc69c159af1366b dc36fd3664c0946ccbdc02c86d558c871ed86476
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Fri Apr 30 23:30:52 2010 +0200

    Merge branch 'obconcat-importalias' into archer-jankratochvil-fortran-module2

commit dc36fd3664c0946ccbdc02c86d558c871ed86476
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Fri Apr 30 23:30:34 2010 +0200

    fix comment

-----------------------------------------------------------------------

Summary of changes:
 gdb/cp-support.h |   51 ++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 38 insertions(+), 13 deletions(-)

First 500 lines of diff:
diff --git a/gdb/cp-support.h b/gdb/cp-support.h
index f2f202f..dd4df84 100644
--- a/gdb/cp-support.h
+++ b/gdb/cp-support.h
@@ -37,19 +37,44 @@ struct type;
 struct demangle_component;
 
 /* This struct is designed to store data from using directives.  It
-   says that names from namespace IMPORT_SRC should be visible within
-   namespace IMPORT_DEST.  These form a linked list; NEXT is the next element
-   of the list.  If the imported namespace has been aliased, ALIAS is set to a
-   string representing the alias.  Otherwise, ALIAS is NULL.
-   Eg:
-       namespace C = A::B;
-   ALIAS = "C"
-   DECLARATION is the name of the imported declaration, if this import
-   statement represents one.
-   Eg:
-       using A::x;
-   Where x is variable in namespace A.  DECLARATION is set to x.
-*/
+   says that names from namespace IMPORT_SRC should be visible within namespace
+   IMPORT_DEST.  These form a linked list; NEXT is the next element of the
+   list.  If the imported namespace or declaration has been aliased within the
+   IMPORT_DEST namespace, ALIAS is set to a string representing the alias.
+   Otherwise, ALIAS is NULL.  DECLARATION is the name of the imported
+   declaration, if this import statement represents one.  Otherwise DECLARATION
+   is NULL and this import statement represents a namespace.
+
+   C++:      using namespace A;
+   Fortran:  use A
+   import_src = "A"
+   import_dest = local scope of the import statement even such as ""
+   alias = NULL
+   declaration = NULL
+
+   C++:      using A::x;
+   Fortran:  use A, only: x
+   import_src = "A"
+   import_dest = local scope of the import statement even such as ""
+   alias = NULL
+   declaration = "x"
+   The declaration will get imported as import_dest::x.
+
+   C++:      namespace LOCALNS = A;
+   Fortran has no way to address non-local namespace/module.
+   import_src = "A"
+   import_dest = local scope of the import statement even such as ""
+   alias = "LOCALNS"
+   declaration = NULL
+   The namespace will get imported as the import_dest::LOCALNS namespace.
+
+   C++ cannot express it, it would be something like:  using localname = A::x;
+   Fortran:  use A, only localname => x
+   import_src = "A"
+   import_dest = local scope of the import statement even such as ""
+   alias = "localname"
+   declaration = "x"
+   The declaration will get imported as localname or `import_dest`localname.  */
 
 struct using_direct
 {


hooks/post-receive
--
Repository for Project Archer.

[SCM] archer-jankratochvil-fortran-module2: Merge branch 'obconcat-importalias' into archer-jankratochvil-fortran-module2

[jkratoch]

The branch, archer-jankratochvil-fortran-module2 has been updated
       via  7cde4cc5c5fd9cb3ad9700c6cdc69c159af1366b (commit)
       via  9c166dce3ab84cc511200cf0085adc02fb1508fa (commit)
       via  017824c7f27243fbf3ebc2b60f1f0bc66c2aea7c (commit)
      from  c3b1b23b356a1dbcd9853a2fee5371982b5988a6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit 7cde4cc5c5fd9cb3ad9700c6cdc69c159af1366b
Merge: c3b1b23b356a1dbcd9853a2fee5371982b5988a6 9c166dce3ab84cc511200cf0085adc02fb1508fa
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Fri Apr 30 20:53:14 2010 +0200

    Merge branch 'obconcat-importalias' into archer-jankratochvil-fortran-module2

commit 9c166dce3ab84cc511200cf0085adc02fb1508fa
Merge: fa09a4ee8d9cab1a04816383e277f352b1cf1eec 017824c7f27243fbf3ebc2b60f1f0bc66c2aea7c
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Fri Apr 30 20:53:05 2010 +0200

    Merge branch 'obconcat' into obconcat-importalias

commit 017824c7f27243fbf3ebc2b60f1f0bc66c2aea7c
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Fri Apr 30 20:52:56 2010 +0200

    obstack_grow_str

-----------------------------------------------------------------------

Summary of changes:
 gdb/symfile.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

First 500 lines of diff:
diff --git a/gdb/symfile.c b/gdb/symfile.c
index 5d8cbec..8fdf7f8 100644
--- a/gdb/symfile.c
+++ b/gdb/symfile.c
@@ -228,7 +228,7 @@ obconcat (struct obstack *obstackp, ...)
       if (s == NULL)
 	break;
 
-      obstack_grow (obstackp, s, strlen (s));
+      obstack_grow_str (obstackp, s);
     }
   va_end (ap);
   obstack_1grow (obstackp, 0);


hooks/post-receive
--
Repository for Project Archer.