cvs commit: jakarta-oro/src/java/org/apache/oro/text/regex Perl5Matcher.java

dfs         2003/02/23 19:34:09

  Modified:    .        CHANGES build.properties
               src/java/org/apache/oro/text/regex Perl5Matcher.java
  Log:
  
  
  Revision  Changes    Path
  1.34      +6 -1      jakarta-oro/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/jakarta-oro/CHANGES,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- CHANGES	26 Jan 2003 02:26:53 -0000	1.33
  +++ CHANGES	24 Feb 2003 03:34:09 -0000	1.34
  @@ -1,5 +1,10 @@
   $Id$
   
  +Version 2.0.8-dev-1
  + o Fixed embarrassing bug whereby an expression like (A)(B)((C)(D))+
  +   when matched against input like ABCDE would produce matching groups
  +   of: "A" "B" "" null "D" instead of "A" "B" "CD" "C" "D".
  +
   Version 2.0.7
    o Made Perl5Util.toString() return null if no match exists in keeping
      with the MatchResult interface.  Previously, a NullPointerException
  
  
  
  1.7       +4 -4      jakarta-oro/build.properties
  
  Index: build.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-oro/build.properties,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- build.properties	26 Jan 2003 02:26:53 -0000	1.6
  +++ build.properties	24 Feb 2003 03:34:09 -0000	1.7
  @@ -12,13 +12,13 @@
   # Name and version information
   name=Jakarta-ORO
   project=jakarta-oro
  -version=2.0.7
  +version=2.0.8-dev-1
   
   # Name and version of the project
   project.name=${project}-${version}
   
   top.dir=.
  -year=2000-2002
  +year=2000-2003
   
   jakarta-site2.dir=../jakarta-site2
   
  @@ -82,7 +82,7 @@
   # Document constants
   #company.name=Apache Software Foundation
     
  -#copyright.date=2000-2002
  +#copyright.date=2000-2003
   #copyright.message=Copyright © ${copyright.date} ${company.name}. All Rights Reserved.
   
   # Time stamp patterns
  
  
  
  1.23      +2 -2      jakarta-oro/src/java/org/apache/oro/text/regex/Perl5Matcher.java
  
  Index: Perl5Matcher.java
  ===================================================================
  RCS file: /home/cvs/jakarta-oro/src/java/org/apache/oro/text/regex/Perl5Matcher.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- Perl5Matcher.java	3 Jan 2003 17:18:08 -0000	1.22
  +++ Perl5Matcher.java	24 Feb 2003 03:34:09 -0000	1.23
  @@ -167,7 +167,7 @@
       state[1] = __lastParen;
       state[2] = __inputOffset;
   
  -    for(paren = __expSize; paren > parenFloor; paren-=3, stateEntries-=3) {
  +    for(paren = __expSize; paren > parenFloor; --paren, stateEntries-=3) {
         state[stateEntries]     = __endMatchOffsets[paren];
         state[stateEntries + 1] = __beginMatchOffsets[paren];
         state[stateEntries + 2] = paren;