[Jython-checkins] CVS: jython/org/python/core PyString.java,2.37,2.38

[Finn B. <bc...@us...>]

Update of /cvsroot/jython/jython/org/python/core
In directory usw-pr-cvs1:/tmp/cvs-serv20600

Modified Files:
	PyString.java 
Log Message:
count(): Fix a one-off bug regarding the end index.



Index: PyString.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PyString.java,v
retrieving revision 2.37
retrieving revision 2.38
diff -C2 -r2.37 -r2.38
*** PyString.java	2001/02/02 09:28:37	2.37
--- PyString.java	2001/02/02 13:07:32	2.38
***************
*** 1095,1110 ****
  
      public int count(String sub, int start, int end) {
!         int n = string.length();
!         if (start < 0)
!             start = n+start;
          if (end < 0)
!             end = n+end;
!         if (end > n)
!             end = n;
!         if (start > end)
!             start = end;
  
!         int slen = sub.length();
!         //end = end-slen;
  
          int count=0;
--- 1095,1114 ----
  
      public int count(String sub, int start, int end) {
!         int len = string.length();
!         if (end > len)
!             end = len;
!         if (end < 0)
!             end += len;
          if (end < 0)
!             end = 0;
!         if (start < 0)
!             start += len;
!         if (start < 0)
!             start = 0;
  
!         int n = sub.length();
!         end = end + 1 - n;
!         if (n == 0)
!             return end-start;
  
          int count=0;
***************
*** 1114,1118 ****
                  break;
              count++;
!             start = index+slen;
          }
          return count;
--- 1118,1122 ----
                  break;
              count++;
!             start = index + n;
          }
          return count;