Re: [PATCH] Add hook for re_dup() into regex engine as reg_dupe (make re pluggable under threads)

Message-ID: <9b18b3110609290341p11767110sec20a6fee2038a00@mail.gmail.com>

p4raw-id: //depot/perl@28900

1 files changed, 93 insertions, 93 deletions

diff --git a/regnodes.h b/regnodes.h
index b967287a95..31286f9c84 100644
--- a/regnodes.h
+++ b/regnodes.h
@@ -7,101 +7,101 @@
 #define REGNODE_MAX           	66
 #define REGMATCH_STATE_MAX    	91
 
-#define	END                   	0	/*0000 End of program.*/
-#define	SUCCEED               	1	/*0x01 Return from a subroutine, basically.*/
-#define	BOL                   	2	/*0x02 Match "" at beginning of line.*/
-#define	MBOL                  	3	/*0x03 Same, assuming multiline.*/
-#define	SBOL                  	4	/*0x04 Same, assuming singleline.*/
-#define	EOS                   	5	/*0x05 Match "" at end of string.*/
-#define	EOL                   	6	/*0x06 Match "" at end of line.*/
-#define	MEOL                  	7	/*0x07 Same, assuming multiline.*/
-#define	SEOL                  	8	/*0x08 Same, assuming singleline.*/
-#define	BOUND                 	9	/*0x09 Match "" at any word boundary*/
-#define	BOUNDL                	10	/*0x0a Match "" at any word boundary*/
-#define	NBOUND                	11	/*0x0b Match "" at any word non-boundary*/
-#define	NBOUNDL               	12	/*0x0c Match "" at any word non-boundary*/
-#define	GPOS                  	13	/*0x0d Matches where last m//g left off.*/
-#define	REG_ANY               	14	/*0x0e Match any one character (except newline).*/
-#define	SANY                  	15	/*0x0f Match any one character.*/
-#define	CANY                  	16	/*0x10 Match any one byte.*/
-#define	ANYOF                 	17	/*0x11 Match character in (or not in) this class.*/
-#define	ALNUM                 	18	/*0x12 Match any alphanumeric character*/
-#define	ALNUML                	19	/*0x13 Match any alphanumeric char in locale*/
-#define	NALNUM                	20	/*0x14 Match any non-alphanumeric character*/
-#define	NALNUML               	21	/*0x15 Match any non-alphanumeric char in locale*/
-#define	SPACE                 	22	/*0x16 Match any whitespace character*/
-#define	SPACEL                	23	/*0x17 Match any whitespace char in locale*/
-#define	NSPACE                	24	/*0x18 Match any non-whitespace character*/
-#define	NSPACEL               	25	/*0x19 Match any non-whitespace char in locale*/
-#define	DIGIT                 	26	/*0x1a Match any numeric character*/
-#define	DIGITL                	27	/*0x1b Match any numeric character in locale*/
-#define	NDIGIT                	28	/*0x1c Match any non-numeric character*/
-#define	NDIGITL               	29	/*0x1d Match any non-numeric character in locale*/
-#define	CLUMP                 	30	/*0x1e Match any combining character sequence*/
-#define	BRANCH                	31	/*0x1f Match this alternative, or the next...*/
-#define	BACK                  	32	/*0x20 Match "", "next" ptr points backward.*/
-#define	EXACT                 	33	/*0x21 Match this string (preceded by length).*/
-#define	EXACTF                	34	/*0x22 Match this string, folded (prec. by length).*/
-#define	EXACTFL               	35	/*0x23 Match this string, folded in locale (w/len).*/
-#define	NOTHING               	36	/*0x24 Match empty string.*/
-#define	TAIL                  	37	/*0x25 Match empty string. Can jump here from outside.*/
-#define	STAR                  	38	/*0x26 Match this (simple) thing 0 or more times.*/
-#define	PLUS                  	39	/*0x27 Match this (simple) thing 1 or more times.*/
-#define	CURLY                 	40	/*0x28 Match this simple thing {n,m} times.*/
-#define	CURLYN                	41	/*0x29 Match next-after-this simple thing*/
-#define	CURLYM                	42	/*0x2a Match this medium-complex thing {n,m} times.*/
-#define	CURLYX                	43	/*0x2b Match this complex thing {n,m} times.*/
-#define	WHILEM                	44	/*0x2c Do curly processing and see if rest matches.*/
-#define	OPEN                  	45	/*0x2d Mark this point in input as start of*/
-#define	CLOSE                 	46	/*0x2e Analogous to OPEN.*/
-#define	REF                   	47	/*0x2f Match some already matched string*/
-#define	REFF                  	48	/*0x30 Match already matched string, folded*/
-#define	REFFL                 	49	/*0x31 Match already matched string, folded in loc.*/
-#define	IFMATCH               	50	/*0x32 Succeeds if the following matches.*/
-#define	UNLESSM               	51	/*0x33 Fails if the following matches.*/
-#define	SUSPEND               	52	/*0x34 "Independent" sub-RE.*/
-#define	IFTHEN                	53	/*0x35 Switch, should be preceeded by switcher .*/
-#define	GROUPP                	54	/*0x36 Whether the group matched.*/
-#define	LONGJMP               	55	/*0x37 Jump far away.*/
-#define	BRANCHJ               	56	/*0x38 BRANCH with long offset.*/
-#define	EVAL                  	57	/*0x39 Execute some Perl code.*/
-#define	MINMOD                	58	/*0x3a Next operator is not greedy.*/
-#define	LOGICAL               	59	/*0x3b Next opcode should set the flag only.*/
-#define	RENUM                 	60	/*0x3c Group with independently numbered parens.*/
-#define	TRIE                  	61	/*0x3d Match many EXACT(FL?)? at once. flags==type*/
-#define	TRIEC                 	62	/*0x3e Same as TRIE, but with embedded charclass data*/
-#define	AHOCORASICK           	63	/*0x3f Aho Corasick stclass. flags==type*/
-#define	AHOCORASICKC          	64	/*0x40 Same as AHOCORASICK, but with embedded charclass data*/
-#define	OPTIMIZED             	65	/*0x41 Placeholder for dump.*/
-#define	PSEUDO                	66	/*0x42 Pseudo opcode for internal use.*/
+#define	END                   	0	/* 0000 End of program. */
+#define	SUCCEED               	1	/* 0x01 Return from a subroutine, basically. */
+#define	BOL                   	2	/* 0x02 Match "" at beginning of line. */
+#define	MBOL                  	3	/* 0x03 Same, assuming multiline. */
+#define	SBOL                  	4	/* 0x04 Same, assuming singleline. */
+#define	EOS                   	5	/* 0x05 Match "" at end of string. */
+#define	EOL                   	6	/* 0x06 Match "" at end of line. */
+#define	MEOL                  	7	/* 0x07 Same, assuming multiline. */
+#define	SEOL                  	8	/* 0x08 Same, assuming singleline. */
+#define	BOUND                 	9	/* 0x09 Match "" at any word boundary */
+#define	BOUNDL                	10	/* 0x0a Match "" at any word boundary */
+#define	NBOUND                	11	/* 0x0b Match "" at any word non-boundary */
+#define	NBOUNDL               	12	/* 0x0c Match "" at any word non-boundary */
+#define	GPOS                  	13	/* 0x0d Matches where last m//g left off. */
+#define	REG_ANY               	14	/* 0x0e Match any one character (except newline). */
+#define	SANY                  	15	/* 0x0f Match any one character. */
+#define	CANY                  	16	/* 0x10 Match any one byte. */
+#define	ANYOF                 	17	/* 0x11 Match character in (or not in) this class. */
+#define	ALNUM                 	18	/* 0x12 Match any alphanumeric character */
+#define	ALNUML                	19	/* 0x13 Match any alphanumeric char in locale */
+#define	NALNUM                	20	/* 0x14 Match any non-alphanumeric character */
+#define	NALNUML               	21	/* 0x15 Match any non-alphanumeric char in locale */
+#define	SPACE                 	22	/* 0x16 Match any whitespace character */
+#define	SPACEL                	23	/* 0x17 Match any whitespace char in locale */
+#define	NSPACE                	24	/* 0x18 Match any non-whitespace character */
+#define	NSPACEL               	25	/* 0x19 Match any non-whitespace char in locale */
+#define	DIGIT                 	26	/* 0x1a Match any numeric character */
+#define	DIGITL                	27	/* 0x1b Match any numeric character in locale */
+#define	NDIGIT                	28	/* 0x1c Match any non-numeric character */
+#define	NDIGITL               	29	/* 0x1d Match any non-numeric character in locale */
+#define	CLUMP                 	30	/* 0x1e Match any combining character sequence */
+#define	BRANCH                	31	/* 0x1f Match this alternative, or the next... */
+#define	BACK                  	32	/* 0x20 Match "", "next" ptr points backward. */
+#define	EXACT                 	33	/* 0x21 Match this string (preceded by length). */
+#define	EXACTF                	34	/* 0x22 Match this string, folded (prec. by length). */
+#define	EXACTFL               	35	/* 0x23 Match this string, folded in locale (w/len). */
+#define	NOTHING               	36	/* 0x24 Match empty string. */
+#define	TAIL                  	37	/* 0x25 Match empty string. Can jump here from outside. */
+#define	STAR                  	38	/* 0x26 Match this (simple) thing 0 or more times. */
+#define	PLUS                  	39	/* 0x27 Match this (simple) thing 1 or more times. */
+#define	CURLY                 	40	/* 0x28 Match this simple thing {n,m} times. */
+#define	CURLYN                	41	/* 0x29 Match next-after-this simple thing */
+#define	CURLYM                	42	/* 0x2a Match this medium-complex thing {n,m} times. */
+#define	CURLYX                	43	/* 0x2b Match this complex thing {n,m} times. */
+#define	WHILEM                	44	/* 0x2c Do curly processing and see if rest matches. */
+#define	OPEN                  	45	/* 0x2d Mark this point in input as start of */
+#define	CLOSE                 	46	/* 0x2e Analogous to OPEN. */
+#define	REF                   	47	/* 0x2f Match some already matched string */
+#define	REFF                  	48	/* 0x30 Match already matched string, folded */
+#define	REFFL                 	49	/* 0x31 Match already matched string, folded in loc. */
+#define	IFMATCH               	50	/* 0x32 Succeeds if the following matches. */
+#define	UNLESSM               	51	/* 0x33 Fails if the following matches. */
+#define	SUSPEND               	52	/* 0x34 "Independent" sub-RE. */
+#define	IFTHEN                	53	/* 0x35 Switch, should be preceeded by switcher . */
+#define	GROUPP                	54	/* 0x36 Whether the group matched. */
+#define	LONGJMP               	55	/* 0x37 Jump far away. */
+#define	BRANCHJ               	56	/* 0x38 BRANCH with long offset. */
+#define	EVAL                  	57	/* 0x39 Execute some Perl code. */
+#define	MINMOD                	58	/* 0x3a Next operator is not greedy. */
+#define	LOGICAL               	59	/* 0x3b Next opcode should set the flag only. */
+#define	RENUM                 	60	/* 0x3c Group with independently numbered parens. */
+#define	TRIE                  	61	/* 0x3d Match many EXACT(FL?)? at once. flags==type */
+#define	TRIEC                 	62	/* 0x3e Same as TRIE, but with embedded charclass data */
+#define	AHOCORASICK           	63	/* 0x3f Aho Corasick stclass. flags==type */
+#define	AHOCORASICKC          	64	/* 0x40 Same as AHOCORASICK, but with embedded charclass data */
+#define	OPTIMIZED             	65	/* 0x41 Placeholder for dump. */
+#define	PSEUDO                	66	/* 0x42 Pseudo opcode for internal use. */
 
 	/* ------------ States ------------- */
 
