This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
Remove yyerror_sv
authorFather Chrysostomos <sprout@cpan.org>
Thu, 22 Mar 2012 00:55:19 +0000 (17:55 -0700)
committerFather Chrysostomos <sprout@cpan.org>
Fri, 23 Mar 2012 03:23:52 +0000 (20:23 -0700)
This was added in the previous commit, but was unnecessary, as it
is not used anywhere and is not part of the public API.

embed.fnc
embed.h
proto.h
toke.c

index e01d915..6337942 100644 (file)
--- a/embed.fnc
+++ b/embed.fnc
@@ -1516,7 +1516,6 @@ p |void   |write_to_stderr|NN SV* msv
 p      |int    |yyerror        |NN const char *const s
 p      |int    |yyerror_pv     |NN const char *const s|U32 flags
 p      |int    |yyerror_pvn    |NN const char *const s|STRLEN len|U32 flags
-p      |int    |yyerror_sv     |NN SV * sv|U32 flags
 : Used in perly.y, and by Data::Alias
 EXp    |int    |yylex
 p      |void   |yyunlex
diff --git a/embed.h b/embed.h
index 0150570..6f13c91 100644 (file)
--- a/embed.h
+++ b/embed.h
 #define yyerror(a)             Perl_yyerror(aTHX_ a)
 #define yyerror_pv(a,b)                Perl_yyerror_pv(aTHX_ a,b)
 #define yyerror_pvn(a,b,c)     Perl_yyerror_pvn(aTHX_ a,b,c)
-#define yyerror_sv(a,b)                Perl_yyerror_sv(aTHX_ a,b)
 #define yyparse(a)             Perl_yyparse(aTHX_ a)
 #define yyunlex()              Perl_yyunlex(aTHX)
 #  if !(defined(DEBUGGING))
diff --git a/proto.h b/proto.h
index c9b51e9..88c3378 100644 (file)
--- a/proto.h
+++ b/proto.h
@@ -4779,11 +4779,6 @@ PERL_CALLCONV int        Perl_yyerror_pvn(pTHX_ const char *const s, STRLEN len, U32 fl
 #define PERL_ARGS_ASSERT_YYERROR_PVN   \
        assert(s)
 
-PERL_CALLCONV int      Perl_yyerror_sv(pTHX_ SV * sv, U32 flags)
-                       __attribute__nonnull__(pTHX_1);
-#define PERL_ARGS_ASSERT_YYERROR_SV    \
-       assert(sv)
-
 PERL_CALLCONV int      Perl_yylex(pTHX);
 PERL_CALLCONV int      Perl_yyparse(pTHX_ int gramtype);
 PERL_CALLCONV void     Perl_yyunlex(pTHX);
diff --git a/toke.c b/toke.c
index 08607ef..346a39d 100644 (file)
--- a/toke.c
+++ b/toke.c
@@ -10740,18 +10740,6 @@ Perl_yyerror_pv(pTHX_ const char *const s, U32 flags)
 }
 
 int
-Perl_yyerror_sv(pTHX_ SV * sv, U32 flags)
-{
-    char *s;
-    STRLEN len;
-    PERL_ARGS_ASSERT_YYERROR_SV;
-    s = SvPV(sv, len);
-    if (SvUTF8(sv))
-       flags |= SVf_UTF8;
-    return yyerror_pvn(s, len, flags);
-}
-
-int
 Perl_yyerror_pvn(pTHX_ const char *const s, STRLEN len, U32 flags)
 {
     dVAR;