[Pcre-svn] [721] code/trunk: Comment correction and minor co…

Startseite
Nachricht löschen
Autor: Subversion repository
Datum:  
To: pcre-svn
Betreff: [Pcre-svn] [721] code/trunk: Comment correction and minor code improvement.
Revision: 721
          http://vcs.pcre.org/viewvc?view=rev&revision=721
Author:   ph10
Date:     2011-10-07 16:51:39 +0100 (Fri, 07 Oct 2011)


Log Message:
-----------
Comment correction and minor code improvement.

Modified Paths:
--------------
    code/trunk/pcre_compile.c
    code/trunk/pcre_exec.c


Modified: code/trunk/pcre_compile.c
===================================================================
--- code/trunk/pcre_compile.c    2011-10-07 15:18:21 UTC (rev 720)
+++ code/trunk/pcre_compile.c    2011-10-07 15:51:39 UTC (rev 721)
@@ -5932,11 +5932,10 @@
       cd->assert_depth -= 1;


     /* At the end of compiling, code is still pointing to the start of the
-    group, while tempcode has been updated to point past the end of the group
-    and any option resetting that may follow it. The pattern pointer (ptr)
-    is on the bracket. */
+    group, while tempcode has been updated to point past the end of the group.
+    The pattern pointer (ptr) is on the bracket.


-    /* If this is a conditional bracket, check that there are no more than
+    If this is a conditional bracket, check that there are no more than
     two branches in the group, or just one if it's a DEFINE group. We do this
     in the real compile phase, not in the pre-pass, where the whole group may
     not be available. */


Modified: code/trunk/pcre_exec.c
===================================================================
--- code/trunk/pcre_exec.c    2011-10-07 15:18:21 UTC (rev 720)
+++ code/trunk/pcre_exec.c    2011-10-07 15:51:39 UTC (rev 721)
@@ -1750,8 +1750,7 @@
     assertions. We also need to record the match start in case it was changed
     by \K. */


-    if (*prev == OP_ASSERT || *prev == OP_ASSERT_NOT ||
-        *prev == OP_ASSERTBACK || *prev == OP_ASSERTBACK_NOT)
+    if (*prev >= OP_ASSERT && *prev <= OP_ASSERTBACK_NOT)
       {
       md->end_match_ptr = eptr;      /* For ONCE */
       md->end_offset_top = offset_top;