X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=regcomp.c;h=dd48f3cf99f8873fae09b65a9d54396c59d23ee7;hb=b6455c53c26be8a62e12a3f2a24a3a5086dd2c7b;hp=f876c541742b6bcbfab2dd50cd587ff74b819b12;hpb=7cf3a6a3b1c2b0edcdd2a882c2d730810d8f9910;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/regcomp.c b/regcomp.c
index f876c54..dd48f3c 100644
--- a/regcomp.c
+++ b/regcomp.c
@@ -1405,7 +1405,20 @@ S_make_trie(pTHX_ RExC_state_t *pRExC_state, regnode *startbranch, regnode *firs
                     /* store the codepoint in the bitmap, and if its ascii
                        also store its folded equivelent. */
                     TRIE_BITMAP_SET(trie,uvc);
-                    if ( folder ) TRIE_BITMAP_SET(trie,folder[ uvc ]);
+
+		    /* store the folded codepoint */
+		    if ( folder ) TRIE_BITMAP_SET(trie,folder[ uvc ]);
+
+		    if ( !UTF ) {
+			/* store first byte of utf8 representation of
+			   codepoints in the 127 < uvc < 256 range */
+			if (127 < uvc && uvc < 192) {
+			    TRIE_BITMAP_SET(trie,194);
+			} else if (191 < uvc ) {
+			    TRIE_BITMAP_SET(trie,195);
+			/* && uvc < 256 -- we know uvc is < 256 already */
+			}
+		    }
                     set_bit = 0; /* We've done our bit :-) */
                 }
             } else {
@@ -8791,7 +8804,7 @@ Perl_regprop(pTHX_ const regexp *prog, SV *sv, const regnode *o)
 	    pv_pretty(dsv, STRING(o), STR_LEN(o), 60, 
 	        PL_colors[0], PL_colors[1],
 	        PERL_PV_ESCAPE_UNI_DETECT |
-	        PERL_PV_PRETTY_ELIPSES    |
+	        PERL_PV_PRETTY_ELLIPSES   |
 	        PERL_PV_PRETTY_LTGT    
             ); 
 	Perl_sv_catpvf(aTHX_ sv, " %s", s );
@@ -9759,7 +9772,7 @@ S_dumpuntil(pTHX_ const regexp *r, const regnode *start, const regnode *node,
                     elem_ptr ? pv_pretty(sv, SvPV_nolen_const(*elem_ptr), SvCUR(*elem_ptr), 60,
 	                    PL_colors[0], PL_colors[1],
 	                    (SvUTF8(*elem_ptr) ? PERL_PV_ESCAPE_UNI : 0) |
-	                    PERL_PV_PRETTY_ELIPSES    |
+	                    PERL_PV_PRETTY_ELLIPSES    |
 	                    PERL_PV_PRETTY_LTGT
                             )
                             : "???"