Author: infinoid
Date: Fri Jan  2 22:58:47 2009
New Revision: 34859

Modified:
   trunk/compilers/imcc/main.c
   trunk/include/parrot/charset.h
   trunk/include/parrot/encoding.h
   trunk/include/parrot/events.h
   trunk/include/parrot/exceptions.h
   trunk/include/parrot/extend.h
   trunk/include/parrot/global.h
   trunk/include/parrot/global_setup.h
   trunk/include/parrot/headers.h
   trunk/include/parrot/hll.h
   trunk/include/parrot/inter_call.h
   trunk/include/parrot/interpreter.h
   trunk/include/parrot/io.h
   trunk/include/parrot/library.h
   trunk/include/parrot/multidispatch.h
   trunk/include/parrot/oo.h
   trunk/include/parrot/packfile.h
   trunk/include/parrot/resources.h
   trunk/include/parrot/scheduler.h
   trunk/include/parrot/smallobject.h
   trunk/include/parrot/stacks.h
   trunk/include/parrot/string_funcs.h
   trunk/include/parrot/sub.h
   trunk/src/charset/ascii.h
   trunk/src/charset/iso-8859-1.h
   trunk/src/global_setup.c
   trunk/src/inter_call.c
   trunk/src/library.c
   trunk/src/multidispatch.c
   trunk/src/stm/stm_waitlist.h
   trunk/tools/build/headerizer.pl

Log:
[cage] Codingstd fixes from recent merge (linelength, cuddled_else, c_operator).

Modified: trunk/compilers/imcc/main.c
==============================================================================
--- trunk/compilers/imcc/main.c (original)
+++ trunk/compilers/imcc/main.c Fri Jan  2 22:58:47 2009
@@ -112,7 +112,8 @@
        PARROT_ASSERT_ARG(interp)
 #define ASSERT_ARGS_help __attribute__unused__ int _ASSERT_ARGS_CHECK = 0
 #define ASSERT_ARGS_help_debug __attribute__unused__ int _ASSERT_ARGS_CHECK = 0
-#define ASSERT_ARGS_imcc_get_optimization_description __attribute__unused__ 
int _ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_imcc_get_optimization_description \
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(opt_desc)
 #define ASSERT_ARGS_imcc_run_pbc __attribute__unused__ int _ASSERT_ARGS_CHECK 
= \
        PARROT_ASSERT_ARG(interp) \

Modified: trunk/include/parrot/charset.h
==============================================================================
--- trunk/include/parrot/charset.h      (original)
+++ trunk/include/parrot/charset.h      Fri Jan  2 22:58:47 2009
@@ -175,8 +175,10 @@
     || PARROT_ASSERT_ARG(charsetname)
 #define ASSERT_ARGS_Parrot_charset_number_of_str __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(src)
-#define ASSERT_ARGS_Parrot_charsets_encodings_deinit __attribute__unused__ int 
_ASSERT_ARGS_CHECK = 0
-#define ASSERT_ARGS_Parrot_charsets_encodings_init __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_Parrot_charsets_encodings_deinit \
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = 0
+#define ASSERT_ARGS_Parrot_charsets_encodings_init \
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp)
 #define ASSERT_ARGS_Parrot_default_charset __attribute__unused__ int 
_ASSERT_ARGS_CHECK = 0
 #define ASSERT_ARGS_Parrot_find_charset __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
@@ -195,7 +197,8 @@
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(charsetname) \
     || PARROT_ASSERT_ARG(charset)
-#define ASSERT_ARGS_Parrot_register_charset_converter __attribute__unused__ 
int _ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_Parrot_register_charset_converter \
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(lhs) \
     || PARROT_ASSERT_ARG(rhs) \
     || PARROT_ASSERT_ARG(func)

Modified: trunk/include/parrot/encoding.h
==============================================================================
--- trunk/include/parrot/encoding.h     (original)
+++ trunk/include/parrot/encoding.h     Fri Jan  2 22:58:47 2009
@@ -163,7 +163,8 @@
        PARROT_ASSERT_ARG(src)
 #define ASSERT_ARGS_Parrot_find_encoding __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(encodingname)