-#define	TRIE_next             	67	/*0x43 Regmatch state for TRIE*/
-#define	TRIE_next_fail        	68	/*0x44 Regmatch state for TRIE*/
-#define	EVAL_AB               	69	/*0x45 Regmatch state for EVAL*/
-#define	EVAL_AB_fail          	70	/*0x46 Regmatch state for EVAL*/
-#define	resume_CURLYX         	71	/*0x47 Regmatch state for CURLYX*/
-#define	resume_WHILEM1        	72	/*0x48 Regmatch state for WHILEM*/
-#define	resume_WHILEM2        	73	/*0x49 Regmatch state for WHILEM*/
-#define	resume_WHILEM3        	74	/*0x4a Regmatch state for WHILEM*/
-#define	resume_WHILEM4        	75	/*0x4b Regmatch state for WHILEM*/
-#define	resume_WHILEM5        	76	/*0x4c Regmatch state for WHILEM*/
-#define	resume_WHILEM6        	77	/*0x4d Regmatch state for WHILEM*/
-#define	BRANCH_next           	78	/*0x4e Regmatch state for BRANCH*/
-#define	BRANCH_next_fail      	79	/*0x4f Regmatch state for BRANCH*/
-#define	CURLYM_A              	80	/*0x50 Regmatch state for CURLYM*/
-#define	CURLYM_A_fail         	81	/*0x51 Regmatch state for CURLYM*/
-#define	CURLYM_B              	82	/*0x52 Regmatch state for CURLYM*/
-#define	CURLYM_B_fail         	83	/*0x53 Regmatch state for CURLYM*/
-#define	IFMATCH_A             	84	/*0x54 Regmatch state for IFMATCH*/
-#define	IFMATCH_A_fail        	85	/*0x55 Regmatch state for IFMATCH*/
-#define	CURLY_B_min_known     	86	/*0x56 Regmatch state for CURLY*/
-#define	CURLY_B_min_known_fail	87	/*0x57 Regmatch state for CURLY*/
-#define	CURLY_B_min           	88	/*0x58 Regmatch state for CURLY*/
-#define	CURLY_B_min_fail      	89	/*0x59 Regmatch state for CURLY*/
-#define	CURLY_B_max           	90	/*0x5a Regmatch state for CURLY*/
-#define	CURLY_B_max_fail      	91	/*0x5b Regmatch state for CURLY*/
+#define	TRIE_next             	67	/* 0x43 Regmatch state for TRIE */
+#define	TRIE_next_fail        	68	/* 0x44 Regmatch state for TRIE */
+#define	EVAL_AB               	69	/* 0x45 Regmatch state for EVAL */
+#define	EVAL_AB_fail          	70	/* 0x46 Regmatch state for EVAL */
+#define	resume_CURLYX         	71	/* 0x47 Regmatch state for CURLYX */
+#define	resume_WHILEM1        	72	/* 0x48 Regmatch state for WHILEM */
+#define	resume_WHILEM2        	73	/* 0x49 Regmatch state for WHILEM */
+#define	resume_WHILEM3        	74	/* 0x4a Regmatch state for WHILEM */
+#define	resume_WHILEM4        	75	/* 0x4b Regmatch state for WHILEM */
+#define	resume_WHILEM5        	76	/* 0x4c Regmatch state for WHILEM */
+#define	resume_WHILEM6        	77	/* 0x4d Regmatch state for WHILEM */
+#define	BRANCH_next           	78	/* 0x4e Regmatch state for BRANCH */
+#define	BRANCH_next_fail      	79	/* 0x4f Regmatch state for BRANCH */
+#define	CURLYM_A              	80	/* 0x50 Regmatch state for CURLYM */
+#define	CURLYM_A_fail         	81	/* 0x51 Regmatch state for CURLYM */
+#define	CURLYM_B              	82	/* 0x52 Regmatch state for CURLYM */
+#define	CURLYM_B_fail         	83	/* 0x53 Regmatch state for CURLYM */
+#define	IFMATCH_A             	84	/* 0x54 Regmatch state for IFMATCH */
+#define	IFMATCH_A_fail        	85	/* 0x55 Regmatch state for IFMATCH */
+#define	CURLY_B_min_known     	86	/* 0x56 Regmatch state for CURLY */
+#define	CURLY_B_min_known_fail	87	/* 0x57 Regmatch state for CURLY */
+#define	CURLY_B_min           	88	/* 0x58 Regmatch state for CURLY */
+#define	CURLY_B_min_fail      	89	/* 0x59 Regmatch state for CURLY */
+#define	CURLY_B_max           	90	/* 0x5a Regmatch state for CURLY */
+#define	CURLY_B_max_fail      	91	/* 0x5b Regmatch state for CURLY */
 
 
 #ifndef DOINIT
@@ -347,7 +347,7 @@ static const char reg_off_by_arg[] = {
 };
 
 #ifdef DEBUGGING
-extern const char * const reg_name[] = {
+const char * const reg_name[] = {
 	"END",                   	/* 0000 */
 	"SUCCEED",               	/* 0x01 */
 	"BOL",                   	/* 0x02 */