2010-04-06 Tobias Burnus <burnus@net-b.de>

[pf3gnuchains/gcc-fork.git] / gcc / fortran / parse.c

diff --git a/gcc/fortran/parse.c b/gcc/fortran/parse.c
index ef8931d..9320069 100644 (file)
--- a/gcc/fortran/parse.c
+++ b/gcc/fortran/parse.c
@@ -2110,6 +2110,22 @@ endType:
          || c->attr.access == ACCESS_PRIVATE
          || (c->ts.type == BT_DERIVED && c->ts.u.derived->attr.private_comp))
        sym->attr.private_comp = 1;
+
+     /* Fix up incomplete CLASS components.  */
+     if (c->ts.type == BT_CLASS)
+       {
+         gfc_component *data;
+         gfc_component *vptr;
+         gfc_symbol *vtab;
+         data = gfc_find_component (c->ts.u.derived, "$data", true, true);
+         vptr = gfc_find_component (c->ts.u.derived, "$vptr", true, true);
+         if (vptr->ts.u.derived == NULL)
+           {
+             vtab = gfc_find_derived_vtab (data->ts.u.derived, false);
+             gcc_assert (vtab);
+             vptr->ts.u.derived = vtab->ts.u.derived;
+           }
+       }
     }
 
   if (!seen_component)
@@ -2248,9 +2264,9 @@ loop:
     {
       if (current_state == COMP_NONE)
        {
-         if (new_state == COMP_FUNCTION)
+         if (new_state == COMP_FUNCTION && sym)
            gfc_add_function (&sym->attr, sym->name, NULL);
-         else if (new_state == COMP_SUBROUTINE)
+         else if (new_state == COMP_SUBROUTINE && sym)
            gfc_add_subroutine (&sym->attr, sym->name, NULL);
 
          current_state = new_state;