/[pcre]/code/trunk/pcre_dfa_exec.c

Diff of /code/trunk/pcre_dfa_exec.c

Parent Directory | Revision Log | View Patch Patch

-revision 236 by ph10,
Tue Sep 11 12:57:06 2007 UTC
+revision 341 by ph10,
Sat Apr 19 16:41:04 2008 UTC
 Line 6
  and semantics are as close as possible to those of the Perl 5 language.
                         Written by Philip Hazel
-            Copyright (c) 1997-2007 University of Cambridge
+            Copyright (c) 1997-2008 University of Cambridge
  -----------------------------------------------------------------------------
  Redistribution and use in source and binary forms, with or without
 Line 84 
 centralize the loading of these characte
  small value. ***NOTE*** If the start of this table is modified, the two tables
  that follow must also be modified. */
- static uschar coptable[] = {
+ static const uschar coptable[] = {
 ,                             /* End                                    */
 , 0, 0, 0, 0,                 /* \A, \G, \K, \B, \b                     */
 , 0, 0, 0, 0, 0,              /* \D, \d, \S, \s, \W, \w                 */
-, 0,                          /* Any, Anybyte                           */
+, 0, 0,                       /* Any, AllAny, Anybyte                   */
 , 0, 0,                       /* NOTPROP, PROP, EXTUNI                  */
 , 0, 0, 0, 0,                 /* \R, \H, \h, \V, \v                     */
 , 0, 0, 0, 0,                 /* \Z, \z, Opt, ^, $                      */
 Line 132 
 static uschar coptable[] = {
 ,                             /* DEF                                    */
 , 0,                          /* BRAZERO, BRAMINZERO                    */
 , 0, 0, 0,                    /* PRUNE, SKIP, THEN, COMMIT              */
-, 0                           /* FAIL, ACCEPT                           */
+, 0, 0                        /* FAIL, ACCEPT, SKIPZERO                 */
  };
  /* These 2 tables allow for compact code for testing for \D, \d, \S, \s, \W,
  and \w */
- static uschar toptable1[] = {
+ static const uschar toptable1[] = {
 , 0, 0, 0, 0, 0,
    ctype_digit, ctype_digit,
    ctype_space, ctype_space,
    ctype_word,  ctype_word,
-                              /* OP_ANY */
+, 0                            /* OP_ANY, OP_ALLANY */
  };
- static uschar toptable2[] = {
+ static const uschar toptable2[] = {
 , 0, 0, 0, 0, 0,
    ctype_digit, 0,
    ctype_space, 0,
    ctype_word,  0,
-                              /* OP_ANY */
+, 1                            /* OP_ANY, OP_ALLANY */
  };
 Line 223 
 Arguments:
    rlevel            function call recursion level
    recursing         regex recursive call level
- Returns:            > 0 =>
+ Returns:            > 0 => number of match offset pairs placed in offsets
-                     = 0 =>
+                     = 0 => offsets overflowed; longest matches are present
                       -1 => failed to match
                     < -1 => some kind of unexpected problem
 Line 694 
 for (;;)
        break;
        /*-----------------------------------------------------------------*/
+       case OP_SKIPZERO:
+       code += 1 + GET(code, 2);
+       while (*code == OP_ALT) code += GET(code, 1);
+       ADD_ACTIVE(code - start_code + 1 + LINK_SIZE, 0);
+       break;
+       /*-----------------------------------------------------------------*/
        case OP_CIRC:
        if ((ptr == start_subject && (md->moptions & PCRE_NOTBOL) == 0) ||
            ((ims & PCRE_MULTILINE) != 0 &&
-Line 737 
 for (;;)
+Line 744 
 for (;;)
        break;
        /*-----------------------------------------------------------------*/
+       case OP_ALLANY:
+       if (clen > 0)
+         { ADD_NEW(state_offset + 1, 0); }
+       break;
+       /*-----------------------------------------------------------------*/
        case OP_EODN:
        if (clen == 0 || (IS_NEWLINE(ptr) && ptr == end_subject - md->nllen))
          { ADD_ACTIVE(state_offset + 1, 0); }
-Line 852 
 for (;;)
+Line 865 
 for (;;)
  /* ========================================================================== */
        /* These opcodes likewise inspect the subject character, but have an
        argument that is not a data character. It is one of these opcodes:
-       OP_ANY, OP_DIGIT, OP_NOT_DIGIT, OP_WHITESPACE, OP_NOT_SPACE, OP_WORDCHAR,
+       OP_ANY, OP_ALLANY, OP_DIGIT, OP_NOT_DIGIT, OP_WHITESPACE, OP_NOT_SPACE,
-       OP_NOT_WORDCHAR. The value is loaded into d. */
+       OP_WORDCHAR, OP_NOT_WORDCHAR. The value is loaded into d. */
        case OP_TYPEPLUS:
        case OP_TYPEMINPLUS:
-Line 2162 
 for (;;)
+Line 2175 
 for (;;)
  /* ========================================================================== */
        /* These are the opcodes for fancy brackets of various kinds. We have
-       to use recursion in order to handle them. */
+       to use recursion in order to handle them. The "always failing" assersion
+       (?!) is optimised when compiling to OP_FAIL, so we have to support that,
+       though the other "backtracking verbs" are not supported. */
+       case OP_FAIL:
+       break;
        case OP_ASSERT:
        case OP_ASSERT_NOT:
-Line 2604 
 if ((md->moptions & (PCRE_BSR_ANYCRLF|PC
+Line 2622 
 if ((md->moptions & (PCRE_BSR_ANYCRLF|PC
      md->moptions |= re->options & (PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE);
  #ifdef BSR_ANYCRLF
    else md->moptions |= PCRE_BSR_ANYCRLF;
  #endif
    }
  /* Handle different types of newline. The three bits give eight cases. If
  nothing is set at run time, whatever was used at compile time applies. */

 Legend:



Removed from v.236
 


changed lines


 
Added in v.341
 Legend:



Removed from v.236
 


changed lines


 
Added in v.341
-Removed from v.236
+Added in v.341

	ViewVC Help
Powered by ViewVC 1.1.5