-#define ASSERT_ARGS_Parrot_find_encoding_converter __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_Parrot_find_encoding_converter \
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(lhs) \
     || PARROT_ASSERT_ARG(rhs)

Modified: trunk/include/parrot/events.h
==============================================================================
--- trunk/include/parrot/events.h       (original)
+++ trunk/include/parrot/events.h       Fri Jan  2 22:58:47 2009
@@ -187,7 +187,8 @@
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(cbi) \
     || PARROT_ASSERT_ARG(ext)
-#define ASSERT_ARGS_Parrot_new_suspend_for_gc_event __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_Parrot_new_suspend_for_gc_event \
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp)
 #define ASSERT_ARGS_Parrot_new_terminate_event __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp)
@@ -201,7 +202,8 @@
     || PARROT_ASSERT_ARG(entry)
 #define ASSERT_ARGS_Parrot_sleep_on_event __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp)
-#define ASSERT_ARGS_Parrot_schedule_broadcast_qentry __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_Parrot_schedule_broadcast_qentry \
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(entry)
 /* Don't modify between HEADERIZER BEGIN / HEADERIZER END.  Your changes will 
be lost. */
 /* HEADERIZER END: src/events.c */

Modified: trunk/include/parrot/exceptions.h
==============================================================================
--- trunk/include/parrot/exceptions.h   (original)
+++ trunk/include/parrot/exceptions.h   Fri Jan  2 22:58:47 2009
@@ -284,7 +284,7 @@
         const char *file, unsigned int line) /* HEADERIZER SKIP */
 {
 #ifndef NDEBUG
-    if(!x) Parrot_confess(name, file, line);
+    if (!x) Parrot_confess(name, file, line);
 #endif
     PARROT_ASSERT(x);
     return 0;

Modified: trunk/include/parrot/extend.h
==============================================================================
--- trunk/include/parrot/extend.h       (original)
+++ trunk/include/parrot/extend.h       Fri Jan  2 22:58:47 2009
@@ -456,7 +456,8 @@
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(pmc) \
     || PARROT_ASSERT_ARG(length)
-#define ASSERT_ARGS_Parrot_PMC_get_cstringn_intkey __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_Parrot_PMC_get_cstringn_intkey \
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(pmc) \
     || PARROT_ASSERT_ARG(length)
@@ -489,7 +490,8 @@
        PARROT_ASSERT_ARG(interp)
 #define ASSERT_ARGS_Parrot_PMC_set_cstringn __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp)
-#define ASSERT_ARGS_Parrot_PMC_set_cstringn_intkey __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_Parrot_PMC_set_cstringn_intkey \
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp)
 #define ASSERT_ARGS_Parrot_PMC_set_intval __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp)

Modified: trunk/include/parrot/global.h
==============================================================================
--- trunk/include/parrot/global.h       (original)
+++ trunk/include/parrot/global.h       Fri Jan  2 22:58:47 2009
@@ -192,15 +192,18 @@
 #define ASSERT_ARGS_Parrot_get_namespace_keyed __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(base_ns)
-#define ASSERT_ARGS_Parrot_get_namespace_keyed_str __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_Parrot_get_namespace_keyed_str \
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(base_ns)
-#define ASSERT_ARGS_Parrot_make_namespace_autobase __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_Parrot_make_namespace_autobase \
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp)
 #define ASSERT_ARGS_Parrot_make_namespace_keyed __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(base_ns)
-#define ASSERT_ARGS_Parrot_make_namespace_keyed_str __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_Parrot_make_namespace_keyed_str \
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(base_ns)
 #define ASSERT_ARGS_Parrot_ns_get_name __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \

Modified: trunk/include/parrot/global_setup.h
==============================================================================
--- trunk/include/parrot/global_setup.h (original)
+++ trunk/include/parrot/global_setup.h Fri Jan  2 22:58:47 2009
@@ -35,7 +35,8 @@
 void parrot_global_setup_2(PARROT_INTERP)
         __attribute__nonnull__(1);
 
-#define ASSERT_ARGS_Parrot_set_config_hash_internal __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_Parrot_set_config_hash_internal \
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(parrot_config)
 #define ASSERT_ARGS_init_world __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp)

