[Dotgnu-pnet-commits] CVS: pnet/image sig_writer.c,1.4,1.5

[Rhys Weatherley <address@hidden>]

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

Modified Files:
        sig_writer.c 
Log Message:


WriteType: fix the writing of multi-dimensional array types (Bug #1961).


Index: sig_writer.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/image/sig_writer.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** sig_writer.c        13 Jan 2002 11:24:57 -0000      1.4
--- sig_writer.c        12 Dec 2002 04:02:10 -0000      1.5
***************
*** 361,364 ****
--- 361,365 ----
                                unsigned long rank;
                                unsigned long sizes;
+                               unsigned long num;
                                int needSizes;
                                ILType *elemType;
***************
*** 417,421 ****
                                {
                                        elemType = type;
!                                       while(ILType_IsComplex(elemType) &&
                                              (elemType->kind__ == 
IL_TYPE_COMPLEX_ARRAY ||
                                                   elemType->kind__ == 
IL_TYPE_COMPLEX_ARRAY_CONTINUE))
--- 418,423 ----
                                {
                                        elemType = type;
!                                       num = sizes;
!                                       while(num > 0 && 
ILType_IsComplex(elemType) &&
                                              (elemType->kind__ == 
IL_TYPE_COMPLEX_ARRAY ||
                                                   elemType->kind__ == 
IL_TYPE_COMPLEX_ARRAY_CONTINUE))
***************
*** 426,429 ****
--- 428,432 ----
                                                }
                                                elemType = 
elemType->un.array__.elemType__;
+                                               --num;
                                        }
                                }
***************
*** 433,437 ****
                                }
                                elemType = type;
!                               while(ILType_IsComplex(elemType) &&
                                      (elemType->kind__ == 
IL_TYPE_COMPLEX_ARRAY ||
                                           elemType->kind__ == 
IL_TYPE_COMPLEX_ARRAY_CONTINUE))
--- 436,441 ----
                                }
                                elemType = type;
!                               num = rank;
!                               while(num > 0 && ILType_IsComplex(elemType) &&
                                      (elemType->kind__ == 
IL_TYPE_COMPLEX_ARRAY ||
                                           elemType->kind__ == 
IL_TYPE_COMPLEX_ARRAY_CONTINUE))
***************
*** 443,446 ****
--- 447,451 ----
                                        }
                                        elemType = 
elemType->un.array__.elemType__;
+                                       --num;
                                }
                        }