s/Perl_utf8skip/PL_utf8skip/g

p4raw-id: //depot/perl@2241

6 files changed, 15 insertions, 26 deletions

diff --git a/embed.h b/embed.h
index c240a9815a..4150e9ba57 100644
--- a/embed.h
+++ b/embed.h
@@ -964,7 +964,6 @@
 #define utf8_distance		Perl_utf8_distance
 #define utf8_hop		Perl_utf8_hop
 #define utf8_to_uv		Perl_utf8_to_uv
-#define utf8skip		Perl_utf8skip
 #define utilize			Perl_utilize
 #define uv_to_utf8		Perl_uv_to_utf8
 #define vivify_defelem		Perl_vivify_defelem
diff --git a/embed.pl b/embed.pl
index 709acc60e0..e318df10f3 100755
--- a/embed.pl
+++ b/embed.pl
@@ -365,17 +365,7 @@ my @extras = qw(
     fprintf
 );
 
-my %skip;
-
-for $sym (qw[
-    utf8skip
-	  ])
-{
-    $skip{$sym}++;
-}
-
 for $sym (sort(keys(%global),@extras)) {
-    next if exists $skip{$sym};
     print EM embedobj($sym);
 }
 
diff --git a/global.sym b/global.sym
index 95c2b0a8c5..38e6998514 100644
--- a/global.sym
+++ b/global.sym
@@ -611,7 +611,6 @@ utf16_to_utf8_reversed
 utf8_distance
 utf8_hop
 utf8_to_uv
-utf8skip
 utilize
 uv_to_utf8
 vivify_defelem
diff --git a/globvar.sym b/globvar.sym
index 91329ca47b..0bf1fee262 100644
--- a/globvar.sym
+++ b/globvar.sym
@@ -36,6 +36,7 @@ psig_name
 psig_ptr
 regkind
 simple
+utf8skip
 varies
 vtbl_sv
 vtbl_env
diff --git a/regexec.c b/regexec.c
index 83db7b5472..841b9008c2 100644
--- a/regexec.c
+++ b/regexec.c
@@ -417,7 +417,7 @@ regexec_flags(register regexp *prog, char *stringarg, register char *strend,
 	    if (s > startpos)
 		s--;
 	    while (s < strend) {
-		if (*s++ == '\n') {	/* don't need utf8skip here */
+		if (*s++ == '\n') {	/* don't need PL_utf8skip here */
 		    if (s < strend && regtry(prog, s))
 			goto got_it;
 		}
@@ -1185,7 +1185,7 @@ regmatch(regnode *prog)
 	    break;
 	case SANYUTF8:
 	    if (nextchr & 0x80) {
-		locinput += utf8skip[nextchr];
+		locinput += PL_utf8skip[nextchr];
 		if (locinput > PL_regeol)
 		    sayNO;
 		nextchr = UCHARAT(locinput);
@@ -1202,7 +1202,7 @@ regmatch(regnode *prog)
 	    break;
 	case ANYUTF8:
 	    if (nextchr & 0x80) {
-		locinput += utf8skip[nextchr];
+		locinput += PL_utf8skip[nextchr];
 		if (locinput > PL_regeol)
 		    sayNO;
 		nextchr = UCHARAT(locinput);
@@ -1278,7 +1278,7 @@ regmatch(regnode *prog)
 		sayNO;
 	    if (locinput >= PL_regeol)
 		sayNO;
-	    locinput += utf8skip[nextchr];
+	    locinput += PL_utf8skip[nextchr];
 	    nextchr = UCHARAT(locinput);
 	    break;
 	case ANYOF:
@@ -1315,7 +1315,7 @@ regmatch(regnode *prog)
 		{
 		    sayNO;
 		}
-		locinput += utf8skip[nextchr];
+		locinput += PL_utf8skip[nextchr];
 		nextchr = UCHARAT(locinput);
 		break;
 	    }
@@ -1348,7 +1348,7 @@ regmatch(regnode *prog)
 		{
 		    sayNO;
 		}
-		locinput += utf8skip[nextchr];
+		locinput += PL_utf8skip[nextchr];
 		nextchr = UCHARAT(locinput);
 		break;
 	    }
@@ -1420,7 +1420,7 @@ regmatch(regnode *prog)
 		{
 		    sayNO;
 		}
-		locinput += utf8skip[nextchr];
+		locinput += PL_utf8skip[nextchr];
 		nextchr = UCHARAT(locinput);
 		break;
 	    }
@@ -1453,7 +1453,7 @@ regmatch(regnode *prog)
 		{
 		    sayNO;
 		}
-		locinput += utf8skip[nextchr];
+		locinput += PL_utf8skip[nextchr];
 		nextchr = UCHARAT(locinput);
 		break;
 	    }
@@ -1471,7 +1471,7 @@ regmatch(regnode *prog)
 	    if (nextchr & 0x80) {
 		if (!(swash_fetch(PL_utf8_digit,(U8*)locinput)))
 		    sayNO;
-		locinput += utf8skip[nextchr];
+		locinput += PL_utf8skip[nextchr];
 		nextchr = UCHARAT(locinput);
 		break;
 	    }
@@ -1492,7 +1492,7 @@ regmatch(regnode *prog)
 	    if (nextchr & 0x80) {
 		if (swash_fetch(PL_utf8_digit,(U8*)locinput))
 		    sayNO;
-		locinput += utf8skip[nextchr];
+		locinput += PL_utf8skip[nextchr];
 		nextchr = UCHARAT(locinput);
 		break;
 	    }
@@ -1503,7 +1503,7 @@ regmatch(regnode *prog)
 	case CLUMP:
 	    if (locinput >= PL_regeol || swash_fetch(PL_utf8_mark,(U8*)locinput))
 		sayNO;
-	    locinput += utf8skip[nextchr];
+	    locinput += PL_utf8skip[nextchr];
 	    while (locinput < PL_regeol && swash_fetch(PL_utf8_mark,(U8*)locinput))
 		locinput += UTF8SKIP(locinput);
 	    if (locinput > PL_regeol)
diff --git a/utf8.h b/utf8.h
index 50892b0ffb..51d0143b63 100644
--- a/utf8.h
+++ b/utf8.h
@@ -8,7 +8,7 @@
  */
 
 #ifdef DOINIT
-EXTCONST unsigned char utf8skip[] = {
+EXTCONST unsigned char PL_utf8skip[] = {
 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /* ascii */
 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /* ascii */
 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /* ascii */
@@ -19,9 +19,9 @@ EXTCONST unsigned char utf8skip[] = {
 3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,4,4,4,4,4,4,4,4,5,5,5,5,6,6,7,8, /* cjk etc. */
 };
 #else
-EXTCONST unsigned char utf8skip[];
+EXTCONST unsigned char PL_utf8skip[];
 #endif
 
 #define IN_UTF8 (PL_curcop->op_private & HINT_UTF8)
 
-#define UTF8SKIP(s) utf8skip[*(U8*)s]
+#define UTF8SKIP(s) PL_utf8skip[*(U8*)s]