[Dotgnu-pnet-commits] CVS: pnet/cscc/csharp cs_gather.c,1.33,1.34

[Gopal.V <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnet/cscc/csharp
In directory subversions:/tmp/cvs-serv24819/cscc/csharp

Modified Files:
        cs_gather.c 
Log Message:
fix rest of attributes inheritance


Index: cs_gather.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/cscc/csharp/cs_gather.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -r1.33 -r1.34
*** cs_gather.c 20 Dec 2002 09:37:47 -0000      1.33
--- cs_gather.c 12 Jan 2003 18:31:42 -0000      1.34
***************
*** 206,224 ****
                }
        
-               if(baseName)
-               {
-                       namelen=strlen(baseName);
-                       if(namelen >= 9 && strcmp(baseName + namelen - 9, 
"Attribute") == 0)
-                       {
-                               namelen=strlen(name);
-                               if(namelen < 9 || strcmp(name + namelen - 9, 
"Attribute") != 0)
-                               {
-                                       defn->name = ILInternAppendedString
-                                                                       
(ILInternString(defn->name, namelen),
-                                                                        
ILInternString("Attribute", 9)).string;
-                                       name=defn->name;
-                               }
-                       }
-               }
  
                /* Look in the scope for the base class */
--- 206,209 ----
***************
*** 242,245 ****
--- 227,243 ----
                        CCErrorOnLine(yygetfilename(baseNode), 
yygetlinenum(baseNode),
                                                  "invalid base type");
+               }
+               if(baseList[base] && 
ILTypeIdentical(ILType_FromClass(baseList[base]),
+                                                               
ILFindSystemType(info,"Attribute")))
+               {
+                               
+                       namelen=strlen(name);
+                       if(namelen < 9 || strcmp(name + namelen - 9, 
"Attribute") != 0)
+                       {
+                               defn->name = ILInternAppendedString
+                                                               
(ILInternString(defn->name, namelen),
+                                                                
ILInternString("Attribute", 9)).string;
+                               name=defn->name;
+                       }
                }
        }