Nice/src/bossa/syntax typedef.nice,1.23,1.24

Update of /cvsroot/nice/Nice/src/bossa/syntax
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19172/src/bossa/syntax

Modified Files:
	typedef.nice 
Log Message:
Rename getVariance to findVariance to avoid conflict with parent (MethodContainer) variance getter.


Index: typedef.nice
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/typedef.nice,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** typedef.nice	25 Mar 2005 16:40:00 -0000	1.23
--- typedef.nice	5 Apr 2005 18:17:33 -0000	1.24
***************
*** 46,50 ****
    void computeVariance()
    {
!     int arity = getVariance(this);
  
      let tpv = notNull( typeParametersVariances );
--- 46,50 ----
    void computeVariance()
    {
!     int arity = findVariance(this);
  
      let tpv = notNull( typeParametersVariances );
***************
*** 833,859 ****
  // Variance lookup
  
! int getVariance(TypeDefinition t)
  {
!   int arity = getVariance(t.implementations);
    if (arity != -1)
      return arity;
  
!   arity = getVariance(t.abstractions);
    return arity;
  }
  
! getVariance(ClassDefinition c)
  {
!   int arity = getVariance(c.superClassIdent);
    return arity >= 0 ? arity : super;
  }
  
! getVariance(InterfaceDefinition i)
  {
!   int arity = getVariance(i.extensions);
    return arity >= 0 ? arity : super;
  }
  
! int getVariance(?List<MonotypeConstructor> parents)
  {
    if (parents == null)
--- 833,859 ----
  // Variance lookup
  
! int findVariance(TypeDefinition t)
  {
!   int arity = findVariance(t.implementations);
    if (arity != -1)
      return arity;
  
!   arity = findVariance(t.abstractions);
    return arity;
  }
  
! findVariance(ClassDefinition c)
  {
!   int arity = findVariance(c.superClassIdent);
    return arity >= 0 ? arity : super;
  }
  
! findVariance(InterfaceDefinition i)
  {
!   int arity = findVariance(i.extensions);
    return arity >= 0 ? arity : super;
  }
  
! int findVariance(?List<MonotypeConstructor> parents)
  {
    if (parents == null)
***************
*** 863,867 ****
    for (MonotypeConstructor m : parents)
      {
!       res = getVariance(m);
        if (res != -1)
          return res;
--- 863,867 ----
    for (MonotypeConstructor m : parents)
      {
!       res = findVariance(m);
        if (res != -1)
          return res;
***************
*** 871,875 ****
  }
  
! int getVariance(?MonotypeConstructor parent)
  {
    if (parent == null)
--- 871,875 ----
  }
  
! int findVariance(?MonotypeConstructor parent)
  {
    if (parent == null)



-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click