[Nice-commit] Nice/src/bossa/syntax niceMethod.nice,1.23,1.24
Brought to you by:
bonniot
|
From: Daniel B. <bo...@us...> - 2005-03-08 16:03:39
|
Update of /cvsroot/nice/Nice/src/bossa/syntax In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10143/src/bossa/syntax Modified Files: niceMethod.nice Log Message: Handle methods that are partly specialized by existing imported methods. Index: niceMethod.nice =================================================================== RCS file: /cvsroot/nice/Nice/src/bossa/syntax/niceMethod.nice,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** niceMethod.nice 8 Mar 2005 10:50:59 -0000 1.23 --- niceMethod.nice 8 Mar 2005 16:03:28 -0000 1.24 *************** *** 152,156 **** return ! mlsub.typing.Typing.smaller(itsDomain, ourDomain, true) && ! nice.tools.typing.Types.typeParameterDispatch(s.getType(), this.getType()); } --- 152,160 ---- 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()); } |