[Nice-commit] Nice/src/bossa/link Alternative.java,1.43,1.44 Dispatch.java,1.62,1.63

[<ar...@us...>]

Update of /cvsroot/nice/Nice/src/bossa/link
In directory sc8-pr-cvs1:/tmp/cvs-serv30612/F:/nice/src/bossa/link

Modified Files:
	Alternative.java Dispatch.java 
Log Message:
fix for bug #803972, incorrect error messages by dispatch tests of integer comparisons.

Index: Alternative.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/link/Alternative.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** Alternative.java	3 Sep 2003 22:32:10 -0000	1.43
--- Alternative.java	26 Sep 2003 23:12:36 -0000	1.44
***************
*** 126,129 ****
--- 126,137 ----
    }
  
+   boolean containsTypeMatchingValue()
+   {
+     for(int i = 0; i < patterns.length; i++)
+       if (patterns[i].atTypeMatchingValue())
+ 	return true;
+ 
+     return false;
+   }
  
    /****************************************************************

Index: Dispatch.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/link/Dispatch.java,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** Dispatch.java	11 Sep 2003 20:56:35 -0000	1.62
--- Dispatch.java	26 Sep 2003 23:12:36 -0000	1.63
***************
*** 235,239 ****
  	  if (first == null)
  	    first = a;
! 	  else if (!Alternative.less(first, a))
  	    {
  	      failed = true;
--- 235,240 ----
  	  if (first == null)
  	    first = a;
! 	  else if (!Alternative.less(first, a) &&
! 		   !a.containsTypeMatchingValue())
  	    {
  	      failed = true;