[Nice-commit] Nice/src/bossa/syntax niceMethod.nice,1.29,1.30

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

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

Modified Files:
	niceMethod.nice 
Log Message:
Take care of primitive types when deciding of method generalization (fixes bug #1509635).


Index: niceMethod.nice
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/niceMethod.nice,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** niceMethod.nice	19 Aug 2005 16:04:28 -0000	1.29
--- niceMethod.nice	25 Nov 2007 17:12:31 -0000	1.30
***************
*** 167,174 ****
      return
        // if the two domains have some types in common (they intersect)
!       // then we can consider this is specialized by d
!       // (provided we already know d it not more general than this, in which
!       //  we would have said that this specializes d).
!       nice.tools.typing.Types.domainsIntersect(this.getType(), s.getType()) &&
      ! nice.tools.typing.Types.typeParameterDispatch(s.getType(), this.getType());
    }
--- 167,174 ----
      return
        // if the two domains have some types in common (they intersect)
!       // then we can consider that 'this' is specialized by 'd'
!       // (provided we already know 'd' is not more general than 'this',
!       // in which case we would have said that this specializes d).
!       nice.tools.typing.Types.domainsIntersect(this.getType(), s.getType(), true) &&
      ! nice.tools.typing.Types.typeParameterDispatch(s.getType(), this.getType());
    }