Modified: trunk/include/parrot/headers.h
==============================================================================
--- trunk/include/parrot/headers.h      (original)
+++ trunk/include/parrot/headers.h      Fri Jan  2 22:58:47 2009
@@ -204,9 +204,11 @@
 #define ASSERT_ARGS_Parrot_forall_header_pools __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(func)
-#define ASSERT_ARGS_Parrot_initialize_header_pool_names __attribute__unused__ 
int _ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_Parrot_initialize_header_pool_names \
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp)
-#define ASSERT_ARGS_Parrot_initialize_header_pools __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_Parrot_initialize_header_pools \
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp)
 #define ASSERT_ARGS_Parrot_merge_header_pools __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(dest_interp) \

Modified: trunk/include/parrot/hll.h
==============================================================================
--- trunk/include/parrot/hll.h  (original)
+++ trunk/include/parrot/hll.h  Fri Jan  2 22:58:47 2009
@@ -89,7 +89,8 @@
        PARROT_ASSERT_ARG(interp)
 #define ASSERT_ARGS_Parrot_get_HLL_type __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp)
-#define ASSERT_ARGS_Parrot_regenerate_HLL_namespaces __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_Parrot_regenerate_HLL_namespaces \
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp)
 #define ASSERT_ARGS_Parrot_register_HLL __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \

Modified: trunk/include/parrot/inter_call.h
==============================================================================
--- trunk/include/parrot/inter_call.h   (original)
+++ trunk/include/parrot/inter_call.h   Fri Jan  2 22:58:47 2009
@@ -263,7 +263,8 @@
 #define ASSERT_ARGS_Parrot_fetch_arg_nci __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(st)
-#define ASSERT_ARGS_Parrot_init_arg_indexes_and_sig_pmc __attribute__unused__ 
int _ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_Parrot_init_arg_indexes_and_sig_pmc \
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(ctx) \
     || PARROT_ASSERT_ARG(sti)
 #define ASSERT_ARGS_Parrot_init_arg_nci __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
@@ -286,11 +287,13 @@
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(src_ctx) \
     || PARROT_ASSERT_ARG(dest_ctx)
-#define ASSERT_ARGS_Parrot_pcc_invoke_sub_from_c_args __attribute__unused__ 
int _ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_Parrot_pcc_invoke_sub_from_c_args \
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(sub_obj) \
     || PARROT_ASSERT_ARG(sig)
-#define ASSERT_ARGS_Parrot_pcc_invoke_sub_from_sig_object 
__attribute__unused__ int _ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_Parrot_pcc_invoke_sub_from_sig_object \
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(sub_obj) \
     || PARROT_ASSERT_ARG(sig_obj)

Modified: trunk/include/parrot/interpreter.h
==============================================================================
--- trunk/include/parrot/interpreter.h  (original)
+++ trunk/include/parrot/interpreter.h  Fri Jan  2 22:58:47 2009
@@ -730,12 +730,14 @@
     || PARROT_ASSERT_ARG(sub) \
     || PARROT_ASSERT_ARG(meth) \
     || PARROT_ASSERT_ARG(sig)
-#define ASSERT_ARGS_Parrot_run_meth_fromc_arglist_retf __attribute__unused__ 
int _ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_Parrot_run_meth_fromc_arglist_retf \
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(sub) \
     || PARROT_ASSERT_ARG(meth) \
     || PARROT_ASSERT_ARG(sig)
-#define ASSERT_ARGS_Parrot_run_meth_fromc_arglist_reti __attribute__unused__ 
int _ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_Parrot_run_meth_fromc_arglist_reti \
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(sub) \
     || PARROT_ASSERT_ARG(meth) \
@@ -745,12 +747,14 @@
     || PARROT_ASSERT_ARG(sub) \
     || PARROT_ASSERT_ARG(meth) \
     || PARROT_ASSERT_ARG(sig)
-#define ASSERT_ARGS_Parrot_run_meth_fromc_args_retf __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_Parrot_run_meth_fromc_args_retf \
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(sub) \
     || PARROT_ASSERT_ARG(meth) \
     || PARROT_ASSERT_ARG(sig)
