[Nice-commit] Nice/testsuite/compiler/typing dti.testsuite,1.8,1.9

[Artem Gr K. <ar...@us...>]

Update of /cvsroot/nice/Nice/testsuite/compiler/typing
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1907/testsuite/compiler/typing

Modified Files:
	dti.testsuite 
Log Message:
Type merging works (for IfExp).

Index: dti.testsuite
===================================================================
RCS file: /cvsroot/nice/Nice/testsuite/compiler/typing/dti.testsuite,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** dti.testsuite	8 Mar 2005 12:45:52 -0000	1.8
--- dti.testsuite	8 Mar 2005 19:33:20 -0000	1.9
***************
*** 57,61 ****
    s. /*/// FAIL HERE*/ substring(1);
  
! /// PASS bug
    ?String s = maybeString();
    if (maybeTrue())
--- 57,61 ----
    s. /*/// FAIL HERE*/ substring(1);
  
! /// PASS
    ?String s = maybeString();
    if (maybeTrue())
***************
*** 78,82 ****
  }
  
! /// PASS bug
    ?String s = null; 
    if(maybeTrue())
--- 78,82 ----
  }
  
! /// PASS
    ?String s = null; 
    if(maybeTrue())
***************
*** 279,283 ****
    assert a.y == 1;
  
! /// PASS bug
   ?C a = new D();
   if (maybeTrue())
--- 279,283 ----
    assert a.y == 1;
  
! /// PASS
   ?C a = new D();
   if (maybeTrue())