dotgnu-pnet-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Dotgnu-pnet-commits] CVS: pnet/cscc/csharp cs_attrs.c,1.10,1.11 cs_cast


From: Gopal.V <address@hidden>
Subject: [Dotgnu-pnet-commits] CVS: pnet/cscc/csharp cs_attrs.c,1.10,1.11 cs_cast.tc,1.7,1.8 cs_invoke.tc,1.18,1.19 cs_lvalue.tc,1.25,1.26 cs_misc.tc,1.9,1.10 cs_stmt.tc,1.27,1.28
Date: Fri, 15 Nov 2002 21:45:34 -0500

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

Modified Files:
        cs_attrs.c cs_cast.tc cs_invoke.tc cs_lvalue.tc cs_misc.tc 
        cs_stmt.tc 
Log Message:
indirect checks for ILCoerce* and ILCast* functions 


Index: cs_attrs.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/cscc/csharp/cs_attrs.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** cs_attrs.c  19 Sep 2002 04:07:14 -0000      1.10
--- cs_attrs.c  16 Nov 2002 02:45:32 -0000      1.11
***************
*** 474,478 ****
                                                        
namedArgs[argNum].parent,
                                                        namedArgs[argNum].type,
!                                                       
GetAttrFieldType(namedFields[argNum])) &&
                                   ILGenCastConst
                                                (info, &(namedValues[argNum]),
--- 474,478 ----
                                                        
namedArgs[argNum].parent,
                                                        namedArgs[argNum].type,
!                                                       
GetAttrFieldType(namedFields[argNum]),1) &&
                                   ILGenCastConst
                                                (info, &(namedValues[argNum]),

Index: cs_cast.tc
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/cscc/csharp/cs_cast.tc,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** cs_cast.tc  9 Nov 2002 21:24:13 -0000       1.7
--- cs_cast.tc  16 Nov 2002 02:45:32 -0000      1.8
***************
*** 67,71 ****
        /* Determine if we can cast between the types */
        if(!ILCast(info, node->expr2, &(node->expr2),
!                          CSSemGetType(value), CSSemGetType(type)))
        {
                CCErrorOnLine(yygetfilename(node), yygetlinenum(node),
--- 67,71 ----
        /* Determine if we can cast between the types */
        if(!ILCast(info, node->expr2, &(node->expr2),
!                          CSSemGetType(value), CSSemGetType(type),69))
        {
                CCErrorOnLine(yygetfilename(node), yygetlinenum(node),

Index: cs_invoke.tc
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/cscc/csharp/cs_invoke.tc,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** cs_invoke.tc        16 Nov 2002 01:02:30 -0000      1.18
--- cs_invoke.tc        16 Nov 2002 02:45:32 -0000      1.19
***************
*** 1358,1362 ****
                        /* Match anything that can coerce to the parameter type 
*/
                        if (!ILCanCoerceNode(info, args[argNum].node, 
!                                                                       
args[argNum].type, paramType))
                        {
                                return 0;
--- 1358,1362 ----
                        /* Match anything that can coerce to the parameter type 
*/
                        if (!ILCanCoerceNode(info, args[argNum].node, 
!                                                                       
args[argNum].type, paramType,1))
                        {
                                return 0;
***************
*** 1573,1577 ****
                {
                        ILCoerce(info, args[argNum].node,
!                                        args[argNum].parent, 
args[argNum].type, paramType);
                }
                ++paramNum;
--- 1573,1577 ----
                {
                        ILCoerce(info, args[argNum].node,
!                                        args[argNum].parent, 
args[argNum].type, paramType,0);
                }
                ++paramNum;
***************
*** 1593,1597 ****
                                        (signature, ILTypeNumParams(signature));
                                ILCoerce(info, args[argNum].node,
!                                                args[argNum].parent, 
args[argNum].type, paramType);
                                argArray = 0;
                        }
--- 1593,1597 ----
                                        (signature, ILTypeNumParams(signature));
                                ILCoerce(info, args[argNum].node,
!                                                args[argNum].parent, 
args[argNum].type, paramType,0);
                                argArray = 0;
                        }
***************
*** 1610,1614 ****
                                        ILCoerce(info, args[argNum2].node,
                                                         args[argNum2].parent, 
args[argNum2].type,
!                                                        paramType);
                                }
  
--- 1610,1614 ----
                                        ILCoerce(info, args[argNum2].node,
                                                         args[argNum2].parent, 
args[argNum2].type,
!                                                        paramType,0);
                                }
  

Index: cs_lvalue.tc
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/cscc/csharp/cs_lvalue.tc,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** cs_lvalue.tc        15 Nov 2002 12:50:57 -0000      1.25
--- cs_lvalue.tc        16 Nov 2002 02:45:32 -0000      1.26
***************
*** 1218,1227 ****
                {
                        if(ILCoerce(info, args[argNum].node, 
args[argNum].parent,
!                                   args[argNum].type, ILType_Int32))
                        {
                                args[argNum].node = *(args[argNum].parent);
                        }
                        else if(ILCoerce(info, args[argNum].node, 
args[argNum].parent,
!                                        args[argNum].type, ILType_UInt32))
                        {
                                args[argNum].node =
--- 1218,1227 ----
                {
                        if(ILCoerce(info, args[argNum].node, 
args[argNum].parent,
!                                   args[argNum].type, ILType_Int32,1))
                        {
                                args[argNum].node = *(args[argNum].parent);
                        }
                        else if(ILCoerce(info, args[argNum].node, 
args[argNum].parent,
!                                        args[argNum].type, ILType_UInt32,1))
                        {
                                args[argNum].node =
***************
*** 1230,1234 ****
                        }
                        else if(ILCoerce(info, args[argNum].node, 
args[argNum].parent,
!                                        args[argNum].type, ILType_Int64))
                        {
                                args[argNum].node =
--- 1230,1234 ----
                        }
                        else if(ILCoerce(info, args[argNum].node, 
args[argNum].parent,
!                                        args[argNum].type, ILType_Int64,1))
                        {
                                args[argNum].node =
***************
*** 1237,1241 ****
                        }
                        else if(ILCoerce(info, args[argNum].node, 
args[argNum].parent,
!                                        args[argNum].type, ILType_UInt64))
                        {
                                args[argNum].node =
--- 1237,1241 ----
                        }
                        else if(ILCoerce(info, args[argNum].node, 
args[argNum].parent,
!                                        args[argNum].type, ILType_UInt64,1))
                        {
                                args[argNum].node =

Index: cs_misc.tc
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/cscc/csharp/cs_misc.tc,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** cs_misc.tc  9 Nov 2002 21:24:13 -0000       1.9
--- cs_misc.tc  16 Nov 2002 02:45:32 -0000      1.10
***************
*** 347,357 ****
                        {
                                if(!ILCoerce(info, *parentNode, parentNode,
!                                                        CSSemGetType(value), 
ILType_Int32) &&
                                   !ILCoerce(info, *parentNode, parentNode,
!                                                        CSSemGetType(value), 
ILType_UInt32) &&
                                   !ILCoerce(info, *parentNode, parentNode,
!                                                        CSSemGetType(value), 
ILType_Int64) &&
                                   !ILCoerce(info, *parentNode, parentNode,
!                                                        CSSemGetType(value), 
ILType_UInt64))
                                {
                                        CCErrorOnLine
--- 347,357 ----
                        {
                                if(!ILCoerce(info, *parentNode, parentNode,
!                                                        CSSemGetType(value), 
ILType_Int32,1) &&
                                   !ILCoerce(info, *parentNode, parentNode,
!                                                        CSSemGetType(value), 
ILType_UInt32,1) &&
                                   !ILCoerce(info, *parentNode, parentNode,
!                                                        CSSemGetType(value), 
ILType_Int64,1) &&
                                   !ILCoerce(info, *parentNode, parentNode,
!                                                        CSSemGetType(value), 
ILType_UInt64,1))
                                {
                                        CCErrorOnLine
***************
*** 377,387 ****
                {
                        if(!ILCoerce(info, *parentNode, parentNode,
!                                                CSSemGetType(value), 
ILType_Int32) &&
                           !ILCoerce(info, *parentNode, parentNode,
!                                                CSSemGetType(value), 
ILType_UInt32) &&
                           !ILCoerce(info, *parentNode, parentNode,
!                                                CSSemGetType(value), 
ILType_Int64) &&
                           !ILCoerce(info, *parentNode, parentNode,
!                                                CSSemGetType(value), 
ILType_UInt64))
                        {
                                CCErrorOnLine
--- 377,387 ----
                {
                        if(!ILCoerce(info, *parentNode, parentNode,
!                                                CSSemGetType(value), 
ILType_Int32,1) &&
                           !ILCoerce(info, *parentNode, parentNode,
!                                                CSSemGetType(value), 
ILType_UInt32,1) &&
                           !ILCoerce(info, *parentNode, parentNode,
!                                                CSSemGetType(value), 
ILType_Int64,1) &&
                           !ILCoerce(info, *parentNode, parentNode,
!                                                CSSemGetType(value), 
ILType_UInt64,1))
                        {
                                CCErrorOnLine

Index: cs_stmt.tc
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/cscc/csharp/cs_stmt.tc,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** cs_stmt.tc  16 Nov 2002 01:02:30 -0000      1.27
--- cs_stmt.tc  16 Nov 2002 02:45:32 -0000      1.28
***************
*** 321,325 ****
                        castNode=ILNode_EmptyExpr_create
                                (ILTypeToMachineType(node->elemType));
!                       
if(!ILCast(info,castNode,&(castNode),node->elemType,type))
                        {
                                CCErrorOnLine(yygetfilename(node), 
yygetlinenum(node),
--- 321,325 ----
                        castNode=ILNode_EmptyExpr_create
                                (ILTypeToMachineType(node->elemType));
!                       
if(!ILCast(info,castNode,&(castNode),node->elemType,type,1))
                        {
                                CCErrorOnLine(yygetfilename(node), 
yygetlinenum(node),
***************
*** 437,441 ****
                        {       
                                
castNode=ILNode_EmptyExpr_create(ILTypeToMachineType(retType));
!                               
if(!ILCast(info,castNode,&(castNode),retType,type))
                                {
                                        CCErrorOnLine(yygetfilename(node), 
yygetlinenum(node),
--- 437,441 ----
                        {       
                                
castNode=ILNode_EmptyExpr_create(ILTypeToMachineType(retType));
!                               
if(!ILCast(info,castNode,&(castNode),retType,type,1))
                                {
                                        CCErrorOnLine(yygetfilename(node), 
yygetlinenum(node),
***************
*** 703,707 ****
                                /* Coerce the case expression to the governing 
type */
                                if(!ILCoerce(info, caseLabel->expr, 
&(caseLabel->expr),
!                                                        CSSemGetType(value), 
switchType))
                                {
                                        
CCErrorOnLine(yygetfilename(caseLabel->expr),
--- 703,707 ----
                                /* Coerce the case expression to the governing 
type */
                                if(!ILCoerce(info, caseLabel->expr, 
&(caseLabel->expr),
!                                                        CSSemGetType(value), 
switchType,1))
                                {
                                        
CCErrorOnLine(yygetfilename(caseLabel->expr),
***************
*** 908,912 ****
                {
                        if(ILCanCoerceKind(info, actualType, 
governingTypes[posn],
!                                                          
IL_CONVERT_USER_DEFINED))
                        {
                                switchType = governingTypes[posn];
--- 908,912 ----
                {
                        if(ILCanCoerceKind(info, actualType, 
governingTypes[posn],
!                                                          
IL_CONVERT_USER_DEFINED,1))
                        {
                                switchType = governingTypes[posn];
***************
*** 918,922 ****
                        stringType = ILFindSystemType(info, "String");
                        if(ILCanCoerceKind(info, actualType, stringType,
!                                                          
IL_CONVERT_USER_DEFINED))
                        {
                                switchType = stringType;
--- 918,922 ----
                        stringType = ILFindSystemType(info, "String");
                        if(ILCanCoerceKind(info, actualType, stringType,
!                                                          
IL_CONVERT_USER_DEFINED,1))
                        {
                                switchType = stringType;
***************
*** 934,938 ****
  
        /* Cast the switch expression to the governing type */
!       ILCast(info, node->expr, &(node->expr), actualType, switchType);
  
        node->switchType=switchType;
--- 934,938 ----
  
        /* Cast the switch expression to the governing type */
!       ILCast(info, node->expr, &(node->expr), actualType, switchType,1);
  
        node->switchType=switchType;
***************
*** 1057,1061 ****
        /* Coerce the case expression to the governing type */
        if(!ILCoerce(info, node->expr, &(node->expr),
!                                        CSSemGetType(value), 
switchExpr->switchType))
        {
                CCErrorOnLine(yygetfilename(node->expr),
--- 1057,1061 ----
        /* Coerce the case expression to the governing type */
        if(!ILCoerce(info, node->expr, &(node->expr),
!                                        CSSemGetType(value), 
switchExpr->switchType,1))
        {
                CCErrorOnLine(yygetfilename(node->expr),
***************
*** 1232,1236 ****
                /* Coerce to the return type */
                if(!ILCoerce(info, node->expr, &(node->expr),
!                                        CSSemGetType(value), returnType))
                {
                        CCErrorOnLine(yygetfilename(node), yygetlinenum(node),
--- 1232,1236 ----
                /* Coerce to the return type */
                if(!ILCoerce(info, node->expr, &(node->expr),
!                                        CSSemGetType(value), returnType,1))
                {
                        CCErrorOnLine(yygetfilename(node), yygetlinenum(node),
***************
*** 1285,1289 ****
        exceptionClass = ILFindSystemType(info, "Exception");
        if(!ILCoerce(info, node->expr, &(node->expr),
!                                CSSemGetType(value), exceptionClass))
        {
                CCErrorOnLine(yygetfilename(node), yygetlinenum(node),
--- 1285,1289 ----
        exceptionClass = ILFindSystemType(info, "Exception");
        if(!ILCoerce(info, node->expr, &(node->expr),
!                                CSSemGetType(value), exceptionClass,1))
        {
                CCErrorOnLine(yygetfilename(node), yygetlinenum(node),
***************
*** 1431,1435 ****
        /* Coerce the lock expression to "System.Object" */
        if(!ILCoerce(info, node->expr, &(node->expr),
!                                CSSemGetType(value), objectType))
        {
                CCErrorOnLine(yygetfilename(node->expr), 
yygetlinenum(node->expr),
--- 1431,1435 ----
        /* Coerce the lock expression to "System.Object" */
        if(!ILCoerce(info, node->expr, &(node->expr),
!                                CSSemGetType(value), objectType,1))
        {
                CCErrorOnLine(yygetfilename(node->expr), 
yygetlinenum(node->expr),
***************
*** 1697,1701 ****
                /* Make sure that the value is compatible with the field's type 
*/
                if(!ILCoerce(info, decl->initializer, &(decl->initializer),
!                                        CSSemGetType(value), type))
                {
                        CCErrorOnLine(yygetfilename(decl->initializer),
--- 1697,1701 ----
                /* Make sure that the value is compatible with the field's type 
*/
                if(!ILCoerce(info, decl->initializer, &(decl->initializer),
!                                        CSSemGetType(value), type,1))
                {
                        CCErrorOnLine(yygetfilename(decl->initializer),





reply via email to

[Prev in Thread] Current Thread [Next in Thread]