Nice/src/nice/tools/typing Types.java,1.15,1.16

Daniel Bonniot <[email protected]> Wed, 25 May 2005 23:22:59 +0000
Newsgroups gmane.comp.lang.nice.cvs
Message-ID <[email protected]>
Update of /cvsroot/nice/Nice/src/nice/tools/typing
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2569/src/nice/tools/typing

Modified Files:
	Types.java 
Log Message:
Fix subtyping of wildcards. Should be safe, but overrestrictive, since
a wildcard is now not a subtype of itself.


Index: Types.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/nice/tools/typing/Types.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Types.java	24 May 2005 19:14:56 -0000	1.15
--- Types.java	25 May 2005 23:22:57 -0000	1.16
***************
*** 99,103 ****
    {
      m = m.equivalent();
!     if (! (m.getKind() == NullnessKind.instance))
        return m;
  
--- 99,103 ----
    {
      m = m.equivalent();
!     if (m.getKind() != NullnessKind.instance || m == UnknownMonotype.instance)
        return m;
  



-------------------------------------------------------
SF.Net email is sponsored by: GoToMeeting - the easiest way to collaborate
online with coworkers and clients while avoiding the high cost of travel and
communications. There is no equipment to buy and you can meet as often as
you want. Try it free.http://ads.osdn.com/?ad_id=7402&alloc_id=16135&op=click