[Dotgnu-pnet-commits] CVS: pnet/ilalink link_type.c,1.11,1.12

[Rhys Weatherley <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnet/ilalink
In directory subversions:/tmp/cvs-serv16376/ilalink

Modified Files:
        link_type.c 
Log Message:


Shift the name information out of ILClass into a separate ILClassName
record, so that we can eventually load the names before loading the classes.


Index: link_type.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/ilalink/link_type.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** link_type.c 19 Feb 2003 04:36:37 -0000      1.11
--- link_type.c 28 Feb 2003 04:57:46 -0000      1.12
***************
*** 64,68 ****
                {
                        /* We have a library find context as the parent */
!                       if(!_ILLinkerFindClass(find, classInfo->name, 
classInfo->namespace))
                        {
                                return CONVERT_REF_FAILED;
--- 64,69 ----
                {
                        /* We have a library find context as the parent */
!                       if(!_ILLinkerFindClass(find, ILClass_Name(classInfo),
!                                                                  
ILClass_Namespace(classInfo)))
                        {
                                return CONVERT_REF_FAILED;
***************
*** 74,79 ****
                        /* We have an actual TypeDef or TypeRef as the parent */
                        scope = ILToProgramItem(*resultInfo);
!                       newClass = ILClassLookup(scope, classInfo->name,
!                                                                        
classInfo->namespace);
                        if(newClass)
                        {
--- 75,80 ----
                        /* We have an actual TypeDef or TypeRef as the parent */
                        scope = ILToProgramItem(*resultInfo);
!                       newClass = ILClassLookup(scope, ILClass_Name(classInfo),
!                                                                        
ILClass_Namespace(classInfo));
                        if(newClass)
                        {
***************
*** 81,86 ****
                                return CONVERT_REF_LOCAL;
                        }
!                       newClass = ILClassCreateRef(scope, 0, classInfo->name,
!                                                                               
classInfo->namespace);
                        if(!newClass)
                        {
--- 82,87 ----
                                return CONVERT_REF_LOCAL;
                        }
!                       newClass = ILClassCreateRef(scope, 0, 
ILClass_Name(classInfo),
!                                                                               
ILClass_Namespace(classInfo));
                        if(!newClass)
                        {
***************
*** 95,99 ****
        {
                /* Converting a top-level class reference to outside the image 
*/
!               scope = classInfo->scope;
                assem = ILProgramItemToAssembly(scope);
                if(assem && ILAssemblyIsRef(assem) &&
--- 96,100 ----
        {
                /* Converting a top-level class reference to outside the image 
*/
!               scope = classInfo->className->scope;
                assem = ILProgramItemToAssembly(scope);
                if(assem && ILAssemblyIsRef(assem) &&
***************
*** 102,106 ****
                        /* Resolved to a specific library */
                        _ILLinkerFindInit(find, linker, library);
!                       if(_ILLinkerFindClass(find, classInfo->name, 
classInfo->namespace))
                        {
                                return CONVERT_REF_LIBRARY;
--- 103,108 ----
                        /* Resolved to a specific library */
                        _ILLinkerFindInit(find, linker, library);
!                       if(_ILLinkerFindClass(find, ILClass_Name(classInfo),
!                                                                 
ILClass_Namespace(classInfo)))
                        {
                                return CONVERT_REF_LIBRARY;
***************
*** 112,116 ****
                }
                _ILLinkerFindInit(find, linker, 0);
!               if(_ILLinkerFindClass(find, classInfo->name, 
classInfo->namespace))
                {
                        /* Resolved to one of the libraries */
--- 114,119 ----
                }
                _ILLinkerFindInit(find, linker, 0);
!               if(_ILLinkerFindClass(find, ILClass_Name(classInfo),
!                                                         
ILClass_Namespace(classInfo)))
                {
                        /* Resolved to one of the libraries */
***************
*** 128,133 ****
           the link completes, we will scan for dangling TypeRef's */
        scope = ILClassGlobalScope(linker->image);
!       name = classInfo->name;
!       namespace = classInfo->namespace;
        if(!strcmp(name, "<Module>") && !namespace)
        {
--- 131,136 ----
           the link completes, we will scan for dangling TypeRef's */
        scope = ILClassGlobalScope(linker->image);
!       name = ILClass_Name(classInfo);
!       namespace = ILClass_Namespace(classInfo);
        if(!strcmp(name, "<Module>") && !namespace)
        {