Author: paultcochrane
Date: Sun Sep 30 14:18:33 2007
New Revision: 21682
Modified:
trunk/src/embed.c
trunk/src/exceptions.c
trunk/src/inter_call.c
trunk/src/interpreter.c
trunk/src/io/io_passdown.c
trunk/src/io/io_stdio.c
trunk/src/io/io_win32.c
trunk/src/key.c
trunk/src/ops/pmc.ops
trunk/src/pmc/class.pmc
trunk/src/pmc/role.pmc
Log:
[core] Reorganised the length of some lines of code to conform to coding
standards.
Modified: trunk/src/embed.c
==============================================================================
--- trunk/src/embed.c (original)
+++ trunk/src/embed.c Sun Sep 30 14:18:33 2007
@@ -914,8 +914,10 @@
if (debugs && curr_mapping < num_mappings) {
if (op_code_seq_num ==
interp->code->debugs->mappings[curr_mapping]->offset) {
- const int filename_const_offset =
interp->code->debugs->mappings[curr_mapping]->u.filename;
- PIO_printf(interp, "Current Source Filename %Ss\n",
interp->code->const_table->constants[filename_const_offset]->u.string);
+ const int filename_const_offset =
+ interp->code->debugs->mappings[curr_mapping]->u.filename;
+ PIO_printf(interp, "Current Source Filename %Ss\n",
+
interp->code->const_table->constants[filename_const_offset]->u.string);
curr_mapping++;
}
}
Modified: trunk/src/exceptions.c
==============================================================================
--- trunk/src/exceptions.c (original)
+++ trunk/src/exceptions.c Sun Sep 30 14:18:33 2007
@@ -837,7 +837,9 @@
const size_t size = backtrace(array, BACKTRACE_DEPTH);
char ** const strings = backtrace_symbols(array, size);
- fprintf(stderr, "Backtrace - Obtained %zd stack frames (max trace depth is
%d).\n", size, BACKTRACE_DEPTH);
+ fprintf(stderr,
+ "Backtrace - Obtained %zd stack frames (max trace depth is %d).\n",
+ size, BACKTRACE_DEPTH);
# ifndef BACKTRACE_VERBOSE
for (i = 0; i < size; i++) {
/* always ident */
Modified: trunk/src/inter_call.c
==============================================================================
--- trunk/src/inter_call.c (original)
+++ trunk/src/inter_call.c Sun Sep 30 14:18:33 2007
@@ -1156,8 +1156,12 @@
PARROT_API
void
-parrot_pass_args(PARROT_INTERP, NOTNULL(parrot_context_t *src_ctx),
NOTNULL(parrot_context_t *dest_ctx),
- NOTNULL(opcode_t *src_indexes), NOTNULL(opcode_t *dest_indexes),
arg_pass_t param_or_result)
+parrot_pass_args(PARROT_INTERP,
+ NOTNULL(parrot_context_t *src_ctx),
+ NOTNULL(parrot_context_t *dest_ctx),
+ NOTNULL(opcode_t *src_indexes),
+ NOTNULL(opcode_t *dest_indexes),
+ arg_pass_t param_or_result)
{
call_state st;
PMC* src_signature;
Modified: trunk/src/interpreter.c
==============================================================================
--- trunk/src/interpreter.c (original)
+++ trunk/src/interpreter.c Sun Sep 30 14:18:33 2007
@@ -49,7 +49,8 @@
#include "parrot/dynext.h"
-/* HEADERIZER HFILE: none */ /* XXX Needs to get done at the same time as the
other interpreter files */
+/* HEADERIZER HFILE: none */
+/* XXX Needs to get done at the same time as the other interpreter files */
/* HEADERIZER BEGIN: static */
Modified: trunk/src/io/io_passdown.c
==============================================================================
--- trunk/src/io/io_passdown.c (original)
+++ trunk/src/io/io_passdown.c Sun Sep 30 14:18:33 2007
@@ -117,7 +117,10 @@
PARROT_WARN_UNUSED_RESULT
size_t
-PIO_peek_down(PARROT_INTERP, NULLOK(ParrotIOLayer *layer), NOTNULL(ParrotIO
*io), NOTNULL(STRING **buf))
+PIO_peek_down(PARROT_INTERP,
+ NULLOK(ParrotIOLayer *layer),
+ NOTNULL(ParrotIO *io),
+ NOTNULL(STRING **buf))
{
while (layer) {
if (layer->api->Peek)
Modified: trunk/src/io/io_stdio.c
==============================================================================
--- trunk/src/io/io_stdio.c (original)
+++ trunk/src/io/io_stdio.c Sun Sep 30 14:18:33 2007
@@ -101,7 +101,8 @@
/* HEADERIZER END: static */
-extern INTVAL PIO_stdio_getblksize(PIOHANDLE fd); /* XXX Use a
declaration in a header file */
+/* XXX Use a declaration in a header file */
+extern INTVAL PIO_stdio_getblksize(PIOHANDLE fd);
/* Defined at bottom */
extern const ParrotIOLayerAPI pio_stdio_layer_api;
@@ -320,7 +321,10 @@
*/
static size_t
-PIO_stdio_peek(PARROT_INTERP, SHIM(ParrotIOLayer *layer), NOTNULL(ParrotIO
*io), NOTNULL(STRING **buf))
+PIO_stdio_peek(PARROT_INTERP,
+ SHIM(ParrotIOLayer *layer),
+ NOTNULL(ParrotIO *io),
+ NOTNULL(STRING **buf))
{
FILE * const fptr = (FILE *)io->fd;
STRING * const s = PIO_make_io_string(interp, buf, 1);
Modified: trunk/src/io/io_win32.c
==============================================================================
--- trunk/src/io/io_win32.c (original)
+++ trunk/src/io/io_win32.c Sun Sep 30 14:18:33 2007
@@ -458,7 +458,10 @@
*/
static size_t
-PIO_win32_read(PARROT_INTERP, SHIM(ParrotIOLayer *layer), NOTNULL(ParrotIO
*io), NOTNULL(STRING **buf))
+PIO_win32_read(PARROT_INTERP,
+ SHIM(ParrotIOLayer *layer),
+ NOTNULL(ParrotIO *io),
+ NOTNULL(STRING **buf))
{
DWORD countread;
void *buffer;
@@ -668,7 +671,10 @@
*/
static INTVAL
-PIO_win32_connect(PARROT_INTERP, SHIM(ParrotIOLayer *layer), NOTNULL(ParrotIO
*io), NOTNULL(STRING *r))
+PIO_win32_connect(PARROT_INTERP,
+ SHIM(ParrotIOLayer *layer),
+ NOTNULL(ParrotIO *io),
+ NOTNULL(STRING *r))
{
if (r) {
struct sockaddr_in sa;
@@ -753,7 +759,10 @@
*/
static INTVAL
-PIO_win32_recv(PARROT_INTERP, SHIM(ParrotIOLayer *layer), NOTNULL(ParrotIO
*io), NOTNULL(STRING **s))
+PIO_win32_recv(PARROT_INTERP,
+ SHIM(ParrotIOLayer *layer),
+ NOTNULL(ParrotIO *io),
+ NOTNULL(STRING **s))
{
int error;
int err;
Modified: trunk/src/key.c
==============================================================================
--- trunk/src/key.c (original)
+++ trunk/src/key.c Sun Sep 30 14:18:33 2007
@@ -495,7 +495,8 @@
value = string_append(interp, value, VTABLE_get_string(interp,
key));
break;
case KEY_integer_FLAG | KEY_register_FLAG:
- value = string_append(interp, value, string_from_int(interp,
REG_INT(interp, PMC_int_val(key))));
+ value = string_append(interp, value,
+ string_from_int(interp, REG_INT(interp,
PMC_int_val(key))));
break;
case KEY_string_FLAG | KEY_register_FLAG:
value = string_append(interp, value, quote);
@@ -509,7 +510,8 @@
}
break;
default:
- value = string_append(interp, value,
string_from_literal(interp, "Key type unknown"));
+ value = string_append(interp, value,
+ string_from_literal(interp, "Key type unknown"));
break;
}
Modified: trunk/src/ops/pmc.ops
==============================================================================
--- trunk/src/ops/pmc.ops (original)
+++ trunk/src/ops/pmc.ops Sun Sep 30 14:18:33 2007
@@ -94,7 +94,8 @@
if (!PMC_IS_NULL(ns))
classobj = VTABLE_get_class(interp, ns);
- if (!PMC_IS_NULL(classobj) && !VTABLE_isa(interp, classobj,
string_from_literal(interp, "PMCProxy")))
+ if (!PMC_IS_NULL(classobj) &&
+ !VTABLE_isa(interp, classobj, string_from_literal(interp, "PMCProxy")))
$1 = VTABLE_instantiate(interp, classobj, PMCNULL);
else {
INTVAL type = pmc_type(interp, _class);
Modified: trunk/src/pmc/class.pmc
==============================================================================
--- trunk/src/pmc/class.pmc (original)
+++ trunk/src/pmc/class.pmc Sun Sep 30 14:18:33 2007
@@ -703,7 +703,8 @@
/* If we have already added a vtable override with this name... */
if (VTABLE_exists_keyed_str(interp, _class->vtable_overrides, name)) {
real_exception(interp, NULL, E_NotImplementedError,
- "A vtable override of this name already exists. It may have
been supplied by a role.");
+ "A vtable override of this name already exists."
+ "It may have been supplied by a role.");
}
/* Check name is a valid vtable method name. */
Modified: trunk/src/pmc/role.pmc
==============================================================================
--- trunk/src/pmc/role.pmc (original)
+++ trunk/src/pmc/role.pmc Sun Sep 30 14:18:33 2007
@@ -524,7 +524,8 @@
*/
PCCMETHOD attributes() {
- PMC *ret_attrib_metadata = VTABLE_inspect_str(interp, SELF,
CONST_STRING(interp, "attributes"));
+ PMC *ret_attrib_metadata =
+ VTABLE_inspect_str(interp, SELF, CONST_STRING(interp,
"attributes"));
PCCRETURN(PMC *ret_attrib_metadata);
}
