Attachment 9872 Details for Bug 4137 – Additional patch: OP_ANY (.) did only check for \n but should use new method isNewline

[patch] Additional patch: OP_ANY (.) did only check for \n but should use new method isNewline

patch_OP_ANY_and_newline.txt (text/plain), 1.25 KB, created by Hendrik Brummermann on 2004-01-09 11:51:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Hendrik Brummermann

Created: 2004-01-09 11:51:08 UTC

Size: 1.25 KB

patch

obsolete

>Index: RE.java
>===================================================================
>RCS file: /home/cvspublic/jakarta-regexp/src/java/org/apache/regexp/RE.java,v
>retrieving revision 1.14
>diff -u -r1.14 RE.java
>--- RE.java	6 Sep 2003 01:45:51 -0000	1.14
>+++ RE.java	9 Jan 2004 11:42:34 -0000
>@@ -1137,25 +1149,23 @@
>                     break;
> 
>                 case OP_ANY:
>
>                     if((matchFlags & MATCH_SINGLELINE) == MATCH_SINGLELINE) {
>                         // Match anything
>                         if(search.isEnd(idx))
>                         {
>                             return -1;
>                         }
>-                        idx++;
>-                        break;
>                     }
>                     else
>                     {
>                         // Match anything but a newline
>-                        if (search.isEnd(idx) || search.charAt(idx++) == '\n')
>+                        if (search.isEnd(idx) || isNewline(idx))
>                         {
>                             return -1;
>                         }
>-                        break;
>                     }
>+                    idx++;
>+                    break;
> 
>                 case OP_ATOM:
>                     {
>

Actions: View | Diff

Attachments on bug 4137: 9656 | 9746 | 9872