-#define ASSERT_ARGS_Parrot_run_meth_fromc_args_reti __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_Parrot_run_meth_fromc_args_reti \
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(sub) \
     || PARROT_ASSERT_ARG(meth) \
@@ -762,11 +766,13 @@
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(sub) \
     || PARROT_ASSERT_ARG(sig)
-#define ASSERT_ARGS_Parrot_runops_fromc_arglist_retf __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_Parrot_runops_fromc_arglist_retf \
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(sub) \
     || PARROT_ASSERT_ARG(sig)
-#define ASSERT_ARGS_Parrot_runops_fromc_arglist_reti __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_Parrot_runops_fromc_arglist_reti \
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(sub) \
     || PARROT_ASSERT_ARG(sig)
@@ -774,7 +780,8 @@
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(sub) \
     || PARROT_ASSERT_ARG(sig)
-#define ASSERT_ARGS_Parrot_runops_fromc_args_event __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_Parrot_runops_fromc_args_event \
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(sub) \
     || PARROT_ASSERT_ARG(sig)
@@ -788,7 +795,8 @@
     || PARROT_ASSERT_ARG(sig)
 #define ASSERT_ARGS_destroy_runloop_jump_points __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp)
-#define ASSERT_ARGS_really_destroy_runloop_jump_points __attribute__unused__ 
int _ASSERT_ARGS_CHECK = 0
+#define ASSERT_ARGS_really_destroy_runloop_jump_points \
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = 0
 #define ASSERT_ARGS_runops __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp)
 /* Don't modify between HEADERIZER BEGIN / HEADERIZER END.  Your changes will 
be lost. */

Modified: trunk/include/parrot/io.h
==============================================================================
--- trunk/include/parrot/io.h   (original)
+++ trunk/include/parrot/io.h   Fri Jan  2 22:58:47 2009
@@ -703,11 +703,13 @@
        PARROT_ASSERT_ARG(filehandle)
 #define ASSERT_ARGS_Parrot_io_get_flags __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(filehandle)
-#define ASSERT_ARGS_Parrot_io_get_last_file_position __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_Parrot_io_get_last_file_position \
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(filehandle)
 #define ASSERT_ARGS_Parrot_io_get_os_handle __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(filehandle)
-#define ASSERT_ARGS_Parrot_io_is_closed_filehandle __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_Parrot_io_is_closed_filehandle \
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(pmc)
 #define ASSERT_ARGS_Parrot_io_is_encoding __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \

Modified: trunk/include/parrot/library.h
==============================================================================
--- trunk/include/parrot/library.h      (original)
+++ trunk/include/parrot/library.h      Fri Jan  2 22:58:47 2009
@@ -101,7 +101,8 @@
 #define ASSERT_ARGS_Parrot_locate_runtime_file __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(file_name)
-#define ASSERT_ARGS_Parrot_locate_runtime_file_str __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_Parrot_locate_runtime_file_str \
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(file)
 #define ASSERT_ARGS_parrot_init_library_paths __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \

Modified: trunk/include/parrot/multidispatch.h
==============================================================================
--- trunk/include/parrot/multidispatch.h        (original)
+++ trunk/include/parrot/multidispatch.h        Fri Jan  2 22:58:47 2009
@@ -216,24 +216,29 @@
         __attribute__nonnull__(2)
         __attribute__nonnull__(3);
 
-#define ASSERT_ARGS_Parrot_build_sig_object_from_varargs __attribute__unused__ 
int _ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_Parrot_build_sig_object_from_varargs \
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(sig)
-#define ASSERT_ARGS_Parrot_mmd_add_multi_from_c_args __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_Parrot_mmd_add_multi_from_c_args \
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(sub_name) \
     || PARROT_ASSERT_ARG(short_sig) \
     || PARROT_ASSERT_ARG(long_sig) \
     || PARROT_ASSERT_ARG(multi_func_ptr)
-#define ASSERT_ARGS_Parrot_mmd_add_multi_from_long_sig __attribute__unused__ 
int _ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_Parrot_mmd_add_multi_from_long_sig \
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(sub_name) \
     || PARROT_ASSERT_ARG(long_sig) \
     || PARROT_ASSERT_ARG(sub_obj)
