From f89a69a2cefcbc1226e8cf1059096f2e974ca5f9 Mon Sep 17 00:00:00 2001 From: Fernando Brito Date: Mon, 29 Nov 2010 19:00:43 -0300 Subject: [PATCH] Renaming Parrot_get_HLL_name() to Parrot_hll_get_HLL_name() --- docs/embed.pod | 2 +- include/parrot/hll.h | 4 ++-- src/hll.c | 8 ++++---- src/pmc/callcontext.pmc | 2 +- src/pmc/sub.pmc | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/embed.pod b/docs/embed.pod index 6a09cabfd6..d34821dc77 100644 --- a/docs/embed.pod +++ b/docs/embed.pod @@ -682,7 +682,7 @@ The list may also be augmented if additional functionality is required. =item C -=item C +=item C =item C diff --git a/include/parrot/hll.h b/include/parrot/hll.h index b8e6cc7a8a..7b8fb57876 100644 --- a/include/parrot/hll.h +++ b/include/parrot/hll.h @@ -38,7 +38,7 @@ INTVAL Parrot_get_HLL_id(PARROT_INTERP, ARGIN_NULLOK(STRING *hll_name)) PARROT_EXPORT PARROT_WARN_UNUSED_RESULT PARROT_CAN_RETURN_NULL -STRING * Parrot_get_HLL_name(PARROT_INTERP, INTVAL id) +STRING * Parrot_hll_get_HLL_name(PARROT_INTERP, INTVAL id) __attribute__nonnull__(1); PARROT_EXPORT @@ -76,7 +76,7 @@ void Parrot_hll_init_HLL(PARROT_INTERP) PARROT_ASSERT_ARG(interp)) #define ASSERT_ARGS_Parrot_get_HLL_id __attribute__unused__ int _ASSERT_ARGS_CHECK = (\ PARROT_ASSERT_ARG(interp)) -#define ASSERT_ARGS_Parrot_get_HLL_name __attribute__unused__ int _ASSERT_ARGS_CHECK = (\ +#define ASSERT_ARGS_Parrot_hll_get_HLL_name __attribute__unused__ int _ASSERT_ARGS_CHECK = (\ PARROT_ASSERT_ARG(interp)) #define ASSERT_ARGS_Parrot_hll_get_HLL_namespace __attribute__unused__ int _ASSERT_ARGS_CHECK = (\ PARROT_ASSERT_ARG(interp)) diff --git a/src/hll.c b/src/hll.c index 6a40c866d0..a3a1ee8a4c 100644 --- a/src/hll.c +++ b/src/hll.c @@ -222,7 +222,7 @@ Parrot_get_HLL_id(PARROT_INTERP, ARGIN_NULLOK(STRING *hll_name)) /* -=item C +=item C Returns the STRING name of the HLL with the given C number. If the id is out of range or does not exist, the NULL value is returned instead. Note @@ -236,9 +236,9 @@ PARROT_EXPORT PARROT_WARN_UNUSED_RESULT PARROT_CAN_RETURN_NULL STRING * -Parrot_get_HLL_name(PARROT_INTERP, INTVAL id) +Parrot_hll_get_HLL_name(PARROT_INTERP, INTVAL id) { - ASSERT_ARGS(Parrot_get_HLL_name) + ASSERT_ARGS(Parrot_hll_get_HLL_name) PMC * const hll_info = interp->HLL_info; const INTVAL nelements = VTABLE_elements(interp, hll_info); @@ -445,7 +445,7 @@ Parrot_hll_regenerate_HLL_namespaces(PARROT_INTERP) if (PMC_IS_NULL(ns_hash) || ns_hash->vtable->base_type == enum_class_Undef) { - STRING * hll_name = Parrot_get_HLL_name(interp, hll_id); + STRING * hll_name = Parrot_hll_get_HLL_name(interp, hll_id); if (!hll_name) continue; diff --git a/src/pmc/callcontext.pmc b/src/pmc/callcontext.pmc index f2d1551d0a..e43457fc6f 100644 --- a/src/pmc/callcontext.pmc +++ b/src/pmc/callcontext.pmc @@ -994,7 +994,7 @@ return current Namespace else if (STRING_equal(INTERP, key, CONST_STRING(INTERP, "current_hll"))) { GET_ATTR_current_HLL(INTERP, SELF, hll); value = Parrot_pmc_new(interp, Parrot_hll_get_ctx_HLL_type(interp, enum_class_String)); - VTABLE_set_string_native(interp, value, Parrot_get_HLL_name(INTERP, hll)); + VTABLE_set_string_native(interp, value, Parrot_hll_get_HLL_name(INTERP, hll)); } else Parrot_ex_throw_from_c_args(INTERP, NULL, diff --git a/src/pmc/sub.pmc b/src/pmc/sub.pmc index ee4fd85018..08e3cc714a 100644 --- a/src/pmc/sub.pmc +++ b/src/pmc/sub.pmc @@ -709,7 +709,7 @@ Archives the subroutine. sub->ns_entry_name = CONST_STRING(INTERP, ""); VTABLE_push_string(INTERP, info, sub->ns_entry_name); - hll_name = Parrot_get_HLL_name(INTERP, sub->HLL_id); + hll_name = Parrot_hll_get_HLL_name(INTERP, sub->HLL_id); if (!hll_name) hll_name = CONST_STRING(INTERP, ""); VTABLE_push_string(INTERP, info, hll_name);