X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=regcomp.h;h=3e3f2239d863e3116da6d608a3d0a94e997aa4ac;hb=b0d07b4e8d25114701bc6954107375b0bddf5764;hp=1a0916adb0cbb5690b2d9bcdfe52948f1b91a34f;hpb=fe578d7fdd84ab0398dc36da7f84e59e1f2bb290;p=p5sagit%2Fp5-mst-13.2.git diff --git a/regcomp.h b/regcomp.h index 1a0916a..3e3f223 100644 --- a/regcomp.h +++ b/regcomp.h @@ -7,6 +7,7 @@ * License or the Artistic License, as specified in the README file. * */ +#include "regcharclass.h" typedef OP OP_4tree; /* Will be redefined later. */ @@ -177,7 +178,7 @@ struct regnode_2 { #define ANYOF_BITMAP_SIZE 32 /* 256 b/(8 b/B) */ -#define ANYOF_CLASSBITMAP_SIZE 4 /* up to 32 (8*4) named classes */ +#define ANYOF_CLASSBITMAP_SIZE 4 /* up to 40 (8*5) named classes */ /* also used by trie */ struct regnode_charclass { @@ -345,6 +346,14 @@ struct regnode_charclass_class { /* has [[:blah:]] classes */ #define ANYOF_MAX 32 +/* pseudo classes, not stored in the class bitmap, but used as flags + during compilation of char classes */ + +#define ANYOF_VERTWS (ANYOF_MAX+1) +#define ANYOF_NVERTWS (ANYOF_MAX+2) +#define ANYOF_HORIZWS (ANYOF_MAX+3) +#define ANYOF_NHORIZWS (ANYOF_MAX+4) + /* Backward source code compatibility. */ #define ANYOF_ALNUML ANYOF_ALNUM @@ -444,6 +453,8 @@ EXTCONST U8 PL_simple[] = { SPACE, SPACEL, NSPACE, NSPACEL, DIGIT, NDIGIT, + VERTWS, NVERTWS, + HORIZWS, NHORIZWS, 0 }; #endif @@ -460,7 +471,7 @@ EXTCONST regexp_engine PL_core_reg_engine = { Perl_regfree_internal, Perl_reg_numbered_buff_get, Perl_reg_named_buff_get, - Perl_reg_qr_pkg, + Perl_reg_qr_package, #if defined(USE_ITHREADS) Perl_regdupe_internal #endif @@ -799,3 +810,4 @@ re.pm, especially to the documentation. #endif /* DEBUG RELATED DEFINES */ +