-#define ASSERT_ARGS_Parrot_mmd_add_multi_list_from_c_args 
__attribute__unused__ int _ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_Parrot_mmd_add_multi_list_from_c_args \
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(mmd_info)
-#define ASSERT_ARGS_Parrot_mmd_build_type_tuple_from_sig_obj 
__attribute__unused__ int _ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_Parrot_mmd_build_type_tuple_from_sig_obj \
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(sig_obj)
 #define ASSERT_ARGS_Parrot_mmd_cache_create __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
@@ -241,12 +246,14 @@
 #define ASSERT_ARGS_Parrot_mmd_cache_destroy __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(cache)
-#define ASSERT_ARGS_Parrot_mmd_cache_lookup_by_types __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_Parrot_mmd_cache_lookup_by_types \
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(cache) \
     || PARROT_ASSERT_ARG(name) \
     || PARROT_ASSERT_ARG(types)
-#define ASSERT_ARGS_Parrot_mmd_cache_lookup_by_values __attribute__unused__ 
int _ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_Parrot_mmd_cache_lookup_by_values \
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(cache) \
     || PARROT_ASSERT_ARG(name) \
@@ -254,34 +261,40 @@
 #define ASSERT_ARGS_Parrot_mmd_cache_mark __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(cache)
-#define ASSERT_ARGS_Parrot_mmd_cache_store_by_types __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_Parrot_mmd_cache_store_by_types \
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(cache) \
     || PARROT_ASSERT_ARG(name) \
     || PARROT_ASSERT_ARG(types) \
     || PARROT_ASSERT_ARG(chosen)
-#define ASSERT_ARGS_Parrot_mmd_cache_store_by_values __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_Parrot_mmd_cache_store_by_values \
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(cache) \
     || PARROT_ASSERT_ARG(name) \
     || PARROT_ASSERT_ARG(values) \
     || PARROT_ASSERT_ARG(chosen)
-#define ASSERT_ARGS_Parrot_mmd_find_multi_from_long_sig __attribute__unused__ 
int _ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_Parrot_mmd_find_multi_from_long_sig \
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(name) \
     || PARROT_ASSERT_ARG(long_sig)
-#define ASSERT_ARGS_Parrot_mmd_find_multi_from_sig_obj __attribute__unused__ 
int _ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_Parrot_mmd_find_multi_from_sig_obj \
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(name) \
     || PARROT_ASSERT_ARG(invoke_sig)
-#define ASSERT_ARGS_Parrot_mmd_multi_dispatch_from_c_args 
__attribute__unused__ int _ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_Parrot_mmd_multi_dispatch_from_c_args \
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(name) \
     || PARROT_ASSERT_ARG(sig)
 #define ASSERT_ARGS_Parrot_mmd_sort_manhattan __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(candidates)
-#define ASSERT_ARGS_Parrot_mmd_sort_manhattan_by_sig_pmc __attribute__unused__ 
int _ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_Parrot_mmd_sort_manhattan_by_sig_pmc \
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(candidates) \
     || PARROT_ASSERT_ARG(invoke_sig)

Modified: trunk/include/parrot/oo.h
==============================================================================
--- trunk/include/parrot/oo.h   (original)
+++ trunk/include/parrot/oo.h   Fri Jan  2 22:58:47 2009
@@ -229,7 +229,8 @@
 #define ASSERT_ARGS_Parrot_get_vtable_index __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(name)
-#define ASSERT_ARGS_Parrot_invalidate_method_cache __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_Parrot_invalidate_method_cache \
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp)
 #define ASSERT_ARGS_Parrot_MMD_method_name __attribute__unused__ int 
_ASSERT_ARGS_CHECK = 0
 #define ASSERT_ARGS_Parrot_oo_get_class __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
@@ -251,15 +252,18 @@
 #define ASSERT_ARGS_Parrot_class_lookup_p __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(class_name)
-#define ASSERT_ARGS_Parrot_oo_extract_methods_from_namespace 
__attribute__unused__ int _ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_Parrot_oo_extract_methods_from_namespace \
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(self) \
     || PARROT_ASSERT_ARG(ns)
