[Nice-commit] Nice/src/nice/tools/typing Types.java,1.17,1.18

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

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

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


Index: Types.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/nice/tools/typing/Types.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Types.java	22 Jun 2005 14:34:12 -0000	1.17
--- Types.java	25 Nov 2007 17:12:31 -0000	1.18
***************
*** 310,314 ****
                that is, there exists some types that belong to both domains.
    */
!   public static boolean domainsIntersect(Polytype t1, Polytype t2)
    {
      Typing.enter();
--- 310,314 ----
                that is, there exists some types that belong to both domains.
    */
!   public static boolean domainsIntersect(Polytype t1, Polytype t2, boolean dispatchable)
    {
      Typing.enter();
***************
*** 326,331 ****
  
          // ... that can be used for both methods ...
!         Typing.leq(args, parameters(t1));
!         Typing.leq(args, parameters(t2));
        }
        finally {
--- 326,331 ----
  
          // ... that can be used for both methods ...
!         Typing.leq(args, parameters(t1), dispatchable);
!         Typing.leq(args, parameters(t2), dispatchable);
        }
        finally {