[Dotgnu-pnet-commits] CVS: pnet/cscc/csharp cs_attrs.c,1.24,1.25

[Gopal.V <address@hidden>]

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

Modified Files:
        cs_attrs.c 
Log Message:
Iron out the tagged object stuff


Index: cs_attrs.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/cscc/csharp/cs_attrs.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** cs_attrs.c  2 May 2003 16:56:13 -0000       1.24
--- cs_attrs.c  4 May 2003 19:34:24 -0000       1.25
***************
*** 299,311 ****
                break;
  
!               default:
                {
                        /* Note : We assume the values are castable and
                         * do not provide any checks here */
!                       if(ILType_IsArray(paramType))
!                       {
!                               /* TODO: arrays */
!                       }
!                       else if(ILType_IsPrimitive(argType))
                        {
                                switch(argValue->valueType)
--- 299,307 ----
                break;
  
!               case IL_META_SERIALTYPE_VARIANT:
                {
                        /* Note : We assume the values are castable and
                         * do not provide any checks here */
!                       if(ILType_IsPrimitive(argType))
                        {
                                switch(argValue->valueType)
***************
*** 371,374 ****
--- 367,379 ----
                }
                break;
+ 
+               default:
+               {
+                       if(ILType_IsArray(paramType))
+                       {
+                               /* TODO: arrays */
+                       }
+               }
+               break;
        }
  }
***************
*** 789,807 ****
                {
                        if(!ILGenCastConst(info, &(evalValues[argNum]),
!                                                          
evalValues[argNum].valueType,
!                                                          
ILTypeToMachineType(paramType)))
                        {
-                               if(!ILCanCastKind(info, evalArgs[argNum].type,
-                                                       paramType,
-                                                       IL_CONVERT_STANDARD,
-                                                       0))
-                               {
                                                                
!                                       
CCErrorOnLine(yygetfilename(evalArgs[argNum].node),
!                                                                 
yygetlinenum(evalArgs[argNum].node),
!                                                                 _("could not 
coerce constant argument %d"),
!                                                                 argNum + 1);
!                                       haveErrors = 1;
!                               }
                        }
                        else if(ILSerializeGetType(paramType) == -1)
--- 794,807 ----
                {
                        if(!ILGenCastConst(info, &(evalValues[argNum]),
!                                  
evalValues[argNum].valueType,ILTypeToMachineType(paramType))
!                          && !ILCanCastKind(info, evalArgs[argNum].type,
!                                                               paramType, 
IL_CONVERT_STANDARD,0))
                        {
                                                                
!                               
CCErrorOnLine(yygetfilename(evalArgs[argNum].node),
!                                                         
yygetlinenum(evalArgs[argNum].node),
!                                                         _("could not coerce 
constant argument %d"),
!                                                         argNum + 1);
!                               haveErrors = 1;
                        }
                        else if(ILSerializeGetType(paramType) == -1)