From 7350962f469ccd5aa91df76014fab15c0a785530 Mon Sep 17 00:00:00 2001 From: Father Chrysostomos Date: Wed, 21 Mar 2012 17:55:19 -0700 Subject: Remove yyerror_sv 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 | 1 - embed.h | 1 - proto.h | 5 ----- toke.c | 12 ------------ 4 files changed, 19 deletions(-) diff --git a/embed.fnc b/embed.fnc index e01d915b15..6337942f98 100644 --- 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 01505700ec..6f13c91479 100644 --- a/embed.h +++ b/embed.h @@ -1214,7 +1214,6 @@ #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 c9b51e9f69..88c3378b0c 100644 --- 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 08607efb25..346a39d64d 100644 --- a/toke.c +++ b/toke.c @@ -10739,18 +10739,6 @@ Perl_yyerror_pv(pTHX_ const char *const s, U32 flags) return yyerror_pvn(s, strlen(s), 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) { -- cgit v1.2.1