[Dotgnu-pnet-commits] CVS: pnet/ilalink link_method.c,1.24,1.25 link_type.c,1.10,1.11

[Rhys Weatherley <address@hidden>]

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

Modified Files:
        link_method.c link_type.c 
Log Message:


Linking of method specifications.


Index: link_method.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/ilalink/link_method.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** link_method.c       18 Feb 2003 07:23:49 -0000      1.24
--- link_method.c       19 Feb 2003 04:36:37 -0000      1.25
***************
*** 66,69 ****
--- 66,70 ----
        ILStandAloneSig *sig;
        ILTypeSpec *spec;
+       ILMethodSpec *mspec;
  
        if(!(*token))
***************
*** 107,111 ****
                        return 1;
                }
!               break;
  
                case IL_META_TOKEN_STAND_ALONE_SIG:
--- 108,112 ----
                        return 1;
                }
!               /* Not reached */
  
                case IL_META_TOKEN_STAND_ALONE_SIG:
***************
*** 127,131 ****
                        return 1;
                }
!               break;
  
                case IL_META_TOKEN_TYPE_SPEC:
--- 128,132 ----
                        return 1;
                }
!               /* Not reached */
  
                case IL_META_TOKEN_TYPE_SPEC:
***************
*** 141,152 ****
                        return 1;
                }
!               break;
  
                case IL_META_TOKEN_METHOD_SPEC:
                {
                        /* Convert a generic method specification */
!                       /* TODO */
                }
!               break;
  
                default:
--- 142,172 ----
                        return 1;
                }
!               /* Not reached */
  
                case IL_META_TOKEN_METHOD_SPEC:
                {
                        /* Convert a generic method specification */
!                       member = ILMethodSpec_Method((ILMethodSpec *)item);
!                       member = _ILLinkerConvertMemberRef(linker, member);
!                       if(!member)
!                       {
!                               return -1;
!                       }
!                       type = ILMethodSpec_Type((ILMethodSpec *)item);
!                       type = _ILLinkerConvertType(linker, type);
!                       if(!type)
!                       {
!                               return -1;
!                       }
!                       mspec = ILMethodSpecCreate(linker->image, 0, member, 
type);
!                       if(!mspec)
!                       {
!                               _ILLinkerOutOfMemory(linker);
!                               return -1;
!                       }
!                       *token = ILMethodSpec_Token(mspec);
!                       return 1;
                }
!               /* Not reached */
  
                default:

Index: link_type.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/ilalink/link_type.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** link_type.c 19 Feb 2003 03:54:48 -0000      1.10
--- link_type.c 19 Feb 2003 04:36:37 -0000      1.11
***************
*** 330,339 ****
                        {
                                newType->num__ = 0;
-                               newType->un.method__.retType__ =
-                                       _ILLinkerConvertType(linker, 
type->un.method__.retType__);
                                newType->un.method__.next__ = 0;
!                               if(!(newType->un.method__.retType__))
                                {
!                                       return ILType_Invalid;
                                }
                                for(param = 1; param <= 
(ILUInt32)(type->num__); ++param)
--- 330,343 ----
                        {
                                newType->num__ = 0;
                                newType->un.method__.next__ = 0;
!                               if(type->un.method__.retType__)
                                {
!                                       newType->un.method__.retType__ =
!                                               _ILLinkerConvertType
!                                                       (linker, 
type->un.method__.retType__);
!                                       if(!(newType->un.method__.retType__))
!                                       {
!                                               return ILType_Invalid;
!                                       }
                                }
                                for(param = 1; param <= 
(ILUInt32)(type->num__); ++param)