[Dotgnu-pnet-commits] CVS: pnet/codegen cg_scope.c,1.13,1.14 cg_scope.h,1.12,1.13

[Gopal.V <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnet/codegen
In directory subversions:/tmp/cvs-serv27260/codegen

Modified Files:
        cg_scope.c cg_scope.h 
Log Message:
fix scoping bug that was breaking cscctest


Index: cg_scope.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/codegen/cg_scope.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** cg_scope.c  15 Nov 2002 20:26:28 -0000      1.13
--- cg_scope.c  16 Nov 2002 01:44:28 -0000      1.14
***************
*** 477,481 ****
  int ILScopeDeclareType(ILScope *scope, ILNode *node, const char *name,
                                           const char *namespace, ILScope 
**resultScope,
!                                          ILNode **origDefn)
  {
        ILScope *namespaceScope;
--- 477,481 ----
  int ILScopeDeclareType(ILScope *scope, ILNode *node, const char *name,
                                           const char *namespace, ILScope 
**resultScope,
!                                          ILNode **origDefn, ILScope 
*attachScope)
  {
        ILScope *namespaceScope;
***************
*** 531,534 ****
--- 531,540 ----
        usingScope->using = scope->using;
        usingScope->lookup = UsingScope_Lookup;
+       
+       if(attachScope)
+       {
+               attachScope->parent=usingScope;
+               usingScope=attachScope; /* insert the scope under usingScope */
+       }
  
        /* Create a scope to hold the type itself */

Index: cg_scope.h
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/codegen/cg_scope.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** cg_scope.h  15 Nov 2002 20:26:28 -0000      1.12
--- cg_scope.h  16 Nov 2002 01:44:28 -0000      1.13
***************
*** 121,129 ****
   * already exists, then an "IL_SCOPE_ERROR_xxx" code is
   * returned.  If there is a declaration for the type already,
!  * then the node will be returned in "origDefn".
   */
  int ILScopeDeclareType(ILScope *scope, ILNode *node, const char *name,
                                           const char *namespace, ILScope 
**resultScope,
!                                          ILNode **origDefn);
  
  /*
--- 121,131 ----
   * already exists, then an "IL_SCOPE_ERROR_xxx" code is
   * returned.  If there is a declaration for the type already,
!  * then the node will be returned in "origDefn". The attach
!  * scope is added between the scope and resultScope scopes.
!  * scope->..attachScope->resultScope
   */
  int ILScopeDeclareType(ILScope *scope, ILNode *node, const char *name,
                                           const char *namespace, ILScope 
**resultScope,
!                                          ILNode **origDefn, ILScope 
*attachScope);
  
  /*