From f7e3d3266d17243c5ff03ec4aa7b2e1a457623ae Mon Sep 17 00:00:00 2001 From: Florian Ragwitz Date: Sat, 11 Sep 2010 16:22:45 +0200 Subject: [PATCH] Shorten external symbol name for VMS VMS seems to have a 31 character limitation for external symbols. To be able to fit into that, rename 'coerce_qwlist_to_paren_list' to 'munge_qwlist_to_paren_list'. --- embed.fnc | 2 +- embed.h | 4 ++-- perly.act | 2 +- perly.h | 2 +- perly.y | 2 +- proto.h | 4 ++-- toke.c | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/embed.fnc b/embed.fnc index a4382a3..4f3690c 100644 --- a/embed.fnc +++ b/embed.fnc @@ -2396,7 +2396,7 @@ xpoM |void|store_cop_label \ xpo |int |keyword_plugin_standard|NN char* keyword_ptr|STRLEN keyword_len|NN OP** op_ptr : Used in perly.y -xp |void |coerce_qwlist_to_paren_list|NN OP* qwlist +xp |void |munge_qwlist_to_paren_list|NN OP* qwlist #if defined(USE_ITHREADS) # if defined(PERL_IN_SV_C) diff --git a/embed.h b/embed.h index b4e419c..e7fbcf3 100644 --- a/embed.h +++ b/embed.h @@ -2079,7 +2079,7 @@ #define boot_core_mro Perl_boot_core_mro #endif #ifdef PERL_CORE -#define coerce_qwlist_to_paren_list Perl_coerce_qwlist_to_paren_list +#define munge_qwlist_to_paren_list Perl_munge_qwlist_to_paren_list #endif #if defined(USE_ITHREADS) # if defined(PERL_IN_SV_C) @@ -4553,7 +4553,7 @@ #ifdef PERL_CORE #endif #ifdef PERL_CORE -#define coerce_qwlist_to_paren_list(a) Perl_coerce_qwlist_to_paren_list(aTHX_ a) +#define munge_qwlist_to_paren_list(a) Perl_munge_qwlist_to_paren_list(aTHX_ a) #endif #if defined(USE_ITHREADS) # if defined(PERL_IN_SV_C) diff --git a/perly.act b/perly.act index 9f05270..0211497 100644 --- a/perly.act +++ b/perly.act @@ -1631,7 +1631,7 @@ case 2: case 212: #line 1371 "perly.y" - { coerce_qwlist_to_paren_list((ps[(1) - (1)].val.opval)); ;} + { munge_qwlist_to_paren_list((ps[(1) - (1)].val.opval)); ;} break; case 213: diff --git a/perly.h b/perly.h index e7b9927..b6d6500 100644 --- a/perly.h +++ b/perly.h @@ -215,7 +215,7 @@ typedef union YYSTYPE TOKEN* tkval; #endif } -/* Line 1529 of yacc.c. */ +/* Line 1489 of yacc.c. */ YYSTYPE; # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 diff --git a/perly.y b/perly.y index 483a1e4..c1ea3b8 100644 --- a/perly.y +++ b/perly.y @@ -1368,7 +1368,7 @@ listexprcom: /* NULL */ lpar_or_qw: '(' { $$ = $1; } | QWLIST - { coerce_qwlist_to_paren_list($1); } + { munge_qwlist_to_paren_list($1); } '(' { $$ = $3; } ; diff --git a/proto.h b/proto.h index a29bdc0..4951a73 100644 --- a/proto.h +++ b/proto.h @@ -6992,9 +6992,9 @@ PERL_CALLCONV int Perl_keyword_plugin_standard(pTHX_ char* keyword_ptr, STRLEN k #define PERL_ARGS_ASSERT_KEYWORD_PLUGIN_STANDARD \ assert(keyword_ptr); assert(op_ptr) -PERL_CALLCONV void Perl_coerce_qwlist_to_paren_list(pTHX_ OP* qwlist) +PERL_CALLCONV void Perl_munge_qwlist_to_paren_list(pTHX_ OP* qwlist) __attribute__nonnull__(pTHX_1); -#define PERL_ARGS_ASSERT_COERCE_QWLIST_TO_PAREN_LIST \ +#define PERL_ARGS_ASSERT_MUNGE_QWLIST_TO_PAREN_LIST \ assert(qwlist) diff --git a/toke.c b/toke.c index b8694a6..c4ff0c2 100644 --- a/toke.c +++ b/toke.c @@ -13984,9 +13984,9 @@ Perl_parse_fullstmt(pTHX_ U32 flags) } void -Perl_coerce_qwlist_to_paren_list(pTHX_ OP *qwlist) +Perl_munge_qwlist_to_paren_list(pTHX_ OP *qwlist) { - PERL_ARGS_ASSERT_COERCE_QWLIST_TO_PAREN_LIST; + PERL_ARGS_ASSERT_MUNGE_QWLIST_TO_PAREN_LIST; deprecate("qw(...) as parentheses"); force_next(')'); if (qwlist->op_type == OP_STUB) { -- 1.8.3.1