[svn:parrot] r41675 - branches/pcc_reapply/src/call
allison at svn.parrot.org
allison at svn.parrot.org
Sun Oct 4 08:16:22 UTC 2009
Author: allison
Date: Sun Oct 4 08:16:22 2009
New Revision: 41675
URL: https://trac.parrot.org/parrot/changeset/41675
Log:
[pcc] More naming cleanup for maintenance sanity.
Modified:
branches/pcc_reapply/src/call/args.c
Modified: branches/pcc_reapply/src/call/args.c
==============================================================================
--- branches/pcc_reapply/src/call/args.c Sun Oct 4 08:07:45 2009 (r41674)
+++ branches/pcc_reapply/src/call/args.c Sun Oct 4 08:16:22 2009 (r41675)
@@ -78,7 +78,7 @@
ARGMOD_NULLOK(PMC *call_object),
ARGIN(PMC *raw_sig),
ARGIN(void *arg_info),
- ARGIN(struct pcc_set_funcs *funcs))
+ ARGIN(struct pcc_set_funcs *accessor))
__attribute__nonnull__(1)
__attribute__nonnull__(3)
__attribute__nonnull__(4)
@@ -191,7 +191,7 @@
PARROT_ASSERT_ARG(interp) \
, PARROT_ASSERT_ARG(raw_sig) \
, PARROT_ASSERT_ARG(arg_info) \
- , PARROT_ASSERT_ARG(funcs))
+ , PARROT_ASSERT_ARG(accessor))
#define ASSERT_ARGS_intval_constant_from_op __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
PARROT_ASSERT_ARG(interp))
#define ASSERT_ARGS_intval_constant_from_varargs __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
@@ -695,7 +695,7 @@
/*
=item C<static void fill_params(PARROT_INTERP, PMC *call_object, PMC *raw_sig,
-void *arg_info, struct pcc_set_funcs *funcs)>
+void *arg_info, struct pcc_set_funcs *accessor)>
Gets args for the current function call and puts them into position.
First it gets the positional non-slurpy parameters, then the positional
@@ -708,7 +708,7 @@
static void
fill_params(PARROT_INTERP, ARGMOD_NULLOK(PMC *call_object),
- ARGIN(PMC *raw_sig), ARGIN(void *arg_info), ARGIN(struct pcc_set_funcs *funcs))
+ ARGIN(PMC *raw_sig), ARGIN(void *arg_info), ARGIN(struct pcc_set_funcs *accessor))
{
ASSERT_ARGS(fill_params)
PMC *ctx = CURRENT_CONTEXT(interp);
@@ -762,7 +762,7 @@
EXCEPTION_INVALID_OPERATION,
"unable to determine if optional argument was passed");
- *funcs->intval(interp, arg_info, param_index) = got_optional;
+ *accessor->intval(interp, arg_info, param_index) = got_optional;
got_optional = -1;
continue; /* on to next parameter */
}
@@ -773,7 +773,7 @@
PMC * const collect_named = pmc_new(interp,
Parrot_get_ctx_HLL_type(interp, enum_class_Hash));
- *funcs->pmc(interp, arg_info, param_index) = collect_named;
+ *accessor->pmc(interp, arg_info, param_index) = collect_named;
named_count += VTABLE_elements(interp, collect_named);
}
/* Collect positional arguments into array */
@@ -789,7 +789,7 @@
VTABLE_push_pmc(interp, collect_positional,
VTABLE_get_pmc_keyed_int(interp, call_object, positional_index));
}
- *funcs->pmc(interp, arg_info, param_index) = collect_positional;
+ *accessor->pmc(interp, arg_info, param_index) = collect_positional;
}
continue; /* on to next parameter */
@@ -799,8 +799,8 @@
/* Just store the name for now (this parameter is only the
* name). The next parameter is the actual value. */
param_name = PARROT_ARG_CONSTANT_ISSET(param_flags)
- ? funcs->string_constant(interp, arg_info, param_index)
- : *funcs->string(interp, arg_info, param_index);
+ ? accessor->string_constant(interp, arg_info, param_index)
+ : *accessor->string(interp, arg_info, param_index);
continue;
}
@@ -813,19 +813,19 @@
switch (PARROT_ARG_TYPE_MASK_MASK(param_flags)) {
case PARROT_ARG_INTVAL:
- *funcs->intval(interp, arg_info, param_index) =
+ *accessor->intval(interp, arg_info, param_index) =
VTABLE_get_integer_keyed_str(interp, call_object, param_name);
break;
case PARROT_ARG_FLOATVAL:
- *funcs->numval(interp, arg_info, param_index) =
+ *accessor->numval(interp, arg_info, param_index) =
VTABLE_get_number_keyed_str(interp, call_object, param_name);
break;
case PARROT_ARG_STRING:
- *funcs->string(interp, arg_info, param_index) =
+ *accessor->string(interp, arg_info, param_index) =
VTABLE_get_string_keyed_str(interp, call_object, param_name);
break;
case PARROT_ARG_PMC:
- *funcs->pmc(interp, arg_info, param_index) =
+ *accessor->pmc(interp, arg_info, param_index) =
VTABLE_get_pmc_keyed_str(interp, call_object, param_name);
break;
default:
@@ -863,16 +863,16 @@
optional_count++;
switch (PARROT_ARG_TYPE_MASK_MASK(param_flags)) {
case PARROT_ARG_INTVAL:
- *funcs->intval(interp, arg_info, param_index) = 0;
+ *accessor->intval(interp, arg_info, param_index) = 0;
break;
case PARROT_ARG_FLOATVAL:
- *funcs->numval(interp, arg_info, param_index) = 0.0;
+ *accessor->numval(interp, arg_info, param_index) = 0.0;
break;
case PARROT_ARG_STRING:
- *funcs->string(interp, arg_info, param_index) = NULL;
+ *accessor->string(interp, arg_info, param_index) = NULL;
break;
case PARROT_ARG_PMC:
- *funcs->pmc(interp, arg_info, param_index) = PMCNULL;
+ *accessor->pmc(interp, arg_info, param_index) = PMCNULL;
break;
default:
Parrot_ex_throw_from_c_args(interp, NULL,
@@ -891,22 +891,22 @@
/* It's a (possibly optional) positional. Fill it. */
switch (PARROT_ARG_TYPE_MASK_MASK(param_flags)) {
case PARROT_ARG_INTVAL:
- *funcs->intval(interp, arg_info, param_index) =
+ *accessor->intval(interp, arg_info, param_index) =
VTABLE_get_integer_keyed_int(interp, call_object, positional_index);
positional_index++;
break;
case PARROT_ARG_FLOATVAL:
- *funcs->numval(interp, arg_info, param_index) =
+ *accessor->numval(interp, arg_info, param_index) =
VTABLE_get_number_keyed_int(interp, call_object, positional_index);
positional_index++;
break;
case PARROT_ARG_STRING:
- *funcs->string(interp, arg_info, param_index) =
+ *accessor->string(interp, arg_info, param_index) =
VTABLE_get_string_keyed_int(interp, call_object, positional_index);
positional_index++;
break;
case PARROT_ARG_PMC:
- *funcs->pmc(interp, arg_info, param_index) =
+ *accessor->pmc(interp, arg_info, param_index) =
VTABLE_get_pmc_keyed_int(interp, call_object, positional_index);
positional_index++;
break;
More information about the parrot-commits
mailing list