-#define ASSERT_ARGS_Parrot_oo_find_vtable_override __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_Parrot_oo_find_vtable_override \
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(classobj) \
     || PARROT_ASSERT_ARG(name)
-#define ASSERT_ARGS_Parrot_oo_find_vtable_override_for_class 
__attribute__unused__ int _ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_Parrot_oo_find_vtable_override_for_class \
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(classobj) \
     || PARROT_ASSERT_ARG(name)

Modified: trunk/include/parrot/packfile.h
==============================================================================
--- trunk/include/parrot/packfile.h     (original)
+++ trunk/include/parrot/packfile.h     Fri Jan  2 22:58:47 2009
@@ -722,7 +722,8 @@
 #define ASSERT_ARGS_PackFile_new_dummy __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(name)
-#define ASSERT_ARGS_PackFile_remove_segment_by_name __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_PackFile_remove_segment_by_name \
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(dir) \
     || PARROT_ASSERT_ARG(name)
 #define ASSERT_ARGS_PackFile_Segment_destroy __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \

Modified: trunk/include/parrot/resources.h
==============================================================================
--- trunk/include/parrot/resources.h    (original)
+++ trunk/include/parrot/resources.h    Fri Jan  2 22:58:47 2009
@@ -106,7 +106,8 @@
 #define ASSERT_ARGS_Parrot_in_memory_pool __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(bufstart)
-#define ASSERT_ARGS_Parrot_initialize_memory_pools __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_Parrot_initialize_memory_pools \
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp)
 #define ASSERT_ARGS_Parrot_merge_memory_pools __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(dest_interp) \

Modified: trunk/include/parrot/scheduler.h
==============================================================================
--- trunk/include/parrot/scheduler.h    (original)
+++ trunk/include/parrot/scheduler.h    Fri Jan  2 22:58:47 2009
@@ -171,21 +171,26 @@
 #define ASSERT_ARGS_Parrot_cx_broadcast_message __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(messagetype)
-#define ASSERT_ARGS_Parrot_cx_count_handlers_typed __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_Parrot_cx_count_handlers_typed \
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(handler_type)
-#define ASSERT_ARGS_Parrot_cx_delete_handler_local __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_Parrot_cx_delete_handler_local \
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(handler_type)
-#define ASSERT_ARGS_Parrot_cx_delete_handler_typed __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_Parrot_cx_delete_handler_typed \
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(handler_type)
-#define ASSERT_ARGS_Parrot_cx_delete_suspend_for_gc __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_Parrot_cx_delete_suspend_for_gc \
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp)
 #define ASSERT_ARGS_Parrot_cx_delete_task __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(task)
-#define ASSERT_ARGS_Parrot_cx_find_handler_for_task __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_Parrot_cx_find_handler_for_task \
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(task)
 #define ASSERT_ARGS_Parrot_cx_find_handler_local __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
@@ -196,7 +201,8 @@
     || PARROT_ASSERT_ARG(scheduler)
 #define ASSERT_ARGS_Parrot_cx_peek_task __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp)
-#define ASSERT_ARGS_Parrot_cx_request_suspend_for_gc __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_Parrot_cx_request_suspend_for_gc \
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp)
 #define ASSERT_ARGS_Parrot_cx_runloop_end __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp)

Modified: trunk/include/parrot/smallobject.h
==============================================================================
--- trunk/include/parrot/smallobject.h  (original)
+++ trunk/include/parrot/smallobject.h  Fri Jan  2 22:58:47 2009
@@ -208,7 +208,8 @@
 #define ASSERT_ARGS_Parrot_is_const_pmc __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(pmc)
-#define ASSERT_ARGS_Parrot_small_object_pool_merge __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_Parrot_small_object_pool_merge \
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(dest) \
     || PARROT_ASSERT_ARG(source)

Modified: trunk/include/parrot/stacks.h
==============================================================================
--- trunk/include/parrot/stacks.h       (original)
+++ trunk/include/parrot/stacks.h       Fri Jan  2 22:58:47 2009
@@ -176,7 +176,8 @@
 #define ASSERT_ARGS_new_stack __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(name)
