X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=regcomp.c;h=0d6b581b74456bbce0f0e7f629a1cb8c086225d7;hb=014822e4c0d7b7cfffc319235fe7ea64ec87ecae;hp=d68b351e9c4fcd0dda4037e6cb86a876919d2af6;hpb=f1dbda3de5c3411948f38b5bfb0bf037571d20a6;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/regcomp.c b/regcomp.c
index d68b351..0d6b581 100644
--- a/regcomp.c
+++ b/regcomp.c
@@ -2297,7 +2297,7 @@ STATIC regnode *
 S_regclass(pTHX)
 {
     dTHR;
-    register I32 value;
+    register UV value;
     register I32 lastvalue = OOB_CHAR8;
     register I32 range = 0;
     register regnode *ret;
@@ -2491,16 +2491,28 @@ S_regclass(pTHX)
 		    if (LOC)
 			ANYOF_CLASS_SET(ret, ANYOF_ASCII);
 		    else {
+#ifdef ASCIIish
 			for (value = 0; value < 128; value++)
 			    ANYOF_BITMAP_SET(ret, value);
+#else  /* EBCDIC */
+			for (value = 0; value < 256; value++)
+			    if (isASCII(value))
+				ANYOF_BITMAP_SET(ret, value);
+#endif /* EBCDIC */
 		    }
 		    break;
 		case ANYOF_NASCII:
 		    if (LOC)
 			ANYOF_CLASS_SET(ret, ANYOF_NASCII);
 		    else {
+#ifdef ASCIIish
 			for (value = 128; value < 256; value++)
 			    ANYOF_BITMAP_SET(ret, value);
+#else  /* EBCDIC */
+			for (value = 0; value < 256; value++)
+			    if (!isASCII(value))
+				ANYOF_BITMAP_SET(ret, value);
+#endif /* EBCDIC */
 		    }
 		    break;
 		case ANYOF_CNTRL:
@@ -2725,7 +2737,7 @@ S_regclassutf8(pTHX)
 {
     dTHR;
     register char *e;
-    register U32 value;
+    register UV value;
     register U32 lastvalue = OOB_UTF8;
     register I32 range = 0;
     register regnode *ret;
@@ -3502,39 +3514,39 @@ Perl_save_re_context(pTHX)
     SAVEPPTR(PL_reginput);		/* String-input pointer. */
     SAVEPPTR(PL_regbol);		/* Beginning of input, for ^ check. */
     SAVEPPTR(PL_regeol);		/* End of input, for $ check. */
-    SAVESPTR(PL_regstartp);		/* Pointer to startp array. */
-    SAVESPTR(PL_regendp);		/* Ditto for endp. */
-    SAVESPTR(PL_reglastparen);		/* Similarly for lastparen. */
+    SAVEVPTR(PL_regstartp);		/* Pointer to startp array. */
+    SAVEVPTR(PL_regendp);		/* Ditto for endp. */
+    SAVEVPTR(PL_reglastparen);		/* Similarly for lastparen. */
     SAVEPPTR(PL_regtill);		/* How far we are required to go. */
     SAVEI32(PL_regprev);		/* char before regbol, \n if none */
-    SAVESPTR(PL_reg_start_tmp);		/* from regexec.c */
+    SAVEVPTR(PL_reg_start_tmp);		/* from regexec.c */
     PL_reg_start_tmp = 0;
     SAVEFREEPV(PL_reg_start_tmp);
     SAVEI32(PL_reg_start_tmpl);		/* from regexec.c */
     PL_reg_start_tmpl = 0;
-    SAVESPTR(PL_regdata);
+    SAVEVPTR(PL_regdata);
     SAVEI32(PL_reg_flags);		/* from regexec.c */
     SAVEI32(PL_reg_eval_set);		/* from regexec.c */
     SAVEI32(PL_regnarrate);		/* from regexec.c */
-    SAVESPTR(PL_regprogram);		/* from regexec.c */
+    SAVEVPTR(PL_regprogram);		/* from regexec.c */
     SAVEINT(PL_regindent);		/* from regexec.c */
-    SAVESPTR(PL_regcc);			/* from regexec.c */
-    SAVESPTR(PL_curcop);
-    SAVESPTR(PL_regcomp_rx);		/* from regcomp.c */
+    SAVEVPTR(PL_regcc);			/* from regexec.c */
+    SAVEVPTR(PL_curcop);
+    SAVEVPTR(PL_regcomp_rx);		/* from regcomp.c */
     SAVEI32(PL_regseen);		/* from regcomp.c */
     SAVEI32(PL_regsawback);		/* Did we see \1, ...? */
     SAVEI32(PL_regnaughty);		/* How bad is this pattern? */
-    SAVESPTR(PL_regcode);		/* Code-emit pointer; &regdummy = don't */
+    SAVEVPTR(PL_regcode);		/* Code-emit pointer; &regdummy = don't */
     SAVEPPTR(PL_regxend);		/* End of input for compile */
     SAVEPPTR(PL_regcomp_parse);		/* Input-scan pointer. */
-    SAVESPTR(PL_reg_call_cc);		/* from regexec.c */
-    SAVESPTR(PL_reg_re);		/* from regexec.c */
+    SAVEVPTR(PL_reg_call_cc);		/* from regexec.c */
+    SAVEVPTR(PL_reg_re);		/* from regexec.c */
     SAVEPPTR(PL_reg_ganch);		/* from regexec.c */
     SAVESPTR(PL_reg_sv);		/* from regexec.c */
-    SAVESPTR(PL_reg_magic);		/* from regexec.c */
+    SAVEVPTR(PL_reg_magic);		/* from regexec.c */
     SAVEI32(PL_reg_oldpos);			/* from regexec.c */
-    SAVESPTR(PL_reg_oldcurpm);		/* from regexec.c */
-    SAVESPTR(PL_reg_curpm);		/* from regexec.c */
+    SAVEVPTR(PL_reg_oldcurpm);		/* from regexec.c */
+    SAVEVPTR(PL_reg_curpm);		/* from regexec.c */
 #ifdef DEBUGGING
     SAVEPPTR(PL_reg_starttry);		/* from regexec.c */    
 #endif