[svn:parrot] r42851 - branches/cs_csr_merge/src/call
bacek at svn.parrot.org
bacek at svn.parrot.org
Wed Dec 2 09:41:24 UTC 2009
Author: bacek
Date: Wed Dec 2 09:41:23 2009
New Revision: 42851
URL: https://trac.parrot.org/parrot/changeset/42851
Log:
Make headerized happy again in src/call/args.c
Modified:
branches/cs_csr_merge/src/call/args.c
Modified: branches/cs_csr_merge/src/call/args.c
==============================================================================
--- branches/cs_csr_merge/src/call/args.c Wed Dec 2 09:17:14 2009 (r42850)
+++ branches/cs_csr_merge/src/call/args.c Wed Dec 2 09:41:23 2009 (r42851)
@@ -108,10 +108,45 @@
__attribute__nonnull__(1)
__attribute__nonnull__(2);
+PARROT_CANNOT_RETURN_NULL
+static STRING* csr_get_string_keyed_int(PARROT_INTERP,
+ ARGIN(PMC *self),
+ INTVAL key)
+ __attribute__nonnull__(1)
+ __attribute__nonnull__(2);
+
static void csr_push_integer(PARROT_INTERP, ARGIN(PMC *self), INTVAL type)
__attribute__nonnull__(1)
__attribute__nonnull__(2);
+static void csr_set_integer_keyed_int(PARROT_INTERP,
+ ARGIN(PMC *self),
+ INTVAL key,
+ INTVAL value)
+ __attribute__nonnull__(1)
+ __attribute__nonnull__(2);
+
+static void csr_set_integer_native(PARROT_INTERP,
+ ARGIN(PMC *self),
+ INTVAL size)
+ __attribute__nonnull__(1)
+ __attribute__nonnull__(2);
+
+static void csr_set_number_keyed_int(PARROT_INTERP,
+ ARGIN(PMC *self),
+ INTVAL key,
+ FLOATVAL value)
+ __attribute__nonnull__(1)
+ __attribute__nonnull__(2);
+
+static void csr_set_pmc_keyed_int(PARROT_INTERP,
+ ARGIN(PMC *self),
+ INTVAL key,
+ ARGIN(PMC *value))
+ __attribute__nonnull__(1)
+ __attribute__nonnull__(2)
+ __attribute__nonnull__(4);
+
static void csr_set_pointer_keyed_int(PARROT_INTERP,
ARGIN(PMC *self),
INTVAL key,
@@ -120,6 +155,14 @@
__attribute__nonnull__(2)
__attribute__nonnull__(4);
+static void csr_set_string_keyed_int(PARROT_INTERP,
+ ARGIN(PMC *self),
+ INTVAL key,
+ ARGIN(STRING *value))
+ __attribute__nonnull__(1)
+ __attribute__nonnull__(2)
+ __attribute__nonnull__(4);
+
PARROT_CANNOT_RETURN_NULL
static void dissect_aggregate_arg(PARROT_INTERP,
ARGMOD(PMC *call_object),
@@ -387,13 +430,33 @@
#define ASSERT_ARGS_csr_get_pointer_keyed_int __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
PARROT_ASSERT_ARG(interp) \
, PARROT_ASSERT_ARG(self))
+#define ASSERT_ARGS_csr_get_string_keyed_int __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
+ PARROT_ASSERT_ARG(interp) \
+ , PARROT_ASSERT_ARG(self))
#define ASSERT_ARGS_csr_push_integer __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
PARROT_ASSERT_ARG(interp) \
, PARROT_ASSERT_ARG(self))
+#define ASSERT_ARGS_csr_set_integer_keyed_int __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
+ PARROT_ASSERT_ARG(interp) \
+ , PARROT_ASSERT_ARG(self))
+#define ASSERT_ARGS_csr_set_integer_native __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
+ PARROT_ASSERT_ARG(interp) \
+ , PARROT_ASSERT_ARG(self))
+#define ASSERT_ARGS_csr_set_number_keyed_int __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
+ PARROT_ASSERT_ARG(interp) \
+ , PARROT_ASSERT_ARG(self))
+#define ASSERT_ARGS_csr_set_pmc_keyed_int __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
+ PARROT_ASSERT_ARG(interp) \
+ , PARROT_ASSERT_ARG(self) \
+ , PARROT_ASSERT_ARG(value))
#define ASSERT_ARGS_csr_set_pointer_keyed_int __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
PARROT_ASSERT_ARG(interp) \
, PARROT_ASSERT_ARG(self) \
, PARROT_ASSERT_ARG(value))
+#define ASSERT_ARGS_csr_set_string_keyed_int __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
+ PARROT_ASSERT_ARG(interp) \
+ , PARROT_ASSERT_ARG(self) \
+ , PARROT_ASSERT_ARG(value))
#define ASSERT_ARGS_dissect_aggregate_arg __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
PARROT_ASSERT_ARG(interp) \
, PARROT_ASSERT_ARG(call_object) \
@@ -2823,7 +2886,8 @@
/*
-=item C<void csr_set_integer_native(INTVAL size)>
+=item C<static void csr_set_integer_native(PARROT_INTERP, PMC *self, INTVAL
+size)>
Resizes the array to C<size> elements.
@@ -2832,7 +2896,8 @@
*/
static void
-csr_set_integer_native(PARROT_INTERP, ARGIN(PMC *self), INTVAL size) {
+csr_set_integer_native(PARROT_INTERP, ARGIN(PMC *self), INTVAL size)
+{
void **values = NULL;
INTVAL resize_threshold;
@@ -2889,7 +2954,8 @@
*/
static INTVAL
-csr_elements(PARROT_INTERP, ARGIN(PMC *self)) {
+csr_elements(PARROT_INTERP, ARGIN(PMC *self))
+{
INTVAL size;
GETATTR_CallSignature_returns_size(interp, self, size);
return size;
@@ -2909,7 +2975,8 @@
*/
static void
-csr_set_pointer_keyed_int(PARROT_INTERP, ARGIN(PMC *self), INTVAL key, ARGIN(void *value)) {
+csr_set_pointer_keyed_int(PARROT_INTERP, ARGIN(PMC *self), INTVAL key, ARGIN(void *value))
+{
void **values;
INTVAL size;
@@ -2944,7 +3011,8 @@
*/
static void
-csr_push_integer(PARROT_INTERP, ARGIN(PMC *self), INTVAL type) {
+csr_push_integer(PARROT_INTERP, ARGIN(PMC *self), INTVAL type)
+{
void **values;
INTVAL idx;
@@ -2964,13 +3032,17 @@
/*
-=item C<void csr_set_integer_keyed_int(INTVAL key, INTVAL value)>
+=item C<static void csr_set_integer_keyed_int(PARROT_INTERP, PMC *self, INTVAL
+key, INTVAL value)>
-=item C<void csr_set_number_keyed_int(INTVAL key, FLOATVAL value)>
+=item C<static void csr_set_number_keyed_int(PARROT_INTERP, PMC *self, INTVAL
+key, FLOATVAL value)>
-=item C<void csr_set_string_keyed_int(INTVAL key, STRING *value)>
+=item C<static void csr_set_string_keyed_int(PARROT_INTERP, PMC *self, INTVAL
+key, STRING *value)>
-=item C<void csr_set_pmc_keyed_int(INTVAL key, PMC *value)>
+=item C<static void csr_set_pmc_keyed_int(PARROT_INTERP, PMC *self, INTVAL key,
+PMC *value)>
Sets the value of the element at index C<key> to C<value>, casting if
necessary.
@@ -2980,7 +3052,8 @@
*/
static void
-csr_set_integer_keyed_int(PARROT_INTERP, ARGIN(PMC *self), INTVAL key, INTVAL value) {
+csr_set_integer_keyed_int(PARROT_INTERP, ARGIN(PMC *self), INTVAL key, INTVAL value)
+{
void *cell = csr_get_pointer_keyed_int(interp, self, key);
void *ptr = UNTAG_CELL(cell);
@@ -3003,7 +3076,8 @@
}
static void
-csr_set_number_keyed_int(PARROT_INTERP, ARGIN(PMC *self), INTVAL key, FLOATVAL value) {
+csr_set_number_keyed_int(PARROT_INTERP, ARGIN(PMC *self), INTVAL key, FLOATVAL value)
+{
void *cell = csr_get_pointer_keyed_int(interp, self, key);
void *ptr = UNTAG_CELL(cell);
@@ -3026,7 +3100,8 @@
}
static void
-csr_set_string_keyed_int(PARROT_INTERP, ARGIN(PMC *self), INTVAL key, STRING *value) {
+csr_set_string_keyed_int(PARROT_INTERP, ARGIN(PMC *self), INTVAL key, ARGIN(STRING *value))
+{
void *cell = csr_get_pointer_keyed_int(interp, self, key);
void *ptr = UNTAG_CELL(cell);
@@ -3051,7 +3126,8 @@
}
static void
-csr_set_pmc_keyed_int(PARROT_INTERP, ARGIN(PMC *self), INTVAL key, PMC *value) {
+csr_set_pmc_keyed_int(PARROT_INTERP, ARGIN(PMC *self), INTVAL key, ARGIN(PMC *value))
+{
void *cell = csr_get_pointer_keyed_int(interp, self, key);
void *ptr = UNTAG_CELL(cell);
@@ -3075,7 +3151,8 @@
/*
-=item C<void *csr_get_string_keyed_int(INTVAL key)>
+=item C<static STRING* csr_get_string_keyed_int(PARROT_INTERP, PMC *self, INTVAL
+key)>
Gets raw pointer for result.
@@ -3085,7 +3162,8 @@
PARROT_CANNOT_RETURN_NULL
static STRING*
-csr_get_string_keyed_int(PARROT_INTERP, ARGIN(PMC *self), INTVAL key) {
+csr_get_string_keyed_int(PARROT_INTERP, ARGIN(PMC *self), INTVAL key)
+{
void *cell = csr_get_pointer_keyed_int(interp, self, key);
void *ptr = UNTAG_CELL(cell);
return (STRING *)ptr;
@@ -3105,7 +3183,8 @@
PARROT_CANNOT_RETURN_NULL
static void*
-csr_get_pointer_keyed_int(PARROT_INTERP, ARGIN(PMC *self), INTVAL key) {
+csr_get_pointer_keyed_int(PARROT_INTERP, ARGIN(PMC *self), INTVAL key)
+{
void **values;
INTVAL size;
More information about the parrot-commits
mailing list