-#define ASSERT_ARGS_Parrot_dump_dynamic_environment __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_Parrot_dump_dynamic_environment \
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(dynamic_env)
 #define ASSERT_ARGS_Parrot_pop_mark __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \

Modified: trunk/include/parrot/string_funcs.h
==============================================================================
--- trunk/include/parrot/string_funcs.h (original)
+++ trunk/include/parrot/string_funcs.h Fri Jan  2 22:58:47 2009
@@ -623,7 +623,8 @@
        PARROT_ASSERT_ARG(interp)
 #define ASSERT_ARGS_string_escape_string __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp)
-#define ASSERT_ARGS_string_escape_string_delimited __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_string_escape_string_delimited \
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp)
 #define ASSERT_ARGS_string_from_cstring __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp)
@@ -663,7 +664,8 @@
 #define ASSERT_ARGS_string_pin __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(s)
-#define ASSERT_ARGS_string_primary_encoding_for_representation 
__attribute__unused__ int _ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_string_primary_encoding_for_representation \
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp)
 #define ASSERT_ARGS_string_printf __attribute__unused__ int _ASSERT_ARGS_CHECK 
= \
        PARROT_ASSERT_ARG(interp) \

Modified: trunk/include/parrot/sub.h
==============================================================================
--- trunk/include/parrot/sub.h  (original)
+++ trunk/include/parrot/sub.h  Fri Jan  2 22:58:47 2009
@@ -379,7 +379,8 @@
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(pmc) \
     || PARROT_ASSERT_ARG(cc)
-#define ASSERT_ARGS_Parrot_continuation_rewind_environment 
__attribute__unused__ int _ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_Parrot_continuation_rewind_environment \
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(cc)
 #define ASSERT_ARGS_Parrot_find_pad __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \

Modified: trunk/src/charset/ascii.h
==============================================================================
--- trunk/src/charset/ascii.h   (original)
+++ trunk/src/charset/ascii.h   Fri Jan  2 22:58:47 2009
@@ -124,7 +124,8 @@
 #define ASSERT_ARGS_charset_cvt_ascii_to_binary __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(src)
-#define ASSERT_ARGS_charset_cvt_ascii_to_iso_8859_1 __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_charset_cvt_ascii_to_iso_8859_1 \
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(src)
 #define ASSERT_ARGS_mixed_cs_index __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \

Modified: trunk/src/charset/iso-8859-1.h
==============================================================================
--- trunk/src/charset/iso-8859-1.h      (original)
+++ trunk/src/charset/iso-8859-1.h      Fri Jan  2 22:58:47 2009
@@ -29,10 +29,12 @@
 const CHARSET * Parrot_charset_iso_8859_1_init(PARROT_INTERP)
         __attribute__nonnull__(1);
 
-#define ASSERT_ARGS_charset_cvt_iso_8859_1_to_ascii __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_charset_cvt_iso_8859_1_to_ascii \
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(src)
-#define ASSERT_ARGS_Parrot_charset_iso_8859_1_init __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_Parrot_charset_iso_8859_1_init \
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp)
 /* Don't modify between HEADERIZER BEGIN / HEADERIZER END.  Your changes will 
be lost. */
 /* HEADERIZER END: src/charset/iso-8859-1.c */

Modified: trunk/src/global_setup.c
==============================================================================
--- trunk/src/global_setup.c    (original)
+++ trunk/src/global_setup.c    Fri Jan  2 22:58:47 2009
@@ -41,7 +41,8 @@
 static void parrot_set_config_hash_interpreter(PARROT_INTERP)
         __attribute__nonnull__(1);
 
-#define ASSERT_ARGS_parrot_set_config_hash_interpreter __attribute__unused__ 
int _ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_parrot_set_config_hash_interpreter \
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp)
 /* Don't modify between HEADERIZER BEGIN / HEADERIZER END.  Your changes will 
be lost. */
 /* HEADERIZER END: static */

