X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=regnodes.h;h=c5725cd70715661d88fa7c724e2f2e3a1720cb0d;hb=f948ffe74d98a1c774305dd651dca94c0aceed38;hp=030fa1a2c07f870de38f941710a9a18ab26ef5ee;hpb=885f9e59968d66740b5c621739ead374e8e37a2b;p=p5sagit%2Fp5-mst-13.2.git diff --git a/regnodes.h b/regnodes.h index 030fa1a..c5725cd 100644 --- a/regnodes.h +++ b/regnodes.h @@ -28,57 +28,61 @@ #define ANYOF 22 /* 0x16 Match character in (or not in) this class. */ #define ANYOFUTF8 23 /* 0x17 Match character in (or not in) this class. */ #define ALNUM 24 /* 0x18 Match any alphanumeric character */ -#define ALNUMUTF8 25 /* 0x19 Match any alphanumeric character */ +#define ALNUMUTF8 25 /* 0x19 Match any alphanumeric character in utf8 */ #define ALNUML 26 /* 0x1a Match any alphanumeric char in locale */ -#define ALNUMLUTF8 27 /* 0x1b Match any alphanumeric char in locale */ +#define ALNUMLUTF8 27 /* 0x1b Match any alphanumeric char in locale+utf8 */ #define NALNUM 28 /* 0x1c Match any non-alphanumeric character */ -#define NALNUMUTF8 29 /* 0x1d Match any non-alphanumeric character */ +#define NALNUMUTF8 29 /* 0x1d Match any non-alphanumeric character in utf8 */ #define NALNUML 30 /* 0x1e Match any non-alphanumeric char in locale */ -#define NALNUMLUTF8 31 /* 0x1f Match any non-alphanumeric char in locale */ +#define NALNUMLUTF8 31 /* 0x1f Match any non-alphanumeric char in locale+utf8 */ #define SPACE 32 /* 0x20 Match any whitespace character */ -#define SPACEUTF8 33 /* 0x21 Match any whitespace character */ +#define SPACEUTF8 33 /* 0x21 Match any whitespace character in utf8 */ #define SPACEL 34 /* 0x22 Match any whitespace char in locale */ -#define SPACELUTF8 35 /* 0x23 Match any whitespace char in locale */ +#define SPACELUTF8 35 /* 0x23 Match any whitespace char in locale+utf8 */ #define NSPACE 36 /* 0x24 Match any non-whitespace character */ -#define NSPACEUTF8 37 /* 0x25 Match any non-whitespace character */ +#define NSPACEUTF8 37 /* 0x25 Match any non-whitespace character in utf8 */ #define NSPACEL 38 /* 0x26 Match any non-whitespace char in locale */ -#define NSPACELUTF8 39 /* 0x27 Match any non-whitespace char in locale */ +#define NSPACELUTF8 39 /* 0x27 Match any non-whitespace char in locale+utf8 */ #define DIGIT 40 /* 0x28 Match any numeric character */ -#define DIGITUTF8 41 /* 0x29 Match any numeric character */ -#define NDIGIT 42 /* 0x2a Match any non-numeric character */ -#define NDIGITUTF8 43 /* 0x2b Match any non-numeric character */ -#define CLUMP 44 /* 0x2c Match any combining character sequence */ -#define BRANCH 45 /* 0x2d Match this alternative, or the next... */ -#define BACK 46 /* 0x2e Match "", "next" ptr points backward. */ -#define EXACT 47 /* 0x2f Match this string (preceded by length). */ -#define EXACTF 48 /* 0x30 Match this string, folded (prec. by length). */ -#define EXACTFL 49 /* 0x31 Match this string, folded in locale (w/len). */ -#define NOTHING 50 /* 0x32 Match empty string. */ -#define TAIL 51 /* 0x33 Match empty string. Can jump here from outside. */ -#define STAR 52 /* 0x34 Match this (simple) thing 0 or more times. */ -#define PLUS 53 /* 0x35 Match this (simple) thing 1 or more times. */ -#define CURLY 54 /* 0x36 Match this simple thing {n,m} times. */ -#define CURLYN 55 /* 0x37 Match next-after-this simple thing */ -#define CURLYM 56 /* 0x38 Match this medium-complex thing {n,m} times. */ -#define CURLYX 57 /* 0x39 Match this complex thing {n,m} times. */ -#define WHILEM 58 /* 0x3a Do curly processing and see if rest matches. */ -#define OPEN 59 /* 0x3b Mark this point in input as start of #n. */ -#define CLOSE 60 /* 0x3c Analogous to OPEN. */ -#define REF 61 /* 0x3d Match some already matched string */ -#define REFF 62 /* 0x3e Match already matched string, folded */ -#define REFFL 63 /* 0x3f Match already matched string, folded in loc. */ -#define IFMATCH 64 /* 0x40 Succeeds if the following matches. */ -#define UNLESSM 65 /* 0x41 Fails if the following matches. */ -#define SUSPEND 66 /* 0x42 "Independent" sub-RE. */ -#define IFTHEN 67 /* 0x43 Switch, should be preceeded by switcher . */ -#define GROUPP 68 /* 0x44 Whether the group matched. */ -#define LONGJMP 69 /* 0x45 Jump far away. */ -#define BRANCHJ 70 /* 0x46 BRANCH with long offset. */ -#define EVAL 71 /* 0x47 Execute some Perl code. */ -#define MINMOD 72 /* 0x48 Next operator is not greedy. */ -#define LOGICAL 73 /* 0x49 Next opcode should set the flag only. */ -#define RENUM 74 /* 0x4a Group with independently numbered parens. */ -#define OPTIMIZED 75 /* 0x4b Placeholder for dump. */ +#define DIGITUTF8 41 /* 0x29 Match any numeric character in utf8 */ +#define DIGITL 42 /* 0x2a Match any numeric character in locale */ +#define DIGITLUTF8 43 /* 0x2b Match any numeric character in locale+utf8 */ +#define NDIGIT 44 /* 0x2c Match any non-numeric character */ +#define NDIGITUTF8 45 /* 0x2d Match any non-numeric character in utf8 */ +#define NDIGITL 46 /* 0x2e Match any non-numeric character in locale */ +#define NDIGITLUTF8 47 /* 0x2f Match any non-numeric character in locale+utf8 */ +#define CLUMP 48 /* 0x30 Match any combining character sequence */ +#define BRANCH 49 /* 0x31 Match this alternative, or the next... */ +#define BACK 50 /* 0x32 Match "", "next" ptr points backward. */ +#define EXACT 51 /* 0x33 Match this string (preceded by length). */ +#define EXACTF 52 /* 0x34 Match this string, folded (prec. by length). */ +#define EXACTFL 53 /* 0x35 Match this string, folded in locale (w/len). */ +#define NOTHING 54 /* 0x36 Match empty string. */ +#define TAIL 55 /* 0x37 Match empty string. Can jump here from outside. */ +#define STAR 56 /* 0x38 Match this (simple) thing 0 or more times. */ +#define PLUS 57 /* 0x39 Match this (simple) thing 1 or more times. */ +#define CURLY 58 /* 0x3a Match this simple thing {n,m} times. */ +#define CURLYN 59 /* 0x3b Match next-after-this simple thing */ +#define CURLYM 60 /* 0x3c Match this medium-complex thing {n,m} times. */ +#define CURLYX 61 /* 0x3d Match this complex thing {n,m} times. */ +#define WHILEM 62 /* 0x3e Do curly processing and see if rest matches. */ +#define OPEN 63 /* 0x3f Mark this point in input as start of #n. */ +#define CLOSE 64 /* 0x40 Analogous to OPEN. */ +#define REF 65 /* 0x41 Match some already matched string */ +#define REFF 66 /* 0x42 Match already matched string, folded */ +#define REFFL 67 /* 0x43 Match already matched string, folded in loc. */ +#define IFMATCH 68 /* 0x44 Succeeds if the following matches. */ +#define UNLESSM 69 /* 0x45 Fails if the following matches. */ +#define SUSPEND 70 /* 0x46 "Independent" sub-RE. */ +#define IFTHEN 71 /* 0x47 Switch, should be preceeded by switcher . */ +#define GROUPP 72 /* 0x48 Whether the group matched. */ +#define LONGJMP 73 /* 0x49 Jump far away. */ +#define BRANCHJ 74 /* 0x4a BRANCH with long offset. */ +#define EVAL 75 /* 0x4b Execute some Perl code. */ +#define MINMOD 76 /* 0x4c Next operator is not greedy. */ +#define LOGICAL 77 /* 0x4d Next opcode should set the flag only. */ +#define RENUM 78 /* 0x4e Group with independently numbered parens. */ +#define OPTIMIZED 79 /* 0x4f Placeholder for dump. */ #ifndef DOINIT EXTCONST U8 PL_regkind[]; @@ -126,8 +130,12 @@ EXTCONST U8 PL_regkind[] = { NSPACE, /* NSPACELUTF8 */ DIGIT, /* DIGIT */ DIGIT, /* DIGITUTF8 */ + DIGIT, /* DIGITL */ + DIGIT, /* DIGITLUTF8 */ NDIGIT, /* NDIGIT */ NDIGIT, /* NDIGITUTF8 */ + NDIGIT, /* NDIGITL */ + NDIGIT, /* NDIGITLUTF8 */ CLUMP, /* CLUMP */ BRANCH, /* BRANCH */ BACK, /* BACK */ @@ -208,8 +216,12 @@ const static U8 regarglen[] = { 0, /* NSPACELUTF8 */ 0, /* DIGIT */ 0, /* DIGITUTF8 */ + 0, /* DIGITL */ + 0, /* DIGITLUTF8 */ 0, /* NDIGIT */ 0, /* NDIGITUTF8 */ + 0, /* NDIGITL */ + 0, /* NDIGITLUTF8 */ 0, /* CLUMP */ 0, /* BRANCH */ 0, /* BACK */ @@ -287,8 +299,12 @@ const static char reg_off_by_arg[] = { 0, /* NSPACELUTF8 */ 0, /* DIGIT */ 0, /* DIGITUTF8 */ + 0, /* DIGITL */ + 0, /* DIGITLUTF8 */ 0, /* NDIGIT */ 0, /* NDIGITUTF8 */ + 0, /* NDIGITL */ + 0, /* NDIGITLUTF8 */ 0, /* CLUMP */ 0, /* BRANCH */ 0, /* BACK */ @@ -367,43 +383,47 @@ const static char * const reg_name[] = { "NSPACELUTF8", /* 0x27 */ "DIGIT", /* 0x28 */ "DIGITUTF8", /* 0x29 */ - "NDIGIT", /* 0x2a */ - "NDIGITUTF8", /* 0x2b */ - "CLUMP", /* 0x2c */ - "BRANCH", /* 0x2d */ - "BACK", /* 0x2e */ - "EXACT", /* 0x2f */ - "EXACTF", /* 0x30 */ - "EXACTFL", /* 0x31 */ - "NOTHING", /* 0x32 */ - "TAIL", /* 0x33 */ - "STAR", /* 0x34 */ - "PLUS", /* 0x35 */ - "CURLY", /* 0x36 */ - "CURLYN", /* 0x37 */ - "CURLYM", /* 0x38 */ - "CURLYX", /* 0x39 */ - "WHILEM", /* 0x3a */ - "OPEN", /* 0x3b */ - "CLOSE", /* 0x3c */ - "REF", /* 0x3d */ - "REFF", /* 0x3e */ - "REFFL", /* 0x3f */ - "IFMATCH", /* 0x40 */ - "UNLESSM", /* 0x41 */ - "SUSPEND", /* 0x42 */ - "IFTHEN", /* 0x43 */ - "GROUPP", /* 0x44 */ - "LONGJMP", /* 0x45 */ - "BRANCHJ", /* 0x46 */ - "EVAL", /* 0x47 */ - "MINMOD", /* 0x48 */ - "LOGICAL", /* 0x49 */ - "RENUM", /* 0x4a */ - "OPTIMIZED", /* 0x4b */ + "DIGITL", /* 0x2a */ + "DIGITLUTF8", /* 0x2b */ + "NDIGIT", /* 0x2c */ + "NDIGITUTF8", /* 0x2d */ + "NDIGITL", /* 0x2e */ + "NDIGITLUTF8", /* 0x2f */ + "CLUMP", /* 0x30 */ + "BRANCH", /* 0x31 */ + "BACK", /* 0x32 */ + "EXACT", /* 0x33 */ + "EXACTF", /* 0x34 */ + "EXACTFL", /* 0x35 */ + "NOTHING", /* 0x36 */ + "TAIL", /* 0x37 */ + "STAR", /* 0x38 */ + "PLUS", /* 0x39 */ + "CURLY", /* 0x3a */ + "CURLYN", /* 0x3b */ + "CURLYM", /* 0x3c */ + "CURLYX", /* 0x3d */ + "WHILEM", /* 0x3e */ + "OPEN", /* 0x3f */ + "CLOSE", /* 0x40 */ + "REF", /* 0x41 */ + "REFF", /* 0x42 */ + "REFFL", /* 0x43 */ + "IFMATCH", /* 0x44 */ + "UNLESSM", /* 0x45 */ + "SUSPEND", /* 0x46 */ + "IFTHEN", /* 0x47 */ + "GROUPP", /* 0x48 */ + "LONGJMP", /* 0x49 */ + "BRANCHJ", /* 0x4a */ + "EVAL", /* 0x4b */ + "MINMOD", /* 0x4c */ + "LOGICAL", /* 0x4d */ + "RENUM", /* 0x4e */ + "OPTIMIZED", /* 0x4f */ }; -const static int reg_num = 76; +const static int reg_num = 80; #endif /* DEBUGGING */ #endif /* REG_COMP_C */