Author: kjs
Date: Sun Feb 10 05:20:28 2008
New Revision: 25625
Modified:
trunk/src/hash.c
trunk/src/hll.c
trunk/src/inter_call.c
trunk/src/inter_cb.c
Log:
[src] align declarations and operators.
Modified: trunk/src/hash.c
==============================================================================
--- trunk/src/hash.c (original)
+++ trunk/src/hash.c Sun Feb 10 05:20:28 2008
@@ -301,8 +301,8 @@
void
parrot_mark_hash(PARROT_INTERP, ARGIN(Hash *hash))
{
- UINTVAL found = 0;
- int mark_key = 0;
+ UINTVAL found = 0;
+ int mark_key = 0;
int mark_value = 0;
size_t i;
@@ -917,7 +917,7 @@
INTVAL i = PMC_int_val(key);
const BucketIndex bi = (BucketIndex)PMC_data(key);
HashBucket *b;
- void *res;
+ void *res;
/* idx directly in the bucket store, which is at negative
* address from the data pointer
Modified: trunk/src/hll.c
==============================================================================
--- trunk/src/hll.c (original)
+++ trunk/src/hll.c Sun Feb 10 05:20:28 2008
@@ -141,7 +141,7 @@
INTVAL
Parrot_register_HLL(PARROT_INTERP, ARGIN(STRING *hll_name))
{
- PMC *entry, *name, *type_hash, *ns_hash, *hll_info;
+ PMC *entry, *name, *type_hash, *ns_hash, *hll_info;
INTVAL idx;
/* TODO LOCK or disallow in threads */
Modified: trunk/src/inter_call.c
==============================================================================
--- trunk/src/inter_call.c (original)
+++ trunk/src/inter_call.c Sun Feb 10 05:20:28 2008
@@ -317,11 +317,11 @@
ARGIN_NULLOK(void *ap), ARGMOD(call_state_item *sti))
{
sti->used = 1;
- sti->i = 0;
- sti->n = 0;
+ sti->i = 0;
+ sti->n = 0;
sti->mode = CALL_STATE_SIG;
- sti->ctx = ctx;
- sti->sig = 0;
+ sti->ctx = ctx;
+ sti->sig = 0;
if (*sig) {
sti->u.sig.sig = sig;
@@ -498,15 +498,15 @@
break;
case PARROT_ARG_STRING:
UVal_str(st->val) = constant ?
st->src.ctx->constants[idx]->u.string
- : CTX_REG_STR(st->src.ctx, idx);
+ : CTX_REG_STR(st->src.ctx, idx);
break;
case PARROT_ARG_FLOATVAL:
UVal_num(st->val) = constant ?
st->src.ctx->constants[idx]->u.number
- : CTX_REG_NUM(st->src.ctx, idx);
+ : CTX_REG_NUM(st->src.ctx, idx);
break;
case PARROT_ARG_PMC:
UVal_pmc(st->val) = constant ? st->src.ctx->constants[idx]->u.key
- : CTX_REG_PMC(st->src.ctx, idx);
+ : CTX_REG_PMC(st->src.ctx, idx);
if (st->src.sig & PARROT_ARG_FLATTEN) {
int retval;
@@ -1819,8 +1819,8 @@
const char *x;
const char *ret_x = NULL;
- int index = -1;
- int cur = 0;
+ int index = -1;
+ int cur = 0;
va_list list;
va_start(list, signature);
Modified: trunk/src/inter_cb.c
==============================================================================
--- trunk/src/inter_cb.c (original)
+++ trunk/src/inter_cb.c Sun Feb 10 05:20:28 2008
@@ -275,23 +275,23 @@
Parrot_run_callback(PARROT_INTERP,
ARGMOD(PMC* user_data), ARGIN(char* external_data))
{
- PMC * signature;
- PMC * sub;
- STRING * sig_str;
- char * p;
+ PMC *signature;
+ PMC *sub;
+ STRING *sig_str;
+ char *p;
char pasm_sig[4];
INTVAL i_param;
- PMC * p_param;
- void* param = NULL; /* avoid -Ox warning */
- STRING * sc;
-
- sc = CONST_STRING(interp, "_sub");
- sub = VTABLE_getprop(interp, user_data, sc);
- sc = CONST_STRING(interp, "_signature");
+ PMC *p_param;
+ void *param = NULL; /* avoid -Ox warning */
+ STRING *sc;
+
+ sc = CONST_STRING(interp, "_sub");
+ sub = VTABLE_getprop(interp, user_data, sc);
+ sc = CONST_STRING(interp, "_signature");
signature = VTABLE_getprop(interp, user_data, sc);
- sig_str = VTABLE_get_string(interp, signature);
- p = sig_str->strstart;
+ sig_str = VTABLE_get_string(interp, signature);
+ p = sig_str->strstart;
++p; /* Skip return type */
pasm_sig[0] = 'v'; /* no return value supported yet */
