[Nice-commit] Nice/src/bossa/syntax Pattern.java,1.63,1.64

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

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

Modified Files:
	Pattern.java 
Log Message:
Stricter checks of integer (comparison) patterns.

Index: Pattern.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/Pattern.java,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -d -r1.63 -r1.64
*** Pattern.java	9 Jul 2003 23:03:20 -0000	1.63
--- Pattern.java	15 Jul 2003 11:11:22 -0000	1.64
***************
*** 485,492 ****
      if (atIntValue())
        {
! 	if (Typing.testRigidLeq(domaintc, PrimitiveType.intTC))
! 	  tc = PrimitiveType.intTC;
!         else if (Typing.testRigidLeq(domaintc, PrimitiveType.longTC))
! 	  tc = PrimitiveType.longTC;
        }
    }
--- 485,504 ----
      if (atIntValue())
        {
!         if (domaintc != null)
!           {
! 	    if (Typing.testRigidLeq(domaintc, PrimitiveType.intTC))
! 	    {
! 	      tc = PrimitiveType.intTC;
! 	      return;
!             }
!             else if (Typing.testRigidLeq(domaintc, PrimitiveType.longTC))
! 	    {
! 	      tc = PrimitiveType.longTC;
! 	      return;
!             }
!             else if (Typing.testRigidLeq(domaintc, PrimitiveType.charTC))
!               return;
!           }    
!         User.error(location, "Integer value patterns are not allowed for methods where the declared parameter isn't a primitive type.");
        }
    }