[Nice-commit] Nice/src/bossa/syntax typedef.nice,1.21,1.22

[Daniel B. <bo...@us...>]

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

Modified Files:
	typedef.nice 
Log Message:
Properly localize variance errors again.


Index: typedef.nice
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/typedef.nice,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** typedef.nice	11 Mar 2005 17:35:51 -0000	1.21
--- typedef.nice	22 Mar 2005 15:32:16 -0000	1.22
***************
*** 906,910 ****
  private void copyVariance(TypeDefinition this, TypeDefinition from)
  {
!   if (this.variance != from.variance)
      {
        this.variance = from.variance;
--- 906,913 ----
  private void copyVariance(TypeDefinition this, TypeDefinition from)
  {
!   if (this.variance != from.variance &&
!       // Only specialization is supported
!       (this.variance == null ||
!        notNull(this.variance).arity() < notNull(from.variance).arity()))
      {
        this.variance = from.variance;