Re: Branch Merging

[Tobias Burnus <burnus at net-b dot de>]

Tobias Burnus wrote:
> I am currently running a diff between
> svn://gcc.gnu.org/svn/gcc/trunk@157996 and
> svn://gcc.gnu.org/svn/gcc/branches/fortran-exp to have another look at
> the changes.
>   

A few observations:

Index: gcc/fortran/gfortran.h
+/*#define gfc_constructor_base struct gfc_constructor* */
+#include "splay-tree.h"
+typedef splay_tree gfc_constructor_base;

The comment-out #define line looks superfluous.

+  union
   {
-    mpz_t offset; /* Record the offset of array element which appears in
-                     data statement like "data a(5)/4/".  */
-    gfc_component *component; /* Record the component being
initialized.  */
+     gfc_component *component; /* Record the component being
initialized.  */
   }
   n;

Why is this a union if there is only a single item in it?


Index: gcc/fortran/constructor.h
+   Copyright (C) 2009

Add 2010.

+   TODO: remove array.c (gfc_get_array_element)
+   TODO: remove expr.c (find_array_element)
+   TODO: ???    data.c (get_array_index).  */

Just a reminder ...


Index: gcc/fortran/array.c
+  /* TODO: Removed check against flag_max_array_constructor.
+     Might be necessary to re-introduce it later?!  */

Ditto.


Index: gcc/fortran/constructor.c
+/*static int
+node_copy_and_append (splay_tree_node node, void *base)
+{
+  gfc_constructor_append ((gfc_constructor_base*)base,
+                         node_copy (node, base));
+  return 0;
+}*/

Any plans for this function? If not, remove; if yes, please add a second
empty line before and after the function.


Index: gcc/fortran/data.c
+   TODO: remove this, use symbol.c(gfc_find_component) instead.  */

Just a reminder ...


Index: gcc/fortran/expr.c
+   TODO: Merge these functions, if possible.  */

Ditto.


I like the patch.

Tobias