[RFC, Patch, Fortran] F2003's OOP constructor support

Dominique Dhumieres dominiq@lps.ens.fr
Mon Oct 31 21:35:00 GMT 2011


Hi Tobias,

I just browsed your patch to check if it is likely to conflict with
Mikael's or Paul's ones and saw something wierd in trans-types.c:

+/*<<<<<<< .mine
+	&& derived->module)
+    {
+      gsym =  gfc_find_gsymbol (gfc_gsym_root, derived->module);
+      if (gsym && gsym->ns && gsym->type == GSYM_MODULE)
+	{
+	  gfc_symbol *s;
+	  s = NULL;
+	  gfc_find_symbol (derived->name, gsym->ns, 0, &s);
+	  if (s->attr.generic)
+	    s = gfc_find_dt_in_generic (s);
+	  gcc_assert (s->attr.flavor == FL_DERIVED);
+
+	  if (s)
+	    {
+	      if (!s->backend_decl)
+		s->backend_decl = gfc_get_derived_type (s);
+	      gfc_copy_dt_decls_ifequal (s, derived, true);
+	      goto copy_derived_types;
+	    }
+	}
+    }
+=======*/
 	&& derived->module
 	&& gfc_get_module_backend_decl (derived))
     goto copy_derived_types;
+/*>>>>>>> .r170461*/

A left over of a postponed conflict?

Cheers,

Dominique



More information about the Fortran mailing list