[Nice-commit] Nice/src/bossa/syntax Pattern.java,1.71,1.72

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

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

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

Index: Pattern.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/Pattern.java,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -d -r1.71 -r1.72
*** Pattern.java	11 Sep 2003 20:50:27 -0000	1.71
--- Pattern.java	26 Sep 2003 23:12:36 -0000	1.72
***************
*** 385,394 ****
  
      if (this.atEnum() && that.atEnum())
!       return this.atValue.toString().compareTo(that.atValue.toString()) < 0;
  
      if (this.atIntCompare() && that.atIntCompare())
        {
  	if (this.atLess() != that.atLess())
! 	  return atLess();
  
          long val = this.atValue.longValue();
--- 385,394 ----
  
      if (this.atEnum() && that.atEnum())
!       return false;
  
      if (this.atIntCompare() && that.atIntCompare())
        {
  	if (this.atLess() != that.atLess())
! 	  return false;
  
          long val = this.atValue.longValue();
***************
*** 842,844 ****
--- 842,845 ----
    public boolean atIntCompare() { return compareKind > 0;}
    public boolean atLess() { return compareKind == LT || compareKind == LE; }
+   public boolean atTypeMatchingValue() { return atEnum() || atIntCompare(); }
  }