Modified: trunk/src/inter_call.c
==============================================================================
--- trunk/src/inter_call.c      (original)
+++ trunk/src/inter_call.c      Fri Jan  2 22:58:47 2009
@@ -299,7 +299,8 @@
     || PARROT_ASSERT_ARG(ctx) \
     || PARROT_ASSERT_ARG(indexes) \
     || PARROT_ASSERT_ARG(result_list)
-#define ASSERT_ARGS_set_context_sig_returns_varargs __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_set_context_sig_returns_varargs \
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(ctx) \
     || PARROT_ASSERT_ARG(indexes) \

Modified: trunk/src/library.c
==============================================================================
--- trunk/src/library.c (original)
+++ trunk/src/library.c Fri Jan  2 22:58:47 2009
@@ -108,7 +108,8 @@
 #define ASSERT_ARGS_path_finalize __attribute__unused__ int _ASSERT_ARGS_CHECK 
= \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(path)
-#define ASSERT_ARGS_path_guarantee_trailing_separator __attribute__unused__ 
int _ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_path_guarantee_trailing_separator \
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(path)
 #define ASSERT_ARGS_try_bytecode_extensions __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \

Modified: trunk/src/multidispatch.c
==============================================================================
--- trunk/src/multidispatch.c   (original)
+++ trunk/src/multidispatch.c   Fri Jan  2 22:58:47 2009
@@ -185,10 +185,12 @@
     || PARROT_ASSERT_ARG(ns_name) \
     || PARROT_ASSERT_ARG(sub_name) \
     || PARROT_ASSERT_ARG(sub_obj)
-#define ASSERT_ARGS_mmd_build_type_tuple_from_long_sig __attribute__unused__ 
int _ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_mmd_build_type_tuple_from_long_sig \
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(long_sig)
-#define ASSERT_ARGS_mmd_build_type_tuple_from_type_list __attribute__unused__ 
int _ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_mmd_build_type_tuple_from_type_list \
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(type_list)
 #define ASSERT_ARGS_mmd_cache_key_from_types __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
@@ -221,7 +223,8 @@
     || PARROT_ASSERT_ARG(candidates)
 #define ASSERT_ARGS_Parrot_mmd_arg_tuple_func __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp)
-#define ASSERT_ARGS_Parrot_mmd_get_cached_multi_sig __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_Parrot_mmd_get_cached_multi_sig \
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(sub)
 #define ASSERT_ARGS_Parrot_mmd_maybe_candidate __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \

Modified: trunk/src/stm/stm_waitlist.h
==============================================================================
--- trunk/src/stm/stm_waitlist.h        (original)
+++ trunk/src/stm/stm_waitlist.h        Fri Jan  2 22:58:47 2009
@@ -91,12 +91,14 @@
 #define ASSERT_ARGS_Parrot_STM_waitlist_add_self __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(waitlist)
-#define ASSERT_ARGS_Parrot_STM_waitlist_destroy_thread __attribute__unused__ 
int _ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_Parrot_STM_waitlist_destroy_thread \
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp)
 #define ASSERT_ARGS_Parrot_STM_waitlist_init __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(waitlist)
-#define ASSERT_ARGS_Parrot_STM_waitlist_remove_all __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_Parrot_STM_waitlist_remove_all \
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp)
 #define ASSERT_ARGS_Parrot_STM_waitlist_signal __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \

Modified: trunk/tools/build/headerizer.pl
==============================================================================
--- trunk/tools/build/headerizer.pl     (original)
+++ trunk/tools/build/headerizer.pl     Fri Jan  2 22:58:47 2009
@@ -381,11 +381,15 @@
         my @asserts = asserts_from_args( @args );
 
         my $assert = "#define ASSERT_ARGS_" . $func->{name};
-            $assert .= " __attribute__unused__ int _ASSERT_ARGS_CHECK = ";
+        if(length($func->{name}) > 29) {
+            $assert .= " \\\n    ";
+        }
+        $assert .= " __attribute__unused__ int _ASSERT_ARGS_CHECK = ";
         if(@asserts) {
             $assert .= "\\\n       ";
             $assert .= join(" \\\n    || ", @asserts);
-        } else {
+        }
+        else {
             $assert .= "0";
         }
         push(@decls, $assert);

Reply via email to