[Dotgnu-pnet-commits] pnet/image meta_build.c, 1.39, 1.40 misc_token.c, 1.7, 1.8

[Rhys Weatherley <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnet/image
In directory subversions:/tmp/cvs-serv19553/image

Modified Files:
        meta_build.c misc_token.c 
Log Message:


Set an exported type's scope when it is created so that the correct
ILClassName is constructed.


Index: misc_token.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/image/misc_token.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** misc_token.c        14 Oct 2003 04:12:21 -0000      1.7
--- misc_token.c        25 Nov 2003 02:01:37 -0000      1.8
***************
*** 885,889 ****
                                                                         
ILUInt32 attributes,
                                                                         const 
char *name,
!                                                                        const 
char *namespace)
  {
        ILExportedType *type;
--- 885,890 ----
                                                                         
ILUInt32 attributes,
                                                                         const 
char *name,
!                                                                        const 
char *namespace,
!                                                                        
ILProgramItem *scope)
  {
        ILExportedType *type;
***************
*** 900,908 ****
        type->classItem.attributes = attributes | IL_META_TYPEDEF_REFERENCE;
        type->classItem.className =
!               _ILClassNameLookup(image, 0, 0, name, namespace);
        if(!(type->classItem.className))
        {
                type->classItem.className =
!                       _ILClassNameCreate(image, token, name, namespace, 0, 0);
        }
        if(!(type->classItem.className))
--- 901,909 ----
        type->classItem.attributes = attributes | IL_META_TYPEDEF_REFERENCE;
        type->classItem.className =
!               _ILClassNameLookup(image, scope, 0, name, namespace);
        if(!(type->classItem.className))
        {
                type->classItem.className =
!                       _ILClassNameCreate(image, token, name, namespace, 
scope, 0);
        }
        if(!(type->classItem.className))

Index: meta_build.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/image/meta_build.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** meta_build.c        25 Nov 2003 00:33:54 -0000      1.39
--- meta_build.c        25 Nov 2003 02:01:37 -0000      1.40
***************
*** 3157,3164 ****
  {
        ILExportedType *type;
-       ILProgramItem *scope;
-       ILFileDecl *decl;
-       ILAssembly *assem;
-       ILExportedType *expType;
  
        /* Create the exported type record */
--- 3157,3160 ----
***************
*** 3168,3172 ****
                                                (image, 
values[IL_OFFSET_EXPTYPE_NAME]),
                                    ILImageGetString
!                                               (image, 
values[IL_OFFSET_EXPTYPE_NAMESPACE]));
        if(!type)
        {
--- 3164,3170 ----
                                                (image, 
values[IL_OFFSET_EXPTYPE_NAME]),
                                    ILImageGetString
!                                               (image, 
values[IL_OFFSET_EXPTYPE_NAMESPACE]),
!                                       ILProgramItem_FromToken
!                                               (image, 
values[IL_OFFSET_EXPTYPE_FILE]));
        if(!type)
        {
***************
*** 3176,3194 ****
        /* Set the foreign class identifier */
        ILExportedTypeSetId(type, values[IL_OFFSET_EXPTYPE_CLASS]);
- 
-       /* Set the scope */
-       scope = ILProgramItem_FromToken(image, values[IL_OFFSET_EXPTYPE_FILE]);
-       if((decl = ILProgramItemToFileDecl(scope)) != 0)
-       {
-               ILExportedTypeSetScopeFile(type, decl);
-       }
-       else if((assem = ILProgramItemToAssembly(scope)) != 0)
-       {
-               ILExportedTypeSetScopeAssembly(type, assem);
-       }
-       else if((expType = ILProgramItemToExportedType(scope)) != 0)
-       {
-               ILExportedTypeSetScopeType(type, expType);
-       }
  
        /* Add the exported type to the "redo" list */
--- 3174,3177 ----