[Dotgnu-pnet-commits] CVS: pnet/cscc/csharp cs_decls.tc,1.36,1.37

[Gopal.V <address@hidden>]

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

Modified Files:
        cs_decls.tc 
Log Message:
Fix error reporting for static ctors


Index: cs_decls.tc
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/cscc/csharp/cs_decls.tc,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -r1.36 -r1.37
*** cs_decls.tc 27 Feb 2003 06:19:22 -0000      1.36
--- cs_decls.tc 9 Mar 2003 10:05:57 -0000       1.37
***************
*** 711,714 ****
--- 711,715 ----
        ILEvalValue evalValue;
        ILNode *savedMethod;
+       ILNode *initializer;
  
        savedMethod=info->currentMethod;
***************
*** 749,754 ****
        if(node->owner && (node->owner->modifiers & IL_META_FIELDDEF_STATIC) == 
0)
        {
!               CSAddInitCtor(info, ILNode_Assign_create
!                                               (node->name, 
node->initializer));
                goto done;
        }
--- 750,758 ----
        if(node->owner && (node->owner->modifiers & IL_META_FIELDDEF_STATIC) == 
0)
        {
!               initializer = ILNode_Assign_create(node->name, 
node->initializer);
!               yysetfilename(initializer,yygetfilename(node));
!               yysetlinenum(initializer,yygetlinenum(node));
!               
!               CSAddInitCtor(info, initializer);
                goto done;
        }
***************
*** 819,824 ****
        /*      CSAddStaticCtor(info,  
                         ILNode_Assign_create(node->name, node->initializer)); 
*/
!       node->staticCtor = ILNode_NewScope_create
!                                               
(ILNode_Assign_create(node->name, node->initializer));
  
  done:
--- 823,832 ----
        /*      CSAddStaticCtor(info,  
                         ILNode_Assign_create(node->name, node->initializer)); 
*/
! 
!       initializer=ILNode_Assign_create(node->name, node->initializer);
!       yysetfilename(initializer,yygetfilename(node));
!       yysetlinenum(initializer,yygetlinenum(node));
! 
!       node->staticCtor = ILNode_NewScope_create(initializer);
  
  done: