Skip to content

Commit

Permalink
Renaming Parrot_get_ctx_HLL_namespace() to Parrot_hll_get_ctx_HLL_nam…
Browse files Browse the repository at this point in the history 
…espace()
  • Loading branch information
@fernandobrito
fernandobrito committed Nov 29, 2010
1 parent e515afa commit 8e80030
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 28 deletions.
2 changes: 1 addition & 1 deletion docs/embed.pod
View file
Expand Up @@ -668,7 +668,7 @@ The list may also be augmented if additional functionality is required.

=item C<Parrot_gc_mark_PObj_alive>

=item C<Parrot_get_ctx_HLL_namespace>
=item C<Parrot_hll_get_ctx_HLL_namespace>

=item C<Parrot_hll_get_ctx_HLL_type>

Expand Down
4 changes: 2 additions & 2 deletions include/parrot/hll.h
View file
Expand Up @@ -23,7 +23,7 @@
PARROT_EXPORT
PARROT_WARN_UNUSED_RESULT
PARROT_CAN_RETURN_NULL
PMC* Parrot_get_ctx_HLL_namespace(PARROT_INTERP)
PMC* Parrot_hll_get_ctx_HLL_namespace(PARROT_INTERP)
__attribute__nonnull__(1);

PARROT_EXPORT
Expand Down Expand Up @@ -70,7 +70,7 @@ void Parrot_hll_register_HLL_type(PARROT_INTERP,
void Parrot_hll_init_HLL(PARROT_INTERP)
__attribute__nonnull__(1);

#define ASSERT_ARGS_Parrot_get_ctx_HLL_namespace __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
#define ASSERT_ARGS_Parrot_hll_get_ctx_HLL_namespace __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
PARROT_ASSERT_ARG(interp))
#define ASSERT_ARGS_Parrot_hll_get_ctx_HLL_type __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
PARROT_ASSERT_ARG(interp))
Expand Down
6 changes: 3 additions & 3 deletions src/hll.c
View file
Expand Up @@ -374,7 +374,7 @@ Parrot_hll_get_ctx_HLL_type(PARROT_INTERP, INTVAL core_type)

/*
=item C<PMC* Parrot_get_ctx_HLL_namespace(PARROT_INTERP)>
=item C<PMC* Parrot_hll_get_ctx_HLL_namespace(PARROT_INTERP)>
Return root namespace of the current HLL.
Expand All @@ -386,9 +386,9 @@ PARROT_EXPORT
PARROT_WARN_UNUSED_RESULT
PARROT_CAN_RETURN_NULL
PMC*
Parrot_get_ctx_HLL_namespace(PARROT_INTERP)
Parrot_hll_get_ctx_HLL_namespace(PARROT_INTERP)
{
ASSERT_ARGS(Parrot_get_ctx_HLL_namespace)
ASSERT_ARGS(Parrot_hll_get_ctx_HLL_namespace)
return Parrot_get_HLL_namespace(interp, Parrot_pcc_get_HLL(interp, CURRENT_CONTEXT(interp)));
}

Expand Down
2 changes: 1 addition & 1 deletion src/namespace.c
View file
Expand Up @@ -702,7 +702,7 @@ Parrot_ns_find_named_item(PARROT_INTERP, ARGIN(STRING *name), SHIM(void *next))
if (!PMC_IS_NULL(g))
return g;

g = Parrot_ns_find_namespace_global(interp, Parrot_get_ctx_HLL_namespace(interp), name);
g = Parrot_ns_find_namespace_global(interp, Parrot_hll_get_ctx_HLL_namespace(interp), name);
if (!PMC_IS_NULL(g))
return g;
return PMCNULL;
Expand Down
30 changes: 15 additions & 15 deletions src/ops/core_ops.c
View file
Expand Up @@ -23719,15 +23719,15 @@ return (opcode_t *)cur_opcode + 3;}
opcode_t *
Parrot_get_hll_namespace_p(opcode_t *cur_opcode, PARROT_INTERP) {
const Parrot_Context * const CUR_CTX = Parrot_pcc_get_context_struct(interp, interp->ctx);
PMC * const hll_ns = Parrot_get_ctx_HLL_namespace(interp);
PMC * const hll_ns = Parrot_hll_get_ctx_HLL_namespace(interp);
PREG(1) = hll_ns;

return (opcode_t *)cur_opcode + 2;}

opcode_t *
Parrot_get_hll_namespace_p_p(opcode_t *cur_opcode, PARROT_INTERP) {
const Parrot_Context * const CUR_CTX = Parrot_pcc_get_context_struct(interp, interp->ctx);
PMC * const hll_ns = Parrot_get_ctx_HLL_namespace(interp);
PMC * const hll_ns = Parrot_hll_get_ctx_HLL_namespace(interp);
if (PMC_IS_NULL(hll_ns))
PREG(1) = PMCNULL;
else {
Expand All @@ -23740,7 +23740,7 @@ return (opcode_t *)cur_opcode + 3;}
opcode_t *
Parrot_get_hll_namespace_p_pc(opcode_t *cur_opcode, PARROT_INTERP) {
const Parrot_Context * const CUR_CTX = Parrot_pcc_get_context_struct(interp, interp->ctx);
PMC * const hll_ns = Parrot_get_ctx_HLL_namespace(interp);
PMC * const hll_ns = Parrot_hll_get_ctx_HLL_namespace(interp);
if (PMC_IS_NULL(hll_ns))
PREG(1) = PMCNULL;
else {
Expand Down Expand Up @@ -23871,23 +23871,23 @@ return (opcode_t *)cur_opcode + 4;}
opcode_t *
Parrot_get_hll_global_p_s(opcode_t *cur_opcode, PARROT_INTERP) {
const Parrot_Context * const CUR_CTX = Parrot_pcc_get_context_struct(interp, interp->ctx);
PMC * const hll_ns = Parrot_get_ctx_HLL_namespace(interp);
PMC * const hll_ns = Parrot_hll_get_ctx_HLL_namespace(interp);
PREG(1) = Parrot_ns_find_global_from_op(interp, hll_ns, SREG(2), cur_opcode + 3);

return (opcode_t *)cur_opcode + 3;}

opcode_t *
Parrot_get_hll_global_p_sc(opcode_t *cur_opcode, PARROT_INTERP) {
const Parrot_Context * const CUR_CTX = Parrot_pcc_get_context_struct(interp, interp->ctx);
PMC * const hll_ns = Parrot_get_ctx_HLL_namespace(interp);
PMC * const hll_ns = Parrot_hll_get_ctx_HLL_namespace(interp);
PREG(1) = Parrot_ns_find_global_from_op(interp, hll_ns, SCONST(2), cur_opcode + 3);

return (opcode_t *)cur_opcode + 3;}

opcode_t *
Parrot_get_hll_global_p_p_s(opcode_t *cur_opcode, PARROT_INTERP) {
const Parrot_Context * const CUR_CTX = Parrot_pcc_get_context_struct(interp, interp->ctx);
PMC * const hll_ns = Parrot_get_ctx_HLL_namespace(interp);
PMC * const hll_ns = Parrot_hll_get_ctx_HLL_namespace(interp);
if (PMC_IS_NULL(hll_ns)) {
PREG(1) = hll_ns;
}
Expand All @@ -23904,7 +23904,7 @@ return (opcode_t *)cur_opcode + 4;}
opcode_t *
Parrot_get_hll_global_p_pc_s(opcode_t *cur_opcode, PARROT_INTERP) {
const Parrot_Context * const CUR_CTX = Parrot_pcc_get_context_struct(interp, interp->ctx);
PMC * const hll_ns = Parrot_get_ctx_HLL_namespace(interp);
PMC * const hll_ns = Parrot_hll_get_ctx_HLL_namespace(interp);
if (PMC_IS_NULL(hll_ns)) {
PREG(1) = hll_ns;
}
Expand All @@ -23921,7 +23921,7 @@ return (opcode_t *)cur_opcode + 4;}
opcode_t *
Parrot_get_hll_global_p_p_sc(opcode_t *cur_opcode, PARROT_INTERP) {
const Parrot_Context * const CUR_CTX = Parrot_pcc_get_context_struct(interp, interp->ctx);
PMC * const hll_ns = Parrot_get_ctx_HLL_namespace(interp);
PMC * const hll_ns = Parrot_hll_get_ctx_HLL_namespace(interp);
if (PMC_IS_NULL(hll_ns)) {
PREG(1) = hll_ns;
}
Expand All @@ -23938,7 +23938,7 @@ return (opcode_t *)cur_opcode + 4;}
opcode_t *
Parrot_get_hll_global_p_pc_sc(opcode_t *cur_opcode, PARROT_INTERP) {
const Parrot_Context * const CUR_CTX = Parrot_pcc_get_context_struct(interp, interp->ctx);
PMC * const hll_ns = Parrot_get_ctx_HLL_namespace(interp);
PMC * const hll_ns = Parrot_hll_get_ctx_HLL_namespace(interp);
if (PMC_IS_NULL(hll_ns)) {
PREG(1) = hll_ns;
}
Expand Down Expand Up @@ -24091,23 +24091,23 @@ return (opcode_t *)cur_opcode + 4;}
opcode_t *
Parrot_set_hll_global_s_p(opcode_t *cur_opcode, PARROT_INTERP) {
const Parrot_Context * const CUR_CTX = Parrot_pcc_get_context_struct(interp, interp->ctx);
PMC * const hll_ns = Parrot_get_ctx_HLL_namespace(interp);
PMC * const hll_ns = Parrot_hll_get_ctx_HLL_namespace(interp);
Parrot_ns_set_global(interp, hll_ns, SREG(1), PREG(2));

return (opcode_t *)cur_opcode + 3;}

opcode_t *
Parrot_set_hll_global_sc_p(opcode_t *cur_opcode, PARROT_INTERP) {
const Parrot_Context * const CUR_CTX = Parrot_pcc_get_context_struct(interp, interp->ctx);
PMC * const hll_ns = Parrot_get_ctx_HLL_namespace(interp);
PMC * const hll_ns = Parrot_hll_get_ctx_HLL_namespace(interp);
Parrot_ns_set_global(interp, hll_ns, SCONST(1), PREG(2));

return (opcode_t *)cur_opcode + 3;}

opcode_t *
Parrot_set_hll_global_p_s_p(opcode_t *cur_opcode, PARROT_INTERP) {
const Parrot_Context * const CUR_CTX = Parrot_pcc_get_context_struct(interp, interp->ctx);
PMC * const hll_ns = Parrot_get_ctx_HLL_namespace(interp);
PMC * const hll_ns = Parrot_hll_get_ctx_HLL_namespace(interp);
PMC * const ns = Parrot_ns_make_namespace_keyed(interp, hll_ns, PREG(1));

Parrot_ns_set_global(interp, ns, SREG(2), PREG(3));
Expand All @@ -24117,7 +24117,7 @@ return (opcode_t *)cur_opcode + 4;}
opcode_t *
Parrot_set_hll_global_pc_s_p(opcode_t *cur_opcode, PARROT_INTERP) {
const Parrot_Context * const CUR_CTX = Parrot_pcc_get_context_struct(interp, interp->ctx);
PMC * const hll_ns = Parrot_get_ctx_HLL_namespace(interp);
PMC * const hll_ns = Parrot_hll_get_ctx_HLL_namespace(interp);
PMC * const ns = Parrot_ns_make_namespace_keyed(interp, hll_ns, PCONST(1));

Parrot_ns_set_global(interp, ns, SREG(2), PREG(3));
Expand All @@ -24127,7 +24127,7 @@ return (opcode_t *)cur_opcode + 4;}
opcode_t *
Parrot_set_hll_global_p_sc_p(opcode_t *cur_opcode, PARROT_INTERP) {
const Parrot_Context * const CUR_CTX = Parrot_pcc_get_context_struct(interp, interp->ctx);
PMC * const hll_ns = Parrot_get_ctx_HLL_namespace(interp);
PMC * const hll_ns = Parrot_hll_get_ctx_HLL_namespace(interp);
PMC * const ns = Parrot_ns_make_namespace_keyed(interp, hll_ns, PREG(1));

Parrot_ns_set_global(interp, ns, SCONST(2), PREG(3));
Expand All @@ -24137,7 +24137,7 @@ return (opcode_t *)cur_opcode + 4;}
opcode_t *
Parrot_set_hll_global_pc_sc_p(opcode_t *cur_opcode, PARROT_INTERP) {
const Parrot_Context * const CUR_CTX = Parrot_pcc_get_context_struct(interp, interp->ctx);
PMC * const hll_ns = Parrot_get_ctx_HLL_namespace(interp);
PMC * const hll_ns = Parrot_hll_get_ctx_HLL_namespace(interp);
PMC * const ns = Parrot_ns_make_namespace_keyed(interp, hll_ns, PCONST(1));

Parrot_ns_set_global(interp, ns, SCONST(2), PREG(3));
Expand Down
12 changes: 6 additions & 6 deletions src/ops/var.ops
View file
Expand Up @@ -201,12 +201,12 @@ null.
=cut

op get_hll_namespace(out PMC) {
PMC * const hll_ns = Parrot_get_ctx_HLL_namespace(interp);
PMC * const hll_ns = Parrot_hll_get_ctx_HLL_namespace(interp);
$1 = hll_ns;
}

op get_hll_namespace(out PMC, in PMC) {
PMC * const hll_ns = Parrot_get_ctx_HLL_namespace(interp);
PMC * const hll_ns = Parrot_hll_get_ctx_HLL_namespace(interp);
if (PMC_IS_NULL(hll_ns))
$1 = PMCNULL;
else {
Expand Down Expand Up @@ -297,12 +297,12 @@ global doesn't exist, $1 is set to null.
=cut

op get_hll_global(out PMC, in STR) {
PMC * const hll_ns = Parrot_get_ctx_HLL_namespace(interp);
PMC * const hll_ns = Parrot_hll_get_ctx_HLL_namespace(interp);
$1 = Parrot_ns_find_global_from_op(interp, hll_ns, $2, expr NEXT());
}

op get_hll_global(out PMC, in PMC, in STR) {
PMC * const hll_ns = Parrot_get_ctx_HLL_namespace(interp);
PMC * const hll_ns = Parrot_hll_get_ctx_HLL_namespace(interp);
if (PMC_IS_NULL(hll_ns)) {
$1 = hll_ns;
}
Expand Down Expand Up @@ -393,12 +393,12 @@ does not exist, it is created.
=cut

op set_hll_global(in STR, invar PMC) {
PMC * const hll_ns = Parrot_get_ctx_HLL_namespace(interp);
PMC * const hll_ns = Parrot_hll_get_ctx_HLL_namespace(interp);
Parrot_ns_set_global(interp, hll_ns, $1, $2);
}

op set_hll_global(in PMC, in STR, invar PMC) {
PMC * const hll_ns = Parrot_get_ctx_HLL_namespace(interp);
PMC * const hll_ns = Parrot_hll_get_ctx_HLL_namespace(interp);
PMC * const ns = Parrot_ns_make_namespace_keyed(interp, hll_ns, $1);

Parrot_ns_set_global(interp, ns, $2, $3);
Expand Down

0 comments on commit 8e80030

Please sign in to comment.