develooper Front page | perl.cvs.parrot | Postings from January 2009

[svn:parrot] r35009 - in trunk: compilers/imcc include/parrot src src/atomic src/charset src/encodings src/gc src/io src/jit/i386 src/packfile src/stm t/codingstd

From:
infinoid
Date:
January 5, 2009 15:17
Subject:
[svn:parrot] r35009 - in trunk: compilers/imcc include/parrot src src/atomic src/charset src/encodings src/gc src/io src/jit/i386 src/packfile src/stm t/codingstd
Message ID:
20090105231733.E7777CB9F9@x12.develooper.com
Author: infinoid
Date: Mon Jan  5 15:17:26 2009
New Revision: 35009

Modified:
   trunk/compilers/imcc/cfg.c
   trunk/compilers/imcc/debug.c
   trunk/compilers/imcc/imc.c
   trunk/compilers/imcc/imcparser.c
   trunk/compilers/imcc/instructions.c
   trunk/compilers/imcc/main.c
   trunk/compilers/imcc/optimizer.c
   trunk/compilers/imcc/parser_util.c
   trunk/compilers/imcc/pbc.c
   trunk/compilers/imcc/pcc.c
   trunk/compilers/imcc/reg_alloc.c
   trunk/compilers/imcc/sets.c
   trunk/compilers/imcc/symreg.c
   trunk/include/parrot/exceptions.h
   trunk/src/atomic/gcc_x86.c
   trunk/src/byteorder.c
   trunk/src/charset.c
   trunk/src/charset/ascii.c
   trunk/src/charset/binary.c
   trunk/src/charset/iso-8859-1.c
   trunk/src/charset/unicode.c
   trunk/src/cpu_dep.c
   trunk/src/datatypes.c
   trunk/src/debug.c
   trunk/src/dynext.c
   trunk/src/embed.c
   trunk/src/encoding.c
   trunk/src/encodings/fixed_8.c
   trunk/src/encodings/ucs2.c
   trunk/src/encodings/utf16.c
   trunk/src/encodings/utf8.c
   trunk/src/events.c
   trunk/src/exceptions.c
   trunk/src/exec.c
   trunk/src/exit.c
   trunk/src/extend.c
   trunk/src/gc/dod.c
   trunk/src/gc/gc_gms.c
   trunk/src/gc/gc_ims.c
   trunk/src/gc/memory.c
   trunk/src/gc/register.c
   trunk/src/gc/res_lea.c
   trunk/src/gc/resources.c
   trunk/src/gc/smallobject.c
   trunk/src/global.c
   trunk/src/global_setup.c
   trunk/src/hash.c
   trunk/src/headers.c
   trunk/src/hll.c
   trunk/src/inter_call.c
   trunk/src/inter_cb.c
   trunk/src/inter_create.c
   trunk/src/inter_misc.c
   trunk/src/inter_run.c
   trunk/src/interpreter.c
   trunk/src/intlist.c
   trunk/src/io/api.c
   trunk/src/io/buffer.c
   trunk/src/io/core.c
   trunk/src/io/filehandle.c
   trunk/src/io/portable.c
   trunk/src/io/unix.c
   trunk/src/io/utf8.c
   trunk/src/io/win32.c
   trunk/src/jit/i386/exec_dep.c
   trunk/src/key.c
   trunk/src/library.c
   trunk/src/list.c
   trunk/src/longopt.c
   trunk/src/misc.c
   trunk/src/multidispatch.c
   trunk/src/oo.c
   trunk/src/packdump.c
   trunk/src/packfile.c
   trunk/src/packfile/pf_items.c
   trunk/src/packout.c
   trunk/src/pbc_merge.c
   trunk/src/pic.c
   trunk/src/pic_jit.c
   trunk/src/pmc.c
   trunk/src/pmc_freeze.c
   trunk/src/runops_cores.c
   trunk/src/scheduler.c
   trunk/src/spf_render.c
   trunk/src/spf_vtable.c
   trunk/src/stacks.c
   trunk/src/stm/backend.c
   trunk/src/stm/waitlist.c
   trunk/src/string.c
   trunk/src/string_primitives.c
   trunk/src/sub.c
   trunk/src/thread.c
   trunk/src/trace.c
   trunk/src/tsq.c
   trunk/src/utils.c
   trunk/src/vtables.c
   trunk/src/warnings.c
   trunk/t/codingstd/c_arg_assert.t

Log:
[cage] Attempt to work around MSVC warnings related to ASSERT_ARGS().
* remove the trailing semicolon from ASSERT_ARGS() in the functions being checked.
* add the semicolon to ASSERT_ARGS() itself.
* disable ASSERT_ARGS() so it defines to nothing on MSVC.
* update t/codingstd/c_args_assert.t so it no longer expects to see the semicolon.

Modified: trunk/compilers/imcc/cfg.c
==============================================================================
--- trunk/compilers/imcc/cfg.c	(original)
+++ trunk/compilers/imcc/cfg.c	Mon Jan  5 15:17:26 2009
@@ -219,7 +219,7 @@
 check_invoke_type(PARROT_INTERP, ARGIN(const IMC_Unit    *unit),
                                  ARGIN(const Instruction *ins))
 {
-    ASSERT_ARGS(check_invoke_type);
+    ASSERT_ARGS(check_invoke_type)
     /* 1) pcc sub call or yield */
     if (ins->type & (ITPCCSUB | ITPCCYIELD))
         return INVOKE_SUB_CALL;
@@ -258,7 +258,7 @@
 void
 find_basic_blocks(PARROT_INTERP, ARGMOD(IMC_Unit *unit), int first)
 {
-    ASSERT_ARGS(find_basic_blocks);
+    ASSERT_ARGS(find_basic_blocks)
     Basic_block          *bb;
     Instruction          *ins;
     const SymHash * const hsh = &unit->hash;
@@ -370,7 +370,7 @@
 bb_check_set_addr(PARROT_INTERP, ARGMOD(IMC_Unit *unit),
         ARGMOD(Basic_block *bb), ARGIN(const SymReg *label))
 {
-    ASSERT_ARGS(bb_check_set_addr);
+    ASSERT_ARGS(bb_check_set_addr)
     const Instruction *ins;
 
     for (ins = unit->instructions; ins; ins = ins->next) {
@@ -406,7 +406,7 @@
 void
 build_cfg(PARROT_INTERP, ARGMOD(IMC_Unit *unit))
 {
-    ASSERT_ARGS(build_cfg);
+    ASSERT_ARGS(build_cfg)
     Basic_block *last = NULL;
     unsigned int i;
     int changes;
@@ -549,7 +549,7 @@
 bb_findadd_edge(PARROT_INTERP, ARGMOD(IMC_Unit *unit), ARGIN(Basic_block *from),
         ARGIN(const SymReg *label))
 {
-    ASSERT_ARGS(bb_findadd_edge);
+    ASSERT_ARGS(bb_findadd_edge)
     Instruction         *ins;
     const SymReg * const r = find_sym(interp, label->name);
 
@@ -590,7 +590,7 @@
 blocks_are_connected(ARGIN(const Basic_block *from),
                      ARGIN(const Basic_block *to))
 {
-    ASSERT_ARGS(blocks_are_connected);
+    ASSERT_ARGS(blocks_are_connected)
     const Edge *pred = to->pred_list;
 
     while (pred) {
@@ -619,7 +619,7 @@
 bb_add_edge(ARGMOD(IMC_Unit *unit), ARGIN(Basic_block  *from),
                                     ARGMOD(Basic_block *to))
 {
-    ASSERT_ARGS(bb_add_edge);
+    ASSERT_ARGS(bb_add_edge)
     Edge *e;
     if (blocks_are_connected(from, to))
         return;
@@ -661,7 +661,7 @@
 static void
 bb_remove_edge(ARGMOD(IMC_Unit *unit), ARGMOD(Edge *edge))
 {
-    ASSERT_ARGS(bb_remove_edge);
+    ASSERT_ARGS(bb_remove_edge)
     if (edge->from->succ_list == edge) {
         edge->from->succ_list = edge->succ_next;
     }
@@ -716,7 +716,7 @@
 static void
 free_edge(ARGMOD(IMC_Unit *unit))
 {
-    ASSERT_ARGS(free_edge);
+    ASSERT_ARGS(free_edge)
     Edge *e;
 
     for (e = unit->edge_list; e;) {
@@ -743,7 +743,7 @@
 int
 edge_count(ARGIN(const IMC_Unit *unit))
 {
-    ASSERT_ARGS(edge_count);
+    ASSERT_ARGS(edge_count)
     Edge *e = unit->edge_list;
     int   i = 0;
     while (e) {
@@ -769,7 +769,7 @@
 void
 life_analysis(PARROT_INTERP, ARGIN(const IMC_Unit *unit))
 {
-    ASSERT_ARGS(life_analysis);
+    ASSERT_ARGS(life_analysis)
     SymReg  ** const reglist = unit->reglist;
     unsigned int     i;
 
@@ -793,7 +793,7 @@
 static void
 analyse_life_symbol(ARGIN(const IMC_Unit *unit), ARGMOD(SymReg* r))
 {
-    ASSERT_ARGS(analyse_life_symbol);
+    ASSERT_ARGS(analyse_life_symbol)
     unsigned int i;
 
 #if IMC_TRACE_HIGH
@@ -856,7 +856,7 @@
 void
 free_life_info(ARGIN(const IMC_Unit *unit), ARGMOD(SymReg *r))
 {
-    ASSERT_ARGS(free_life_info);
+    ASSERT_ARGS(free_life_info)
 #if IMC_TRACE_HIGH
     fprintf(stderr, "free_life_into(%s)\n", r->name);
 #endif
@@ -889,7 +889,7 @@
 static void
 analyse_life_block(ARGIN(const Basic_block* bb), ARGMOD(SymReg *r))
 {
-    ASSERT_ARGS(analyse_life_block);
+    ASSERT_ARGS(analyse_life_block)
     Life_range  * const l        = make_life_range(r, bb->index);
     Instruction         *special = NULL;
     Instruction         *ins;
@@ -968,7 +968,7 @@
 static void
 propagate_need(ARGMOD(Basic_block *bb), ARGIN(const SymReg *r), int i)
 {
-    ASSERT_ARGS(propagate_need);
+    ASSERT_ARGS(propagate_need)
     Edge        *edge;
     Life_range  *l;
     Basic_block *pred;
@@ -1037,7 +1037,7 @@
 void
 compute_dominators(PARROT_INTERP, ARGMOD(IMC_Unit *unit))
 {
-    ASSERT_ARGS(compute_dominators);
+    ASSERT_ARGS(compute_dominators)
 #define USE_BFS 0
 
 #if !USE_BFS
@@ -1176,7 +1176,7 @@
 void
 compute_dominance_frontiers(PARROT_INTERP, ARGMOD(IMC_Unit *unit))
 {
-    ASSERT_ARGS(compute_dominance_frontiers);
+    ASSERT_ARGS(compute_dominance_frontiers)
     int i, b;
 
     const int    n                   = unit->n_basic_blocks;
@@ -1238,7 +1238,7 @@
 static void
 free_dominators(ARGMOD(IMC_Unit *unit))
 {
-    ASSERT_ARGS(free_dominators);
+    ASSERT_ARGS(free_dominators)
     if (unit->dominators) {
         unsigned int i;
 
@@ -1266,7 +1266,7 @@
 static void
 free_dominance_frontiers(ARGMOD(IMC_Unit *unit))
 {
-    ASSERT_ARGS(free_dominance_frontiers);
+    ASSERT_ARGS(free_dominance_frontiers)
     if (unit->dominance_frontiers) {
         unsigned int i;
 
@@ -1293,7 +1293,7 @@
 static void
 sort_loops(PARROT_INTERP, ARGIN(IMC_Unit *unit))
 {
-    ASSERT_ARGS(sort_loops);
+    ASSERT_ARGS(sort_loops)
 
     Loop_info   *li;
     Loop_info  **loop_info = unit->loop_info;
@@ -1374,7 +1374,7 @@
 void
 find_loops(PARROT_INTERP, ARGMOD(IMC_Unit *unit))
 {
-    ASSERT_ARGS(find_loops);
+    ASSERT_ARGS(find_loops)
     unsigned int i;
 
     IMCC_info(interp, 2, "find_loops\n");
@@ -1412,7 +1412,7 @@
 int
 natural_preheader(ARGIN(const IMC_Unit *unit), ARGIN(const Loop_info *loop_info))
 {
-    ASSERT_ARGS(natural_preheader);
+    ASSERT_ARGS(natural_preheader)
     Edge *edge;
     int   preheader = -1;
 
@@ -1451,7 +1451,7 @@
 static void
 mark_loop(PARROT_INTERP, ARGMOD(IMC_Unit *unit), ARGIN(const Edge *e))
 {
-    ASSERT_ARGS(mark_loop);
+    ASSERT_ARGS(mark_loop)
     Set         *loop;
     Set         *exits;
     Edge        *edge;
@@ -1538,7 +1538,7 @@
 static void
 free_loops(ARGMOD(IMC_Unit *unit))
 {
-    ASSERT_ARGS(free_loops);
+    ASSERT_ARGS(free_loops)
     int i;
 
     for (i = 0; i < unit->n_loops; i++) {
@@ -1568,7 +1568,7 @@
 void
 search_predecessors_not_in(ARGIN(const Basic_block *node), ARGMOD(Set *s))
 {
-   ASSERT_ARGS(search_predecessors_not_in);
+   ASSERT_ARGS(search_predecessors_not_in)
    Edge *edge;
 
    for (edge = node->pred_list; edge; edge = edge->pred_next) {
@@ -1597,7 +1597,7 @@
 static void
 init_basic_blocks(ARGMOD(IMC_Unit *unit))
 {
-    ASSERT_ARGS(init_basic_blocks);
+    ASSERT_ARGS(init_basic_blocks)
 
     if (!unit->bb_list)
         clear_basic_blocks(unit);
@@ -1623,7 +1623,7 @@
 void
 clear_basic_blocks(ARGMOD(IMC_Unit *unit))
 {
-    ASSERT_ARGS(clear_basic_blocks);
+    ASSERT_ARGS(clear_basic_blocks)
 
     if (unit->bb_list) {
         unsigned int i;
@@ -1657,7 +1657,7 @@
 static Basic_block*
 make_basic_block(ARGMOD(IMC_Unit *unit), ARGMOD(Instruction *ins))
 {
-    ASSERT_ARGS(make_basic_block);
+    ASSERT_ARGS(make_basic_block)
     Basic_block * const bb = mem_allocate_typed(Basic_block);
     int                 n  = unit->n_basic_blocks;
 
@@ -1698,7 +1698,7 @@
 Life_range *
 make_life_range(ARGMOD(SymReg *r), int idx)
 {
-    ASSERT_ARGS(make_life_range);
+    ASSERT_ARGS(make_life_range)
     Life_range * const l = mem_allocate_zeroed_typed(Life_range);
     r->life_info[idx]    = l;
 

Modified: trunk/compilers/imcc/debug.c
==============================================================================
--- trunk/compilers/imcc/debug.c	(original)
+++ trunk/compilers/imcc/debug.c	Mon Jan  5 15:17:26 2009
@@ -44,7 +44,7 @@
 void
 IMCC_fatal(PARROT_INTERP, SHIM(int code), ARGIN(const char *fmt), ...)
 {
-    ASSERT_ARGS(IMCC_fatal);
+    ASSERT_ARGS(IMCC_fatal)
     va_list ap;
 
     va_start(ap, fmt);
@@ -68,7 +68,7 @@
 void
 IMCC_fataly(PARROT_INTERP, SHIM(int code), ARGIN(const char *fmt), ...)
 {
-    ASSERT_ARGS(IMCC_fataly);
+    ASSERT_ARGS(IMCC_fataly)
     va_list ap;
 
     va_start(ap, fmt);
@@ -93,7 +93,7 @@
 void
 IMCC_fatal_standalone(PARROT_INTERP, int code, ARGIN(const char *fmt), ...)
 {
-    ASSERT_ARGS(IMCC_fatal_standalone);
+    ASSERT_ARGS(IMCC_fatal_standalone)
     va_list ap;
 
     va_start(ap, fmt);
@@ -118,7 +118,7 @@
 void
 IMCC_fataly_standalone(PARROT_INTERP, int code, ARGIN(const char *fmt), ...)
 {
-    ASSERT_ARGS(IMCC_fataly_standalone);
+    ASSERT_ARGS(IMCC_fataly_standalone)
 
     va_list ap;
 
@@ -145,7 +145,7 @@
 void
 IMCC_warning(PARROT_INTERP, ARGIN(const char *fmt), ...)
 {
-    ASSERT_ARGS(IMCC_warning);
+    ASSERT_ARGS(IMCC_warning)
     va_list ap;
     if (IMCC_INFO(interp)->imcc_warn)
         return;
@@ -170,7 +170,7 @@
 void
 IMCC_info(PARROT_INTERP, int level, ARGIN(const char *fmt), ...)
 {
-    ASSERT_ARGS(IMCC_info);
+    ASSERT_ARGS(IMCC_info)
     va_list ap;
 
     if (level > IMCC_INFO(interp)->verbose)
@@ -195,7 +195,7 @@
 void
 IMCC_debug(PARROT_INTERP, int level, ARGIN(const char *fmt), ...)
 {
-    ASSERT_ARGS(IMCC_debug);
+    ASSERT_ARGS(IMCC_debug)
     va_list ap;
 
     if (!(level & IMCC_INFO(interp)->debug))
@@ -218,7 +218,7 @@
 void
 dump_instructions(PARROT_INTERP, ARGIN(const IMC_Unit *unit))
 {
-    ASSERT_ARGS(dump_instructions);
+    ASSERT_ARGS(dump_instructions)
     const Instruction *ins;
     int                pc;
 
@@ -263,7 +263,7 @@
 void
 dump_cfg(ARGIN(const IMC_Unit *unit))
 {
-    ASSERT_ARGS(dump_cfg);
+    ASSERT_ARGS(dump_cfg)
     unsigned int i;
     Edge *e;
 
@@ -303,7 +303,7 @@
 void
 dump_loops(ARGIN(const IMC_Unit *unit))
 {
-    ASSERT_ARGS(dump_loops);
+    ASSERT_ARGS(dump_loops)
     int i;
     Loop_info ** loop_info = unit->loop_info;
 
@@ -350,7 +350,7 @@
 void
 dump_labels(ARGIN(const IMC_Unit *unit))
 {
-    ASSERT_ARGS(dump_labels);
+    ASSERT_ARGS(dump_labels)
     const SymHash * const hsh = &unit->hash;
     unsigned int          i;
 
@@ -384,7 +384,7 @@
 void
 dump_symreg(ARGIN(const IMC_Unit *unit))
 {
-    ASSERT_ARGS(dump_symreg);
+    ASSERT_ARGS(dump_symreg)
     unsigned int i;
     SymReg ** const reglist = unit->reglist;
 
@@ -433,7 +433,7 @@
 void
 dump_liveness_status(ARGIN(const IMC_Unit *unit))
 {
-    ASSERT_ARGS(dump_liveness_status);
+    ASSERT_ARGS(dump_liveness_status)
     unsigned int i;
     SymReg ** const reglist = unit->reglist;
 
@@ -462,7 +462,7 @@
 void
 dump_liveness_status_var(ARGIN(const IMC_Unit *unit), ARGIN(const SymReg* r))
 {
-    ASSERT_ARGS(dump_liveness_status_var);
+    ASSERT_ARGS(dump_liveness_status_var)
     fprintf(stderr, "\nSymbol %s:", r->name);
     if (r->life_info) {
         unsigned int i;
@@ -511,7 +511,7 @@
 void
 dump_interference_graph(ARGIN(const IMC_Unit *unit))
 {
-    ASSERT_ARGS(dump_interference_graph);
+    ASSERT_ARGS(dump_interference_graph)
     int x;
     SymReg** const reglist = unit->reglist;
     const int n_symbols = unit->n_symbols;
@@ -551,7 +551,7 @@
 void
 dump_dominators(ARGIN(const IMC_Unit *unit))
 {
-    ASSERT_ARGS(dump_dominators);
+    ASSERT_ARGS(dump_dominators)
     unsigned int i;
 
     fprintf(stderr, "\nDumping the Dominators Tree:"
@@ -586,7 +586,7 @@
 void
 dump_dominance_frontiers(ARGIN(const IMC_Unit *unit))
 {
-    ASSERT_ARGS(dump_dominance_frontiers);
+    ASSERT_ARGS(dump_dominance_frontiers)
     unsigned int i;
 
     fprintf(stderr, "\nDumping the Dominance Frontiers:"

Modified: trunk/compilers/imcc/imc.c
==============================================================================
--- trunk/compilers/imcc/imc.c	(original)
+++ trunk/compilers/imcc/imc.c	Mon Jan  5 15:17:26 2009
@@ -65,7 +65,7 @@
 void
 imc_compile_all_units(PARROT_INTERP)
 {
-    ASSERT_ARGS(imc_compile_all_units);
+    ASSERT_ARGS(imc_compile_all_units)
     /* compile all units created during the parse */
     IMC_Unit *unit;
 
@@ -115,7 +115,7 @@
 void
 imc_compile_unit(PARROT_INTERP, ARGIN(IMC_Unit *unit))
 {
-    ASSERT_ARGS(imc_compile_unit);
+    ASSERT_ARGS(imc_compile_unit)
     /* Not much here for now except the allocator */
     IMCC_INFO(interp)->cur_unit = unit;
 
@@ -138,7 +138,7 @@
 void
 imc_cleanup(PARROT_INTERP, ARGIN_NULLOK(void *yyscanner))
 {
-    ASSERT_ARGS(imc_cleanup);
+    ASSERT_ARGS(imc_cleanup)
     IMCC_pop_parser_state(interp, yyscanner);
     clear_globals(interp);
     mem_sys_free(IMCC_INFO(interp)->ghash.data);
@@ -161,7 +161,7 @@
 static IMC_Unit *
 imc_new_unit(IMC_Unit_Type t)
 {
-    ASSERT_ARGS(imc_new_unit);
+    ASSERT_ARGS(imc_new_unit)
     IMC_Unit * const unit = mem_allocate_zeroed_typed(IMC_Unit);
     create_symhash(&unit->hash);
     unit->type = t;
@@ -185,7 +185,7 @@
 IMC_Unit *
 imc_open_unit(PARROT_INTERP, IMC_Unit_Type t)
 {
-    ASSERT_ARGS(imc_open_unit);
+    ASSERT_ARGS(imc_open_unit)
     IMC_Unit   * const unit     = imc_new_unit(t);
     imc_info_t * const imc_info = IMCC_INFO(interp);
 
@@ -224,7 +224,7 @@
 void
 imc_close_unit(PARROT_INTERP, ARGIN_NULLOK(IMC_Unit *unit))
 {
-    ASSERT_ARGS(imc_close_unit);
+    ASSERT_ARGS(imc_close_unit)
 #if COMPILE_IMMEDIATE
     if (unit)
         imc_compile_unit(interp, unit);
@@ -247,7 +247,7 @@
 static void
 imc_free_unit(PARROT_INTERP, ARGMOD(IMC_Unit *unit))
 {
-    ASSERT_ARGS(imc_free_unit);
+    ASSERT_ARGS(imc_free_unit)
     imc_info_t * const imc = IMCC_INFO(interp);
 
 #if IMC_TRACE_HIGH

Modified: trunk/compilers/imcc/imcparser.c
==============================================================================
--- trunk/compilers/imcc/imcparser.c	(original)
+++ trunk/compilers/imcc/imcparser.c	Mon Jan  5 15:17:26 2009
@@ -667,7 +667,7 @@
 static Instruction *
 MK_I(PARROT_INTERP, ARGMOD(IMC_Unit *unit), ARGIN(const char *fmt), int n, ...)
 {
-    ASSERT_ARGS(MK_I);
+    ASSERT_ARGS(MK_I)
     char opname[64];
     char *p;
     const char *q;
@@ -701,7 +701,7 @@
 mk_pmc_const(PARROT_INTERP, ARGMOD(IMC_Unit *unit), ARGIN(const char *type),
         ARGMOD(SymReg *left), ARGIN(const char *constant))
 {
-    ASSERT_ARGS(mk_pmc_const);
+    ASSERT_ARGS(mk_pmc_const)
     const int type_enum = atoi(type);
     const int ascii = (*constant == '\'' || *constant == '"');
     SymReg *rhs;
@@ -756,7 +756,7 @@
 mk_pmc_const_named(PARROT_INTERP, ARGMOD(IMC_Unit *unit),
     ARGIN(const char *name), ARGMOD(SymReg *left), ARGIN(const char *constant))
 {
-    ASSERT_ARGS(mk_pmc_const_named);
+    ASSERT_ARGS(mk_pmc_const_named)
     SymReg *rhs;
     SymReg *r[3];
     char   *const_name;
@@ -814,7 +814,7 @@
 func_ins(PARROT_INTERP, ARGMOD(IMC_Unit *unit), ARGIN(SymReg *lhs), ARGIN(const char *op),
          ARGMOD(SymReg **r), int n, int keyv, int emit)
 {
-    ASSERT_ARGS(func_ins);
+    ASSERT_ARGS(func_ins)
     int i;
     /* shift regs up by 1 */
     for (i = n - 1; i >= 0; --i)
@@ -833,7 +833,7 @@
 static void
 clear_state(PARROT_INTERP)
 {
-    ASSERT_ARGS(clear_state);
+    ASSERT_ARGS(clear_state)
     IMCC_INFO(interp) -> nargs = 0;
     IMCC_INFO(interp) -> keyvec = 0;
 }
@@ -842,7 +842,7 @@
 Instruction *
 INS_LABEL(PARROT_INTERP, ARGMOD_NULLOK(IMC_Unit *unit), ARGMOD(SymReg *r0), int emit)
 {
-    ASSERT_ARGS(INS_LABEL);
+    ASSERT_ARGS(INS_LABEL)
 
     Instruction * const ins = _mk_instruction("", "%s:", 1, &r0, 0);
     ins->type               = ITLABEL;
@@ -858,7 +858,7 @@
 static Instruction *
 iLABEL(PARROT_INTERP, ARGMOD_NULLOK(IMC_Unit *unit), ARGMOD(SymReg *r0))
 {
-    ASSERT_ARGS(iLABEL);
+    ASSERT_ARGS(iLABEL)
     Instruction * const i = INS_LABEL(interp, unit, r0, 1);
     i->line               = IMCC_INFO(interp)->line;
 
@@ -870,7 +870,7 @@
 static Instruction *
 iSUBROUTINE(PARROT_INTERP, ARGMOD_NULLOK(IMC_Unit *unit), ARGMOD(SymReg *r))
 {
-    ASSERT_ARGS(iSUBROUTINE);
+    ASSERT_ARGS(iSUBROUTINE)
     Instruction * const i = iLABEL(interp, unit, r);
 
     r->type    = (r->type & VT_ENCODED) ? VT_PCC_SUB|VT_ENCODED : VT_PCC_SUB;
@@ -891,7 +891,7 @@
 iINDEXFETCH(PARROT_INTERP, ARGMOD(IMC_Unit *unit), ARGIN(SymReg *r0), ARGIN(SymReg *r1),
         ARGIN(SymReg *r2))
 {
-    ASSERT_ARGS(iINDEXFETCH);
+    ASSERT_ARGS(iINDEXFETCH)
     IMCC_INFO(interp) -> keyvec |= KEY_BIT(2);
     return MK_I(interp, unit, "set %s, %s[%s]", 3, r0, r1, r2);
 }
@@ -905,7 +905,7 @@
 iINDEXSET(PARROT_INTERP, ARGMOD(IMC_Unit *unit), ARGIN(SymReg *r0), ARGIN(SymReg *r1),
         ARGIN(SymReg *r2))
 {
-    ASSERT_ARGS(iINDEXSET);
+    ASSERT_ARGS(iINDEXSET)
     if (r0->set == 'P') {
         IMCC_INFO(interp)->keyvec |= KEY_BIT(1);
         MK_I(interp, unit, "set %s[%s], %s", 3, r0, r1, r2);
@@ -922,7 +922,7 @@
 static const char *
 inv_op(ARGIN(const char *op))
 {
-    ASSERT_ARGS(inv_op);
+    ASSERT_ARGS(inv_op)
     int n;
     return get_neg_op(op, &n);
 }
@@ -931,7 +931,7 @@
 Instruction *
 IMCC_create_itcall_label(PARROT_INTERP)
 {
-    ASSERT_ARGS(IMCC_create_itcall_label);
+    ASSERT_ARGS(IMCC_create_itcall_label)
     char         name[128];
     SymReg      *r;
     Instruction *i;
@@ -952,7 +952,7 @@
 static SymReg *
 mk_sub_address_fromc(PARROT_INTERP, ARGIN(const char *name))
 {
-    ASSERT_ARGS(mk_sub_address_fromc);
+    ASSERT_ARGS(mk_sub_address_fromc)
     /* name is a quoted sub name */
     SymReg *r;
     char *name_copy                  = str_dup(name + 1);
@@ -968,7 +968,7 @@
 static SymReg *
 mk_sub_address_u(PARROT_INTERP, ARGIN(const char *name))
 {
-    ASSERT_ARGS(mk_sub_address_u);
+    ASSERT_ARGS(mk_sub_address_u)
     SymReg * const r = mk_sub_address(interp, name);
     r->type         |= VT_ENCODED;
 
@@ -994,7 +994,7 @@
 static void
 begin_return_or_yield(PARROT_INTERP, int yield)
 {
-    ASSERT_ARGS(begin_return_or_yield);
+    ASSERT_ARGS(begin_return_or_yield)
     Instruction *i;
     Instruction * const ins = IMCC_INFO(interp)->cur_unit->instructions;
     char                name[128];
@@ -1015,7 +1015,7 @@
 static void
 set_lexical(PARROT_INTERP, ARGMOD(SymReg *r), ARGIN(const char *name))
 {
-    ASSERT_ARGS(set_lexical);
+    ASSERT_ARGS(set_lexical)
     SymReg * const n = mk_const(interp, name, 'S');
 
     r->usage |= U_LEXICAL;
@@ -1034,7 +1034,7 @@
 add_pcc_named_arg(PARROT_INTERP, ARGMOD(SymReg *cur_call), ARGIN(const char *name),
         ARGIN(SymReg *value))
 {
-    ASSERT_ARGS(add_pcc_named_arg);
+    ASSERT_ARGS(add_pcc_named_arg)
     SymReg * const r = mk_const(interp, name, 'S');
 
     r->type  |= VT_NAMED;
@@ -1047,7 +1047,7 @@
 add_pcc_named_result(PARROT_INTERP, ARGMOD(SymReg *cur_call), ARGIN(const char *name),
         ARGIN(SymReg *value))
 {
-    ASSERT_ARGS(add_pcc_named_result);
+    ASSERT_ARGS(add_pcc_named_result)
     SymReg * const r = mk_const(interp, name, 'S');
     r->type         |= VT_NAMED;
 
@@ -1059,7 +1059,7 @@
 add_pcc_named_param(PARROT_INTERP, ARGMOD(SymReg *cur_call), ARGIN(const char *name),
         ARGIN(SymReg *value))
 {
-    ASSERT_ARGS(add_pcc_named_param);
+    ASSERT_ARGS(add_pcc_named_param)
     SymReg * const r = mk_const(interp, name, 'S');
     r->type         |= VT_NAMED;
 
@@ -1071,7 +1071,7 @@
 add_pcc_named_return(PARROT_INTERP, ARGMOD(SymReg *cur_call), ARGIN(const char *name),
         ARGIN(SymReg *value))
 {
-    ASSERT_ARGS(add_pcc_named_return);
+    ASSERT_ARGS(add_pcc_named_return)
     SymReg * const r = mk_const(interp, name, 'S');
     r->type         |= VT_NAMED;
 
@@ -1083,7 +1083,7 @@
 static void
 adv_named_set(PARROT_INTERP, ARGIN(char *name))
 {
-    ASSERT_ARGS(adv_named_set);
+    ASSERT_ARGS(adv_named_set)
     if (IMCC_INFO(interp)->adv_named_id) {
         IMCC_fataly(interp, EXCEPTION_SYNTAX_ERROR,
                     "Named parameter with more than one name.\n");
@@ -1094,7 +1094,7 @@
 static void
 do_loadlib(PARROT_INTERP, ARGIN(const char *lib))
 {
-    ASSERT_ARGS(do_loadlib);
+    ASSERT_ARGS(do_loadlib)
     STRING * const s = string_unescape_cstring(interp, lib + 1, '"', NULL);
     PMC    *ignored  = Parrot_load_lib(interp, s, NULL);
     UNUSED(ignored);

Modified: trunk/compilers/imcc/instructions.c
==============================================================================
--- trunk/compilers/imcc/instructions.c	(original)
+++ trunk/compilers/imcc/instructions.c	Mon Jan  5 15:17:26 2009
@@ -97,7 +97,7 @@
 _mk_instruction(ARGIN(const char *op), ARGIN(const char *fmt), int n,
         ARGIN(SymReg * const *r), int flags)
 {
-    ASSERT_ARGS(_mk_instruction);
+    ASSERT_ARGS(_mk_instruction)
     const size_t reg_space  = (n > 1) ? (sizeof (SymReg *) * (n - 1)) : 0;
     Instruction * const ins =
         (Instruction*)mem_sys_allocate_zeroed(sizeof (Instruction) + reg_space);
@@ -140,7 +140,7 @@
 void
 imcc_init_tables(PARROT_INTERP)
 {
-    ASSERT_ARGS(imcc_init_tables);
+    ASSERT_ARGS(imcc_init_tables)
     const char *writes[] = {
         "cleari", "clearn", "clearp", "clears",
     };
@@ -168,7 +168,7 @@
 int
 ins_writes2(ARGIN(const Instruction *ins), int t)
 {
-    ASSERT_ARGS(ins_writes2);
+    ASSERT_ARGS(ins_writes2)
     const char *p;
 
     if (ins->opnum == w_special[0])
@@ -202,7 +202,7 @@
 int
 instruction_reads(ARGIN(const Instruction *ins), ARGIN(const SymReg *r))
 {
-    ASSERT_ARGS(instruction_reads);
+    ASSERT_ARGS(instruction_reads)
     int f, i;
 
     if (ins->opnum == PARROT_OP_set_args_pc
@@ -272,7 +272,7 @@
 int
 instruction_writes(ARGIN(const Instruction *ins), ARGIN(const SymReg *r))
 {
-    ASSERT_ARGS(instruction_writes);
+    ASSERT_ARGS(instruction_writes)
     const int f = ins->flags;
     int i;
 
@@ -356,7 +356,7 @@
 int
 get_branch_regno(ARGIN(const Instruction *ins))
 {
-    ASSERT_ARGS(get_branch_regno);
+    ASSERT_ARGS(get_branch_regno)
     int j;
 
     for (j = ins->opsize - 2; j >= 0 && ins->symregs[j] ; --j)
@@ -381,7 +381,7 @@
 SymReg *
 get_branch_reg(ARGIN(const Instruction *ins))
 {
-    ASSERT_ARGS(get_branch_reg);
+    ASSERT_ARGS(get_branch_reg)
     const int r = get_branch_regno(ins);
 
     if (r >= 0)
@@ -410,7 +410,7 @@
 Instruction *
 _delete_ins(ARGMOD(IMC_Unit *unit), ARGIN(Instruction *ins))
 {
-    ASSERT_ARGS(_delete_ins);
+    ASSERT_ARGS(_delete_ins)
     Instruction * const next = ins->next;
     Instruction * const prev = ins->prev;
 
@@ -444,7 +444,7 @@
 Instruction *
 delete_ins(ARGMOD(IMC_Unit *unit), ARGMOD(Instruction *ins))
 {
-    ASSERT_ARGS(delete_ins);
+    ASSERT_ARGS(delete_ins)
     Instruction * next = _delete_ins(unit, ins);
 
 
@@ -468,7 +468,7 @@
 insert_ins(ARGMOD(IMC_Unit *unit), ARGMOD_NULLOK(Instruction *ins),
         ARGMOD(Instruction *tmp))
 {
-    ASSERT_ARGS(insert_ins);
+    ASSERT_ARGS(insert_ins)
     if (!ins) {
         Instruction * const next = unit->instructions;
 
@@ -515,7 +515,7 @@
 prepend_ins(ARGMOD(IMC_Unit *unit), ARGMOD_NULLOK(Instruction *ins),
         ARGMOD(Instruction *tmp))
 {
-    ASSERT_ARGS(prepend_ins);
+    ASSERT_ARGS(prepend_ins)
     if (!ins) {
         Instruction * const next = unit->instructions;
 
@@ -554,7 +554,7 @@
 subst_ins(ARGMOD(IMC_Unit *unit), ARGMOD(Instruction *ins),
           ARGMOD(Instruction *tmp), int needs_freeing)
 {
-    ASSERT_ARGS(subst_ins);
+    ASSERT_ARGS(subst_ins)
     Instruction * const prev = ins->prev;
 
 
@@ -594,7 +594,7 @@
 Instruction *
 move_ins(ARGMOD(IMC_Unit *unit), ARGMOD(Instruction *ins), ARGMOD(Instruction *to))
 {
-    ASSERT_ARGS(move_ins);
+    ASSERT_ARGS(move_ins)
     Instruction * const next = _delete_ins(unit, ins);
     insert_ins(unit, to, ins);
     return next;
@@ -615,7 +615,7 @@
 Instruction *
 emitb(PARROT_INTERP, ARGMOD_NULLOK(IMC_Unit *unit), ARGIN_NULLOK(Instruction *i))
 {
-    ASSERT_ARGS(emitb);
+    ASSERT_ARGS(emitb)
     if (!unit || !i)
         return NULL;
 
@@ -646,7 +646,7 @@
 void
 free_ins(ARGMOD(Instruction *ins))
 {
-    ASSERT_ARGS(free_ins);
+    ASSERT_ARGS(free_ins)
     free(ins->format);
     free(ins->opname);
     free(ins);
@@ -666,7 +666,7 @@
 int
 ins_print(PARROT_INTERP, ARGIN(PMC *io), ARGIN(const Instruction *ins))
 {
-    ASSERT_ARGS(ins_print);
+    ASSERT_ARGS(ins_print)
     char regb[IMCC_MAX_FIX_REGS][REGB_SIZE];
     /* only long key constants can overflow */
     char *regstr[IMCC_MAX_FIX_REGS];
@@ -792,7 +792,7 @@
 static int
 e_file_open(PARROT_INTERP, ARGIN(void *param))
 {
-    ASSERT_ARGS(e_file_open);
+    ASSERT_ARGS(e_file_open)
     char * const file = (char *) param;
 
     if (!STREQ(file, "-")) {
@@ -821,7 +821,7 @@
 static int
 e_file_close(PARROT_INTERP, SHIM(void *param))
 {
-    ASSERT_ARGS(e_file_close);
+    ASSERT_ARGS(e_file_close)
     printf("\n\n");
     fclose(stdout);
     IMCC_info(interp, 1, "assembly module %s written.\n", output);
@@ -844,7 +844,7 @@
         SHIM(const IMC_Unit *unit),
         ARGIN(const Instruction *ins))
 {
-    ASSERT_ARGS(e_file_emit);
+    ASSERT_ARGS(e_file_emit)
 #if IMC_TRACE
     Parrot_io_eprintf(NULL, "e_file_emit\n");
 #endif
@@ -874,7 +874,7 @@
 int
 emit_open(PARROT_INTERP, int type, ARGIN_NULLOK(void *param))
 {
-    ASSERT_ARGS(emit_open);
+    ASSERT_ARGS(emit_open)
     IMCC_INFO(interp)->emitter       = type;
     IMCC_INFO(interp)->has_compile   = 0;
     IMCC_INFO(interp)->dont_optimize = 0;
@@ -897,7 +897,7 @@
 int
 emit_flush(PARROT_INTERP, ARGIN_NULLOK(void *param), ARGIN(IMC_Unit *unit))
 {
-    ASSERT_ARGS(emit_flush);
+    ASSERT_ARGS(emit_flush)
     Instruction *ins;
     int          emitter = IMCC_INFO(interp)->emitter;
 
@@ -929,7 +929,7 @@
 int
 emit_close(PARROT_INTERP, ARGIN_NULLOK(void *param))
 {
-    ASSERT_ARGS(emit_close);
+    ASSERT_ARGS(emit_close)
     return (emitters[IMCC_INFO(interp)->emitter]).close(interp, param);
 }
 

Modified: trunk/compilers/imcc/main.c
==============================================================================
--- trunk/compilers/imcc/main.c	(original)
+++ trunk/compilers/imcc/main.c	Mon Jan  5 15:17:26 2009
@@ -144,7 +144,7 @@
 static void
 usage(ARGMOD(FILE *fp))
 {
-    ASSERT_ARGS(usage);
+    ASSERT_ARGS(usage)
     fprintf(fp,
             "parrot -[abcCEfgGhjprStvVwy.] [-d [FLAGS]] [-D [FLAGS]]"
             "[-O [level]] [-o FILE] <file>\n");
@@ -163,7 +163,7 @@
 static void
 help_debug(void)
 {
-    ASSERT_ARGS(help_debug);
+    ASSERT_ARGS(help_debug)
     /* split printf for C89 compliance on string length */
     printf(
     "--imcc-debug -d [Flags] ...\n"
@@ -208,7 +208,7 @@
 static void
 help(void)
 {
-    ASSERT_ARGS(help);
+    ASSERT_ARGS(help)
     /* split printf for C89 compliance on string length */
     printf(
     "parrot [Options] <file>\n"
@@ -266,7 +266,7 @@
 static void
 Parrot_version(PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_version);
+    ASSERT_ARGS(Parrot_version)
     printf("This is parrot version " PARROT_VERSION);
     printf(" built for " PARROT_ARCHNAME ".\n");
     printf("Copyright (C) 2001-2008, The Perl Foundation.\n\
@@ -343,7 +343,7 @@
 static int
 is_all_hex_digits(ARGIN(const char *s))
 {
-    ASSERT_ARGS(is_all_hex_digits);
+    ASSERT_ARGS(is_all_hex_digits)
     for (; *s; s++)
         if (!isxdigit(*s))
             return 0;
@@ -605,7 +605,7 @@
 static void
 do_pre_process(PARROT_INTERP)
 {
-    ASSERT_ARGS(do_pre_process);
+    ASSERT_ARGS(do_pre_process)
     int       c;
     YYSTYPE   val;
 
@@ -727,7 +727,7 @@
 static void
 imcc_get_optimization_description(const PARROT_INTERP, int opt_level, ARGMOD(char *opt_desc))
 {
-    ASSERT_ARGS(imcc_get_optimization_description);
+    ASSERT_ARGS(imcc_get_optimization_description)
     int i = 0;
 
     if (opt_level & (OPT_PRE | OPT_CFG))
@@ -801,7 +801,7 @@
 imcc_run_pbc(PARROT_INTERP, int obj_file, ARGIN_NULLOK(const char *output_file),
         int argc, ARGIN(char **argv))
 {
-    ASSERT_ARGS(imcc_run_pbc);
+    ASSERT_ARGS(imcc_run_pbc)
     if (IMCC_INFO(interp)->imcc_warn)
         PARROT_WARNINGS_on(interp, PARROT_WARNINGS_ALL_FLAG);
     else
@@ -837,7 +837,7 @@
 static void
 imcc_write_pbc(PARROT_INTERP, ARGIN(const char *output_file))
 {
-    ASSERT_ARGS(imcc_write_pbc);
+    ASSERT_ARGS(imcc_write_pbc)
     size_t    size;
     opcode_t *packed;
     FILE     *fp;
@@ -876,7 +876,7 @@
 static void
 determine_input_file_type(PARROT_INTERP, ARGIN(const char * const sourcefile))
 {
-    ASSERT_ARGS(determine_input_file_type);
+    ASSERT_ARGS(determine_input_file_type)
     yyscan_t yyscanner = IMCC_INFO(interp)->yyscanner;
 
     /* Read in the source and check the file extension for the input type;
@@ -921,7 +921,7 @@
 determine_output_file_type(PARROT_INTERP,
     ARGMOD(int *obj_file), ARGIN(const char *output_file))
 {
-    ASSERT_ARGS(determine_output_file_type);
+    ASSERT_ARGS(determine_output_file_type)
     const char * const ext = strrchr(output_file, '.');
 
     if (ext) {
@@ -957,7 +957,7 @@
                     ARGIN(const char * const sourcefile),
                     ARGIN_NULLOK(const char * const output_file))
 {
-    ASSERT_ARGS(compile_to_bytecode);
+    ASSERT_ARGS(compile_to_bytecode)
     PackFile *pf;
     yyscan_t  yyscanner = IMCC_INFO(interp)->yyscanner;
     const int per_pbc   = (STATE_WRITE_PBC(interp) | STATE_RUN_PBC(interp)) !=0;

Modified: trunk/compilers/imcc/optimizer.c
==============================================================================
--- trunk/compilers/imcc/optimizer.c	(original)
+++ trunk/compilers/imcc/optimizer.c	Mon Jan  5 15:17:26 2009
@@ -317,7 +317,7 @@
 int
 pre_optimize(PARROT_INTERP, ARGMOD(IMC_Unit *unit))
 {
-    ASSERT_ARGS(pre_optimize);
+    ASSERT_ARGS(pre_optimize)
     int changed = 0;
 
     if (IMCC_INFO(interp)->optimizer_level & OPT_PRE) {
@@ -346,7 +346,7 @@
 int
 cfg_optimize(PARROT_INTERP, ARGMOD(IMC_Unit *unit))
 {
-    ASSERT_ARGS(cfg_optimize);
+    ASSERT_ARGS(cfg_optimize)
     if (IMCC_INFO(interp)->dont_optimize)
         return 0;
     if (IMCC_INFO(interp)->optimizer_level & OPT_PRE) {
@@ -379,7 +379,7 @@
 int
 optimize(PARROT_INTERP, ARGMOD(IMC_Unit *unit))
 {
-    ASSERT_ARGS(optimize);
+    ASSERT_ARGS(optimize)
     int any = 0;
     if (IMCC_INFO(interp)->optimizer_level & OPT_CFG) {
         IMCC_info(interp, 2, "optimize\n");
@@ -409,7 +409,7 @@
 const char *
 get_neg_op(ARGIN(const char *op), ARGOUT(int *n))
 {
-    ASSERT_ARGS(get_neg_op);
+    ASSERT_ARGS(get_neg_op)
     static const struct br_pairs {
         const char * const op;
         const char * const nop;
@@ -455,7 +455,7 @@
 static int
 if_branch(PARROT_INTERP, ARGMOD(IMC_Unit *unit))
 {
-    ASSERT_ARGS(if_branch);
+    ASSERT_ARGS(if_branch)
     Instruction *ins, *last;
     int reg, changed = 0;
 
@@ -520,7 +520,7 @@
 static int
 strength_reduce(PARROT_INTERP, ARGMOD(IMC_Unit *unit))
 {
-    ASSERT_ARGS(strength_reduce);
+    ASSERT_ARGS(strength_reduce)
     Instruction *ins, *tmp;
     SymReg *r;
     int changes = 0;
@@ -765,7 +765,7 @@
 static int
 constant_propagation(PARROT_INTERP, ARGMOD(IMC_Unit *unit))
 {
-    ASSERT_ARGS(constant_propagation);
+    ASSERT_ARGS(constant_propagation)
     Instruction *ins;
     SymReg *c, *o;
     int any = 0;
@@ -873,7 +873,7 @@
 IMCC_subst_constants_umix(PARROT_INTERP, ARGMOD(IMC_Unit *unit), ARGIN(const char *name),
         ARGMOD(SymReg **r), int n)
 {
-    ASSERT_ARGS(IMCC_subst_constants_umix);
+    ASSERT_ARGS(IMCC_subst_constants_umix)
     Instruction *tmp;
     const char * const ops[] = {
         "abs", "add", "div", "mul", "sub", "fdiv"
@@ -914,7 +914,7 @@
 static int
 eval_ins(PARROT_INTERP, ARGIN(const char *op), size_t ops, ARGIN(SymReg **r))
 {
-    ASSERT_ARGS(eval_ins);
+    ASSERT_ARGS(eval_ins)
     opcode_t eval[4], *pc;
     int opnum;
     int i;
@@ -996,7 +996,7 @@
 IMCC_subst_constants(PARROT_INTERP, ARGMOD(IMC_Unit *unit), ARGIN(const char *name),
         ARGMOD(SymReg **r), int n, ARGOUT(int *ok))
 {
-    ASSERT_ARGS(IMCC_subst_constants);
+    ASSERT_ARGS(IMCC_subst_constants)
     Instruction *tmp;
     const char * const ops[] = {
         "add", "sub", "mul", "div", "fdiv", "pow",
@@ -1191,7 +1191,7 @@
 static int
 branch_branch(PARROT_INTERP, ARGMOD(IMC_Unit *unit))
 {
-    ASSERT_ARGS(branch_branch);
+    ASSERT_ARGS(branch_branch)
     Instruction *ins;
     int changed = 0;
 
@@ -1252,7 +1252,7 @@
 static int
 branch_reorg(PARROT_INTERP, ARGMOD(IMC_Unit *unit))
 {
-    ASSERT_ARGS(branch_reorg);
+    ASSERT_ARGS(branch_reorg)
     unsigned int i;
     int changed = 0;
 
@@ -1336,7 +1336,7 @@
 branch_cond_loop_swap(PARROT_INTERP, ARGMOD(IMC_Unit *unit), ARGMOD(Instruction *branch),
         ARGMOD(Instruction *start), ARGMOD(Instruction *cond))
 {
-    ASSERT_ARGS(branch_cond_loop_swap);
+    ASSERT_ARGS(branch_cond_loop_swap)
     int changed = 0;
     int args;
     const char * const neg_op = get_neg_op(cond->opname, &args);
@@ -1426,7 +1426,7 @@
 static int
 branch_cond_loop(PARROT_INTERP, ARGMOD(IMC_Unit *unit))
 {
-    ASSERT_ARGS(branch_cond_loop);
+    ASSERT_ARGS(branch_cond_loop)
     Instruction *ins, *cond, *start, *prev;
     int changed = 0, found;
 
@@ -1499,7 +1499,7 @@
 static int
 unused_label(PARROT_INTERP, ARGMOD(IMC_Unit *unit))
 {
-    ASSERT_ARGS(unused_label);
+    ASSERT_ARGS(unused_label)
     unsigned int i;
     int used;
     int changed = 0;
@@ -1572,7 +1572,7 @@
 static int
 dead_code_remove(PARROT_INTERP, ARGMOD(IMC_Unit *unit))
 {
-    ASSERT_ARGS(dead_code_remove);
+    ASSERT_ARGS(dead_code_remove)
     unsigned int i;
     int changed = 0;
     Instruction *ins, *last;
@@ -1656,7 +1656,7 @@
 static int
 used_once(PARROT_INTERP, ARGMOD(IMC_Unit *unit))
 {
-    ASSERT_ARGS(used_once);
+    ASSERT_ARGS(used_once)
     Instruction *ins;
     int opt = 0;
 
@@ -1702,7 +1702,7 @@
 _is_ins_save(ARGIN(const IMC_Unit *unit), ARGIN(const Instruction *check_ins),
         ARGIN(const SymReg *r), int what)
 {
-    ASSERT_ARGS(_is_ins_save);
+    ASSERT_ARGS(_is_ins_save)
     Instruction *ins;
     int bb;
     int use_count, lhs_use_count;
@@ -1805,7 +1805,7 @@
 is_ins_save(PARROT_INTERP, ARGIN(const IMC_Unit *unit), ARGIN(const Instruction *ins),
         ARGIN(const SymReg *r), int what)
 {
-    ASSERT_ARGS(is_ins_save);
+    ASSERT_ARGS(is_ins_save)
     int save;
 
     reason = 0;
@@ -1831,7 +1831,7 @@
 static int
 max_loop_depth(ARGIN(const IMC_Unit *unit))
 {
-    ASSERT_ARGS(max_loop_depth);
+    ASSERT_ARGS(max_loop_depth)
     int i;
     int d = 0;
 
@@ -1854,7 +1854,7 @@
 static int
 is_invariant(PARROT_INTERP, ARGIN(const IMC_Unit *unit), ARGIN(const Instruction *ins))
 {
-    ASSERT_ARGS(is_invariant);
+    ASSERT_ARGS(is_invariant)
     int what;
 
     if (STREQ(ins->opname, "new")) {
@@ -1889,7 +1889,7 @@
 Basic_block *
 find_outer(ARGIN(const IMC_Unit *unit), ARGIN(const Basic_block *blk))
 {
-    ASSERT_ARGS(find_outer);
+    ASSERT_ARGS(find_outer)
     int i;
     Loop_info ** const loop_info = unit->loop_info;
     const int          bb        = blk->index;
@@ -1922,7 +1922,7 @@
 move_ins_out(PARROT_INTERP, ARGMOD(IMC_Unit *unit),
         ARGMOD(Instruction **ins), ARGIN(const Basic_block *bb))
 {
-    ASSERT_ARGS(move_ins_out);
+    ASSERT_ARGS(move_ins_out)
     Basic_block *pred;
     Instruction * next, *out;
 
@@ -1975,7 +1975,7 @@
 static int
 loop_one(PARROT_INTERP, ARGMOD(IMC_Unit *unit), int bnr)
 {
-    ASSERT_ARGS(loop_one);
+    ASSERT_ARGS(loop_one)
     Basic_block * const bb = unit->bb_list[bnr];
     Instruction *ins;
     int changed = 0;
@@ -2015,7 +2015,7 @@
 static int
 loop_optimization(PARROT_INTERP, ARGMOD(IMC_Unit *unit))
 {
-    ASSERT_ARGS(loop_optimization);
+    ASSERT_ARGS(loop_optimization)
     int l;
     int changed = 0;
     static int prev_depth;

Modified: trunk/compilers/imcc/parser_util.c
==============================================================================
--- trunk/compilers/imcc/parser_util.c	(original)
+++ trunk/compilers/imcc/parser_util.c	Mon Jan  5 15:17:26 2009
@@ -146,7 +146,7 @@
 iNEW(PARROT_INTERP, ARGMOD(IMC_Unit *unit), ARGMOD(SymReg *r0),
         ARGMOD(char *type), ARGIN_NULLOK(SymReg *init), int emit)
 {
-    ASSERT_ARGS(iNEW);
+    ASSERT_ARGS(iNEW)
     char fmt[256];
     SymReg *regs[3];
     SymReg *pmc;
@@ -202,7 +202,7 @@
 op_fullname(ARGOUT(char *dest), ARGIN(const char *name),
     ARGIN(SymReg * const *args), int narg, int keyvec)
 {
-    ASSERT_ARGS(op_fullname);
+    ASSERT_ARGS(op_fullname)
     int i;
     const size_t namelen = strlen(name);
 
@@ -277,7 +277,7 @@
 check_op(PARROT_INTERP, ARGOUT(char *fullname), ARGIN(const char *name),
         ARGIN(SymReg * const * r), int narg, int keyvec)
 {
-    ASSERT_ARGS(check_op);
+    ASSERT_ARGS(check_op)
     op_fullname(fullname, name, r, narg, keyvec);
 
     return interp->op_lib->op_code(fullname, 1);
@@ -297,7 +297,7 @@
 int
 is_op(PARROT_INTERP, ARGIN(const char *name))
 {
-    ASSERT_ARGS(is_op);
+    ASSERT_ARGS(is_op)
     return interp->op_lib->op_code(name, 0) >= 0
         || interp->op_lib->op_code(name, 1) >= 0;
 }
@@ -319,7 +319,7 @@
 var_arg_ins(PARROT_INTERP, ARGMOD(IMC_Unit *unit), ARGIN(const char *name),
         ARGMOD(SymReg **r), int n, int emit)
 {
-    ASSERT_ARGS(var_arg_ins);
+    ASSERT_ARGS(var_arg_ins)
     int op;
     Instruction *ins;
     char fullname[64];
@@ -371,7 +371,7 @@
     ARGIN_NULLOK(const char *fmt), ARGIN(SymReg **r), int n, int keyvec,
     int emit)
 {
-    ASSERT_ARGS(INS);
+    ASSERT_ARGS(INS)
     int i, op, len;
     int dirs = 0;
     Instruction *ins;
@@ -573,7 +573,7 @@
 int
 do_yylex_init(PARROT_INTERP, ARGOUT(yyscan_t* yyscanner))
 {
-    ASSERT_ARGS(do_yylex_init);
+    ASSERT_ARGS(do_yylex_init)
     const int retval = yylex_init(yyscanner);
 
     /* This way we can get the interpreter via yyscanner */
@@ -601,7 +601,7 @@
 imcc_compile(PARROT_INTERP, ARGIN(const char *s), int pasm_file,
         ARGOUT(STRING **error_message))
 {
-    ASSERT_ARGS(imcc_compile);
+    ASSERT_ARGS(imcc_compile)
     /* imcc always compiles to interp->code
      * save old cs, make new
      */
@@ -745,7 +745,7 @@
 PMC *
 imcc_compile_pasm(PARROT_INTERP, ARGIN(const char *s))
 {
-    ASSERT_ARGS(imcc_compile_pasm);
+    ASSERT_ARGS(imcc_compile_pasm)
     STRING *error_message;
     return imcc_compile(interp, s, 1, &error_message);
 }
@@ -768,7 +768,7 @@
 PMC *
 imcc_compile_pir(PARROT_INTERP, ARGIN(const char *s))
 {
-    ASSERT_ARGS(imcc_compile_pir);
+    ASSERT_ARGS(imcc_compile_pir)
     STRING *error_message;
     return imcc_compile(interp, s, 0, &error_message);
 }
@@ -789,7 +789,7 @@
 IMCC_compile_pir_s(PARROT_INTERP, ARGIN(const char *s),
         ARGOUT(STRING **error_message))
 {
-    ASSERT_ARGS(IMCC_compile_pir_s);
+    ASSERT_ARGS(IMCC_compile_pir_s)
     return imcc_compile(interp, s, 0, error_message);
 }
 
@@ -809,7 +809,7 @@
 IMCC_compile_pasm_s(PARROT_INTERP, ARGIN(const char *s),
         ARGOUT(STRING **error_message))
 {
-    ASSERT_ARGS(IMCC_compile_pasm_s);
+    ASSERT_ARGS(IMCC_compile_pasm_s)
     return imcc_compile(interp, s, 1, error_message);
 }
 
@@ -828,7 +828,7 @@
 PMC *
 imcc_compile_pasm_ex(PARROT_INTERP, ARGIN(const char *s))
 {
-    ASSERT_ARGS(imcc_compile_pasm_ex);
+    ASSERT_ARGS(imcc_compile_pasm_ex)
     STRING *error_message;
 
     PMC * const sub = imcc_compile(interp, s, 1, &error_message);
@@ -855,7 +855,7 @@
 PMC *
 imcc_compile_pir_ex(PARROT_INTERP, ARGIN(const char *s))
 {
-    ASSERT_ARGS(imcc_compile_pir_ex);
+    ASSERT_ARGS(imcc_compile_pir_ex)
     STRING *error_message;
 
     PMC * const sub = imcc_compile(interp, s, 0, &error_message);
@@ -881,7 +881,7 @@
 imcc_compile_file(PARROT_INTERP, ARGIN(const char *fullname),
         ARGOUT(STRING **error_message))
 {
-    ASSERT_ARGS(imcc_compile_file);
+    ASSERT_ARGS(imcc_compile_file)
     PackFile_ByteCode  * const cs_save  = interp->code;
     PackFile_ByteCode         *cs       = NULL;
     struct _imc_info_t        *imc_info = NULL;
@@ -995,7 +995,7 @@
 void *
 IMCC_compile_file(PARROT_INTERP, ARGIN(const char *s))
 {
-    ASSERT_ARGS(IMCC_compile_file);
+    ASSERT_ARGS(IMCC_compile_file)
     STRING *error_message;
     return imcc_compile_file(interp, s, &error_message);
 }
@@ -1015,7 +1015,7 @@
 IMCC_compile_file_s(PARROT_INTERP, ARGIN(const char *s),
         ARGOUT(STRING **error_message))
 {
-    ASSERT_ARGS(IMCC_compile_file_s);
+    ASSERT_ARGS(IMCC_compile_file_s)
     return imcc_compile_file(interp, s, error_message);
 }
 
@@ -1032,7 +1032,7 @@
 void
 register_compilers(PARROT_INTERP)
 {
-    ASSERT_ARGS(register_compilers);
+    ASSERT_ARGS(register_compilers)
     Parrot_compreg(interp, const_string(interp, "PASM"), imcc_compile_pasm_ex);
     Parrot_compreg(interp, const_string(interp, "PIR"),  imcc_compile_pir_ex);
 
@@ -1057,7 +1057,7 @@
 static int
 change_op(PARROT_INTERP, ARGMOD(IMC_Unit *unit), ARGMOD(SymReg **r), int num, int emit)
 {
-    ASSERT_ARGS(change_op);
+    ASSERT_ARGS(change_op)
     int changed = 0;
 
     if (r[num]->type & (VTCONST|VT_CONSTP)) {
@@ -1115,7 +1115,7 @@
 try_find_op(PARROT_INTERP, ARGMOD(IMC_Unit *unit), ARGIN(const char *name),
         ARGMOD(SymReg **r), int n, int keyvec, int emit)
 {
-    ASSERT_ARGS(try_find_op);
+    ASSERT_ARGS(try_find_op)
     char fullname[64];
     int changed = 0;
     /*
@@ -1202,7 +1202,7 @@
 static const char *
 try_rev_cmp(ARGIN(const char *name), ARGMOD(SymReg **r))
 {
-    ASSERT_ARGS(try_rev_cmp);
+    ASSERT_ARGS(try_rev_cmp)
     static struct br_pairs {
         ARGIN(const char * const op);
         ARGIN(const char * const nop);
@@ -1250,7 +1250,7 @@
 int
 imcc_vfprintf(PARROT_INTERP, ARGIN(PMC *io), ARGIN(const char *format), va_list ap)
 {
-    ASSERT_ARGS(imcc_vfprintf);
+    ASSERT_ARGS(imcc_vfprintf)
     return Parrot_io_putps(interp, io, Parrot_vsprintf_c(interp, format, ap));
 }
 
@@ -1270,7 +1270,7 @@
 void
 imcc_init(PARROT_INTERP)
 {
-    ASSERT_ARGS(imcc_init);
+    ASSERT_ARGS(imcc_init)
     PARROT_ASSERT(IMCC_INFO(interp) == NULL);
 
     IMCC_INFO(interp) = mem_allocate_zeroed_typed(imc_info_t);
@@ -1291,7 +1291,7 @@
 static void
 imcc_destroy_macro_values(ARGMOD(void *value))
 {
-    ASSERT_ARGS(imcc_destroy_macro_values);
+    ASSERT_ARGS(imcc_destroy_macro_values)
     macro_t *  const m      = (macro_t *)value;
     params_t * const params = &m->params;
 
@@ -1322,7 +1322,7 @@
 void
 imcc_destroy(PARROT_INTERP)
 {
-    ASSERT_ARGS(imcc_destroy);
+    ASSERT_ARGS(imcc_destroy)
     Hash * const macros = IMCC_INFO(interp)->macros;
 
     if (macros)

Modified: trunk/compilers/imcc/pbc.c
==============================================================================
--- trunk/compilers/imcc/pbc.c	(original)
+++ trunk/compilers/imcc/pbc.c	Mon Jan  5 15:17:26 2009
@@ -311,7 +311,7 @@
 static void
 imcc_globals_destroy(PARROT_INTERP, SHIM(int ex), SHIM(void *param))
 {
-    ASSERT_ARGS(imcc_globals_destroy);
+    ASSERT_ARGS(imcc_globals_destroy)
     code_segment_t *cs = IMCC_INFO(interp)->globals->cs;
 
     while (cs) {
@@ -347,7 +347,7 @@
 static int
 add_const_table(PARROT_INTERP)
 {
-    ASSERT_ARGS(add_const_table);
+    ASSERT_ARGS(add_const_table)
     const size_t oldcount = interp->code->const_table->const_count;
     const size_t newcount = oldcount + 1;
 
@@ -383,7 +383,7 @@
 static int
 add_const_table_pmc(PARROT_INTERP, ARGIN(PMC *pmc))
 {
-    ASSERT_ARGS(add_const_table_pmc);
+    ASSERT_ARGS(add_const_table_pmc)
     int newitem = add_const_table(interp);
 
     interp->code->const_table->constants[newitem]->type  = PFC_PMC;
@@ -406,7 +406,7 @@
 static int
 add_const_table_key(PARROT_INTERP, ARGIN(PMC *key))
 {
-    ASSERT_ARGS(add_const_table_key);
+    ASSERT_ARGS(add_const_table_key)
     int newitem = add_const_table(interp);
 
     interp->code->const_table->constants[newitem]->type  = PFC_KEY;
@@ -429,7 +429,7 @@
 int
 e_pbc_open(PARROT_INTERP, SHIM(void *param))
 {
-    ASSERT_ARGS(e_pbc_open);
+    ASSERT_ARGS(e_pbc_open)
     code_segment_t *cs = mem_allocate_zeroed_typed(code_segment_t);
 
     if (!IMCC_INFO(interp)->globals)
@@ -496,7 +496,7 @@
 static int
 old_blocks(PARROT_INTERP)
 {
-    ASSERT_ARGS(old_blocks);
+    ASSERT_ARGS(old_blocks)
     const  subs_t *s;
     size_t         size = 0;
 
@@ -523,7 +523,7 @@
 opcode_t *
 make_jit_info(PARROT_INTERP, ARGIN(const IMC_Unit *unit))
 {
-    ASSERT_ARGS(make_jit_info);
+    ASSERT_ARGS(make_jit_info)
     const size_t old  = old_blocks(interp);
     const size_t size = unit->n_basic_blocks + old;
 
@@ -571,7 +571,7 @@
 static void
 make_new_sub(PARROT_INTERP, ARGIN(IMC_Unit *unit))
 {
-    ASSERT_ARGS(make_new_sub);
+    ASSERT_ARGS(make_new_sub)
     subs_t * const s = mem_allocate_zeroed_typed(subs_t);
 
     s->prev          = IMCC_INFO(interp)->globals->cs->subs;
@@ -604,7 +604,7 @@
 static int
 get_old_size(PARROT_INTERP, ARGOUT(int *ins_line))
 {
-    ASSERT_ARGS(get_old_size);
+    ASSERT_ARGS(get_old_size)
     size_t size = 0;
 
     *ins_line   = 0;
@@ -634,7 +634,7 @@
 static void
 store_sub_size(PARROT_INTERP, size_t size, size_t ins_line)
 {
-    ASSERT_ARGS(store_sub_size);
+    ASSERT_ARGS(store_sub_size)
     IMCC_INFO(interp)->globals->cs->subs->size     = size;
     IMCC_INFO(interp)->globals->cs->subs->ins_line = ins_line;
 }
@@ -653,7 +653,7 @@
 static void
 store_fixup(PARROT_INTERP, ARGIN(const SymReg *r), int pc, int offset)
 {
-    ASSERT_ARGS(store_fixup);
+    ASSERT_ARGS(store_fixup)
     SymReg * const fixup = _mk_address(interp,
             &IMCC_INFO(interp)->globals->cs->subs->fixup, r->name, U_add_all);
 
@@ -685,7 +685,7 @@
 static void
 store_key_const(PARROT_INTERP, ARGIN(const char *str), int idx)
 {
-    ASSERT_ARGS(store_key_const);
+    ASSERT_ARGS(store_key_const)
     SymReg * const c =
         _mk_const(&IMCC_INFO(interp)->globals->cs->key_consts, str, 0);
     c->color = idx;
@@ -705,7 +705,7 @@
 static size_t
 get_codesize(PARROT_INTERP, ARGIN(const IMC_Unit *unit), ARGOUT(size_t *src_lines))
 {
-    ASSERT_ARGS(get_codesize);
+    ASSERT_ARGS(get_codesize)
     Instruction *ins = unit->instructions;
     size_t       code_size;
 
@@ -767,7 +767,7 @@
 find_global_label(PARROT_INTERP, ARGIN(const char *name),
     ARGIN(const subs_t *sym), ARGOUT(int *pc))
 {
-    ASSERT_ARGS(find_global_label);
+    ASSERT_ARGS(find_global_label)
     subs_t *s;
 
     *pc = 0;
@@ -793,7 +793,7 @@
 find_sub_by_subid(PARROT_INTERP, ARGIN(const char *lookup),
     ARGIN(const subs_t *sym), ARGOUT(int *pc))
 {
-    ASSERT_ARGS(find_sub_by_subid);
+    ASSERT_ARGS(find_sub_by_subid)
     subs_t *s;
     UNUSED(sym);
 
@@ -824,7 +824,7 @@
 static void
 fixup_globals(PARROT_INTERP)
 {
-    ASSERT_ARGS(fixup_globals);
+    ASSERT_ARGS(fixup_globals)
     subs_t *s;
     int     jumppc = 0;
 
@@ -935,7 +935,7 @@
 STRING *
 IMCC_string_from_reg(PARROT_INTERP, ARGIN(const SymReg *r))
 {
-    ASSERT_ARGS(IMCC_string_from_reg);
+    ASSERT_ARGS(IMCC_string_from_reg)
     const char *buf = r->name;
 
     if (r->type & VT_ENCODED) {
@@ -978,7 +978,7 @@
 STRING *
 IMCC_string_from__STRINGC(PARROT_INTERP, ARGIN(const char *buf))
 {
-    ASSERT_ARGS(IMCC_string_from__STRINGC);
+    ASSERT_ARGS(IMCC_string_from__STRINGC)
     const int ascii = (*buf == '\'' || *buf == '"');
     if (!ascii) {
         /*
@@ -1029,7 +1029,7 @@
 static int
 add_const_str(PARROT_INTERP, ARGIN(const SymReg *r))
 {
-    ASSERT_ARGS(add_const_str);
+    ASSERT_ARGS(add_const_str)
     const int      k = add_const_table(interp);
     STRING * const s = IMCC_string_from_reg(interp, r);
 
@@ -1054,7 +1054,7 @@
 static int
 add_const_num(PARROT_INTERP, ARGIN_NULLOK(const char *buf))
 {
-    ASSERT_ARGS(add_const_num);
+    ASSERT_ARGS(add_const_num)
     const int      k = add_const_table(interp);
     STRING * const s = string_from_cstring(interp, buf, 0);
 
@@ -1080,7 +1080,7 @@
 static PMC*
 mk_multi_sig(PARROT_INTERP, ARGIN(const SymReg *r))
 {
-    ASSERT_ARGS(mk_multi_sig);
+    ASSERT_ARGS(mk_multi_sig)
     PackFile_ConstTable *ct;
     PMC                 *multi_sig;
     pcc_sub_t * const    pcc_sub = r->pcc_sub;
@@ -1145,7 +1145,7 @@
 create_lexinfo(PARROT_INTERP, ARGMOD(IMC_Unit *unit), ARGIN(PMC *sub),
                int need_lex)
 {
-    ASSERT_ARGS(create_lexinfo);
+    ASSERT_ARGS(create_lexinfo)
     PMC                *lex_info    = NULL;
     SymHash            *hsh         = &unit->hash;
     PackFile_Constant **constants   = interp->code->const_table->constants;
@@ -1215,7 +1215,7 @@
 static PMC*
 find_outer(PARROT_INTERP, ARGIN(const IMC_Unit *unit))
 {
-    ASSERT_ARGS(find_outer);
+    ASSERT_ARGS(find_outer)
     subs_t *s;
     PMC    *current;
     STRING *cur_name;
@@ -1279,7 +1279,7 @@
 static int
 add_const_pmc_sub(PARROT_INTERP, ARGMOD(SymReg *r), size_t offs, size_t end)
 {
-    ASSERT_ARGS(add_const_pmc_sub);
+    ASSERT_ARGS(add_const_pmc_sub)
     PMC                 *ns_pmc;
     PMC                 *sub_pmc;
     Parrot_sub          *sub;
@@ -1501,7 +1501,7 @@
 static int
 add_const_key(PARROT_INTERP, ARGIN(const opcode_t *key), int size, ARGIN(const char *s_key))
 {
-    ASSERT_ARGS(add_const_key);
+    ASSERT_ARGS(add_const_key)
     const SymReg * const r =
         _get_sym(&IMCC_INFO(interp)->globals->cs->key_consts, s_key);
     const opcode_t      *rc;
@@ -1553,7 +1553,7 @@
 static const char *
 slice_deb(int bits)
 {
-    ASSERT_ARGS(slice_deb);
+    ASSERT_ARGS(slice_deb)
     if ((bits & VT_SLICE_BITS) == (VT_START_SLICE|VT_END_SLICE))
         return "start+end";
 
@@ -1590,7 +1590,7 @@
 static opcode_t
 build_key(PARROT_INTERP, ARGIN(SymReg *key_reg))
 {
-    ASSERT_ARGS(build_key);
+    ASSERT_ARGS(build_key)
 #define KEYLEN 21
     SymReg   *reg;
 
@@ -1718,7 +1718,7 @@
 INTVAL
 IMCC_int_from_reg(PARROT_INTERP, ARGIN(const SymReg *r))
 {
-    ASSERT_ARGS(IMCC_int_from_reg);
+    ASSERT_ARGS(IMCC_int_from_reg)
     INTVAL i;
 
     errno = 0;
@@ -1763,7 +1763,7 @@
 static void
 make_pmc_const(PARROT_INTERP, ARGMOD(SymReg *r))
 {
-    ASSERT_ARGS(make_pmc_const);
+    ASSERT_ARGS(make_pmc_const)
     PMC    *_class = interp->vtables[r->pmc_type]->pmc_class;
     STRING *s;
     PMC    *p;
@@ -1797,7 +1797,7 @@
 static void
 add_1_const(PARROT_INTERP, ARGMOD(SymReg *r))
 {
-    ASSERT_ARGS(add_1_const);
+    ASSERT_ARGS(add_1_const)
     if (r->color >= 0)
         return;
 
@@ -1854,7 +1854,7 @@
 static void
 constant_folding(PARROT_INTERP, ARGIN(const IMC_Unit *unit))
 {
-    ASSERT_ARGS(constant_folding);
+    ASSERT_ARGS(constant_folding)
     const SymHash *hsh = &IMCC_INFO(interp)->ghash;
     unsigned int   i;
 
@@ -1913,7 +1913,7 @@
 int
 e_pbc_new_sub(PARROT_INTERP, SHIM(void *param), ARGIN(IMC_Unit *unit))
 {
-    ASSERT_ARGS(e_pbc_new_sub);
+    ASSERT_ARGS(e_pbc_new_sub)
     if (!unit->instructions)
         return 0;
 
@@ -1936,7 +1936,7 @@
 int
 e_pbc_end_sub(PARROT_INTERP, SHIM(void *param), ARGIN(IMC_Unit *unit))
 {
-    ASSERT_ARGS(e_pbc_end_sub);
+    ASSERT_ARGS(e_pbc_end_sub)
     Instruction *ins;
     int          pragma;
 
@@ -1992,7 +1992,7 @@
 static void
 verify_signature(PARROT_INTERP, ARGIN(const Instruction *ins), ARGIN(opcode_t *pc))
 {
-    ASSERT_ARGS(verify_signature);
+    ASSERT_ARGS(verify_signature)
     PMC    *changed_sig    = NULL;
     PMC    * const sig_arr = interp->code->const_table->constants[pc[-1]]->u.key;
     int     needed         = 0;
@@ -2070,7 +2070,7 @@
 e_pbc_emit(PARROT_INTERP, SHIM(void *param), ARGIN(const IMC_Unit *unit),
         ARGIN(const Instruction *ins))
 {
-    ASSERT_ARGS(e_pbc_emit);
+    ASSERT_ARGS(e_pbc_emit)
     op_info_t *op_info;
     int        ok = 0;
     int        op, i;
@@ -2302,7 +2302,7 @@
 int
 e_pbc_close(PARROT_INTERP, SHIM(void *param))
 {
-    ASSERT_ARGS(e_pbc_close);
+    ASSERT_ARGS(e_pbc_close)
     fixup_globals(interp);
 
     return 0;

Modified: trunk/compilers/imcc/pcc.c
==============================================================================
--- trunk/compilers/imcc/pcc.c	(original)
+++ trunk/compilers/imcc/pcc.c	Mon Jan  5 15:17:26 2009
@@ -165,7 +165,7 @@
 insINS(PARROT_INTERP, ARGMOD(IMC_Unit *unit), ARGIN(Instruction *ins),
         ARGIN(const char *name), ARGIN(SymReg **regs), int n)
 {
-    ASSERT_ARGS(insINS);
+    ASSERT_ARGS(insINS)
     /* INS can return NULL, but insert_ins() cannot take one */
     Instruction * const tmp = INS(interp, unit, name, NULL, regs, n, 0, 0);
     if (tmp)
@@ -188,7 +188,7 @@
 SymReg*
 get_pasm_reg(PARROT_INTERP, ARGIN(const char *name))
 {
-    ASSERT_ARGS(get_pasm_reg);
+    ASSERT_ARGS(get_pasm_reg)
     SymReg * const r = _get_sym(&IMCC_INFO(interp)->cur_unit->hash, name);
 
     if (r)
@@ -212,7 +212,7 @@
 SymReg*
 get_const(PARROT_INTERP, ARGIN(const char *name), int type)
 {
-    ASSERT_ARGS(get_const);
+    ASSERT_ARGS(get_const)
     SymReg * const r = _get_sym(&IMCC_INFO(interp)->ghash, name);
 
     if (r && r->set == type)
@@ -240,7 +240,7 @@
         ARGIN(const char *op_name), int n,
         ARGIN_NULLOK(SymReg * const *args), ARGIN_NULLOK(const int *arg_flags))
 {
-    ASSERT_ARGS(pcc_get_args);
+    ASSERT_ARGS(pcc_get_args)
     /* Notes:
      * The created string is in the format "\"(0x0010,0x0220,0x0010)\"".
      * flags always has exactly 4 hex digits.
@@ -348,7 +348,7 @@
 static void
 unshift_self(ARGIN(SymReg *sub), ARGIN(SymReg *obj))
 {
-    ASSERT_ARGS(unshift_self);
+    ASSERT_ARGS(unshift_self)
     struct pcc_sub_t * const pcc_sub = sub->pcc_sub;
     const int                n       = pcc_sub->nargs;
     int                      i;
@@ -381,7 +381,7 @@
 void
 expand_pcc_sub(PARROT_INTERP, ARGMOD(IMC_Unit *unit), ARGIN(Instruction *ins))
 {
-    ASSERT_ARGS(expand_pcc_sub);
+    ASSERT_ARGS(expand_pcc_sub)
     int          nargs;
     SymReg      *sub = ins->symregs[0];
     SymReg      *regs[2];
@@ -459,7 +459,7 @@
 void
 expand_pcc_sub_ret(PARROT_INTERP, ARGMOD(IMC_Unit *unit), ARGIN(Instruction *ins))
 {
-    ASSERT_ARGS(expand_pcc_sub_ret);
+    ASSERT_ARGS(expand_pcc_sub_ret)
     const int is_yield = ins->type & ITPCCYIELD;
     SymReg * const sub = ins->symregs[0];
     const int n        = sub->pcc_sub->nret;
@@ -503,7 +503,7 @@
 static int
 pcc_reg_mov(PARROT_INTERP, unsigned char d, unsigned char s, ARGMOD(void *vinfo))
 {
-    ASSERT_ARGS(pcc_reg_mov);
+    ASSERT_ARGS(pcc_reg_mov)
     static const char types[] = "INSP";
     static SymReg    *temps[4];
     move_info_t      *info    = (move_info_t *)vinfo;
@@ -578,7 +578,7 @@
 move_regs(PARROT_INTERP, ARGIN(IMC_Unit *unit), ARGIN(Instruction *ins),
         size_t n, ARGIN(SymReg **dest), ARGIN(SymReg **src))
 {
-    ASSERT_ARGS(move_regs);
+    ASSERT_ARGS(move_regs)
     unsigned char *move_list;
     move_info_t    move_info;
     unsigned int   i;
@@ -634,7 +634,7 @@
 recursive_tail_call(PARROT_INTERP, ARGIN(IMC_Unit *unit),
         ARGIN(Instruction *ins), ARGIN(SymReg *sub))
 {
-    ASSERT_ARGS(recursive_tail_call);
+    ASSERT_ARGS(recursive_tail_call)
     SymReg *called_sub, *this_sub, *label;
     SymReg *regs[2];
     Instruction *get_params, *tmp_ins, *unused_ins;
@@ -698,7 +698,7 @@
 insert_tail_call(PARROT_INTERP, ARGIN(IMC_Unit *unit), ARGMOD(Instruction *ins),
         ARGMOD(SymReg *sub), ARGIN_NULLOK(SymReg *meth))
 {
-    ASSERT_ARGS(insert_tail_call);
+    ASSERT_ARGS(insert_tail_call)
     SymReg *regs[3];
 
     if (meth) {
@@ -730,7 +730,7 @@
 void
 expand_pcc_sub_call(PARROT_INTERP, ARGMOD(IMC_Unit *unit), ARGMOD(Instruction *ins))
 {
-    ASSERT_ARGS(expand_pcc_sub_call);
+    ASSERT_ARGS(expand_pcc_sub_call)
     SymReg *arg, *reg, *regs[3];
     int          n;
     int          tail_call;

Modified: trunk/compilers/imcc/reg_alloc.c
==============================================================================
--- trunk/compilers/imcc/reg_alloc.c	(original)
+++ trunk/compilers/imcc/reg_alloc.c	Mon Jan  5 15:17:26 2009
@@ -237,7 +237,7 @@
 ig_get_word(int i, int j, int N, ARGIN(unsigned int *graph),
             ARGMOD(int *bit_ofs))
 {
-    ASSERT_ARGS(ig_get_word);
+    ASSERT_ARGS(ig_get_word)
     unsigned int bit = i * N + j;
     *bit_ofs        = bit % sizeof (*graph);
 
@@ -257,7 +257,7 @@
 static void
 ig_set(int i, int j, int N, ARGIN(unsigned int *graph))
 {
-    ASSERT_ARGS(ig_set);
+    ASSERT_ARGS(ig_set)
     int bit_ofs;
     unsigned int *word = ig_get_word(i, j, N, graph, &bit_ofs);
     *word |= (1 << bit_ofs);
@@ -276,7 +276,7 @@
 unsigned int
 ig_test(int i, int j, int N, ARGIN(unsigned int *graph))
 {
-    ASSERT_ARGS(ig_test);
+    ASSERT_ARGS(ig_test)
     int bit_ofs;
     unsigned int* word = ig_get_word(i, j, N, graph, &bit_ofs);
     return *word & (1 << bit_ofs);
@@ -296,7 +296,7 @@
 static unsigned int*
 ig_allocate(int N)
 {
-    ASSERT_ARGS(ig_allocate);
+    ASSERT_ARGS(ig_allocate)
     /* size is N*N bits, but we want don't want to allocate a partial
      * word, so round up to the nearest multiple of sizeof (int).
      */
@@ -319,7 +319,7 @@
 void
 imc_reg_alloc(PARROT_INTERP, ARGIN_NULLOK(IMC_Unit *unit))
 {
-    ASSERT_ARGS(imc_reg_alloc);
+    ASSERT_ARGS(imc_reg_alloc)
     const char *function;
 
     if (!unit)
@@ -425,7 +425,7 @@
 void
 free_reglist(ARGMOD(IMC_Unit *unit))
 {
-    ASSERT_ARGS(free_reglist);
+    ASSERT_ARGS(free_reglist)
 #if IMC_TRACE
     fprintf(stderr, "reg_alloc.c: free_reglist\n");
 #endif
@@ -459,7 +459,7 @@
 void
 graph_coloring_reg_alloc(PARROT_INTERP, ARGMOD(IMC_Unit *unit))
 {
-    ASSERT_ARGS(graph_coloring_reg_alloc);
+    ASSERT_ARGS(graph_coloring_reg_alloc)
     build_interference_graph(interp, unit);
 
     try_allocate(interp, unit);
@@ -480,7 +480,7 @@
 static void
 make_stat(ARGMOD(IMC_Unit *unit), ARGMOD_NULLOK(int *sets), ARGMOD_NULLOK(int *cols))
 {
-    ASSERT_ARGS(make_stat);
+    ASSERT_ARGS(make_stat)
     /* register usage summary */
     SymHash * const hsh = &unit->hash;
     unsigned int    i;
@@ -534,7 +534,7 @@
 static void
 imc_stat_init(ARGMOD(IMC_Unit *unit))
 {
-    ASSERT_ARGS(imc_stat_init);
+    ASSERT_ARGS(imc_stat_init)
     int j;
 
     make_stat(unit, unit->n_vars_used, NULL);
@@ -560,7 +560,7 @@
 static void
 print_stat(PARROT_INTERP, ARGMOD(IMC_Unit *unit))
 {
-    ASSERT_ARGS(print_stat);
+    ASSERT_ARGS(print_stat)
     int sets[4] = {0, 0, 0, 0};
 
     const char * const function =
@@ -608,7 +608,7 @@
 static int
 reg_sort_f(ARGIN(const void *a), ARGIN(const void *b))
 {
-    ASSERT_ARGS(reg_sort_f);
+    ASSERT_ARGS(reg_sort_f)
     const SymReg * const ra = *(SymReg**)a;
     const SymReg * const rb = *(SymReg**)b;
 
@@ -634,7 +634,7 @@
 static void
 sort_reglist(ARGMOD(IMC_Unit *unit))
 {
-    ASSERT_ARGS(sort_reglist);
+    ASSERT_ARGS(sort_reglist)
     qsort(unit->reglist, unit->n_symbols, sizeof (SymReg *), reg_sort_f);
 }
 
@@ -660,7 +660,7 @@
 static void
 build_reglist(NULLOK_INTERP, ARGMOD(IMC_Unit *unit))
 {
-    ASSERT_ARGS(build_reglist);
+    ASSERT_ARGS(build_reglist)
     SymHash  const *hsh = &unit->hash;
     unsigned int    i, count, unused, n_symbols;
 
@@ -723,7 +723,7 @@
 static void
 rebuild_reglist(ARGMOD(IMC_Unit *unit))
 {
-    ASSERT_ARGS(rebuild_reglist);
+    ASSERT_ARGS(rebuild_reglist)
     unsigned int i, count, unused;
     static const char types[] = "INSP";
 
@@ -775,7 +775,7 @@
 static void
 build_interference_graph(PARROT_INTERP, ARGMOD(IMC_Unit *unit))
 {
-    ASSERT_ARGS(build_interference_graph);
+    ASSERT_ARGS(build_interference_graph)
     int x;
     unsigned int *interference_graph;
 
@@ -824,7 +824,7 @@
 static void
 compute_du_chain(ARGMOD(IMC_Unit *unit))
 {
-    ASSERT_ARGS(compute_du_chain);
+    ASSERT_ARGS(compute_du_chain)
     Instruction *ins        = unit->instructions;
     Instruction *lastbranch = NULL;
     unsigned int i;
@@ -863,7 +863,7 @@
 static void
 compute_one_du_chain(ARGMOD(SymReg *r), ARGIN(IMC_Unit *unit))
 {
-    ASSERT_ARGS(compute_one_du_chain);
+    ASSERT_ARGS(compute_one_du_chain)
     Instruction * ins;
 
     /* We cannot rely on computing the value of r->first when parsing,
@@ -915,7 +915,7 @@
 interferes(PARROT_INTERP, ARGIN(const IMC_Unit *unit),
         ARGIN(const SymReg *r0), ARGIN(const SymReg *r1))
 {
-    ASSERT_ARGS(interferes);
+    ASSERT_ARGS(interferes)
     unsigned int i;
 
     /* Registers don't interfere with themselves */
@@ -1004,7 +1004,7 @@
 static int
 ig_find_color(ARGIN(const IMC_Unit *unit), ARGIN(const char *avail))
 {
-    ASSERT_ARGS(ig_find_color);
+    ASSERT_ARGS(ig_find_color)
     unsigned int c;
 
     for (c = 0; c < unit->n_symbols; c++)
@@ -1032,7 +1032,7 @@
 static int
 try_allocate(PARROT_INTERP, ARGIN(IMC_Unit *unit))
 {
-    ASSERT_ARGS(try_allocate);
+    ASSERT_ARGS(try_allocate)
     unsigned int    i;
     char           *avail;
     unsigned int   *graph   = unit->interference_graph;
@@ -1104,7 +1104,7 @@
 map_colors(ARGIN(const IMC_Unit* unit), int x, ARGIN(unsigned int *graph),
         ARGMOD(char *avail), int typ, int already_allocated)
 {
-    ASSERT_ARGS(map_colors);
+    ASSERT_ARGS(map_colors)
     const int n_symbols = unit->n_symbols;
     int       y;
 
@@ -1134,7 +1134,7 @@
 static int
 first_avail(ARGIN(const IMC_Unit *unit), int reg_set, ARGOUT_NULLOK(Set **avail))
 {
-    ASSERT_ARGS(first_avail);
+    ASSERT_ARGS(first_avail)
     int n                     = (int)unit->n_symbols > unit->max_color
                               ? (int)unit->n_symbols
                               : unit->max_color;
@@ -1179,7 +1179,7 @@
 static void
 allocate_uniq(PARROT_INTERP, ARGMOD(IMC_Unit *unit), int usage)
 {
-    ASSERT_ARGS(allocate_uniq);
+    ASSERT_ARGS(allocate_uniq)
     SymHash     *hsh     = &unit->hash;
     Set         *sets[4] = { NULL, NULL, NULL, NULL };
     SymReg      *r;
@@ -1242,7 +1242,7 @@
 static void
 vanilla_reg_alloc(SHIM_INTERP, ARGMOD(IMC_Unit *unit))
 {
-    ASSERT_ARGS(vanilla_reg_alloc);
+    ASSERT_ARGS(vanilla_reg_alloc)
     char         type[] = "INSP";
     SymHash     *hsh    = &unit->hash;
     Set         *avail;
@@ -1296,7 +1296,7 @@
 static void
 allocate_lexicals(PARROT_INTERP, ARGMOD(IMC_Unit *unit))
 {
-    ASSERT_ARGS(allocate_lexicals);
+    ASSERT_ARGS(allocate_lexicals)
     IMCC_debug(interp, DEBUG_IMC, "allocate lexicals\n");
     allocate_uniq(interp, unit, U_LEXICAL);
 }
@@ -1314,7 +1314,7 @@
 static void
 allocate_non_volatile(PARROT_INTERP, ARGMOD(IMC_Unit *unit))
 {
-    ASSERT_ARGS(allocate_non_volatile);
+    ASSERT_ARGS(allocate_non_volatile)
     IMCC_debug(interp, DEBUG_IMC, "allocate non_volatile\n");
     allocate_uniq(interp, unit, U_NON_VOLATILE);
 }

Modified: trunk/compilers/imcc/sets.c
==============================================================================
--- trunk/compilers/imcc/sets.c	(original)
+++ trunk/compilers/imcc/sets.c	Mon Jan  5 15:17:26 2009
@@ -51,7 +51,7 @@
 Set*
 set_make(unsigned int length)
 {
-    ASSERT_ARGS(set_make);
+    ASSERT_ARGS(set_make)
     Set * const s = mem_allocate_zeroed_typed(Set);
     s->length     = length;
     s->bmp        = mem_allocate_n_zeroed_typed(NUM_BYTES(length),
@@ -76,7 +76,7 @@
 Set*
 set_make_full(unsigned int length)
 {
-    ASSERT_ARGS(set_make_full);
+    ASSERT_ARGS(set_make_full)
     Set * const s      = set_make(length);
     const size_t bytes = NUM_BYTES(length);
 
@@ -100,7 +100,7 @@
 void
 set_free(ARGMOD(Set *s))
 {
-    ASSERT_ARGS(set_free);
+    ASSERT_ARGS(set_free)
     if (s->bmp)
         mem_sys_free(s->bmp);
 
@@ -121,7 +121,7 @@
 void
 set_clear(ARGMOD(Set *s))
 {
-    ASSERT_ARGS(set_clear);
+    ASSERT_ARGS(set_clear)
     memset(s->bmp, 0, NUM_BYTES(s->length));
 }
 
@@ -141,7 +141,7 @@
 Set*
 set_copy(ARGIN(const Set *s))
 {
-    ASSERT_ARGS(set_copy);
+    ASSERT_ARGS(set_copy)
     Set * const d = set_make(s->length);
 
     memcpy(d->bmp, s->bmp, NUM_BYTES(d->length));
@@ -165,7 +165,7 @@
 int
 set_equal(ARGIN(const Set *s1), ARGIN(const Set *s2))
 {
-    ASSERT_ARGS(set_equal);
+    ASSERT_ARGS(set_equal)
     int          mask;
     const size_t bytes = s1->length / 8;
 
@@ -201,7 +201,7 @@
 void
 set_add(ARGMOD(Set *s), unsigned int element)
 {
-    ASSERT_ARGS(set_add);
+    ASSERT_ARGS(set_add)
     const int elem_byte_in_set = BYTE_IN_SET(element);
     const int bytes_in_set     = BYTE_IN_SET(s->length);
 
@@ -230,7 +230,7 @@
 unsigned int
 set_first_zero(ARGIN(const Set *s))
 {
-    ASSERT_ARGS(set_first_zero);
+    ASSERT_ARGS(set_first_zero)
     unsigned int i;
 
 
@@ -269,7 +269,7 @@
 int
 set_contains(ARGIN(const Set *s), unsigned int element)
 {
-    ASSERT_ARGS(set_contains);
+    ASSERT_ARGS(set_contains)
 
     if (element > s->length)
         return 0;
@@ -301,7 +301,7 @@
 Set *
 set_union(ARGIN(const Set *s1), ARGIN(const Set *s2))
 {
-    ASSERT_ARGS(set_union);
+    ASSERT_ARGS(set_union)
     unsigned int i;
     Set * const s = set_make(s1->length);
 
@@ -334,7 +334,7 @@
 Set *
 set_intersec(ARGIN(const Set *s1), ARGIN(const Set *s2))
 {
-    ASSERT_ARGS(set_intersec);
+    ASSERT_ARGS(set_intersec)
     unsigned int i;
     Set * const  s = set_make(s1->length);
 
@@ -363,7 +363,7 @@
 void
 set_intersec_inplace(ARGMOD(Set *s1), ARGIN(const Set *s2))
 {
-    ASSERT_ARGS(set_intersec_inplace);
+    ASSERT_ARGS(set_intersec_inplace)
     unsigned int i;
 
     if (s1->length != s2->length)

Modified: trunk/compilers/imcc/symreg.c
==============================================================================
--- trunk/compilers/imcc/symreg.c	(original)
+++ trunk/compilers/imcc/symreg.c	Mon Jan  5 15:17:26 2009
@@ -127,7 +127,7 @@
 void
 push_namespace(SHIM_INTERP, ARGIN(const char *name))
 {
-    ASSERT_ARGS(push_namespace);
+    ASSERT_ARGS(push_namespace)
     Namespace * const ns = mem_allocate_zeroed_typed(Namespace);
 
     ns->parent = _namespace;
@@ -150,7 +150,7 @@
 void
 pop_namespace(PARROT_INTERP, ARGIN(const char *name))
 {
-    ASSERT_ARGS(pop_namespace);
+    ASSERT_ARGS(pop_namespace)
     Namespace * const ns = _namespace;
 
     if (!ns)
@@ -186,7 +186,7 @@
 static SymReg *
 _get_sym_typed(ARGIN(const SymHash *hsh), ARGIN(const char *name), int t)
 {
-    ASSERT_ARGS(_get_sym_typed);
+    ASSERT_ARGS(_get_sym_typed)
     SymReg            *p;
     const unsigned int i = hash_str(name) % hsh->size;
 
@@ -216,7 +216,7 @@
 static SymReg *
 _mk_symreg(ARGMOD(SymHash *hsh), ARGIN(const char *name), int t)
 {
-    ASSERT_ARGS(_mk_symreg);
+    ASSERT_ARGS(_mk_symreg)
     SymReg * r = _get_sym_typed(hsh, name, t);
 
     if (!r) {
@@ -249,7 +249,7 @@
 SymReg *
 mk_symreg(PARROT_INTERP, ARGIN(const char *name), int t)
 {
-    ASSERT_ARGS(mk_symreg);
+    ASSERT_ARGS(mk_symreg)
     IMC_Unit * const unit = IMCC_INFO(interp)->last_unit;
     return _mk_symreg(&unit->hash, name, t);
 }
@@ -271,7 +271,7 @@
 char *
 symreg_to_str(ARGIN(const SymReg *s))
 {
-    ASSERT_ARGS(symreg_to_str);
+    ASSERT_ARGS(symreg_to_str)
     /* NOTE: the below magic number encompasses all the quoted strings which
      * may be included in the sprintf output (for now) */
     char * const buf = (char *)mem_sys_allocate(250 + strlen(s->name));
@@ -313,7 +313,7 @@
 SymReg *
 mk_temp_reg(PARROT_INTERP, int t)
 {
-    ASSERT_ARGS(mk_temp_reg);
+    ASSERT_ARGS(mk_temp_reg)
     char       buf[30];
     static int temp;
 
@@ -338,7 +338,7 @@
 SymReg *
 mk_pcc_sub(PARROT_INTERP, ARGIN(const char *name), int proto)
 {
-    ASSERT_ARGS(mk_pcc_sub);
+    ASSERT_ARGS(mk_pcc_sub)
     IMC_Unit * const unit = IMCC_INFO(interp)->last_unit;
     SymReg   * const r    = _mk_symreg(&unit->hash, name, proto);
 
@@ -362,7 +362,7 @@
 void
 add_namespace(PARROT_INTERP, ARGMOD(IMC_Unit *unit))
 {
-    ASSERT_ARGS(add_namespace);
+    ASSERT_ARGS(add_namespace)
     SymReg * const ns = IMCC_INFO(interp)->cur_namespace;
 
     if (!ns)
@@ -400,7 +400,7 @@
 void
 add_pcc_arg(ARGMOD(SymReg *r), ARGMOD(SymReg *arg))
 {
-    ASSERT_ARGS(add_pcc_arg);
+    ASSERT_ARGS(add_pcc_arg)
     pcc_sub_t * const sub = r->pcc_sub;
     const int         n   = sub->nargs;
 
@@ -429,7 +429,7 @@
 void
 add_pcc_result(ARGMOD(SymReg *r), ARGMOD(SymReg *arg))
 {
-    ASSERT_ARGS(add_pcc_result);
+    ASSERT_ARGS(add_pcc_result)
     pcc_sub_t * const sub = r->pcc_sub;
     const int         n   = sub->nret;
 
@@ -460,7 +460,7 @@
 void
 add_pcc_multi(ARGMOD(SymReg *r), ARGIN_NULLOK(SymReg *arg))
 {
-    ASSERT_ARGS(add_pcc_multi);
+    ASSERT_ARGS(add_pcc_multi)
     pcc_sub_t * const sub = r->pcc_sub;
     const int n           = sub->nmulti;
 
@@ -483,7 +483,7 @@
 void
 add_pcc_sub(ARGMOD(SymReg *r), ARGIN(SymReg *arg))
 {
-    ASSERT_ARGS(add_pcc_sub);
+    ASSERT_ARGS(add_pcc_sub)
     r->pcc_sub->sub = arg;
 }
 
@@ -501,7 +501,7 @@
 void
 add_pcc_cc(ARGMOD(SymReg *r), ARGIN(SymReg *arg))
 {
-    ASSERT_ARGS(add_pcc_cc);
+    ASSERT_ARGS(add_pcc_cc)
     r->pcc_sub->cc = arg;
 }
 
@@ -521,7 +521,7 @@
 SymReg *
 mk_pasm_reg(PARROT_INTERP, ARGIN(const char *name))
 {
-    ASSERT_ARGS(mk_pasm_reg);
+    ASSERT_ARGS(mk_pasm_reg)
     SymReg *r    = _get_sym(&IMCC_INFO(interp)->cur_unit->hash, name);
 
     if (!r) {
@@ -557,7 +557,7 @@
 static char *
 _mk_fullname(ARGIN_NULLOK(const Namespace *ns), ARGIN(const char *name))
 {
-    ASSERT_ARGS(_mk_fullname);
+    ASSERT_ARGS(_mk_fullname)
     if (ns) {
         const size_t len = strlen(name) + strlen(ns->name) + 3;
         char *result = (char *) mem_sys_allocate(len);
@@ -584,7 +584,7 @@
 SymReg *
 mk_ident(PARROT_INTERP, ARGIN(const char *name), int t)
 {
-    ASSERT_ARGS(mk_ident);
+    ASSERT_ARGS(mk_ident)
     char   * const fullname = _mk_fullname(_namespace, name);
     SymReg        *r        = mk_symreg(interp, fullname, t);
 
@@ -624,7 +624,7 @@
 SymReg*
 mk_ident_ur(PARROT_INTERP, ARGIN(const char *name), int t)
 {
-    ASSERT_ARGS(mk_ident_ur);
+    ASSERT_ARGS(mk_ident_ur)
     SymReg * const r = mk_ident(interp, name, t);
     r->usage        |= U_NON_VOLATILE;
 
@@ -648,7 +648,7 @@
 mk_pmc_const_2(PARROT_INTERP, ARGMOD(IMC_Unit *unit), ARGIN(SymReg *left),
         ARGMOD(SymReg *rhs))
 {
-    ASSERT_ARGS(mk_pmc_const_2);
+    ASSERT_ARGS(mk_pmc_const_2)
     /* XXX This always returns NULL.  Probably shouldn't return anything then. */
     SymReg *r[3];
     char   *name;
@@ -705,7 +705,7 @@
 mk_const_ident(PARROT_INTERP, ARGIN(const char *name), int t,
         ARGMOD(SymReg *val), int global)
 {
-    ASSERT_ARGS(mk_const_ident);
+    ASSERT_ARGS(mk_const_ident)
     SymReg *r;
 
     /*
@@ -756,7 +756,7 @@
 SymReg *
 _mk_const(ARGMOD(SymHash *hsh), ARGIN(const char *name), int t)
 {
-    ASSERT_ARGS(_mk_const);
+    ASSERT_ARGS(_mk_const)
     SymReg * const r = _mk_symreg(hsh, name, t);
     r->type          = VTCONST;
 
@@ -780,7 +780,7 @@
 static int
 int_overflows(ARGIN(const SymReg *r))
 {
-    ASSERT_ARGS(int_overflows);
+    ASSERT_ARGS(int_overflows)
     INTVAL i;
     errno = 0;
 
@@ -818,7 +818,7 @@
 SymReg *
 mk_const(PARROT_INTERP, ARGIN(const char *name), int t)
 {
-    ASSERT_ARGS(mk_const);
+    ASSERT_ARGS(mk_const)
     SymHash * const h = &IMCC_INFO(interp)->ghash;
 
     if (!h->data)
@@ -844,7 +844,7 @@
 static char *
 add_ns(PARROT_INTERP, ARGIN(const char *name))
 {
-    ASSERT_ARGS(add_ns);
+    ASSERT_ARGS(add_ns)
     size_t len, l;
     char *ns_name, *p;
 
@@ -890,7 +890,7 @@
 SymReg *
 _mk_address(PARROT_INTERP, ARGMOD(SymHash *hsh), ARGIN(const char *name), int uniq)
 {
-    ASSERT_ARGS(_mk_address);
+    ASSERT_ARGS(_mk_address)
     SymReg *r;
 
     if (uniq == U_add_all) {
@@ -950,7 +950,7 @@
 SymReg *
 mk_sub_label(PARROT_INTERP, ARGIN(const char *name))
 {
-    ASSERT_ARGS(mk_sub_label);
+    ASSERT_ARGS(mk_sub_label)
     SymReg * const s = _mk_address(interp, &IMCC_INFO(interp)->ghash,
             name, U_add_uniq_sub);
 
@@ -975,7 +975,7 @@
 SymReg *
 mk_sub_address(PARROT_INTERP, ARGIN(const char *name))
 {
-    ASSERT_ARGS(mk_sub_address);
+    ASSERT_ARGS(mk_sub_address)
     SymReg * const s = _mk_address(interp, &IMCC_INFO(interp)->ghash,
             name, U_add_all);
 
@@ -1000,7 +1000,7 @@
 SymReg *
 mk_local_label(PARROT_INTERP, ARGIN(const char *name))
 {
-    ASSERT_ARGS(mk_local_label);
+    ASSERT_ARGS(mk_local_label)
     IMC_Unit * const unit = IMCC_INFO(interp)->last_unit;
     return _mk_address(interp, &unit->hash, name, U_add_uniq_label);
 }
@@ -1021,7 +1021,7 @@
 SymReg *
 mk_label_address(PARROT_INTERP, ARGIN(const char *name))
 {
-    ASSERT_ARGS(mk_label_address);
+    ASSERT_ARGS(mk_label_address)
     IMC_Unit * const unit = IMCC_INFO(interp)->last_unit;
     return _mk_address(interp, &unit->hash, name, U_add_once);
 }
@@ -1076,7 +1076,7 @@
 SymReg *
 dup_sym(ARGIN(const SymReg *r))
 {
-    ASSERT_ARGS(dup_sym);
+    ASSERT_ARGS(dup_sym)
     SymReg * const new_sym = mem_allocate_zeroed_typed(SymReg);
     STRUCT_COPY(new_sym, r);
     new_sym->name = str_dup(r->name);
@@ -1103,7 +1103,7 @@
 SymReg *
 link_keys(PARROT_INTERP, int nargs, ARGMOD(SymReg **keys), int force)
 {
-    ASSERT_ARGS(link_keys);
+    ASSERT_ARGS(link_keys)
     char   *key_str;
     SymReg *key;
     SymReg *keychain;
@@ -1198,7 +1198,7 @@
 void
 free_sym(ARGMOD(SymReg *r))
 {
-    ASSERT_ARGS(free_sym);
+    ASSERT_ARGS(free_sym)
     pcc_sub_t * const sub = r->pcc_sub;
 
     if (sub) {
@@ -1243,7 +1243,7 @@
 void
 create_symhash(ARGOUT(SymHash *hash))
 {
-    ASSERT_ARGS(create_symhash);
+    ASSERT_ARGS(create_symhash)
     hash->data    = mem_allocate_n_zeroed_typed(16, SymReg *);
     hash->size    = 16;
     hash->entries = 0;
@@ -1263,7 +1263,7 @@
 static void
 resize_symhash(ARGMOD(SymHash *hsh))
 {
-    ASSERT_ARGS(resize_symhash);
+    ASSERT_ARGS(resize_symhash)
     const int    new_size = hsh->size << 1; /* new size is twice as large */
     int          n_next   = 16;
     SymReg     **next_r   = mem_allocate_n_zeroed_typed(n_next, SymReg *);
@@ -1323,7 +1323,7 @@
 void
 _store_symreg(ARGMOD(SymHash *hsh), ARGMOD(SymReg *r))
 {
-    ASSERT_ARGS(_store_symreg);
+    ASSERT_ARGS(_store_symreg)
     const int i = hash_str(r->name) % hsh->size;
 #if IMC_TRACE_HIGH
     printf("    store [%s]\n", r->name);
@@ -1351,7 +1351,7 @@
 void
 store_symreg(PARROT_INTERP, ARGMOD(SymReg *r))
 {
-    ASSERT_ARGS(store_symreg);
+    ASSERT_ARGS(store_symreg)
     _store_symreg(&IMCC_INFO(interp)->cur_unit->hash, r);
 }
 
@@ -1371,7 +1371,7 @@
 SymReg *
 _get_sym(ARGIN(const SymHash *hsh), ARGIN(const char *name))
 {
-    ASSERT_ARGS(_get_sym);
+    ASSERT_ARGS(_get_sym)
     SymReg   *p;
     const unsigned int i = hash_str(name) % hsh->size;
 
@@ -1401,7 +1401,7 @@
 SymReg *
 get_sym(PARROT_INTERP, ARGIN(const char *name))
 {
-    ASSERT_ARGS(get_sym);
+    ASSERT_ARGS(get_sym)
     return _get_sym(&IMCC_INFO(interp)->cur_unit->hash, name);
 }
 
@@ -1422,7 +1422,7 @@
 _find_sym(PARROT_INTERP, ARGIN_NULLOK(const Namespace *nspace),
         ARGIN(const SymHash *hsh), ARGIN(const char *name))
 {
-    ASSERT_ARGS(_find_sym);
+    ASSERT_ARGS(_find_sym)
     const Namespace *ns;
     SymReg          *p;
 
@@ -1466,7 +1466,7 @@
 SymReg *
 find_sym(PARROT_INTERP, ARGIN(const char *name))
 {
-    ASSERT_ARGS(find_sym);
+    ASSERT_ARGS(find_sym)
     if (IMCC_INFO(interp)->cur_unit)
         return _find_sym(interp, _namespace,
             &IMCC_INFO(interp)->cur_unit->hash, name);
@@ -1488,7 +1488,7 @@
 void
 clear_sym_hash(ARGMOD(SymHash *hsh))
 {
-    ASSERT_ARGS(clear_sym_hash);
+    ASSERT_ARGS(clear_sym_hash)
     unsigned int i;
 
     if (!hsh->data)
@@ -1526,7 +1526,7 @@
 void
 debug_dump_sym_hash(ARGIN(const SymHash *hsh))
 {
-    ASSERT_ARGS(debug_dump_sym_hash);
+    ASSERT_ARGS(debug_dump_sym_hash)
     unsigned int i;
 
     for (i = 0; i < hsh->size; i++) {
@@ -1552,7 +1552,7 @@
 void
 clear_locals(ARGIN_NULLOK(IMC_Unit *unit))
 {
-    ASSERT_ARGS(clear_locals);
+    ASSERT_ARGS(clear_locals)
     SymHash * const hsh = &unit->hash;
     unsigned int    i;
 
@@ -1589,7 +1589,7 @@
 void
 clear_globals(PARROT_INTERP)
 {
-    ASSERT_ARGS(clear_globals);
+    ASSERT_ARGS(clear_globals)
     SymHash * const hsh = &IMCC_INFO(interp)->ghash;
 
     if (hsh->data)
@@ -1613,7 +1613,7 @@
 unsigned int
 hash_str(ARGIN(const char *str))
 {
-    ASSERT_ARGS(hash_str);
+    ASSERT_ARGS(hash_str)
     unsigned long  key = 0;
     const    char *s;
 

Modified: trunk/include/parrot/exceptions.h
==============================================================================
--- trunk/include/parrot/exceptions.h	(original)
+++ trunk/include/parrot/exceptions.h	Mon Jan  5 15:17:26 2009
@@ -282,7 +282,11 @@
 #  define PARROT_ASSERT_ARG(x) ((x) ? (0) : (Parrot_confess(#x, __FILE__, __LINE__), 0))
 #endif
 
-#define ASSERT_ARGS(a) ASSERT_ARGS_ ## a
+#ifdef _MSC_VER
+#  define ASSERT_ARGS(a)
+#else
+#  define ASSERT_ARGS(a) ASSERT_ARGS_ ## a ;
+#endif
 
 
 #endif /* PARROT_EXCEPTIONS_H_GUARD */

Modified: trunk/src/atomic/gcc_x86.c
==============================================================================
--- trunk/src/atomic/gcc_x86.c	(original)
+++ trunk/src/atomic/gcc_x86.c	Mon Jan  5 15:17:26 2009
@@ -51,7 +51,7 @@
 parrot_i386_cmpxchg(ARGMOD(void *volatile *ptr), ARGIN_NULLOK(void *expect),
                                         ARGIN_NULLOK(void *update))
 {
-    ASSERT_ARGS(parrot_i386_cmpxchg);
+    ASSERT_ARGS(parrot_i386_cmpxchg)
 #if defined(PARROT_HAS_X86_64_GCC_CMPXCHG)
     __asm__ __volatile__("lock\n"
                          "cmpxchgq %1,%2":"=a"(expect):"q"(update), "m"(*ptr),
@@ -84,7 +84,7 @@
 long
 parrot_i386_xadd(ARGIN(volatile long *l), long amount)
 {
-    ASSERT_ARGS(parrot_i386_xadd);
+    ASSERT_ARGS(parrot_i386_xadd)
     long result = amount;
 #if defined(PARROT_HAS_X86_64_GCC_CMPXCHG)
     __asm__ __volatile__("lock\n" "xaddq %0, %1" : "=r"(result), "=m"(*l) :

Modified: trunk/src/byteorder.c
==============================================================================
--- trunk/src/byteorder.c	(original)
+++ trunk/src/byteorder.c	Mon Jan  5 15:17:26 2009
@@ -47,7 +47,7 @@
 INTVAL
 fetch_iv_le(INTVAL w)
 {
-    ASSERT_ARGS(fetch_iv_le);
+    ASSERT_ARGS(fetch_iv_le)
 #if !PARROT_BIGENDIAN
     return w;
 #else
@@ -85,7 +85,7 @@
 INTVAL
 fetch_iv_be(INTVAL w)
 {
-    ASSERT_ARGS(fetch_iv_be);
+    ASSERT_ARGS(fetch_iv_be)
 #if PARROT_BIGENDIAN
     return w;
 #else
@@ -121,7 +121,7 @@
 opcode_t
 fetch_op_be(opcode_t w)
 {
-    ASSERT_ARGS(fetch_op_be);
+    ASSERT_ARGS(fetch_op_be)
 #if PARROT_BIGENDIAN
     return w;
 #else
@@ -159,7 +159,7 @@
 opcode_t
 fetch_op_le(opcode_t w)
 {
-    ASSERT_ARGS(fetch_op_le);
+    ASSERT_ARGS(fetch_op_le)
 #if !PARROT_BIGENDIAN
     return w;
 #else
@@ -207,7 +207,7 @@
 void
 fetch_buf_be_4(ARGOUT(unsigned char *rb), ARGIN(const unsigned char *b))
 {
-    ASSERT_ARGS(fetch_buf_be_4);
+    ASSERT_ARGS(fetch_buf_be_4)
 #if PARROT_BIGENDIAN
     memcpy(rb, b, 4);
 #else
@@ -231,7 +231,7 @@
 void
 fetch_buf_le_4(ARGOUT(unsigned char *rb), ARGIN(const unsigned char *b))
 {
-    ASSERT_ARGS(fetch_buf_le_4);
+    ASSERT_ARGS(fetch_buf_le_4)
 #if !PARROT_BIGENDIAN
     memcpy(rb, b, 4);
 #else
@@ -255,7 +255,7 @@
 void
 fetch_buf_be_8(ARGOUT(unsigned char *rb), ARGIN(const unsigned char *b))
 {
-    ASSERT_ARGS(fetch_buf_be_8);
+    ASSERT_ARGS(fetch_buf_be_8)
 #if PARROT_BIGENDIAN
     memcpy(rb, b, 8);
 #else
@@ -283,7 +283,7 @@
 void
 fetch_buf_le_8(ARGOUT(unsigned char *rb), ARGIN(const unsigned char *b))
 {
-    ASSERT_ARGS(fetch_buf_le_8);
+    ASSERT_ARGS(fetch_buf_le_8)
 #if !PARROT_BIGENDIAN
     memcpy(rb, b, 8);
 #else
@@ -311,7 +311,7 @@
 void
 fetch_buf_le_12(ARGOUT(unsigned char *rb), ARGIN(const unsigned char *b))
 {
-    ASSERT_ARGS(fetch_buf_le_12);
+    ASSERT_ARGS(fetch_buf_le_12)
 #if !PARROT_BIGENDIAN
     memcpy(rb, b, 12);
 #else
@@ -343,7 +343,7 @@
 void
 fetch_buf_be_12(ARGOUT(unsigned char *rb), ARGIN(const unsigned char *b))
 {
-    ASSERT_ARGS(fetch_buf_be_12);
+    ASSERT_ARGS(fetch_buf_be_12)
 #if PARROT_BIGENDIAN
     memcpy(rb, b, 12);
 #else
@@ -375,7 +375,7 @@
 void
 fetch_buf_le_16(ARGOUT(unsigned char *rb), ARGIN(const unsigned char *b))
 {
-    ASSERT_ARGS(fetch_buf_le_16);
+    ASSERT_ARGS(fetch_buf_le_16)
 #if !PARROT_BIGENDIAN
     memcpy(rb, b, 16);
 #else
@@ -411,7 +411,7 @@
 void
 fetch_buf_be_16(ARGOUT(unsigned char *rb), ARGIN(const unsigned char *b))
 {
-    ASSERT_ARGS(fetch_buf_be_16);
+    ASSERT_ARGS(fetch_buf_be_16)
 #if PARROT_BIGENDIAN
     memcpy(rb, b, 16);
 #else

Modified: trunk/src/charset.c
==============================================================================
--- trunk/src/charset.c	(original)
+++ trunk/src/charset.c	Mon Jan  5 15:17:26 2009
@@ -98,7 +98,7 @@
 CHARSET *
 Parrot_new_charset(SHIM_INTERP)
 {
-    ASSERT_ARGS(Parrot_new_charset);
+    ASSERT_ARGS(Parrot_new_charset)
     return mem_allocate_typed(CHARSET);
 }
 
@@ -117,7 +117,7 @@
 void
 Parrot_charsets_encodings_deinit(SHIM_INTERP)
 {
-    ASSERT_ARGS(Parrot_charsets_encodings_deinit);
+    ASSERT_ARGS(Parrot_charsets_encodings_deinit)
     int i;
     const int n = all_charsets->n_charsets;
 
@@ -149,7 +149,7 @@
 const CHARSET *
 Parrot_find_charset(SHIM_INTERP, ARGIN(const char *charsetname))
 {
-    ASSERT_ARGS(Parrot_find_charset);
+    ASSERT_ARGS(Parrot_find_charset)
     int i;
     const int n = all_charsets->n_charsets;
 
@@ -177,7 +177,7 @@
 CHARSET *
 Parrot_load_charset(PARROT_INTERP, ARGIN(const char *charsetname))
 {
-    ASSERT_ARGS(Parrot_load_charset);
+    ASSERT_ARGS(Parrot_load_charset)
     UNUSED(charsetname);
 
     Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_UNIMPLEMENTED,
@@ -199,7 +199,7 @@
 INTVAL
 Parrot_charset_number(PARROT_INTERP, ARGIN(const STRING *charsetname))
 {
-    ASSERT_ARGS(Parrot_charset_number);
+    ASSERT_ARGS(Parrot_charset_number)
     int i;
     const int n = all_charsets->n_charsets;
 
@@ -225,7 +225,7 @@
 INTVAL
 Parrot_charset_number_of_str(SHIM_INTERP, ARGIN(const STRING *src))
 {
-    ASSERT_ARGS(Parrot_charset_number_of_str);
+    ASSERT_ARGS(Parrot_charset_number_of_str)
     int i;
     const int n = all_charsets->n_charsets;
 
@@ -253,7 +253,7 @@
 STRING*
 Parrot_charset_name(SHIM_INTERP, INTVAL number_of_charset)
 {
-    ASSERT_ARGS(Parrot_charset_name);
+    ASSERT_ARGS(Parrot_charset_name)
     if (number_of_charset < 0 || number_of_charset >= all_charsets->n_charsets)
         return NULL;
     return all_charsets->set[number_of_charset].name;
@@ -275,7 +275,7 @@
 const CHARSET *
 Parrot_get_charset(SHIM_INTERP, INTVAL number_of_charset)
 {
-    ASSERT_ARGS(Parrot_get_charset);
+    ASSERT_ARGS(Parrot_get_charset)
     if (number_of_charset < 0 || number_of_charset >= all_charsets->n_charsets)
         return NULL;
     return all_charsets->set[number_of_charset].charset;
@@ -298,7 +298,7 @@
 const char *
 Parrot_charset_c_name(SHIM_INTERP, INTVAL number_of_charset)
 {
-    ASSERT_ARGS(Parrot_charset_c_name);
+    ASSERT_ARGS(Parrot_charset_c_name)
     if (number_of_charset < 0 || number_of_charset >= all_charsets->n_charsets)
         return NULL;
     return all_charsets->set[number_of_charset].charset->name;
@@ -320,7 +320,7 @@
 register_charset(PARROT_INTERP, ARGIN(const char *charsetname),
         ARGIN(CHARSET *charset))
 {
-    ASSERT_ARGS(register_charset);
+    ASSERT_ARGS(register_charset)
     int i;
     const int n = all_charsets->n_charsets;
 
@@ -364,7 +364,7 @@
 static void
 register_static_converters(PARROT_INTERP)
 {
-    ASSERT_ARGS(register_static_converters);
+    ASSERT_ARGS(register_static_converters)
     Parrot_register_charset_converter(interp,
             Parrot_iso_8859_1_charset_ptr, Parrot_ascii_charset_ptr,
             charset_cvt_iso_8859_1_to_ascii);
@@ -404,7 +404,7 @@
 Parrot_register_charset(PARROT_INTERP, ARGIN(const char *charsetname),
         ARGIN(CHARSET *charset))
 {
-    ASSERT_ARGS(Parrot_register_charset);
+    ASSERT_ARGS(Parrot_register_charset)
     if (!all_charsets) {
         all_charsets = mem_allocate_typed(All_charsets);
         all_charsets->n_charsets = 0;
@@ -447,7 +447,7 @@
 void
 Parrot_charsets_encodings_init(PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_charsets_encodings_init);
+    ASSERT_ARGS(Parrot_charsets_encodings_init)
     /* the order is crucial here:
      * 1) encodings, default = fixed_8
      * 2) charsets   default = ascii
@@ -487,7 +487,7 @@
 Parrot_make_default_charset(SHIM_INTERP, SHIM(const char *charsetname),
         ARGIN(CHARSET *charset))
 {
-    ASSERT_ARGS(Parrot_make_default_charset);
+    ASSERT_ARGS(Parrot_make_default_charset)
     Parrot_default_charset_ptr = charset;
     return 1;
 }
@@ -508,7 +508,7 @@
 const CHARSET *
 Parrot_default_charset(SHIM_INTERP)
 {
-    ASSERT_ARGS(Parrot_default_charset);
+    ASSERT_ARGS(Parrot_default_charset)
     return Parrot_default_charset_ptr;
 }
 
@@ -529,7 +529,7 @@
 Parrot_find_charset_converter(SHIM_INTERP,
         ARGIN(const CHARSET *lhs), ARGIN(const CHARSET *rhs))
 {
-    ASSERT_ARGS(Parrot_find_charset_converter);
+    ASSERT_ARGS(Parrot_find_charset_converter)
     int i;
     const int n = all_charsets->n_charsets;
 
@@ -564,7 +564,7 @@
         ARGIN(const CHARSET *lhs), ARGIN(CHARSET *rhs),
         ARGIN(charset_converter_t func))
 {
-    ASSERT_ARGS(Parrot_register_charset_converter);
+    ASSERT_ARGS(Parrot_register_charset_converter)
     int i;
     const int n = all_charsets->n_charsets;
 

Modified: trunk/src/charset/ascii.c
==============================================================================
--- trunk/src/charset/ascii.c	(original)
+++ trunk/src/charset/ascii.c	Mon Jan  5 15:17:26 2009
@@ -195,7 +195,7 @@
 ascii_get_graphemes(PARROT_INTERP, ARGIN(STRING *source_string),
         UINTVAL offset, UINTVAL count)
 {
-    ASSERT_ARGS(ascii_get_graphemes);
+    ASSERT_ARGS(ascii_get_graphemes)
     return ENCODING_GET_BYTES(interp, source_string, offset, count);
 }
 
@@ -214,7 +214,7 @@
 set_graphemes(PARROT_INTERP, ARGIN(STRING *source_string),
         UINTVAL offset, UINTVAL replace_count, ARGMOD(STRING *insert_string))
 {
-    ASSERT_ARGS(set_graphemes);
+    ASSERT_ARGS(set_graphemes)
     ENCODING_SET_BYTES(interp, source_string, offset,
             replace_count, insert_string);
 
@@ -238,7 +238,7 @@
 ascii_get_graphemes_inplace(PARROT_INTERP, ARGIN(STRING *source_string),
         UINTVAL offset, UINTVAL count, ARGMOD(STRING *dest_string))
 {
-    ASSERT_ARGS(ascii_get_graphemes_inplace);
+    ASSERT_ARGS(ascii_get_graphemes_inplace)
     return ENCODING_GET_BYTES_INPLACE(interp, source_string,
             offset, count, dest_string);
 }
@@ -258,7 +258,7 @@
 static STRING *
 to_ascii(PARROT_INTERP, ARGIN(STRING *src), ARGMOD_NULLOK(STRING *dest))
 {
-    ASSERT_ARGS(to_ascii);
+    ASSERT_ARGS(to_ascii)
     String_iter iter;
     UINTVAL offs;
     unsigned char *p;
@@ -301,7 +301,7 @@
 static STRING *
 to_unicode(PARROT_INTERP, ARGMOD(STRING *src), ARGMOD_NULLOK(STRING *dest))
 {
-    ASSERT_ARGS(to_unicode);
+    ASSERT_ARGS(to_unicode)
     if (dest) {
         dest->charset = Parrot_unicode_charset_ptr;
         dest->encoding = CHARSET_GET_PREFERRED_ENCODING(interp, dest);
@@ -329,7 +329,7 @@
 static STRING *
 to_charset(PARROT_INTERP, ARGIN(STRING *src), ARGIN_NULLOK(STRING *dest))
 {
-    ASSERT_ARGS(to_charset);
+    ASSERT_ARGS(to_charset)
     const charset_converter_t conversion_func =
         Parrot_find_charset_converter(interp, src->charset, Parrot_ascii_charset_ptr);
 
@@ -357,7 +357,7 @@
 static STRING*
 compose(PARROT_INTERP, ARGIN(STRING *src))
 {
-    ASSERT_ARGS(compose);
+    ASSERT_ARGS(compose)
     return string_copy(interp, src);
 }
 
@@ -377,7 +377,7 @@
 static STRING*
 decompose(PARROT_INTERP, ARGMOD(STRING *src))
 {
-    ASSERT_ARGS(decompose);
+    ASSERT_ARGS(decompose)
     return string_copy(interp, src);
 }
 
@@ -394,7 +394,7 @@
 static void
 upcase(SHIM_INTERP, ARGIN(STRING *source_string))
 {
-    ASSERT_ARGS(upcase);
+    ASSERT_ARGS(upcase)
     const UINTVAL n = source_string->strlen;
 
     if (n) {
@@ -420,7 +420,7 @@
 static void
 downcase(SHIM_INTERP, ARGIN(STRING *source_string))
 {
-    ASSERT_ARGS(downcase);
+    ASSERT_ARGS(downcase)
     const UINTVAL n = source_string->strlen;
 
     if (n) {
@@ -448,7 +448,7 @@
 static void
 titlecase(SHIM_INTERP, ARGIN(STRING *source_string))
 {
-    ASSERT_ARGS(titlecase);
+    ASSERT_ARGS(titlecase)
     const UINTVAL n = source_string->strlen;
 
     if (n) {
@@ -476,7 +476,7 @@
 static void
 upcase_first(SHIM_INTERP, ARGIN(STRING *source_string))
 {
-    ASSERT_ARGS(upcase_first);
+    ASSERT_ARGS(upcase_first)
     if (source_string->strlen) {
         char * const buffer = source_string->strstart;
         buffer[0] = (char)toupper((unsigned char)buffer[0]);
@@ -497,7 +497,7 @@
 static void
 downcase_first(SHIM_INTERP, ARGIN(STRING *source_string))
 {
-    ASSERT_ARGS(downcase_first);
+    ASSERT_ARGS(downcase_first)
     if (source_string->strlen) {
         char * const buffer = source_string->strstart;
         buffer[0] = (char)tolower((unsigned char)buffer[0]);
@@ -518,7 +518,7 @@
 static void
 titlecase_first(SHIM_INTERP, ARGMOD(STRING *source_string))
 {
-    ASSERT_ARGS(titlecase_first);
+    ASSERT_ARGS(titlecase_first)
     if (source_string->strlen) {
         char * const buffer = source_string->strstart;
         buffer[0] = (char)toupper((unsigned char)buffer[0]);
@@ -540,7 +540,7 @@
 INTVAL
 ascii_compare(PARROT_INTERP, ARGIN(const STRING *lhs), ARGIN(const STRING *rhs))
 {
-    ASSERT_ARGS(ascii_compare);
+    ASSERT_ARGS(ascii_compare)
     const UINTVAL l_len = lhs->strlen;
     const UINTVAL r_len = rhs->strlen;
     const UINTVAL min_len = l_len > r_len ? r_len : l_len;
@@ -589,7 +589,7 @@
 mixed_cs_index(PARROT_INTERP, ARGIN(STRING *src), ARGIN(STRING *search),
     UINTVAL offs)
 {
-    ASSERT_ARGS(mixed_cs_index);
+    ASSERT_ARGS(mixed_cs_index)
     String_iter src_iter, search_iter;
     UINTVAL len;
     INTVAL start;
@@ -636,7 +636,7 @@
 ascii_cs_index(PARROT_INTERP, ARGIN(STRING *source_string),
         ARGIN(STRING *search_string), UINTVAL offset)
 {
-    ASSERT_ARGS(ascii_cs_index);
+    ASSERT_ARGS(ascii_cs_index)
     INTVAL retval;
     if (source_string->charset != search_string->charset) {
         return mixed_cs_index(interp, source_string, search_string, offset);
@@ -664,7 +664,7 @@
 ascii_cs_rindex(PARROT_INTERP, ARGIN(STRING *source_string),
         ARGIN(STRING *search_string), UINTVAL offset)
 {
-    ASSERT_ARGS(ascii_cs_rindex);
+    ASSERT_ARGS(ascii_cs_rindex)
     INTVAL retval;
 
     if (source_string->charset != search_string->charset)
@@ -692,7 +692,7 @@
 static UINTVAL
 validate(PARROT_INTERP, ARGIN(STRING *src))
 {
-    ASSERT_ARGS(validate);
+    ASSERT_ARGS(validate)
     UINTVAL offset;
     String_iter iter;
 
@@ -721,7 +721,7 @@
 static STRING *
 string_from_codepoint(PARROT_INTERP, UINTVAL codepoint)
 {
-    ASSERT_ARGS(string_from_codepoint);
+    ASSERT_ARGS(string_from_codepoint)
     char real_codepoint = (char)codepoint;
     STRING * const return_string = string_make(interp, &real_codepoint, 1, "ascii", 0);
     return return_string;
@@ -741,7 +741,7 @@
 static INTVAL
 is_cclass(PARROT_INTERP, INTVAL flags, ARGIN(const STRING *source_string), UINTVAL offset)
 {
-    ASSERT_ARGS(is_cclass);
+    ASSERT_ARGS(is_cclass)
     UINTVAL codepoint;
 
     if (offset >= source_string->strlen)
@@ -770,7 +770,7 @@
 find_cclass(PARROT_INTERP, INTVAL flags, ARGIN(STRING *source_string),
             UINTVAL offset, UINTVAL count)
 {
-    ASSERT_ARGS(find_cclass);
+    ASSERT_ARGS(find_cclass)
     UINTVAL pos = offset;
     UINTVAL end = offset + count;
 
@@ -798,7 +798,7 @@
 find_not_cclass(PARROT_INTERP, INTVAL flags, ARGIN(STRING *source_string),
                 UINTVAL offset, UINTVAL count)
 {
-    ASSERT_ARGS(find_not_cclass);
+    ASSERT_ARGS(find_not_cclass)
     UINTVAL pos = offset;
     UINTVAL end = offset + count;
 
@@ -827,7 +827,7 @@
 size_t
 ascii_compute_hash(SHIM_INTERP, ARGIN(const STRING *source_string), size_t seed)
 {
-    ASSERT_ARGS(ascii_compute_hash);
+    ASSERT_ARGS(ascii_compute_hash)
     size_t hashval = seed;
     const char *buffptr = (const char *)source_string->strstart;
     UINTVAL len = source_string->strlen;
@@ -855,7 +855,7 @@
 const CHARSET *
 Parrot_charset_ascii_init(PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_charset_ascii_init);
+    ASSERT_ARGS(Parrot_charset_ascii_init)
     CHARSET * const return_set = Parrot_new_charset(interp);
     static const CHARSET base_set = {
         "ascii",
@@ -903,7 +903,7 @@
 STRING *
 charset_cvt_ascii_to_binary(PARROT_INTERP, ARGIN(STRING *src), ARGIN_NULLOK(STRING *dest))
 {
-    ASSERT_ARGS(charset_cvt_ascii_to_binary);
+    ASSERT_ARGS(charset_cvt_ascii_to_binary)
     if (dest) {
         UINTVAL offs;
 
@@ -935,7 +935,7 @@
 charset_cvt_ascii_to_iso_8859_1(PARROT_INTERP, ARGIN(STRING *src),
     ARGIN_NULLOK(STRING *dest))
 {
-    ASSERT_ARGS(charset_cvt_ascii_to_iso_8859_1);
+    ASSERT_ARGS(charset_cvt_ascii_to_iso_8859_1)
     if (dest) {
         UINTVAL offs;
 

Modified: trunk/src/charset/binary.c
==============================================================================
--- trunk/src/charset/binary.c	(original)
+++ trunk/src/charset/binary.c	Mon Jan  5 15:17:26 2009
@@ -164,7 +164,7 @@
 set_graphemes(PARROT_INTERP, ARGIN(STRING *source_string),
         UINTVAL offset, UINTVAL replace_count, ARGMOD(STRING *insert_string))
 {
-    ASSERT_ARGS(set_graphemes);
+    ASSERT_ARGS(set_graphemes)
     ENCODING_SET_BYTES(interp, source_string, offset,
             replace_count, insert_string);
 }
@@ -184,7 +184,7 @@
 static STRING*
 to_charset(PARROT_INTERP, ARGIN(STRING *src), ARGIN_NULLOK(STRING *dest))
 {
-    ASSERT_ARGS(to_charset);
+    ASSERT_ARGS(to_charset)
     charset_converter_t conversion_func =
         Parrot_find_charset_converter(interp, src->charset, Parrot_binary_charset_ptr);
 
@@ -210,7 +210,7 @@
 static STRING*
 compose(PARROT_INTERP, SHIM(STRING *source_string))
 {
-    ASSERT_ARGS(compose);
+    ASSERT_ARGS(compose)
     EXCEPTION(EXCEPTION_INVALID_CHARTYPE, "Can't compose binary data");
 }
 
@@ -229,7 +229,7 @@
 static STRING*
 decompose(PARROT_INTERP, SHIM(STRING *source_string))
 {
-    ASSERT_ARGS(decompose);
+    ASSERT_ARGS(decompose)
     EXCEPTION(EXCEPTION_INVALID_CHARTYPE, "Can't decompose binary data");
 }
 
@@ -247,7 +247,7 @@
 static void
 upcase(PARROT_INTERP, SHIM(STRING *source_string))
 {
-    ASSERT_ARGS(upcase);
+    ASSERT_ARGS(upcase)
     EXCEPTION(EXCEPTION_INVALID_CHARTYPE, "Can't upcase binary data");
 }
 
@@ -265,7 +265,7 @@
 static void
 downcase(PARROT_INTERP, SHIM(STRING *source_string))
 {
-    ASSERT_ARGS(downcase);
+    ASSERT_ARGS(downcase)
     EXCEPTION(EXCEPTION_INVALID_CHARTYPE, "Can't downcase binary data");
 }
 
@@ -283,7 +283,7 @@
 static void
 titlecase(PARROT_INTERP, SHIM(STRING *source_string))
 {
-    ASSERT_ARGS(titlecase);
+    ASSERT_ARGS(titlecase)
     EXCEPTION(EXCEPTION_INVALID_CHARTYPE, "Can't titlecase binary data");
 }
 
@@ -301,7 +301,7 @@
 static void
 upcase_first(PARROT_INTERP, SHIM(STRING *source_string))
 {
-    ASSERT_ARGS(upcase_first);
+    ASSERT_ARGS(upcase_first)
     EXCEPTION(EXCEPTION_INVALID_CHARTYPE, "Can't upcase binary data");
 }
 
@@ -319,7 +319,7 @@
 static void
 downcase_first(PARROT_INTERP, SHIM(STRING *source_string))
 {
-    ASSERT_ARGS(downcase_first);
+    ASSERT_ARGS(downcase_first)
     EXCEPTION(EXCEPTION_INVALID_CHARTYPE, "Can't downcase binary data");
 }
 
@@ -337,7 +337,7 @@
 static void
 titlecase_first(PARROT_INTERP, SHIM(STRING *source_string))
 {
-    ASSERT_ARGS(titlecase_first);
+    ASSERT_ARGS(titlecase_first)
     EXCEPTION(EXCEPTION_INVALID_CHARTYPE, "Can't titlecase binary data");
 }
 
@@ -354,7 +354,7 @@
 static INTVAL
 compare(SHIM_INTERP, SHIM(const STRING *lhs), SHIM(const STRING *rhs))
 {
-    ASSERT_ARGS(compare);
+    ASSERT_ARGS(compare)
     return 0;
 }
 
@@ -373,7 +373,7 @@
 cs_index(SHIM_INTERP, SHIM(STRING *source_string),
         SHIM(STRING *search_string), SHIM(UINTVAL offset))
 {
-    ASSERT_ARGS(cs_index);
+    ASSERT_ARGS(cs_index)
     return -1;
 }
 
@@ -392,7 +392,7 @@
 cs_rindex(SHIM_INTERP, SHIM(STRING *source_string),
         SHIM(STRING *search_string), SHIM(UINTVAL offset))
 {
-    ASSERT_ARGS(cs_rindex);
+    ASSERT_ARGS(cs_rindex)
     return -1;
 }
 
@@ -410,7 +410,7 @@
 static UINTVAL
 validate(SHIM_INTERP, SHIM(STRING *source_string))
 {
-    ASSERT_ARGS(validate);
+    ASSERT_ARGS(validate)
     return 1;
 }
 
@@ -428,7 +428,7 @@
 is_cclass(SHIM_INTERP, SHIM(INTVAL flags), SHIM(const STRING *source_string),
         SHIM(UINTVAL offset))
 {
-    ASSERT_ARGS(is_cclass);
+    ASSERT_ARGS(is_cclass)
     return 0;
 }
 
@@ -446,7 +446,7 @@
 find_cclass(SHIM_INTERP, SHIM(INTVAL flags),
             SHIM(STRING *source_string), UINTVAL offset, UINTVAL count)
 {
-    ASSERT_ARGS(find_cclass);
+    ASSERT_ARGS(find_cclass)
     return offset + count;
 }
 
@@ -464,7 +464,7 @@
 find_not_cclass(SHIM_INTERP, SHIM(INTVAL flags),
                SHIM(STRING *source_string), UINTVAL offset, UINTVAL count)
 {
-    ASSERT_ARGS(find_not_cclass);
+    ASSERT_ARGS(find_not_cclass)
     return offset + count;
 }
 
@@ -482,7 +482,7 @@
 static STRING *
 string_from_codepoint(PARROT_INTERP, UINTVAL codepoint)
 {
-    ASSERT_ARGS(string_from_codepoint);
+    ASSERT_ARGS(string_from_codepoint)
     STRING *return_string;
     char real_codepoint = (char)codepoint;
     return_string = string_make(interp, &real_codepoint, 1, "binary", 0);
@@ -505,7 +505,7 @@
 const CHARSET *
 Parrot_charset_binary_init(PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_charset_binary_init);
+    ASSERT_ARGS(Parrot_charset_binary_init)
     CHARSET * const return_set = Parrot_new_charset(interp);
     static const CHARSET base_set = {
         "binary",

Modified: trunk/src/charset/iso-8859-1.c
==============================================================================
--- trunk/src/charset/iso-8859-1.c	(original)
+++ trunk/src/charset/iso-8859-1.c	Mon Jan  5 15:17:26 2009
@@ -194,7 +194,7 @@
 set_graphemes(PARROT_INTERP, ARGIN(STRING *source_string),
         UINTVAL offset, UINTVAL replace_count, ARGMOD(STRING *insert_string))
 {
-    ASSERT_ARGS(set_graphemes);
+    ASSERT_ARGS(set_graphemes)
     ENCODING_SET_BYTES(interp, source_string, offset,
             replace_count, insert_string);
 }
@@ -213,7 +213,7 @@
 static STRING *
 to_latin1(PARROT_INTERP, ARGIN(STRING *src), ARGMOD_NULLOK(STRING *dest))
 {
-    ASSERT_ARGS(to_latin1);
+    ASSERT_ARGS(to_latin1)
     UINTVAL offs, src_len;
     String_iter iter;
 
@@ -255,7 +255,7 @@
 static STRING *
 to_unicode(PARROT_INTERP, ARGIN(STRING *src), ARGMOD_NULLOK(STRING *dest))
 {
-    ASSERT_ARGS(to_unicode);
+    ASSERT_ARGS(to_unicode)
     if (dest) {
         UINTVAL offs;
         String_iter iter;
@@ -299,7 +299,7 @@
 static STRING *
 to_charset(PARROT_INTERP, ARGIN(STRING *src), ARGIN_NULLOK(STRING *dest))
 {
-    ASSERT_ARGS(to_charset);
+    ASSERT_ARGS(to_charset)
     const charset_converter_t conversion_func =
         Parrot_find_charset_converter(interp, src->charset, Parrot_iso_8859_1_charset_ptr);
 
@@ -327,7 +327,7 @@
 static STRING*
 compose(PARROT_INTERP, ARGIN(STRING *src))
 {
-    ASSERT_ARGS(compose);
+    ASSERT_ARGS(compose)
     return string_copy(interp, src);
 }
 
@@ -345,7 +345,7 @@
 static STRING*
 decompose(PARROT_INTERP, SHIM(STRING *src))
 {
-    ASSERT_ARGS(decompose);
+    ASSERT_ARGS(decompose)
     Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_UNIMPLEMENTED,
             "decompose for iso-8859-1 not implemented");
 }
@@ -364,7 +364,7 @@
 static void
 upcase(PARROT_INTERP, ARGIN(STRING *source_string))
 {
-    ASSERT_ARGS(upcase);
+    ASSERT_ARGS(upcase)
     unsigned char *buffer;
     UINTVAL offset = 0;
 
@@ -397,7 +397,7 @@
 static void
 downcase(PARROT_INTERP, ARGIN(STRING *source_string))
 {
-    ASSERT_ARGS(downcase);
+    ASSERT_ARGS(downcase)
     if (source_string->strlen) {
         UINTVAL offset;
         unsigned char *buffer;
@@ -429,7 +429,7 @@
 static void
 titlecase(PARROT_INTERP, ARGIN(STRING *source_string))
 {
-    ASSERT_ARGS(titlecase);
+    ASSERT_ARGS(titlecase)
     unsigned char *buffer;
     unsigned int c;
     UINTVAL offset;
@@ -470,7 +470,7 @@
 static void
 upcase_first(PARROT_INTERP, ARGIN(STRING *source_string))
 {
-    ASSERT_ARGS(upcase_first);
+    ASSERT_ARGS(upcase_first)
     if (source_string->strlen) {
         unsigned char *buffer;
         unsigned int c;
@@ -500,7 +500,7 @@
 static void
 downcase_first(PARROT_INTERP, ARGIN(STRING *source_string))
 {
-    ASSERT_ARGS(downcase_first);
+    ASSERT_ARGS(downcase_first)
     if (source_string->strlen) {
         unsigned char *buffer;
         unsigned int c;
@@ -530,7 +530,7 @@
 static void
 titlecase_first(PARROT_INTERP, ARGIN(STRING *source_string))
 {
-    ASSERT_ARGS(titlecase_first);
+    ASSERT_ARGS(titlecase_first)
     upcase_first(interp, source_string);
 }
 
@@ -548,7 +548,7 @@
 static UINTVAL
 validate(PARROT_INTERP, ARGIN(STRING *src))
 {
-    ASSERT_ARGS(validate);
+    ASSERT_ARGS(validate)
     UINTVAL offset;
 
     for (offset = 0; offset < string_length(interp, src); ++offset) {
@@ -573,7 +573,7 @@
 is_cclass(PARROT_INTERP, INTVAL flags,
           ARGIN(const STRING *source_string), UINTVAL offset)
 {
-    ASSERT_ARGS(is_cclass);
+    ASSERT_ARGS(is_cclass)
     UINTVAL codepoint;
 
     if (offset >= source_string->strlen) return 0;
@@ -600,7 +600,7 @@
 find_cclass(PARROT_INTERP, INTVAL flags,
             ARGIN(STRING *source_string), UINTVAL offset, UINTVAL count)
 {
-    ASSERT_ARGS(find_cclass);
+    ASSERT_ARGS(find_cclass)
     UINTVAL pos = offset;
     UINTVAL end = offset + count;
     UINTVAL codepoint;
@@ -629,7 +629,7 @@
 find_not_cclass(PARROT_INTERP, INTVAL flags,
                 ARGIN(STRING *source_string), UINTVAL offset, UINTVAL count)
 {
-    ASSERT_ARGS(find_not_cclass);
+    ASSERT_ARGS(find_not_cclass)
     UINTVAL pos = offset;
     UINTVAL end = offset + count;
 
@@ -658,7 +658,7 @@
 static STRING *
 string_from_codepoint(PARROT_INTERP, UINTVAL codepoint)
 {
-    ASSERT_ARGS(string_from_codepoint);
+    ASSERT_ARGS(string_from_codepoint)
     char real_codepoint = (char)codepoint;
     STRING * const return_string = string_make(interp, &real_codepoint, 1,
             "iso-8859-1", 0);
@@ -679,7 +679,7 @@
 const CHARSET *
 Parrot_charset_iso_8859_1_init(PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_charset_iso_8859_1_init);
+    ASSERT_ARGS(Parrot_charset_iso_8859_1_init)
     CHARSET * const return_set = Parrot_new_charset(interp);
     static const CHARSET base_set = {
         "iso-8859-1",
@@ -729,7 +729,7 @@
 charset_cvt_iso_8859_1_to_ascii(PARROT_INTERP, ARGIN(STRING *src),
         ARGMOD_NULLOK(STRING *dest))
 {
-    ASSERT_ARGS(charset_cvt_iso_8859_1_to_ascii);
+    ASSERT_ARGS(charset_cvt_iso_8859_1_to_ascii)
     UINTVAL offs;
     if (dest) {
         Parrot_reallocate_string(interp, dest, src->strlen);

Modified: trunk/src/charset/unicode.c
==============================================================================
--- trunk/src/charset/unicode.c	(original)
+++ trunk/src/charset/unicode.c	Mon Jan  5 15:17:26 2009
@@ -238,7 +238,7 @@
 set_graphemes(PARROT_INTERP, ARGIN(STRING *source_string),
         UINTVAL offset, UINTVAL replace_count, ARGMOD(STRING *insert_string))
 {
-    ASSERT_ARGS(set_graphemes);
+    ASSERT_ARGS(set_graphemes)
     ENCODING_SET_CODEPOINTS(interp, source_string, offset,
             replace_count, insert_string);
 }
@@ -260,7 +260,7 @@
 get_graphemes(PARROT_INTERP, ARGIN(STRING *source_string),
         UINTVAL offset, UINTVAL count)
 {
-    ASSERT_ARGS(get_graphemes);
+    ASSERT_ARGS(get_graphemes)
     return ENCODING_GET_CODEPOINTS(interp, source_string, offset, count);
 }
 
@@ -281,7 +281,7 @@
 get_graphemes_inplace(PARROT_INTERP, ARGIN(STRING *source_string),
         UINTVAL offset, UINTVAL count, ARGMOD(STRING *dest_string))
 {
-    ASSERT_ARGS(get_graphemes_inplace);
+    ASSERT_ARGS(get_graphemes_inplace)
     return ENCODING_GET_CODEPOINTS_INPLACE(interp, source_string,
             offset, count, dest_string);
 }
@@ -301,7 +301,7 @@
 static STRING*
 to_charset(PARROT_INTERP, ARGIN(STRING *src), ARGIN_NULLOK(STRING *dest))
 {
-    ASSERT_ARGS(to_charset);
+    ASSERT_ARGS(to_charset)
     const charset_converter_t conversion_func =
             Parrot_find_charset_converter(interp, src->charset,
                     Parrot_unicode_charset_ptr);
@@ -330,7 +330,7 @@
 static STRING*
 compose(PARROT_INTERP, ARGIN(STRING *src))
 {
-    ASSERT_ARGS(compose);
+    ASSERT_ARGS(compose)
 #if PARROT_HAS_ICU
     STRING *dest;
     int src_len, dest_len;
@@ -390,7 +390,7 @@
 static STRING*
 decompose(PARROT_INTERP, SHIM(STRING *src))
 {
-    ASSERT_ARGS(decompose);
+    ASSERT_ARGS(decompose)
     /* TODO: RT #59696 Implement this. */
     UNIMPL;
 }
@@ -412,7 +412,7 @@
 static void
 upcase(PARROT_INTERP, ARGIN(STRING *src))
 {
-    ASSERT_ARGS(upcase);
+    ASSERT_ARGS(upcase)
 #if PARROT_HAS_ICU
 
     UErrorCode err;
@@ -506,7 +506,7 @@
 static void
 downcase(PARROT_INTERP, ARGIN(STRING *src))
 {
-    ASSERT_ARGS(downcase);
+    ASSERT_ARGS(downcase)
     if (src->bufused  == src->strlen
     &&  src->encoding == Parrot_utf8_encoding_ptr) {
         Parrot_ascii_charset_ptr->downcase(interp, src);
@@ -570,7 +570,7 @@
 static void
 titlecase(PARROT_INTERP, ARGIN(STRING *src))
 {
-    ASSERT_ARGS(titlecase);
+    ASSERT_ARGS(titlecase)
 #if PARROT_HAS_ICU
 
     UErrorCode err;
@@ -637,7 +637,7 @@
 static void
 upcase_first(PARROT_INTERP, SHIM(STRING *source_string))
 {
-    ASSERT_ARGS(upcase_first);
+    ASSERT_ARGS(upcase_first)
     /* TODO: RT #59696 Implement this. */
     UNIMPL;
 }
@@ -657,7 +657,7 @@
 static void
 downcase_first(PARROT_INTERP, SHIM(STRING *source_string))
 {
-    ASSERT_ARGS(downcase_first);
+    ASSERT_ARGS(downcase_first)
     /* TODO: RT #59696 Implement this. */
     UNIMPL;
 }
@@ -677,7 +677,7 @@
 static void
 titlecase_first(PARROT_INTERP, SHIM(STRING *source_string))
 {
-    ASSERT_ARGS(titlecase_first);
+    ASSERT_ARGS(titlecase_first)
     /* TODO: RT #59696 Implement this. */
     UNIMPL;
 }
@@ -697,7 +697,7 @@
 static INTVAL
 compare(PARROT_INTERP, ARGIN(const STRING *lhs), ARGIN(const STRING *rhs))
 {
-    ASSERT_ARGS(compare);
+    ASSERT_ARGS(compare)
     String_iter l_iter, r_iter;
     UINTVAL offs, cl, cr, min_len, l_len, r_len;
 
@@ -743,7 +743,7 @@
 cs_rindex(PARROT_INTERP, SHIM(STRING *source_string),
         SHIM(STRING *search_string), UINTVAL offset)
 {
-    ASSERT_ARGS(cs_rindex);
+    ASSERT_ARGS(cs_rindex)
     /* TODO: RT #59696 Implement this. */
     UNIMPL;
 }
@@ -762,7 +762,7 @@
 static UINTVAL
 validate(PARROT_INTERP, ARGIN(STRING *src))
 {
-    ASSERT_ARGS(validate);
+    ASSERT_ARGS(validate)
     UINTVAL     offset;
     String_iter iter;
 
@@ -793,7 +793,7 @@
 static int
 u_iscclass(PARROT_INTERP, UINTVAL codepoint, INTVAL flags)
 {
-    ASSERT_ARGS(u_iscclass);
+    ASSERT_ARGS(u_iscclass)
 #if PARROT_HAS_ICU
             /* XXX which one
                return u_charDigitValue(codepoint);
@@ -890,7 +890,7 @@
 is_cclass(PARROT_INTERP, INTVAL flags,
           ARGIN(const STRING *source_string), UINTVAL offset)
 {
-    ASSERT_ARGS(is_cclass);
+    ASSERT_ARGS(is_cclass)
     UINTVAL codepoint;
 
     if (offset >= source_string->strlen)
@@ -919,7 +919,7 @@
 find_cclass(PARROT_INTERP, INTVAL flags,
             ARGIN(STRING *source_string), UINTVAL offset, UINTVAL count)
 {
-    ASSERT_ARGS(find_cclass);
+    ASSERT_ARGS(find_cclass)
     String_iter iter;
     UINTVAL     codepoint;
     UINTVAL     pos = offset;
@@ -961,7 +961,7 @@
 find_not_cclass(PARROT_INTERP, INTVAL flags,
                 ARGIN(STRING *source_string), UINTVAL offset, UINTVAL count)
 {
-    ASSERT_ARGS(find_not_cclass);
+    ASSERT_ARGS(find_not_cclass)
     String_iter iter;
     UINTVAL     codepoint;
     UINTVAL     pos = offset;
@@ -1011,7 +1011,7 @@
 static STRING *
 string_from_codepoint(PARROT_INTERP, UINTVAL codepoint)
 {
-    ASSERT_ARGS(string_from_codepoint);
+    ASSERT_ARGS(string_from_codepoint)
     String_iter    iter;
     STRING * const dest = string_make(interp, "", 1, "unicode", 0);
 
@@ -1038,7 +1038,7 @@
 static size_t
 compute_hash(PARROT_INTERP, ARGIN(const STRING *src), size_t seed)
 {
-    ASSERT_ARGS(compute_hash);
+    ASSERT_ARGS(compute_hash)
     String_iter iter;
     UINTVAL     offs;
     size_t      hashval = seed;
@@ -1070,7 +1070,7 @@
 const CHARSET *
 Parrot_charset_unicode_init(PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_charset_unicode_init);
+    ASSERT_ARGS(Parrot_charset_unicode_init)
     CHARSET * const      return_set = Parrot_new_charset(interp);
     static const CHARSET base_set   = {
         "unicode",

Modified: trunk/src/cpu_dep.c
==============================================================================
--- trunk/src/cpu_dep.c	(original)
+++ trunk/src/cpu_dep.c	Mon Jan  5 15:17:26 2009
@@ -64,7 +64,7 @@
 void
 trace_system_areas(PARROT_INTERP)
 {
-    ASSERT_ARGS(trace_system_areas);
+    ASSERT_ARGS(trace_system_areas)
     {
 #if defined(__sparc)
         /* Flush the register windows. For sparc systems, we use hand-coded
@@ -152,7 +152,7 @@
 static void
 trace_system_stack(PARROT_INTERP)
 {
-    ASSERT_ARGS(trace_system_stack);
+    ASSERT_ARGS(trace_system_stack)
     /* Create a local variable on the system stack. This represents the
        "top" of the stack. A value stored in interp->lo_var_ptr represents
        the "bottom" of the stack. We must trace the entire area between the

Modified: trunk/src/datatypes.c
==============================================================================
--- trunk/src/datatypes.c	(original)
+++ trunk/src/datatypes.c	Mon Jan  5 15:17:26 2009
@@ -40,7 +40,7 @@
 INTVAL
 Parrot_get_datatype_enum(PARROT_INTERP, ARGIN(const STRING *type_name))
 {
-    ASSERT_ARGS(Parrot_get_datatype_enum);
+    ASSERT_ARGS(Parrot_get_datatype_enum)
     char * const type = string_to_cstring(interp, type_name);
     int i;
 
@@ -72,7 +72,7 @@
 STRING *
 Parrot_get_datatype_name(PARROT_INTERP, INTVAL type)
 {
-    ASSERT_ARGS(Parrot_get_datatype_name);
+    ASSERT_ARGS(Parrot_get_datatype_name)
     const char * const s =
         (type < enum_first_type || type >= enum_last_type)
             ? "illegal"

Modified: trunk/src/debug.c
==============================================================================
--- trunk/src/debug.c	(original)
+++ trunk/src/debug.c	Mon Jan  5 15:17:26 2009
@@ -400,7 +400,7 @@
 static void
 dbg_break(ARGIN(PDB_t * pdb), ARGIN(const char * cmd))
 {
-    ASSERT_ARGS(dbg_break);
+    ASSERT_ARGS(dbg_break)
     TRACEDEB_MSG("dbg_break");
 
     PDB_set_break(pdb->debugee, cmd);
@@ -409,7 +409,7 @@
 static void
 dbg_continue(ARGIN(PDB_t * pdb), ARGIN(const char * cmd))
 {
-    ASSERT_ARGS(dbg_continue);
+    ASSERT_ARGS(dbg_continue)
     TRACEDEB_MSG("dbg_continue");
 
     PDB_continue(pdb->debugee, cmd);
@@ -418,7 +418,7 @@
 static void
 dbg_delete(ARGIN(PDB_t * pdb), ARGIN(const char * cmd))
 {
-    ASSERT_ARGS(dbg_delete);
+    ASSERT_ARGS(dbg_delete)
     TRACEDEB_MSG("dbg_delete");
 
     PDB_delete_breakpoint(pdb->debugee, cmd);
@@ -427,7 +427,7 @@
 static void
 dbg_disable(ARGIN(PDB_t * pdb), ARGIN(const char * cmd))
 {
-    ASSERT_ARGS(dbg_disable);
+    ASSERT_ARGS(dbg_disable)
     TRACEDEB_MSG("dbg_disable");
 
     PDB_disable_breakpoint(pdb->debugee, cmd);
@@ -436,7 +436,7 @@
 static void
 dbg_disassemble(ARGIN(PDB_t * pdb), ARGIN(const char * cmd))
 {
-    ASSERT_ARGS(dbg_disassemble);
+    ASSERT_ARGS(dbg_disassemble)
     TRACEDEB_MSG("dbg_disassemble");
 
     PDB_disassemble(pdb->debugee, cmd);
@@ -445,7 +445,7 @@
 static void
 dbg_echo(ARGMOD(PDB_t * pdb), SHIM(const char * cmd))
 {
-    ASSERT_ARGS(dbg_echo);
+    ASSERT_ARGS(dbg_echo)
     TRACEDEB_MSG("dbg_echo");
 
     if (pdb->state & PDB_ECHO) {
@@ -461,21 +461,21 @@
 static void
 dbg_enable(ARGIN(PDB_t * pdb), ARGIN(const char * cmd))
 {
-    ASSERT_ARGS(dbg_enable);
+    ASSERT_ARGS(dbg_enable)
     PDB_enable_breakpoint(pdb->debugee, cmd);
 }
 
 static void
 dbg_eval(ARGIN(PDB_t * pdb), ARGIN(const char * cmd))
 {
-    ASSERT_ARGS(dbg_eval);
+    ASSERT_ARGS(dbg_eval)
     PDB_eval(pdb->debugee, cmd);
 }
 
 static void
 dbg_gcdebug(ARGMOD(PDB_t * pdb), SHIM(const char * cmd))
 {
-    ASSERT_ARGS(dbg_gcdebug);
+    ASSERT_ARGS(dbg_gcdebug)
     TRACEDEB_MSG("dbg_gcdebug");
 
     if (pdb->state & PDB_GCDEBUG) {
@@ -491,7 +491,7 @@
 static void
 dbg_help(ARGIN(PDB_t * pdb), ARGIN(const char * cmd))
 {
-    ASSERT_ARGS(dbg_help);
+    ASSERT_ARGS(dbg_help)
     TRACEDEB_MSG("dbg_help");
 
     PDB_help(pdb->debugee, cmd);
@@ -500,7 +500,7 @@
 static void
 dbg_info(ARGIN(PDB_t * pdb), SHIM(const char * cmd))
 {
-    ASSERT_ARGS(dbg_info);
+    ASSERT_ARGS(dbg_info)
     TRACEDEB_MSG("dbg_info");
 
     PDB_info(pdb->debugger);
@@ -509,7 +509,7 @@
 static void
 dbg_list(ARGIN(PDB_t * pdb), ARGIN(const char * cmd))
 {
-    ASSERT_ARGS(dbg_list);
+    ASSERT_ARGS(dbg_list)
     TRACEDEB_MSG("dbg_list");
 
     PDB_list(pdb->debugee, cmd);
@@ -518,7 +518,7 @@
 static void
 dbg_load(ARGIN(PDB_t * pdb), ARGIN(const char * cmd))
 {
-    ASSERT_ARGS(dbg_load);
+    ASSERT_ARGS(dbg_load)
     TRACEDEB_MSG("dbg_load");
 
     PDB_load_source(pdb->debugee, cmd);
@@ -527,7 +527,7 @@
 static void
 dbg_next(ARGIN(PDB_t * pdb), ARGIN(const char * cmd))
 {
-    ASSERT_ARGS(dbg_next);
+    ASSERT_ARGS(dbg_next)
     TRACEDEB_MSG("dbg_next");
 
     PDB_next(pdb->debugee, cmd);
@@ -536,7 +536,7 @@
 static void
 dbg_print(ARGIN(PDB_t * pdb), ARGIN(const char * cmd))
 {
-    ASSERT_ARGS(dbg_print);
+    ASSERT_ARGS(dbg_print)
     TRACEDEB_MSG("dbg_print");
 
     PDB_print(pdb->debugee, cmd);
@@ -545,7 +545,7 @@
 static void
 dbg_quit(ARGMOD(PDB_t * pdb), SHIM(const char * cmd))
 {
-    ASSERT_ARGS(dbg_quit);
+    ASSERT_ARGS(dbg_quit)
     TRACEDEB_MSG("dbg_quit");
 
     pdb->state |= PDB_EXIT;
@@ -555,7 +555,7 @@
 static void
 dbg_run(ARGIN(PDB_t * pdb), ARGIN(const char * cmd))
 {
-    ASSERT_ARGS(dbg_run);
+    ASSERT_ARGS(dbg_run)
     TRACEDEB_MSG("dbg_run");
 
     PDB_init(pdb->debugee, cmd);
@@ -565,7 +565,7 @@
 static void
 dbg_script(ARGIN(PDB_t * pdb), ARGIN(const char * cmd))
 {
-    ASSERT_ARGS(dbg_script);
+    ASSERT_ARGS(dbg_script)
     TRACEDEB_MSG("dbg_script");
 
     PDB_script_file(pdb->debugee, cmd);
@@ -574,7 +574,7 @@
 static void
 dbg_stack(ARGIN(PDB_t * pdb), SHIM(const char * cmd))
 {
-    ASSERT_ARGS(dbg_stack);
+    ASSERT_ARGS(dbg_stack)
     TRACEDEB_MSG("dbg_stack");
 
     PDB_backtrace(pdb->debugee);
@@ -583,7 +583,7 @@
 static void
 dbg_trace(ARGIN(PDB_t * pdb), ARGIN(const char * cmd))
 {
-    ASSERT_ARGS(dbg_trace);
+    ASSERT_ARGS(dbg_trace)
     TRACEDEB_MSG("dbg_trace");
 
     PDB_trace(pdb->debugee, cmd);
@@ -592,7 +592,7 @@
 static void
 dbg_watch(ARGIN(PDB_t * pdb), ARGIN(const char * cmd))
 {
-    ASSERT_ARGS(dbg_watch);
+    ASSERT_ARGS(dbg_watch)
     TRACEDEB_MSG("dbg_watch");
 
     PDB_watchpoint(pdb->debugee, cmd);
@@ -731,7 +731,7 @@
 static const struct DebuggerCmd_t *
 get_command(unsigned long cmdhash)
 {
-    ASSERT_ARGS(get_command);
+    ASSERT_ARGS(get_command)
     switch ((enum DebugCmd)cmdhash) {
         case debug_cmd_break:
             return & cmd_break;
@@ -799,7 +799,7 @@
 static const char *
 skip_whitespace(ARGIN(const char *cmd))
 {
-    ASSERT_ARGS(skip_whitespace);
+    ASSERT_ARGS(skip_whitespace)
     while (isspace((unsigned char)*cmd))
         ++cmd;
     return cmd;
@@ -809,7 +809,7 @@
 static unsigned long
 get_uint(ARGMOD(const char **cmd), unsigned int def)
 {
-    ASSERT_ARGS(get_uint);
+    ASSERT_ARGS(get_uint)
     char *cmdnext;
     unsigned int result = strtoul(skip_whitespace(* cmd), & cmdnext, 0);
     if (cmdnext != *cmd)
@@ -823,7 +823,7 @@
 static unsigned long
 get_ulong(ARGMOD(const char **cmd), unsigned long def)
 {
-    ASSERT_ARGS(get_ulong);
+    ASSERT_ARGS(get_ulong)
     char *cmdnext;
     unsigned long result = strtoul(skip_whitespace(* cmd), & cmdnext, 0);
     if (cmdnext != * cmd)
@@ -846,7 +846,7 @@
 static void
 chop_newline(ARGMOD(char * buf))
 {
-    ASSERT_ARGS(chop_newline);
+    ASSERT_ARGS(chop_newline)
     size_t l;
     l = strlen(buf);
     if (l > 0 && buf [l - 1] == '\n')
@@ -870,7 +870,7 @@
 static const char *
 nextarg(ARGIN_NULLOK(const char *command))
 {
-    ASSERT_ARGS(nextarg);
+    ASSERT_ARGS(nextarg)
     /* as long as the character pointed to by command is not NULL,
      * and it is either alphanumeric, a comma or a closing bracket,
      * continue looking for the next argument.
@@ -901,7 +901,7 @@
 static const char *
 skip_command(ARGIN(const char *str))
 {
-    ASSERT_ARGS(skip_command);
+    ASSERT_ARGS(skip_command)
     /* while str is not null and it contains a command (no spaces),
      * skip the character
      */
@@ -928,7 +928,7 @@
 static const char *
 parse_int(ARGIN(const char *str), ARGOUT(int *intP))
 {
-    ASSERT_ARGS(parse_int);
+    ASSERT_ARGS(parse_int)
     char *end;
 
     *intP = strtol(str, &end, 0);
@@ -953,7 +953,7 @@
 static const char *
 parse_string(PARROT_INTERP, ARGIN(const char *str), ARGOUT(STRING **strP))
 {
-    ASSERT_ARGS(parse_string);
+    ASSERT_ARGS(parse_string)
     const char *string_start;
 
     /* if this is not a quoted string, there's nothing to parse */
@@ -1001,7 +1001,7 @@
 static const char*
 parse_key(PARROT_INTERP, ARGIN(const char *str), ARGOUT(PMC **keyP))
 {
-    ASSERT_ARGS(parse_key);
+    ASSERT_ARGS(parse_key)
     /* clear output parameter */
     *keyP = NULL;
 
@@ -1054,7 +1054,7 @@
 static const char *
 parse_command(ARGIN(const char *command), ARGOUT(unsigned long *cmdP))
 {
-    ASSERT_ARGS(parse_command);
+    ASSERT_ARGS(parse_command)
     int           i;
     unsigned long c = 0;
 
@@ -1094,7 +1094,7 @@
 static void
 debugger_cmdline(PARROT_INTERP)
 {
-    ASSERT_ARGS(debugger_cmdline);
+    ASSERT_ARGS(debugger_cmdline)
     TRACEDEB_MSG("debugger_cmdline");
 
     /*while (!(interp->pdb->state & PDB_EXIT)) {*/
@@ -1124,7 +1124,7 @@
 static void
 close_script_file(PARROT_INTERP)
 {
-    ASSERT_ARGS(close_script_file);
+    ASSERT_ARGS(close_script_file)
     TRACEDEB_MSG("Closing debugger script file");
     if (interp->pdb->script_file) {
         fclose(interp->pdb->script_file);
@@ -1149,7 +1149,7 @@
 void
 Parrot_debugger_init(PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_debugger_init);
+    ASSERT_ARGS(Parrot_debugger_init)
     TRACEDEB_MSG("Parrot_debugger_init");
 
     if (! interp->pdb) {
@@ -1184,7 +1184,7 @@
 void
 Parrot_debugger_destroy(PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_debugger_destroy);
+    ASSERT_ARGS(Parrot_debugger_destroy)
     /* Unfinished.
        Free all debugger allocated resources.
      */
@@ -1216,7 +1216,7 @@
 void
 Parrot_debugger_load(PARROT_INTERP, ARGIN_NULLOK(STRING *filename))
 {
-    ASSERT_ARGS(Parrot_debugger_load);
+    ASSERT_ARGS(Parrot_debugger_load)
     char *file;
 
     TRACEDEB_MSG("Parrot_debugger_load");
@@ -1243,7 +1243,7 @@
 void
 Parrot_debugger_start(PARROT_INTERP, ARGIN(opcode_t * cur_opcode))
 {
-    ASSERT_ARGS(Parrot_debugger_start);
+    ASSERT_ARGS(Parrot_debugger_start)
     TRACEDEB_MSG("Parrot_debugger_start");
 
     if (!interp->pdb)
@@ -1292,7 +1292,7 @@
 void
 Parrot_debugger_break(PARROT_INTERP, ARGIN(opcode_t * cur_opcode))
 {
-    ASSERT_ARGS(Parrot_debugger_break);
+    ASSERT_ARGS(Parrot_debugger_break)
     TRACEDEB_MSG("Parrot_debugger_break");
 
     if (!interp->pdb)
@@ -1347,7 +1347,7 @@
 void
 PDB_get_command(PARROT_INTERP)
 {
-    ASSERT_ARGS(PDB_get_command);
+    ASSERT_ARGS(PDB_get_command)
     unsigned int  i;
     int           ch;
     char         *c;
@@ -1436,7 +1436,7 @@
 void
 PDB_script_file(PARROT_INTERP, ARGIN(const char *command))
 {
-    ASSERT_ARGS(PDB_script_file);
+    ASSERT_ARGS(PDB_script_file)
     FILE *fd;
 
     TRACEDEB_MSG("PDB_script_file");
@@ -1474,7 +1474,7 @@
 int
 PDB_run_command(PARROT_INTERP, ARGIN(const char *command))
 {
-    ASSERT_ARGS(PDB_run_command);
+    ASSERT_ARGS(PDB_run_command)
     unsigned long c;
     PDB_t        * const pdb = interp->pdb;
     const DebuggerCmd *cmd;
@@ -1529,7 +1529,7 @@
 void
 PDB_next(PARROT_INTERP, ARGIN_NULLOK(const char *command))
 {
-    ASSERT_ARGS(PDB_next);
+    ASSERT_ARGS(PDB_next)
     unsigned long  n;
     PDB_t  * const pdb = interp->pdb;
     Interp *debugee;
@@ -1592,7 +1592,7 @@
 void
 PDB_trace(PARROT_INTERP, ARGIN_NULLOK(const char *command))
 {
-    ASSERT_ARGS(PDB_trace);
+    ASSERT_ARGS(PDB_trace)
     unsigned long  n;
     PDB_t *  const pdb = interp->pdb;
     Interp        *debugee;
@@ -1640,7 +1640,7 @@
 static unsigned short
 condition_regtype(ARGIN(const char *cmd))
 {
-    ASSERT_ARGS(condition_regtype);
+    ASSERT_ARGS(condition_regtype)
     switch (*cmd) {
         case 'i':
         case 'I':
@@ -1673,7 +1673,7 @@
 PDB_condition_t *
 PDB_cond(PARROT_INTERP, ARGIN(const char *command))
 {
-    ASSERT_ARGS(PDB_cond);
+    ASSERT_ARGS(PDB_cond)
     PDB_condition_t *condition;
     const char      *auxcmd;
     char             str[DEBUG_CMD_BUFFER_LENGTH + 1];
@@ -1842,7 +1842,7 @@
 void
 PDB_watchpoint(PARROT_INTERP, ARGIN(const char *command))
 {
-    ASSERT_ARGS(PDB_watchpoint);
+    ASSERT_ARGS(PDB_watchpoint)
     PDB_t           * const pdb = interp->pdb;
     PDB_condition_t * const condition = PDB_cond(interp, command);
 
@@ -1869,7 +1869,7 @@
 void
 PDB_set_break(PARROT_INTERP, ARGIN_NULLOK(const char *command))
 {
-    ASSERT_ARGS(PDB_set_break);
+    ASSERT_ARGS(PDB_set_break)
     PDB_t            * const pdb      = interp->pdb;
     PDB_breakpoint_t *newbreak;
     PDB_breakpoint_t **lbreak;
@@ -1993,7 +1993,7 @@
 void
 PDB_init(PARROT_INTERP, SHIM(const char *command))
 {
-    ASSERT_ARGS(PDB_init);
+    ASSERT_ARGS(PDB_init)
     PDB_t * const pdb = interp->pdb;
 
     /* Restart if we are already running */
@@ -2018,7 +2018,7 @@
 void
 PDB_continue(PARROT_INTERP, ARGIN_NULLOK(const char *command))
 {
-    ASSERT_ARGS(PDB_continue);
+    ASSERT_ARGS(PDB_continue)
     PDB_t * const pdb = interp->pdb;
     unsigned long ln = 0;
 
@@ -2077,7 +2077,7 @@
 PDB_breakpoint_t *
 PDB_find_breakpoint(PARROT_INTERP, ARGIN(const char *command))
 {
-    ASSERT_ARGS(PDB_find_breakpoint);
+    ASSERT_ARGS(PDB_find_breakpoint)
     const char *oldcmd = command;
     const unsigned long n = get_ulong(&command, 0);
     if (command != oldcmd) {
@@ -2117,7 +2117,7 @@
 void
 PDB_disable_breakpoint(PARROT_INTERP, ARGIN(const char *command))
 {
-    ASSERT_ARGS(PDB_disable_breakpoint);
+    ASSERT_ARGS(PDB_disable_breakpoint)
     PDB_breakpoint_t * const breakpoint = PDB_find_breakpoint(interp, command);
 
     /* if the breakpoint exists, disable it. */
@@ -2139,7 +2139,7 @@
 void
 PDB_enable_breakpoint(PARROT_INTERP, ARGIN(const char *command))
 {
-    ASSERT_ARGS(PDB_enable_breakpoint);
+    ASSERT_ARGS(PDB_enable_breakpoint)
     PDB_breakpoint_t * const breakpoint = PDB_find_breakpoint(interp, command);
 
     /* if the breakpoint exists, and it was disabled, enable it. */
@@ -2160,7 +2160,7 @@
 void
 PDB_delete_breakpoint(PARROT_INTERP, ARGIN(const char *command))
 {
-    ASSERT_ARGS(PDB_delete_breakpoint);
+    ASSERT_ARGS(PDB_delete_breakpoint)
     PDB_breakpoint_t * const breakpoint = PDB_find_breakpoint(interp, command);
 
     if (breakpoint) {
@@ -2209,7 +2209,7 @@
 void
 PDB_delete_condition(SHIM_INTERP, ARGMOD(PDB_breakpoint_t *breakpoint))
 {
-    ASSERT_ARGS(PDB_delete_condition);
+    ASSERT_ARGS(PDB_delete_condition)
     if (breakpoint->condition->value) {
         if (breakpoint->condition->type & PDB_cond_str) {
             /* 'value' is a string, so we need to be careful */
@@ -2242,7 +2242,7 @@
 void
 PDB_skip_breakpoint(PARROT_INTERP, unsigned long i)
 {
-    ASSERT_ARGS(PDB_skip_breakpoint);
+    ASSERT_ARGS(PDB_skip_breakpoint)
 #if TRACE_DEBUGGER
         fprintf(stderr, "PDB_skip_breakpoint: %li\n", i);
 #endif
@@ -2263,7 +2263,7 @@
 char
 PDB_program_end(PARROT_INTERP)
 {
-    ASSERT_ARGS(PDB_program_end);
+    ASSERT_ARGS(PDB_program_end)
     PDB_t * const pdb = interp->pdb;
 
     TRACEDEB_MSG("PDB_program_end");
@@ -2289,7 +2289,7 @@
 char
 PDB_check_condition(PARROT_INTERP, ARGIN(const PDB_condition_t *condition))
 {
-    ASSERT_ARGS(PDB_check_condition);
+    ASSERT_ARGS(PDB_check_condition)
     Parrot_Context *ctx = CONTEXT(interp);
 
     TRACEDEB_MSG("PDB_check_condition");
@@ -2400,7 +2400,7 @@
 static PDB_breakpoint_t *
 current_breakpoint(ARGIN(PDB_t * pdb))
 {
-    ASSERT_ARGS(current_breakpoint);
+    ASSERT_ARGS(current_breakpoint)
     PDB_breakpoint_t *breakpoint = pdb->breakpoint;
     while (breakpoint) {
         if (pdb->cur_opcode == breakpoint->pc)
@@ -2424,7 +2424,7 @@
 char
 PDB_break(PARROT_INTERP)
 {
-    ASSERT_ARGS(PDB_break);
+    ASSERT_ARGS(PDB_break)
     PDB_t            * const pdb = interp->pdb;
     PDB_condition_t  *watchpoint = pdb->watchpoint;
     PDB_breakpoint_t *breakpoint;
@@ -2496,7 +2496,7 @@
 char *
 PDB_escape(ARGIN(const char *string), UINTVAL length)
 {
-    ASSERT_ARGS(PDB_escape);
+    ASSERT_ARGS(PDB_escape)
     const char *end;
     char       *_new, *fill;
 
@@ -2563,7 +2563,7 @@
 int
 PDB_unescape(ARGMOD(char *string))
 {
-    ASSERT_ARGS(PDB_unescape);
+    ASSERT_ARGS(PDB_unescape)
     int l = 0;
 
     for (; *string; string++) {
@@ -2621,7 +2621,7 @@
         ARGMOD_NULLOK(PDB_file_t *file), ARGIN_NULLOK(const opcode_t *code_start),
         int full_name)
 {
-    ASSERT_ARGS(PDB_disassemble_op);
+    ASSERT_ARGS(PDB_disassemble_op)
     int         j;
     size_t     size = 0;
     int        specialop = 0;
@@ -2928,7 +2928,7 @@
 void
 PDB_disassemble(PARROT_INTERP, SHIM(const char *command))
 {
-    ASSERT_ARGS(PDB_disassemble);
+    ASSERT_ARGS(PDB_disassemble)
     PDB_t    * const pdb = interp->pdb;
     opcode_t * pc        = interp->code->base.data;
 
@@ -3031,7 +3031,7 @@
 PDB_add_label(ARGMOD(PDB_file_t *file), ARGIN(const opcode_t *cur_opcode),
         opcode_t offset)
 {
-    ASSERT_ARGS(PDB_add_label);
+    ASSERT_ARGS(PDB_add_label)
     PDB_label_t *_new;
     PDB_label_t *label = file->label;
 
@@ -3076,7 +3076,7 @@
 void
 PDB_free_file(SHIM_INTERP, ARGIN_NULLOK(PDB_file_t *file))
 {
-    ASSERT_ARGS(PDB_free_file);
+    ASSERT_ARGS(PDB_free_file)
     while (file) {
         /* Free all of the allocated line structures */
         PDB_line_t  *line = file->line;
@@ -3126,7 +3126,7 @@
 void
 PDB_load_source(PARROT_INTERP, ARGIN(const char *command))
 {
-    ASSERT_ARGS(PDB_load_source);
+    ASSERT_ARGS(PDB_load_source)
     FILE          *file;
     char           f[DEBUG_CMD_BUFFER_LENGTH + 1];
     int            i, j, c;
@@ -3243,7 +3243,7 @@
 char
 PDB_hasinstruction(ARGIN(const char *c))
 {
-    ASSERT_ARGS(PDB_hasinstruction);
+    ASSERT_ARGS(PDB_hasinstruction)
     char h = 0;
 
     /* as long as c is not NULL, we're not looking at a comment (#...) or a '\n'... */
@@ -3277,7 +3277,7 @@
 void
 PDB_list(PARROT_INTERP, ARGIN(const char *command))
 {
-    ASSERT_ARGS(PDB_list);
+    ASSERT_ARGS(PDB_list)
     char          *c;
     unsigned long  line_number;
     unsigned long  i;
@@ -3345,7 +3345,7 @@
 void
 PDB_eval(PARROT_INTERP, ARGIN(const char *command))
 {
-    ASSERT_ARGS(PDB_eval);
+    ASSERT_ARGS(PDB_eval)
     /* This code is almost certainly wrong. The Parrot debugger needs love. */
     opcode_t *run = PDB_compile(interp, command);
 
@@ -3372,7 +3372,7 @@
 opcode_t *
 PDB_compile(PARROT_INTERP, ARGIN(const char *command))
 {
-    ASSERT_ARGS(PDB_compile);
+    ASSERT_ARGS(PDB_compile)
     STRING     *buf;
     const char *end      = "\nend\n";
     STRING     *key      = CONST_STRING(interp, "PASM");
@@ -3404,7 +3404,7 @@
 static void
 dump_string(PARROT_INTERP, ARGIN_NULLOK(const STRING *s))
 {
-    ASSERT_ARGS(dump_string);
+    ASSERT_ARGS(dump_string)
     if (!s)
         return;
 
@@ -3430,7 +3430,7 @@
 void
 PDB_print(PARROT_INTERP, ARGIN(const char *command))
 {
-    ASSERT_ARGS(PDB_print);
+    ASSERT_ARGS(PDB_print)
     const char * const s = GDB_P(interp->pdb->debugee, command);
     Parrot_io_eprintf(interp, "%s\n", s);
 }
@@ -3449,7 +3449,7 @@
 void
 PDB_info(PARROT_INTERP)
 {
-    ASSERT_ARGS(PDB_info);
+    ASSERT_ARGS(PDB_info)
     Parrot_io_eprintf(interp, "Total memory allocated = %ld\n",
             interpinfo(interp, TOTAL_MEM_ALLOC));
     Parrot_io_eprintf(interp, "DOD runs = %ld\n",
@@ -3492,7 +3492,7 @@
 void
 PDB_help(PARROT_INTERP, ARGIN(const char *command))
 {
-    ASSERT_ARGS(PDB_help);
+    ASSERT_ARGS(PDB_help)
     unsigned long c;
     const DebuggerCmd *cmd;
 
@@ -3553,7 +3553,7 @@
 void
 PDB_backtrace(PARROT_INTERP)
 {
-    ASSERT_ARGS(PDB_backtrace);
+    ASSERT_ARGS(PDB_backtrace)
     STRING           *str;
     PMC              *old       = PMCNULL;
     int               rec_level = 0;
@@ -3642,7 +3642,7 @@
 static const char*
 GDB_print_reg(PARROT_INTERP, int t, int n)
 {
-    ASSERT_ARGS(GDB_print_reg);
+    ASSERT_ARGS(GDB_print_reg)
 
     if (n >= 0 && n < CONTEXT(interp)->n_regs_used[t]) {
         switch (t) {
@@ -3681,7 +3681,7 @@
 static const char*
 GDB_P(PARROT_INTERP, ARGIN(const char *s))
 {
-    ASSERT_ARGS(GDB_P);
+    ASSERT_ARGS(GDB_P)
     int t;
     char reg_type;
 
@@ -3749,7 +3749,7 @@
 static int
 GDB_B(PARROT_INTERP, ARGIN(const char *s))
 {
-    ASSERT_ARGS(GDB_B);
+    ASSERT_ARGS(GDB_B)
     if ((unsigned long)s < 0x10000) {
         /* HACK alarm pb 45 is passed as the integer not a string */
         /* RT #46145 check if in bounds */

Modified: trunk/src/dynext.c
==============================================================================
--- trunk/src/dynext.c	(original)
+++ trunk/src/dynext.c	Mon Jan  5 15:17:26 2009
@@ -145,7 +145,7 @@
 set_cstring_prop(PARROT_INTERP, ARGMOD(PMC *lib_pmc), ARGIN(const char *what),
         ARGIN(STRING *name))
 {
-    ASSERT_ARGS(set_cstring_prop);
+    ASSERT_ARGS(set_cstring_prop)
     STRING * const key  = const_string(interp, what);
     PMC    * const prop = constant_pmc_new(interp, enum_class_String);
 
@@ -167,7 +167,7 @@
 store_lib_pmc(PARROT_INTERP, ARGIN(PMC *lib_pmc), ARGIN(STRING *path),
         ARGIN(STRING *type), ARGIN(STRING *lib_name))
 {
-    ASSERT_ARGS(store_lib_pmc);
+    ASSERT_ARGS(store_lib_pmc)
     PMC * const iglobals = interp->iglobals;
     PMC * const dyn_libs = VTABLE_get_pmc_keyed_int(interp, iglobals,
             IGLOBALS_DYN_LIBS);
@@ -198,7 +198,7 @@
 static PMC*
 is_loaded(PARROT_INTERP, ARGIN(STRING *path))
 {
-    ASSERT_ARGS(is_loaded);
+    ASSERT_ARGS(is_loaded)
     PMC * const iglobals = interp->iglobals;
     PMC * const dyn_libs = VTABLE_get_pmc_keyed_int(interp, iglobals,
             IGLOBALS_DYN_LIBS);
@@ -224,7 +224,7 @@
 get_path(PARROT_INTERP, ARGMOD(STRING *lib), ARGOUT(void **handle),
         ARGIN(STRING *wo_ext), ARGIN_NULLOK(STRING *ext))
 {
-    ASSERT_ARGS(get_path);
+    ASSERT_ARGS(get_path)
     STRING *path, *full_name;
     const char *err = NULL;    /* buffer returned from Parrot_dlerror */
 
@@ -346,7 +346,7 @@
                 ARGIN_NULLOK(PMC *(*load_func)(PARROT_INTERP)),
                 ARGIN_NULLOK(void (*init_func)(PARROT_INTERP, ARGIN_NULLOK(PMC *))))
 {
-    ASSERT_ARGS(Parrot_init_lib);
+    ASSERT_ARGS(Parrot_init_lib)
     PMC *lib_pmc = NULL;
 
     if (load_func)
@@ -380,7 +380,7 @@
 run_init_lib(PARROT_INTERP, ARGIN(void *handle),
         ARGIN(STRING *lib_name), ARGIN(STRING *wo_ext))
 {
-    ASSERT_ARGS(run_init_lib);
+    ASSERT_ARGS(run_init_lib)
     STRING *type;
     PMC *(*load_func)(PARROT_INTERP);
     void (*init_func)(PARROT_INTERP, PMC *);
@@ -459,7 +459,7 @@
 static STRING *
 clone_string_into(ARGMOD(Interp *d), ARGIN(Interp *s), ARGIN(PMC *value))
 {
-    ASSERT_ARGS(clone_string_into);
+    ASSERT_ARGS(clone_string_into)
     STRING * const orig = VTABLE_get_string(s, value);
     char * const raw_str = string_to_cstring(s, orig);
     STRING * const ret =
@@ -485,7 +485,7 @@
 static PMC *
 make_string_pmc(PARROT_INTERP, ARGIN(STRING *string))
 {
-    ASSERT_ARGS(make_string_pmc);
+    ASSERT_ARGS(make_string_pmc)
     PMC * const ret = VTABLE_new_from_string(interp,
         interp->vtables[enum_class_String]->pmc_class,
         string, PObj_constant_FLAG);
@@ -509,7 +509,7 @@
 PMC *
 Parrot_clone_lib_into(ARGMOD(Interp *d), ARGMOD(Interp *s), ARGIN(PMC *lib_pmc))
 {
-    ASSERT_ARGS(Parrot_clone_lib_into);
+    ASSERT_ARGS(Parrot_clone_lib_into)
     STRING * const filename = CONST_STRING(s, "_filename");
     STRING * const libname  = CONST_STRING(s, "_lib_name");
     STRING * const type_str = CONST_STRING(s, "_type");
@@ -589,7 +589,7 @@
 PMC *
 Parrot_load_lib(PARROT_INTERP, ARGIN_NULLOK(STRING *lib), SHIM(PMC *initializer))
 {
-    ASSERT_ARGS(Parrot_load_lib);
+    ASSERT_ARGS(Parrot_load_lib)
     void   *handle;
     PMC    *lib_pmc;
     STRING *path;

Modified: trunk/src/embed.c
==============================================================================
--- trunk/src/embed.c	(original)
+++ trunk/src/embed.c	Mon Jan  5 15:17:26 2009
@@ -591,7 +591,7 @@
 static PMC*
 setup_argv(PARROT_INTERP, int argc, ARGIN(char **argv))
 {
-    ASSERT_ARGS(setup_argv);
+    ASSERT_ARGS(setup_argv)
     INTVAL i;
     PMC   *userargv;
 
@@ -639,7 +639,7 @@
 static int
 prof_sort_f(ARGIN(const void *a), ARGIN(const void *b))
 {
-    ASSERT_ARGS(prof_sort_f);
+    ASSERT_ARGS(prof_sort_f)
     const FLOATVAL timea = ((const ProfData *)a)->time;
     const FLOATVAL timeb = ((const ProfData *)b)->time;
 
@@ -667,7 +667,7 @@
 static const char *
 op_name(PARROT_INTERP, int k)
 {
-    ASSERT_ARGS(op_name);
+    ASSERT_ARGS(op_name)
     switch (k) {
         case PARROT_PROF_DOD_p1:
             return "DOD_mark_root";
@@ -703,7 +703,7 @@
 static FLOATVAL
 calibrate(PARROT_INTERP)
 {
-    ASSERT_ARGS(calibrate);
+    ASSERT_ARGS(calibrate)
     size_t   count  = 1000000;
     size_t   n      = count;
     opcode_t code[] = { 1 };      /* noop */
@@ -734,7 +734,7 @@
 static void
 print_profile(PARROT_INTERP, SHIM(int status), SHIM(void *p))
 {
-    ASSERT_ARGS(print_profile);
+    ASSERT_ARGS(print_profile)
     RunProfile * const profile = interp->profile;
 
     if (profile) {
@@ -818,7 +818,7 @@
 static void
 print_debug(PARROT_INTERP, SHIM(int status), SHIM(void *p))
 {
-    ASSERT_ARGS(print_debug);
+    ASSERT_ARGS(print_debug)
     if (Interp_debug_TEST(interp, PARROT_MEM_STAT_DEBUG_FLAG)) {
         /* Give souls brave enough to activate debugging an earful about GC. */
 
@@ -846,7 +846,7 @@
 static PMC*
 set_current_sub(PARROT_INTERP)
 {
-    ASSERT_ARGS(set_current_sub);
+    ASSERT_ARGS(set_current_sub)
     opcode_t i;
     PMC *sub_pmc;
 

Modified: trunk/src/encoding.c
==============================================================================
--- trunk/src/encoding.c	(original)
+++ trunk/src/encoding.c	Mon Jan  5 15:17:26 2009
@@ -70,7 +70,7 @@
 void
 parrot_init_encodings_2(void)
 {
-    ASSERT_ARGS(parrot_init_encodings_2);
+    ASSERT_ARGS(parrot_init_encodings_2)
     const int n = all_encodings->n_encodings;
     int i;
 
@@ -92,7 +92,7 @@
 void
 parrot_deinit_encodings(void)
 {
-    ASSERT_ARGS(parrot_deinit_encodings);
+    ASSERT_ARGS(parrot_deinit_encodings)
     const int n = all_encodings->n_encodings;
     int i;
 
@@ -120,7 +120,7 @@
 ENCODING *
 Parrot_new_encoding(SHIM_INTERP)
 {
-    ASSERT_ARGS(Parrot_new_encoding);
+    ASSERT_ARGS(Parrot_new_encoding)
     return mem_allocate_typed(ENCODING);
 }
 
@@ -141,7 +141,7 @@
 const ENCODING *
 Parrot_find_encoding(SHIM_INTERP, ARGIN(const char *encodingname))
 {
-    ASSERT_ARGS(Parrot_find_encoding);
+    ASSERT_ARGS(Parrot_find_encoding)
     const int n = all_encodings->n_encodings;
     int i;
 
@@ -176,7 +176,7 @@
 const ENCODING *
 Parrot_load_encoding(PARROT_INTERP, ARGIN(const char *encodingname))
 {
-    ASSERT_ARGS(Parrot_load_encoding);
+    ASSERT_ARGS(Parrot_load_encoding)
     UNUSED(encodingname);
     Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_UNIMPLEMENTED,
         "Can't load encodings yet");
@@ -197,7 +197,7 @@
 INTVAL
 Parrot_encoding_number(PARROT_INTERP, ARGIN(const STRING *encodingname))
 {
-    ASSERT_ARGS(Parrot_encoding_number);
+    ASSERT_ARGS(Parrot_encoding_number)
     const int n = all_encodings->n_encodings;
     int i;
 
@@ -224,7 +224,7 @@
 INTVAL
 Parrot_encoding_number_of_str(SHIM_INTERP, ARGIN(const STRING *src))
 {
-    ASSERT_ARGS(Parrot_encoding_number_of_str);
+    ASSERT_ARGS(Parrot_encoding_number_of_str)
     const int n = all_encodings->n_encodings;
     int i;
 
@@ -252,7 +252,7 @@
 STRING*
 Parrot_encoding_name(SHIM_INTERP, INTVAL number_of_encoding)
 {
-    ASSERT_ARGS(Parrot_encoding_name);
+    ASSERT_ARGS(Parrot_encoding_name)
     if (number_of_encoding >= all_encodings->n_encodings)
         return NULL;
     return all_encodings->enc[number_of_encoding].name;
@@ -274,7 +274,7 @@
 const ENCODING*
 Parrot_get_encoding(SHIM_INTERP, INTVAL number_of_encoding)
 {
-    ASSERT_ARGS(Parrot_get_encoding);
+    ASSERT_ARGS(Parrot_get_encoding)
     if (number_of_encoding >= all_encodings->n_encodings)
         return NULL;
     return all_encodings->enc[number_of_encoding].encoding;
@@ -297,7 +297,7 @@
 const char *
 Parrot_encoding_c_name(SHIM_INTERP, INTVAL number_of_encoding)
 {
-    ASSERT_ARGS(Parrot_encoding_c_name);
+    ASSERT_ARGS(Parrot_encoding_c_name)
     if (number_of_encoding >= all_encodings->n_encodings)
         return NULL;
     return all_encodings->enc[number_of_encoding].encoding->name;
@@ -318,7 +318,7 @@
 register_encoding(PARROT_INTERP, ARGIN(const char *encodingname),
         ARGIN(ENCODING *encoding))
 {
-    ASSERT_ARGS(register_encoding);
+    ASSERT_ARGS(register_encoding)
     const int n = all_encodings->n_encodings;
     int i;
 
@@ -359,7 +359,7 @@
 Parrot_register_encoding(PARROT_INTERP, ARGIN(const char *encodingname),
         ARGIN(ENCODING *encoding))
 {
-    ASSERT_ARGS(Parrot_register_encoding);
+    ASSERT_ARGS(Parrot_register_encoding)
     if (!all_encodings) {
         all_encodings = mem_allocate_typed(All_encodings);
         all_encodings->n_encodings = 0;
@@ -403,7 +403,7 @@
 Parrot_make_default_encoding(SHIM_INTERP, SHIM(const char *encodingname),
         ARGIN(ENCODING *encoding))
 {
-    ASSERT_ARGS(Parrot_make_default_encoding);
+    ASSERT_ARGS(Parrot_make_default_encoding)
     Parrot_default_encoding_ptr = encoding;
     return 1;
 }
@@ -424,7 +424,7 @@
 const ENCODING *
 Parrot_default_encoding(SHIM_INTERP)
 {
-    ASSERT_ARGS(Parrot_default_encoding);
+    ASSERT_ARGS(Parrot_default_encoding)
     return Parrot_default_encoding_ptr;
 }
 
@@ -444,7 +444,7 @@
 encoding_converter_t
 Parrot_find_encoding_converter(PARROT_INTERP, ARGIN(ENCODING *lhs), ARGIN(ENCODING *rhs))
 {
-    ASSERT_ARGS(Parrot_find_encoding_converter);
+    ASSERT_ARGS(Parrot_find_encoding_converter)
     UNUSED(lhs);
     UNUSED(rhs);
 

Modified: trunk/src/encodings/fixed_8.c
==============================================================================
--- trunk/src/encodings/fixed_8.c	(original)
+++ trunk/src/encodings/fixed_8.c	Mon Jan  5 15:17:26 2009
@@ -234,7 +234,7 @@
 static STRING *
 to_encoding(PARROT_INTERP, SHIM(STRING *src), SHIM(STRING *dest))
 {
-    ASSERT_ARGS(to_encoding);
+    ASSERT_ARGS(to_encoding)
     UNIMPL;
 }
 
@@ -254,7 +254,7 @@
 get_codepoint(PARROT_INTERP, ARGIN(const STRING *source_string),
         UINTVAL offset)
 {
-    ASSERT_ARGS(get_codepoint);
+    ASSERT_ARGS(get_codepoint)
     return get_byte(interp, source_string, offset);
 }
 
@@ -272,7 +272,7 @@
 set_codepoint(PARROT_INTERP, ARGIN(STRING *source_string),
         UINTVAL offset, UINTVAL codepoint)
 {
-    ASSERT_ARGS(set_codepoint);
+    ASSERT_ARGS(set_codepoint)
     set_byte(interp, source_string, offset, codepoint);
 }
 
@@ -290,7 +290,7 @@
 static UINTVAL
 get_byte(PARROT_INTERP, ARGIN(const STRING *source_string), UINTVAL offset)
 {
-    ASSERT_ARGS(get_byte);
+    ASSERT_ARGS(get_byte)
     unsigned char *contents = (unsigned char *)source_string->strstart;
 
     if (offset >= source_string->bufused) {
@@ -317,7 +317,7 @@
 set_byte(PARROT_INTERP, ARGIN(const STRING *source_string),
         UINTVAL offset, UINTVAL byte)
 {
-    ASSERT_ARGS(set_byte);
+    ASSERT_ARGS(set_byte)
     unsigned char *contents;
 
     if (offset >= source_string->bufused)
@@ -345,7 +345,7 @@
 get_codepoints(PARROT_INTERP, ARGIN(STRING *source_string),
         UINTVAL offset, UINTVAL count)
 {
-    ASSERT_ARGS(get_codepoints);
+    ASSERT_ARGS(get_codepoints)
     STRING * const return_string = get_bytes(interp, source_string,
             offset, count);
     return_string->charset = source_string->charset;
@@ -368,7 +368,7 @@
 static STRING *
 get_bytes(PARROT_INTERP, ARGIN(STRING *source_string), UINTVAL offset, UINTVAL count)
 {
-    ASSERT_ARGS(get_bytes);
+    ASSERT_ARGS(get_bytes)
     STRING * const return_string = Parrot_make_COW_reference(interp,
             source_string);
     return_string->encoding = source_string->encoding;
@@ -401,7 +401,7 @@
 get_codepoints_inplace(PARROT_INTERP, ARGIN(STRING *source_string),
         UINTVAL offset, UINTVAL count, ARGMOD(STRING *dest_string))
 {
-    ASSERT_ARGS(get_codepoints_inplace);
+    ASSERT_ARGS(get_codepoints_inplace)
     return get_bytes_inplace(interp, source_string, offset,
             count, dest_string);
 }
@@ -423,7 +423,7 @@
 get_bytes_inplace(PARROT_INTERP, ARGIN(STRING *source_string),
         UINTVAL offset, UINTVAL count, ARGMOD(STRING *return_string))
 {
-    ASSERT_ARGS(get_bytes_inplace);
+    ASSERT_ARGS(get_bytes_inplace)
     Parrot_reuse_COW_reference(interp, source_string, return_string);
 
     return_string->strstart = (char *)return_string->strstart + offset ;
@@ -449,7 +449,7 @@
 set_codepoints(PARROT_INTERP, ARGIN(STRING *source_string),
         UINTVAL offset, UINTVAL count, ARGMOD(STRING *new_codepoints))
 {
-    ASSERT_ARGS(set_codepoints);
+    ASSERT_ARGS(set_codepoints)
     set_bytes(interp, source_string, offset, count, new_codepoints);
 }
 
@@ -468,7 +468,7 @@
 set_bytes(PARROT_INTERP, ARGIN(STRING *source_string),
         UINTVAL offset, UINTVAL count, ARGMOD(STRING *new_bytes))
 {
-    ASSERT_ARGS(set_bytes);
+    ASSERT_ARGS(set_bytes)
     string_replace(interp, source_string, offset, count, new_bytes, NULL);
 }
 
@@ -485,7 +485,7 @@
 static void
 become_encoding(PARROT_INTERP, SHIM(STRING *source_string))
 {
-    ASSERT_ARGS(become_encoding);
+    ASSERT_ARGS(become_encoding)
     UNIMPL;
 }
 
@@ -503,7 +503,7 @@
 static UINTVAL
 codepoints(PARROT_INTERP, ARGIN(STRING *source_string))
 {
-    ASSERT_ARGS(codepoints);
+    ASSERT_ARGS(codepoints)
     return bytes(interp, source_string);
 }
 
@@ -520,7 +520,7 @@
 static UINTVAL
 bytes(SHIM_INTERP, ARGIN(STRING *source_string))
 {
-    ASSERT_ARGS(bytes);
+    ASSERT_ARGS(bytes)
     return source_string->bufused;
 }
 
@@ -541,7 +541,7 @@
 static UINTVAL
 fixed8_get_next(PARROT_INTERP, ARGMOD(String_iter *iter))
 {
-    ASSERT_ARGS(fixed8_get_next);
+    ASSERT_ARGS(fixed8_get_next)
     const UINTVAL c = get_byte(interp, iter->str, iter->charpos++);
     iter->bytepos++;
     return c;
@@ -561,7 +561,7 @@
 static void
 fixed8_set_next(PARROT_INTERP, ARGMOD(String_iter *iter), UINTVAL c)
 {
-    ASSERT_ARGS(fixed8_set_next);
+    ASSERT_ARGS(fixed8_set_next)
     set_byte(interp, iter->str, iter->charpos++, c);
     iter->bytepos++;
 }
@@ -579,7 +579,7 @@
 static void
 fixed8_set_position(SHIM_INTERP, ARGMOD(String_iter *iter), UINTVAL pos)
 {
-    ASSERT_ARGS(fixed8_set_position);
+    ASSERT_ARGS(fixed8_set_position)
     iter->bytepos = iter->charpos = pos;
     PARROT_ASSERT(pos <= PObj_buflen(iter->str));
 }
@@ -598,7 +598,7 @@
 static void
 iter_init(SHIM_INTERP, ARGIN(const STRING *src), ARGOUT(String_iter *iter))
 {
-    ASSERT_ARGS(iter_init);
+    ASSERT_ARGS(iter_init)
     iter->str             = src;
     iter->bytepos         = iter->charpos        = 0;
     iter->get_and_advance = fixed8_get_next;
@@ -620,7 +620,7 @@
 ENCODING *
 Parrot_encoding_fixed_8_init(PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_encoding_fixed_8_init);
+    ASSERT_ARGS(Parrot_encoding_fixed_8_init)
     ENCODING * const return_encoding = Parrot_new_encoding(interp);
 
     ENCODING base_encoding = {

Modified: trunk/src/encodings/ucs2.c
==============================================================================
--- trunk/src/encodings/ucs2.c	(original)
+++ trunk/src/encodings/ucs2.c	Mon Jan  5 15:17:26 2009
@@ -225,7 +225,7 @@
 static STRING *
 to_encoding(PARROT_INTERP, ARGIN(STRING *src), ARGMOD(STRING *dest))
 {
-    ASSERT_ARGS(to_encoding);
+    ASSERT_ARGS(to_encoding)
     STRING * const result =
         Parrot_utf16_encoding_ptr->to_encoding(interp, src, dest);
 
@@ -250,7 +250,7 @@
 static UINTVAL
 get_codepoint(PARROT_INTERP, ARGIN(const STRING *src), UINTVAL offset)
 {
-    ASSERT_ARGS(get_codepoint);
+    ASSERT_ARGS(get_codepoint)
 #if PARROT_HAS_ICU
     UChar * const s = (UChar*) src->strstart;
     return s[offset];
@@ -273,7 +273,7 @@
 static void
 set_codepoint(PARROT_INTERP, ARGIN(STRING *src), UINTVAL offset, UINTVAL codepoint)
 {
-    ASSERT_ARGS(set_codepoint);
+    ASSERT_ARGS(set_codepoint)
 #if PARROT_HAS_ICU
     UChar * const s = (UChar*) src->strstart;
     s[offset] = codepoint;
@@ -297,7 +297,7 @@
 static UINTVAL
 get_byte(PARROT_INTERP, SHIM(const STRING *src), UINTVAL offset)
 {
-    ASSERT_ARGS(get_byte);
+    ASSERT_ARGS(get_byte)
     UNIMPL;
 }
 
@@ -314,7 +314,7 @@
 static void
 set_byte(PARROT_INTERP, SHIM(const STRING *src), UINTVAL offset, UINTVAL byte)
 {
-    ASSERT_ARGS(set_byte);
+    ASSERT_ARGS(set_byte)
     UNIMPL;
 }
 
@@ -334,7 +334,7 @@
 static STRING *
 get_codepoints(PARROT_INTERP, ARGIN(STRING *src), UINTVAL offset, UINTVAL count)
 {
-    ASSERT_ARGS(get_codepoints);
+    ASSERT_ARGS(get_codepoints)
     STRING * const return_string = Parrot_make_COW_reference(interp, src);
 #if PARROT_HAS_ICU
     return_string->strstart = (char*)src->strstart + offset * sizeof (UChar);
@@ -372,7 +372,7 @@
 static STRING *
 get_bytes(PARROT_INTERP, SHIM(STRING *src), UINTVAL offset, UINTVAL count)
 {
-    ASSERT_ARGS(get_bytes);
+    ASSERT_ARGS(get_bytes)
     UNIMPL;
 }
 
@@ -394,7 +394,7 @@
 get_codepoints_inplace(PARROT_INTERP, SHIM(STRING *src),
         UINTVAL offset, UINTVAL count, SHIM(STRING *dest_string))
 {
-    ASSERT_ARGS(get_codepoints_inplace);
+    ASSERT_ARGS(get_codepoints_inplace)
     UNIMPL;
 }
 
@@ -415,7 +415,7 @@
 get_bytes_inplace(PARROT_INTERP, SHIM(STRING *src),
         UINTVAL offset, UINTVAL count, SHIM(STRING *return_string))
 {
-    ASSERT_ARGS(get_bytes_inplace);
+    ASSERT_ARGS(get_bytes_inplace)
     UNIMPL;
 }
 
@@ -434,7 +434,7 @@
 set_codepoints(PARROT_INTERP, SHIM(STRING *src),
         UINTVAL offset, UINTVAL count, SHIM(STRING *new_codepoints))
 {
-    ASSERT_ARGS(set_codepoints);
+    ASSERT_ARGS(set_codepoints)
     UNIMPL;
 }
 
@@ -453,7 +453,7 @@
 set_bytes(PARROT_INTERP, SHIM(STRING *src),
         UINTVAL offset, UINTVAL count, SHIM(STRING *new_bytes))
 {
-    ASSERT_ARGS(set_bytes);
+    ASSERT_ARGS(set_bytes)
     UNIMPL;
 }
 
@@ -470,7 +470,7 @@
 static void
 become_encoding(PARROT_INTERP, SHIM(STRING *src))
 {
-    ASSERT_ARGS(become_encoding);
+    ASSERT_ARGS(become_encoding)
     UNIMPL;
 }
 
@@ -489,7 +489,7 @@
 static UINTVAL
 codepoints(PARROT_INTERP, ARGIN(STRING *src))
 {
-    ASSERT_ARGS(codepoints);
+    ASSERT_ARGS(codepoints)
 #if PARROT_HAS_ICU
     return src->bufused / sizeof (UChar);
 #else
@@ -512,7 +512,7 @@
 static UINTVAL
 bytes(PARROT_INTERP, ARGIN(STRING *src))
 {
-    ASSERT_ARGS(bytes);
+    ASSERT_ARGS(bytes)
     return src->bufused;
 }
 
@@ -530,7 +530,7 @@
 static UINTVAL
 ucs2_decode_and_advance(PARROT_INTERP, ARGMOD(String_iter *i))
 {
-    ASSERT_ARGS(ucs2_decode_and_advance);
+    ASSERT_ARGS(ucs2_decode_and_advance)
     UChar * const s = (UChar*) i->str->strstart;
     size_t pos = i->bytepos / sizeof (UChar);
 
@@ -557,7 +557,7 @@
 static void
 ucs2_encode_and_advance(PARROT_INTERP, ARGMOD(String_iter *i), UINTVAL c)
 {
-    ASSERT_ARGS(ucs2_encode_and_advance);
+    ASSERT_ARGS(ucs2_encode_and_advance)
     UChar * const s = (UChar*) i->str->strstart;
     UINTVAL pos = i->bytepos / sizeof (UChar);
     s[pos++] = (UChar)c;
@@ -578,7 +578,7 @@
 static void
 ucs2_set_position(SHIM_INTERP, ARGMOD(String_iter *i), UINTVAL n)
 {
-    ASSERT_ARGS(ucs2_set_position);
+    ASSERT_ARGS(ucs2_set_position)
     i->charpos = n;
     i->bytepos = n * sizeof (UChar);
 }
@@ -598,7 +598,7 @@
 static void
 iter_init(PARROT_INTERP, ARGIN(const STRING *src), ARGOUT(String_iter *iter))
 {
-    ASSERT_ARGS(iter_init);
+    ASSERT_ARGS(iter_init)
 #if PARROT_HAS_ICU
     iter->str             = src;
     iter->bytepos         = 0;
@@ -626,7 +626,7 @@
 ENCODING *
 Parrot_encoding_ucs2_init(PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_encoding_ucs2_init);
+    ASSERT_ARGS(Parrot_encoding_ucs2_init)
     ENCODING * const return_encoding = Parrot_new_encoding(interp);
 
     static const ENCODING base_encoding = {

Modified: trunk/src/encodings/utf16.c
==============================================================================
--- trunk/src/encodings/utf16.c	(original)
+++ trunk/src/encodings/utf16.c	Mon Jan  5 15:17:26 2009
@@ -243,7 +243,7 @@
 static STRING *
 to_encoding(PARROT_INTERP, ARGIN(STRING *src), ARGIN_NULLOK(STRING *dest))
 {
-    ASSERT_ARGS(to_encoding);
+    ASSERT_ARGS(to_encoding)
 #if PARROT_HAS_ICU
     UErrorCode err;
     int dest_len;
@@ -349,7 +349,7 @@
 static UINTVAL
 get_codepoint(PARROT_INTERP, ARGIN(const STRING *src), UINTVAL offset)
 {
-    ASSERT_ARGS(get_codepoint);
+    ASSERT_ARGS(get_codepoint)
 #if PARROT_HAS_ICU
     UChar * const s = (UChar*) src->strstart;
     UINTVAL c, pos;
@@ -380,7 +380,7 @@
 static void
 set_codepoint(PARROT_INTERP, ARGIN(STRING *src), UINTVAL offset, UINTVAL codepoint)
 {
-    ASSERT_ARGS(set_codepoint);
+    ASSERT_ARGS(set_codepoint)
     UNUSED(interp);
     UNUSED(src);
     UNUSED(offset);
@@ -401,7 +401,7 @@
 static UINTVAL
 get_byte(SHIM_INTERP, ARGIN(const STRING *src), UINTVAL offset)
 {
-    ASSERT_ARGS(get_byte);
+    ASSERT_ARGS(get_byte)
     const unsigned char * const contents = (unsigned char *)src->strstart;
     if (offset >= src->bufused) {
 /*        Parrot_ex_throw_from_c_args(interp, NULL, 0,
@@ -425,7 +425,7 @@
 static void
 set_byte(PARROT_INTERP, ARGIN(const STRING *src), UINTVAL offset, UINTVAL byte)
 {
-    ASSERT_ARGS(set_byte);
+    ASSERT_ARGS(set_byte)
     unsigned char *contents;
 
     if (offset >= src->bufused)
@@ -452,7 +452,7 @@
 static STRING *
 get_codepoints(PARROT_INTERP, ARGIN(STRING *src), UINTVAL offset, UINTVAL count)
 {
-    ASSERT_ARGS(get_codepoints);
+    ASSERT_ARGS(get_codepoints)
     String_iter iter;
     UINTVAL start;
     STRING * const return_string = Parrot_make_COW_reference(interp, src);
@@ -486,7 +486,7 @@
 get_codepoints_inplace(PARROT_INTERP, ARGIN(STRING *src),
         UINTVAL offset, UINTVAL count, ARGMOD(STRING *return_string))
 {
-    ASSERT_ARGS(get_codepoints_inplace);
+    ASSERT_ARGS(get_codepoints_inplace)
     String_iter iter;
     UINTVAL start;
     Parrot_reuse_COW_reference(interp, src, return_string);
@@ -516,7 +516,7 @@
 static STRING *
 get_bytes(PARROT_INTERP, ARGIN(STRING *src), UINTVAL offset, UINTVAL count)
 {
-    ASSERT_ARGS(get_bytes);
+    ASSERT_ARGS(get_bytes)
     UNUSED(interp);
     UNUSED(src);
     UNUSED(offset)
@@ -541,7 +541,7 @@
 get_bytes_inplace(PARROT_INTERP, ARGIN(STRING *src),
         UINTVAL offset, UINTVAL count, ARGIN(STRING *return_string))
 {
-    ASSERT_ARGS(get_bytes_inplace);
+    ASSERT_ARGS(get_bytes_inplace)
     UNUSED(interp);
     UNUSED(src);
     UNUSED(offset)
@@ -565,7 +565,7 @@
 set_codepoints(PARROT_INTERP, ARGIN(STRING *src),
         UINTVAL offset, UINTVAL count, ARGIN(STRING *new_codepoints))
 {
-    ASSERT_ARGS(set_codepoints);
+    ASSERT_ARGS(set_codepoints)
     UNUSED(interp);
     UNUSED(src);
     UNUSED(offset)
@@ -589,7 +589,7 @@
 set_bytes(PARROT_INTERP, SHIM(STRING *src),
         UINTVAL offset, UINTVAL count, SHIM(STRING *new_bytes))
 {
-    ASSERT_ARGS(set_bytes);
+    ASSERT_ARGS(set_bytes)
     UNUSED(interp);
     UNUSED(offset)
     UNUSED(count);
@@ -609,7 +609,7 @@
 static void
 become_encoding(PARROT_INTERP, SHIM(STRING *src))
 {
-    ASSERT_ARGS(become_encoding);
+    ASSERT_ARGS(become_encoding)
     UNIMPL;
 }
 
@@ -628,7 +628,7 @@
 static UINTVAL
 codepoints(PARROT_INTERP, ARGIN(STRING *src))
 {
-    ASSERT_ARGS(codepoints);
+    ASSERT_ARGS(codepoints)
     String_iter iter;
     /*
      * this is used to initially calculate src->strlen,
@@ -654,7 +654,7 @@
 static UINTVAL
 bytes(SHIM_INTERP, ARGIN(STRING *src))
 {
-    ASSERT_ARGS(bytes);
+    ASSERT_ARGS(bytes)
     return src->bufused;
 }
 
@@ -673,7 +673,7 @@
 static UINTVAL
 utf16_decode_and_advance(PARROT_INTERP, ARGMOD(String_iter *i))
 {
-    ASSERT_ARGS(utf16_decode_and_advance);
+    ASSERT_ARGS(utf16_decode_and_advance)
     UChar *s = (UChar*) i->str->strstart;
     UINTVAL c, pos;
     pos = i->bytepos / sizeof (UChar);
@@ -700,7 +700,7 @@
 static void
 utf16_encode_and_advance(PARROT_INTERP, ARGMOD(String_iter *i), UINTVAL c)
 {
-    ASSERT_ARGS(utf16_encode_and_advance);
+    ASSERT_ARGS(utf16_encode_and_advance)
     UChar *s = (UChar*) i->str->strstart;
     UINTVAL pos;
     pos = i->bytepos / sizeof (UChar);
@@ -722,7 +722,7 @@
 static void
 utf16_set_position(PARROT_INTERP, ARGMOD(String_iter *i), UINTVAL n)
 {
-    ASSERT_ARGS(utf16_set_position);
+    ASSERT_ARGS(utf16_set_position)
     UChar * const s = (UChar*) i->str->strstart;
     UINTVAL pos;
     pos = 0;
@@ -746,7 +746,7 @@
 static void
 iter_init(PARROT_INTERP, ARGIN(const STRING *src), ARGOUT(String_iter *iter))
 {
-    ASSERT_ARGS(iter_init);
+    ASSERT_ARGS(iter_init)
     iter->str = src;
     iter->bytepos = iter->charpos = 0;
 #if PARROT_HAS_ICU
@@ -773,7 +773,7 @@
 ENCODING *
 Parrot_encoding_utf16_init(PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_encoding_utf16_init);
+    ASSERT_ARGS(Parrot_encoding_utf16_init)
     ENCODING * const return_encoding = Parrot_new_encoding(interp);
 
     static const ENCODING base_encoding = {

Modified: trunk/src/encodings/utf8.c
==============================================================================
--- trunk/src/encodings/utf8.c	(original)
+++ trunk/src/encodings/utf8.c	Mon Jan  5 15:17:26 2009
@@ -277,7 +277,7 @@
 static UINTVAL
 utf8_characters(PARROT_INTERP, ARGIN(const utf8_t *ptr), UINTVAL byte_len)
 {
-    ASSERT_ARGS(utf8_characters);
+    ASSERT_ARGS(utf8_characters)
     const utf8_t *u8ptr = ptr;
     const utf8_t *u8end = u8ptr + byte_len;
     UINTVAL characters = 0;
@@ -307,7 +307,7 @@
 static UINTVAL
 utf8_decode(PARROT_INTERP, ARGIN(const utf8_t *ptr))
 {
-    ASSERT_ARGS(utf8_decode);
+    ASSERT_ARGS(utf8_decode)
     const utf8_t *u8ptr = ptr;
     UINTVAL c = *u8ptr;
 
@@ -352,7 +352,7 @@
 static void *
 utf8_encode(PARROT_INTERP, ARGIN(void *ptr), UINTVAL c)
 {
-    ASSERT_ARGS(utf8_encode);
+    ASSERT_ARGS(utf8_encode)
     const UINTVAL        len   = UNISKIP(c);
 
     /* the const is good on u8ptr, but using ptr on other variables avoids the
@@ -389,7 +389,7 @@
 static const void *
 utf8_skip_forward(ARGIN(const void *ptr), UINTVAL n)
 {
-    ASSERT_ARGS(utf8_skip_forward);
+    ASSERT_ARGS(utf8_skip_forward)
     const utf8_t *u8ptr = (const utf8_t *)ptr;
 
     while (n-- > 0) {
@@ -414,7 +414,7 @@
 static const void *
 utf8_skip_backward(ARGIN(const void *ptr), UINTVAL n)
 {
-    ASSERT_ARGS(utf8_skip_backward);
+    ASSERT_ARGS(utf8_skip_backward)
     const utf8_t *u8ptr = (const utf8_t *)ptr;
 
     while (n-- > 0) {
@@ -452,7 +452,7 @@
 static UINTVAL
 utf8_decode_and_advance(PARROT_INTERP, ARGMOD(String_iter *i))
 {
-    ASSERT_ARGS(utf8_decode_and_advance);
+    ASSERT_ARGS(utf8_decode_and_advance)
     const utf8_t *u8ptr = (utf8_t *)((char *)i->str->strstart + i->bytepos);
     UINTVAL c = *u8ptr;
 
@@ -501,7 +501,7 @@
 static void
 utf8_encode_and_advance(PARROT_INTERP, ARGMOD(String_iter *i), UINTVAL c)
 {
-    ASSERT_ARGS(utf8_encode_and_advance);
+    ASSERT_ARGS(utf8_encode_and_advance)
     const STRING * const s = i->str;
     unsigned char * const pos = (unsigned char *)s->strstart + i->bytepos;
     unsigned char * const new_pos = (unsigned char *)utf8_encode(interp, pos, c);
@@ -526,7 +526,7 @@
 static void
 utf8_set_position(SHIM_INTERP, ARGMOD(String_iter *i), UINTVAL pos)
 {
-    ASSERT_ARGS(utf8_set_position);
+    ASSERT_ARGS(utf8_set_position)
     const utf8_t *u8ptr = (const utf8_t *)i->str->strstart;
 
     /* start from last known charpos, if we can */
@@ -562,7 +562,7 @@
 static STRING *
 to_encoding(PARROT_INTERP, ARGMOD(STRING *src), ARGMOD_NULLOK(STRING *dest))
 {
-    ASSERT_ARGS(to_encoding);
+    ASSERT_ARGS(to_encoding)
     STRING *result;
     String_iter src_iter;
     UINTVAL offs, dest_len, dest_pos, src_len;
@@ -648,7 +648,7 @@
 static UINTVAL
 get_codepoint(PARROT_INTERP, ARGIN(const STRING *src), UINTVAL offset)
 {
-    ASSERT_ARGS(get_codepoint);
+    ASSERT_ARGS(get_codepoint)
     const utf8_t * const start = (const utf8_t *)utf8_skip_forward(src->strstart, offset);
     return utf8_decode(interp, start);
 }
@@ -666,7 +666,7 @@
 static void
 set_codepoint(PARROT_INTERP, ARGIN(STRING *src), UINTVAL offset, UINTVAL codepoint)
 {
-    ASSERT_ARGS(set_codepoint);
+    ASSERT_ARGS(set_codepoint)
     const void *start;
     void *p;
     DECL_CONST_CAST;
@@ -689,7 +689,7 @@
 static UINTVAL
 get_byte(SHIM_INTERP, ARGIN(const STRING *src), UINTVAL offset)
 {
-    ASSERT_ARGS(get_byte);
+    ASSERT_ARGS(get_byte)
     unsigned char *contents = (unsigned char *)src->strstart;
     if (offset >= src->bufused) {
 /*        Parrot_ex_throw_from_c_args(interp, NULL, 0,
@@ -714,7 +714,7 @@
 set_byte(PARROT_INTERP, ARGIN(const STRING *src),
         UINTVAL offset, UINTVAL byte)
 {
-    ASSERT_ARGS(set_byte);
+    ASSERT_ARGS(set_byte)
     unsigned char *contents;
 
     if (offset >= src->bufused)
@@ -740,7 +740,7 @@
 static STRING *
 get_codepoints(PARROT_INTERP, ARGIN(STRING *src), UINTVAL offset, UINTVAL count)
 {
-    ASSERT_ARGS(get_codepoints);
+    ASSERT_ARGS(get_codepoints)
 
     STRING * const return_string = Parrot_make_COW_reference(interp, src);
     String_iter    iter;
@@ -778,7 +778,7 @@
 static STRING *
 get_bytes(PARROT_INTERP, ARGMOD(STRING *src), UINTVAL offset, UINTVAL count)
 {
-    ASSERT_ARGS(get_bytes);
+    ASSERT_ARGS(get_bytes)
     STRING * const return_string = Parrot_make_COW_reference(interp, src);
 
     return_string->encoding = src->encoding;    /* XXX */
@@ -809,7 +809,7 @@
 get_codepoints_inplace(PARROT_INTERP, ARGMOD(STRING *src),
         UINTVAL offset, UINTVAL count, ARGMOD(STRING *return_string))
 {
-    ASSERT_ARGS(get_codepoints_inplace);
+    ASSERT_ARGS(get_codepoints_inplace)
     String_iter iter;
     UINTVAL start;
 
@@ -845,7 +845,7 @@
 get_bytes_inplace(PARROT_INTERP, SHIM(STRING *src),
         UINTVAL offset, UINTVAL count, SHIM(STRING *return_string))
 {
-    ASSERT_ARGS(get_bytes_inplace);
+    ASSERT_ARGS(get_bytes_inplace)
     UNIMPL;
 }
 
@@ -864,7 +864,7 @@
 set_codepoints(PARROT_INTERP, SHIM(STRING *src),
         UINTVAL offset, UINTVAL count, SHIM(STRING *new_codepoints))
 {
-    ASSERT_ARGS(set_codepoints);
+    ASSERT_ARGS(set_codepoints)
     UNIMPL;
 }
 
@@ -883,7 +883,7 @@
 set_bytes(PARROT_INTERP, SHIM(STRING *src),
         UINTVAL offset, UINTVAL count, SHIM(STRING *new_bytes))
 {
-    ASSERT_ARGS(set_bytes);
+    ASSERT_ARGS(set_bytes)
     UNIMPL;
 }
 
@@ -900,7 +900,7 @@
 static void
 become_encoding(PARROT_INTERP, SHIM(STRING *src))
 {
-    ASSERT_ARGS(become_encoding);
+    ASSERT_ARGS(become_encoding)
     UNIMPL;
 }
 
@@ -918,7 +918,7 @@
 static UINTVAL
 codepoints(PARROT_INTERP, ARGMOD(STRING *src))
 {
-    ASSERT_ARGS(codepoints);
+    ASSERT_ARGS(codepoints)
     String_iter iter;
     /*
      * this is used to initially calculate src->strlen,
@@ -944,7 +944,7 @@
 static UINTVAL
 bytes(SHIM_INTERP, ARGIN(STRING *src))
 {
-    ASSERT_ARGS(bytes);
+    ASSERT_ARGS(bytes)
     return src->bufused;
 }
 
@@ -961,7 +961,7 @@
 static void
 iter_init(SHIM_INTERP, ARGIN(const STRING *src), ARGOUT(String_iter *iter))
 {
-    ASSERT_ARGS(iter_init);
+    ASSERT_ARGS(iter_init)
     iter->str             = src;
     iter->bytepos         = 0;
     iter->charpos         = 0;
@@ -984,7 +984,7 @@
 ENCODING *
 Parrot_encoding_utf8_init(PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_encoding_utf8_init);
+    ASSERT_ARGS(Parrot_encoding_utf8_init)
     ENCODING * const return_encoding = Parrot_new_encoding(interp);
 
     static const ENCODING base_encoding = {

Modified: trunk/src/events.c
==============================================================================
--- trunk/src/events.c	(original)
+++ trunk/src/events.c	Mon Jan  5 15:17:26 2009
@@ -242,7 +242,7 @@
 static void
 sig_handler(int signum)
 {
-    ASSERT_ARGS(sig_handler);
+    ASSERT_ARGS(sig_handler)
     switch (signum) {
         case SIGINT:
             sig_int = 1;
@@ -270,7 +270,7 @@
 static void
 Parrot_sigaction(int sig, ARGIN(void (*handler)(int)))
 {
-    ASSERT_ARGS(Parrot_sigaction);
+    ASSERT_ARGS(Parrot_sigaction)
 #ifdef PARROT_HAS_SIGACTION
     struct sigaction action;
     sigset_t block_mask;
@@ -305,7 +305,7 @@
 static void
 Parrot_unblock_signal(int sig)
 {
-    ASSERT_ARGS(Parrot_unblock_signal);
+    ASSERT_ARGS(Parrot_unblock_signal)
 #ifdef PARROT_HAS_SIGACTION
     sigset_t block_mask;
 
@@ -333,7 +333,7 @@
 void
 Parrot_init_signals(void)
 {
-    ASSERT_ARGS(Parrot_init_signals);
+    ASSERT_ARGS(Parrot_init_signals)
     /*
      * SIGFPE is architecture specific - some signal an error,
      * some don't, so we have to use direct checks if we are dividing
@@ -361,7 +361,7 @@
 static void
 init_events_first(PARROT_INTERP)
 {
-    ASSERT_ARGS(init_events_first);
+    ASSERT_ARGS(init_events_first)
     Parrot_thread    ev_handle;
 #ifndef WIN32
     Parrot_thread    io_handle;
@@ -421,7 +421,7 @@
 static void
 init_events_all(PARROT_INTERP)
 {
-    ASSERT_ARGS(init_events_all);
+    ASSERT_ARGS(init_events_all)
     /*
      * create per interpreter task queue
      */
@@ -442,7 +442,7 @@
 void
 Parrot_init_events(PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_init_events);
+    ASSERT_ARGS(Parrot_init_events)
     if (!interp->parent_interpreter) {
         /* add the very first interpreter to the list of interps. */
         pt_add_to_interpreters(interp, NULL);
@@ -471,7 +471,7 @@
 void
 Parrot_schedule_event(PARROT_INTERP, ARGMOD(parrot_event* ev))
 {
-    ASSERT_ARGS(Parrot_schedule_event);
+    ASSERT_ARGS(Parrot_schedule_event)
     QUEUE_ENTRY * const entry = mem_allocate_typed(QUEUE_ENTRY);
     entry->next = NULL;
     ev->interp  = interp;
@@ -508,7 +508,7 @@
 static void
 schedule_signal_event(int signum)
 {
-    ASSERT_ARGS(schedule_signal_event);
+    ASSERT_ARGS(schedule_signal_event)
     parrot_event* const ev    = mem_allocate_typed(parrot_event);
     QUEUE_ENTRY * const entry = mem_allocate_typed(QUEUE_ENTRY);
 
@@ -539,7 +539,7 @@
 Parrot_new_timer_event(PARROT_INTERP, ARGIN_NULLOK(PMC *timer), FLOATVAL diff,
         FLOATVAL interval, int repeat, ARGIN_NULLOK(PMC *sub), parrot_event_type_enum typ)
 {
-    ASSERT_ARGS(Parrot_new_timer_event);
+    ASSERT_ARGS(Parrot_new_timer_event)
     parrot_event* const ev = mem_allocate_typed(parrot_event);
 
     const FLOATVAL now = Parrot_floatval_time();
@@ -571,7 +571,7 @@
 void
 Parrot_new_cb_event(PARROT_INTERP, ARGIN(PMC *cbi), ARGIN(char *ext))
 {
-    ASSERT_ARGS(Parrot_new_cb_event);
+    ASSERT_ARGS(Parrot_new_cb_event)
     parrot_event* const ev    = mem_allocate_typed(parrot_event);
     QUEUE_ENTRY*  const entry = mem_allocate_typed(QUEUE_ENTRY);
 
@@ -598,7 +598,7 @@
 void
 Parrot_del_timer_event(PARROT_INTERP, ARGIN(const PMC *timer))
 {
-    ASSERT_ARGS(Parrot_del_timer_event);
+    ASSERT_ARGS(Parrot_del_timer_event)
     QUEUE_ENTRY *entry;
 
     LOCK(event_queue->queue_mutex);
@@ -634,7 +634,7 @@
 void
 Parrot_new_terminate_event(PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_new_terminate_event);
+    ASSERT_ARGS(Parrot_new_terminate_event)
     parrot_event* const ev = mem_allocate_typed(parrot_event);
     ev->type = EVENT_TYPE_TERMINATE;
     Parrot_schedule_event(interp, ev);
@@ -655,7 +655,7 @@
 void
 Parrot_new_suspend_for_gc_event(PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_new_suspend_for_gc_event);
+    ASSERT_ARGS(Parrot_new_suspend_for_gc_event)
     QUEUE_ENTRY *qe;
     parrot_event* const ev = mem_allocate_typed(parrot_event);
     ev->type = EVENT_TYPE_SUSPEND_FOR_GC;
@@ -683,7 +683,7 @@
 void
 Parrot_kill_event_loop(PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_kill_event_loop);
+    ASSERT_ARGS(Parrot_kill_event_loop)
     parrot_event* const ev = mem_allocate_typed(parrot_event);
     ev->type = EVENT_TYPE_EVENT_TERMINATE;
     Parrot_schedule_event(interp, ev);
@@ -704,7 +704,7 @@
 void
 Parrot_schedule_interp_qentry(PARROT_INTERP, ARGIN(struct QUEUE_ENTRY *entry))
 {
-    ASSERT_ARGS(Parrot_schedule_interp_qentry);
+    ASSERT_ARGS(Parrot_schedule_interp_qentry)
     parrot_event * const event = (parrot_event *)entry->data;
     /*
      * sleep checks events when it awakes
@@ -743,7 +743,7 @@
 void
 Parrot_schedule_broadcast_qentry(ARGIN(struct QUEUE_ENTRY *entry))
 {
-    ASSERT_ARGS(Parrot_schedule_broadcast_qentry);
+    ASSERT_ARGS(Parrot_schedule_broadcast_qentry)
     parrot_event * const event = (parrot_event *)entry->data;
 
     switch (event->type) {
@@ -823,7 +823,7 @@
 static void
 store_io_event(ARGMOD(pending_io_events *ios), ARGIN(parrot_event *ev))
 {
-    ASSERT_ARGS(store_io_event);
+    ASSERT_ARGS(store_io_event)
     if (!ios->alloced) {
         ios->alloced = 16;
         ios->events  = mem_allocate_n_zeroed_typed(ios->alloced, parrot_event *);
@@ -850,7 +850,7 @@
 static void
 io_thread_ready_rd(ARGMOD(pending_io_events *ios), int ready_rd)
 {
-    ASSERT_ARGS(io_thread_ready_rd);
+    ASSERT_ARGS(io_thread_ready_rd)
     size_t i;
 
     for (i = 0; i < ios->n; ++i) {
@@ -888,7 +888,7 @@
 static void*
 io_thread(SHIM(void *data))
 {
-    ASSERT_ARGS(io_thread);
+    ASSERT_ARGS(io_thread)
     fd_set act_rfds, act_wfds;
     int n_highest, i;
     int  running = 1;
@@ -1016,7 +1016,7 @@
 static void
 stop_io_thread(void)
 {
-    ASSERT_ARGS(stop_io_thread);
+    ASSERT_ARGS(stop_io_thread)
 #ifndef WIN32
     io_thread_msg buf;
     /*
@@ -1044,7 +1044,7 @@
 Parrot_event_add_io_event(PARROT_INTERP,
         ARGIN_NULLOK(PMC *pio), ARGIN_NULLOK(PMC *sub), ARGIN_NULLOK(PMC *data), INTVAL which)
 {
-    ASSERT_ARGS(Parrot_event_add_io_event);
+    ASSERT_ARGS(Parrot_event_add_io_event)
     io_thread_msg buf;
     parrot_event * const event = mem_allocate_typed(parrot_event);
 
@@ -1090,7 +1090,7 @@
 static QUEUE_ENTRY*
 dup_entry(ARGIN(const QUEUE_ENTRY *entry))
 {
-    ASSERT_ARGS(dup_entry);
+    ASSERT_ARGS(dup_entry)
     QUEUE_ENTRY * const new_entry = mem_allocate_typed(QUEUE_ENTRY);
 
     new_entry->next = NULL;
@@ -1116,7 +1116,7 @@
 static QUEUE_ENTRY*
 dup_entry_interval(ARGIN(QUEUE_ENTRY *entry), FLOATVAL now)
 {
-    ASSERT_ARGS(dup_entry_interval);
+    ASSERT_ARGS(dup_entry_interval)
     QUEUE_ENTRY  * const new_entry = dup_entry(entry);
     parrot_event * const event     = (parrot_event *)new_entry->data;
 
@@ -1139,7 +1139,7 @@
 static int
 process_events(ARGMOD(QUEUE *event_q))
 {
-    ASSERT_ARGS(process_events);
+    ASSERT_ARGS(process_events)
     FLOATVAL     now;
     QUEUE_ENTRY *entry;
 
@@ -1224,7 +1224,7 @@
 static void*
 event_thread(ARGMOD(void *data))
 {
-    ASSERT_ARGS(event_thread);
+    ASSERT_ARGS(event_thread)
     QUEUE * const event_q = (QUEUE *) data;
     int running = 1;
 
@@ -1297,7 +1297,7 @@
 static opcode_t *
 wait_for_wakeup(PARROT_INTERP, ARGIN_NULLOK(opcode_t *next))
 {
-    ASSERT_ARGS(wait_for_wakeup);
+    ASSERT_ARGS(wait_for_wakeup)
     QUEUE * const tq = interp->task_queue;
 
     interp->sleeping = 1;
@@ -1345,7 +1345,7 @@
 opcode_t *
 Parrot_sleep_on_event(PARROT_INTERP, FLOATVAL t, ARGIN_NULLOK(opcode_t *next))
 {
-    ASSERT_ARGS(Parrot_sleep_on_event);
+    ASSERT_ARGS(Parrot_sleep_on_event)
 #if PARROT_HAS_THREADS
 
     if (interp->sleeping)
@@ -1388,7 +1388,7 @@
 opcode_t *
 Parrot_do_check_events(PARROT_INTERP, ARGIN_NULLOK(opcode_t *next))
 {
-    ASSERT_ARGS(Parrot_do_check_events);
+    ASSERT_ARGS(Parrot_do_check_events)
     if (peek_entry(interp->task_queue))
         return Parrot_do_handle_events(interp, 0, next);
 
@@ -1408,7 +1408,7 @@
 static void
 event_to_exception(PARROT_INTERP, ARGIN(const parrot_event* event))
 {
-    ASSERT_ARGS(event_to_exception);
+    ASSERT_ARGS(event_to_exception)
     const int exit_code = -event->u.signal;
 
     switch (event->u.signal) {
@@ -1450,7 +1450,7 @@
 static opcode_t *
 do_event(PARROT_INTERP, ARGIN(parrot_event* event), ARGIN_NULLOK(opcode_t *next))
 {
-    ASSERT_ARGS(do_event);
+    ASSERT_ARGS(do_event)
     edebug((stderr, "do_event %s\n", et(event)));
     switch (event->type) {
         case EVENT_TYPE_TERMINATE:
@@ -1513,7 +1513,7 @@
 opcode_t *
 Parrot_do_handle_events(PARROT_INTERP, int restore, ARGIN_NULLOK(opcode_t *next))
 {
-    ASSERT_ARGS(Parrot_do_handle_events);
+    ASSERT_ARGS(Parrot_do_handle_events)
     QUEUE * const tq = interp->task_queue;
 
     if (restore)

Modified: trunk/src/exceptions.c
==============================================================================
--- trunk/src/exceptions.c	(original)
+++ trunk/src/exceptions.c	Mon Jan  5 15:17:26 2009
@@ -79,7 +79,7 @@
 Parrot_ex_build_exception(PARROT_INTERP, INTVAL severity,
         long error, ARGIN_NULLOK(STRING *msg))
 {
-    ASSERT_ARGS(Parrot_ex_build_exception);
+    ASSERT_ARGS(Parrot_ex_build_exception)
     PMC *exception = pmc_new(interp, enum_class_Exception);
 
     VTABLE_set_integer_keyed_str(interp, exception, CONST_STRING(interp, "severity"), severity);
@@ -104,7 +104,7 @@
 void
 die_from_exception(PARROT_INTERP, ARGIN(PMC *exception))
 {
-    ASSERT_ARGS(die_from_exception);
+    ASSERT_ARGS(die_from_exception)
     STRING * const message     = VTABLE_get_string(interp, exception);
     INTVAL         exit_status = 1;
     const INTVAL   severity    = VTABLE_get_integer_keyed_str(interp, exception, CONST_STRING(interp, "severity"));
@@ -170,7 +170,7 @@
 void
 Parrot_ex_add_c_handler(PARROT_INTERP, ARGIN(Parrot_runloop *jp))
 {
-    ASSERT_ARGS(Parrot_ex_add_c_handler);
+    ASSERT_ARGS(Parrot_ex_add_c_handler)
     PMC * const handler = pmc_new(interp, enum_class_ExceptionHandler);
     /* Flag to mark a C exception handler */
     PObj_get_FLAGS(handler) |= SUB_FLAG_C_HANDLER;
@@ -193,7 +193,7 @@
 opcode_t *
 Parrot_ex_throw_from_op(PARROT_INTERP, ARGIN(PMC *exception), ARGIN_NULLOK(void *dest))
 {
-    ASSERT_ARGS(Parrot_ex_throw_from_op);
+    ASSERT_ARGS(Parrot_ex_throw_from_op)
     opcode_t   *address;
     PMC * const handler = Parrot_cx_find_handler_local(interp, exception);
     if (PMC_IS_NULL(handler)) {
@@ -241,7 +241,7 @@
 pass_exception_args(PARROT_INTERP, ARGIN(const char *sig),
         ARGIN(opcode_t *dest), ARGIN(Parrot_Context * old_ctx), ...)
 {
-    ASSERT_ARGS(pass_exception_args);
+    ASSERT_ARGS(pass_exception_args)
     va_list   ap;
     opcode_t *next;
 
@@ -257,7 +257,7 @@
 build_exception_from_args(PARROT_INTERP, int ex_type,
         ARGIN(const char *format), va_list arglist)
 {
-    ASSERT_ARGS(build_exception_from_args);
+    ASSERT_ARGS(build_exception_from_args)
     /* Make and set exception message. */
     STRING * const msg =
         strchr(format, '%')
@@ -295,7 +295,7 @@
 void
 Parrot_ex_throw_from_c(PARROT_INTERP, ARGIN(PMC *exception))
 {
-    ASSERT_ARGS(Parrot_ex_throw_from_c);
+    ASSERT_ARGS(Parrot_ex_throw_from_c)
     PMC * const handler = Parrot_cx_find_handler_local(interp, exception);
     RunProfile * const profile      = interp->profile;
     Parrot_runloop    *return_point = interp->current_runloop;
@@ -360,7 +360,7 @@
 Parrot_ex_throw_from_op_args(PARROT_INTERP, ARGIN_NULLOK(void *dest),
         int ex_type, ARGIN(const char *format), ...)
 {
-    ASSERT_ARGS(Parrot_ex_throw_from_op_args);
+    ASSERT_ARGS(Parrot_ex_throw_from_op_args)
     PMC *exception;
 
     va_list arglist;
@@ -393,7 +393,7 @@
 Parrot_ex_throw_from_c_args(PARROT_INTERP, SHIM(void *ret_addr),
         int exitcode, ARGIN(const char *format), ...)
 {
-    ASSERT_ARGS(Parrot_ex_throw_from_c_args);
+    ASSERT_ARGS(Parrot_ex_throw_from_c_args)
     PMC *exception;
 
     va_list arglist;
@@ -420,7 +420,7 @@
 opcode_t *
 Parrot_ex_rethrow_from_op(PARROT_INTERP, ARGIN(PMC *exception))
 {
-    ASSERT_ARGS(Parrot_ex_rethrow_from_op);
+    ASSERT_ARGS(Parrot_ex_rethrow_from_op)
     if (exception->vtable->base_type != enum_class_Exception)
         PANIC(interp, "Illegal rethrow");
 
@@ -445,7 +445,7 @@
 void
 Parrot_ex_rethrow_from_c(PARROT_INTERP, ARGIN(PMC *exception))
 {
-    ASSERT_ARGS(Parrot_ex_rethrow_from_c);
+    ASSERT_ARGS(Parrot_ex_rethrow_from_c)
     Parrot_ex_mark_unhandled(interp, exception);
 
     Parrot_ex_throw_from_c(interp, exception);
@@ -465,7 +465,7 @@
 void
 Parrot_ex_mark_unhandled(PARROT_INTERP, ARGIN(PMC *exception))
 {
-    ASSERT_ARGS(Parrot_ex_mark_unhandled);
+    ASSERT_ARGS(Parrot_ex_mark_unhandled)
     VTABLE_set_integer_keyed_str(interp, exception, CONST_STRING(interp, "handled"), -1);
 }
 
@@ -485,7 +485,7 @@
 size_t
 Parrot_ex_calc_handler_offset(PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_ex_calc_handler_offset);
+    ASSERT_ARGS(Parrot_ex_calc_handler_offset)
     PMC * const exception = VTABLE_pop_pmc(interp, interp->scheduler);
 
     /* now fill rest of exception, locate handler and get
@@ -521,7 +521,7 @@
 Parrot_assert(INTVAL condition, ARGIN(const char *condition_string),
         ARGIN(const char *file), unsigned int line)
 {
-    ASSERT_ARGS(Parrot_assert);
+    ASSERT_ARGS(Parrot_assert)
     if (!condition)
         Parrot_confess(condition_string, file, line);
 }
@@ -541,7 +541,7 @@
 void
 Parrot_confess(ARGIN(const char *cond), ARGIN(const char *file), unsigned int line)
 {
-    ASSERT_ARGS(Parrot_confess);
+    ASSERT_ARGS(Parrot_confess)
     fprintf(stderr, "%s:%u: failed assertion '%s'\n", file, line, cond);
     Parrot_print_backtrace();
     abort();
@@ -561,7 +561,7 @@
 void
 Parrot_print_backtrace(void)
 {
-    ASSERT_ARGS(Parrot_print_backtrace);
+    ASSERT_ARGS(Parrot_print_backtrace)
 #ifdef PARROT_HAS_BACKTRACE
 #  define BACKTRACE_DEPTH 32
 /*#  define BACKTRACE_VERBOSE */
@@ -627,7 +627,7 @@
 void
 exit_fatal(int exitcode, ARGIN(const char *format), ...)
 {
-    ASSERT_ARGS(exit_fatal);
+    ASSERT_ARGS(exit_fatal)
     va_list arglist;
     va_start(arglist, format);
     vfprintf(stderr, format, arglist);
@@ -663,7 +663,7 @@
 do_panic(NULLOK_INTERP, ARGIN_NULLOK(const char *message),
          ARGIN_NULLOK(const char *file), unsigned int line)
 {
-    ASSERT_ARGS(do_panic);
+    ASSERT_ARGS(do_panic)
     /* Note: we can't format any floats in here--Parrot_sprintf
     ** may panic because of floats.
     ** and we don't use Parrot_sprintf or such, because we are

Modified: trunk/src/exec.c
==============================================================================
--- trunk/src/exec.c	(original)
+++ trunk/src/exec.c	Mon Jan  5 15:17:26 2009
@@ -86,7 +86,7 @@
 Parrot_exec(PARROT_INTERP, ARGIN(opcode_t *pc),
         ARGIN(opcode_t *code_start), ARGIN(opcode_t *code_end))
 {
-    ASSERT_ARGS(Parrot_exec);
+    ASSERT_ARGS(Parrot_exec)
 #ifdef JIT_CGP
     int i, j *k;
 #endif
@@ -156,7 +156,7 @@
 add_data_member(ARGMOD(Parrot_exec_objfile_t *obj),
         ARGIN_NULLOK(const void *src), size_t len)
 {
-    ASSERT_ARGS(add_data_member);
+    ASSERT_ARGS(add_data_member)
     char *cp;
 
     if (obj->data.size == 0) {
@@ -194,7 +194,7 @@
 static void
 exec_init(ARGIN(Parrot_exec_objfile_t *obj))
 {
-    ASSERT_ARGS(exec_init);
+    ASSERT_ARGS(exec_init)
     obj->text_rellocation_table = (Parrot_exec_rellocation_t *)
         mem_sys_allocate_zeroed(sizeof (Parrot_exec_rellocation_t));
     obj->data_rellocation_table = (Parrot_exec_rellocation_t *)
@@ -234,7 +234,7 @@
 Parrot_exec_add_symbol(ARGMOD(Parrot_exec_objfile_t *obj),
         ARGIN(const char *symbol), int stype)
 {
-    ASSERT_ARGS(Parrot_exec_add_symbol);
+    ASSERT_ARGS(Parrot_exec_add_symbol)
 
     int symbol_number = symbol_list_find(obj, symbol);
     if (symbol_number == -1) {
@@ -286,7 +286,7 @@
 Parrot_exec_add_text_rellocation_reg(ARGIN(Parrot_exec_objfile_t *obj),
         ARGIN(char *nptr), ARGIN(const char *var), int offset, int disp)
 {
-    ASSERT_ARGS(Parrot_exec_add_text_rellocation_reg);
+    ASSERT_ARGS(Parrot_exec_add_text_rellocation_reg)
     Parrot_exec_add_text_rellocation(obj, nptr, RTYPE_COM, var, disp);
     return (int *)offset;
 }
@@ -307,7 +307,7 @@
 Parrot_exec_add_text_rellocation_func(ARGIN(Parrot_exec_objfile_t *obj),
         ARGIN(char *nptr), ARGIN(const char *func_name))
 {
-    ASSERT_ARGS(Parrot_exec_add_text_rellocation_func);
+    ASSERT_ARGS(Parrot_exec_add_text_rellocation_func)
     Parrot_exec_add_text_rellocation(obj, nptr, RTYPE_FUNC, func_name, 1);
 }
 
@@ -326,7 +326,7 @@
 Parrot_exec_add_text_rellocation(ARGIN(Parrot_exec_objfile_t *obj), ARGIN(char *nptr),
     int type, ARGIN(const char *symbol), int disp)
 {
-    ASSERT_ARGS(Parrot_exec_add_text_rellocation);
+    ASSERT_ARGS(Parrot_exec_add_text_rellocation)
     int symbol_number;
     char *addr;
     Parrot_exec_rellocation_t * new_relloc = (Parrot_exec_rellocation_t *)
@@ -375,7 +375,7 @@
 static int
 symbol_list_find(ARGIN(const Parrot_exec_objfile_t *obj), ARGIN(const char *symbol))
 {
-    ASSERT_ARGS(symbol_list_find);
+    ASSERT_ARGS(symbol_list_find)
     int i;
 
     for (i = 0; i < obj->symbol_count; i++)

Modified: trunk/src/exit.c
==============================================================================
--- trunk/src/exit.c	(original)
+++ trunk/src/exit.c	Mon Jan  5 15:17:26 2009
@@ -40,7 +40,7 @@
 void
 Parrot_on_exit(PARROT_INTERP, NOTNULL(exit_handler_f function), ARGIN_NULLOK(void *arg))
 {
-    ASSERT_ARGS(Parrot_on_exit);
+    ASSERT_ARGS(Parrot_on_exit)
     /* RT#46403  we might want locking around the list access.   I'm sure this
      * will be the least of the threading issues. */
 
@@ -67,7 +67,7 @@
 void
 Parrot_exit(PARROT_INTERP, int status)
 {
-    ASSERT_ARGS(Parrot_exit);
+    ASSERT_ARGS(Parrot_exit)
     /* call all the exit handlers */
     /* we are well "below" the runloop now, where lo_var_ptr
      * is set usually - exit handlers may run some resource-hungry

Modified: trunk/src/extend.c
==============================================================================
--- trunk/src/extend.c	(original)
+++ trunk/src/extend.c	Mon Jan  5 15:17:26 2009
@@ -90,7 +90,7 @@
 Parrot_vfprintf(PARROT_INTERP, ARGIN(Parrot_PMC pio),
         ARGIN(const char *s), va_list args)
 {
-    ASSERT_ARGS(Parrot_vfprintf);
+    ASSERT_ARGS(Parrot_vfprintf)
     STRING * str;
     INTVAL retval;
 
@@ -107,7 +107,7 @@
 Parrot_fprintf(PARROT_INTERP, ARGIN(Parrot_PMC pio),
         ARGIN(const char *s), ...)
 {
-    ASSERT_ARGS(Parrot_fprintf);
+    ASSERT_ARGS(Parrot_fprintf)
     va_list args;
     INTVAL retval;
 
@@ -122,7 +122,7 @@
 int
 Parrot_printf(NULLOK_INTERP, ARGIN(const char *s), ...)
 {
-    ASSERT_ARGS(Parrot_printf);
+    ASSERT_ARGS(Parrot_printf)
     va_list args;
     INTVAL retval;
     va_start(args, s);
@@ -145,7 +145,7 @@
 int
 Parrot_eprintf(NULLOK_INTERP, ARGIN(const char *s), ...)
 {
-    ASSERT_ARGS(Parrot_eprintf);
+    ASSERT_ARGS(Parrot_eprintf)
     va_list args;
     INTVAL retval;
 
@@ -181,7 +181,7 @@
 Parrot_PMC_get_string_intkey(PARROT_INTERP,
         Parrot_PMC pmc, Parrot_Int key)
 {
-    ASSERT_ARGS(Parrot_PMC_get_string_intkey);
+    ASSERT_ARGS(Parrot_PMC_get_string_intkey)
     Parrot_String retval;
     PARROT_CALLIN_START(interp);
     retval = VTABLE_get_string_keyed_int(interp, pmc, key);
@@ -207,7 +207,7 @@
 Parrot_PMC_get_pointer_intkey(PARROT_INTERP,
         Parrot_PMC pmc, Parrot_Int key)
 {
-    ASSERT_ARGS(Parrot_PMC_get_pointer_intkey);
+    ASSERT_ARGS(Parrot_PMC_get_pointer_intkey)
     void *retval;
     PARROT_CALLIN_START(interp);
     retval = VTABLE_get_pointer_keyed_int(interp, pmc, key);
@@ -230,7 +230,7 @@
 Parrot_PMC_get_pmc_intkey(PARROT_INTERP,
         Parrot_PMC pmc, Parrot_Int key)
 {
-    ASSERT_ARGS(Parrot_PMC_get_pmc_intkey);
+    ASSERT_ARGS(Parrot_PMC_get_pmc_intkey)
     Parrot_PMC retval;
     PARROT_CALLIN_START(interp);
     retval = VTABLE_get_pmc_keyed_int(interp, pmc, key);
@@ -252,7 +252,7 @@
 Parrot_Int
 Parrot_PMC_get_intval(PARROT_INTERP, Parrot_PMC pmc)
 {
-    ASSERT_ARGS(Parrot_PMC_get_intval);
+    ASSERT_ARGS(Parrot_PMC_get_intval)
     Parrot_Int retval;
     PARROT_CALLIN_START(interp);
     retval = VTABLE_get_integer(interp, pmc);
@@ -275,7 +275,7 @@
 Parrot_PMC_get_intval_intkey(PARROT_INTERP,
         Parrot_PMC pmc, Parrot_Int key)
 {
-    ASSERT_ARGS(Parrot_PMC_get_intval_intkey);
+    ASSERT_ARGS(Parrot_PMC_get_intval_intkey)
     Parrot_Int retval;
     PARROT_CALLIN_START(interp);
     retval = VTABLE_get_integer_keyed_int(interp, pmc, key);
@@ -298,7 +298,7 @@
 Parrot_PMC_get_intval_pmckey(PARROT_INTERP,
         Parrot_PMC pmc, Parrot_PMC key)
 {
-    ASSERT_ARGS(Parrot_PMC_get_intval_pmckey);
+    ASSERT_ARGS(Parrot_PMC_get_intval_pmckey)
     Parrot_Int retval;
     PARROT_CALLIN_START(interp);
     retval = VTABLE_get_integer_keyed(interp, pmc, key);
@@ -320,7 +320,7 @@
 Parrot_Float
 Parrot_PMC_get_numval(PARROT_INTERP, Parrot_PMC pmc)
 {
-    ASSERT_ARGS(Parrot_PMC_get_numval);
+    ASSERT_ARGS(Parrot_PMC_get_numval)
     Parrot_Float retval;
     PARROT_CALLIN_START(interp);
     retval = VTABLE_get_number(interp, pmc);
@@ -343,7 +343,7 @@
 Parrot_PMC_get_numval_intkey(PARROT_INTERP,
         Parrot_PMC pmc, Parrot_Int key)
 {
-    ASSERT_ARGS(Parrot_PMC_get_numval_intkey);
+    ASSERT_ARGS(Parrot_PMC_get_numval_intkey)
     Parrot_Float retval;
     PARROT_CALLIN_START(interp);
     retval = VTABLE_get_number_keyed_int(interp, pmc, key);
@@ -370,7 +370,7 @@
 Parrot_PMC_get_cstring_intkey(PARROT_INTERP,
         Parrot_PMC pmc, Parrot_Int key)
 {
-    ASSERT_ARGS(Parrot_PMC_get_cstring_intkey);
+    ASSERT_ARGS(Parrot_PMC_get_cstring_intkey)
     STRING *intermediate;
     char   *retval;
 
@@ -400,7 +400,7 @@
 char *
 Parrot_PMC_get_cstring(PARROT_INTERP, Parrot_PMC pmc)
 {
-    ASSERT_ARGS(Parrot_PMC_get_cstring);
+    ASSERT_ARGS(Parrot_PMC_get_cstring)
     STRING *intermediate;
     char   *retval;
 
@@ -434,7 +434,7 @@
 Parrot_PMC_get_cstringn(PARROT_INTERP, ARGIN(Parrot_PMC pmc),
         ARGOUT(Parrot_Int *length))
 {
-    ASSERT_ARGS(Parrot_PMC_get_cstringn);
+    ASSERT_ARGS(Parrot_PMC_get_cstringn)
     char *retval;
 
     PARROT_CALLIN_START(interp);
@@ -467,7 +467,7 @@
 Parrot_PMC_get_cstringn_intkey(PARROT_INTERP, ARGIN(Parrot_PMC pmc),
         ARGOUT(Parrot_Int *length), Parrot_Int key)
 {
-    ASSERT_ARGS(Parrot_PMC_get_cstringn_intkey);
+    ASSERT_ARGS(Parrot_PMC_get_cstringn_intkey)
     char *retval;
 
     PARROT_CALLIN_START(interp);
@@ -494,7 +494,7 @@
 Parrot_PMC_set_string(PARROT_INTERP,
         Parrot_PMC pmc, Parrot_String value)
 {
-    ASSERT_ARGS(Parrot_PMC_set_string);
+    ASSERT_ARGS(Parrot_PMC_set_string)
     PARROT_CALLIN_START(interp);
     VTABLE_set_string_native(interp, pmc, value);
     PARROT_CALLIN_END(interp);
@@ -515,7 +515,7 @@
 Parrot_PMC_set_string_intkey(PARROT_INTERP,
         Parrot_PMC pmc, Parrot_Int key, Parrot_String value)
 {
-    ASSERT_ARGS(Parrot_PMC_set_string_intkey);
+    ASSERT_ARGS(Parrot_PMC_set_string_intkey)
     PARROT_CALLIN_START(interp);
     VTABLE_set_string_keyed_int(interp, pmc, key, value);
     PARROT_CALLIN_END(interp);
@@ -536,7 +536,7 @@
 Parrot_PMC_set_pmc_intkey(PARROT_INTERP,
         Parrot_PMC pmc, Parrot_Int key, Parrot_PMC value)
 {
-    ASSERT_ARGS(Parrot_PMC_set_pmc_intkey);
+    ASSERT_ARGS(Parrot_PMC_set_pmc_intkey)
     PARROT_CALLIN_START(interp);
     VTABLE_set_pmc_keyed_int(interp, pmc, key, value);
     PARROT_CALLIN_END(interp);
@@ -557,7 +557,7 @@
 Parrot_PMC_set_pmc_pmckey(PARROT_INTERP,
         Parrot_PMC pmc, Parrot_PMC key, Parrot_PMC value)
 {
-    ASSERT_ARGS(Parrot_PMC_set_pmc_pmckey);
+    ASSERT_ARGS(Parrot_PMC_set_pmc_pmckey)
     PARROT_CALLIN_START(interp);
     VTABLE_set_pmc_keyed(interp, pmc, key, value);
     PARROT_CALLIN_END(interp);
@@ -578,7 +578,7 @@
 Parrot_PMC_set_pointer_intkey(PARROT_INTERP,
         ARGIN(Parrot_PMC pmc), Parrot_Int key, ARGIN_NULLOK(void *value))
 {
-    ASSERT_ARGS(Parrot_PMC_set_pointer_intkey);
+    ASSERT_ARGS(Parrot_PMC_set_pointer_intkey)
     PARROT_CALLIN_START(interp);
     VTABLE_set_pointer_keyed_int(interp, pmc, key, value);
     PARROT_CALLIN_END(interp);
@@ -598,7 +598,7 @@
 void
 Parrot_PMC_set_intval(PARROT_INTERP, Parrot_PMC pmc, Parrot_Int value)
 {
-    ASSERT_ARGS(Parrot_PMC_set_intval);
+    ASSERT_ARGS(Parrot_PMC_set_intval)
     PARROT_CALLIN_START(interp);
     VTABLE_set_integer_native(interp, pmc, value);
     PARROT_CALLIN_END(interp);
@@ -619,7 +619,7 @@
 Parrot_PMC_set_intval_intkey(PARROT_INTERP,
         Parrot_PMC pmc, Parrot_Int key, Parrot_Int value)
 {
-    ASSERT_ARGS(Parrot_PMC_set_intval_intkey);
+    ASSERT_ARGS(Parrot_PMC_set_intval_intkey)
     PARROT_CALLIN_START(interp);
     VTABLE_set_integer_keyed_int(interp, pmc, key, value);
     PARROT_CALLIN_END(interp);
@@ -639,7 +639,7 @@
 void
 Parrot_PMC_set_numval(PARROT_INTERP, Parrot_PMC pmc, Parrot_Float value)
 {
-    ASSERT_ARGS(Parrot_PMC_set_numval);
+    ASSERT_ARGS(Parrot_PMC_set_numval)
     PARROT_CALLIN_START(interp);
     VTABLE_set_number_native(interp, pmc, value);
     PARROT_CALLIN_END(interp);
@@ -660,7 +660,7 @@
 Parrot_PMC_set_numval_intkey(PARROT_INTERP,
         Parrot_PMC pmc, Parrot_Int key, Parrot_Float value)
 {
-    ASSERT_ARGS(Parrot_PMC_set_numval_intkey);
+    ASSERT_ARGS(Parrot_PMC_set_numval_intkey)
     PARROT_CALLIN_START(interp);
     VTABLE_set_number_keyed_int(interp, pmc, key, value);
     PARROT_CALLIN_END(interp);
@@ -680,7 +680,7 @@
 void
 Parrot_PMC_set_cstring(PARROT_INTERP, Parrot_PMC pmc, ARGIN_NULLOK(const char *value))
 {
-    ASSERT_ARGS(Parrot_PMC_set_cstring);
+    ASSERT_ARGS(Parrot_PMC_set_cstring)
     PARROT_CALLIN_START(interp);
     VTABLE_set_string_native(interp, pmc,
                              string_from_cstring(interp, value, 0));
@@ -702,7 +702,7 @@
 Parrot_PMC_set_cstring_intkey(PARROT_INTERP,
         Parrot_PMC pmc, Parrot_Int key, ARGIN_NULLOK(const char *value))
 {
-    ASSERT_ARGS(Parrot_PMC_set_cstring_intkey);
+    ASSERT_ARGS(Parrot_PMC_set_cstring_intkey)
     PARROT_CALLIN_START(interp);
     VTABLE_set_string_keyed_int(interp, pmc, key,
                                 string_from_cstring(interp, value, 0));
@@ -724,7 +724,7 @@
 Parrot_PMC_set_cstringn(PARROT_INTERP,
         Parrot_PMC pmc, ARGIN_NULLOK(const char *value), Parrot_UInt length)
 {
-    ASSERT_ARGS(Parrot_PMC_set_cstringn);
+    ASSERT_ARGS(Parrot_PMC_set_cstringn)
     PARROT_CALLIN_START(interp);
     VTABLE_set_string_native(interp, pmc,
                              string_from_cstring(interp, value, length));
@@ -746,7 +746,7 @@
 Parrot_PMC_push_intval(PARROT_INTERP,
         Parrot_PMC pmc, Parrot_Int value)
 {
-    ASSERT_ARGS(Parrot_PMC_push_intval);
+    ASSERT_ARGS(Parrot_PMC_push_intval)
     PARROT_CALLIN_START(interp);
     VTABLE_push_integer(interp, pmc, value);
     PARROT_CALLIN_END(interp);
@@ -766,7 +766,7 @@
 void
 Parrot_PMC_push_numval(PARROT_INTERP, Parrot_PMC pmc, Parrot_Float value)
 {
-    ASSERT_ARGS(Parrot_PMC_push_numval);
+    ASSERT_ARGS(Parrot_PMC_push_numval)
     PARROT_CALLIN_START(interp);
     VTABLE_push_float(interp, pmc, value);
     PARROT_CALLIN_END(interp);
@@ -786,7 +786,7 @@
 void
 Parrot_PMC_delete_pmckey(PARROT_INTERP, Parrot_PMC pmc, Parrot_PMC key)
 {
-    ASSERT_ARGS(Parrot_PMC_delete_pmckey);
+    ASSERT_ARGS(Parrot_PMC_delete_pmckey)
     PARROT_CALLIN_START(interp);
     VTABLE_delete_keyed(interp, pmc, key);
     PARROT_CALLIN_END(interp);
@@ -808,7 +808,7 @@
         Parrot_PMC pmc, Parrot_Int key, ARGIN_NULLOK(const char *value),
         Parrot_UInt length)
 {
-    ASSERT_ARGS(Parrot_PMC_set_cstringn_intkey);
+    ASSERT_ARGS(Parrot_PMC_set_cstringn_intkey)
     PARROT_CALLIN_START(interp);
     VTABLE_set_string_keyed_int(interp, pmc, key,
                                 string_from_cstring(interp, value, length));
@@ -829,7 +829,7 @@
 Parrot_PMC
 Parrot_PMC_new(PARROT_INTERP, Parrot_Int type)
 {
-    ASSERT_ARGS(Parrot_PMC_new);
+    ASSERT_ARGS(Parrot_PMC_new)
     Parrot_PMC newpmc;
     PARROT_CALLIN_START(interp);
     newpmc = pmc_new_noinit(interp, type);
@@ -852,7 +852,7 @@
 Parrot_Int
 Parrot_PMC_typenum(PARROT_INTERP, ARGIN_NULLOK(const char *_class))
 {
-    ASSERT_ARGS(Parrot_PMC_typenum);
+    ASSERT_ARGS(Parrot_PMC_typenum)
     Parrot_Int retval;
     PARROT_CALLIN_START(interp);
     retval = pmc_type(interp, string_from_cstring(interp, _class, 0));
@@ -874,7 +874,7 @@
 Parrot_PMC
 Parrot_PMC_null(void)
 {
-    ASSERT_ARGS(Parrot_PMC_null);
+    ASSERT_ARGS(Parrot_PMC_null)
     return PMCNULL;
 }
 
@@ -892,7 +892,7 @@
 void
 Parrot_free_cstring(ARGIN_NULLOK(char *string))
 {
-    ASSERT_ARGS(Parrot_free_cstring);
+    ASSERT_ARGS(Parrot_free_cstring)
     string_cstring_free(string);
 }
 
@@ -924,7 +924,7 @@
 Parrot_call_sub(PARROT_INTERP, Parrot_PMC sub,
                  ARGIN(const char *signature), ...)
 {
-    ASSERT_ARGS(Parrot_call_sub);
+    ASSERT_ARGS(Parrot_call_sub)
     va_list ap;
     void *result;
 
@@ -955,7 +955,7 @@
 Parrot_call_sub_ret_int(PARROT_INTERP, Parrot_PMC sub,
                  ARGIN(const char *signature), ...)
 {
-    ASSERT_ARGS(Parrot_call_sub_ret_int);
+    ASSERT_ARGS(Parrot_call_sub_ret_int)
     va_list ap;
     Parrot_Int result;
 
@@ -986,7 +986,7 @@
 Parrot_call_sub_ret_float(PARROT_INTERP, Parrot_PMC sub,
                  ARGIN(const char *signature), ...)
 {
-    ASSERT_ARGS(Parrot_call_sub_ret_float);
+    ASSERT_ARGS(Parrot_call_sub_ret_float)
     va_list      ap;
     Parrot_Float result;
 
@@ -1022,7 +1022,7 @@
 Parrot_call_method(PARROT_INTERP, Parrot_PMC sub, Parrot_PMC obj,
                         Parrot_String method, ARGIN(const char *signature), ...)
 {
-    ASSERT_ARGS(Parrot_call_method);
+    ASSERT_ARGS(Parrot_call_method)
     void    *result;
     va_list ap;
 
@@ -1053,7 +1053,7 @@
 Parrot_call_method_ret_int(PARROT_INTERP, Parrot_PMC sub,
         Parrot_PMC obj, Parrot_String method, ARGIN(const char *signature), ...)
 {
-    ASSERT_ARGS(Parrot_call_method_ret_int);
+    ASSERT_ARGS(Parrot_call_method_ret_int)
     Parrot_Int result;
     va_list    ap;
 
@@ -1081,7 +1081,7 @@
 Parrot_call_method_ret_float(PARROT_INTERP, Parrot_PMC sub,
         Parrot_PMC obj, Parrot_String method, ARGIN(const char *signature), ...)
 {
-    ASSERT_ARGS(Parrot_call_method_ret_float);
+    ASSERT_ARGS(Parrot_call_method_ret_float)
     Parrot_Float result;
     va_list      ap;
 
@@ -1108,7 +1108,7 @@
 Parrot_Int
 Parrot_get_intreg(PARROT_INTERP, Parrot_Int regnum)
 {
-    ASSERT_ARGS(Parrot_get_intreg);
+    ASSERT_ARGS(Parrot_get_intreg)
     return REG_INT(interp, regnum);
 }
 
@@ -1126,7 +1126,7 @@
 Parrot_Float
 Parrot_get_numreg(PARROT_INTERP, Parrot_Int regnum)
 {
-    ASSERT_ARGS(Parrot_get_numreg);
+    ASSERT_ARGS(Parrot_get_numreg)
     return REG_NUM(interp, regnum);
 }
 
@@ -1144,7 +1144,7 @@
 Parrot_String
 Parrot_get_strreg(PARROT_INTERP, Parrot_Int regnum)
 {
-    ASSERT_ARGS(Parrot_get_strreg);
+    ASSERT_ARGS(Parrot_get_strreg)
     return REG_STR(interp, regnum);
 }
 
@@ -1162,7 +1162,7 @@
 Parrot_PMC
 Parrot_get_pmcreg(PARROT_INTERP, Parrot_Int regnum)
 {
-    ASSERT_ARGS(Parrot_get_pmcreg);
+    ASSERT_ARGS(Parrot_get_pmcreg)
     return REG_PMC(interp, regnum);
 }
 
@@ -1181,7 +1181,7 @@
 Parrot_set_intreg(PARROT_INTERP, Parrot_Int regnum,
                   Parrot_Int value)
 {
-    ASSERT_ARGS(Parrot_set_intreg);
+    ASSERT_ARGS(Parrot_set_intreg)
     REG_INT(interp, regnum) = value;
 }
 
@@ -1200,7 +1200,7 @@
 Parrot_set_numreg(PARROT_INTERP, Parrot_Int regnum,
                   Parrot_Float value)
 {
-    ASSERT_ARGS(Parrot_set_numreg);
+    ASSERT_ARGS(Parrot_set_numreg)
     REG_NUM(interp, regnum) = value;
 }
 
@@ -1219,7 +1219,7 @@
 Parrot_set_strreg(PARROT_INTERP, Parrot_Int regnum,
                   Parrot_String value)
 {
-    ASSERT_ARGS(Parrot_set_strreg);
+    ASSERT_ARGS(Parrot_set_strreg)
     REG_STR(interp, regnum) = value;
 }
 
@@ -1238,7 +1238,7 @@
 Parrot_set_pmcreg(PARROT_INTERP, Parrot_Int regnum,
                   Parrot_PMC value)
 {
-    ASSERT_ARGS(Parrot_set_pmcreg);
+    ASSERT_ARGS(Parrot_set_pmcreg)
     REG_PMC(interp, regnum) = value;
 }
 
@@ -1266,7 +1266,7 @@
     Parrot_UInt length, ARGIN_NULLOK(const char * const encoding_name),
     Parrot_UInt flags)
 {
-    ASSERT_ARGS(Parrot_new_string);
+    ASSERT_ARGS(Parrot_new_string)
     Parrot_String retval;
     PARROT_CALLIN_START(interp);
     retval = string_make(interp, buffer, length, encoding_name, flags);
@@ -1289,7 +1289,7 @@
 Parrot_Language
 Parrot_find_language(SHIM_INTERP, SHIM(char *language))
 {
-    ASSERT_ARGS(Parrot_find_language);
+    ASSERT_ARGS(Parrot_find_language)
     return 0;
 }
 
@@ -1309,7 +1309,7 @@
 void
 Parrot_register_pmc(PARROT_INTERP, Parrot_PMC pmc)
 {
-    ASSERT_ARGS(Parrot_register_pmc);
+    ASSERT_ARGS(Parrot_register_pmc)
     PARROT_CALLIN_START(interp);
     dod_register_pmc(interp, pmc);
     PARROT_CALLIN_END(interp);
@@ -1331,7 +1331,7 @@
 void
 Parrot_unregister_pmc(PARROT_INTERP, Parrot_PMC pmc)
 {
-    ASSERT_ARGS(Parrot_unregister_pmc);
+    ASSERT_ARGS(Parrot_unregister_pmc)
     PARROT_CALLIN_START(interp);
     dod_unregister_pmc(interp, pmc);
     PARROT_CALLIN_END(interp);
@@ -1351,7 +1351,7 @@
 void
 Parrot_PMC_set_vtable(SHIM_INTERP, Parrot_PMC pmc, Parrot_VTABLE vtable)
 {
-    ASSERT_ARGS(Parrot_PMC_set_vtable);
+    ASSERT_ARGS(Parrot_PMC_set_vtable)
     pmc->vtable = vtable;
 }
 
@@ -1370,7 +1370,7 @@
 Parrot_VTABLE
 Parrot_get_vtable(PARROT_INTERP, Parrot_Int id)
 {
-    ASSERT_ARGS(Parrot_get_vtable);
+    ASSERT_ARGS(Parrot_get_vtable)
     return interp->vtables[id];
 }
 

Modified: trunk/src/gc/dod.c
==============================================================================
--- trunk/src/gc/dod.c	(original)
+++ trunk/src/gc/dod.c	Mon Jan  5 15:17:26 2009
@@ -102,7 +102,7 @@
 static void
 mark_special(PARROT_INTERP, ARGIN(PMC *obj))
 {
-    ASSERT_ARGS(mark_special);
+    ASSERT_ARGS(mark_special)
     int     hi_prio;
     Arenas *arena_base;
 
@@ -195,7 +195,7 @@
 void
 pobject_lives(PARROT_INTERP, ARGMOD(PObj *obj))
 {
-    ASSERT_ARGS(pobject_lives);
+    ASSERT_ARGS(pobject_lives)
 #if PARROT_GC_GMS
     do {
         if (!PObj_live_TEST(obj) && \
@@ -267,7 +267,7 @@
 int
 Parrot_dod_trace_root(PARROT_INTERP, int trace_stack)
 {
-    ASSERT_ARGS(Parrot_dod_trace_root);
+    ASSERT_ARGS(Parrot_dod_trace_root)
     Arenas           * const arena_base = interp->arena_base;
     Parrot_Context   *ctx;
     PObj             *obj;
@@ -379,7 +379,7 @@
 static int
 trace_active_PMCs(PARROT_INTERP, int trace_stack)
 {
-    ASSERT_ARGS(trace_active_PMCs);
+    ASSERT_ARGS(trace_active_PMCs)
     if (!Parrot_dod_trace_root(interp, trace_stack))
         return 0;
 
@@ -401,7 +401,7 @@
 int
 Parrot_dod_trace_children(PARROT_INTERP, size_t how_many)
 {
-    ASSERT_ARGS(Parrot_dod_trace_children);
+    ASSERT_ARGS(Parrot_dod_trace_children)
     Arenas * const arena_base = interp->arena_base;
     const int      lazy_dod   = arena_base->lazy_dod;
     PMC           *current    = arena_base->dod_mark_start;
@@ -490,7 +490,7 @@
 void
 Parrot_dod_trace_pmc_data(PARROT_INTERP, ARGIN(PMC *p))
 {
-    ASSERT_ARGS(Parrot_dod_trace_pmc_data);
+    ASSERT_ARGS(Parrot_dod_trace_pmc_data)
     /* malloced array of PMCs */
     PMC ** const data = PMC_data_typed(p, PMC **);
 
@@ -518,7 +518,7 @@
 void
 clear_cow(PARROT_INTERP, ARGMOD(Small_Object_Pool *pool), int cleanup)
 {
-    ASSERT_ARGS(clear_cow);
+    ASSERT_ARGS(clear_cow)
     const UINTVAL object_size = pool->object_size;
     Small_Object_Arena *cur_arena;
 
@@ -564,7 +564,7 @@
 void
 used_cow(PARROT_INTERP, ARGMOD(Small_Object_Pool *pool), int cleanup)
 {
-    ASSERT_ARGS(used_cow);
+    ASSERT_ARGS(used_cow)
     const UINTVAL object_size = pool->object_size;
     Small_Object_Arena *cur_arena;
 
@@ -609,7 +609,7 @@
 void
 Parrot_dod_sweep(PARROT_INTERP, ARGMOD(Small_Object_Pool *pool))
 {
-    ASSERT_ARGS(Parrot_dod_sweep);
+    ASSERT_ARGS(Parrot_dod_sweep)
     UINTVAL total_used        = 0;
     const UINTVAL object_size = pool->object_size;
 
@@ -700,7 +700,7 @@
 Parrot_dod_free_pmc(PARROT_INTERP, SHIM(Small_Object_Pool *pool),
         ARGMOD(PObj *p))
 {
-    ASSERT_ARGS(Parrot_dod_free_pmc);
+    ASSERT_ARGS(Parrot_dod_free_pmc)
     PMC    * const pmc        = (PMC *)p;
     Arenas * const arena_base = interp->arena_base;
 
@@ -737,7 +737,7 @@
 void
 Parrot_free_pmc_ext(PARROT_INTERP, ARGMOD(PMC *p))
 {
-    ASSERT_ARGS(Parrot_free_pmc_ext);
+    ASSERT_ARGS(Parrot_free_pmc_ext)
     /* if the PMC has a PMC_EXT structure, return it to the pool/arena */
     Arenas            * const arena_base = interp->arena_base;
     Small_Object_Pool * const ext_pool   = arena_base->pmc_ext_pool;
@@ -771,7 +771,7 @@
 Parrot_dod_free_sysmem(SHIM_INTERP, SHIM(Small_Object_Pool *pool),
         ARGMOD(PObj *b))
 {
-    ASSERT_ARGS(Parrot_dod_free_sysmem);
+    ASSERT_ARGS(Parrot_dod_free_sysmem)
     /* has sysmem allocated, e.g. string_pin */
     if (PObj_sysmem_TEST(b) && PObj_bufstart(b))
         mem_sys_free(PObj_bufstart(b));
@@ -796,7 +796,7 @@
 Parrot_dod_free_buffer_malloc(SHIM_INTERP, SHIM(Small_Object_Pool *pool),
         ARGMOD(PObj *b))
 {
-    ASSERT_ARGS(Parrot_dod_free_buffer_malloc);
+    ASSERT_ARGS(Parrot_dod_free_buffer_malloc)
     /* free allocated space at (int *)bufstart - 1, but not if it used COW or is
      * external */
     PObj_buflen(b) = 0;
@@ -829,7 +829,7 @@
 void
 Parrot_dod_free_buffer(SHIM_INTERP, ARGMOD(Small_Object_Pool *pool), ARGMOD(PObj *b))
 {
-    ASSERT_ARGS(Parrot_dod_free_buffer);
+    ASSERT_ARGS(Parrot_dod_free_buffer)
     Memory_Pool * const mem_pool = (Memory_Pool *)pool->mem_pool;
 
     /* XXX Jarkko reported that on irix pool->mem_pool was NULL, which really
@@ -861,7 +861,7 @@
 static size_t
 find_common_mask(PARROT_INTERP, size_t val1, size_t val2)
 {
-    ASSERT_ARGS(find_common_mask);
+    ASSERT_ARGS(find_common_mask)
     int       i;
     const int bound = sizeof (size_t) * 8;
 
@@ -901,7 +901,7 @@
 void
 trace_mem_block(PARROT_INTERP, size_t lo_var_ptr, size_t hi_var_ptr)
 {
-    ASSERT_ARGS(trace_mem_block);
+    ASSERT_ARGS(trace_mem_block)
     size_t    prefix;
     ptrdiff_t cur_var_ptr;
 
@@ -972,7 +972,7 @@
 static void
 clear_live_bits(ARGIN(const Small_Object_Pool *pool))
 {
-    ASSERT_ARGS(clear_live_bits);
+    ASSERT_ARGS(clear_live_bits)
     Small_Object_Arena *arena;
     const UINTVAL object_size = pool->object_size;
 
@@ -1003,7 +1003,7 @@
 void
 Parrot_dod_clear_live_bits(PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_dod_clear_live_bits);
+    ASSERT_ARGS(Parrot_dod_clear_live_bits)
     Small_Object_Pool * const pool = interp->arena_base->pmc_pool;
     clear_live_bits(pool);
 }
@@ -1021,7 +1021,7 @@
 void
 Parrot_dod_profile_start(PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_dod_profile_start);
+    ASSERT_ARGS(Parrot_dod_profile_start)
     if (Interp_flags_TEST(interp, PARROT_PROFILE_FLAG))
         interp->profile->dod_time = Parrot_floatval_time();
 }
@@ -1040,7 +1040,7 @@
 void
 Parrot_dod_profile_end(PARROT_INTERP, int what)
 {
-    ASSERT_ARGS(Parrot_dod_profile_end);
+    ASSERT_ARGS(Parrot_dod_profile_end)
     if (Interp_flags_TEST(interp, PARROT_PROFILE_FLAG)) {
         RunProfile * const profile = interp->profile;
         const FLOATVAL     now     = Parrot_floatval_time();
@@ -1075,7 +1075,7 @@
 void
 Parrot_dod_ms_run_init(PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_dod_ms_run_init);
+    ASSERT_ARGS(Parrot_dod_ms_run_init)
     Arenas * const arena_base       = interp->arena_base;
 
     arena_base->dod_trace_ptr       = NULL;
@@ -1100,7 +1100,7 @@
 sweep_cb(PARROT_INTERP, ARGMOD(Small_Object_Pool *pool), int flag,
     ARGMOD(void *arg))
 {
-    ASSERT_ARGS(sweep_cb);
+    ASSERT_ARGS(sweep_cb)
     int * const total_free = (int *) arg;
 
 #ifdef GC_IS_MALLOC
@@ -1136,7 +1136,7 @@
 void
 Parrot_dod_ms_run(PARROT_INTERP, UINTVAL flags)
 {
-    ASSERT_ARGS(Parrot_dod_ms_run);
+    ASSERT_ARGS(Parrot_dod_ms_run)
     Arenas * const arena_base = interp->arena_base;
 
     /* XXX these should go into the interpreter */
@@ -1240,7 +1240,7 @@
 void
 Parrot_do_dod_run(PARROT_INTERP, UINTVAL flags)
 {
-    ASSERT_ARGS(Parrot_do_dod_run);
+    ASSERT_ARGS(Parrot_do_dod_run)
     interp->arena_base->do_gc_mark(interp, flags);
     parrot_gc_context(interp);
 }

Modified: trunk/src/gc/gc_gms.c
==============================================================================
--- trunk/src/gc/gc_gms.c	(original)
+++ trunk/src/gc/gc_gms.c	Mon Jan  5 15:17:26 2009
@@ -508,7 +508,7 @@
 static void
 parrot_gc_gms_deinit(PARROT_INTERP)
 {
-    ASSERT_ARGS(parrot_gc_gms_deinit);
+    ASSERT_ARGS(parrot_gc_gms_deinit)
     Arenas * const arena_base = interp->arena_base;
 
     /*
@@ -533,7 +533,7 @@
 static void
 gc_gms_pool_init(PARROT_INTERP, ARGMOD(Small_Object_Pool *pool))
 {
-    ASSERT_ARGS(gc_gms_pool_init);
+    ASSERT_ARGS(gc_gms_pool_init)
     pool->add_free_object = gc_gms_add_free_object;
     pool->get_free_object = gc_gms_get_free_object;
     pool->alloc_objects   = gc_gms_alloc_objects;
@@ -561,7 +561,7 @@
 void
 Parrot_gc_gms_init(PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_gc_gms_init);
+    ASSERT_ARGS(Parrot_gc_gms_init)
     Arenas * const arena_base = interp->arena_base;
 
     arena_base->gc_private = mem_sys_allocate_zeroed(sizeof (Gc_gms_private));
@@ -595,7 +595,7 @@
 gc_gms_add_free_object(PARROT_INTERP, SHIM(Small_Object_Pool *pool),
         SHIM(PObj *to_add))
 {
-    ASSERT_ARGS(gc_gms_add_free_object);
+    ASSERT_ARGS(gc_gms_add_free_object)
     Parrot_ex_throw_from_c_args(interp, NULL, 1, "gms abuse");
 }
 
@@ -645,7 +645,7 @@
 gc_gms_chain_objects(PARROT_INTERP, ARGMOD(Small_Object_Pool *pool),
         ARGIN(Small_Object_Arena *new_arena), size_t real_size)
 {
-    ASSERT_ARGS(gc_gms_chain_objects);
+    ASSERT_ARGS(gc_gms_chain_objects)
     Gc_gms_hdr *next, *prev;
     size_t i, n;
 
@@ -703,7 +703,7 @@
 static void
 gc_gms_alloc_objects(PARROT_INTERP, ARGMOD(Small_Object_Pool *pool))
 {
-    ASSERT_ARGS(gc_gms_alloc_objects);
+    ASSERT_ARGS(gc_gms_alloc_objects)
     const size_t real_size = pool->object_size;
     Small_Object_Arena * const new_arena = mem_internal_allocate(sizeof (Small_Object_Arena));
     const size_t size = real_size * pool->objects_per_alloc;
@@ -736,7 +736,7 @@
 static void
 gc_gms_more_objects(PARROT_INTERP, ARGMOD(Small_Object_Pool *pool))
 {
-    ASSERT_ARGS(gc_gms_more_objects);
+    ASSERT_ARGS(gc_gms_more_objects)
     if (pool->skip)
         pool->skip = 0;
     else if (pool->last_Arena) {
@@ -768,7 +768,7 @@
 static PObj *
 gc_gms_get_free_object(PARROT_INTERP, ARGMOD(Small_Object_Pool *pool))
 {
-    ASSERT_ARGS(gc_gms_get_free_object);
+    ASSERT_ARGS(gc_gms_get_free_object)
     PObj *ptr;
     Gc_gms_hdr *hdr;
 
@@ -821,7 +821,7 @@
 static Gc_gms_gen *
 gc_gms_create_gen(PARROT_INTERP, ARGMOD(Small_Object_Pool *pool), size_t gen_no)
 {
-    ASSERT_ARGS(gc_gms_create_gen);
+    ASSERT_ARGS(gc_gms_create_gen)
     Gc_gms_gen * const gen = mem_sys_allocate(sizeof (*gen));
 
     gen->gen_no = gen_no;
@@ -850,7 +850,7 @@
 static void
 gc_gms_init_gen(PARROT_INTERP, ARGMOD(Small_Object_Pool *pool))
 {
-    ASSERT_ARGS(gc_gms_init_gen);
+    ASSERT_ARGS(gc_gms_init_gen)
     Gc_gms_private *gmsp;
     /*
      * Generations are numbered beginning at zero
@@ -882,7 +882,7 @@
 static Gc_gms_gen *
 gc_gms_find_gen(PARROT_INTERP, ARGIN(const Gc_gms_hdr *h), UINTVAL gen_no)
 {
-    ASSERT_ARGS(gc_gms_find_gen);
+    ASSERT_ARGS(gc_gms_find_gen)
     Gc_gms_gen *gen;
     const Small_Object_Pool * const pool = h->gen->pool;
 
@@ -918,7 +918,7 @@
 static void
 gc_gms_promote(PARROT_INTERP, ARGIN(Gc_gms_hdr *h), UINTVAL gen_no)
 {
-    ASSERT_ARGS(gc_gms_promote);
+    ASSERT_ARGS(gc_gms_promote)
     Gc_gms_gen *gen;
     Gc_gms_hdr *prev, *next;
     Small_Object_Pool * const pool = h->gen->pool;
@@ -966,7 +966,7 @@
 static void
 gc_gms_store_hdr_list(PARROT_INTERP, ARGMOD(Gc_gms_hdr_list *l), ARGIN(Gc_gms_hdr *h))
 {
-    ASSERT_ARGS(gc_gms_store_hdr_list);
+    ASSERT_ARGS(gc_gms_store_hdr_list)
     Gc_gms_hdr_store * const s = l->last;
 
     /* if it's not created or if it's full allocate new store */
@@ -1000,7 +1000,7 @@
 static void
 gc_gms_clear_hdr_list(PARROT_INTERP, ARGMOD(Gc_gms_hdr_list *l))
 {
-    ASSERT_ARGS(gc_gms_clear_hdr_list);
+    ASSERT_ARGS(gc_gms_clear_hdr_list)
     Gc_gms_hdr_store *s, *next;
 
     for (s = l->first; s; s = next) {
@@ -1023,7 +1023,7 @@
 static void
 gc_gms_store_igp(PARROT_INTERP, ARGIN(Gc_gms_hdr *h))
 {
-    ASSERT_ARGS(gc_gms_store_igp);
+    ASSERT_ARGS(gc_gms_store_igp)
     Gc_gms_gen * const gen = h->gen;
     Gc_gms_hdr_list * const igp = &gen->igp;
 
@@ -1043,7 +1043,7 @@
 static void
 gc_gms_clear_igp(PARROT_INTERP, ARGIN(Gc_gms_gen *gen))
 {
-    ASSERT_ARGS(gc_gms_clear_igp);
+    ASSERT_ARGS(gc_gms_clear_igp)
     Gc_gms_hdr_list * const igp = &gen->igp;
 
     gc_gms_clear_hdr_list(interp, igp);
@@ -1066,7 +1066,7 @@
 parrot_gc_gms_wb(PARROT_INTERP, ARGIN(PMC *agg), ARGIN(void *old),
     ARGIN(void *_new))
 {
-    ASSERT_ARGS(parrot_gc_gms_wb);
+    ASSERT_ARGS(parrot_gc_gms_wb)
     Gc_gms_hdr * const nh = PObj_to_GMSH(_new);
     Gc_gms_hdr * const ah = PObj_to_GMSH(agg);
 
@@ -1100,7 +1100,7 @@
 parrot_gc_gms_wb_key(PARROT_INTERP, ARGIN(PMC *agg), ARGIN(void *old),
     ARGIN(void *old_key), ARGIN(void *_new), ARGIN(void *new_key))
 {
-    ASSERT_ARGS(parrot_gc_gms_wb_key);
+    ASSERT_ARGS(parrot_gc_gms_wb_key)
     Gc_gms_hdr *nh, *ah;
 
     /* handle hash values */
@@ -1136,7 +1136,7 @@
 gc_gms_merge_gen(PARROT_INTERP, ARGMOD(Small_Object_Pool *pool),
         int flag, SHIM(Gc_gms_plan *plan))
 {
-    ASSERT_ARGS(gc_gms_merge_gen);
+    ASSERT_ARGS(gc_gms_merge_gen)
     Gc_gms_hdr *h;
 
     /* run through the blacks and set their generation pointer
@@ -1171,7 +1171,7 @@
 gc_gms_use_gen(PARROT_INTERP, ARGMOD(Small_Object_Pool *pool),
         int flag, ARGIN(const Gc_gms_plan *plan))
 {
-    ASSERT_ARGS(gc_gms_use_gen);
+    ASSERT_ARGS(gc_gms_use_gen)
     Gc_gms_gen *gen, *prev;
     UINTVAL next_gen;
 
@@ -1207,7 +1207,7 @@
 static int
 set_gen_cb(PARROT_INTERP, ARGIN(Small_Object_Pool *pool), int flag, ARGIN(void *arg))
 {
-    ASSERT_ARGS(set_gen_cb);
+    ASSERT_ARGS(set_gen_cb)
     Gc_gms_plan * const plan = (Gc_gms_plan *)arg;
 
     if (plan->merge_gen)
@@ -1230,7 +1230,7 @@
 static void
 gc_gms_set_gen(PARROT_INTERP)
 {
-    ASSERT_ARGS(gc_gms_set_gen);
+    ASSERT_ARGS(gc_gms_set_gen)
     Gc_gms_plan plan;
     Gc_gms_private *gmsp;
     /*
@@ -1347,7 +1347,7 @@
 static void
 gc_gms_setto_gray(PARROT_INTERP, ARGIN(Gc_gms_hdr *h), int priority)
 {
-    ASSERT_ARGS(gc_gms_setto_gray);
+    ASSERT_ARGS(gc_gms_setto_gray)
     Small_Object_Pool * const pool = h->gen->pool;
     /*
      * TODO high_priority like in src/dod.c
@@ -1410,7 +1410,7 @@
 static void
 gc_gms_setto_black(PARROT_INTERP, ARGMOD(Gc_gms_hdr *h), int priority)
 {
-    ASSERT_ARGS(gc_gms_setto_black);
+    ASSERT_ARGS(gc_gms_setto_black)
     Small_Object_Pool * const pool = h->gen->pool;
 
     /*
@@ -1471,7 +1471,7 @@
 void
 parrot_gc_gms_pobject_lives(PARROT_INTERP, ARGMOD(PObj *obj))
 {
-    ASSERT_ARGS(parrot_gc_gms_pobject_lives);
+    ASSERT_ARGS(parrot_gc_gms_pobject_lives)
     Gc_gms_hdr *h;
     int priority;
 
@@ -1500,7 +1500,7 @@
 static int
 init_mark_cb(PARROT_INTERP, ARGMOD(Small_Object_Pool *pool), int flag, ARGIN(void *arg))
 {
-    ASSERT_ARGS(init_mark_cb);
+    ASSERT_ARGS(init_mark_cb)
     pool->gray = pool->black = pool->black_fin = pool->white;
 #  if GC_GMS_DEBUG
     gms_debug_verify(interp, pool, "init_mark");
@@ -1521,7 +1521,7 @@
 static void
 gc_gms_init_mark(PARROT_INTERP)
 {
-    ASSERT_ARGS(gc_gms_init_mark);
+    ASSERT_ARGS(gc_gms_init_mark)
     Arenas * const arena_base = interp->arena_base;
 
     arena_base->dod_trace_ptr = NULL;
@@ -1545,7 +1545,7 @@
 static int
 trace_igp_cb(PARROT_INTERP, ARGIN(Small_Object_Pool *pool), int flag, SHIM(void *arg))
 {
-    ASSERT_ARGS(trace_igp_cb);
+    ASSERT_ARGS(trace_igp_cb)
     Gc_gms_hdr_store *s;
     Gc_gms_gen * const gen = pool->last_gen;
     Gc_gms_hdr_list * const igp = &gen->igp;
@@ -1573,7 +1573,7 @@
 static int
 gc_gms_trace_root(PARROT_INTERP, int trace_stack)
 {
-    ASSERT_ARGS(gc_gms_trace_root);
+    ASSERT_ARGS(gc_gms_trace_root)
     const int ret = Parrot_dod_trace_root(interp, trace_stack);
 
     if (ret == 0)
@@ -1595,7 +1595,7 @@
 static int
 trace_children_cb(PARROT_INTERP, ARGIN(Small_Object_Pool *pool), int flag, SHIM(void *arg))
 {
-    ASSERT_ARGS(trace_children_cb);
+    ASSERT_ARGS(trace_children_cb)
     Arenas * const arena_base = interp->arena_base;
     const int lazy_dod = arena_base->lazy_dod;
     const UINTVAL mask = PObj_data_is_PMC_array_FLAG | PObj_custom_mark_FLAG;
@@ -1660,7 +1660,7 @@
 static int
 gc_gms_trace_children(PARROT_INTERP)
 {
-    ASSERT_ARGS(gc_gms_trace_children);
+    ASSERT_ARGS(gc_gms_trace_children)
     return !Parrot_forall_header_pools(interp, POOL_PMC, 0,
             trace_children_cb);
 }
@@ -1680,7 +1680,7 @@
 static int
 sweep_cb_pmc(PARROT_INTERP, ARGIN(Small_Object_Pool *pool), int flag, SHIM(void *arg))
 {
-    ASSERT_ARGS(sweep_cb_pmc);
+    ASSERT_ARGS(sweep_cb_pmc)
     Gc_gms_hdr *h;
     Arenas * const arena_base = interp->arena_base;
 
@@ -1718,7 +1718,7 @@
 static int
 sweep_cb_buf(PARROT_INTERP, ARGMOD(Small_Object_Pool *pool), int flag, SHIM(void *arg))
 {
-    ASSERT_ARGS(sweep_cb_buf);
+    ASSERT_ARGS(sweep_cb_buf)
     Gc_gms_hdr *h;
 
     /* TODO object stats */
@@ -1786,7 +1786,7 @@
 static void
 gc_gms_sweep(PARROT_INTERP)
 {
-    ASSERT_ARGS(gc_gms_sweep);
+    ASSERT_ARGS(gc_gms_sweep)
     Parrot_forall_header_pools(interp, POOL_PMC, 0, sweep_cb_pmc);
     Parrot_forall_header_pools(interp, POOL_BUFFER, 0, sweep_cb_buf);
 }
@@ -1804,7 +1804,7 @@
 static int
 end_cycle_cb(PARROT_INTERP, ARGMOD(Small_Object_Pool *pool), int flag, SHIM(void *arg))
 {
-    ASSERT_ARGS(end_cycle_cb);
+    ASSERT_ARGS(end_cycle_cb)
     Gc_gms_hdr *h;
     /*
      * clear live flags
@@ -1831,7 +1831,7 @@
 static void
 gc_gms_end_cycle(PARROT_INTERP)
 {
-    ASSERT_ARGS(gc_gms_end_cycle);
+    ASSERT_ARGS(gc_gms_end_cycle)
     Parrot_forall_header_pools(interp, POOL_ALL, 0, end_cycle_cb);
 }
 
@@ -1858,7 +1858,7 @@
 static void
 parrot_gc_gms_run(PARROT_INTERP, UINTVAL flags)
 {
-    ASSERT_ARGS(parrot_gc_gms_run);
+    ASSERT_ARGS(parrot_gc_gms_run)
     Arenas * const arena_base = interp->arena_base;
     Gc_gms_private *g_gms;
 
@@ -1911,7 +1911,7 @@
 static void
 gms_debug_verify(PARROT_INTERP, ARGMOD(Small_Object_Pool *pool), ARGIN(const char *action))
 {
-    ASSERT_ARGS(gms_debug_verify);
+    ASSERT_ARGS(gms_debug_verify)
     Gc_gms_hdr *h;
     int bf, gf, wf, ff;
     size_t i;

Modified: trunk/src/gc/gc_ims.c
==============================================================================
--- trunk/src/gc/gc_ims.c	(original)
+++ trunk/src/gc/gc_ims.c	Mon Jan  5 15:17:26 2009
@@ -520,7 +520,7 @@
 static void
 gc_ims_add_free_object(PARROT_INTERP, ARGMOD(Small_Object_Pool *pool), ARGOUT(void *to_add))
 {
-    ASSERT_ARGS(gc_ims_add_free_object);
+    ASSERT_ARGS(gc_ims_add_free_object)
     *(void **)to_add = pool->free_list;
     pool->free_list  = to_add;
 #if DISABLE_GC_DEBUG
@@ -550,7 +550,7 @@
 static void *
 gc_ims_get_free_object(PARROT_INTERP, ARGMOD(Small_Object_Pool *pool))
 {
-    ASSERT_ARGS(gc_ims_get_free_object);
+    ASSERT_ARGS(gc_ims_get_free_object)
     PObj *ptr;
     Arenas * const arena_base    = interp->arena_base;
     Gc_ims_private * const g_ims = (Gc_ims_private *)arena_base->gc_private;
@@ -591,7 +591,7 @@
 static void
 gc_ims_alloc_objects(PARROT_INTERP, ARGMOD(Small_Object_Pool *pool))
 {
-    ASSERT_ARGS(gc_ims_alloc_objects);
+    ASSERT_ARGS(gc_ims_alloc_objects)
     Small_Object_Arena *new_arena;
     size_t size;
 
@@ -622,7 +622,7 @@
 static void
 gc_ims_pool_init(SHIM_INTERP, ARGMOD(Small_Object_Pool *pool))
 {
-    ASSERT_ARGS(gc_ims_pool_init);
+    ASSERT_ARGS(gc_ims_pool_init)
     pool->add_free_object = gc_ims_add_free_object;
     pool->get_free_object = gc_ims_get_free_object;
     pool->alloc_objects   = gc_ims_alloc_objects;
@@ -643,7 +643,7 @@
 static void
 parrot_gc_ims_deinit(PARROT_INTERP)
 {
-    ASSERT_ARGS(parrot_gc_ims_deinit);
+    ASSERT_ARGS(parrot_gc_ims_deinit)
     Arenas * const arena_base = interp->arena_base;
 
     mem_sys_free(arena_base->gc_private);
@@ -667,7 +667,7 @@
 void
 Parrot_gc_ims_init(PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_gc_ims_init);
+    ASSERT_ARGS(Parrot_gc_ims_init)
     Arenas * const arena_base = interp->arena_base;
     arena_base->gc_private    = mem_allocate_zeroed_typed(Gc_ims_private);
 
@@ -695,7 +695,7 @@
 static void
 parrot_gc_ims_reinit(PARROT_INTERP)
 {
-    ASSERT_ARGS(parrot_gc_ims_reinit);
+    ASSERT_ARGS(parrot_gc_ims_reinit)
     Gc_ims_private *g_ims;
     Arenas * const  arena_base = interp->arena_base;
 
@@ -730,7 +730,7 @@
 static void
 parrot_gc_ims_mark(PARROT_INTERP)
 {
-    ASSERT_ARGS(parrot_gc_ims_mark);
+    ASSERT_ARGS(parrot_gc_ims_mark)
     size_t todo;
     double work_factor;
     PMC   *next;
@@ -798,7 +798,7 @@
 static void
 parrot_gc_ims_sweep(PARROT_INTERP)
 {
-    ASSERT_ARGS(parrot_gc_ims_sweep);
+    ASSERT_ARGS(parrot_gc_ims_sweep)
     Arenas * const  arena_base = interp->arena_base;
     Gc_ims_private *g_ims      = (Gc_ims_private *)arena_base->gc_private;
     size_t          n_objects;
@@ -848,7 +848,7 @@
 static int
 collect_cb(PARROT_INTERP, ARGMOD(Small_Object_Pool *pool), SHIM(int flag), ARGIN(void *arg))
 {
-    ASSERT_ARGS(collect_cb);
+    ASSERT_ARGS(collect_cb)
     const int           check_only = (int)(INTVAL)arg;
     Memory_Pool * const mem_pool   = pool->mem_pool;
 
@@ -896,7 +896,7 @@
 static int
 parrot_gc_ims_collect(PARROT_INTERP, int check_only)
 {
-    ASSERT_ARGS(parrot_gc_ims_collect);
+    ASSERT_ARGS(parrot_gc_ims_collect)
 #if defined(GC_IS_MALLOC) && GC_IS_MALLOC
     UNUSED(interp);
     UNUSED(check_only);
@@ -942,7 +942,7 @@
 static void
 parrot_gc_ims_run_increment(PARROT_INTERP)
 {
-    ASSERT_ARGS(parrot_gc_ims_run_increment);
+    ASSERT_ARGS(parrot_gc_ims_run_increment)
     Arenas * const arena_base    = interp->arena_base;
     Gc_ims_private * const g_ims = (Gc_ims_private *)arena_base->gc_private;
 
@@ -1022,7 +1022,7 @@
 static void
 parrot_gc_ims_run(PARROT_INTERP, UINTVAL flags)
 {
-    ASSERT_ARGS(parrot_gc_ims_run);
+    ASSERT_ARGS(parrot_gc_ims_run)
     int                    lazy;
     Arenas * const         arena_base = interp->arena_base;
     Gc_ims_private * const g_ims      = (Gc_ims_private *)arena_base->gc_private;
@@ -1126,7 +1126,7 @@
 void
 Parrot_dod_ims_wb(PARROT_INTERP, ARGMOD(PMC *agg), ARGMOD(PMC *_new))
 {
-    ASSERT_ARGS(Parrot_dod_ims_wb);
+    ASSERT_ARGS(Parrot_dod_ims_wb)
 #if DOD_IMS_GREY_NEW
     IMS_DEBUG((stderr, "%d agg %p mark %p\n",
                 ((Gc_ims_private *)interp->arena_base->

Modified: trunk/src/gc/memory.c
==============================================================================
--- trunk/src/gc/memory.c	(original)
+++ trunk/src/gc/memory.c	Mon Jan  5 15:17:26 2009
@@ -43,7 +43,7 @@
 void *
 mem_sys_allocate(size_t size)
 {
-    ASSERT_ARGS(mem_sys_allocate);
+    ASSERT_ARGS(mem_sys_allocate)
     void * const ptr = malloc(size);
 #ifdef DETAIL_MEMORY_DEBUG
     fprintf(stderr, "Allocated %i at %p\n", size, ptr);
@@ -70,7 +70,7 @@
 void *
 mem__internal_allocate(size_t size, ARGIN(const char *file), int line)
 {
-    ASSERT_ARGS(mem__internal_allocate);
+    ASSERT_ARGS(mem__internal_allocate)
     void * const ptr = malloc((size_t)size);
 #ifdef DETAIL_MEMORY_DEBUG
     fprintf(stderr, "Internal malloc %i at %p (%s/%d)\n",
@@ -101,7 +101,7 @@
 void *
 mem_sys_allocate_zeroed(size_t size)
 {
-    ASSERT_ARGS(mem_sys_allocate_zeroed);
+    ASSERT_ARGS(mem_sys_allocate_zeroed)
     void * const ptr = calloc(1, (size_t)size);
 #ifdef DETAIL_MEMORY_DEBUG
     fprintf(stderr, "Allocated %i at %p\n", size, ptr);
@@ -128,7 +128,7 @@
 void *
 mem__internal_allocate_zeroed(size_t size, ARGIN(const char *file), int line)
 {
-    ASSERT_ARGS(mem__internal_allocate_zeroed);
+    ASSERT_ARGS(mem__internal_allocate_zeroed)
     void * const ptr = calloc(1, (size_t)size);
 #ifdef DETAIL_MEMORY_DEBUG
     fprintf(stderr, "Internal malloc %i at %p (%s/%d)\n",
@@ -160,7 +160,7 @@
 void *
 mem_sys_realloc(ARGFREE(void *from), size_t size)
 {
-    ASSERT_ARGS(mem_sys_realloc);
+    ASSERT_ARGS(mem_sys_realloc)
     void *ptr;
 #ifdef DETAIL_MEMORY_DEBUG
     fprintf(stderr, "Freed %p (realloc -- %i bytes)\n", from, size);
@@ -196,7 +196,7 @@
 void *
 mem_sys_realloc_zeroed(ARGFREE(void *from), size_t size, size_t old_size)
 {
-    ASSERT_ARGS(mem_sys_realloc_zeroed);
+    ASSERT_ARGS(mem_sys_realloc_zeroed)
     void *ptr;
 #ifdef DETAIL_MEMORY_DEBUG
     fprintf(stderr, "Freed %p (realloc -- %i bytes)\n", from, size);
@@ -233,7 +233,7 @@
 mem__internal_realloc(ARGFREE(void *from), size_t size,
         ARGIN(const char *file), int line)
 {
-    ASSERT_ARGS(mem__internal_realloc);
+    ASSERT_ARGS(mem__internal_realloc)
     void * const ptr = realloc(from, size);
 #ifdef DETAIL_MEMORY_DEBUG
     fprintf(stderr, "internal free of %p (realloc -- %i bytes) (%s/%d)\n",
@@ -270,7 +270,7 @@
 mem__internal_realloc_zeroed(ARGFREE(void *from), size_t size, size_t old_size,
     ARGIN(const char *file), int line)
 {
-    ASSERT_ARGS(mem__internal_realloc_zeroed);
+    ASSERT_ARGS(mem__internal_realloc_zeroed)
     void * const ptr = realloc(from, size);
 #  ifdef DETAIL_MEMORY_DEBUG
     fprintf(stderr, "internal free of %p (realloc -- %i bytes) (%s/%d)\n",
@@ -305,7 +305,7 @@
 void
 mem_sys_free(ARGFREE(void *from))
 {
-    ASSERT_ARGS(mem_sys_free);
+    ASSERT_ARGS(mem_sys_free)
 #ifdef DETAIL_MEMORY_DEBUG
     fprintf(stderr, "Freed %p\n", from);
 #endif
@@ -328,7 +328,7 @@
 void
 mem__internal_free(ARGFREE(void *from), ARGIN(const char *file), int line)
 {
-    ASSERT_ARGS(mem__internal_free);
+    ASSERT_ARGS(mem__internal_free)
 #ifdef DETAIL_MEMORY_DEBUG
     fprintf(stderr, "Internal free of %p (%s/%d)\n", from, file, line);
 #else
@@ -353,7 +353,7 @@
 void
 mem_setup_allocator(PARROT_INTERP)
 {
-    ASSERT_ARGS(mem_setup_allocator);
+    ASSERT_ARGS(mem_setup_allocator)
     interp->arena_base = mem_allocate_zeroed_typed(Arenas);
     interp->arena_base->sized_header_pools = NULL;
 

Modified: trunk/src/gc/register.c
==============================================================================
--- trunk/src/gc/register.c	(original)
+++ trunk/src/gc/register.c	Mon Jan  5 15:17:26 2009
@@ -156,7 +156,7 @@
 void
 destroy_context(PARROT_INTERP)
 {
-    ASSERT_ARGS(destroy_context);
+    ASSERT_ARGS(destroy_context)
     Parrot_Context *context = CONTEXT(interp);
     int             slot;
 
@@ -196,7 +196,7 @@
 void
 create_initial_context(PARROT_INTERP)
 {
-    ASSERT_ARGS(create_initial_context);
+    ASSERT_ARGS(create_initial_context)
     static INTVAL   num_regs[] = {32, 32, 32, 32};
     Parrot_Context *ignored;
 
@@ -228,10 +228,10 @@
 void
 parrot_gc_context(PARROT_INTERP)
 {
-    ASSERT_ARGS(parrot_gc_context);
+    ASSERT_ARGS(parrot_gc_context)
 #if CHUNKED_CTX_MEM
     Parrot_Context ctx;
-    ASSERT_ARGS(parrot_gc_context);
+    ASSERT_ARGS(parrot_gc_context)
 
     if (!interp->ctx_mem.threshold)
         return;
@@ -258,7 +258,7 @@
 static void
 clear_regs(PARROT_INTERP, ARGMOD(Parrot_Context *ctx))
 {
-    ASSERT_ARGS(clear_regs);
+    ASSERT_ARGS(clear_regs)
     int i;
 
     /* NULL out registers - P/S have to be NULL for GC
@@ -309,7 +309,7 @@
 init_context(PARROT_INTERP, ARGMOD(Parrot_Context *ctx),
         ARGIN_NULLOK(const Parrot_Context *old))
 {
-    ASSERT_ARGS(init_context);
+    ASSERT_ARGS(init_context)
     ctx->ref_count         = 0;    /* RT #46191 1 - Exceptions !!! */
     ctx->gc_mark           = 0;
     ctx->current_results   = NULL;
@@ -356,7 +356,7 @@
 Parrot_Context *
 Parrot_push_context(PARROT_INTERP, ARGIN(const INTVAL *n_regs_used))
 {
-    ASSERT_ARGS(Parrot_push_context);
+    ASSERT_ARGS(Parrot_push_context)
     Parrot_Context * const old = CONTEXT(interp);
     Parrot_Context * const ctx = Parrot_set_new_context(interp, n_regs_used);
 
@@ -385,7 +385,7 @@
 void
 Parrot_pop_context(PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_pop_context);
+    ASSERT_ARGS(Parrot_pop_context)
     Parrot_Context * const ctx = CONTEXT(interp);
     Parrot_Context * const old = ctx->caller_ctx;
 
@@ -425,7 +425,7 @@
 Parrot_alloc_context(PARROT_INTERP, ARGIN(const INTVAL *number_regs_used),
     ARGIN_NULLOK(Parrot_Context *old))
 {
-    ASSERT_ARGS(Parrot_alloc_context);
+    ASSERT_ARGS(Parrot_alloc_context)
     Parrot_Context *ctx;
     void *p;
 
@@ -522,7 +522,7 @@
 Parrot_Context *
 Parrot_set_new_context(PARROT_INTERP, ARGIN(const INTVAL *number_regs_used))
 {
-    ASSERT_ARGS(Parrot_set_new_context);
+    ASSERT_ARGS(Parrot_set_new_context)
     Parrot_Context *old = CONTEXT(interp);
     Parrot_Context *ctx = Parrot_alloc_context(interp, number_regs_used, old);
 
@@ -550,7 +550,7 @@
 void
 Parrot_free_context(PARROT_INTERP, ARGMOD(Parrot_Context *ctx), int deref)
 {
-    ASSERT_ARGS(Parrot_free_context);
+    ASSERT_ARGS(Parrot_free_context)
     /*
      * The context structure has a reference count, initially 0.
      * This field is incremented when something outside of the normal
@@ -656,7 +656,7 @@
 Parrot_context_ref_trace(PARROT_INTERP, ARGMOD(Parrot_Context *ctx),
         ARGIN(const char *file), int line)
 {
-    ASSERT_ARGS(Parrot_context_ref_trace);
+    ASSERT_ARGS(Parrot_context_ref_trace)
     if (Interp_debug_TEST(interp, PARROT_CTX_DESTROY_DEBUG_FLAG)) {
         const char *name = "unknown";
 
@@ -686,7 +686,7 @@
 void
 Parrot_set_context_threshold(SHIM_INTERP, SHIM(Parrot_Context *ctx))
 {
-    ASSERT_ARGS(Parrot_set_context_threshold);
+    ASSERT_ARGS(Parrot_set_context_threshold)
     /* nothing to do */
 }
 
@@ -712,7 +712,7 @@
 void
 Parrot_clear_i(PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_clear_i);
+    ASSERT_ARGS(Parrot_clear_i)
     int i;
     for (i = 0; i < CONTEXT(interp)->n_regs_used[REGNO_INT]; ++i)
         REG_INT(interp, i) = 0;
@@ -733,7 +733,7 @@
 void
 Parrot_clear_s(PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_clear_s);
+    ASSERT_ARGS(Parrot_clear_s)
     int i;
     for (i = 0; i < CONTEXT(interp)->n_regs_used[REGNO_STR]; ++i)
         REG_STR(interp, i) = NULL;
@@ -754,7 +754,7 @@
 void
 Parrot_clear_p(PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_clear_p);
+    ASSERT_ARGS(Parrot_clear_p)
     int i;
     for (i = 0; i < CONTEXT(interp)->n_regs_used[REGNO_PMC]; ++i)
         REG_PMC(interp, i) = PMCNULL;
@@ -775,7 +775,7 @@
 void
 Parrot_clear_n(PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_clear_n);
+    ASSERT_ARGS(Parrot_clear_n)
     int i;
     for (i = 0; i < CONTEXT(interp)->n_regs_used[REGNO_NUM]; ++i)
         REG_NUM(interp, i) = 0.0;

Modified: trunk/src/gc/res_lea.c
==============================================================================
--- trunk/src/gc/res_lea.c	(original)
+++ trunk/src/gc/res_lea.c	Mon Jan  5 15:17:26 2009
@@ -45,7 +45,7 @@
 void
 Parrot_go_collect(PARROT_INTERP)
 {
-    ASSERT_ARGS(parrot_go_collect);
+    ASSERT_ARGS(parrot_go_collect)
     if (interp->arena_base->GC_block_level) {
         return;
     }
@@ -66,7 +66,7 @@
 static PARROT_INLINE void*
 xmalloc(size_t size)
 {
-    ASSERT_ARGS(xmalloc);
+    ASSERT_ARGS(xmalloc)
     void *p = malloc(size);
     if (!p)
         do_panic(NULL, "malloc: out of mem", __FILE__, __LINE__);
@@ -87,7 +87,7 @@
 static PARROT_INLINE void*
 xcalloc(size_t n, size_t size)
 {
-    ASSERT_ARGS(xcalloc);
+    ASSERT_ARGS(xcalloc)
     void * const p = calloc(n, size);
     if (!p)
         do_panic(NULL, "calloc: out of mem", __FILE__, __LINE__);
@@ -108,7 +108,7 @@
 static PARROT_INLINE void*
 xrealloc(void *p, size_t size)
 {
-    ASSERT_ARGS(xrealloc);
+    ASSERT_ARGS(xrealloc)
     void * const n = realloc(p, size);
     if (!n)
         do_panic(NULL, "realloc: out of mem", __FILE__, __LINE__);
@@ -129,7 +129,7 @@
 void
 Parrot_reallocate(PARROT_INTERP, Buffer *buffer, size_t newsize)
 {
-    ASSERT_ARGS(parrot_reallocate);
+    ASSERT_ARGS(parrot_reallocate)
     const size_t oldlen = PObj_buflen(buffer);
     Buffer_alloc_unit *p;
 
@@ -177,7 +177,7 @@
 void
 Parrot_allocate_aligned(PARROT_INTERP, Buffer *buffer, size_t size)
 {
-    ASSERT_ARGS(parrot_allocate_aligned);
+    ASSERT_ARGS(parrot_allocate_aligned)
     Buffer_alloc_unit *p;
     p = (Buffer_alloc_unit *) xmalloc(Buffer_alloc_offset + size);
     p->ref_count = 0;
@@ -199,7 +199,7 @@
 void
 Parrot_reallocate_string(PARROT_INTERP, STRING *str, size_t newsize)
 {
-    ASSERT_ARGS(parrot_reallocate_string);
+    ASSERT_ARGS(parrot_reallocate_string)
     Buffer_alloc_unit *p;
 
     if (!PObj_bufstart(str)) {
@@ -227,7 +227,7 @@
 void
 Parrot_allocate_string(PARROT_INTERP, STRING *str, size_t size)
 {
-    ASSERT_ARGS(parrot_allocate_string);
+    ASSERT_ARGS(parrot_allocate_string)
     Buffer_alloc_unit *p;
     p = (Buffer_alloc_unit *) xcalloc(Buffer_alloc_offset + size, 1);
     p->ref_count = 0;
@@ -248,7 +248,7 @@
 void
 Parrot_initialize_memory_pools(PARROT_INTERP)
 {
-    ASSERT_ARGS(parrot_initialize_memory_pools);
+    ASSERT_ARGS(parrot_initialize_memory_pools)
 }
 
 /*
@@ -263,7 +263,7 @@
 void
 Parrot_merge_memory_pools(Interp *dest, Interp *source)
 {
-    ASSERT_ARGS(parrot_merge_memory_pools);
+    ASSERT_ARGS(parrot_merge_memory_pools)
 }
 
 /*
@@ -279,7 +279,7 @@
 void
 Parrot_destroy_memory_pools(PARROT_INTERP)
 {
-    ASSERT_ARGS(parrot_destroy_memory_pools);
+    ASSERT_ARGS(parrot_destroy_memory_pools)
 }
 
 /*

Modified: trunk/src/gc/resources.c
==============================================================================
--- trunk/src/gc/resources.c	(original)
+++ trunk/src/gc/resources.c	Mon Jan  5 15:17:26 2009
@@ -143,7 +143,7 @@
 alloc_new_block(PARROT_INTERP, size_t size, ARGMOD(Memory_Pool *pool),
         ARGIN(const char *why))
 {
-    ASSERT_ARGS(alloc_new_block);
+    ASSERT_ARGS(alloc_new_block)
     Memory_Block *new_block;
 
     const size_t alloc_size = (size > pool->minimum_block_size)
@@ -228,7 +228,7 @@
 static void *
 mem_allocate(PARROT_INTERP, size_t size, ARGMOD(Memory_Pool *pool))
 {
-    ASSERT_ARGS(mem_allocate);
+    ASSERT_ARGS(mem_allocate)
     void *return_val;
 
     /* we always should have one block at least */
@@ -305,7 +305,7 @@
 static const char*
 buffer_location(PARROT_INTERP, ARGIN(const PObj *b))
 {
-    ASSERT_ARGS(buffer_location);
+    ASSERT_ARGS(buffer_location)
     int i;
     static char reg[10];
 
@@ -334,7 +334,7 @@
 static void
 debug_print_buf(PARROT_INTERP, ARGIN(const PObj *b))
 {
-    ASSERT_ARGS(debug_print_buf);
+    ASSERT_ARGS(debug_print_buf)
     fprintf(stderr, "found %p, len %d, flags 0x%08x at %s\n",
             b, (int)PObj_buflen(b), (uint)PObj_get_FLAGS(b),
             buffer_location(interp, b));
@@ -361,7 +361,7 @@
 static void
 compact_pool(PARROT_INTERP, ARGMOD(Memory_Pool *pool))
 {
-    ASSERT_ARGS(compact_pool);
+    ASSERT_ARGS(compact_pool)
     INTVAL        j;
     UINTVAL       total_size;
 
@@ -599,7 +599,7 @@
 void
 Parrot_go_collect(PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_go_collect);
+    ASSERT_ARGS(Parrot_go_collect)
     compact_pool(interp, interp->arena_base->memory_pool);
 }
 
@@ -620,7 +620,7 @@
 static size_t
 aligned_size(ARGIN(const Buffer *buffer), size_t len)
 {
-    ASSERT_ARGS(aligned_size);
+    ASSERT_ARGS(aligned_size)
     if (PObj_is_COWable_TEST(buffer))
         len += sizeof (void*);
     if (PObj_aligned_TEST(buffer))
@@ -647,7 +647,7 @@
 static char *
 aligned_mem(ARGIN(const Buffer *buffer), ARGIN(char *mem))
 {
-    ASSERT_ARGS(aligned_mem);
+    ASSERT_ARGS(aligned_mem)
     if (PObj_is_COWable_TEST(buffer))
         mem += sizeof (void*);
     if (PObj_aligned_TEST(buffer))
@@ -676,7 +676,7 @@
 static size_t
 aligned_string_size(size_t len)
 {
-    ASSERT_ARGS(aligned_string_size);
+    ASSERT_ARGS(aligned_string_size)
     len += sizeof (void*);
     len = (len + WORD_ALIGN_1) & WORD_ALIGN_MASK;
     return len;
@@ -697,7 +697,7 @@
 int
 Parrot_in_memory_pool(PARROT_INTERP, ARGIN(void *bufstart))
 {
-    ASSERT_ARGS(Parrot_in_memory_pool);
+    ASSERT_ARGS(Parrot_in_memory_pool)
     Memory_Pool * const pool = interp->arena_base->memory_pool;
     Memory_Block * cur_block = pool->top_block;
 
@@ -735,7 +735,7 @@
 void
 Parrot_reallocate(PARROT_INTERP, ARGMOD(Buffer *buffer), size_t newsize)
 {
-    ASSERT_ARGS(Parrot_reallocate);
+    ASSERT_ARGS(Parrot_reallocate)
     size_t copysize;
     char  *mem;
     Memory_Pool * const pool = interp->arena_base->memory_pool;
@@ -805,7 +805,7 @@
 void
 Parrot_reallocate_string(PARROT_INTERP, ARGMOD(STRING *str), size_t newsize)
 {
-    ASSERT_ARGS(Parrot_reallocate_string);
+    ASSERT_ARGS(Parrot_reallocate_string)
     size_t copysize;
     char *mem, *oldmem;
     size_t new_size, needed, old_size;
@@ -876,7 +876,7 @@
 void
 Parrot_allocate(PARROT_INTERP, ARGOUT(Buffer *buffer), size_t size)
 {
-    ASSERT_ARGS(Parrot_allocate);
+    ASSERT_ARGS(Parrot_allocate)
     PObj_buflen(buffer) = 0;
     PObj_bufstart(buffer) = NULL;
     PARROT_ASSERT((size & WORD_ALIGN_1) == 0);
@@ -901,7 +901,7 @@
 void
 Parrot_allocate_aligned(PARROT_INTERP, ARGOUT(Buffer *buffer), size_t size)
 {
-    ASSERT_ARGS(Parrot_allocate_aligned);
+    ASSERT_ARGS(Parrot_allocate_aligned)
     size_t new_size;
     char *mem;
 
@@ -933,7 +933,7 @@
 void
 Parrot_allocate_string(PARROT_INTERP, ARGOUT(STRING *str), size_t size)
 {
-    ASSERT_ARGS(Parrot_allocate_string);
+    ASSERT_ARGS(Parrot_allocate_string)
     size_t       new_size;
     Memory_Pool *pool;
     char        *mem;
@@ -976,7 +976,7 @@
 static Memory_Pool *
 new_memory_pool(size_t min_block, NULLOK(compact_f compact))
 {
-    ASSERT_ARGS(new_memory_pool);
+    ASSERT_ARGS(new_memory_pool)
     Memory_Pool * const pool = mem_internal_allocate_typed(Memory_Pool);
 
     pool->top_block              = NULL;
@@ -1006,7 +1006,7 @@
 void
 Parrot_initialize_memory_pools(PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_initialize_memory_pools);
+    ASSERT_ARGS(Parrot_initialize_memory_pools)
     Arenas * const arena_base = interp->arena_base;
 
     arena_base->memory_pool   = new_memory_pool(POOL_SIZE, &compact_pool);
@@ -1033,7 +1033,7 @@
 void
 Parrot_destroy_memory_pools(PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_destroy_memory_pools);
+    ASSERT_ARGS(Parrot_destroy_memory_pools)
     int i;
 
     for (i = 0; i < 2; i++) {
@@ -1069,7 +1069,7 @@
 static void
 merge_pools(ARGMOD(Memory_Pool *dest), ARGMOD(Memory_Pool *source))
 {
-    ASSERT_ARGS(merge_pools);
+    ASSERT_ARGS(merge_pools)
     Memory_Block *cur_block;
 
     cur_block = source->top_block;
@@ -1114,7 +1114,7 @@
 void
 Parrot_merge_memory_pools(ARGIN(Interp *dest_interp), ARGIN(Interp *source_interp))
 {
-    ASSERT_ARGS(Parrot_merge_memory_pools);
+    ASSERT_ARGS(Parrot_merge_memory_pools)
     merge_pools(dest_interp->arena_base->constant_string_pool,
                 source_interp->arena_base->constant_string_pool);
 

Modified: trunk/src/gc/smallobject.c
==============================================================================
--- trunk/src/gc/smallobject.c	(original)
+++ trunk/src/gc/smallobject.c	Mon Jan  5 15:17:26 2009
@@ -119,7 +119,7 @@
 INTVAL
 contained_in_pool(ARGIN(const Small_Object_Pool *pool), ARGIN(const void *ptr))
 {
-    ASSERT_ARGS(contained_in_pool);
+    ASSERT_ARGS(contained_in_pool)
     const Small_Object_Arena *arena;
 
     ptr = PObj_to_ARENA(ptr);
@@ -151,7 +151,7 @@
 int
 Parrot_is_const_pmc(PARROT_INTERP, ARGIN(const PMC *pmc))
 {
-    ASSERT_ARGS(Parrot_is_const_pmc);
+    ASSERT_ARGS(Parrot_is_const_pmc)
     Small_Object_Pool * const pool = interp->arena_base->constant_pmc_pool;
     const               int   c    = contained_in_pool(pool, pmc);
 
@@ -179,7 +179,7 @@
 static void
 more_traceable_objects(PARROT_INTERP, ARGMOD(Small_Object_Pool *pool))
 {
-    ASSERT_ARGS(more_traceable_objects);
+    ASSERT_ARGS(more_traceable_objects)
     if (pool->skip)
         pool->skip = 0;
     else {
@@ -213,7 +213,7 @@
 static void
 gc_ms_add_free_pmc_ext(SHIM_INTERP, ARGMOD(Small_Object_Pool *pool), ARGIN(void *to_add))
 {
-    ASSERT_ARGS(gc_ms_add_free_pmc_ext);
+    ASSERT_ARGS(gc_ms_add_free_pmc_ext)
     PMC_EXT *object        = (PMC_EXT *)to_add;
     object->_metadata      = NULL;
 
@@ -236,7 +236,7 @@
 static void
 gc_ms_add_free_object(SHIM_INTERP, ARGMOD(Small_Object_Pool *pool), ARGIN(void *to_add))
 {
-    ASSERT_ARGS(gc_ms_add_free_object);
+    ASSERT_ARGS(gc_ms_add_free_object)
     PObj *object           = (PObj *)to_add;
 
     PObj_flags_SETTO(object, PObj_on_free_list_FLAG);
@@ -265,7 +265,7 @@
 static void *
 gc_ms_get_free_object(PARROT_INTERP, ARGMOD(Small_Object_Pool *pool))
 {
-    ASSERT_ARGS(gc_ms_get_free_object);
+    ASSERT_ARGS(gc_ms_get_free_object)
     PObj *ptr;
     PObj *free_list = (PObj *)pool->free_list;
 
@@ -300,7 +300,7 @@
 static void *
 gc_ms_get_free_pmc_ext(PARROT_INTERP, ARGMOD(Small_Object_Pool *pool))
 {
-    ASSERT_ARGS(gc_ms_get_free_pmc_ext);
+    ASSERT_ARGS(gc_ms_get_free_pmc_ext)
     PMC_EXT *ptr;
     PMC_EXT *free_list = (PMC_EXT *)pool->free_list;
 
@@ -334,7 +334,7 @@
         ARGMOD(Small_Object_Pool  *pool),
         ARGMOD(Small_Object_Arena *arena))
 {
-    ASSERT_ARGS(Parrot_add_to_free_list);
+    ASSERT_ARGS(Parrot_add_to_free_list)
     UINTVAL  i;
     void    *object;
     const UINTVAL num_objects = pool->objects_per_alloc;
@@ -369,7 +369,7 @@
     ARGMOD(Small_Object_Pool *pool),
     ARGMOD(Small_Object_Arena *new_arena), size_t size)
 {
-    ASSERT_ARGS(Parrot_append_arena_in_pool);
+    ASSERT_ARGS(Parrot_append_arena_in_pool)
 
     /* Maintain the *_arena_memory invariant for stack walking code. Set it
      * regardless if we're the first pool to be added. */
@@ -407,7 +407,7 @@
 static void
 gc_ms_alloc_objects(PARROT_INTERP, ARGMOD(Small_Object_Pool *pool))
 {
-    ASSERT_ARGS(gc_ms_alloc_objects);
+    ASSERT_ARGS(gc_ms_alloc_objects)
     /* Setup memory for the new objects */
     Small_Object_Arena * const new_arena =
         mem_internal_allocate_typed(Small_Object_Arena);
@@ -460,7 +460,7 @@
 Small_Object_Pool *
 new_small_object_pool(size_t object_size, size_t objects_per_alloc)
 {
-    ASSERT_ARGS(new_small_object_pool);
+    ASSERT_ARGS(new_small_object_pool)
     Small_Object_Pool * const pool =
         mem_internal_allocate_zeroed_typed(Small_Object_Pool);
 
@@ -487,7 +487,7 @@
 void
 gc_pmc_ext_pool_init(ARGMOD(Small_Object_Pool *pool))
 {
-    ASSERT_ARGS(gc_pmc_ext_pool_init);
+    ASSERT_ARGS(gc_pmc_ext_pool_init)
     pool->add_free_object = gc_ms_add_free_pmc_ext;
     pool->get_free_object = gc_ms_get_free_pmc_ext;
     pool->alloc_objects   = gc_ms_alloc_objects;
@@ -509,7 +509,7 @@
 static void
 gc_ms_pool_init(SHIM_INTERP, ARGMOD(Small_Object_Pool *pool))
 {
-    ASSERT_ARGS(gc_ms_pool_init);
+    ASSERT_ARGS(gc_ms_pool_init)
     pool->add_free_object = gc_ms_add_free_object;
     pool->get_free_object = gc_ms_get_free_object;
     pool->alloc_objects   = gc_ms_alloc_objects;
@@ -532,7 +532,7 @@
 void
 Parrot_gc_ms_init(PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_gc_ms_init);
+    ASSERT_ARGS(Parrot_gc_ms_init)
     Arenas * const arena_base     = interp->arena_base;
 
     arena_base->do_gc_mark         = Parrot_dod_ms_run;
@@ -557,7 +557,7 @@
 Parrot_small_object_pool_merge(PARROT_INTERP,
         ARGMOD(Small_Object_Pool *dest), ARGMOD(Small_Object_Pool *source))
 {
-    ASSERT_ARGS(Parrot_small_object_pool_merge);
+    ASSERT_ARGS(Parrot_small_object_pool_merge)
     Small_Object_Arena  *cur_arena;
     void               **free_list_end;
 

Modified: trunk/src/global.c
==============================================================================
--- trunk/src/global.c	(original)
+++ trunk/src/global.c	Mon Jan  5 15:17:26 2009
@@ -124,7 +124,7 @@
 static PMC *
 internal_ns_keyed(PARROT_INTERP, ARGIN(PMC *base_ns), ARGIN(PMC *pmc_key), int flags)
 {
-    ASSERT_ARGS(internal_ns_keyed);
+    ASSERT_ARGS(internal_ns_keyed)
     PMC *ns = base_ns;
     INTVAL i, n;
 
@@ -180,7 +180,7 @@
 internal_ns_keyed_str(PARROT_INTERP, ARGIN(PMC *base_ns),
     ARGIN(STRING *key), int flags)
 {
-    ASSERT_ARGS(internal_ns_keyed_str);
+    ASSERT_ARGS(internal_ns_keyed_str)
     PMC *ns = VTABLE_get_pmc_keyed_str(interp, base_ns, key);
 
     if (!PMC_IS_NULL(ns) && VTABLE_isa(interp, ns, CONST_STRING(interp, "NameSpace")))
@@ -205,7 +205,7 @@
 static PMC *
 internal_ns_keyed_key(PARROT_INTERP, ARGIN(PMC *ns), ARGIN(PMC *key), int flags)
 {
-    ASSERT_ARGS(internal_ns_keyed_key);
+    ASSERT_ARGS(internal_ns_keyed_key)
     while (key) {
         STRING *part   = VTABLE_get_string(interp, key);
         PMC    *sub_ns = VTABLE_get_pmc_keyed_str(interp, ns, part);
@@ -243,7 +243,7 @@
 static PMC *
 internal_ns_maybe_create(PARROT_INTERP, ARGIN(PMC *ns), ARGIN(STRING *key), int flags)
 {
-    ASSERT_ARGS(internal_ns_maybe_create);
+    ASSERT_ARGS(internal_ns_maybe_create)
     PMC *sub_ns;
 
     /* RT #46157 - stop depending on typed namespace */
@@ -281,7 +281,7 @@
 PMC *
 Parrot_get_namespace_keyed(PARROT_INTERP, ARGIN(PMC *base_ns), ARGIN_NULLOK(PMC *pmc_key))
 {
-    ASSERT_ARGS(Parrot_get_namespace_keyed);
+    ASSERT_ARGS(Parrot_get_namespace_keyed)
     return internal_ns_keyed(interp, base_ns, pmc_key, 0);
 }
 
@@ -303,7 +303,7 @@
 Parrot_get_namespace_keyed_str(PARROT_INTERP, ARGIN(PMC *base_ns),
         ARGIN_NULLOK(STRING *str_key))
 {
-    ASSERT_ARGS(Parrot_get_namespace_keyed_str);
+    ASSERT_ARGS(Parrot_get_namespace_keyed_str)
     return internal_ns_keyed_str(interp, base_ns, str_key, 0);
 }
 
@@ -326,7 +326,7 @@
 Parrot_make_namespace_keyed(PARROT_INTERP, ARGIN(PMC *base_ns),
         ARGIN_NULLOK(PMC *pmc_key))
 {
-    ASSERT_ARGS(Parrot_make_namespace_keyed);
+    ASSERT_ARGS(Parrot_make_namespace_keyed)
     return internal_ns_keyed(interp, base_ns, pmc_key, INTERN_NS_CREAT);
 }
 
@@ -349,7 +349,7 @@
 Parrot_make_namespace_keyed_str(PARROT_INTERP, ARGIN(PMC *base_ns),
         ARGIN_NULLOK(STRING *str_key))
 {
-    ASSERT_ARGS(Parrot_make_namespace_keyed_str);
+    ASSERT_ARGS(Parrot_make_namespace_keyed_str)
     return internal_ns_keyed_str(interp, base_ns, str_key, INTERN_NS_CREAT);
 }
 
@@ -373,7 +373,7 @@
 PMC *
 Parrot_make_namespace_autobase(PARROT_INTERP, ARGIN_NULLOK(PMC *key))
 {
-    ASSERT_ARGS(Parrot_make_namespace_autobase);
+    ASSERT_ARGS(Parrot_make_namespace_autobase)
     PMC *base_ns;
     if (VTABLE_isa(interp, key, CONST_STRING(interp, "String")))
         base_ns = CONTEXT(interp)->current_namespace;
@@ -402,7 +402,7 @@
 PMC *
 Parrot_get_namespace_autobase(PARROT_INTERP, ARGIN_NULLOK(PMC *key))
 {
-    ASSERT_ARGS(Parrot_get_namespace_autobase);
+    ASSERT_ARGS(Parrot_get_namespace_autobase)
     PMC *base_ns;
     if (VTABLE_isa(interp, key, CONST_STRING(interp, "String")))
         base_ns = CONTEXT(interp)->current_namespace;
@@ -428,7 +428,7 @@
 PMC *
 Parrot_ns_get_name(PARROT_INTERP, ARGIN(PMC *_namespace))
 {
-    ASSERT_ARGS(Parrot_ns_get_name);
+    ASSERT_ARGS(Parrot_ns_get_name)
     PMC *names;
     Parrot_PCCINVOKE(interp, _namespace, CONST_STRING(interp, "get_name"), "->P", &names);
     return names;
@@ -472,7 +472,7 @@
 PMC *
 Parrot_get_global(PARROT_INTERP, ARGIN_NULLOK(PMC *ns), ARGIN_NULLOK(STRING *globalname))
 {
-    ASSERT_ARGS(Parrot_get_global);
+    ASSERT_ARGS(Parrot_get_global)
     if (PMC_IS_NULL(ns))
         return PMCNULL;
 
@@ -494,7 +494,7 @@
 Parrot_set_global(PARROT_INTERP, ARGIN_NULLOK(PMC *ns),
         ARGIN_NULLOK(STRING *globalname), ARGIN_NULLOK(PMC *val))
 {
-    ASSERT_ARGS(Parrot_set_global);
+    ASSERT_ARGS(Parrot_set_global)
     VTABLE_set_pmc_keyed_str(interp, ns, globalname, val);
 }
 
@@ -519,7 +519,7 @@
 PMC *
 Parrot_find_global_n(PARROT_INTERP, ARGIN_NULLOK(PMC *ns), ARGIN_NULLOK(STRING *globalname))
 {
-    ASSERT_ARGS(Parrot_find_global_n);
+    ASSERT_ARGS(Parrot_find_global_n)
     PMC *res;
 
 #if DEBUG_GLOBAL
@@ -559,7 +559,7 @@
 PMC *
 Parrot_find_global_cur(PARROT_INTERP, ARGIN_NULLOK(STRING *globalname))
 {
-    ASSERT_ARGS(Parrot_find_global_cur);
+    ASSERT_ARGS(Parrot_find_global_cur)
     PMC * const ns = CONTEXT(interp)->current_namespace;
     return Parrot_find_global_n(interp, ns, globalname);
 }
@@ -585,7 +585,7 @@
 PMC *
 Parrot_find_global_k(PARROT_INTERP, ARGIN_NULLOK(PMC *pmc_key), ARGIN(STRING *globalname))
 {
-    ASSERT_ARGS(Parrot_find_global_k);
+    ASSERT_ARGS(Parrot_find_global_k)
     PMC * const ns =
         Parrot_get_namespace_keyed(interp,
                                    Parrot_get_ctx_HLL_namespace(interp),
@@ -615,7 +615,7 @@
 Parrot_find_global_s(PARROT_INTERP, ARGIN_NULLOK(STRING *str_key),
         ARGIN_NULLOK(STRING *globalname))
 {
-    ASSERT_ARGS(Parrot_find_global_s);
+    ASSERT_ARGS(Parrot_find_global_s)
     PMC *const ns =
         Parrot_get_namespace_keyed_str(interp,
                                        Parrot_get_ctx_HLL_namespace(interp),
@@ -638,7 +638,7 @@
 Parrot_store_global_n(PARROT_INTERP, ARGIN_NULLOK(PMC *ns),
         ARGIN_NULLOK(STRING *globalname), ARGIN_NULLOK(PMC *val))
 {
-    ASSERT_ARGS(Parrot_store_global_n);
+    ASSERT_ARGS(Parrot_store_global_n)
 #if DEBUG_GLOBAL
     if (globalname)
         Parrot_io_printf(interp, "store_global name '%Ss'\n", globalname);
@@ -665,7 +665,7 @@
 Parrot_store_global_cur(PARROT_INTERP, ARGIN_NULLOK(STRING *globalname),
         ARGIN_NULLOK(PMC *val))
 {
-    ASSERT_ARGS(Parrot_store_global_cur);
+    ASSERT_ARGS(Parrot_store_global_cur)
     Parrot_store_global_n(interp,
                           CONTEXT(interp)->current_namespace,
                           globalname, val);
@@ -693,7 +693,7 @@
 Parrot_store_global_k(PARROT_INTERP, ARGIN(PMC *pmc_key),
         ARGIN_NULLOK(STRING *globalname), ARGIN_NULLOK(PMC *val))
 {
-    ASSERT_ARGS(Parrot_store_global_k);
+    ASSERT_ARGS(Parrot_store_global_k)
     PMC *ns;
 
     /*
@@ -732,7 +732,7 @@
 Parrot_store_global_s(PARROT_INTERP, ARGIN_NULLOK(STRING *str_key),
         ARGIN_NULLOK(STRING *globalname), ARGIN_NULLOK(PMC *val))
 {
-    ASSERT_ARGS(Parrot_store_global_s);
+    ASSERT_ARGS(Parrot_store_global_s)
     PMC * const ns = Parrot_make_namespace_keyed_str(interp,
                                          Parrot_get_ctx_HLL_namespace(interp),
                                          str_key);
@@ -762,7 +762,7 @@
 Parrot_find_global_op(PARROT_INTERP, ARGIN(PMC *ns),
         ARGIN_NULLOK(STRING *globalname), ARGIN_NULLOK(void *next))
 {
-    ASSERT_ARGS(Parrot_find_global_op);
+    ASSERT_ARGS(Parrot_find_global_op)
     PMC *res;
 
     if (!globalname)
@@ -797,7 +797,7 @@
 PMC *
 Parrot_find_name_op(PARROT_INTERP, ARGIN(STRING *name), SHIM(void *next))
 {
-    ASSERT_ARGS(Parrot_find_name_op);
+    ASSERT_ARGS(Parrot_find_name_op)
     Parrot_Context * const ctx = CONTEXT(interp);
     PMC * const lex_pad = Parrot_find_pad(interp, name, ctx);
     PMC *g;
@@ -837,7 +837,7 @@
 static PMC *
 get_namespace_pmc(PARROT_INTERP, ARGIN(PMC *sub))
 {
-    ASSERT_ARGS(get_namespace_pmc);
+    ASSERT_ARGS(get_namespace_pmc)
     PMC * const nsname = PMC_sub(sub)->namespace_name;
     PMC * const nsroot = Parrot_get_HLL_namespace(interp, PMC_sub(sub)->HLL_id);
 
@@ -866,7 +866,7 @@
 static void
 store_sub_in_multi(PARROT_INTERP, ARGIN(PMC *sub), ARGIN(PMC *ns))
 {
-    ASSERT_ARGS(store_sub_in_multi);
+    ASSERT_ARGS(store_sub_in_multi)
     STRING * const ns_entry_name = PMC_sub(sub)->ns_entry_name;
     PMC    *multisub = VTABLE_get_pmc_keyed_str(interp, ns, ns_entry_name);
 
@@ -897,7 +897,7 @@
 void
 Parrot_store_sub_in_namespace(PARROT_INTERP, ARGIN(PMC *sub))
 {
-    ASSERT_ARGS(Parrot_store_sub_in_namespace);
+    ASSERT_ARGS(Parrot_store_sub_in_namespace)
     const INTVAL cur_id = CONTEXT(interp)->current_HLL;
 
     PMC *ns;

Modified: trunk/src/global_setup.c
==============================================================================
--- trunk/src/global_setup.c	(original)
+++ trunk/src/global_setup.c	Mon Jan  5 15:17:26 2009
@@ -64,7 +64,7 @@
 Parrot_set_config_hash_internal(ARGIN(const unsigned char* parrot_config),
                                  unsigned int parrot_config_size)
 {
-    ASSERT_ARGS(Parrot_set_config_hash_internal);
+    ASSERT_ARGS(Parrot_set_config_hash_internal)
     parrot_config_stored      = parrot_config;
     parrot_config_size_stored = parrot_config_size;
 }
@@ -83,7 +83,7 @@
 static void
 parrot_set_config_hash_interpreter(PARROT_INTERP)
 {
-    ASSERT_ARGS(parrot_set_config_hash_interpreter);
+    ASSERT_ARGS(parrot_set_config_hash_interpreter)
     PMC *iglobals = interp->iglobals;
 
     PMC *config_hash = NULL;
@@ -120,7 +120,7 @@
 void
 init_world_once(PARROT_INTERP)
 {
-    ASSERT_ARGS(init_world_once);
+    ASSERT_ARGS(init_world_once)
     if (!interp->world_inited) {
         /* init_world() sets up some vtable stuff.
          * It must only be called once.
@@ -151,7 +151,7 @@
 void
 init_world(PARROT_INTERP)
 {
-    ASSERT_ARGS(init_world);
+    ASSERT_ARGS(init_world)
     PMC *iglobals, *self, *pmc;
 
 #ifdef PARROT_HAS_PLATFORM_INIT_CODE
@@ -199,7 +199,7 @@
 void
 parrot_global_setup_2(PARROT_INTERP)
 {
-    ASSERT_ARGS(parrot_global_setup_2);
+    ASSERT_ARGS(parrot_global_setup_2)
     PMC *classname_hash, *iglobals;
     int  i;
 

Modified: trunk/src/hash.c
==============================================================================
--- trunk/src/hash.c	(original)
+++ trunk/src/hash.c	Mon Jan  5 15:17:26 2009
@@ -183,7 +183,7 @@
 static size_t
 key_hash_STRING(PARROT_INTERP, ARGMOD(STRING *s), SHIM(size_t seed))
 {
-    ASSERT_ARGS(key_hash_STRING);
+    ASSERT_ARGS(key_hash_STRING)
     if (s->hashval == 0) {
         return string_hash(interp, s);
     }
@@ -205,7 +205,7 @@
 static int
 STRING_compare(PARROT_INTERP, ARGIN(const void *search_key), ARGIN_NULLOK(const void *bucket_key))
 {
-    ASSERT_ARGS(STRING_compare);
+    ASSERT_ARGS(STRING_compare)
     STRING const *s1 = (STRING const *)search_key;
     STRING const *s2 = (STRING const *)bucket_key;
 
@@ -237,7 +237,7 @@
 static int
 pointer_compare(SHIM_INTERP, ARGIN_NULLOK(const void *a), ARGIN_NULLOK(const void *b))
 {
-    ASSERT_ARGS(pointer_compare);
+    ASSERT_ARGS(pointer_compare)
     return a != b;
 }
 
@@ -256,7 +256,7 @@
 static size_t
 key_hash_pointer(SHIM_INTERP, ARGIN(const void *value), size_t seed)
 {
-    ASSERT_ARGS(key_hash_pointer);
+    ASSERT_ARGS(key_hash_pointer)
     return ((size_t) value) ^ seed;
 }
 
@@ -280,7 +280,7 @@
 static size_t
 key_hash_cstring(SHIM_INTERP, ARGIN(const void *value), size_t seed)
 {
-    ASSERT_ARGS(key_hash_cstring);
+    ASSERT_ARGS(key_hash_cstring)
     register size_t h = seed;
     const unsigned char * p = (const unsigned char *) value;
 
@@ -306,7 +306,7 @@
 static int
 cstring_compare(SHIM_INTERP, ARGIN(const char *a), ARGIN(const char *b))
 {
-    ASSERT_ARGS(cstring_compare);
+    ASSERT_ARGS(cstring_compare)
     return strcmp(a, b);
 }
 
@@ -325,7 +325,7 @@
 size_t
 key_hash_int(SHIM_INTERP, ARGIN(const void *value), size_t seed)
 {
-    ASSERT_ARGS(key_hash_int);
+    ASSERT_ARGS(key_hash_int)
     return (size_t)value ^ seed;
 }
 
@@ -344,7 +344,7 @@
 int
 int_compare(SHIM_INTERP, ARGIN_NULLOK(const void *a), ARGIN_NULLOK(const void *b))
 {
-    ASSERT_ARGS(int_compare);
+    ASSERT_ARGS(int_compare)
     return a != b;
 }
 
@@ -362,7 +362,7 @@
 void
 parrot_dump_hash(SHIM_INTERP, ARGIN(const Hash *hash))
 {
-    ASSERT_ARGS(parrot_dump_hash);
+    ASSERT_ARGS(parrot_dump_hash)
     UNUSED(hash);
 }
 
@@ -381,7 +381,7 @@
 void
 parrot_mark_hash(PARROT_INTERP, ARGIN(Hash *hash))
 {
-    ASSERT_ARGS(parrot_mark_hash);
+    ASSERT_ARGS(parrot_mark_hash)
     int mark_key   = 0;
     int mark_value = 0;
 
@@ -408,7 +408,7 @@
 static void
 parrot_mark_hash_keys(PARROT_INTERP, ARGIN(Hash *hash))
 {
-    ASSERT_ARGS(parrot_mark_hash_keys);
+    ASSERT_ARGS(parrot_mark_hash_keys)
     UINTVAL entries = hash->entries;
     UINTVAL found   = 0;
     INTVAL  i;
@@ -433,7 +433,7 @@
 static void
 parrot_mark_hash_values(PARROT_INTERP, ARGIN(Hash *hash))
 {
-    ASSERT_ARGS(parrot_mark_hash_values);
+    ASSERT_ARGS(parrot_mark_hash_values)
     UINTVAL entries = hash->entries;
     UINTVAL found   = 0;
     INTVAL  i;
@@ -458,7 +458,7 @@
 static void
 parrot_mark_hash_both(PARROT_INTERP, ARGIN(Hash *hash))
 {
-    ASSERT_ARGS(parrot_mark_hash_both);
+    ASSERT_ARGS(parrot_mark_hash_both)
     UINTVAL entries = hash->entries;
     UINTVAL found   = 0;
     INTVAL  i;
@@ -498,7 +498,7 @@
 static void
 hash_thaw(PARROT_INTERP, ARGMOD(Hash *hash), ARGMOD(visit_info *info))
 {
-    ASSERT_ARGS(hash_thaw);
+    ASSERT_ARGS(hash_thaw)
     size_t           entry_index;
     IMAGE_IO * const io = info->image_io;
 
@@ -570,7 +570,7 @@
 static void
 hash_freeze(PARROT_INTERP, ARGIN(const Hash * const hash), ARGMOD(visit_info* info))
 {
-    ASSERT_ARGS(hash_freeze);
+    ASSERT_ARGS(hash_freeze)
     size_t i;
     IMAGE_IO * const io = info->image_io;
 
@@ -623,7 +623,7 @@
 void
 parrot_hash_visit(PARROT_INTERP, ARGMOD(Hash *hash), ARGMOD(void *pinfo))
 {
-    ASSERT_ARGS(parrot_hash_visit);
+    ASSERT_ARGS(parrot_hash_visit)
     visit_info* const info = (visit_info*) pinfo;
 
     switch (info->what) {
@@ -674,7 +674,7 @@
 static void
 expand_hash(PARROT_INTERP, ARGMOD(Hash *hash))
 {
-    ASSERT_ARGS(expand_hash);
+    ASSERT_ARGS(expand_hash)
     const UINTVAL old_size = hash->mask + 1;
     const UINTVAL new_size = old_size << 1;
     HashBucket **old_bi, **new_bi;
@@ -783,7 +783,7 @@
 void
 parrot_new_hash(PARROT_INTERP, ARGOUT(Hash **hptr))
 {
-    ASSERT_ARGS(parrot_new_hash);
+    ASSERT_ARGS(parrot_new_hash)
     parrot_new_hash_x(interp,
             hptr,
             enum_type_PMC,
@@ -806,7 +806,7 @@
 void
 parrot_new_pmc_hash(PARROT_INTERP, ARGOUT(PMC *container))
 {
-    ASSERT_ARGS(parrot_new_pmc_hash);
+    ASSERT_ARGS(parrot_new_pmc_hash)
     parrot_new_pmc_hash_x(interp,
             container,
             enum_type_PMC,
@@ -829,7 +829,7 @@
 void
 parrot_new_cstring_hash(PARROT_INTERP, ARGOUT(Hash **hptr))
 {
-    ASSERT_ARGS(parrot_new_cstring_hash);
+    ASSERT_ARGS(parrot_new_cstring_hash)
     parrot_new_hash_x(interp,
             hptr,
             enum_type_PMC,
@@ -859,7 +859,7 @@
 create_hash(PARROT_INTERP, PARROT_DATA_TYPE val_type, Hash_key_type hkey_type,
         ARGIN(hash_comp_fn compare), ARGIN(hash_hash_key_fn keyhash))
 {
-    ASSERT_ARGS(create_hash);
+    ASSERT_ARGS(create_hash)
     size_t      i;
     HashBucket *bp;
 
@@ -923,7 +923,7 @@
 void
 parrot_hash_destroy(SHIM_INTERP, ARGMOD(Hash *hash))
 {
-    ASSERT_ARGS(parrot_hash_destroy);
+    ASSERT_ARGS(parrot_hash_destroy)
     mem_sys_free(hash->bs);
     mem_sys_free(hash);
 }
@@ -942,7 +942,7 @@
 void
 parrot_chash_destroy(PARROT_INTERP, ARGMOD(Hash *hash))
 {
-    ASSERT_ARGS(parrot_chash_destroy);
+    ASSERT_ARGS(parrot_chash_destroy)
     UINTVAL i;
 
     for (i = 0; i <= hash->mask; i++) {
@@ -976,7 +976,7 @@
 parrot_chash_destroy_values(PARROT_INTERP, ARGMOD(Hash *hash),
     ARGIN(value_free func))
 {
-    ASSERT_ARGS(parrot_chash_destroy_values);
+    ASSERT_ARGS(parrot_chash_destroy_values)
     UINTVAL i;
 
     for (i = 0; i <= hash->mask; i++) {
@@ -1019,7 +1019,7 @@
         NOTNULL(hash_comp_fn compare),
         NOTNULL(hash_hash_key_fn keyhash))
 {
-    ASSERT_ARGS(parrot_new_hash_x);
+    ASSERT_ARGS(parrot_new_hash_x)
     *hptr = create_hash(interp, val_type, hkey_type, compare, keyhash);
 }
 
@@ -1043,7 +1043,7 @@
         NOTNULL(hash_comp_fn compare),
         NOTNULL(hash_hash_key_fn keyhash))
 {
-    ASSERT_ARGS(parrot_new_pmc_hash_x);
+    ASSERT_ARGS(parrot_new_pmc_hash_x)
     Hash * const hash = create_hash(interp, val_type, hkey_type, compare, keyhash);
     PMC_struct_val(container) = hash;
     hash->container = container;
@@ -1063,7 +1063,7 @@
 void
 parrot_new_pointer_hash(PARROT_INTERP, ARGOUT(Hash **hptr))
 {
-    ASSERT_ARGS(parrot_new_pointer_hash);
+    ASSERT_ARGS(parrot_new_pointer_hash)
     parrot_new_hash_x(interp, hptr, enum_type_ptr, Hash_key_type_ptr,
             pointer_compare, key_hash_pointer);
 }
@@ -1085,7 +1085,7 @@
 PMC*
 Parrot_new_INTVAL_hash(PARROT_INTERP, UINTVAL flags)
 {
-    ASSERT_ARGS(Parrot_new_INTVAL_hash);
+    ASSERT_ARGS(Parrot_new_INTVAL_hash)
     PMC * const h =
         (flags & PObj_constant_FLAG)
             ? constant_pmc_new_noinit(interp, enum_class_Hash)
@@ -1113,7 +1113,7 @@
 INTVAL
 parrot_hash_size(PARROT_INTERP, ARGIN(const Hash *hash))
 {
-    ASSERT_ARGS(parrot_hash_size);
+    ASSERT_ARGS(parrot_hash_size)
     if (hash)
         return hash->entries;
     Parrot_ex_throw_from_c_args(interp, NULL, 1,
@@ -1136,7 +1136,7 @@
 void *
 parrot_hash_get_idx(SHIM_INTERP, ARGIN(const Hash *hash), ARGMOD(PMC *key))
 {
-    ASSERT_ARGS(parrot_hash_get_idx);
+    ASSERT_ARGS(parrot_hash_get_idx)
     INTVAL i = PMC_int_val(key);
     const BucketIndex bi = (BucketIndex)PMC_data(key);
     HashBucket *b;
@@ -1191,7 +1191,7 @@
 HashBucket *
 parrot_hash_get_bucket(PARROT_INTERP, ARGIN(const Hash *hash), ARGIN(const void *key))
 {
-    ASSERT_ARGS(parrot_hash_get_bucket);
+    ASSERT_ARGS(parrot_hash_get_bucket)
     if (hash->entries > 0) {
         const UINTVAL hashval = (hash->hash_val)(interp, key, hash->seed);
         HashBucket   *bucket  = hash->bi[hashval & hash->mask];
@@ -1223,7 +1223,7 @@
 void *
 parrot_hash_get(PARROT_INTERP, ARGIN(Hash *hash), ARGIN(const void *key))
 {
-    ASSERT_ARGS(parrot_hash_get);
+    ASSERT_ARGS(parrot_hash_get)
     const HashBucket * const bucket = parrot_hash_get_bucket(interp, hash, key);
     return bucket ? bucket->value : NULL;
 }
@@ -1243,7 +1243,7 @@
 INTVAL
 parrot_hash_exists(PARROT_INTERP, ARGIN(Hash *hash), ARGIN(void *key))
 {
-    ASSERT_ARGS(parrot_hash_exists);
+    ASSERT_ARGS(parrot_hash_exists)
     const HashBucket * const bucket = parrot_hash_get_bucket(interp, hash, key);
     return bucket ? 1 : 0;
 }
@@ -1265,7 +1265,7 @@
 HashBucket*
 parrot_hash_put(PARROT_INTERP, ARGMOD(Hash *hash), ARGIN(void *key), ARGIN_NULLOK(void *value))
 {
-    ASSERT_ARGS(parrot_hash_put);
+    ASSERT_ARGS(parrot_hash_put)
     const UINTVAL hashval = (hash->hash_val)(interp, key, hash->seed);
     HashBucket   *bucket  = hash->bi[hashval & hash->mask];
 
@@ -1321,7 +1321,7 @@
 void
 parrot_hash_delete(PARROT_INTERP, ARGMOD(Hash *hash), ARGIN(void *key))
 {
-    ASSERT_ARGS(parrot_hash_delete);
+    ASSERT_ARGS(parrot_hash_delete)
     HashBucket *bucket;
     HashBucket *prev = NULL;
 
@@ -1361,7 +1361,7 @@
 void
 parrot_hash_clone(PARROT_INTERP, ARGIN(const Hash *hash), ARGOUT(Hash *dest))
 {
-    ASSERT_ARGS(parrot_hash_clone);
+    ASSERT_ARGS(parrot_hash_clone)
     UINTVAL i;
 
     for (i = 0; i <= hash->mask; i++) {

Modified: trunk/src/headers.c
==============================================================================
--- trunk/src/headers.c	(original)
+++ trunk/src/headers.c	Mon Jan  5 15:17:26 2009
@@ -115,7 +115,7 @@
 static void *
 get_free_buffer(PARROT_INTERP, ARGIN(Small_Object_Pool *pool))
 {
-    ASSERT_ARGS(get_free_buffer);
+    ASSERT_ARGS(get_free_buffer)
     PObj * const buffer = (PObj *)pool->get_free_object(interp, pool);
 
     /* don't mess around with flags */
@@ -149,7 +149,7 @@
 Small_Object_Pool *
 new_pmc_pool(PARROT_INTERP)
 {
-    ASSERT_ARGS(new_pmc_pool);
+    ASSERT_ARGS(new_pmc_pool)
     const int num_headers = PMC_HEADERS_PER_ALLOC;
     Small_Object_Pool * const pmc_pool =
         new_small_object_pool(sizeof (PMC), num_headers);
@@ -177,7 +177,7 @@
 Small_Object_Pool *
 new_bufferlike_pool(PARROT_INTERP, size_t actual_buffer_size)
 {
-    ASSERT_ARGS(new_bufferlike_pool);
+    ASSERT_ARGS(new_bufferlike_pool)
     const int num_headers          = BUFFER_HEADERS_PER_ALLOC;
     const size_t buffer_size       =
             (actual_buffer_size + sizeof (void *) - 1) & ~(sizeof (void *) - 1);
@@ -208,7 +208,7 @@
 Small_Object_Pool *
 new_buffer_pool(PARROT_INTERP)
 {
-    ASSERT_ARGS(new_buffer_pool);
+    ASSERT_ARGS(new_buffer_pool)
     Small_Object_Pool * const pool = make_bufferlike_pool(interp, sizeof (Buffer));
 
 #ifdef GC_IS_MALLOC
@@ -237,7 +237,7 @@
 Small_Object_Pool *
 new_string_pool(PARROT_INTERP, INTVAL constant)
 {
-    ASSERT_ARGS(new_string_pool);
+    ASSERT_ARGS(new_string_pool)
     Small_Object_Pool *pool;
     if (constant) {
         pool           = new_bufferlike_pool(interp, sizeof (STRING));
@@ -268,7 +268,7 @@
 Small_Object_Pool *
 make_bufferlike_pool(PARROT_INTERP, size_t buffer_size)
 {
-    ASSERT_ARGS(make_bufferlike_pool);
+    ASSERT_ARGS(make_bufferlike_pool)
     const UINTVAL num_old = interp->arena_base->num_sized;
     Small_Object_Pool **sized_pools =
             interp->arena_base->sized_header_pools;
@@ -314,7 +314,7 @@
 Small_Object_Pool *
 get_bufferlike_pool(PARROT_INTERP, size_t buffer_size)
 {
-    ASSERT_ARGS(get_bufferlike_pool);
+    ASSERT_ARGS(get_bufferlike_pool)
     Small_Object_Pool ** const sized_pools =
             interp->arena_base->sized_header_pools;
 
@@ -339,7 +339,7 @@
 PMC *
 new_pmc_header(PARROT_INTERP, UINTVAL flags)
 {
-    ASSERT_ARGS(new_pmc_header);
+    ASSERT_ARGS(new_pmc_header)
     Small_Object_Pool * const pool =
         flags & PObj_constant_FLAG
             ? interp->arena_base->constant_pmc_pool
@@ -385,7 +385,7 @@
 static PMC_EXT *
 new_pmc_ext(PARROT_INTERP)
 {
-    ASSERT_ARGS(new_pmc_ext);
+    ASSERT_ARGS(new_pmc_ext)
     Small_Object_Pool * const pool = interp->arena_base->pmc_ext_pool;
     /* XXX: Should we check here to ensure the PMC_EXT is non-null
             like we do in C<new_pmc>? */
@@ -407,7 +407,7 @@
 void
 add_pmc_ext(PARROT_INTERP, ARGMOD(PMC *pmc))
 {
-    ASSERT_ARGS(add_pmc_ext);
+    ASSERT_ARGS(add_pmc_ext)
     pmc->pmc_ext = new_pmc_ext(interp);
     PObj_is_PMC_EXT_SET(pmc);
 #ifdef PARROT_GC_IMS
@@ -437,7 +437,7 @@
 void
 add_pmc_sync(PARROT_INTERP, ARGMOD(PMC *pmc))
 {
-    ASSERT_ARGS(add_pmc_sync);
+    ASSERT_ARGS(add_pmc_sync)
     if (!PObj_is_PMC_EXT_TEST(pmc)) {
         add_pmc_ext(interp, pmc);
     }
@@ -466,7 +466,7 @@
 STRING *
 new_string_header(PARROT_INTERP, UINTVAL flags)
 {
-    ASSERT_ARGS(new_string_header);
+    ASSERT_ARGS(new_string_header)
     STRING * const string = (STRING *)get_free_buffer(interp,
         (flags & PObj_constant_FLAG)
             ? interp->arena_base->constant_string_header_pool
@@ -497,7 +497,7 @@
 Buffer *
 new_buffer_header(PARROT_INTERP)
 {
-    ASSERT_ARGS(new_buffer_header);
+    ASSERT_ARGS(new_buffer_header)
     return (Buffer *)get_free_buffer(interp,
             interp->arena_base->buffer_header_pool);
 }
@@ -519,7 +519,7 @@
 void *
 new_bufferlike_header(PARROT_INTERP, size_t size)
 {
-    ASSERT_ARGS(new_bufferlike_header);
+    ASSERT_ARGS(new_bufferlike_header)
     Small_Object_Pool * const pool = get_bufferlike_pool(interp, size);
 
     return get_free_buffer(interp, pool);
@@ -544,7 +544,7 @@
 size_t
 get_max_buffer_address(PARROT_INTERP)
 {
-    ASSERT_ARGS(get_max_buffer_address);
+    ASSERT_ARGS(get_max_buffer_address)
     UINTVAL i;
     size_t max = 0;
     Arenas * const arena_base = interp->arena_base;
@@ -578,7 +578,7 @@
 size_t
 get_min_buffer_address(PARROT_INTERP)
 {
-    ASSERT_ARGS(get_min_buffer_address);
+    ASSERT_ARGS(get_min_buffer_address)
     UINTVAL i;
     Arenas * const arena_base = interp->arena_base;
     size_t min = (size_t) -1;
@@ -607,7 +607,7 @@
 size_t
 get_max_pmc_address(PARROT_INTERP)
 {
-    ASSERT_ARGS(get_max_pmc_address);
+    ASSERT_ARGS(get_max_pmc_address)
     return interp->arena_base->pmc_pool->end_arena_memory;
 }
 
@@ -628,7 +628,7 @@
 size_t
 get_min_pmc_address(PARROT_INTERP)
 {
-    ASSERT_ARGS(get_min_pmc_address);
+    ASSERT_ARGS(get_min_pmc_address)
     return interp->arena_base->pmc_pool->start_arena_memory;
 }
 
@@ -647,7 +647,7 @@
 int
 is_buffer_ptr(PARROT_INTERP, ARGIN(const void *ptr))
 {
-    ASSERT_ARGS(is_buffer_ptr);
+    ASSERT_ARGS(is_buffer_ptr)
     UINTVAL i;
     Arenas * const arena_base = interp->arena_base;
 
@@ -675,7 +675,7 @@
 int
 is_pmc_ptr(PARROT_INTERP, ARGIN(const void *ptr))
 {
-    ASSERT_ARGS(is_pmc_ptr);
+    ASSERT_ARGS(is_pmc_ptr)
     return contained_in_pool(interp->arena_base->pmc_pool, ptr);
 }
 
@@ -698,7 +698,7 @@
 void
 Parrot_initialize_header_pools(PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_initialize_header_pools);
+    ASSERT_ARGS(Parrot_initialize_header_pools)
     Arenas * const arena_base = interp->arena_base;
 
     /* Init the constant string header pool */
@@ -790,7 +790,7 @@
 Parrot_forall_header_pools(PARROT_INTERP, int flag, ARGIN_NULLOK(void *arg),
         NOTNULL(pool_iter_fn func))
 {
-    ASSERT_ARGS(Parrot_forall_header_pools);
+    ASSERT_ARGS(Parrot_forall_header_pools)
     Arenas * const arena_base = interp->arena_base;
 
     if (flag & POOL_PMC) {
@@ -847,7 +847,7 @@
 static void
 free_pool(ARGMOD(Small_Object_Pool *pool))
 {
-    ASSERT_ARGS(free_pool);
+    ASSERT_ARGS(free_pool)
     Small_Object_Arena *cur_arena;
 
     for (cur_arena = pool->last_Arena; cur_arena;) {
@@ -930,7 +930,7 @@
 void
 Parrot_destroy_header_pools(PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_destroy_header_pools);
+    ASSERT_ARGS(Parrot_destroy_header_pools)
     INTVAL pass;
 
     /* const/non const COW strings life in different pools
@@ -974,7 +974,7 @@
 static void
 fix_pmc_syncs(ARGMOD(Interp *dest_interp), ARGIN(Small_Object_Pool *pool))
 {
-    ASSERT_ARGS(fix_pmc_syncs);
+    ASSERT_ARGS(fix_pmc_syncs)
     Small_Object_Arena *cur_arena;
     const UINTVAL object_size = pool->object_size;
 
@@ -1013,7 +1013,7 @@
 void
 Parrot_merge_header_pools(ARGMOD(Interp *dest_interp), ARGIN(Interp *source_interp))
 {
-    ASSERT_ARGS(Parrot_merge_header_pools);
+    ASSERT_ARGS(Parrot_merge_header_pools)
     UINTVAL i;
 
     Arenas * const dest_arena = dest_interp->arena_base;
@@ -1069,7 +1069,7 @@
 void
 Parrot_initialize_header_pool_names(PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_initialize_header_pool_names);
+    ASSERT_ARGS(Parrot_initialize_header_pool_names)
     interp->arena_base->string_header_pool->name
             = string_make(interp, "String Pool", strlen("String Pool"),
             0, PObj_constant_FLAG, 0);

Modified: trunk/src/hll.c
==============================================================================
--- trunk/src/hll.c	(original)
+++ trunk/src/hll.c	Mon Jan  5 15:17:26 2009
@@ -81,7 +81,7 @@
 static PMC*
 new_hll_entry(PARROT_INTERP, ARGIN_NULLOK(STRING *entry_name))
 {
-    ASSERT_ARGS(new_hll_entry);
+    ASSERT_ARGS(new_hll_entry)
     PMC * const hll_info = interp->HLL_info;
     const INTVAL id      = VTABLE_elements(interp, hll_info);
 
@@ -131,7 +131,7 @@
 void
 Parrot_init_HLL(PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_init_HLL);
+    ASSERT_ARGS(Parrot_init_HLL)
     interp->HLL_info      =
         constant_pmc_new(interp, enum_class_OrderedHash);
     interp->HLL_namespace =
@@ -158,7 +158,7 @@
 INTVAL
 Parrot_register_HLL(PARROT_INTERP, ARGIN(STRING *hll_name))
 {
-    ASSERT_ARGS(Parrot_register_HLL);
+    ASSERT_ARGS(Parrot_register_HLL)
     PMC   *entry, *name, *type_hash, *ns_hash, *hll_info;
     INTVAL idx;
 
@@ -223,7 +223,7 @@
 INTVAL
 Parrot_register_HLL_lib(PARROT_INTERP, ARGIN(STRING *hll_lib))
 {
-    ASSERT_ARGS(Parrot_register_HLL_lib);
+    ASSERT_ARGS(Parrot_register_HLL_lib)
     PMC   *hll_info = interp->HLL_info;
     PMC   *entry, *name;
     INTVAL nelements, i;
@@ -276,7 +276,7 @@
 INTVAL
 Parrot_get_HLL_id(PARROT_INTERP, ARGIN_NULLOK(STRING *hll_name))
 {
-    ASSERT_ARGS(Parrot_get_HLL_id);
+    ASSERT_ARGS(Parrot_get_HLL_id)
     PMC * const hll_info = interp->HLL_info;
     INTVAL      i;
 
@@ -314,7 +314,7 @@
 STRING *
 Parrot_get_HLL_name(PARROT_INTERP, INTVAL id)
 {
-    ASSERT_ARGS(Parrot_get_HLL_name);
+    ASSERT_ARGS(Parrot_get_HLL_name)
     PMC * const  hll_info  = interp->HLL_info;
     const INTVAL nelements = VTABLE_elements(interp, hll_info);
 
@@ -352,7 +352,7 @@
 Parrot_register_HLL_type(PARROT_INTERP, INTVAL hll_id,
         INTVAL core_type, INTVAL hll_type)
 {
-    ASSERT_ARGS(Parrot_register_HLL_type);
+    ASSERT_ARGS(Parrot_register_HLL_type)
     PMC  *entry, *type_hash;
     PMC  *hll_info = interp->HLL_info;
     const INTVAL n = VTABLE_elements(interp, hll_info);
@@ -397,7 +397,7 @@
 INTVAL
 Parrot_get_HLL_type(PARROT_INTERP, INTVAL hll_id, INTVAL core_type)
 {
-    ASSERT_ARGS(Parrot_get_HLL_type);
+    ASSERT_ARGS(Parrot_get_HLL_type)
     PMC    *entry, *type_hash, *hll_info;
     INTVAL  n, id;
 
@@ -444,7 +444,7 @@
 INTVAL
 Parrot_get_ctx_HLL_type(PARROT_INTERP, INTVAL core_type)
 {
-    ASSERT_ARGS(Parrot_get_ctx_HLL_type);
+    ASSERT_ARGS(Parrot_get_ctx_HLL_type)
     const INTVAL hll_id = CONTEXT(interp)->current_HLL;
 
     return Parrot_get_HLL_type(interp, hll_id, core_type);
@@ -466,7 +466,7 @@
 PMC*
 Parrot_get_ctx_HLL_namespace(PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_get_ctx_HLL_namespace);
+    ASSERT_ARGS(Parrot_get_ctx_HLL_namespace)
     return Parrot_get_HLL_namespace(interp, CONTEXT(interp)->current_HLL);
 }
 
@@ -487,7 +487,7 @@
 PMC*
 Parrot_get_HLL_namespace(PARROT_INTERP, int hll_id)
 {
-    ASSERT_ARGS(Parrot_get_HLL_namespace);
+    ASSERT_ARGS(Parrot_get_HLL_namespace)
     if (hll_id == PARROT_HLL_NONE)
         return interp->root_namespace;
 
@@ -512,7 +512,7 @@
 void
 Parrot_regenerate_HLL_namespaces(PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_regenerate_HLL_namespaces);
+    ASSERT_ARGS(Parrot_regenerate_HLL_namespaces)
     const INTVAL n = VTABLE_elements(interp, interp->HLL_info);
     INTVAL       hll_id;
 

Modified: trunk/src/inter_call.c
==============================================================================
--- trunk/src/inter_call.c	(original)
+++ trunk/src/inter_call.c	Mon Jan  5 15:17:26 2009
@@ -359,7 +359,7 @@
 Parrot_init_arg_nci(PARROT_INTERP, ARGOUT(call_state *st),
     ARGIN(const char *sig))
 {
-    ASSERT_ARGS(Parrot_init_arg_nci);
+    ASSERT_ARGS(Parrot_init_arg_nci)
     init_call_stats(st);
 
     if (PMC_IS_NULL(interp->args_signature))
@@ -388,7 +388,7 @@
 void
 Parrot_init_ret_nci(PARROT_INTERP, ARGOUT(call_state *st), ARGIN(const char *sig))
 {
-    ASSERT_ARGS(Parrot_init_ret_nci);
+    ASSERT_ARGS(Parrot_init_ret_nci)
     Parrot_Context *ctx                 = CONTEXT(interp);
     PMC            * const current_cont = ctx->current_cont;
 
@@ -433,7 +433,7 @@
         ARGIN_NULLOK(opcode_t *indexes), ARGIN_NULLOK(PMC *sig_pmc),
         ARGMOD(call_state_item *sti))
 {
-    ASSERT_ARGS(Parrot_init_arg_indexes_and_sig_pmc);
+    ASSERT_ARGS(Parrot_init_arg_indexes_and_sig_pmc)
     if (!sig_pmc && indexes) {
         ++indexes;
         sig_pmc = ctx->constants[*indexes]->u.key;
@@ -480,7 +480,7 @@
 Parrot_init_arg_op(PARROT_INTERP, ARGIN(Parrot_Context *ctx),
     ARGIN_NULLOK(opcode_t *pc), ARGIN(call_state_item *sti))
 {
-    ASSERT_ARGS(Parrot_init_arg_op);
+    ASSERT_ARGS(Parrot_init_arg_op)
     PMC *sig_pmc = PMCNULL;
 
     if (pc) {
@@ -511,7 +511,7 @@
     ARGIN(const char *sig), ARGIN_NULLOK(void *ap),
     ARGMOD(call_state_item *sti))
 {
-    ASSERT_ARGS(Parrot_init_arg_sig);
+    ASSERT_ARGS(Parrot_init_arg_sig)
     sti->used = 1;
     sti->i    = 0;
     sti->n    = 0;
@@ -547,7 +547,7 @@
 static void
 start_flatten(PARROT_INTERP, ARGMOD(call_state *st), ARGIN(PMC *p_arg))
 {
-    ASSERT_ARGS(start_flatten);
+    ASSERT_ARGS(start_flatten)
     if (PARROT_ARG_NAME_ISSET(st->src.sig)) {
 
         /* src ought to be an hash */
@@ -593,7 +593,7 @@
 static void
 next_arg_sig(ARGMOD(call_state_item *sti))
 {
-    ASSERT_ARGS(next_arg_sig);
+    ASSERT_ARGS(next_arg_sig)
     switch (sti->mode & CALL_S_D_MASK) {
         case CALL_STATE_OP:
             sti->sig = SIG_ITEM(sti->u.op.signature, sti->i);
@@ -636,7 +636,7 @@
 static int
 fetch_arg_sig(PARROT_INTERP, ARGMOD(call_state *st))
 {
-    ASSERT_ARGS(fetch_arg_sig);
+    ASSERT_ARGS(fetch_arg_sig)
     va_list * const ap = (va_list *)(st->src.u.sig.ap);
 
     switch (st->src.sig & PARROT_ARG_TYPE_MASK) {
@@ -698,7 +698,7 @@
 static int
 fetch_arg_op(PARROT_INTERP, ARGMOD(call_state *st))
 {
-    ASSERT_ARGS(fetch_arg_op);
+    ASSERT_ARGS(fetch_arg_op)
     const int    constant = PARROT_ARG_CONSTANT_ISSET(st->src.sig);
     const INTVAL idx      = st->src.u.op.pc[st->src.i];
 
@@ -770,7 +770,7 @@
 int
 Parrot_fetch_arg(PARROT_INTERP, ARGMOD(call_state *st))
 {
-    ASSERT_ARGS(Parrot_fetch_arg);
+    ASSERT_ARGS(Parrot_fetch_arg)
     if (!st->src.used)
         return 1;
 
@@ -850,7 +850,7 @@
 int
 Parrot_fetch_arg_nci(PARROT_INTERP, ARGMOD(call_state *st))
 {
-    ASSERT_ARGS(Parrot_fetch_arg_nci);
+    ASSERT_ARGS(Parrot_fetch_arg_nci)
     next_arg_sig(&st->dest);
 
     if (st->dest.sig & PARROT_ARG_SLURPY_ARRAY) {
@@ -891,7 +891,7 @@
 static void
 convert_arg_from_int(PARROT_INTERP, ARGMOD(call_state *st))
 {
-    ASSERT_ARGS(convert_arg_from_int);
+    ASSERT_ARGS(convert_arg_from_int)
     switch (st->dest.sig & PARROT_ARG_TYPE_MASK) {
         case PARROT_ARG_FLOATVAL:
             UVal_num(st->val) = (FLOATVAL)UVal_int(st->val);
@@ -927,7 +927,7 @@
 static void
 convert_arg_from_num(PARROT_INTERP, ARGMOD(call_state *st))
 {
-    ASSERT_ARGS(convert_arg_from_num);
+    ASSERT_ARGS(convert_arg_from_num)
     switch (st->dest.sig & PARROT_ARG_TYPE_MASK) {
         case PARROT_ARG_INTVAL:
             UVal_int(st->val) = (INTVAL)UVal_num(st->val);
@@ -964,7 +964,7 @@
 static void
 convert_arg_from_str(PARROT_INTERP, ARGMOD(call_state *st))
 {
-    ASSERT_ARGS(convert_arg_from_str);
+    ASSERT_ARGS(convert_arg_from_str)
     switch (st->dest.sig & PARROT_ARG_TYPE_MASK) {
         case PARROT_ARG_INTVAL:
             UVal_int(st->val) = string_to_int(interp, UVal_str(st->val));
@@ -1000,7 +1000,7 @@
 static void
 convert_arg_from_pmc(PARROT_INTERP, ARGMOD(call_state *st))
 {
-    ASSERT_ARGS(convert_arg_from_pmc);
+    ASSERT_ARGS(convert_arg_from_pmc)
     switch (st->dest.sig & PARROT_ARG_TYPE_MASK) {
         case PARROT_ARG_INTVAL:
             UVal_int(st->val) = VTABLE_get_integer(interp, UVal_pmc(st->val));
@@ -1031,7 +1031,7 @@
 static void
 check_for_opt_flag(ARGMOD(call_state *st), int has_arg)
 {
-    ASSERT_ARGS(check_for_opt_flag);
+    ASSERT_ARGS(check_for_opt_flag)
     INTVAL idx;
     call_state_item * const dest = &st->dest;
 
@@ -1075,7 +1075,7 @@
 static void
 clone_key_arg(PARROT_INTERP, ARGMOD(call_state *st))
 {
-    ASSERT_ARGS(clone_key_arg);
+    ASSERT_ARGS(clone_key_arg)
     PMC *key = UVal_pmc(st->val);
 
     if (!key)
@@ -1112,7 +1112,7 @@
 static void
 init_first_dest_named(PARROT_INTERP, ARGMOD(call_state *st))
 {
-    ASSERT_ARGS(init_first_dest_named);
+    ASSERT_ARGS(init_first_dest_named)
     int i, n_named;
 
     if (st->dest.mode & CALL_STATE_SIG)
@@ -1177,7 +1177,7 @@
 static int
 locate_named_named(PARROT_INTERP, ARGMOD(call_state *st))
 {
-    ASSERT_ARGS(locate_named_named);
+    ASSERT_ARGS(locate_named_named)
     int i;
     int n_named = -1;
 
@@ -1231,7 +1231,7 @@
 static void
 store_arg(ARGIN(const call_state *st), INTVAL idx)
 {
-    ASSERT_ARGS(store_arg);
+    ASSERT_ARGS(store_arg)
     switch (st->dest.sig & PARROT_ARG_TYPE_MASK) {
         case PARROT_ARG_INTVAL:
             CTX_REG_INT(st->dest.ctx, idx) = UVal_int(st->val);
@@ -1267,7 +1267,7 @@
 int
 Parrot_store_arg(SHIM_INTERP, ARGIN(const call_state *st))
 {
-    ASSERT_ARGS(Parrot_store_arg);
+    ASSERT_ARGS(Parrot_store_arg)
     INTVAL idx;
     if (st->dest.i >= st->dest.n)
         return 0;
@@ -1294,7 +1294,7 @@
 static void
 too_few(PARROT_INTERP, ARGIN(const call_state *st), ARGIN(const char *action))
 {
-    ASSERT_ARGS(too_few);
+    ASSERT_ARGS(too_few)
     const int max_expected_args = st->params;
     const int min_expected_args = max_expected_args - st->optionals;
 
@@ -1321,7 +1321,7 @@
 static void
 too_many(PARROT_INTERP, ARGIN(const call_state *st), ARGIN(const char *action))
 {
-    ASSERT_ARGS(too_many);
+    ASSERT_ARGS(too_many)
     const int max_expected_args = st->params;
     const int min_expected_args = max_expected_args - st->optionals;
 
@@ -1348,7 +1348,7 @@
 static void
 null_val(int sig, ARGMOD(call_state *st))
 {
-    ASSERT_ARGS(null_val);
+    ASSERT_ARGS(null_val)
     switch (sig & PARROT_ARG_TYPE_MASK) {
         case PARROT_ARG_INTVAL:   UVal_int(st->val) = 0;       break;
         case PARROT_ARG_FLOATVAL: UVal_num(st->val) = 0.0;     break;
@@ -1382,7 +1382,7 @@
 static void
 check_named(PARROT_INTERP, ARGMOD(call_state *st))
 {
-    ASSERT_ARGS(check_named);
+    ASSERT_ARGS(check_named)
     int i;
     int n_named = -1;
 
@@ -1466,7 +1466,7 @@
 static void
 init_call_stats(ARGMOD(call_state *st))
 {
-    ASSERT_ARGS(init_call_stats);
+    ASSERT_ARGS(init_call_stats)
     /* initial guess, adjusted for :flat args */
     st->n_actual_args = st->src.n;
 
@@ -1494,7 +1494,7 @@
 void
 Parrot_process_args(PARROT_INTERP, ARGMOD(call_state *st), arg_pass_t param_or_result)
 {
-    ASSERT_ARGS(Parrot_process_args);
+    ASSERT_ARGS(Parrot_process_args)
     int n_named;
     int err_check = 1;
     call_state_item *src, *dest;
@@ -1702,7 +1702,7 @@
 void
 Parrot_convert_arg(PARROT_INTERP, ARGMOD(call_state *st))
 {
-    ASSERT_ARGS(Parrot_convert_arg);
+    ASSERT_ARGS(Parrot_convert_arg)
     /* register key args have to be cloned */
     if ((st->src.sig & PARROT_ARG_TYPE_MASK) == PARROT_ARG_PMC)
         clone_key_arg(interp, st);
@@ -1749,7 +1749,7 @@
         ARGMOD_NULLOK(opcode_t *src_indexes), ARGMOD_NULLOK(opcode_t *dest_indexes),
         arg_pass_t param_or_result)
 {
-    ASSERT_ARGS(parrot_pass_args);
+    ASSERT_ARGS(parrot_pass_args)
     call_state st;
     PMC *src_signature, *dest_signature;
 
@@ -1798,7 +1798,7 @@
 parrot_pass_args_fromc(PARROT_INTERP, ARGIN(const char *sig),
         ARGMOD(opcode_t *dest), ARGIN(Parrot_Context *old_ctxp), va_list ap)
 {
-    ASSERT_ARGS(parrot_pass_args_fromc);
+    ASSERT_ARGS(parrot_pass_args_fromc)
     call_state st;
 
     Parrot_init_arg_op(interp, CONTEXT(interp), dest, &st.dest);
@@ -1823,7 +1823,7 @@
 set_retval_util(PARROT_INTERP, ARGIN(const char *sig),
     ARGIN(Parrot_Context *ctx), ARGMOD(call_state *st))
 {
-    ASSERT_ARGS(set_retval_util);
+    ASSERT_ARGS(set_retval_util)
     opcode_t * const src_pc = interp->current_returns;
     int              todo   = Parrot_init_arg_op(interp, ctx, src_pc, &st->src);
 
@@ -1860,7 +1860,7 @@
 void *
 set_retval(PARROT_INTERP, int sig_ret, ARGIN(Parrot_Context *ctx))
 {
-    ASSERT_ARGS(set_retval);
+    ASSERT_ARGS(set_retval)
     call_state st;
 
     if (!sig_ret || sig_ret == 'v')
@@ -1895,7 +1895,7 @@
 INTVAL
 set_retval_i(PARROT_INTERP, int sig_ret, ARGIN(Parrot_Context *ctx))
 {
-    ASSERT_ARGS(set_retval_i);
+    ASSERT_ARGS(set_retval_i)
     call_state st;
 
     if (sig_ret != 'I')
@@ -1923,7 +1923,7 @@
 FLOATVAL
 set_retval_f(PARROT_INTERP, int sig_ret, ARGIN(Parrot_Context *ctx))
 {
-    ASSERT_ARGS(set_retval_f);
+    ASSERT_ARGS(set_retval_f)
     call_state st;
 
     if (sig_ret != 'N')
@@ -1953,7 +1953,7 @@
 STRING*
 set_retval_s(PARROT_INTERP, int sig_ret, ARGIN(Parrot_Context *ctx))
 {
-    ASSERT_ARGS(set_retval_s);
+    ASSERT_ARGS(set_retval_s)
     call_state st;
 
     if (sig_ret != 'S')
@@ -1983,7 +1983,7 @@
 PMC*
 set_retval_p(PARROT_INTERP, int sig_ret, ARGIN(Parrot_Context *ctx))
 {
-    ASSERT_ARGS(set_retval_p);
+    ASSERT_ARGS(set_retval_p)
     call_state st;
 
     if (sig_ret != 'P')
@@ -2014,7 +2014,7 @@
     ARGMOD(opcode_t **indexes), ARGMOD(Parrot_Context *ctx),
     ARGIN_NULLOK(PMC *pmc), ARGIN(va_list *list))
 {
-    ASSERT_ARGS(commit_last_arg);
+    ASSERT_ARGS(commit_last_arg)
     int reg_offset = 0;
 
     /* invocant already commited, just return */
@@ -2080,7 +2080,7 @@
 count_signature_elements(PARROT_INTERP, ARGIN(const char *signature),
     ARGMOD(PMC *args_sig), ARGMOD(PMC *results_sig), int flag)
 {
-    ASSERT_ARGS(count_signature_elements);
+    ASSERT_ARGS(count_signature_elements)
     const char  *x;
     unsigned int seen_arrow  = 0;
 
@@ -2179,7 +2179,7 @@
     ARGMOD(opcode_t **indexes), ARGMOD(Parrot_Context *ctx),
     ARGIN(PMC *sig_obj))
 {
-    ASSERT_ARGS(commit_last_arg_sig_object);
+    ASSERT_ARGS(commit_last_arg_sig_object)
     int reg_offset = 0;
 
     /* calculate arg's register offset */
@@ -2243,7 +2243,7 @@
     ARGMOD(Parrot_Context *ctx), ARGMOD(opcode_t **indexes),
     ARGIN_NULLOK(const char *ret_x), ARGMOD(PMC *result_list))
 {
-    ASSERT_ARGS(set_context_sig_returns);
+    ASSERT_ARGS(set_context_sig_returns)
     const char   *x;
     STRING       *empty_string = CONST_STRING(interp, "");
     unsigned int  index        = 0;
@@ -2315,7 +2315,7 @@
 set_context_sig_returns_varargs(PARROT_INTERP, ARGMOD(Parrot_Context *ctx),
     ARGMOD(opcode_t **indexes), ARGIN(const char *ret_x), ARGMOD(va_list returns))
 {
-    ASSERT_ARGS(set_context_sig_returns_varargs);
+    ASSERT_ARGS(set_context_sig_returns_varargs)
     unsigned int index = 0;
     unsigned int seen_arrow = 1;
     const char *x;
@@ -2381,7 +2381,7 @@
     ARGMOD(opcode_t **indexes), ARGMOD(Parrot_Context *ctx),
     ARGMOD(PMC *sig_obj))
 {
-    ASSERT_ARGS(set_context_sig_params);
+    ASSERT_ARGS(set_context_sig_params)
     /* second loop through signature to build all index and arg_flag
      * loop also assigns args(up to the ->) to registers */
     int index      = -1;
@@ -2482,7 +2482,7 @@
 Parrot_pcc_invoke_sub_from_c_args(PARROT_INTERP, ARGIN(PMC *sub_obj),
         ARGIN(const char *sig), ...)
 {
-    ASSERT_ARGS(Parrot_pcc_invoke_sub_from_c_args);
+    ASSERT_ARGS(Parrot_pcc_invoke_sub_from_c_args)
     PMC *sig_obj;
     va_list args;
     va_start(args, sig);
@@ -2553,7 +2553,7 @@
 Parrot_PCCINVOKE(PARROT_INTERP, ARGIN(PMC* pmc), ARGMOD(STRING *method_name),
         ARGIN(const char *signature), ...)
 {
-    ASSERT_ARGS(Parrot_PCCINVOKE);
+    ASSERT_ARGS(Parrot_PCCINVOKE)
 #define PCC_ARG_MAX 1024
     /* variables from PCCINVOKE impl in PCCMETHOD.pm */
     /* args INSP, returns INSP */
@@ -2734,7 +2734,7 @@
 Parrot_pcc_invoke_sub_from_sig_object(PARROT_INTERP, ARGIN(PMC *sub_obj),
         ARGIN(PMC *sig_obj))
 {
-    ASSERT_ARGS(Parrot_pcc_invoke_sub_from_sig_object);
+    ASSERT_ARGS(Parrot_pcc_invoke_sub_from_sig_object)
 #define PCC_ARG_MAX 1024
     /* variables from PCCINVOKE impl in PCCMETHOD.pm */
     /* args INSP, returns INSP */

Modified: trunk/src/inter_cb.c
==============================================================================
--- trunk/src/inter_cb.c	(original)
+++ trunk/src/inter_cb.c	Mon Jan  5 15:17:26 2009
@@ -73,7 +73,7 @@
 Parrot_make_cb(PARROT_INTERP, ARGMOD(PMC* sub), ARGIN(PMC* user_data),
         ARGIN(STRING *cb_signature))
 {
-    ASSERT_ARGS(Parrot_make_cb);
+    ASSERT_ARGS(Parrot_make_cb)
     PMC *cb, *cb_sig;
     int type;
     char * sig_str;
@@ -160,7 +160,7 @@
 static void
 verify_CD(ARGIN(char *external_data), ARGMOD(PMC *user_data))
 {
-    ASSERT_ARGS(verify_CD);
+    ASSERT_ARGS(verify_CD)
     PARROT_INTERP = NULL;
     size_t i;
 
@@ -223,7 +223,7 @@
 static void
 callback_CD(PARROT_INTERP, ARGIN(char *external_data), ARGMOD(PMC *user_data))
 {
-    ASSERT_ARGS(callback_CD);
+    ASSERT_ARGS(callback_CD)
 
     PMC *passed_interp;       /* the interp that originated the CB */
     PMC *passed_synchronous;  /* flagging synchronous execution */
@@ -286,7 +286,7 @@
 Parrot_run_callback(PARROT_INTERP,
         ARGMOD(PMC* user_data), ARGIN(char* external_data))
 {
-    ASSERT_ARGS(Parrot_run_callback);
+    ASSERT_ARGS(Parrot_run_callback)
     PMC     *signature;
     PMC     *sub;
     STRING  *sig_str;
@@ -382,7 +382,7 @@
 void
 Parrot_callback_C(ARGIN(char *external_data), ARGMOD(PMC *user_data))
 {
-    ASSERT_ARGS(Parrot_callback_C);
+    ASSERT_ARGS(Parrot_callback_C)
     verify_CD(external_data, user_data);
 }
 
@@ -390,7 +390,7 @@
 void
 Parrot_callback_D(ARGMOD(PMC *user_data), ARGIN(char *external_data))
 {
-    ASSERT_ARGS(Parrot_callback_D);
+    ASSERT_ARGS(Parrot_callback_D)
     verify_CD(external_data, user_data);
 }
 

Modified: trunk/src/inter_create.c
==============================================================================
--- trunk/src/inter_create.c	(original)
+++ trunk/src/inter_create.c	Mon Jan  5 15:17:26 2009
@@ -67,7 +67,7 @@
 static int
 is_env_var_set(ARGIN(const char* var))
 {
-    ASSERT_ARGS(is_env_var_set);
+    ASSERT_ARGS(is_env_var_set)
     int free_it, retval;
     char* const value = Parrot_getenv(var, &free_it);
     if (value == NULL)
@@ -94,7 +94,7 @@
 static void
 setup_default_compreg(PARROT_INTERP)
 {
-    ASSERT_ARGS(setup_default_compreg);
+    ASSERT_ARGS(setup_default_compreg)
     STRING * const pasm1 = CONST_STRING(interp, "PASM1");
 
     /* register the nci compiler object */
@@ -116,7 +116,7 @@
 Parrot_Interp
 make_interpreter(ARGIN_NULLOK(Interp *parent), INTVAL flags)
 {
-    ASSERT_ARGS(make_interpreter);
+    ASSERT_ARGS(make_interpreter)
     Interp *interp;
 
     /* Get an empty interpreter from system memory */
@@ -293,7 +293,7 @@
 void
 Parrot_destroy(PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_destroy);
+    ASSERT_ARGS(Parrot_destroy)
 #ifdef ATEXIT_DESTROY
     UNUSED(interp);
 #else
@@ -317,7 +317,7 @@
 void
 Parrot_really_destroy(PARROT_INTERP, SHIM(int exit_code), SHIM(void *arg))
 {
-    ASSERT_ARGS(Parrot_really_destroy);
+    ASSERT_ARGS(Parrot_really_destroy)
     /* wait for threads to complete if needed; terminate the event loop */
     if (!interp->parent_interpreter) {
         Parrot_cx_runloop_end(interp);

Modified: trunk/src/inter_misc.c
==============================================================================
--- trunk/src/inter_misc.c	(original)
+++ trunk/src/inter_misc.c	Mon Jan  5 15:17:26 2009
@@ -47,7 +47,7 @@
 register_nci_method(PARROT_INTERP, const int type, ARGIN(void *func),
                     ARGIN(const char *name), ARGIN(const char *proto))
 {
-    ASSERT_ARGS(register_nci_method);
+    ASSERT_ARGS(register_nci_method)
     PMC    * const method      = pmc_new(interp, enum_class_NCI);
     STRING * const method_name = string_make(interp, name, strlen(name),
         NULL, PObj_constant_FLAG|PObj_external_FLAG);
@@ -79,7 +79,7 @@
 register_raw_nci_method_in_ns(PARROT_INTERP, const int type, ARGIN(void *func),
         ARGIN(const char *name))
 {
-    ASSERT_ARGS(register_raw_nci_method_in_ns);
+    ASSERT_ARGS(register_raw_nci_method_in_ns)
     PMC    * const method      = pmc_new(interp, enum_class_NCI);
     STRING * const method_name = string_make(interp, name, strlen(name),
         NULL, PObj_constant_FLAG|PObj_external_FLAG);
@@ -106,7 +106,7 @@
 void
 Parrot_mark_method_writes(PARROT_INTERP, int type, ARGIN(const char *name))
 {
-    ASSERT_ARGS(Parrot_mark_method_writes);
+    ASSERT_ARGS(Parrot_mark_method_writes)
     STRING *const str_name = const_string(interp, name);
     PMC    *const pmc_true = pmc_new(interp, enum_class_Integer);
     PMC    *const method   = VTABLE_get_pmc_keyed_str(
@@ -130,7 +130,7 @@
 Parrot_compreg(PARROT_INTERP, ARGIN(STRING *type),
                     NOTNULL(Parrot_compiler_func_t func))
 {
-    ASSERT_ARGS(Parrot_compreg);
+    ASSERT_ARGS(Parrot_compreg)
     PMC* const iglobals = interp->iglobals;
     PMC        *nci     = pmc_new(interp, enum_class_NCI);
     STRING     *sc      = CONST_STRING(interp, "PJt");
@@ -167,7 +167,7 @@
 Parrot_compile_string(PARROT_INTERP, ARGIN(STRING *type),
         ARGIN(const char *code), ARGOUT(STRING **error))
 {
-    ASSERT_ARGS(Parrot_compile_string);
+    ASSERT_ARGS(Parrot_compile_string)
     if (string_compare(interp, CONST_STRING(interp, "PIR"), type) == 0)
         return IMCC_compile_pir_s(interp, code, error);
 
@@ -193,7 +193,7 @@
 void *
 Parrot_compile_file(PARROT_INTERP, ARGIN(const char *fullname), ARGOUT(STRING **error))
 {
-    ASSERT_ARGS(Parrot_compile_file);
+    ASSERT_ARGS(Parrot_compile_file)
     return IMCC_compile_file_s(interp, fullname, error);
 }
 
@@ -231,7 +231,7 @@
 INTVAL
 interpinfo(PARROT_INTERP, INTVAL what)
 {
-    ASSERT_ARGS(interpinfo);
+    ASSERT_ARGS(interpinfo)
     INTVAL ret = 0;
     int j;
     Arenas *arena_base = interp->arena_base;
@@ -322,7 +322,7 @@
 PMC*
 interpinfo_p(PARROT_INTERP, INTVAL what)
 {
-    ASSERT_ARGS(interpinfo_p);
+    ASSERT_ARGS(interpinfo_p)
     switch (what) {
         case CURRENT_SUB:
             return CONTEXT(interp)->current_sub;
@@ -365,7 +365,7 @@
 STRING*
 interpinfo_s(PARROT_INTERP, INTVAL what)
 {
-    ASSERT_ARGS(interpinfo_s);
+    ASSERT_ARGS(interpinfo_s)
     switch (what) {
         case EXECUTABLE_FULLNAME:
         {
@@ -436,7 +436,7 @@
 INTVAL
 sysinfo_i(SHIM_INTERP, INTVAL info_wanted)
 {
-    ASSERT_ARGS(sysinfo_i);
+    ASSERT_ARGS(sysinfo_i)
     switch (info_wanted) {
         case PARROT_INTSIZE:
             return sizeof (INTVAL);
@@ -478,7 +478,7 @@
 STRING *
 sysinfo_s(PARROT_INTERP, INTVAL info_wanted)
 {
-    ASSERT_ARGS(sysinfo_s);
+    ASSERT_ARGS(sysinfo_s)
     switch (info_wanted) {
         case PARROT_OS:
             return const_string(interp, BUILD_OS_NAME);

Modified: trunk/src/inter_run.c
==============================================================================
--- trunk/src/inter_run.c	(original)
+++ trunk/src/inter_run.c	Mon Jan  5 15:17:26 2009
@@ -65,7 +65,7 @@
 void
 runops(PARROT_INTERP, size_t offs)
 {
-    ASSERT_ARGS(runops);
+    ASSERT_ARGS(runops)
     volatile size_t offset            = offs;
     const    int    old_runloop_id    = interp->current_runloop_id;
     const    int    our_runloop_level = ++interp->current_runloop_level;
@@ -138,7 +138,7 @@
 Parrot_Context *
 Parrot_runops_fromc(PARROT_INTERP, ARGIN(PMC *sub))
 {
-    ASSERT_ARGS(Parrot_runops_fromc);
+    ASSERT_ARGS(Parrot_runops_fromc)
     opcode_t offset, *dest;
     Parrot_Context *ctx;
 
@@ -193,7 +193,7 @@
 runops_args(PARROT_INTERP, ARGIN(PMC *sub), ARGIN_NULLOK(PMC *obj),
         SHIM(STRING *meth), ARGIN(const char *sig), va_list ap)
 {
-    ASSERT_ARGS(runops_args);
+    ASSERT_ARGS(runops_args)
     opcode_t offset, *dest;
     Parrot_Context *ctx;
 
@@ -270,7 +270,7 @@
 void *
 Parrot_run_meth_fromc(PARROT_INTERP, ARGIN(PMC *sub), ARGIN_NULLOK(PMC *obj), SHIM(STRING *meth))
 {
-    ASSERT_ARGS(Parrot_run_meth_fromc);
+    ASSERT_ARGS(Parrot_run_meth_fromc)
     Parrot_Context *ctx;
     opcode_t offset, *dest;
 
@@ -306,7 +306,7 @@
 PMC *
 Parrot_runops_fromc_args(PARROT_INTERP, ARGIN(PMC *sub), ARGIN(const char *sig), ...)
 {
-    ASSERT_ARGS(Parrot_runops_fromc_args);
+    ASSERT_ARGS(Parrot_runops_fromc_args)
     va_list args;
     Parrot_Context *ctx;
     PMC *retval;
@@ -338,7 +338,7 @@
 Parrot_runops_fromc_args_event(PARROT_INTERP, ARGIN(PMC *sub),
         ARGIN(const char *sig), ...)
 {
-    ASSERT_ARGS(Parrot_runops_fromc_args_event);
+    ASSERT_ARGS(Parrot_runops_fromc_args_event)
     va_list args;
     Parrot_Context *ctx;
     void *retval;
@@ -383,7 +383,7 @@
 Parrot_runops_fromc_args_reti(PARROT_INTERP, ARGIN(PMC *sub),
         ARGIN(const char *sig), ...)
 {
-    ASSERT_ARGS(Parrot_runops_fromc_args_reti);
+    ASSERT_ARGS(Parrot_runops_fromc_args_reti)
     va_list args;
     Parrot_Context *ctx;
     INTVAL retval;
@@ -414,7 +414,7 @@
 Parrot_runops_fromc_args_retf(PARROT_INTERP, ARGIN(PMC *sub),
         ARGIN(const char *sig), ...)
 {
-    ASSERT_ARGS(Parrot_runops_fromc_args_retf);
+    ASSERT_ARGS(Parrot_runops_fromc_args_retf)
     va_list args;
     Parrot_Context *ctx;
     FLOATVAL retval;
@@ -446,7 +446,7 @@
 Parrot_run_meth_fromc_args(PARROT_INTERP, ARGIN(PMC *sub), ARGIN_NULLOK(PMC *obj),
         ARGIN(STRING *meth), ARGIN(const char *sig), ...)
 {
-    ASSERT_ARGS(Parrot_run_meth_fromc_args);
+    ASSERT_ARGS(Parrot_run_meth_fromc_args)
     va_list args;
     Parrot_Context *ctx;
     void* retval;
@@ -477,7 +477,7 @@
 Parrot_run_meth_fromc_args_reti(PARROT_INTERP, ARGIN(PMC *sub), ARGIN_NULLOK(PMC *obj),
         ARGIN(STRING *meth), ARGIN(const char *sig), ...)
 {
-    ASSERT_ARGS(Parrot_run_meth_fromc_args_reti);
+    ASSERT_ARGS(Parrot_run_meth_fromc_args_reti)
     va_list args;
     Parrot_Context *ctx;
     INTVAL retval;
@@ -508,7 +508,7 @@
 Parrot_run_meth_fromc_args_retf(PARROT_INTERP, ARGIN(PMC *sub), ARGIN_NULLOK(PMC *obj),
         ARGIN(STRING *meth), ARGIN(const char *sig), ...)
 {
-    ASSERT_ARGS(Parrot_run_meth_fromc_args_retf);
+    ASSERT_ARGS(Parrot_run_meth_fromc_args_retf)
     va_list args;
     Parrot_Context *ctx;
     FLOATVAL retval;
@@ -540,7 +540,7 @@
 Parrot_runops_fromc_arglist(PARROT_INTERP, ARGIN(PMC *sub),
         ARGIN(const char *sig), va_list args)
 {
-    ASSERT_ARGS(Parrot_runops_fromc_arglist);
+    ASSERT_ARGS(Parrot_runops_fromc_arglist)
     void* retval;
     Parrot_Context * const ctx = runops_args(interp, sub, PMCNULL, NULL, sig, args);
 
@@ -567,7 +567,7 @@
 Parrot_runops_fromc_arglist_reti(PARROT_INTERP, ARGIN(PMC *sub),
         ARGIN(const char *sig), va_list args)
 {
-    ASSERT_ARGS(Parrot_runops_fromc_arglist_reti);
+    ASSERT_ARGS(Parrot_runops_fromc_arglist_reti)
     INTVAL retval;
     Parrot_Context * const ctx = runops_args(interp, sub, PMCNULL, NULL, sig, args);
 
@@ -594,7 +594,7 @@
 Parrot_runops_fromc_arglist_retf(PARROT_INTERP, ARGIN(PMC *sub),
         ARGIN(const char *sig), va_list args)
 {
-    ASSERT_ARGS(Parrot_runops_fromc_arglist_retf);
+    ASSERT_ARGS(Parrot_runops_fromc_arglist_retf)
     FLOATVAL retval;
     Parrot_Context * const ctx = runops_args(interp, sub, PMCNULL, NULL, sig, args);
 
@@ -622,7 +622,7 @@
 Parrot_run_meth_fromc_arglist(PARROT_INTERP, ARGIN(PMC *sub), ARGIN_NULLOK(PMC *obj),
         ARGIN(STRING *meth), ARGIN(const char *sig), va_list args)
 {
-    ASSERT_ARGS(Parrot_run_meth_fromc_arglist);
+    ASSERT_ARGS(Parrot_run_meth_fromc_arglist)
     Parrot_Context *ctx;
     void* retval;
 
@@ -652,7 +652,7 @@
 Parrot_run_meth_fromc_arglist_reti(PARROT_INTERP, ARGIN(PMC *sub), ARGIN_NULLOK(PMC *obj),
         ARGIN(STRING *meth), ARGIN(const char *sig), va_list args)
 {
-    ASSERT_ARGS(Parrot_run_meth_fromc_arglist_reti);
+    ASSERT_ARGS(Parrot_run_meth_fromc_arglist_reti)
     INTVAL retval;
     Parrot_Context * const ctx = runops_args(interp, sub, obj, meth, sig, args);
 
@@ -680,7 +680,7 @@
 Parrot_run_meth_fromc_arglist_retf(PARROT_INTERP, ARGIN(PMC *sub), ARGIN_NULLOK(PMC *obj),
         ARGIN(STRING *meth), ARGIN(const char *sig), va_list args)
 {
-    ASSERT_ARGS(Parrot_run_meth_fromc_arglist_retf);
+    ASSERT_ARGS(Parrot_run_meth_fromc_arglist_retf)
     FLOATVAL retval;
     Parrot_Context * const ctx = runops_args(interp, sub, obj, meth, sig, args);
 
@@ -710,7 +710,7 @@
 void
 new_runloop_jump_point(PARROT_INTERP)
 {
-    ASSERT_ARGS(new_runloop_jump_point);
+    ASSERT_ARGS(new_runloop_jump_point)
     Parrot_runloop *jump_point;
 
     if (interp->runloop_jmp_free_list) {
@@ -738,7 +738,7 @@
 void
 free_runloop_jump_point(PARROT_INTERP)
 {
-    ASSERT_ARGS(free_runloop_jump_point);
+    ASSERT_ARGS(free_runloop_jump_point)
     Parrot_runloop * const jump_point = interp->current_runloop;
     interp->current_runloop           = jump_point->prev;
     jump_point->prev                  = interp->runloop_jmp_free_list;
@@ -759,7 +759,7 @@
 void
 destroy_runloop_jump_points(PARROT_INTERP)
 {
-    ASSERT_ARGS(destroy_runloop_jump_points);
+    ASSERT_ARGS(destroy_runloop_jump_points)
     really_destroy_runloop_jump_points(interp->current_runloop);
     really_destroy_runloop_jump_points(interp->runloop_jmp_free_list);
 }
@@ -779,7 +779,7 @@
 void
 really_destroy_runloop_jump_points(ARGIN_NULLOK(Parrot_runloop *jump_point))
 {
-    ASSERT_ARGS(really_destroy_runloop_jump_points);
+    ASSERT_ARGS(really_destroy_runloop_jump_points)
     while (jump_point) {
         Parrot_runloop * const prev = jump_point->prev;
         mem_sys_free(jump_point);

Modified: trunk/src/interpreter.c
==============================================================================
--- trunk/src/interpreter.c	(original)
+++ trunk/src/interpreter.c	Mon Jan  5 15:17:26 2009
@@ -184,7 +184,7 @@
 prederef_args(ARGMOD(void **pc_prederef), PARROT_INTERP,
         ARGIN(opcode_t *pc), ARGIN(const op_info_t *opinfo))
 {
-    ASSERT_ARGS(prederef_args);
+    ASSERT_ARGS(prederef_args)
     const PackFile_ConstTable * const const_table = interp->code->const_table;
 
     const int regs_n = CONTEXT(interp)->n_regs_used[REGNO_NUM];
@@ -382,7 +382,7 @@
 static void
 turn_ev_check(PARROT_INTERP, int on)
 {
-    ASSERT_ARGS(turn_ev_check);
+    ASSERT_ARGS(turn_ev_check)
     const Prederef * const pi = &interp->code->prederef;
     size_t i;
 
@@ -418,7 +418,7 @@
 static oplib_init_f
 get_core_op_lib_init(PARROT_INTERP, int which)
 {
-    ASSERT_ARGS(get_core_op_lib_init);
+    ASSERT_ARGS(get_core_op_lib_init)
     oplib_init_f init_func;
     switch (which) {
         case PARROT_SWITCH_CORE:
@@ -469,7 +469,7 @@
 static oplib_init_f
 get_dynamic_op_lib_init(SHIM_INTERP, ARGIN(const PMC *lib))
 {
-    ASSERT_ARGS(get_dynamic_op_lib_init);
+    ASSERT_ARGS(get_dynamic_op_lib_init)
     return (oplib_init_f)D2FPTR(PMC_struct_val(lib));
 }
 
@@ -487,7 +487,7 @@
 static void
 load_prederef(PARROT_INTERP, int which)
 {
-    ASSERT_ARGS(load_prederef);
+    ASSERT_ARGS(load_prederef)
     const oplib_init_f init_func = get_core_op_lib_init(interp, which);
 
     int (*get_op)(const char * name, int full);
@@ -518,7 +518,7 @@
 static void
 init_prederef(PARROT_INTERP, int which)
 {
-    ASSERT_ARGS(init_prederef);
+    ASSERT_ARGS(init_prederef)
     load_prederef(interp, which);
     if (!interp->code->prederef.code) {
         void        *pred_func;
@@ -586,7 +586,7 @@
 static void
 stop_prederef(PARROT_INTERP)
 {
-    ASSERT_ARGS(stop_prederef);
+    ASSERT_ARGS(stop_prederef)
     interp->op_func_table = PARROT_CORE_OPLIB_INIT(1)->op_func_table;
 
     if (interp->evc_func_table) {
@@ -730,7 +730,7 @@
 static opcode_t *
 runops_jit(PARROT_INTERP, ARGIN(opcode_t *pc))
 {
-    ASSERT_ARGS(runops_jit);
+    ASSERT_ARGS(runops_jit)
 #if JIT_CAPABLE
 #  ifdef PARROT_EXEC_OS_AIX
     /* AIX calling convention requires that function-call-by-ptr be made
@@ -772,7 +772,7 @@
 static opcode_t *
 runops_exec(PARROT_INTERP, ARGIN(opcode_t *pc))
 {
-    ASSERT_ARGS(runops_exec);
+    ASSERT_ARGS(runops_exec)
 #if EXEC_CAPABLE
     opcode_t *code_start;
     UINTVAL   code_size;          /* in opcodes */
@@ -827,7 +827,7 @@
 static opcode_t *
 runops_cgp(PARROT_INTERP, ARGIN(opcode_t *pc))
 {
-    ASSERT_ARGS(runops_cgp);
+    ASSERT_ARGS(runops_cgp)
 #ifdef HAVE_COMPUTED_GOTO
     opcode_t * const code_start = (opcode_t *)interp->code->base.data;
     opcode_t        *pc_prederef;
@@ -862,7 +862,7 @@
 static opcode_t *
 runops_switch(PARROT_INTERP, ARGIN(opcode_t *pc))
 {
-    ASSERT_ARGS(runops_switch);
+    ASSERT_ARGS(runops_switch)
     opcode_t * const code_start = (opcode_t *)interp->code->base.data;
     opcode_t        *pc_prederef;
 
@@ -1173,7 +1173,7 @@
 dynop_register_xx(PARROT_INTERP,
         size_t n_old, size_t n_new, oplib_init_f init_func)
 {
-    ASSERT_ARGS(dynop_register_xx);
+    ASSERT_ARGS(dynop_register_xx)
     const size_t n_tot    = n_old + n_new;
     op_func_t   *ops_addr = NULL;
     op_lib_t    *cg_lib   = init_func(1);
@@ -1286,7 +1286,7 @@
 static void
 dynop_register_switch(size_t n_old, size_t n_new)
 {
-    ASSERT_ARGS(dynop_register_switch);
+    ASSERT_ARGS(dynop_register_switch)
     op_lib_t * const lib = PARROT_CORE_SWITCH_OPLIB_INIT(1);
     lib->op_count        = n_old + n_new;
 }
@@ -1305,7 +1305,7 @@
 static void
 notify_func_table(PARROT_INTERP, ARGIN(op_func_t* table), int on)
 {
-    ASSERT_ARGS(notify_func_table);
+    ASSERT_ARGS(notify_func_table)
     const oplib_init_f init_func = get_core_op_lib_init(interp, interp->run_core);
 
     init_func((long) table);

Modified: trunk/src/intlist.c
==============================================================================
--- trunk/src/intlist.c	(original)
+++ trunk/src/intlist.c	Mon Jan  5 15:17:26 2009
@@ -151,7 +151,7 @@
 void
 intlist_mark(PARROT_INTERP, ARGMOD(IntList *l))
 {
-    ASSERT_ARGS(intlist_mark);
+    ASSERT_ARGS(intlist_mark)
     list_mark(interp, (List *)l);
 }
 
@@ -170,7 +170,7 @@
 IntList *
 intlist_clone(PARROT_INTERP, ARGIN(const IntList *list))
 {
-    ASSERT_ARGS(intlist_clone);
+    ASSERT_ARGS(intlist_clone)
     return (IntList *)list_clone(interp, (const List *)list);
 }
 
@@ -189,7 +189,7 @@
 IntList *
 intlist_new(PARROT_INTERP)
 {
-    ASSERT_ARGS(intlist_new);
+    ASSERT_ARGS(intlist_new)
     return (IntList *)list_new(interp, enum_type_INTVAL);
 }
 
@@ -208,7 +208,7 @@
 INTVAL
 intlist_length(SHIM_INTERP, ARGIN(const IntList *list))
 {
-    ASSERT_ARGS(intlist_length);
+    ASSERT_ARGS(intlist_length)
     return ((const List *)list)->length;
 }
 
@@ -225,7 +225,7 @@
 void
 intlist_assign(PARROT_INTERP, ARGMOD(IntList *l), INTVAL idx, INTVAL val)
 {
-    ASSERT_ARGS(intlist_assign);
+    ASSERT_ARGS(intlist_assign)
     list_assign(interp, (List *)l, idx, INTVAL2PTR(void *, val), enum_type_INTVAL);
 }
 
@@ -242,7 +242,7 @@
 void
 intlist_push(PARROT_INTERP, ARGMOD(IntList *l), INTVAL val)
 {
-    ASSERT_ARGS(intlist_push);
+    ASSERT_ARGS(intlist_push)
     list_push(interp, (List *)l, INTVAL2PTR(void *, val), enum_type_INTVAL);
 }
 
@@ -259,7 +259,7 @@
 void
 intlist_unshift(PARROT_INTERP, ARGMOD(IntList **l), INTVAL val)
 {
-    ASSERT_ARGS(intlist_unshift);
+    ASSERT_ARGS(intlist_unshift)
     list_unshift(interp, (List *)*l, INTVAL2PTR(void *, val), enum_type_INTVAL);
 }
 
@@ -276,7 +276,7 @@
 INTVAL
 intlist_pop(PARROT_INTERP, ARGMOD(IntList *l))
 {
-    ASSERT_ARGS(intlist_pop);
+    ASSERT_ARGS(intlist_pop)
     void * const ret = list_pop(interp, (List *)l, enum_type_INTVAL);
     const INTVAL retval = ret == (void *)-1 ? 0 : *(INTVAL *)ret;
     return retval;
@@ -295,7 +295,7 @@
 INTVAL
 intlist_shift(PARROT_INTERP, ARGMOD(IntList **l))
 {
-    ASSERT_ARGS(intlist_shift);
+    ASSERT_ARGS(intlist_shift)
     void * const ret = list_shift(interp, (List *)*l, enum_type_INTVAL);
     const INTVAL retval = ret == (void *)-1 ? 0 : *(INTVAL *)ret;
     return retval;
@@ -315,7 +315,7 @@
 INTVAL
 intlist_get(PARROT_INTERP, ARGMOD(IntList *list), INTVAL idx)
 {
-    ASSERT_ARGS(intlist_get);
+    ASSERT_ARGS(intlist_get)
     void * const ret = list_get(interp, (List *)list, idx, enum_type_INTVAL);
     if (ret)
         return *(INTVAL *)ret;

Modified: trunk/src/io/api.c
==============================================================================
--- trunk/src/io/api.c	(original)
+++ trunk/src/io/api.c	Mon Jan  5 15:17:26 2009
@@ -52,7 +52,7 @@
 PMC *
 Parrot_io_new_pmc(PARROT_INTERP, INTVAL flags)
 {
-    ASSERT_ARGS(Parrot_io_new_pmc);
+    ASSERT_ARGS(Parrot_io_new_pmc)
     PMC * const new_io = pmc_new(interp, enum_class_FileHandle);
 
     Parrot_io_set_flags(interp, new_io, flags);
@@ -82,7 +82,7 @@
 Parrot_io_open(PARROT_INTERP, ARGIN_NULLOK(PMC *pmc),
         ARGIN(STRING *path), ARGIN_NULLOK(STRING *mode))
 {
-    ASSERT_ARGS(Parrot_io_open);
+    ASSERT_ARGS(Parrot_io_open)
     PMC *new_filehandle;
 
     if (PMC_IS_NULL(pmc))
@@ -117,7 +117,7 @@
 Parrot_io_fdopen(PARROT_INTERP, ARGIN_NULLOK(PMC *pmc), PIOHANDLE fd,
         ARGIN(STRING *sflags))
 {
-    ASSERT_ARGS(Parrot_io_fdopen);
+    ASSERT_ARGS(Parrot_io_fdopen)
     PMC *new_filehandle;
     INTVAL flags;
 
@@ -153,7 +153,7 @@
 INTVAL
 Parrot_io_close(PARROT_INTERP, ARGMOD(PMC *pmc))
 {
-    ASSERT_ARGS(Parrot_io_close);
+    ASSERT_ARGS(Parrot_io_close)
     INTVAL result;
 
     if (PMC_IS_NULL(pmc))
@@ -178,7 +178,7 @@
 INTVAL
 Parrot_io_is_closed(PARROT_INTERP, ARGMOD(PMC *pmc))
 {
-    ASSERT_ARGS(Parrot_io_is_closed);
+    ASSERT_ARGS(Parrot_io_is_closed)
     INTVAL result;
 
     if (PMC_IS_NULL(pmc))
@@ -202,7 +202,7 @@
 void
 Parrot_io_flush(PARROT_INTERP, ARGMOD(PMC *pmc))
 {
-    ASSERT_ARGS(Parrot_io_flush);
+    ASSERT_ARGS(Parrot_io_flush)
     if (PMC_IS_NULL(pmc))
         return;
 
@@ -226,7 +226,7 @@
 STRING *
 Parrot_io_reads(PARROT_INTERP, ARGMOD(PMC *pmc), size_t length)
 {
-    ASSERT_ARGS(Parrot_io_reads);
+    ASSERT_ARGS(Parrot_io_reads)
     STRING *result;
     Parrot_PCCINVOKE(interp, pmc, CONST_STRING(interp, "read"), "I->S",
             length, &result);
@@ -250,7 +250,7 @@
 STRING *
 Parrot_io_readline(PARROT_INTERP, ARGMOD(PMC *pmc))
 {
-    ASSERT_ARGS(Parrot_io_readline);
+    ASSERT_ARGS(Parrot_io_readline)
     STRING *result;
     Parrot_PCCINVOKE(interp, pmc, CONST_STRING(interp, "readline"), "->S",
             &result);
@@ -272,7 +272,7 @@
 INTVAL
 Parrot_io_write(PARROT_INTERP, ARGMOD(PMC *pmc), ARGIN(const void *buffer), size_t length)
 {
-    ASSERT_ARGS(Parrot_io_write);
+    ASSERT_ARGS(Parrot_io_write)
     DECL_CONST_CAST;
     INTVAL result;
     STRING fake;
@@ -306,7 +306,7 @@
 PIOOFF_T
 Parrot_io_seek(PARROT_INTERP, ARGMOD(PMC *pmc), PIOOFF_T offset, INTVAL w)
 {
-    ASSERT_ARGS(Parrot_io_seek);
+    ASSERT_ARGS(Parrot_io_seek)
     if (Parrot_io_is_closed(interp, pmc))
         return -1;
 
@@ -328,7 +328,7 @@
 PIOOFF_T
 Parrot_io_tell(PARROT_INTERP, ARGMOD(PMC *pmc))
 {
-    ASSERT_ARGS(Parrot_io_tell);
+    ASSERT_ARGS(Parrot_io_tell)
     if (Parrot_io_is_closed(interp, pmc))
         return -1;
 
@@ -351,7 +351,7 @@
 INTVAL
 Parrot_io_peek(PARROT_INTERP, ARGMOD(PMC *pmc), ARGOUT(STRING **buffer))
 {
-    ASSERT_ARGS(Parrot_io_peek);
+    ASSERT_ARGS(Parrot_io_peek)
     if (Parrot_io_is_closed(interp, pmc))
         return -1;
 
@@ -374,7 +374,7 @@
 INTVAL
 Parrot_io_eof(PARROT_INTERP, ARGMOD(PMC *pmc))
 {
-    ASSERT_ARGS(Parrot_io_eof);
+    ASSERT_ARGS(Parrot_io_eof)
     INTVAL result;
 
     /* io could be null here, but rather than return a negative error
@@ -404,7 +404,7 @@
 INTVAL
 Parrot_io_puts(PARROT_INTERP, ARGMOD(PMC *pmc), ARGIN(const char *s))
 {
-    ASSERT_ARGS(Parrot_io_puts);
+    ASSERT_ARGS(Parrot_io_puts)
     return Parrot_io_write(interp, pmc, s, strlen(s));
 }
 
@@ -422,7 +422,7 @@
 INTVAL
 Parrot_io_putps(PARROT_INTERP, ARGMOD(PMC *pmc), ARGMOD_NULLOK(STRING *s))
 {
-    ASSERT_ARGS(Parrot_io_putps);
+    ASSERT_ARGS(Parrot_io_putps)
     INTVAL result;
 
     if (PMC_IS_NULL(pmc))
@@ -449,7 +449,7 @@
 INTVAL
 Parrot_io_fprintf(PARROT_INTERP, ARGMOD(PMC *pmc), ARGIN(const char *s), ...)
 {
-    ASSERT_ARGS(Parrot_io_fprintf);
+    ASSERT_ARGS(Parrot_io_fprintf)
     va_list args;
     INTVAL ret;
 
@@ -476,7 +476,7 @@
 INTVAL
 Parrot_io_printf(PARROT_INTERP, ARGIN(const char *s), ...)
 {
-    ASSERT_ARGS(Parrot_io_printf);
+    ASSERT_ARGS(Parrot_io_printf)
     va_list args;
     INTVAL ret;
 
@@ -513,7 +513,7 @@
 INTVAL
 Parrot_io_eprintf(NULLOK(PARROT_INTERP), ARGIN(const char *s), ...)
 {
-    ASSERT_ARGS(Parrot_io_eprintf);
+    ASSERT_ARGS(Parrot_io_eprintf)
     va_list args;
     INTVAL ret;
 
@@ -551,7 +551,7 @@
 PIOHANDLE
 Parrot_io_getfd(PARROT_INTERP, ARGMOD(PMC *pmc))
 {
-    ASSERT_ARGS(Parrot_io_getfd);
+    ASSERT_ARGS(Parrot_io_getfd)
     return Parrot_io_get_os_handle(interp, pmc);
 }
 
@@ -570,7 +570,7 @@
 INTVAL
 Parrot_io_is_tty(PARROT_INTERP, ARGMOD(PMC *pmc))
 {
-    ASSERT_ARGS(Parrot_io_is_tty);
+    ASSERT_ARGS(Parrot_io_is_tty)
     if (Parrot_io_is_closed(interp, pmc))
         return 0;
 
@@ -599,7 +599,7 @@
 PMC *
 Parrot_io_STDIN(PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_io_STDIN);
+    ASSERT_ARGS(Parrot_io_STDIN)
     return _PIO_STDIN(interp);
 }
 
@@ -619,7 +619,7 @@
 PMC *
 Parrot_io_STDOUT(PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_io_STDOUT);
+    ASSERT_ARGS(Parrot_io_STDOUT)
     return _PIO_STDOUT(interp);
 }
 
@@ -639,7 +639,7 @@
 PMC *
 Parrot_io_STDERR(PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_io_STDERR);
+    ASSERT_ARGS(Parrot_io_STDERR)
     return _PIO_STDERR(interp);
 }
 
@@ -665,7 +665,7 @@
 PIOOFF_T
 Parrot_io_make_offset(INTVAL offset)
 {
-    ASSERT_ARGS(Parrot_io_make_offset);
+    ASSERT_ARGS(Parrot_io_make_offset)
     return offset;
 }
 
@@ -683,7 +683,7 @@
 PIOOFF_T
 Parrot_io_make_offset32(INTVAL hi, INTVAL lo)
 {
-    ASSERT_ARGS(Parrot_io_make_offset32);
+    ASSERT_ARGS(Parrot_io_make_offset32)
     return ((PIOOFF_T)hi << 31) | lo;
 }
 
@@ -700,7 +700,7 @@
 PIOOFF_T
 Parrot_io_make_offset_pmc(PARROT_INTERP, ARGMOD(PMC *pmc))
 {
-    ASSERT_ARGS(Parrot_io_make_offset_pmc);
+    ASSERT_ARGS(Parrot_io_make_offset_pmc)
     return VTABLE_get_integer(interp, pmc);
 }
 

Modified: trunk/src/io/buffer.c
==============================================================================
--- trunk/src/io/buffer.c	(original)
+++ trunk/src/io/buffer.c	Mon Jan  5 15:17:26 2009
@@ -47,7 +47,7 @@
 INTVAL
 Parrot_io_init_buffer(PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_io_init_buffer);
+    ASSERT_ARGS(Parrot_io_init_buffer)
     if (Parrot_io_STDOUT(interp))
         Parrot_io_setlinebuf(interp, Parrot_io_STDOUT(interp));
 
@@ -70,7 +70,7 @@
 void
 Parrot_io_setbuf(PARROT_INTERP, ARGMOD(PMC *filehandle), size_t bufsize)
 {
-    ASSERT_ARGS(Parrot_io_setbuf);
+    ASSERT_ARGS(Parrot_io_setbuf)
     INTVAL filehandle_flags = Parrot_io_get_flags(interp, filehandle);
     INTVAL         buffer_flags = Parrot_io_get_buffer_flags(interp, filehandle);
     unsigned char *buffer_start = Parrot_io_get_buffer_start(interp, filehandle);
@@ -140,7 +140,7 @@
 INTVAL
 Parrot_io_setlinebuf(PARROT_INTERP, ARGMOD(PMC *filehandle))
 {
-    ASSERT_ARGS(Parrot_io_setlinebuf);
+    ASSERT_ARGS(Parrot_io_setlinebuf)
     INTVAL filehandle_flags = Parrot_io_get_flags(interp, filehandle);
 
     /* already linebuffering */
@@ -172,7 +172,7 @@
 INTVAL
 Parrot_io_flush_buffer(PARROT_INTERP, ARGMOD(PMC *filehandle))
 {
-    ASSERT_ARGS(Parrot_io_flush_buffer);
+    ASSERT_ARGS(Parrot_io_flush_buffer)
     long wrote;
     size_t to_write;
     STRING fake;
@@ -232,7 +232,7 @@
 size_t
 Parrot_io_fill_readbuf(PARROT_INTERP, ARGMOD(PMC *filehandle))
 {
-    ASSERT_ARGS(Parrot_io_fill_readbuf);
+    ASSERT_ARGS(Parrot_io_fill_readbuf)
     size_t   got;
     STRING   fake;
     STRING  *s    = &fake;
@@ -276,7 +276,7 @@
 Parrot_io_read_buffer(PARROT_INTERP, ARGMOD(PMC *filehandle),
               ARGIN(STRING **buf))
 {
-    ASSERT_ARGS(Parrot_io_read_buffer);
+    ASSERT_ARGS(Parrot_io_read_buffer)
     unsigned char *out_buf, *buffer_start, *buffer_next, *buffer_end;
     STRING        *s;
     size_t         len;
@@ -406,7 +406,7 @@
 Parrot_io_peek_buffer(PARROT_INTERP, ARGMOD(PMC *filehandle),
         ARGOUT(STRING **buf))
 {
-    ASSERT_ARGS(Parrot_io_peek_buffer);
+    ASSERT_ARGS(Parrot_io_peek_buffer)
     unsigned char *buffer_next;
     STRING * const s            = Parrot_io_make_string(interp, buf, 1);
     UINTVAL        len          = 1;
@@ -464,7 +464,7 @@
 size_t
 Parrot_io_readline_buffer(PARROT_INTERP, ARGMOD(PMC *filehandle), ARGOUT(STRING **buf))
 {
-    ASSERT_ARGS(Parrot_io_readline_buffer);
+    ASSERT_ARGS(Parrot_io_readline_buffer)
     size_t l;
     unsigned char *out_buf;
     unsigned char *buf_start;
@@ -566,7 +566,7 @@
 size_t
 Parrot_io_write_buffer(PARROT_INTERP, ARGMOD(PMC *filehandle), ARGIN(STRING *s))
 {
-    ASSERT_ARGS(Parrot_io_write_buffer);
+    ASSERT_ARGS(Parrot_io_write_buffer)
     size_t avail;
     void * const buffer = s->strstart;
     const size_t len = s->bufused;
@@ -674,7 +674,7 @@
 Parrot_io_seek_buffer(PARROT_INTERP, ARGMOD(PMC *filehandle),
         PIOOFF_T offset, INTVAL whence)
 {
-    ASSERT_ARGS(Parrot_io_seek_buffer);
+    ASSERT_ARGS(Parrot_io_seek_buffer)
     PIOOFF_T newpos;
     PIOOFF_T file_pos = Parrot_io_get_file_position(interp, filehandle);
     unsigned char *buffer_start = Parrot_io_get_buffer_start(interp, filehandle);
@@ -733,7 +733,7 @@
 static INTVAL
 io_is_end_of_line(ARGIN(const char *c))
 {
-    ASSERT_ARGS(io_is_end_of_line);
+    ASSERT_ARGS(io_is_end_of_line)
     if ((*(c)) == '\n')
         return 1;
 

Modified: trunk/src/io/core.c
==============================================================================
--- trunk/src/io/core.c	(original)
+++ trunk/src/io/core.c	Mon Jan  5 15:17:26 2009
@@ -48,7 +48,7 @@
 void
 Parrot_io_init(PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_io_init);
+    ASSERT_ARGS(Parrot_io_init)
     /* Has interp been initialized already? */
     if (interp->piodata) {
         /* memsub system is up and running: */
@@ -91,7 +91,7 @@
 void
 Parrot_io_finish(PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_io_finish);
+    ASSERT_ARGS(Parrot_io_finish)
     /*
      * TODO free IO of std-handles
      */
@@ -117,7 +117,7 @@
 void
 Parrot_IOData_mark(PARROT_INTERP, ARGIN(ParrotIOData *piodata))
 {
-    ASSERT_ARGS(Parrot_IOData_mark);
+    ASSERT_ARGS(Parrot_IOData_mark)
     INTVAL i;
     ParrotIOTable table = piodata->table;
 

Modified: trunk/src/io/filehandle.c
==============================================================================
--- trunk/src/io/filehandle.c	(original)
+++ trunk/src/io/filehandle.c	Mon Jan  5 15:17:26 2009
@@ -41,7 +41,7 @@
 INTVAL
 Parrot_io_parse_open_flags(PARROT_INTERP, ARGIN_NULLOK(STRING *mode_str))
 {
-    ASSERT_ARGS(Parrot_io_parse_open_flags);
+    ASSERT_ARGS(Parrot_io_parse_open_flags)
     INTVAL i, mode_len;
     INTVAL flags = 0;
 
@@ -115,7 +115,7 @@
 STRING *
 Parrot_io_make_string(PARROT_INTERP, ARGMOD(STRING **buf), size_t len)
 {
-    ASSERT_ARGS(Parrot_io_make_string);
+    ASSERT_ARGS(Parrot_io_make_string)
     /*
      * when we get a NULL string, we read a default len
      */
@@ -155,7 +155,7 @@
 void
 Parrot_io_set_os_handle(SHIM_INTERP, ARGIN(PMC *filehandle), PIOHANDLE file_descriptor)
 {
-    ASSERT_ARGS(Parrot_io_set_os_handle);
+    ASSERT_ARGS(Parrot_io_set_os_handle)
     PARROT_FILEHANDLE(filehandle)->os_handle = file_descriptor;
 }
 
@@ -179,7 +179,7 @@
 PIOHANDLE
 Parrot_io_get_os_handle(SHIM_INTERP, ARGIN(PMC *filehandle))
 {
-    ASSERT_ARGS(Parrot_io_get_os_handle);
+    ASSERT_ARGS(Parrot_io_get_os_handle)
     return PARROT_FILEHANDLE(filehandle)->os_handle;
 }
 
@@ -203,7 +203,7 @@
 void
 Parrot_io_set_flags(SHIM_INTERP, ARGIN(PMC *filehandle), INTVAL flags)
 {
-    ASSERT_ARGS(Parrot_io_set_flags);
+    ASSERT_ARGS(Parrot_io_set_flags)
     Parrot_FileHandle_attributes *handle_struct = PARROT_FILEHANDLE(filehandle);
     handle_struct->flags = flags;
 }
@@ -228,7 +228,7 @@
 INTVAL
 Parrot_io_get_flags(SHIM_INTERP, ARGIN(PMC *filehandle))
 {
-    ASSERT_ARGS(Parrot_io_get_flags);
+    ASSERT_ARGS(Parrot_io_get_flags)
     Parrot_FileHandle_attributes *handle_struct = PARROT_FILEHANDLE(filehandle);
     INTVAL flags = handle_struct->flags;
     return flags;
@@ -254,7 +254,7 @@
 void
 Parrot_io_set_file_size(SHIM_INTERP, ARGIN(PMC *filehandle), PIOOFF_T file_size)
 {
-    ASSERT_ARGS(Parrot_io_set_file_size);
+    ASSERT_ARGS(Parrot_io_set_file_size)
     PARROT_FILEHANDLE(filehandle)->file_size = file_size;
 }
 
@@ -280,7 +280,7 @@
 PIOOFF_T
 Parrot_io_get_file_size(SHIM_INTERP, ARGIN(PMC *filehandle))
 {
-    ASSERT_ARGS(Parrot_io_get_file_size);
+    ASSERT_ARGS(Parrot_io_get_file_size)
     return PARROT_FILEHANDLE(filehandle)->file_size;
 }
 
@@ -304,7 +304,7 @@
 Parrot_io_set_buffer_start(SHIM_INTERP, ARGIN(PMC *filehandle),
         ARGIN_NULLOK(unsigned char *new_start))
 {
-    ASSERT_ARGS(Parrot_io_set_buffer_start);
+    ASSERT_ARGS(Parrot_io_set_buffer_start)
     PARROT_FILEHANDLE(filehandle)->buffer_start = new_start;
 }
 
@@ -329,7 +329,7 @@
 unsigned char *
 Parrot_io_get_buffer_start(SHIM_INTERP, ARGIN(PMC *filehandle))
 {
-    ASSERT_ARGS(Parrot_io_get_buffer_start);
+    ASSERT_ARGS(Parrot_io_get_buffer_start)
     return PARROT_FILEHANDLE(filehandle)->buffer_start;
 }
 
@@ -354,7 +354,7 @@
 unsigned char *
 Parrot_io_get_buffer_next(SHIM_INTERP, ARGIN(PMC *filehandle))
 {
-    ASSERT_ARGS(Parrot_io_get_buffer_next);
+    ASSERT_ARGS(Parrot_io_get_buffer_next)
     return PARROT_FILEHANDLE(filehandle)->buffer_next;
 }
 
@@ -378,7 +378,7 @@
 Parrot_io_set_buffer_next(SHIM_INTERP, ARGIN(PMC *filehandle),
         ARGIN_NULLOK(unsigned char *new_next))
 {
-    ASSERT_ARGS(Parrot_io_set_buffer_next);
+    ASSERT_ARGS(Parrot_io_set_buffer_next)
     PARROT_FILEHANDLE(filehandle)->buffer_next = new_next;
 }
 
@@ -403,7 +403,7 @@
 unsigned char *
 Parrot_io_get_buffer_end(SHIM_INTERP, ARGIN_NULLOK(PMC *filehandle))
 {
-    ASSERT_ARGS(Parrot_io_get_buffer_end);
+    ASSERT_ARGS(Parrot_io_get_buffer_end)
     return PARROT_FILEHANDLE(filehandle)->buffer_end;
 }
 
@@ -427,7 +427,7 @@
 Parrot_io_set_buffer_end(SHIM_INTERP, ARGIN(PMC *filehandle),
         ARGIN_NULLOK(unsigned char *new_end))
 {
-    ASSERT_ARGS(Parrot_io_set_buffer_end);
+    ASSERT_ARGS(Parrot_io_set_buffer_end)
     PARROT_FILEHANDLE(filehandle)->buffer_end = new_end;
 }
 
@@ -451,7 +451,7 @@
 INTVAL
 Parrot_io_get_buffer_flags(SHIM_INTERP, ARGIN(PMC *filehandle))
 {
-    ASSERT_ARGS(Parrot_io_get_buffer_flags);
+    ASSERT_ARGS(Parrot_io_get_buffer_flags)
     return PARROT_FILEHANDLE(filehandle)->buffer_flags;
 }
 
@@ -474,7 +474,7 @@
 void
 Parrot_io_set_buffer_flags(SHIM_INTERP, ARGIN(PMC *filehandle), INTVAL new_flags)
 {
-    ASSERT_ARGS(Parrot_io_set_buffer_flags);
+    ASSERT_ARGS(Parrot_io_set_buffer_flags)
     PARROT_FILEHANDLE(filehandle)->buffer_flags = new_flags;
 }
 
@@ -498,7 +498,7 @@
 size_t
 Parrot_io_get_buffer_size(SHIM_INTERP, ARGIN(PMC *filehandle))
 {
-    ASSERT_ARGS(Parrot_io_get_buffer_size);
+    ASSERT_ARGS(Parrot_io_get_buffer_size)
     return PARROT_FILEHANDLE(filehandle)->buffer_size;
 }
 
@@ -521,7 +521,7 @@
 void
 Parrot_io_set_buffer_size(SHIM_INTERP, ARGIN(PMC *filehandle), size_t new_size)
 {
-    ASSERT_ARGS(Parrot_io_set_buffer_size);
+    ASSERT_ARGS(Parrot_io_set_buffer_size)
     PARROT_FILEHANDLE(filehandle)->buffer_size = new_size;
 }
 
@@ -544,7 +544,7 @@
 void
 Parrot_io_clear_buffer(SHIM_INTERP, ARGIN(PMC *filehandle))
 {
-    ASSERT_ARGS(Parrot_io_clear_buffer);
+    ASSERT_ARGS(Parrot_io_clear_buffer)
     Parrot_FileHandle_attributes *io = PARROT_FILEHANDLE(filehandle);
     if (io->buffer_start && (io->flags & PIO_BF_MALLOC)) {
         mem_sys_free(io->buffer_start);
@@ -572,7 +572,7 @@
 PIOOFF_T
 Parrot_io_get_file_position(SHIM_INTERP, ARGIN(PMC *filehandle))
 {
-    ASSERT_ARGS(Parrot_io_get_file_position);
+    ASSERT_ARGS(Parrot_io_get_file_position)
     return PARROT_FILEHANDLE(filehandle)->file_pos;
 }
 
@@ -596,7 +596,7 @@
 PIOOFF_T
 Parrot_io_get_last_file_position(SHIM_INTERP, ARGIN(PMC *filehandle))
 {
-    ASSERT_ARGS(Parrot_io_get_last_file_position);
+    ASSERT_ARGS(Parrot_io_get_last_file_position)
     return PARROT_FILEHANDLE(filehandle)->last_pos;
 }
 
@@ -621,7 +621,7 @@
 void
 Parrot_io_set_file_position(SHIM_INTERP, ARGIN(PMC *filehandle), PIOOFF_T file_pos)
 {
-    ASSERT_ARGS(Parrot_io_set_file_position);
+    ASSERT_ARGS(Parrot_io_set_file_position)
     Parrot_FileHandle_attributes *handle_struct = PARROT_FILEHANDLE(filehandle);
     handle_struct->last_pos = handle_struct->file_pos;
     handle_struct->file_pos = file_pos;
@@ -648,7 +648,7 @@
 INTVAL
 Parrot_io_is_encoding(PARROT_INTERP, ARGIN(PMC *filehandle), ARGIN(STRING *value))
 {
-    ASSERT_ARGS(Parrot_io_is_encoding);
+    ASSERT_ARGS(Parrot_io_is_encoding)
     Parrot_FileHandle_attributes *handle_struct = PARROT_FILEHANDLE(filehandle);
     if (STRING_IS_NULL(handle_struct->encoding))
         return 0;
@@ -674,7 +674,7 @@
 INTVAL
 Parrot_io_close_filehandle(PARROT_INTERP, ARGMOD(PMC *pmc))
 {
-    ASSERT_ARGS(Parrot_io_close_filehandle);
+    ASSERT_ARGS(Parrot_io_close_filehandle)
     INTVAL result;
 
     if (Parrot_io_is_closed_filehandle(interp, pmc))
@@ -703,7 +703,7 @@
 INTVAL
 Parrot_io_is_closed_filehandle(PARROT_INTERP, ARGMOD(PMC *pmc))
 {
-    ASSERT_ARGS(Parrot_io_is_closed_filehandle);
+    ASSERT_ARGS(Parrot_io_is_closed_filehandle)
     return PIO_IS_CLOSED(interp, pmc);
 }
 
@@ -721,7 +721,7 @@
 void
 Parrot_io_flush_filehandle(PARROT_INTERP, ARGMOD(PMC *pmc))
 {
-    ASSERT_ARGS(Parrot_io_flush_filehandle);
+    ASSERT_ARGS(Parrot_io_flush_filehandle)
     if (Parrot_io_is_closed(interp, pmc))
         return;
 

Modified: trunk/src/io/portable.c
==============================================================================
--- trunk/src/io/portable.c	(original)
+++ trunk/src/io/portable.c	Mon Jan  5 15:17:26 2009
@@ -58,7 +58,7 @@
 static const char *
 convert_flags_to_stdio(INTVAL flags)
 {
-    ASSERT_ARGS(convert_flags_to_stdio);
+    ASSERT_ARGS(convert_flags_to_stdio)
     if ((flags & (PIO_F_WRITE | PIO_F_READ | PIO_F_APPEND)) ==
         (PIO_F_WRITE | PIO_F_READ | PIO_F_APPEND)) {
         return "a+b";
@@ -97,7 +97,7 @@
 INTVAL
 Parrot_io_init_portable(PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_io_init_portable);
+    ASSERT_ARGS(Parrot_io_init_portable)
 #  ifdef PIO_OS_STDIO
     /* Only set standard handles if stdio is the OS IO */
     PIO_STDIN(interp)
@@ -131,7 +131,7 @@
 Parrot_io_open_portable(PARROT_INTERP, ARGMOD(PMC *filehandle),
               ARGIN(STRING *path), INTVAL flags)
 {
-    ASSERT_ARGS(Parrot_io_open_portable);
+    ASSERT_ARGS(Parrot_io_open_portable)
     const char *oflags;
     FILE       *fptr;
 
@@ -190,7 +190,7 @@
 Parrot_io_fdopen_portable(PARROT_INTERP, ARGMOD(PMC *filehandle),
         PIOHANDLE fptr, INTVAL flags)
 {
-    ASSERT_ARGS(Parrot_io_fdopen_portable);
+    ASSERT_ARGS(Parrot_io_fdopen_portable)
     PMC *io;
 
     if (io_is_tty_portable(fptr))
@@ -223,7 +223,7 @@
 INTVAL
 Parrot_io_close_portable(PARROT_INTERP, ARGMOD(PMC *filehandle))
 {
-    ASSERT_ARGS(Parrot_io_close_portable);
+    ASSERT_ARGS(Parrot_io_close_portable)
     FILE * const fptr = (FILE *)Parrot_io_get_os_handle(interp, filehandle);
 
     if (fptr)
@@ -248,7 +248,7 @@
 INTVAL
 Parrot_io_is_closed_portable(PARROT_INTERP, ARGIN(PMC *filehandle))
 {
-    ASSERT_ARGS(Parrot_io_is_closed_portable);
+    ASSERT_ARGS(Parrot_io_is_closed_portable)
     if (Parrot_io_get_os_handle(interp, filehandle) == (PIOHANDLE)NULL)
         return 1;
 
@@ -269,7 +269,7 @@
 static INTVAL
 io_is_tty_portable(PIOHANDLE fptr)
 {
-    ASSERT_ARGS(io_is_tty_portable);
+    ASSERT_ARGS(io_is_tty_portable)
     UNUSED(fptr);
 
     /* no obvious way to check for this with STDIO */
@@ -292,7 +292,7 @@
         ARGIN(PMC *filehandle),
         ARGIN(STRING **buf))
 {
-    ASSERT_ARGS(Parrot_io_peek_portable);
+    ASSERT_ARGS(Parrot_io_peek_portable)
     FILE   * const fptr  = (FILE *)Parrot_io_get_os_handle(interp, filehandle);
     STRING * const s     = Parrot_io_make_string(interp, buf, 1);
 
@@ -324,7 +324,7 @@
 INTVAL
 Parrot_io_getblksize_portable(PIOHANDLE fptr)
 {
-    ASSERT_ARGS(Parrot_io_getblksize_portable);
+    ASSERT_ARGS(Parrot_io_getblksize_portable)
     UNUSED(fptr);
 
     /* Hard coded for now */
@@ -345,7 +345,7 @@
 INTVAL
 Parrot_io_flush_portable(SHIM_INTERP, SHIM(PMC *filehandle))
 {
-    ASSERT_ARGS(Parrot_io_flush_portable);
+    ASSERT_ARGS(Parrot_io_flush_portable)
     return fflush((FILE *)Parrot_io_get_os_handle(interp, filehandle));
 }
 
@@ -365,7 +365,7 @@
 Parrot_io_read_portable(PARROT_INTERP, SHIM(PMC *filehandle),
               ARGIN(STRING **buf))
 {
-    ASSERT_ARGS(Parrot_io_read_portable);
+    ASSERT_ARGS(Parrot_io_read_portable)
     FILE   * const fptr   = (FILE *)Parrot_io_get_os_handle(interp, filehandle);
     STRING * const s      = Parrot_io_make_string(interp, buf, 2048);
     void   * const buffer = s->strstart;
@@ -397,7 +397,7 @@
 size_t
 Parrot_io_write_portable(PARROT_INTERP, ARGIN(PMC *filehandle), ARGMOD(STRING *s))
 {
-    ASSERT_ARGS(Parrot_io_write_portable);
+    ASSERT_ARGS(Parrot_io_write_portable)
     void * const buffer = s->strstart;
     return fwrite(buffer, 1, s->bufused,
                   (FILE *)Parrot_io_get_os_handle(interp, filehandle));
@@ -418,7 +418,7 @@
 Parrot_io_seek_portable(PARROT_INTERP, ARGMOD(PMC *filehandle),
               PIOOFF_T offset, INTVAL whence)
 {
-    ASSERT_ARGS(Parrot_io_seek_portable);
+    ASSERT_ARGS(Parrot_io_seek_portable)
     PIOOFF_T pos;
     errno = 0;
 
@@ -447,7 +447,7 @@
 PIOOFF_T
 Parrot_io_tell_portable(PARROT_INTERP, ARGIN(PMC *filehandle))
 {
-    ASSERT_ARGS(Parrot_io_tell_portable);
+    ASSERT_ARGS(Parrot_io_tell_portable)
     return (ftell((FILE *)Parrot_io_get_os_handle(interp, filehandle)));
 }
 
@@ -468,7 +468,7 @@
 Parrot_io_open_pipe_portable(PARROT_INTERP, SHIM(PMC *filehandle),
         SHIM(STRING *command), int flags)
 {
-    ASSERT_ARGS(Parrot_io_open_pipe_portable);
+    ASSERT_ARGS(Parrot_io_open_pipe_portable)
     UNUSED(flags);
     Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_UNIMPLEMENTED,
         "pipe() not implemented");

Modified: trunk/src/io/unix.c
==============================================================================
--- trunk/src/io/unix.c	(original)
+++ trunk/src/io/unix.c	Mon Jan  5 15:17:26 2009
@@ -64,7 +64,7 @@
 static INTVAL
 convert_flags_to_unix(INTVAL flags)
 {
-    ASSERT_ARGS(convert_flags_to_unix);
+    ASSERT_ARGS(convert_flags_to_unix)
     INTVAL oflags = 0;
 
     if ((flags & (PIO_F_WRITE | PIO_F_READ)) == (PIO_F_WRITE | PIO_F_READ)) {
@@ -100,7 +100,7 @@
 INTVAL
 Parrot_io_init_unix(PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_io_init_unix);
+    ASSERT_ARGS(Parrot_io_init_unix)
     ParrotIOData * const d = interp->piodata;
     if (d != NULL && d->table != NULL) {
         PMC *filehandle;
@@ -143,7 +143,7 @@
 Parrot_io_open_unix(PARROT_INTERP, ARGMOD_NULLOK(PMC *filehandle),
               ARGIN(STRING *path), INTVAL flags)
 {
-    ASSERT_ARGS(Parrot_io_open_unix);
+    ASSERT_ARGS(Parrot_io_open_unix)
     INTVAL oflags;
     PIOHANDLE fd;
     char *spath;
@@ -262,7 +262,7 @@
 INTVAL
 Parrot_io_async_unix(PARROT_INTERP, ARGMOD(PMC *filehandle), INTVAL b)
 {
-    ASSERT_ARGS(Parrot_io_async_unix);
+    ASSERT_ARGS(Parrot_io_async_unix)
     int rflags;
 #    if defined(linux)
     PIOHANDLE file_descriptor = Parrot_io_get_os_handle(interp, filehandle);
@@ -298,7 +298,7 @@
 PMC *
 Parrot_io_fdopen_unix(PARROT_INTERP, ARGMOD(PMC *filehandle), PIOHANDLE fd, INTVAL flags)
 {
-    ASSERT_ARGS(Parrot_io_fdopen_unix);
+    ASSERT_ARGS(Parrot_io_fdopen_unix)
     if (io_is_tty_unix(fd))
         flags |= PIO_F_CONSOLE;
 
@@ -332,7 +332,7 @@
 INTVAL
 Parrot_io_close_unix(PARROT_INTERP, ARGMOD(PMC *filehandle))
 {
-    ASSERT_ARGS(Parrot_io_close_unix);
+    ASSERT_ARGS(Parrot_io_close_unix)
     PIOHANDLE file_descriptor = Parrot_io_get_os_handle(interp, filehandle);
     /* BSD and Solaris need explicit fsync() */
     if (file_descriptor >= 0) {
@@ -356,7 +356,7 @@
 INTVAL
 Parrot_io_is_closed_unix(PARROT_INTERP, ARGIN(PMC *filehandle))
 {
-    ASSERT_ARGS(Parrot_io_is_closed_unix);
+    ASSERT_ARGS(Parrot_io_is_closed_unix)
     if (Parrot_io_get_os_handle(interp, filehandle) == -1)
         return 1;
 
@@ -376,7 +376,7 @@
 static INTVAL
 io_is_tty_unix(PIOHANDLE fd)
 {
-    ASSERT_ARGS(io_is_tty_unix);
+    ASSERT_ARGS(io_is_tty_unix)
     return isatty(fd);
 }
 
@@ -399,7 +399,7 @@
 INTVAL
 Parrot_io_getblksize_unix(PIOHANDLE fd)
 {
-    ASSERT_ARGS(Parrot_io_getblksize_unix);
+    ASSERT_ARGS(Parrot_io_getblksize_unix)
     if (fd >= 0) {
         /* Try to get the block size of a regular file */
 #  if 0
@@ -442,7 +442,7 @@
 INTVAL
 Parrot_io_flush_unix(PARROT_INTERP, ARGMOD(PMC *filehandle))
 {
-    ASSERT_ARGS(Parrot_io_flush_unix);
+    ASSERT_ARGS(Parrot_io_flush_unix)
     PIOHANDLE file_descriptor = Parrot_io_get_os_handle(interp, filehandle);
     return fsync(file_descriptor);
 }
@@ -462,7 +462,7 @@
 Parrot_io_read_unix(PARROT_INTERP, ARGMOD(PMC *filehandle),
               ARGIN(STRING **buf))
 {
-    ASSERT_ARGS(Parrot_io_read_unix);
+    ASSERT_ARGS(Parrot_io_read_unix)
     PIOHANDLE file_descriptor = Parrot_io_get_os_handle(interp, filehandle);
     INTVAL file_flags = Parrot_io_get_flags(interp, filehandle);
     STRING * const s = Parrot_io_make_string(interp, buf, 2048);
@@ -509,7 +509,7 @@
 size_t
 Parrot_io_write_unix(PARROT_INTERP, ARGIN(PMC *filehandle), ARGMOD(STRING *s))
 {
-    ASSERT_ARGS(Parrot_io_write_unix);
+    ASSERT_ARGS(Parrot_io_write_unix)
     PIOHANDLE file_descriptor = Parrot_io_get_os_handle(interp, filehandle);
     const char * const buffer = s->strstart;
     const char * ptr          = buffer;
@@ -558,7 +558,7 @@
 Parrot_io_seek_unix(PARROT_INTERP, ARGMOD(PMC *filehandle),
               PIOOFF_T offset, INTVAL whence)
 {
-    ASSERT_ARGS(Parrot_io_seek_unix);
+    ASSERT_ARGS(Parrot_io_seek_unix)
     PIOHANDLE file_descriptor = Parrot_io_get_os_handle(interp, filehandle);
     const PIOOFF_T pos        = lseek(file_descriptor, offset, whence);
 
@@ -605,7 +605,7 @@
 PIOOFF_T
 Parrot_io_tell_unix(PARROT_INTERP, ARGMOD(PMC *filehandle))
 {
-    ASSERT_ARGS(Parrot_io_tell_unix);
+    ASSERT_ARGS(Parrot_io_tell_unix)
     PIOHANDLE file_descriptor = Parrot_io_get_os_handle(interp, filehandle);
     const PIOOFF_T pos = lseek(file_descriptor, (PIOOFF_T)0, SEEK_CUR);
 
@@ -628,7 +628,7 @@
 Parrot_io_open_pipe_unix(PARROT_INTERP, ARGMOD(PMC *filehandle),
         ARGIN(STRING *command), int flags)
 {
-    ASSERT_ARGS(Parrot_io_open_pipe_unix);
+    ASSERT_ARGS(Parrot_io_open_pipe_unix)
     /*
      * pipe(), fork() should be defined, if this header is present
      *        if that's not true, we need a test
@@ -739,7 +739,7 @@
         SHIM(PMC *filehandle),
         SHIM(STRING **buf))
 {
-    ASSERT_ARGS(Parrot_io_peek_unix);
+    ASSERT_ARGS(Parrot_io_peek_unix)
     Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_UNIMPLEMENTED,
         "peek() not implemented");
 }

Modified: trunk/src/io/utf8.c
==============================================================================
--- trunk/src/io/utf8.c	(original)
+++ trunk/src/io/utf8.c	Mon Jan  5 15:17:26 2009
@@ -46,7 +46,7 @@
 Parrot_io_read_utf8(PARROT_INTERP, ARGMOD(PMC *filehandle),
         ARGMOD(STRING **buf))
 {
-    ASSERT_ARGS(Parrot_io_read_utf8);
+    ASSERT_ARGS(Parrot_io_read_utf8)
     STRING *s, *s2;
     String_iter iter;
 
@@ -111,7 +111,7 @@
 Parrot_io_write_utf8(PARROT_INTERP, ARGMOD(PMC *filehandle),
         ARGMOD(STRING *s))
 {
-    ASSERT_ARGS(Parrot_io_write_utf8);
+    ASSERT_ARGS(Parrot_io_write_utf8)
     STRING *dest;
 
     if (s->encoding == Parrot_utf8_encoding_ptr)

Modified: trunk/src/io/win32.c
==============================================================================
--- trunk/src/io/win32.c	(original)
+++ trunk/src/io/win32.c	Mon Jan  5 15:17:26 2009
@@ -76,7 +76,7 @@
 convert_flags_to_win32(INTVAL flags, ARGOUT(DWORD * fdwAccess),
                ARGOUT(DWORD * fdwShareMode), ARGOUT(DWORD * fdwCreate))
 {
-    ASSERT_ARGS(convert_flags_to_win32);
+    ASSERT_ARGS(convert_flags_to_win32)
     static DWORD dwDefaultShareMode;
     if (!dwDefaultShareMode) {
         OSVERSIONINFO osvi;
@@ -130,7 +130,7 @@
 INTVAL
 Parrot_io_init_win32(PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_io_init_win32);
+    ASSERT_ARGS(Parrot_io_init_win32)
     HANDLE h;
 #  if PARROT_NET_DEVEL
     struct WSAData sockinfo;
@@ -182,7 +182,7 @@
 INTVAL
 Parrot_io_getblksize_win32(SHIM(PIOHANDLE fd))
 {
-    ASSERT_ARGS(Parrot_io_getblksize_win32);
+    ASSERT_ARGS(Parrot_io_getblksize_win32)
     /* Hard coded for now */
     return PIO_BLKSIZE;
 }
@@ -203,7 +203,7 @@
 Parrot_io_open_win32(PARROT_INTERP, ARGMOD(PMC *filehandle),
                ARGIN(STRING *path), INTVAL flags)
 {
-    ASSERT_ARGS(Parrot_io_open_win32);
+    ASSERT_ARGS(Parrot_io_open_win32)
     DWORD fAcc, fShare, fCreat;
     PIOHANDLE fd;
 
@@ -267,7 +267,7 @@
 Parrot_io_fdopen_win32(PARROT_INTERP, ARGMOD_NULLOK(PMC *filehandle),
         PIOHANDLE fd, INTVAL flags)
 {
-    ASSERT_ARGS(Parrot_io_fdopen_win32);
+    ASSERT_ARGS(Parrot_io_fdopen_win32)
     PMC *io;
 
     if (io_is_tty_win32(fd))
@@ -300,7 +300,7 @@
 INTVAL
 Parrot_io_close_win32(PARROT_INTERP, ARGMOD(PMC *filehandle))
 {
-    ASSERT_ARGS(Parrot_io_close_win32);
+    ASSERT_ARGS(Parrot_io_close_win32)
     PIOHANDLE os_handle = Parrot_io_get_os_handle(interp, filehandle);
     if (os_handle != INVALID_HANDLE_VALUE) {
         CloseHandle(os_handle);
@@ -322,7 +322,7 @@
 INTVAL
 Parrot_io_is_closed_win32(PARROT_INTERP, ARGIN(PMC *filehandle))
 {
-    ASSERT_ARGS(Parrot_io_is_closed_win32);
+    ASSERT_ARGS(Parrot_io_is_closed_win32)
     if (Parrot_io_get_os_handle(interp, filehandle) == INVALID_HANDLE_VALUE)
         return 1;
 
@@ -343,7 +343,7 @@
 static INTVAL
 io_is_tty_win32(PIOHANDLE fd)
 {
-    ASSERT_ARGS(io_is_tty_win32);
+    ASSERT_ARGS(io_is_tty_win32)
     const DWORD ftype = GetFileType(fd);
     return (ftype == FILE_TYPE_CHAR);
 }
@@ -361,7 +361,7 @@
 INTVAL
 Parrot_io_flush_win32(PARROT_INTERP, ARGMOD(PMC *filehandle))
 {
-    ASSERT_ARGS(Parrot_io_flush_win32);
+    ASSERT_ARGS(Parrot_io_flush_win32)
     /*
      * FlushFileBuffers won't work for console handles. From the MS help file:
      *
@@ -393,7 +393,7 @@
         ARGMOD(PMC *filehandle),
         ARGOUT(STRING **buf))
 {
-    ASSERT_ARGS(Parrot_io_read_win32);
+    ASSERT_ARGS(Parrot_io_read_win32)
     DWORD countread;
     void *buffer;
     size_t len;
@@ -439,7 +439,7 @@
         ARGIN(PMC *filehandle),
         ARGIN(STRING *s))
 {
-    ASSERT_ARGS(Parrot_io_write_win32);
+    ASSERT_ARGS(Parrot_io_write_win32)
     DWORD countwrote = 0;
     void * const buffer = s->strstart;
     size_t len = s->bufused;
@@ -483,7 +483,7 @@
 Parrot_io_seek_win32(PARROT_INTERP, ARGMOD(PMC *filehandle),
                PIOOFF_T off, INTVAL whence)
 {
-    ASSERT_ARGS(Parrot_io_seek_win32);
+    ASSERT_ARGS(Parrot_io_seek_win32)
     LARGE_INTEGER offset;
 
     offset.QuadPart = off;
@@ -511,7 +511,7 @@
 PIOOFF_T
 Parrot_io_tell_win32(PARROT_INTERP, ARGIN(PMC *filehandle))
 {
-    ASSERT_ARGS(Parrot_io_tell_win32);
+    ASSERT_ARGS(Parrot_io_tell_win32)
     LARGE_INTEGER p;
 
     p.QuadPart = piooffsetzero;
@@ -539,7 +539,7 @@
         SHIM(PMC *filehandle),
         SHIM(STRING **buf))
 {
-    ASSERT_ARGS(Parrot_io_peek_win32);
+    ASSERT_ARGS(Parrot_io_peek_win32)
     Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_UNIMPLEMENTED,
         "peek() not implemented");
 }
@@ -560,7 +560,7 @@
 Parrot_io_open_pipe_win32(PARROT_INTERP, SHIM(PMC *filehandle),
         SHIM(STRING *command), int flags)
 {
-    ASSERT_ARGS(Parrot_io_open_pipe_win32);
+    ASSERT_ARGS(Parrot_io_open_pipe_win32)
     UNUSED(flags);
     Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_UNIMPLEMENTED,
         "pipe() not implemented");

Modified: trunk/src/jit/i386/exec_dep.c
==============================================================================
--- trunk/src/jit/i386/exec_dep.c	(original)
+++ trunk/src/jit/i386/exec_dep.c	Mon Jan  5 15:17:26 2009
@@ -28,7 +28,7 @@
 void
 Parrot_exec_normal_op(Parrot_jit_info_t *jit_info, PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_exec_normal_op);
+    ASSERT_ARGS(Parrot_exec_normal_op)
     Parrot_jit_optimizer_section_ptr cur_section =
         jit_info->optimizer->cur_section;
     int i, j, last_is_branch = 0;
@@ -114,7 +114,7 @@
 Parrot_exec_normal_op(Parrot_jit_info_t *jit_info,
                      PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_exec_normal_op);
+    ASSERT_ARGS(Parrot_exec_normal_op)
     emitm_pushl_i(jit_info->native_ptr,
         jit_info->objfile->bytecode_header_size +
             jit_info->op_i * sizeof (opcode_t));
@@ -134,7 +134,7 @@
 Parrot_exec_cpcf_op(Parrot_jit_info_t *jit_info,
                    PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_exec_cpcf_op);
+    ASSERT_ARGS(Parrot_exec_cpcf_op)
     Parrot_exec_normal_op(jit_info, interp);
     Parrot_emit_jump_to_eax(jit_info, interp);
 }
@@ -143,7 +143,7 @@
 Parrot_exec_restart_op(Parrot_jit_info_t *jit_info,
                    PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_exec_restart_op);
+    ASSERT_ARGS(Parrot_exec_restart_op)
     char *jmp_ptr, *sav_ptr;
 
     Parrot_exec_normal_op(jit_info, interp);
@@ -173,7 +173,7 @@
 void
 offset_fixup(Parrot_exec_objfile_t *obj)
 {
-    ASSERT_ARGS(offset_fixup);
+    ASSERT_ARGS(offset_fixup)
     int i;
 
     for (i = 0; i < obj->data_count; i++) {

Modified: trunk/src/key.c
==============================================================================
--- trunk/src/key.c	(original)
+++ trunk/src/key.c	Mon Jan  5 15:17:26 2009
@@ -40,7 +40,7 @@
 PMC *
 key_new(PARROT_INTERP)
 {
-    ASSERT_ARGS(key_new);
+    ASSERT_ARGS(key_new)
     return pmc_new(interp, enum_class_Key);
 }
 
@@ -61,7 +61,7 @@
 PMC *
 key_new_integer(PARROT_INTERP, INTVAL value)
 {
-    ASSERT_ARGS(key_new_integer);
+    ASSERT_ARGS(key_new_integer)
     PMC * const key = pmc_new(interp, enum_class_Key);
 
     PObj_get_FLAGS(key) |= KEY_integer_FLAG;
@@ -87,7 +87,7 @@
 PMC *
 key_new_number(PARROT_INTERP, FLOATVAL value)
 {
-    ASSERT_ARGS(key_new_number);
+    ASSERT_ARGS(key_new_number)
     PMC * const key = pmc_new(interp, enum_class_Key);
 
     PObj_get_FLAGS(key) |= KEY_number_FLAG;
@@ -113,7 +113,7 @@
 PMC *
 key_new_string(PARROT_INTERP, ARGIN(STRING *value))
 {
-    ASSERT_ARGS(key_new_string);
+    ASSERT_ARGS(key_new_string)
     PMC * const key = pmc_new(interp, enum_class_Key);
 
     PObj_get_FLAGS(key) |= KEY_string_FLAG;
@@ -140,7 +140,7 @@
 PMC *
 key_new_cstring(PARROT_INTERP, ARGIN_NULLOK(const char *value))
 {
-    ASSERT_ARGS(key_new_cstring);
+    ASSERT_ARGS(key_new_cstring)
     return key_new_string(interp, string_from_cstring(interp, value, 0));
 }
 
@@ -161,7 +161,7 @@
 PMC *
 key_new_pmc(PARROT_INTERP, ARGIN(PMC *value))
 {
-    ASSERT_ARGS(key_new_pmc);
+    ASSERT_ARGS(key_new_pmc)
     PMC * const key = pmc_new(interp, enum_class_Key);
 
     PObj_get_FLAGS(key) |= KEY_pmc_FLAG;
@@ -183,7 +183,7 @@
 void
 key_set_integer(SHIM_INTERP, ARGMOD(PMC *key), INTVAL value)
 {
-    ASSERT_ARGS(key_set_integer);
+    ASSERT_ARGS(key_set_integer)
     PObj_get_FLAGS(key) &= ~KEY_type_FLAGS;
     PObj_get_FLAGS(key) |=  KEY_integer_FLAG;
     PMC_int_val(key)     = value;
@@ -206,7 +206,7 @@
 void
 key_set_register(SHIM_INTERP, ARGMOD(PMC *key), INTVAL value, INTVAL flag)
 {
-    ASSERT_ARGS(key_set_register);
+    ASSERT_ARGS(key_set_register)
     PObj_get_FLAGS(key) &= ~KEY_type_FLAGS;
     PObj_get_FLAGS(key) |=  KEY_register_FLAG | flag;
     PMC_int_val(key)     = value;
@@ -229,7 +229,7 @@
 void
 key_set_number(SHIM_INTERP, ARGMOD(PMC *key), FLOATVAL value)
 {
-    ASSERT_ARGS(key_set_number);
+    ASSERT_ARGS(key_set_number)
     PObj_get_FLAGS(key) &= ~KEY_type_FLAGS;
     PObj_get_FLAGS(key) |=  KEY_number_FLAG;
     PMC_num_val(key)     = value;
@@ -252,7 +252,7 @@
 void
 key_set_string(SHIM_INTERP, ARGMOD(PMC *key), ARGIN(STRING *value))
 {
-    ASSERT_ARGS(key_set_string);
+    ASSERT_ARGS(key_set_string)
     PObj_get_FLAGS(key) &= ~KEY_type_FLAGS;
     PObj_get_FLAGS(key) |=  KEY_string_FLAG;
     PMC_str_val(key)     = value;
@@ -275,7 +275,7 @@
 void
 key_set_pmc(PARROT_INTERP, ARGMOD(PMC *key), ARGIN(PMC *value))
 {
-    ASSERT_ARGS(key_set_pmc);
+    ASSERT_ARGS(key_set_pmc)
     PObj_get_FLAGS(key) &= ~KEY_type_FLAGS;
     PObj_get_FLAGS(key) |=  KEY_pmc_FLAG;
 
@@ -302,7 +302,7 @@
 INTVAL
 key_type(SHIM_INTERP, ARGIN(const PMC *key))
 {
-    ASSERT_ARGS(key_type);
+    ASSERT_ARGS(key_type)
     return (PObj_get_FLAGS(key) & KEY_type_FLAGS) & ~KEY_register_FLAG;
 }
 
@@ -324,7 +324,7 @@
 INTVAL
 key_integer(PARROT_INTERP, ARGIN(PMC *key))
 {
-    ASSERT_ARGS(key_integer);
+    ASSERT_ARGS(key_integer)
     if (VTABLE_isa(interp, key, CONST_STRING(interp, "Key"))) {
         switch (PObj_get_FLAGS(key) & KEY_type_FLAGS) {
         case KEY_hash_iterator_FLAGS:
@@ -379,7 +379,7 @@
 FLOATVAL
 key_number(PARROT_INTERP, ARGIN(PMC *key))
 {
-    ASSERT_ARGS(key_number);
+    ASSERT_ARGS(key_number)
     switch (PObj_get_FLAGS(key) & KEY_type_FLAGS) {
     case KEY_number_FLAG:
         return PMC_num_val(key);
@@ -416,7 +416,7 @@
 STRING *
 key_string(PARROT_INTERP, ARGIN(PMC *key))
 {
-    ASSERT_ARGS(key_string);
+    ASSERT_ARGS(key_string)
     switch (PObj_get_FLAGS(key) & KEY_type_FLAGS) {
         /* remember to COW strings instead of returning them directly */
         case KEY_string_FLAG:
@@ -467,7 +467,7 @@
 PMC *
 key_pmc(PARROT_INTERP, ARGIN(PMC *key))
 {
-    ASSERT_ARGS(key_pmc);
+    ASSERT_ARGS(key_pmc)
     switch (PObj_get_FLAGS(key) & KEY_type_FLAGS) {
     case KEY_pmc_FLAG | KEY_register_FLAG:
         return REG_PMC(interp, PMC_int_val(key));
@@ -493,7 +493,7 @@
 PMC *
 key_next(PARROT_INTERP, ARGIN(PMC *key))
 {
-    ASSERT_ARGS(key_next);
+    ASSERT_ARGS(key_next)
     return VTABLE_isa(interp, key, CONST_STRING(interp, "Key")) && key->pmc_ext
         ? (PMC *)PMC_data(key)
         : NULL;
@@ -521,7 +521,7 @@
 PMC *
 key_append(SHIM_INTERP, ARGMOD(PMC *key1), ARGIN(PMC *key2))
 {
-    ASSERT_ARGS(key_append);
+    ASSERT_ARGS(key_append)
     PMC *tail = key1;
 
     while (PMC_data(tail)) {
@@ -548,7 +548,7 @@
 void
 key_mark(PARROT_INTERP, ARGIN(PMC *key))
 {
-    ASSERT_ARGS(key_mark);
+    ASSERT_ARGS(key_mark)
     const UINTVAL flags = PObj_get_FLAGS(key) & KEY_type_FLAGS;
 
     if (flags == KEY_string_FLAG)
@@ -586,7 +586,7 @@
 STRING *
 key_set_to_string(PARROT_INTERP, ARGIN_NULLOK(PMC *key))
 {
-    ASSERT_ARGS(key_set_to_string);
+    ASSERT_ARGS(key_set_to_string)
     STRING * const semicolon = CONST_STRING(interp, " ; ");
     STRING * const quote     = CONST_STRING(interp, "'");
     STRING        *value     = string_from_cstring(interp, "[ ", 2);

Modified: trunk/src/library.c
==============================================================================
--- trunk/src/library.c	(original)
+++ trunk/src/library.c	Mon Jan  5 15:17:26 2009
@@ -155,7 +155,7 @@
 void
 parrot_init_library_paths(PARROT_INTERP)
 {
-    ASSERT_ARGS(parrot_init_library_paths);
+    ASSERT_ARGS(parrot_init_library_paths)
     PMC *paths;
     STRING *entry;
 
@@ -250,7 +250,7 @@
 static PMC*
 get_search_paths(PARROT_INTERP, enum_lib_paths which)
 {
-    ASSERT_ARGS(get_search_paths);
+    ASSERT_ARGS(get_search_paths)
     PMC * const iglobals = interp->iglobals;
     PMC * const lib_paths = VTABLE_get_pmc_keyed_int(interp, iglobals,
             IGLOBALS_LIB_PATHS);
@@ -273,7 +273,7 @@
 static int
 is_abs_path(ARGIN(const STRING *file))
 {
-    ASSERT_ARGS(is_abs_path);
+    ASSERT_ARGS(is_abs_path)
     const char * const file_name = file->strstart;
     if (file->strlen <= 1)
         return 0;
@@ -312,7 +312,7 @@
 static void
 cnv_to_win32_filesep(ARGMOD(STRING *path))
 {
-    ASSERT_ARGS(cnv_to_win32_filesep);
+    ASSERT_ARGS(cnv_to_win32_filesep)
     char* cnv;
 
     PARROT_ASSERT(path->encoding == Parrot_fixed_8_encoding_ptr ||
@@ -343,7 +343,7 @@
 static STRING*
 path_finalize(PARROT_INTERP, ARGMOD(STRING *path))
 {
-    ASSERT_ARGS(path_finalize);
+    ASSERT_ARGS(path_finalize)
 
     /* TODO create a string API that just does that
      *      a lot of ICU lib functions also need 0-terminated strings
@@ -380,7 +380,7 @@
 static STRING*
 path_guarantee_trailing_separator(PARROT_INTERP, ARGMOD(STRING *path))
 {
-    ASSERT_ARGS(path_guarantee_trailing_separator);
+    ASSERT_ARGS(path_guarantee_trailing_separator)
     STRING * const path_separator_string = string_chr(interp, path_separator);
 
     /* make sure the path has a trailing slash before appending the file */
@@ -408,7 +408,7 @@
 static STRING*
 path_append(PARROT_INTERP, ARGMOD(STRING *l_path), ARGMOD(STRING *r_path))
 {
-    ASSERT_ARGS(path_append);
+    ASSERT_ARGS(path_append)
     l_path = path_guarantee_trailing_separator(interp, l_path);
     l_path = string_append(interp, l_path, r_path);
 
@@ -432,7 +432,7 @@
 static STRING*
 path_concat(PARROT_INTERP, ARGMOD(STRING *l_path), ARGMOD(STRING *r_path))
 {
-    ASSERT_ARGS(path_concat);
+    ASSERT_ARGS(path_concat)
     STRING* join;
 
     join = string_copy(interp, l_path);
@@ -470,7 +470,7 @@
 static STRING*
 try_load_path(PARROT_INTERP, ARGMOD(STRING* path))
 {
-    ASSERT_ARGS(try_load_path);
+    ASSERT_ARGS(try_load_path)
     STRING *final;
 
     final = string_copy(interp, path);
@@ -501,7 +501,7 @@
 static STRING*
 try_bytecode_extensions(PARROT_INTERP, ARGMOD(STRING* path))
 {
-    ASSERT_ARGS(try_bytecode_extensions);
+    ASSERT_ARGS(try_bytecode_extensions)
     STRING *with_ext, *result;
 
     int guess;
@@ -555,7 +555,7 @@
         ARGIN(const char *path),
         enum_lib_paths which)
 {
-    ASSERT_ARGS(Parrot_add_library_path);
+    ASSERT_ARGS(Parrot_add_library_path)
     PMC * const iglobals = interp->iglobals;
     PMC * const lib_paths = VTABLE_get_pmc_keyed_int(interp, iglobals,
         IGLOBALS_LIB_PATHS);
@@ -593,7 +593,7 @@
 Parrot_locate_runtime_file_str(PARROT_INTERP, ARGMOD(STRING *file),
         enum_runtime_ft type)
 {
-    ASSERT_ARGS(Parrot_locate_runtime_file_str);
+    ASSERT_ARGS(Parrot_locate_runtime_file_str)
     STRING *prefix;
     STRING *full_name;
     PMC    *paths;
@@ -648,7 +648,7 @@
 Parrot_locate_runtime_file(PARROT_INTERP, ARGIN(const char *file_name),
         enum_runtime_ft type)
 {
-    ASSERT_ARGS(Parrot_locate_runtime_file);
+    ASSERT_ARGS(Parrot_locate_runtime_file)
     STRING * const file   = string_from_cstring(interp, file_name, 0);
     STRING * const result = Parrot_locate_runtime_file_str(interp, file, type);
     /*
@@ -682,7 +682,7 @@
 char*
 Parrot_get_runtime_prefix(PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_get_runtime_prefix);
+    ASSERT_ARGS(Parrot_get_runtime_prefix)
     int     free_it;
     char * const env = Parrot_getenv("PARROT_RUNTIME", &free_it);
 
@@ -717,7 +717,7 @@
 STRING *
 Parrot_get_runtime_path(PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_get_runtime_path);
+    ASSERT_ARGS(Parrot_get_runtime_path)
     int     free_it;
     char * const env = Parrot_getenv("PARROT_RUNTIME", &free_it);
     STRING *result;
@@ -760,7 +760,7 @@
 parrot_split_path_ext(PARROT_INTERP, ARGMOD(STRING *in),
         ARGOUT(STRING **wo_ext), ARGOUT(STRING **ext))
 {
-    ASSERT_ARGS(parrot_split_path_ext);
+    ASSERT_ARGS(parrot_split_path_ext)
     STRING * const slash1 = CONST_STRING(interp, "/");
     STRING * const slash2 = CONST_STRING(interp, "\\");
     STRING * const dot    = CONST_STRING(interp, ".");

Modified: trunk/src/list.c
==============================================================================
--- trunk/src/list.c	(original)
+++ trunk/src/list.c	Mon Jan  5 15:17:26 2009
@@ -355,7 +355,7 @@
 static List_chunk *
 allocate_chunk(PARROT_INTERP, ARGIN(List *list), UINTVAL items, UINTVAL size)
 {
-    ASSERT_ARGS(allocate_chunk);
+    ASSERT_ARGS(allocate_chunk)
     List_chunk *chunk;
 
     Parrot_block_GC_mark(interp);
@@ -391,7 +391,7 @@
 static void
 rebuild_chunk_ptrs(ARGMOD(List *list), int cut)
 {
-    ASSERT_ARGS(rebuild_chunk_ptrs);
+    ASSERT_ARGS(rebuild_chunk_ptrs)
     List_chunk *chunk, *prev;
     UINTVAL len = 0, start = list->start;
     UINTVAL cap;
@@ -441,7 +441,7 @@
 static void
 rebuild_sparse(ARGMOD(List *list))
 {
-    ASSERT_ARGS(rebuild_sparse);
+    ASSERT_ARGS(rebuild_sparse)
     List_chunk *chunk = list->first;
     List_chunk *prev = NULL;
     int changes = 0;
@@ -473,7 +473,7 @@
 static void
 rebuild_other(PARROT_INTERP, ARGMOD(List *list))
 {
-    ASSERT_ARGS(rebuild_other);
+    ASSERT_ARGS(rebuild_other)
     List_chunk *chunk = list->first;
     List_chunk *prev = NULL;
     int changes = 0;
@@ -542,7 +542,7 @@
 static void
 rebuild_fix_ends(ARGMOD(List *list))
 {
-    ASSERT_ARGS(rebuild_fix_ends);
+    ASSERT_ARGS(rebuild_fix_ends)
     List_chunk * const chunk = list->first;
 
     /* first is irregular, next is empty */
@@ -573,7 +573,7 @@
 static UINTVAL
 rebuild_chunk_list(PARROT_INTERP, ARGMOD(List *list))
 {
-    ASSERT_ARGS(rebuild_chunk_list);
+    ASSERT_ARGS(rebuild_chunk_list)
     List_chunk *chunk, *prev, *first;
     UINTVAL len;
 
@@ -689,7 +689,7 @@
 static List_chunk *
 alloc_next_size(PARROT_INTERP, ARGMOD(List *list), int where, UINTVAL idx)
 {
-    ASSERT_ARGS(alloc_next_size);
+    ASSERT_ARGS(alloc_next_size)
     UINTVAL items, size;
     List_chunk *new_chunk;
     const int much = idx - list->cap >= MIN_ITEMS;
@@ -793,7 +793,7 @@
 static List_chunk *
 add_chunk(PARROT_INTERP, ARGMOD(List *list), int where, UINTVAL idx)
 {
-    ASSERT_ARGS(add_chunk);
+    ASSERT_ARGS(add_chunk)
     List_chunk * const chunk = where ? list->last : list->first;
     List_chunk * const new_chunk = alloc_next_size(interp, list, where, idx);
 
@@ -832,7 +832,7 @@
 UINTVAL
 ld(UINTVAL x)
 {
-    ASSERT_ARGS(ld);
+    ASSERT_ARGS(ld)
     UINTVAL m;                  /* bit position of highest set bit of m */
 
     /* On intel, use BSRL instruction to find highest bit */
@@ -926,7 +926,7 @@
 static List_chunk *
 get_chunk(PARROT_INTERP, ARGMOD(List *list), ARGMOD(UINTVAL *idx))
 {
-    ASSERT_ARGS(get_chunk);
+    ASSERT_ARGS(get_chunk)
     List_chunk *chunk;
     UINTVAL i;
 
@@ -1046,7 +1046,7 @@
 static void
 split_chunk(PARROT_INTERP, ARGMOD(List *list), ARGMOD(List_chunk *chunk), UINTVAL ix)
 {
-    ASSERT_ARGS(split_chunk);
+    ASSERT_ARGS(split_chunk)
     /* allocate space at idx */
     if (chunk->items <= MAX_ITEMS) {
         /* it fits, just allocate */
@@ -1112,7 +1112,7 @@
 list_set(PARROT_INTERP, ARGMOD(List *list), ARGIN_NULLOK(void *item),
         INTVAL type, INTVAL idx)
 {
-    ASSERT_ARGS(list_set);
+    ASSERT_ARGS(list_set)
     const INTVAL oidx = idx;
     List_chunk *chunk = get_chunk(interp, list, (UINTVAL *)&idx);
 
@@ -1181,7 +1181,7 @@
 static void *
 list_item(PARROT_INTERP, ARGMOD(List *list), int type, INTVAL idx)
 {
-    ASSERT_ARGS(list_item);
+    ASSERT_ARGS(list_item)
     List_chunk * const chunk = get_chunk(interp, list, (UINTVAL *)&idx);
     /* if this is a sparse chunk return -1, the caller may decide to return 0
      * or undef or whatever */
@@ -1231,7 +1231,7 @@
 static void
 list_append(PARROT_INTERP, ARGMOD(List *list), ARGIN_NULLOK(void *item), int type, UINTVAL idx)
 {
-    ASSERT_ARGS(list_append);
+    ASSERT_ARGS(list_append)
     /* initially, list may be empty, also used by assign */
     while (idx >= list->cap)
         add_chunk(interp, list, enum_add_at_end, idx);
@@ -1263,7 +1263,7 @@
 List *
 list_new(PARROT_INTERP, PARROT_DATA_TYPE type)
 {
-    ASSERT_ARGS(list_new);
+    ASSERT_ARGS(list_new)
     List * const list = (List *)new_bufferlike_header(interp, sizeof (*list));
 
     list->item_type = type;
@@ -1311,7 +1311,7 @@
 void
 list_pmc_new(PARROT_INTERP, ARGMOD(PMC *container))
 {
-    ASSERT_ARGS(list_pmc_new);
+    ASSERT_ARGS(list_pmc_new)
     List * const l = list_new(interp, enum_type_PMC);
     l->container = container;
     PMC_data(container) = l;
@@ -1342,7 +1342,7 @@
 List *
 list_new_init(PARROT_INTERP, PARROT_DATA_TYPE type, ARGIN(PMC *init))
 {
-    ASSERT_ARGS(list_new_init);
+    ASSERT_ARGS(list_new_init)
     List  *list;
     PMC   *user_array;
     PMC   *multi_key       = NULL;
@@ -1430,7 +1430,7 @@
 void
 list_pmc_new_init(PARROT_INTERP, ARGMOD(PMC *container), ARGIN(PMC *init))
 {
-    ASSERT_ARGS(list_pmc_new_init);
+    ASSERT_ARGS(list_pmc_new_init)
     List * const l = list_new_init(interp, enum_type_PMC, init);
     l->container = container;
     PMC_data(container) = l;
@@ -1458,7 +1458,7 @@
 List *
 list_clone(PARROT_INTERP, ARGIN(const List *other))
 {
-    ASSERT_ARGS(list_clone);
+    ASSERT_ARGS(list_clone)
     List *l;
     List_chunk *chunk, *prev;
     UINTVAL i;
@@ -1533,7 +1533,7 @@
 void
 list_mark(PARROT_INTERP, ARGMOD(List *list))
 {
-    ASSERT_ARGS(list_mark);
+    ASSERT_ARGS(list_mark)
     List_chunk *chunk;
 
     for (chunk = list->first; chunk; chunk = chunk->next) {
@@ -1573,7 +1573,7 @@
 void
 list_visit(PARROT_INTERP, ARGIN(List *list), ARGMOD(void *pinfo))
 {
-    ASSERT_ARGS(list_visit);
+    ASSERT_ARGS(list_visit)
     List_chunk *chunk;
     visit_info * const info = (visit_info*) pinfo;
     UINTVAL idx;
@@ -1612,7 +1612,7 @@
 INTVAL
 list_length(SHIM_INTERP, ARGIN(const List *list))
 {
-    ASSERT_ARGS(list_length);
+    ASSERT_ARGS(list_length)
     return list->length;
 }
 
@@ -1630,7 +1630,7 @@
 void
 list_set_length(PARROT_INTERP, ARGMOD(List *list), INTVAL len)
 {
-    ASSERT_ARGS(list_set_length);
+    ASSERT_ARGS(list_set_length)
     if (len < 0)
         len += list->length;
     if (len >= 0) {
@@ -1670,7 +1670,7 @@
 void
 list_insert(PARROT_INTERP, ARGMOD(List *list), INTVAL idx, INTVAL n_items)
 {
-    ASSERT_ARGS(list_insert);
+    ASSERT_ARGS(list_insert)
     List_chunk *chunk;
 
     PARROT_ASSERT(idx >= 0);
@@ -1744,7 +1744,7 @@
 void
 list_delete(PARROT_INTERP, ARGMOD(List *list), INTVAL idx, INTVAL n_items)
 {
-    ASSERT_ARGS(list_delete);
+    ASSERT_ARGS(list_delete)
     List_chunk *chunk;
 
     PARROT_ASSERT(idx >= 0);
@@ -1827,7 +1827,7 @@
 void
 list_push(PARROT_INTERP, ARGMOD(List *list), ARGIN_NULLOK(void *item), int type)
 {
-    ASSERT_ARGS(list_push);
+    ASSERT_ARGS(list_push)
     const INTVAL idx = list->start + list->length++;
 
     list_append(interp, list, item, type, idx);
@@ -1847,7 +1847,7 @@
 void
 list_unshift(PARROT_INTERP, ARGMOD(List *list), ARGIN(void *item), int type)
 {
-    ASSERT_ARGS(list_unshift);
+    ASSERT_ARGS(list_unshift)
     List_chunk *chunk;
 
     if (list->start == 0) {
@@ -1875,7 +1875,7 @@
 void *
 list_pop(PARROT_INTERP, ARGMOD(List *list), int type)
 {
-    ASSERT_ARGS(list_pop);
+    ASSERT_ARGS(list_pop)
     UINTVAL idx;
     void *ret;
     List_chunk *chunk = list->last;
@@ -1914,7 +1914,7 @@
 void *
 list_shift(PARROT_INTERP, ARGMOD(List *list), int type)
 {
-    ASSERT_ARGS(list_shift);
+    ASSERT_ARGS(list_shift)
     void *ret;
     UINTVAL idx;
     List_chunk *chunk = list->first;
@@ -1953,7 +1953,7 @@
 void
 list_assign(PARROT_INTERP, ARGMOD(List *list), INTVAL idx, ARGIN_NULLOK(void *item), int type)
 {
-    ASSERT_ARGS(list_assign);
+    ASSERT_ARGS(list_assign)
     const INTVAL length = list->length;
 
     if (idx < -length)
@@ -1985,7 +1985,7 @@
 void *
 list_get(PARROT_INTERP, ARGMOD(List *list), INTVAL idx, int type)
 {
-    ASSERT_ARGS(list_get);
+    ASSERT_ARGS(list_get)
     const INTVAL length = list->length;
 
     if (idx >= length || -idx > length) {
@@ -2015,7 +2015,7 @@
 list_splice(PARROT_INTERP, ARGMOD(List *list), ARGIN_NULLOK(List *value_list),
         INTVAL offset, INTVAL count)
 {
-    ASSERT_ARGS(list_splice);
+    ASSERT_ARGS(list_splice)
     const INTVAL value_length = value_list ? value_list->length : 0;
     const INTVAL length = list->length;
     const int type = list->item_type;

Modified: trunk/src/longopt.c
==============================================================================
--- trunk/src/longopt.c	(original)
+++ trunk/src/longopt.c	Mon Jan  5 15:17:26 2009
@@ -88,7 +88,7 @@
             ARGIN(const struct longopt_opt_decl options[]),
             ARGMOD(struct longopt_opt_info* info_buf))
 {
-    ASSERT_ARGS(longopt_get);
+    ASSERT_ARGS(longopt_get)
     const int dex = info_buf->opt_index;
 
     info_buf->opt_id = 0;
@@ -137,7 +137,7 @@
                     ARGIN(const struct longopt_opt_decl options[]),
                     ARGMOD(struct longopt_opt_info* info_buf))
 {
-    ASSERT_ARGS(longopt_get_longopt);
+    ASSERT_ARGS(longopt_get_longopt)
     const int dex = info_buf->opt_index;
     int optlen = 0;
     const struct longopt_opt_decl* dptr;
@@ -232,7 +232,7 @@
                      ARGIN(const struct longopt_opt_decl options[]),
                      ARGMOD(struct longopt_opt_info* info_buf))
 {
-    ASSERT_ARGS(longopt_get_shortopt);
+    ASSERT_ARGS(longopt_get_shortopt)
     const int dex = info_buf->opt_index;
     const struct longopt_opt_decl* dptr;
     const char* pos;

Modified: trunk/src/misc.c
==============================================================================
--- trunk/src/misc.c	(original)
+++ trunk/src/misc.c	Mon Jan  5 15:17:26 2009
@@ -62,7 +62,7 @@
 STRING *
 Parrot_vsprintf_s(PARROT_INTERP, ARGIN(STRING *pat), va_list args)
 {
-    ASSERT_ARGS(Parrot_vsprintf_s);
+    ASSERT_ARGS(Parrot_vsprintf_s)
     SPRINTF_OBJ obj = va_core;
     obj.data = PARROT_VA_TO_VAPTR(args);
 
@@ -84,7 +84,7 @@
 STRING *
 Parrot_vsprintf_c(PARROT_INTERP, ARGIN(const char *pat), va_list args)
 {
-    ASSERT_ARGS(Parrot_vsprintf_c);
+    ASSERT_ARGS(Parrot_vsprintf_c)
     STRING * const realpat = string_make(interp, pat, strlen(pat),
                                   NULL, PObj_external_FLAG);
 
@@ -109,7 +109,7 @@
 Parrot_vsnprintf(PARROT_INTERP, ARGOUT(char *targ),
                  size_t len, ARGIN(const char *pat), va_list args)
 {
-    ASSERT_ARGS(Parrot_vsnprintf);
+    ASSERT_ARGS(Parrot_vsnprintf)
     if (len == 0)
         return;
     len--;
@@ -143,7 +143,7 @@
 STRING *
 Parrot_sprintf_s(PARROT_INTERP, ARGIN(STRING *pat), ...)
 {
-    ASSERT_ARGS(Parrot_sprintf_s);
+    ASSERT_ARGS(Parrot_sprintf_s)
     STRING *ret;
     va_list args;
 
@@ -172,7 +172,7 @@
 STRING *
 Parrot_sprintf_c(PARROT_INTERP, ARGIN(const char *pat), ...)
 {
-    ASSERT_ARGS(Parrot_sprintf_c);
+    ASSERT_ARGS(Parrot_sprintf_c)
     STRING *ret;
     va_list args;
 
@@ -201,7 +201,7 @@
 Parrot_snprintf(PARROT_INTERP, ARGOUT(char *targ), size_t len,
                 ARGIN(const char *pat), ...)
 {
-    ASSERT_ARGS(Parrot_snprintf);
+    ASSERT_ARGS(Parrot_snprintf)
     va_list args;
 
     va_start(args, pat);
@@ -228,7 +228,7 @@
 STRING *
 Parrot_psprintf(PARROT_INTERP, ARGIN(STRING *pat), ARGOUT(PMC *ary))
 {
-    ASSERT_ARGS(Parrot_psprintf);
+    ASSERT_ARGS(Parrot_psprintf)
     SPRINTF_OBJ obj = pmc_core;
     obj.data = ary;
 
@@ -250,7 +250,7 @@
 int
 Parrot_secret_snprintf(ARGOUT(char *buffer), const size_t len, ARGIN(const char *format), ...)
 {
-    ASSERT_ARGS(Parrot_secret_snprintf);
+    ASSERT_ARGS(Parrot_secret_snprintf)
     int retval;
     va_list ap;
     va_start(ap, format);

Modified: trunk/src/multidispatch.c
==============================================================================
--- trunk/src/multidispatch.c	(original)
+++ trunk/src/multidispatch.c	Mon Jan  5 15:17:26 2009
@@ -271,7 +271,7 @@
 PMC*
 Parrot_mmd_find_multi_from_sig_obj(PARROT_INTERP, ARGIN(STRING *name), ARGIN(PMC *invoke_sig))
 {
-    ASSERT_ARGS(Parrot_mmd_find_multi_from_sig_obj);
+    ASSERT_ARGS(Parrot_mmd_find_multi_from_sig_obj)
     PMC * const candidate_list = pmc_new(interp, enum_class_ResizablePMCArray);
 
     mmd_search_by_sig_obj(interp, name, invoke_sig, candidate_list);
@@ -299,7 +299,7 @@
 PMC*
 Parrot_build_sig_object_from_varargs(PARROT_INTERP, ARGIN(const char *sig), va_list args)
 {
-    ASSERT_ARGS(Parrot_build_sig_object_from_varargs);
+    ASSERT_ARGS(Parrot_build_sig_object_from_varargs)
     PMC         *type_tuple    = PMCNULL;
     PMC         *returns       = PMCNULL;
     PMC         *call_object   = pmc_new(interp, enum_class_CallSignature);
@@ -409,7 +409,7 @@
 Parrot_mmd_multi_dispatch_from_c_args(PARROT_INTERP,
         ARGIN(const char *name), ARGIN(const char *sig), ...)
 {
-    ASSERT_ARGS(Parrot_mmd_multi_dispatch_from_c_args);
+    ASSERT_ARGS(Parrot_mmd_multi_dispatch_from_c_args)
     PMC *sig_object, *sub;
 
     va_list args;
@@ -466,7 +466,7 @@
 Parrot_mmd_find_multi_from_long_sig(PARROT_INTERP, ARGIN(STRING *name),
         ARGIN(STRING *long_sig))
 {
-    ASSERT_ARGS(Parrot_mmd_find_multi_from_long_sig);
+    ASSERT_ARGS(Parrot_mmd_find_multi_from_long_sig)
     STRING * const multi_str = CONST_STRING(interp, "MULTI");
     PMC    * const ns        = Parrot_make_namespace_keyed_str(interp,
                                     interp->root_namespace, multi_str);
@@ -500,7 +500,7 @@
 Parrot_mmd_sort_manhattan_by_sig_pmc(PARROT_INTERP, ARGIN(PMC *candidates),
         ARGIN(PMC *invoke_sig))
 {
-    ASSERT_ARGS(Parrot_mmd_sort_manhattan_by_sig_pmc);
+    ASSERT_ARGS(Parrot_mmd_sort_manhattan_by_sig_pmc)
     const INTVAL n = VTABLE_elements(interp, candidates);
 
     if (!n)
@@ -527,7 +527,7 @@
 PMC *
 Parrot_mmd_sort_manhattan(PARROT_INTERP, ARGIN(PMC *candidates))
 {
-    ASSERT_ARGS(Parrot_mmd_sort_manhattan);
+    ASSERT_ARGS(Parrot_mmd_sort_manhattan)
     const INTVAL n = VTABLE_elements(interp, candidates);
 
     if (n) {
@@ -555,7 +555,7 @@
 static PMC*
 Parrot_mmd_arg_tuple_func(PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_mmd_arg_tuple_func);
+    ASSERT_ARGS(Parrot_mmd_arg_tuple_func)
     PMC                *arg;
     PMC                *args_array;    /* from recent set_args opcode */
     PackFile_Constant **constants;
@@ -663,7 +663,7 @@
 Parrot_mmd_search_classes(PARROT_INTERP, ARGIN(STRING *meth),
         ARGIN(PMC *arg_tuple), ARGIN(PMC *cl), INTVAL start_at_parent)
 {
-    ASSERT_ARGS(Parrot_mmd_search_classes);
+    ASSERT_ARGS(Parrot_mmd_search_classes)
     INTVAL type1;
 
     /* get the class of the first argument */
@@ -718,7 +718,7 @@
 static INTVAL
 distance_cmp(SHIM_INTERP, INTVAL a, INTVAL b)
 {
-    ASSERT_ARGS(distance_cmp);
+    ASSERT_ARGS(distance_cmp)
     short da = (short)(a & 0xffff);
     short db = (short)(b & 0xffff);
 
@@ -753,7 +753,7 @@
 static PMC*
 mmd_build_type_tuple_from_type_list(PARROT_INTERP, ARGIN(PMC *type_list))
 {
-    ASSERT_ARGS(mmd_build_type_tuple_from_type_list);
+    ASSERT_ARGS(mmd_build_type_tuple_from_type_list)
     PMC   *multi_sig   = constant_pmc_new(interp, enum_class_FixedIntegerArray);
     INTVAL param_count = VTABLE_elements(interp, type_list);
     INTVAL i;
@@ -798,7 +798,7 @@
 static PMC*
 mmd_build_type_tuple_from_long_sig(PARROT_INTERP, ARGIN(STRING *long_sig))
 {
-    ASSERT_ARGS(mmd_build_type_tuple_from_long_sig);
+    ASSERT_ARGS(mmd_build_type_tuple_from_long_sig)
     PMC *type_list = string_split(interp, CONST_STRING(interp, ","), long_sig);
 
     return mmd_build_type_tuple_from_type_list(interp, type_list);
@@ -822,7 +822,7 @@
 PMC*
 Parrot_mmd_build_type_tuple_from_sig_obj(PARROT_INTERP, ARGIN(PMC *sig_obj))
 {
-    ASSERT_ARGS(Parrot_mmd_build_type_tuple_from_sig_obj);
+    ASSERT_ARGS(Parrot_mmd_build_type_tuple_from_sig_obj)
     PMC * const  type_tuple = pmc_new(interp, enum_class_FixedIntegerArray);
     STRING      *string_sig = VTABLE_get_string(interp, sig_obj);
     const INTVAL sig_len    = string_length(interp, string_sig);
@@ -911,7 +911,7 @@
 static PMC*
 mmd_cvt_to_types(PARROT_INTERP, ARGIN(PMC *multi_sig))
 {
-    ASSERT_ARGS(mmd_cvt_to_types);
+    ASSERT_ARGS(mmd_cvt_to_types)
     PMC        *ar = PMCNULL;
     const INTVAL n = VTABLE_elements(interp, multi_sig);
     INTVAL       i;
@@ -954,7 +954,7 @@
 static PMC *
 Parrot_mmd_get_cached_multi_sig(PARROT_INTERP, ARGIN(PMC *sub))
 {
-    ASSERT_ARGS(Parrot_mmd_get_cached_multi_sig);
+    ASSERT_ARGS(Parrot_mmd_get_cached_multi_sig)
     if (VTABLE_isa(interp, sub, CONST_STRING(interp, "Sub"))) {
         PMC *multi_sig = PMC_sub(sub)->multi_signature;
 
@@ -990,7 +990,7 @@
 static UINTVAL
 mmd_distance(PARROT_INTERP, ARGIN(PMC *pmc), ARGIN(PMC *arg_tuple))
 {
-    ASSERT_ARGS(mmd_distance);
+    ASSERT_ARGS(mmd_distance)
     PMC *multi_sig, *mro;
     INTVAL i, n, args, dist, j, m;
 
@@ -1127,7 +1127,7 @@
 static PMC *
 Parrot_mmd_sort_candidates(PARROT_INTERP, ARGIN(PMC *arg_tuple), ARGIN(PMC *cl))
 {
-    ASSERT_ARGS(Parrot_mmd_sort_candidates);
+    ASSERT_ARGS(Parrot_mmd_sort_candidates)
     PMC         *best_candidate = PMCNULL;
     INTVAL       best_distance  = MMD_BIG_DISTANCE;
     const INTVAL n              = VTABLE_elements(interp, cl);
@@ -1162,7 +1162,7 @@
 static PMC*
 Parrot_mmd_search_scopes(PARROT_INTERP, ARGIN(STRING *meth))
 {
-    ASSERT_ARGS(Parrot_mmd_search_scopes);
+    ASSERT_ARGS(Parrot_mmd_search_scopes)
     PMC * const candidates = pmc_new(interp, enum_class_ResizablePMCArray);
     const int stop         = mmd_search_local(interp, meth, candidates);
 
@@ -1190,7 +1190,7 @@
 static int
 Parrot_mmd_maybe_candidate(PARROT_INTERP, ARGIN(PMC *pmc), ARGIN(PMC *cl))
 {
-    ASSERT_ARGS(Parrot_mmd_maybe_candidate);
+    ASSERT_ARGS(Parrot_mmd_maybe_candidate)
     STRING * const _sub       = CONST_STRING(interp, "Sub");
     STRING * const _multi_sub = CONST_STRING(interp, "MultiSub");
 
@@ -1234,7 +1234,7 @@
 static int
 mmd_search_local(PARROT_INTERP, ARGIN(STRING *name), ARGIN(PMC *candidates))
 {
-    ASSERT_ARGS(mmd_search_local);
+    ASSERT_ARGS(mmd_search_local)
     PMC * const multi_sub = Parrot_find_global_cur(interp, name);
 
     return multi_sub && Parrot_mmd_maybe_candidate(interp, multi_sub, candidates);
@@ -1256,7 +1256,7 @@
 mmd_search_by_sig_obj(PARROT_INTERP, ARGIN(STRING *name),
         ARGIN(PMC *sig_obj), ARGIN(PMC *candidates))
 {
-    ASSERT_ARGS(mmd_search_by_sig_obj);
+    ASSERT_ARGS(mmd_search_by_sig_obj)
     PMC *first_arg = VTABLE_get_pmc_keyed_int(interp, sig_obj, 0);
     PMC *ns, *multi_sub;
 
@@ -1290,7 +1290,7 @@
 static void
 mmd_search_global(PARROT_INTERP, ARGIN(STRING *name), ARGIN(PMC *cl))
 {
-    ASSERT_ARGS(mmd_search_global);
+    ASSERT_ARGS(mmd_search_global)
     STRING * const multi_str = CONST_STRING(interp, "MULTI");
     PMC    * const ns        = Parrot_get_namespace_keyed_str(interp,
                                     interp->root_namespace, multi_str);
@@ -1317,7 +1317,7 @@
 static void
 mmd_add_multi_global(PARROT_INTERP, ARGIN(STRING *sub_name), ARGIN(PMC *sub_obj))
 {
-    ASSERT_ARGS(mmd_add_multi_global);
+    ASSERT_ARGS(mmd_add_multi_global)
     STRING * const multi_str = CONST_STRING(interp, "MULTI");
     PMC    * const ns        = Parrot_make_namespace_keyed_str(interp,
                                     interp->root_namespace, multi_str);
@@ -1348,7 +1348,7 @@
 mmd_add_multi_to_namespace(PARROT_INTERP, ARGIN(STRING *ns_name),
             ARGIN(STRING *sub_name), ARGIN(PMC *sub_obj))
 {
-    ASSERT_ARGS(mmd_add_multi_to_namespace);
+    ASSERT_ARGS(mmd_add_multi_to_namespace)
     PMC * const hll_ns = VTABLE_get_pmc_keyed_int(interp,
                         interp->HLL_namespace, CONTEXT(interp)->current_HLL);
     PMC * const ns     = Parrot_make_namespace_keyed_str(interp, hll_ns, ns_name);
@@ -1380,7 +1380,7 @@
 Parrot_mmd_add_multi_from_long_sig(PARROT_INTERP,
         ARGIN(STRING *sub_name), ARGIN(STRING *long_sig), ARGIN(PMC *sub_obj))
 {
-    ASSERT_ARGS(Parrot_mmd_add_multi_from_long_sig);
+    ASSERT_ARGS(Parrot_mmd_add_multi_from_long_sig)
     PMC    *type_list   = string_split(interp, CONST_STRING(interp, ","), long_sig);
     STRING *ns_name     = VTABLE_get_string_keyed_int(interp, type_list, 0);
     STRING *sub_str     = CONST_STRING(interp, "Sub");
@@ -1419,7 +1419,7 @@
         ARGIN(const char *sub_name), ARGIN(const char *short_sig),
         ARGIN(const char *long_sig), ARGIN(funcptr_t multi_func_ptr))
 {
-    ASSERT_ARGS(Parrot_mmd_add_multi_from_c_args);
+    ASSERT_ARGS(Parrot_mmd_add_multi_from_c_args)
     STRING *comma         = CONST_STRING(interp, ",");
     STRING *sub_name_str  = const_string(interp, sub_name);
     STRING *long_sig_str  = const_string(interp, long_sig);
@@ -1463,7 +1463,7 @@
 Parrot_mmd_add_multi_list_from_c_args(PARROT_INTERP,
         ARGIN(const multi_func_list *mmd_info), INTVAL elements)
 {
-    ASSERT_ARGS(Parrot_mmd_add_multi_list_from_c_args);
+    ASSERT_ARGS(Parrot_mmd_add_multi_list_from_c_args)
     INTVAL i;
     for (i = 0; i < elements; ++i) {
 #ifdef PARROT_HAS_ALIGNED_FUNCPTR
@@ -1493,7 +1493,7 @@
 MMD_Cache *
 Parrot_mmd_cache_create(PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_mmd_cache_create);
+    ASSERT_ARGS(Parrot_mmd_cache_create)
     /* String hash. */
     Hash *cache;
     parrot_new_hash(interp, &cache);
@@ -1516,7 +1516,7 @@
 mmd_cache_key_from_values(PARROT_INTERP, ARGIN(const char *name),
     ARGIN(PMC *values))
 {
-    ASSERT_ARGS(mmd_cache_key_from_values);
+    ASSERT_ARGS(mmd_cache_key_from_values)
     /* Build array of type IDs, which we'll then use as a string to key into
      * the hash. */
     const INTVAL num_values = VTABLE_elements(interp, values);
@@ -1562,7 +1562,7 @@
 Parrot_mmd_cache_lookup_by_values(PARROT_INTERP, ARGMOD(MMD_Cache *cache),
     ARGIN(const char *name), ARGIN(PMC *values))
 {
-    ASSERT_ARGS(Parrot_mmd_cache_lookup_by_values);
+    ASSERT_ARGS(Parrot_mmd_cache_lookup_by_values)
     STRING * const key = mmd_cache_key_from_values(interp, name, values);
 
     if (key)
@@ -1588,7 +1588,7 @@
 Parrot_mmd_cache_store_by_values(PARROT_INTERP, ARGMOD(MMD_Cache *cache),
     ARGIN(const char *name), ARGIN(PMC *values), ARGIN(PMC *chosen))
 {
-    ASSERT_ARGS(Parrot_mmd_cache_store_by_values);
+    ASSERT_ARGS(Parrot_mmd_cache_store_by_values)
     STRING * const key = mmd_cache_key_from_values(interp, name, values);
 
     if (key)
@@ -1611,7 +1611,7 @@
 mmd_cache_key_from_types(PARROT_INTERP, ARGIN(const char *name),
     ARGIN(PMC *types))
 {
-    ASSERT_ARGS(mmd_cache_key_from_types);
+    ASSERT_ARGS(mmd_cache_key_from_types)
     /* Build array of type IDs, which we'll then use as a string to key into
      * the hash. */
     const INTVAL num_types  = VTABLE_elements(interp, types);
@@ -1659,7 +1659,7 @@
 Parrot_mmd_cache_lookup_by_types(PARROT_INTERP, ARGMOD(MMD_Cache *cache),
     ARGIN(const char *name), ARGIN(PMC *types))
 {
-    ASSERT_ARGS(Parrot_mmd_cache_lookup_by_types);
+    ASSERT_ARGS(Parrot_mmd_cache_lookup_by_types)
     STRING * const key = mmd_cache_key_from_types(interp, name, types);
 
     if (key)
@@ -1686,7 +1686,7 @@
 Parrot_mmd_cache_store_by_types(PARROT_INTERP, ARGMOD(MMD_Cache *cache),
     ARGIN(const char *name), ARGIN(PMC *types), ARGIN(PMC *chosen))
 {
-    ASSERT_ARGS(Parrot_mmd_cache_store_by_types);
+    ASSERT_ARGS(Parrot_mmd_cache_store_by_types)
     STRING * const key = mmd_cache_key_from_types(interp, name, types);
 
     if (key)
@@ -1708,7 +1708,7 @@
 void
 Parrot_mmd_cache_mark(PARROT_INTERP, ARGMOD(MMD_Cache *cache))
 {
-    ASSERT_ARGS(Parrot_mmd_cache_mark);
+    ASSERT_ARGS(Parrot_mmd_cache_mark)
     /* As a small future optimization, note that we only *really* need to mark
     * keys - the candidates will be referenced outside the cache, provided it's
     * invalidated properly. */
@@ -1730,7 +1730,7 @@
 void
 Parrot_mmd_cache_destroy(PARROT_INTERP, ARGMOD(MMD_Cache *cache))
 {
-    ASSERT_ARGS(Parrot_mmd_cache_destroy);
+    ASSERT_ARGS(Parrot_mmd_cache_destroy)
     parrot_hash_destroy(interp, cache);
 }
 

Modified: trunk/src/oo.c
==============================================================================
--- trunk/src/oo.c	(original)
+++ trunk/src/oo.c	Mon Jan  5 15:17:26 2009
@@ -99,7 +99,7 @@
 void
 Parrot_oo_extract_methods_from_namespace(PARROT_INTERP, ARGIN(PMC *self), ARGIN(PMC *ns))
 {
-   ASSERT_ARGS(Parrot_oo_extract_methods_from_namespace);
+   ASSERT_ARGS(Parrot_oo_extract_methods_from_namespace)
    PMC *methods, *vtable_overrides;
 
     /* Pull in methods from the namespace, if any. */
@@ -162,7 +162,7 @@
 PMC *
 Parrot_oo_get_namespace(SHIM_INTERP, ARGIN(const PMC *classobj))
 {
-   ASSERT_ARGS(Parrot_oo_get_namespace);
+   ASSERT_ARGS(Parrot_oo_get_namespace)
     Parrot_Class_attributes * const _class     = PARROT_CLASS(classobj);
     PMC          * const _namespace = _class->_namespace;
 
@@ -189,7 +189,7 @@
 PMC *
 Parrot_oo_get_class(PARROT_INTERP, ARGIN(PMC *key))
 {
-    ASSERT_ARGS(Parrot_oo_get_class);
+    ASSERT_ARGS(Parrot_oo_get_class)
     PMC *classobj = PMCNULL;
 
     if (PObj_is_class_TEST(key))
@@ -253,7 +253,7 @@
 PMC *
 Parrot_oo_get_class_str(PARROT_INTERP, ARGIN(STRING *name))
 {
-    ASSERT_ARGS(Parrot_oo_get_class_str);
+    ASSERT_ARGS(Parrot_oo_get_class_str)
     PMC * const hll_ns = VTABLE_get_pmc_keyed_int(interp, interp->HLL_namespace,
                            CONTEXT(interp)->current_HLL);
     PMC * const ns     = Parrot_get_namespace_keyed_str(interp, hll_ns, name);
@@ -293,7 +293,7 @@
 PMC *
 Parrot_oo_newclass_from_str(PARROT_INTERP, ARGIN(STRING *name))
 {
-    ASSERT_ARGS(Parrot_oo_newclass_from_str);
+    ASSERT_ARGS(Parrot_oo_newclass_from_str)
     PMC * const namearg  = pmc_new(interp, enum_class_String);
     PMC        *namehash = pmc_new(interp, enum_class_Hash);
     PMC        *classobj;
@@ -324,7 +324,7 @@
 Parrot_oo_find_vtable_override_for_class(PARROT_INTERP,
         ARGIN(PMC *classobj), ARGIN(STRING *name))
 {
-    ASSERT_ARGS(Parrot_oo_find_vtable_override_for_class);
+    ASSERT_ARGS(Parrot_oo_find_vtable_override_for_class)
     Parrot_Class_attributes *class_info;
     PARROT_ASSERT(PObj_is_class_TEST(classobj));
 
@@ -350,7 +350,7 @@
 Parrot_oo_find_vtable_override(PARROT_INTERP,
         ARGIN(PMC *classobj), ARGIN(STRING *name))
 {
-    ASSERT_ARGS(Parrot_oo_find_vtable_override);
+    ASSERT_ARGS(Parrot_oo_find_vtable_override)
     Parrot_Class_attributes * const _class = PARROT_CLASS(classobj);
 
     if (VTABLE_exists_keyed_str(interp, _class->parent_overrides, name))
@@ -394,7 +394,7 @@
 INTVAL
 Parrot_get_vtable_index(PARROT_INTERP, ARGIN(const STRING *name))
 {
-    ASSERT_ARGS(Parrot_get_vtable_index);
+    ASSERT_ARGS(Parrot_get_vtable_index)
     char * const name_c      = string_to_cstring(interp, name);
 
     /* some of the first "slots" don't have names. skip 'em. */
@@ -441,7 +441,7 @@
 const char*
 Parrot_MMD_method_name(SHIM_INTERP, INTVAL idx)
 {
-    ASSERT_ARGS(Parrot_MMD_method_name);
+    ASSERT_ARGS(Parrot_MMD_method_name)
     PARROT_ASSERT(idx >= 0);
 
     if (idx >= MMD_USER_FIRST)
@@ -468,7 +468,7 @@
 PMC *
 Parrot_class_lookup(PARROT_INTERP, ARGIN(STRING *class_name))
 {
-    ASSERT_ARGS(Parrot_class_lookup);
+    ASSERT_ARGS(Parrot_class_lookup)
     const INTVAL type = pmc_type(interp, class_name);
     PMC         *pmc;
 
@@ -497,7 +497,7 @@
 PMC *
 Parrot_class_lookup_p(PARROT_INTERP, ARGIN(PMC *class_name))
 {
-    ASSERT_ARGS(Parrot_class_lookup_p);
+    ASSERT_ARGS(Parrot_class_lookup_p)
     const INTVAL type = pmc_type_p(interp, class_name);
     PMC         *pmc;
 
@@ -526,7 +526,7 @@
 static INTVAL
 fail_if_type_exists(PARROT_INTERP, ARGIN(PMC *name))
 {
-    ASSERT_ARGS(fail_if_type_exists);
+    ASSERT_ARGS(fail_if_type_exists)
     PMC * const value = (PMC *)VTABLE_get_pointer_keyed(interp, interp->class_hash, name);
 
     if (PMC_IS_NULL(value))
@@ -572,7 +572,7 @@
 INTVAL
 Parrot_oo_register_type(PARROT_INTERP, ARGIN(PMC *name), ARGIN(PMC *namespace))
 {
-    ASSERT_ARGS(Parrot_oo_register_type);
+    ASSERT_ARGS(Parrot_oo_register_type)
     INTVAL type;
     const INTVAL typeid_exists = fail_if_type_exists(interp, name);
 
@@ -623,7 +623,7 @@
 Parrot_remove_parent(PARROT_INTERP, ARGIN(PMC *removed_class),
         ARGIN(PMC *existing_class))
 {
-    ASSERT_ARGS(Parrot_remove_parent);
+    ASSERT_ARGS(Parrot_remove_parent)
     UNUSED(interp);
     UNUSED(removed_class);
     UNUSED(existing_class);
@@ -650,7 +650,7 @@
 void
 mark_object_cache(PARROT_INTERP)
 {
-    ASSERT_ARGS(mark_object_cache);
+    ASSERT_ARGS(mark_object_cache)
     Caches * const mc = interp->caches;
     UINTVAL type, entry;
 
@@ -685,7 +685,7 @@
 void
 init_object_cache(PARROT_INTERP)
 {
-    ASSERT_ARGS(init_object_cache);
+    ASSERT_ARGS(init_object_cache)
     Caches * const mc = interp->caches = mem_allocate_zeroed_typed(Caches);
     mc->idx = NULL;
 }
@@ -704,7 +704,7 @@
 void
 destroy_object_cache(PARROT_INTERP)
 {
-    ASSERT_ARGS(destroy_object_cache);
+    ASSERT_ARGS(destroy_object_cache)
     UINTVAL i;
     Caches * const mc = interp->caches;
 
@@ -732,7 +732,7 @@
 static void
 invalidate_type_caches(PARROT_INTERP, UINTVAL type)
 {
-    ASSERT_ARGS(invalidate_type_caches);
+    ASSERT_ARGS(invalidate_type_caches)
     Caches * const mc = interp->caches;
     INTVAL i;
 
@@ -770,7 +770,7 @@
 static void
 invalidate_all_caches(PARROT_INTERP)
 {
-    ASSERT_ARGS(invalidate_all_caches);
+    ASSERT_ARGS(invalidate_all_caches)
     UINTVAL i;
     for (i = 1; i < (UINTVAL)interp->n_vtable_max; ++i)
         invalidate_type_caches(interp, i);
@@ -792,7 +792,7 @@
 void
 Parrot_invalidate_method_cache(PARROT_INTERP, ARGIN_NULLOK(STRING *_class))
 {
-    ASSERT_ARGS(Parrot_invalidate_method_cache);
+    ASSERT_ARGS(Parrot_invalidate_method_cache)
     INTVAL type;
 
     /* during interp creation and NCI registration the class_hash
@@ -841,7 +841,7 @@
 PMC *
 Parrot_find_method_direct(PARROT_INTERP, ARGIN(PMC *_class), ARGIN(STRING *method_name))
 {
-    ASSERT_ARGS(Parrot_find_method_direct);
+    ASSERT_ARGS(Parrot_find_method_direct)
     PMC * const found = find_method_direct_1(interp, _class, method_name);
 
     if (!PMC_IS_NULL(found))
@@ -877,7 +877,7 @@
 PMC *
 Parrot_find_method_with_cache(PARROT_INTERP, ARGIN(PMC *_class), ARGIN(STRING *method_name))
 {
-    ASSERT_ARGS(Parrot_find_method_with_cache);
+    ASSERT_ARGS(Parrot_find_method_with_cache)
     UINTVAL type, bits;
 
     Caches           *mc;
@@ -960,7 +960,7 @@
 debug_trace_find_meth(PARROT_INTERP, ARGIN(const PMC *_class),
         ARGIN(const STRING *name), ARGIN_NULLOK(const PMC *sub))
 {
-    ASSERT_ARGS(debug_trace_find_meth);
+    ASSERT_ARGS(debug_trace_find_meth)
     STRING *class_name;
     const char *result;
     Interp *tracer;
@@ -1009,7 +1009,7 @@
 find_method_direct_1(PARROT_INTERP, ARGIN(PMC *_class),
                               ARGIN(STRING *method_name))
 {
-    ASSERT_ARGS(find_method_direct_1);
+    ASSERT_ARGS(find_method_direct_1)
     INTVAL i;
 
     PMC * const  mro = _class->vtable->mro;
@@ -1052,7 +1052,7 @@
 static PMC*
 C3_merge(PARROT_INTERP, ARGIN(PMC *merge_list))
 {
-    ASSERT_ARGS(C3_merge);
+    ASSERT_ARGS(C3_merge)
     PMC      *accepted   = PMCNULL;
     PMC      *result     = pmc_new(interp, enum_class_ResizablePMCArray);
     const int list_count = VTABLE_elements(interp, merge_list);
@@ -1150,7 +1150,7 @@
 PMC*
 Parrot_ComputeMRO_C3(PARROT_INTERP, ARGIN(PMC *_class))
 {
-    ASSERT_ARGS(Parrot_ComputeMRO_C3);
+    ASSERT_ARGS(Parrot_ComputeMRO_C3)
     PMC *result;
     PMC * const merge_list = pmc_new(interp, enum_class_ResizablePMCArray);
     PMC *immediate_parents;
@@ -1226,7 +1226,7 @@
                         ARGIN(PMC *alias),   int got_alias,
                         ARGIN(PMC *methods_hash), ARGIN(PMC *roles_list))
 {
-    ASSERT_ARGS(Parrot_ComposeRole);
+    ASSERT_ARGS(Parrot_ComposeRole)
     PMC *methods;
     PMC *methods_iter;
     PMC *roles_of_role;

Modified: trunk/src/packdump.c
==============================================================================
--- trunk/src/packdump.c	(original)
+++ trunk/src/packdump.c	Mon Jan  5 15:17:26 2009
@@ -62,7 +62,7 @@
 void
 PackFile_ConstTable_dump(PARROT_INTERP, ARGIN(const PackFile_ConstTable *self))
 {
-    ASSERT_ARGS(PackFile_ConstTable_dump);
+    ASSERT_ARGS(PackFile_ConstTable_dump)
     opcode_t i;
 
     for (i = 0; i < self->const_count; i++) {
@@ -125,7 +125,7 @@
  * followed by individual bits.
  */
 {
-    ASSERT_ARGS(pobj_flag_dump);
+    ASSERT_ARGS(pobj_flag_dump)
     INTVAL idx = 0;
     int printed_flag_p = 0;
 
@@ -147,7 +147,7 @@
 PackFile_Constant_dump(PARROT_INTERP, ARGIN(const PackFile_ConstTable *ct),
                        ARGIN(const PackFile_Constant *self))
 {
-    ASSERT_ARGS(PackFile_Constant_dump);
+    ASSERT_ARGS(PackFile_Constant_dump)
     PMC *key;
     size_t i;
 
@@ -369,7 +369,7 @@
 void
 PackFile_Fixup_dump(PARROT_INTERP, ARGIN(const PackFile_FixupTable *ft))
 {
-    ASSERT_ARGS(PackFile_Fixup_dump);
+    ASSERT_ARGS(PackFile_Fixup_dump)
     opcode_t i;
 
     for (i = 0; i < ft->fixup_count; i++) {

Modified: trunk/src/packfile.c
==============================================================================
--- trunk/src/packfile.c	(original)
+++ trunk/src/packfile.c	Mon Jan  5 15:17:26 2009
@@ -460,7 +460,7 @@
 void
 PackFile_destroy(PARROT_INTERP, ARGMOD_NULLOK(PackFile *pf))
 {
-    ASSERT_ARGS(PackFile_destroy);
+    ASSERT_ARGS(PackFile_destroy)
     if (!pf) {
         Parrot_io_eprintf(NULL, "PackFile_destroy: pf == NULL!\n");
         return;
@@ -500,7 +500,7 @@
 static void
 make_code_pointers(ARGMOD(PackFile_Segment *seg))
 {
-    ASSERT_ARGS(make_code_pointers);
+    ASSERT_ARGS(make_code_pointers)
     PackFile * const pf = seg->pf;
 
     switch (seg->type) {
@@ -548,7 +548,7 @@
 static int
 sub_pragma(PARROT_INTERP, pbc_action_enum_t action, ARGIN(const PMC *sub_pmc))
 {
-    ASSERT_ARGS(sub_pragma);
+    ASSERT_ARGS(sub_pragma)
     int todo    = 0;
     int pragmas = PObj_get_FLAGS(sub_pmc) &  SUB_FLAG_PF_MASK
                                           & ~SUB_FLAG_IS_OUTER;
@@ -598,7 +598,7 @@
 static PMC*
 run_sub(PARROT_INTERP, ARGIN(PMC *sub_pmc))
 {
-    ASSERT_ARGS(run_sub);
+    ASSERT_ARGS(run_sub)
     const INTVAL old = interp->run_core;
     PMC *retval;
 
@@ -635,7 +635,7 @@
 static PMC*
 do_1_sub_pragma(PARROT_INTERP, ARGMOD(PMC *sub_pmc), pbc_action_enum_t action)
 {
-    ASSERT_ARGS(do_1_sub_pragma);
+    ASSERT_ARGS(do_1_sub_pragma)
     Parrot_sub const *sub = PMC_sub(sub_pmc);
 
     switch (action) {
@@ -729,7 +729,7 @@
 static void
 mark_1_seg(PARROT_INTERP, ARGMOD(PackFile_ConstTable *ct))
 {
-    ASSERT_ARGS(mark_1_seg);
+    ASSERT_ARGS(mark_1_seg)
     opcode_t i;
     PackFile_Constant ** const constants = find_constants(interp, ct);
 
@@ -757,7 +757,7 @@
 find_const_iter(PARROT_INTERP, ARGIN(PackFile_Segment *seg),
                                ARGIN_NULLOK(void *user_data))
 {
-    ASSERT_ARGS(find_const_iter);
+    ASSERT_ARGS(find_const_iter)
     if (seg->type == PF_DIR_SEG)
         PackFile_map_segments(interp, (const PackFile_Directory *)seg,
                 find_const_iter, user_data);
@@ -781,7 +781,7 @@
 void
 mark_const_subs(PARROT_INTERP)
 {
-    ASSERT_ARGS(mark_const_subs);
+    ASSERT_ARGS(mark_const_subs)
     PackFile_Directory *dir;
 
     PackFile * const self = interp->initial_pf;
@@ -814,7 +814,7 @@
 do_sub_pragmas(PARROT_INTERP, ARGIN(PackFile_ByteCode *self),
                pbc_action_enum_t action, ARGIN_NULLOK(PMC *eval_pmc))
 {
-    ASSERT_ARGS(do_sub_pragmas);
+    ASSERT_ARGS(do_sub_pragmas)
     opcode_t i;
     PackFile_FixupTable * const ft = self->fixups;
     PackFile_ConstTable * const ct = self->const_table;
@@ -885,7 +885,7 @@
 PackFile_unpack(PARROT_INTERP, ARGMOD(PackFile *self),
     ARGIN(const opcode_t *packed), size_t packed_size)
 {
-    ASSERT_ARGS(PackFile_unpack);
+    ASSERT_ARGS(PackFile_unpack)
     PackFile_Header * const header = self->header;
     const opcode_t         *cursor;
     int                     header_read_length;
@@ -1044,7 +1044,7 @@
                        PackFile_map_segments_func_t callback,
                        ARGIN_NULLOK(void *user_data))
 {
-    ASSERT_ARGS(PackFile_map_segments);
+    ASSERT_ARGS(PackFile_map_segments)
     size_t i;
 
     for (i = 0; i < dir->num_segments; i++) {
@@ -1073,7 +1073,7 @@
 PackFile_add_segment(SHIM_INTERP, ARGMOD(PackFile_Directory *dir),
         ARGIN(PackFile_Segment *seg))
 {
-    ASSERT_ARGS(PackFile_add_segment);
+    ASSERT_ARGS(PackFile_add_segment)
     mem_realloc_n_typed(dir->segments, dir->num_segments+1, PackFile_Segment *);
     dir->segments[dir->num_segments] = seg;
     dir->num_segments++;
@@ -1102,7 +1102,7 @@
 PackFile_find_segment(PARROT_INTERP, ARGIN_NULLOK(PackFile_Directory *dir),
     ARGIN(const char *name), int sub_dir)
 {
-    ASSERT_ARGS(PackFile_find_segment);
+    ASSERT_ARGS(PackFile_find_segment)
     if (dir) {
         size_t i;
 
@@ -1146,7 +1146,7 @@
 PackFile_remove_segment_by_name(SHIM_INTERP, ARGMOD(PackFile_Directory *dir),
                                 ARGIN(const char *name))
 {
-    ASSERT_ARGS(PackFile_remove_segment_by_name);
+    ASSERT_ARGS(PackFile_remove_segment_by_name)
     size_t i;
 
     for (i = 0; i < dir->num_segments; i++) {
@@ -1187,7 +1187,7 @@
 static void
 PackFile_set_header(ARGOUT(PackFile_Header *header))
 {
-    ASSERT_ARGS(PackFile_set_header);
+    ASSERT_ARGS(PackFile_set_header)
     memcpy(header->magic, "\376PBC\r\n\032\n", 8);
     header->wordsize    = sizeof (opcode_t);
     header->byteorder   = PARROT_BIGENDIAN;
@@ -1258,7 +1258,7 @@
 PackFile *
 PackFile_new(PARROT_INTERP, INTVAL is_mapped)
 {
-    ASSERT_ARGS(PackFile_new);
+    ASSERT_ARGS(PackFile_new)
     PackFile * const pf = mem_allocate_zeroed_typed(PackFile);
     pf->header          = mem_allocate_zeroed_typed(PackFile_Header);
     pf->is_mmap_ped     = is_mapped;
@@ -1302,7 +1302,7 @@
 PackFile *
 PackFile_new_dummy(PARROT_INTERP, ARGIN(const char *name))
 {
-    ASSERT_ARGS(PackFile_new_dummy);
+    ASSERT_ARGS(PackFile_new_dummy)
     PackFile * const pf = PackFile_new(interp, 0);
     /* XXX PackFile_new needs to die on NULL, or else we have to check here */
 
@@ -1328,7 +1328,7 @@
 PackFile_funcs_register(SHIM_INTERP, ARGOUT(PackFile *pf), UINTVAL type,
                         const PackFile_funcs funcs)
 {
-    ASSERT_ARGS(PackFile_funcs_register);
+    ASSERT_ARGS(PackFile_funcs_register)
     /* TODO dynamic registering */
     pf->PackFuncs[type] = funcs;
     return 1;
@@ -1350,7 +1350,7 @@
 static const opcode_t *
 default_unpack(ARGMOD(PackFile_Segment *self), ARGIN(const opcode_t *cursor))
 {
-    ASSERT_ARGS(default_unpack);
+    ASSERT_ARGS(default_unpack)
     DECL_CONST_CAST_OF(opcode_t);
 
     self->op_count = PF_fetch_opcode(self->pf, &cursor);
@@ -1411,7 +1411,7 @@
 void
 default_dump_header(PARROT_INTERP, ARGIN(const PackFile_Segment *self))
 {
-    ASSERT_ARGS(default_dump_header);
+    ASSERT_ARGS(default_dump_header)
     Parrot_io_printf(interp, "%s => [ # offs 0x%x(%d)",
             self->name, (int)self->file_offset, (int)self->file_offset);
     Parrot_io_printf(interp, " = op_count %d, itype %d, id %d, size %d, ...",
@@ -1433,7 +1433,7 @@
 static void
 default_dump(PARROT_INTERP, ARGIN(const PackFile_Segment *self))
 {
-    ASSERT_ARGS(default_dump);
+    ASSERT_ARGS(default_dump)
     size_t i = self->data ? 0: self->file_offset + 4;
 
     default_dump_header(interp, self);
@@ -1468,7 +1468,7 @@
 static void
 pf_register_standard_funcs(PARROT_INTERP, ARGMOD(PackFile *pf))
 {
-    ASSERT_ARGS(pf_register_standard_funcs);
+    ASSERT_ARGS(pf_register_standard_funcs)
     PackFile_funcs dirf = {
         directory_new,
         directory_destroy,
@@ -1550,7 +1550,7 @@
 PackFile_Segment_new_seg(PARROT_INTERP, ARGMOD(PackFile_Directory *dir),
         UINTVAL type, ARGIN(const char *name), int add)
 {
-    ASSERT_ARGS(PackFile_Segment_new_seg);
+    ASSERT_ARGS(PackFile_Segment_new_seg)
     PackFile * const                  pf  = dir->base.pf;
     const PackFile_Segment_new_func_t f   = pf->PackFuncs[type].new_seg;
     PackFile_Segment * const          seg = (f)(interp, pf, name, add);
@@ -1581,7 +1581,7 @@
 create_seg(PARROT_INTERP, ARGMOD(PackFile_Directory *dir), pack_file_types t,
            ARGIN(const char *name), ARGIN(const char *file_name), int add)
 {
-    ASSERT_ARGS(create_seg);
+    ASSERT_ARGS(create_seg)
     PackFile_Segment *seg;
 
     const size_t len = strlen(name) + strlen(file_name) + 2;
@@ -1612,7 +1612,7 @@
 PackFile_ByteCode *
 PF_create_default_segs(PARROT_INTERP, ARGIN(const char *file_name), int add)
 {
-    ASSERT_ARGS(PF_create_default_segs);
+    ASSERT_ARGS(PF_create_default_segs)
     PackFile * const pf   = interp->initial_pf;
     PackFile_ByteCode * const cur_cs =
         (PackFile_ByteCode *)create_seg(interp, &pf->directory,
@@ -1651,7 +1651,7 @@
 void
 PackFile_Segment_destroy(PARROT_INTERP, ARGMOD(PackFile_Segment *self))
 {
-    ASSERT_ARGS(PackFile_Segment_destroy);
+    ASSERT_ARGS(PackFile_Segment_destroy)
     const PackFile_Segment_destroy_func_t f =
         self->pf->PackFuncs[self->type].destroy;
 
@@ -1677,7 +1677,7 @@
 size_t
 PackFile_Segment_packed_size(PARROT_INTERP, ARGIN(PackFile_Segment *self))
 {
-    ASSERT_ARGS(PackFile_Segment_packed_size);
+    ASSERT_ARGS(PackFile_Segment_packed_size)
     size_t size                           = default_packed_size(self);
     const size_t align                    = 16 / sizeof (opcode_t);
     PackFile_Segment_packed_size_func_t f =
@@ -1711,7 +1711,7 @@
 PackFile_Segment_pack(PARROT_INTERP, ARGIN(PackFile_Segment *self),
         ARGIN(opcode_t *cursor))
 {
-    ASSERT_ARGS(PackFile_Segment_pack);
+    ASSERT_ARGS(PackFile_Segment_pack)
     const size_t align             = 16 / sizeof (opcode_t);
     PackFile_Segment_pack_func_t f =
         self->pf->PackFuncs[self->type].pack;
@@ -1747,7 +1747,7 @@
 PackFile_Segment_unpack(PARROT_INTERP, ARGMOD(PackFile_Segment *self),
         ARGIN(const opcode_t *cursor))
 {
-    ASSERT_ARGS(PackFile_Segment_unpack);
+    ASSERT_ARGS(PackFile_Segment_unpack)
     PackFile_Segment_unpack_func_t f = self->pf->PackFuncs[self->type].unpack;
 
     cursor = default_unpack(self, cursor);
@@ -1780,7 +1780,7 @@
 void
 PackFile_Segment_dump(PARROT_INTERP, ARGIN(PackFile_Segment *self))
 {
-    ASSERT_ARGS(PackFile_Segment_dump);
+    ASSERT_ARGS(PackFile_Segment_dump)
     self->pf->PackFuncs[self->type].dump(interp, self);
 }
 
@@ -1806,7 +1806,7 @@
 static PackFile_Segment *
 directory_new(SHIM_INTERP, SHIM(PackFile *pf), SHIM(const char *name), SHIM(int add))
 {
-    ASSERT_ARGS(directory_new);
+    ASSERT_ARGS(directory_new)
 
     return (PackFile_Segment *)mem_allocate_zeroed_typed(PackFile_Directory);
 }
@@ -1825,7 +1825,7 @@
 static void
 directory_dump(PARROT_INTERP, ARGIN(const PackFile_Segment *self))
 {
-    ASSERT_ARGS(directory_dump);
+    ASSERT_ARGS(directory_dump)
     const PackFile_Directory * const dir = (const PackFile_Directory *) self;
     size_t i;
 
@@ -1868,7 +1868,7 @@
 static const opcode_t *
 directory_unpack(PARROT_INTERP, ARGMOD(PackFile_Segment *segp), ARGIN(const opcode_t *cursor))
 {
-    ASSERT_ARGS(directory_unpack);
+    ASSERT_ARGS(directory_unpack)
     PackFile_Directory * const dir = (PackFile_Directory *) segp;
     PackFile           * const pf  = dir->base.pf;
     const opcode_t            *pos;
@@ -2006,7 +2006,7 @@
 static void
 directory_destroy(PARROT_INTERP, ARGMOD(PackFile_Segment *self))
 {
-    ASSERT_ARGS(directory_destroy);
+    ASSERT_ARGS(directory_destroy)
     PackFile_Directory * const dir = (PackFile_Directory *)self;
     size_t i;
 
@@ -2033,7 +2033,7 @@
 static void
 sort_segs(ARGMOD(PackFile_Directory *dir))
 {
-    ASSERT_ARGS(sort_segs);
+    ASSERT_ARGS(sort_segs)
     const size_t      num_segs = dir->num_segments;
     PackFile_Segment *seg      = dir->segments[0];
 
@@ -2081,7 +2081,7 @@
 static size_t
 directory_packed_size(PARROT_INTERP, ARGMOD(PackFile_Segment *self))
 {
-    ASSERT_ARGS(directory_packed_size);
+    ASSERT_ARGS(directory_packed_size)
     PackFile_Directory * const dir   = (PackFile_Directory *)self;
     const size_t               align = 16 / sizeof (opcode_t);
     size_t size, i;
@@ -2134,7 +2134,7 @@
 static opcode_t *
 directory_pack(PARROT_INTERP, ARGIN(PackFile_Segment *self), ARGOUT(opcode_t *cursor))
 {
-    ASSERT_ARGS(directory_pack);
+    ASSERT_ARGS(directory_pack)
     PackFile_Directory * const dir = (PackFile_Directory *)self;
     size_t i;
     size_t align;
@@ -2183,7 +2183,7 @@
 segment_init(ARGOUT(PackFile_Segment *self), ARGIN(PackFile *pf),
         ARGIN(const char *name))
 {
-    ASSERT_ARGS(segment_init);
+    ASSERT_ARGS(segment_init)
     self->pf          = pf;
     self->type        = PF_UNKNOWN_SEG;
     self->file_offset = 0;
@@ -2211,7 +2211,7 @@
 PackFile_Segment *
 PackFile_Segment_new(SHIM_INTERP, SHIM(PackFile *pf), SHIM(const char *name), SHIM(int add))
 {
-    ASSERT_ARGS(PackFile_Segment_new);
+    ASSERT_ARGS(PackFile_Segment_new)
     PackFile_Segment * const seg = mem_allocate_typed(PackFile_Segment);
 
     return seg;
@@ -2239,7 +2239,7 @@
 static void
 default_destroy(ARGMOD(PackFile_Segment *self))
 {
-    ASSERT_ARGS(default_destroy);
+    ASSERT_ARGS(default_destroy)
     if (!self->pf->is_mmap_ped && self->data) {
         mem_sys_free(self->data);
         self->data = NULL;
@@ -2264,7 +2264,7 @@
 static size_t
 default_packed_size(ARGIN(const PackFile_Segment *self))
 {
-    ASSERT_ARGS(default_packed_size);
+    ASSERT_ARGS(default_packed_size)
     /* op_count, itype, id, size */
     /* XXX There should be a constant defining this 4, and why */
     /* This is the 2nd place in the file that has this */
@@ -2286,7 +2286,7 @@
 static opcode_t *
 default_pack(ARGIN(const PackFile_Segment *self), ARGOUT(opcode_t *dest))
 {
-    ASSERT_ARGS(default_pack);
+    ASSERT_ARGS(default_pack)
     *dest++ = self->op_count;
     *dest++ = self->itype;
     *dest++ = self->id;
@@ -2315,7 +2315,7 @@
 static void
 byte_code_destroy(SHIM_INTERP, ARGMOD(PackFile_Segment *self))
 {
-    ASSERT_ARGS(byte_code_destroy);
+    ASSERT_ARGS(byte_code_destroy)
     PackFile_ByteCode * const byte_code = (PackFile_ByteCode *)self;
 
 #ifdef HAS_JIT
@@ -2353,7 +2353,7 @@
 static PackFile_Segment *
 byte_code_new(SHIM_INTERP, SHIM(PackFile *pf), SHIM(const char *name), SHIM(int add))
 {
-    ASSERT_ARGS(byte_code_new);
+    ASSERT_ARGS(byte_code_new)
     PackFile_ByteCode * const byte_code = mem_allocate_zeroed_typed(PackFile_ByteCode);
 
     return (PackFile_Segment *) byte_code;
@@ -2378,7 +2378,7 @@
 static void
 pf_debug_destroy(SHIM_INTERP, ARGMOD(PackFile_Segment *self))
 {
-    ASSERT_ARGS(pf_debug_destroy);
+    ASSERT_ARGS(pf_debug_destroy)
     PackFile_Debug * const debug = (PackFile_Debug *) self;
     int i;
 
@@ -2409,7 +2409,7 @@
 static PackFile_Segment *
 pf_debug_new(SHIM_INTERP, SHIM(PackFile *pf), SHIM(const char *name), SHIM(int add))
 {
-    ASSERT_ARGS(pf_debug_new);
+    ASSERT_ARGS(pf_debug_new)
     PackFile_Debug * const debug = mem_allocate_zeroed_typed(PackFile_Debug);
 
     debug->mappings              = mem_allocate_typed(PackFile_DebugMapping *);
@@ -2432,7 +2432,7 @@
 static size_t
 pf_debug_packed_size(SHIM_INTERP, ARGIN(PackFile_Segment *self))
 {
-    ASSERT_ARGS(pf_debug_packed_size);
+    ASSERT_ARGS(pf_debug_packed_size)
     PackFile_Debug * const debug = (PackFile_Debug *)self;
     int size = 0;
     int i;
@@ -2475,7 +2475,7 @@
 static opcode_t *
 pf_debug_pack(SHIM_INTERP, ARGMOD(PackFile_Segment *self), ARGOUT(opcode_t *cursor))
 {
-    ASSERT_ARGS(pf_debug_pack);
+    ASSERT_ARGS(pf_debug_pack)
     PackFile_Debug * const debug = (PackFile_Debug *)self;
     int i;
     const int n = debug->num_mappings;
@@ -2521,7 +2521,7 @@
 static const opcode_t *
 pf_debug_unpack(PARROT_INTERP, ARGOUT(PackFile_Segment *self), ARGIN(const opcode_t *cursor))
 {
-    ASSERT_ARGS(pf_debug_unpack);
+    ASSERT_ARGS(pf_debug_unpack)
     PackFile_Debug * const debug = (PackFile_Debug *)self;
     PackFile_ByteCode *code;
     int i;
@@ -2598,7 +2598,7 @@
 static void
 pf_debug_dump(PARROT_INTERP, ARGIN(const PackFile_Segment *self))
 {
-    ASSERT_ARGS(pf_debug_dump);
+    ASSERT_ARGS(pf_debug_dump)
     opcode_t i;
     size_t   j;
     const PackFile_Debug * const debug = (const PackFile_Debug *)self;
@@ -2669,7 +2669,7 @@
 PackFile_Debug *
 Parrot_new_debug_seg(PARROT_INTERP, ARGMOD(PackFile_ByteCode *cs), size_t size)
 {
-    ASSERT_ARGS(Parrot_new_debug_seg);
+    ASSERT_ARGS(Parrot_new_debug_seg)
     PackFile_Debug *debug;
 
     if (cs->debugs) {    /* it exists already, resize it */
@@ -2719,7 +2719,7 @@
                          opcode_t offset, int mapping_type,
                          ARGIN(const char *filename), int source_seg)
 {
-    ASSERT_ARGS(Parrot_debug_add_mapping);
+    ASSERT_ARGS(Parrot_debug_add_mapping)
     PackFile_DebugMapping *mapping;
     PackFile_ConstTable * const ct = debug->code->const_table;
     int insert_pos = 0;
@@ -2797,7 +2797,7 @@
 STRING *
 Parrot_debug_pc_to_filename(PARROT_INTERP, ARGIN(const PackFile_Debug *debug), opcode_t pc)
 {
-    ASSERT_ARGS(Parrot_debug_pc_to_filename);
+    ASSERT_ARGS(Parrot_debug_pc_to_filename)
     /* Look through mappings until we find one that maps the passed
        bytecode offset. */
     int i;
@@ -2840,7 +2840,7 @@
 void
 Parrot_switch_to_cs_by_nr(PARROT_INTERP, opcode_t seg)
 {
-    ASSERT_ARGS(Parrot_switch_to_cs_by_nr);
+    ASSERT_ARGS(Parrot_switch_to_cs_by_nr)
     const PackFile_Directory * const dir = interp->code->base.dir;
     const size_t num_segs = dir->num_segments;
     size_t i;
@@ -2878,7 +2878,7 @@
 PackFile_ByteCode *
 Parrot_switch_to_cs(PARROT_INTERP, ARGIN(PackFile_ByteCode *new_cs), int really)
 {
-    ASSERT_ARGS(Parrot_switch_to_cs);
+    ASSERT_ARGS(Parrot_switch_to_cs)
     PackFile_ByteCode * const cur_cs = interp->code;
 
     if (!new_cs)
@@ -2921,7 +2921,7 @@
 static PackFile_Constant *
 clone_constant(PARROT_INTERP, ARGIN(PackFile_Constant *old_const))
 {
-    ASSERT_ARGS(clone_constant);
+    ASSERT_ARGS(clone_constant)
     STRING * const _sub = interp->vtables[enum_class_Sub]->whoami;
 
     if (old_const->type == PFC_PMC
@@ -2970,7 +2970,7 @@
 static PackFile_Constant **
 find_constants(PARROT_INTERP, ARGIN(PackFile_ConstTable *ct))
 {
-    ASSERT_ARGS(find_constants);
+    ASSERT_ARGS(find_constants)
     if (!n_interpreters || !interp->thread_data ||
             interp->thread_data->tid == 0) {
         return ct->constants;
@@ -3024,7 +3024,7 @@
 void
 Parrot_destroy_constants(PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_destroy_constants);
+    ASSERT_ARGS(Parrot_destroy_constants)
     UINTVAL i;
     Hash *hash;
     if (!interp->thread_data) {
@@ -3081,7 +3081,7 @@
 void
 PackFile_FixupTable_clear(PARROT_INTERP, ARGMOD(PackFile_FixupTable *self))
 {
-    ASSERT_ARGS(PackFile_FixupTable_clear);
+    ASSERT_ARGS(PackFile_FixupTable_clear)
     opcode_t i;
     if (!self) {
         Parrot_io_eprintf(interp, "PackFile_FixupTable_clear: self == NULL!\n");
@@ -3119,7 +3119,7 @@
 static void
 fixup_destroy(PARROT_INTERP, ARGMOD(PackFile_Segment *self))
 {
-    ASSERT_ARGS(fixup_destroy);
+    ASSERT_ARGS(fixup_destroy)
     PackFile_FixupTable * const ft = (PackFile_FixupTable *)self;
     PackFile_FixupTable_clear(interp, ft);
 }
@@ -3139,7 +3139,7 @@
 static size_t
 fixup_packed_size(PARROT_INTERP, ARGMOD(PackFile_Segment *self))
 {
-    ASSERT_ARGS(fixup_packed_size);
+    ASSERT_ARGS(fixup_packed_size)
     PackFile_FixupTable * const ft = (PackFile_FixupTable *)self;
     size_t size;
     opcode_t i;
@@ -3179,7 +3179,7 @@
 static opcode_t *
 fixup_pack(PARROT_INTERP, ARGIN(PackFile_Segment *self), ARGOUT(opcode_t *cursor))
 {
-    ASSERT_ARGS(fixup_pack);
+    ASSERT_ARGS(fixup_pack)
     PackFile_FixupTable * const ft = (PackFile_FixupTable *)self;
     opcode_t i;
 
@@ -3216,7 +3216,7 @@
 static PackFile_Segment *
 fixup_new(SHIM_INTERP, SHIM(PackFile *pf), SHIM(const char *name), SHIM(int add))
 {
-    ASSERT_ARGS(fixup_new);
+    ASSERT_ARGS(fixup_new)
     PackFile_FixupTable * const fixup = mem_allocate_zeroed_typed(PackFile_FixupTable);
 
     return (PackFile_Segment *) fixup;
@@ -3239,7 +3239,7 @@
 static const opcode_t *
 fixup_unpack(PARROT_INTERP, ARGIN(PackFile_Segment *seg), ARGIN(const opcode_t *cursor))
 {
-    ASSERT_ARGS(fixup_unpack);
+    ASSERT_ARGS(fixup_unpack)
     opcode_t i;
     PackFile *pf;
     PackFile_FixupTable * const self = (PackFile_FixupTable *)seg;
@@ -3308,7 +3308,7 @@
 PackFile_FixupTable_new_entry(PARROT_INTERP,
         ARGIN(const char *label), INTVAL type, opcode_t offs)
 {
-    ASSERT_ARGS(PackFile_FixupTable_new_entry);
+    ASSERT_ARGS(PackFile_FixupTable_new_entry)
     PackFile_FixupTable *self = interp->code->fixups;
     opcode_t i;
 
@@ -3345,7 +3345,7 @@
 static PackFile_FixupEntry *
 find_fixup(ARGMOD(PackFile_FixupTable *ft), INTVAL type, ARGIN(const char *name))
 {
-    ASSERT_ARGS(find_fixup);
+    ASSERT_ARGS(find_fixup)
     opcode_t i;
     for (i = 0; i < ft->fixup_count; i++) {
         if ((INTVAL)((enum_fixup_t)ft->fixups[i]->type) == type &&
@@ -3372,7 +3372,7 @@
 static INTVAL
 find_fixup_iter(PARROT_INTERP, ARGIN(PackFile_Segment *seg), ARGIN(void *user_data))
 {
-    ASSERT_ARGS(find_fixup_iter);
+    ASSERT_ARGS(find_fixup_iter)
     if (seg->type == PF_DIR_SEG) {
         if (PackFile_map_segments(interp, (PackFile_Directory *)seg,
                     find_fixup_iter, user_data))
@@ -3408,7 +3408,7 @@
 PackFile_FixupEntry *
 PackFile_find_fixup_entry(PARROT_INTERP, INTVAL type, ARGIN(char *name))
 {
-    ASSERT_ARGS(PackFile_find_fixup_entry);
+    ASSERT_ARGS(PackFile_find_fixup_entry)
     /* TODO make a hash of all fixups */
     PackFile_Directory * const dir = interp->code->base.dir;
     PackFile_FixupEntry * const ep = mem_allocate_typed(PackFile_FixupEntry);
@@ -3440,7 +3440,7 @@
 void
 PackFile_ConstTable_clear(PARROT_INTERP, ARGMOD(PackFile_ConstTable *self))
 {
-    ASSERT_ARGS(PackFile_ConstTable_clear);
+    ASSERT_ARGS(PackFile_ConstTable_clear)
     opcode_t i;
 
     for (i = 0; i < self->const_count; i++) {
@@ -3484,7 +3484,7 @@
 PackFile_ConstTable_unpack(PARROT_INTERP, ARGOUT(PackFile_Segment *seg),
         ARGIN(const opcode_t *cursor))
 {
-    ASSERT_ARGS(PackFile_ConstTable_unpack);
+    ASSERT_ARGS(PackFile_ConstTable_unpack)
     opcode_t i;
     PackFile_ConstTable * const self = (PackFile_ConstTable *)seg;
     PackFile * const pf              = seg->pf;
@@ -3548,7 +3548,7 @@
 static PackFile_Segment *
 const_new(SHIM_INTERP, SHIM(PackFile *pf), SHIM(const char *name), SHIM(int add))
 {
-    ASSERT_ARGS(const_new);
+    ASSERT_ARGS(const_new)
     PackFile_ConstTable * const const_table = mem_allocate_zeroed_typed(PackFile_ConstTable);
 
     return (PackFile_Segment *)const_table;
@@ -3567,7 +3567,7 @@
 static void
 const_destroy(PARROT_INTERP, ARGMOD(PackFile_Segment *self))
 {
-    ASSERT_ARGS(const_destroy);
+    ASSERT_ARGS(const_destroy)
     PackFile_ConstTable * const ct = (PackFile_ConstTable *)self;
 
     PackFile_ConstTable_clear(interp, ct);
@@ -3597,7 +3597,7 @@
 PackFile_Constant *
 PackFile_Constant_new(SHIM_INTERP)
 {
-    ASSERT_ARGS(PackFile_Constant_new);
+    ASSERT_ARGS(PackFile_Constant_new)
     PackFile_Constant * const self =
         mem_allocate_zeroed_typed(PackFile_Constant);
 
@@ -3622,7 +3622,7 @@
 void
 PackFile_Constant_destroy(SHIM_INTERP, ARGMOD_NULLOK(PackFile_Constant *self))
 {
-    ASSERT_ARGS(PackFile_Constant_destroy);
+    ASSERT_ARGS(PackFile_Constant_destroy)
     mem_sys_free(self);
 }
 
@@ -3642,7 +3642,7 @@
 size_t
 PackFile_Constant_pack_size(PARROT_INTERP, ARGIN(const PackFile_Constant *self))
 {
-    ASSERT_ARGS(PackFile_Constant_pack_size);
+    ASSERT_ARGS(PackFile_Constant_pack_size)
     size_t packed_size;
     PMC *component;
     STRING *image;
@@ -3710,7 +3710,7 @@
 PackFile_Constant_unpack(PARROT_INTERP, ARGIN(PackFile_ConstTable *constt),
         ARGOUT(PackFile_Constant *self), ARGIN(const opcode_t *cursor))
 {
-    ASSERT_ARGS(PackFile_Constant_unpack);
+    ASSERT_ARGS(PackFile_Constant_unpack)
     PackFile * const pf = constt->base.pf;
     const opcode_t type = PF_fetch_opcode(pf, &cursor);
 
@@ -3766,7 +3766,7 @@
 PackFile_Constant_unpack_pmc(PARROT_INTERP, ARGIN(PackFile_ConstTable *constt),
         ARGMOD(PackFile_Constant *self), ARGIN(const opcode_t *cursor))
 {
-    ASSERT_ARGS(PackFile_Constant_unpack_pmc);
+    ASSERT_ARGS(PackFile_Constant_unpack_pmc)
     PackFile * const pf = constt->base.pf;
     STRING *image, *_sub;
     PMC *pmc;
@@ -3828,7 +3828,7 @@
 PackFile_Constant_unpack_key(PARROT_INTERP, ARGIN(PackFile_ConstTable *constt),
         ARGMOD(PackFile_Constant *self), ARGIN(const opcode_t *cursor))
 {
-    ASSERT_ARGS(PackFile_Constant_unpack_key);
+    ASSERT_ARGS(PackFile_Constant_unpack_key)
     PackFile * const pf = constt->base.pf;
     int pmc_enum = enum_class_Key;
 
@@ -3914,7 +3914,7 @@
 static PackFile *
 PackFile_append_pbc(PARROT_INTERP, ARGIN_NULLOK(const char *filename))
 {
-    ASSERT_ARGS(PackFile_append_pbc);
+    ASSERT_ARGS(PackFile_append_pbc)
     PackFile * const pf = Parrot_readbc(interp, filename);
     if (!pf)
         return NULL;
@@ -3945,7 +3945,7 @@
 void
 Parrot_load_bytecode(PARROT_INTERP, ARGIN_NULLOK(STRING *file_str))
 {
-    ASSERT_ARGS(Parrot_load_bytecode);
+    ASSERT_ARGS(Parrot_load_bytecode)
     char *filename;
     STRING *wo_ext, *ext, *pbc, *path;
     enum_runtime_ft file_type;
@@ -4014,7 +4014,7 @@
 void
 PackFile_fixup_subs(PARROT_INTERP, pbc_action_enum_t what, ARGIN_NULLOK(PMC *eval))
 {
-    ASSERT_ARGS(PackFile_fixup_subs);
+    ASSERT_ARGS(PackFile_fixup_subs)
     do_sub_pragmas(interp, interp->code, what, eval);
 }
 

Modified: trunk/src/packfile/pf_items.c
==============================================================================
--- trunk/src/packfile/pf_items.c	(original)
+++ trunk/src/packfile/pf_items.c	Mon Jan  5 15:17:26 2009
@@ -139,7 +139,7 @@
 static void
 cvt_num12_num8(ARGOUT(unsigned char *dest), ARGIN(const unsigned char *src))
 {
-    ASSERT_ARGS(cvt_num12_num8);
+    ASSERT_ARGS(cvt_num12_num8)
     int expo, i, s;
 #ifdef __LCC__
     int expo2;
@@ -199,7 +199,7 @@
 static void
 cvt_num12_num8_be(ARGOUT(unsigned char *dest), ARGIN(const unsigned char *src))
 {
-    ASSERT_ARGS(cvt_num12_num8_be);
+    ASSERT_ARGS(cvt_num12_num8_be)
     cvt_num12_num8(dest, src);
     /* TODO endianize */
     exit_fatal(1, "TODO cvt_num12_num8_be\n");
@@ -219,7 +219,7 @@
 static void
 cvt_num12_num8_le(ARGOUT(unsigned char *dest), ARGIN(unsigned char *src))
 {
-    ASSERT_ARGS(cvt_num12_num8_le);
+    ASSERT_ARGS(cvt_num12_num8_le)
     unsigned char b[8];
     cvt_num12_num8(b, src);
     fetch_buf_le_8(dest, b);
@@ -238,7 +238,7 @@
 static opcode_t
 fetch_op_test(ARGIN(const unsigned char *b))
 {
-    ASSERT_ARGS(fetch_op_test);
+    ASSERT_ARGS(fetch_op_test)
     union {
         unsigned char buf[4];
         opcode_t o;
@@ -264,7 +264,7 @@
 static opcode_t
 fetch_op_mixed_le(ARGIN(const unsigned char *b))
 {
-    ASSERT_ARGS(fetch_op_mixed_le);
+    ASSERT_ARGS(fetch_op_mixed_le)
 #if OPCODE_T_SIZE == 4
     union {
         unsigned char buf[8];
@@ -300,7 +300,7 @@
 static opcode_t
 fetch_op_mixed_be(ARGIN(const unsigned char *b))
 {
-    ASSERT_ARGS(fetch_op_mixed_be);
+    ASSERT_ARGS(fetch_op_mixed_be)
 #if OPCODE_T_SIZE == 4
     union {
         unsigned char buf[8];
@@ -334,7 +334,7 @@
 static opcode_t
 fetch_op_be_4(ARGIN(const unsigned char *b))
 {
-    ASSERT_ARGS(fetch_op_be_4);
+    ASSERT_ARGS(fetch_op_be_4)
     union {
         unsigned char buf[4];
         opcode_t o;
@@ -368,7 +368,7 @@
 static opcode_t
 fetch_op_be_8(ARGIN(const unsigned char *b))
 {
-    ASSERT_ARGS(fetch_op_be_8);
+    ASSERT_ARGS(fetch_op_be_8)
     union {
         unsigned char buf[8];
         opcode_t o[2];
@@ -398,7 +398,7 @@
 static opcode_t
 fetch_op_le_4(ARGIN(const unsigned char *b))
 {
-    ASSERT_ARGS(fetch_op_le_4);
+    ASSERT_ARGS(fetch_op_le_4)
     union {
         unsigned char buf[4];
         opcode_t o;
@@ -432,7 +432,7 @@
 static opcode_t
 fetch_op_le_8(ARGIN(const unsigned char *b))
 {
-    ASSERT_ARGS(fetch_op_le_8);
+    ASSERT_ARGS(fetch_op_le_8)
     union {
         unsigned char buf[8];
         opcode_t o[2];
@@ -463,7 +463,7 @@
 opcode_t
 PF_fetch_opcode(ARGIN_NULLOK(const PackFile *pf), ARGMOD(const opcode_t **stream))
 {
-    ASSERT_ARGS(PF_fetch_opcode);
+    ASSERT_ARGS(PF_fetch_opcode)
     opcode_t o;
     if (!pf || !pf->fetch_op)
         return *(*stream)++;
@@ -490,7 +490,7 @@
 opcode_t*
 PF_store_opcode(ARGOUT(opcode_t *cursor), opcode_t val)
 {
-    ASSERT_ARGS(PF_store_opcode);
+    ASSERT_ARGS(PF_store_opcode)
     *cursor++ = val;
     return cursor;
 }
@@ -510,7 +510,7 @@
 size_t
 PF_size_opcode(void)
 {
-    ASSERT_ARGS(PF_size_opcode);
+    ASSERT_ARGS(PF_size_opcode)
     return 1;
 }
 
@@ -531,7 +531,7 @@
 INTVAL
 PF_fetch_integer(ARGIN_NULLOK(PackFile *pf), ARGIN(const opcode_t **stream))
 {
-    ASSERT_ARGS(PF_fetch_integer);
+    ASSERT_ARGS(PF_fetch_integer)
     INTVAL i;
     if (!pf || pf->fetch_iv == NULL)
         return *(*stream)++;
@@ -560,7 +560,7 @@
 opcode_t*
 PF_store_integer(ARGOUT(opcode_t *cursor), INTVAL val)
 {
-    ASSERT_ARGS(PF_store_integer);
+    ASSERT_ARGS(PF_store_integer)
     *cursor++ = (opcode_t)val; /* XXX */
     return cursor;
 }
@@ -579,7 +579,7 @@
 size_t
 PF_size_integer(void)
 {
-    ASSERT_ARGS(PF_size_integer);
+    ASSERT_ARGS(PF_size_integer)
     return sizeof (INTVAL) / sizeof (opcode_t);
 }
 
@@ -598,7 +598,7 @@
 FLOATVAL
 PF_fetch_number(ARGIN_NULLOK(PackFile *pf), ARGIN(const opcode_t **stream))
 {
-    ASSERT_ARGS(PF_fetch_number);
+    ASSERT_ARGS(PF_fetch_number)
     /* When we have alignment all squared away we don't need
      * to use memcpy() for native byteorder.
      */
@@ -646,7 +646,7 @@
 opcode_t*
 PF_store_number(ARGOUT(opcode_t *cursor), ARGIN(const FLOATVAL *val))
 {
-    ASSERT_ARGS(PF_store_number);
+    ASSERT_ARGS(PF_store_number)
     opcode_t padded_size  = (sizeof (FLOATVAL) + sizeof (opcode_t) - 1) /
         sizeof (opcode_t);
     mem_sys_memcopy(cursor, val, sizeof (FLOATVAL));
@@ -668,7 +668,7 @@
 size_t
 PF_size_number(void)
 {
-    ASSERT_ARGS(PF_size_number);
+    ASSERT_ARGS(PF_size_number)
     return ROUND_UP(sizeof (FLOATVAL), sizeof (opcode_t));
 }
 
@@ -695,7 +695,7 @@
 STRING *
 PF_fetch_string(PARROT_INTERP, ARGIN_NULLOK(PackFile *pf), ARGIN(const opcode_t **cursor))
 {
-    ASSERT_ARGS(PF_fetch_string);
+    ASSERT_ARGS(PF_fetch_string)
     UINTVAL flags;
     opcode_t charset_nr;
     size_t size;
@@ -753,7 +753,7 @@
 opcode_t*
 PF_store_string(ARGOUT(opcode_t *cursor), ARGIN(const STRING *s))
 {
-    ASSERT_ARGS(PF_store_string);
+    ASSERT_ARGS(PF_store_string)
     opcode_t padded_size = s->bufused;
     char *charcursor;
 
@@ -811,7 +811,7 @@
 size_t
 PF_size_string(ARGIN(const STRING *s))
 {
-    ASSERT_ARGS(PF_size_string);
+    ASSERT_ARGS(PF_size_string)
     opcode_t padded_size = s->bufused;
 
     if (padded_size % sizeof (opcode_t)) {
@@ -837,7 +837,7 @@
 char *
 PF_fetch_cstring(ARGIN(PackFile *pf), ARGIN(const opcode_t **cursor))
 {
-    ASSERT_ARGS(PF_fetch_cstring);
+    ASSERT_ARGS(PF_fetch_cstring)
     const size_t str_len = strlen((const char *)(*cursor)) + 1;
     char * const p = (char *)mem_sys_allocate(str_len);
 
@@ -864,7 +864,7 @@
 opcode_t*
 PF_store_cstring(ARGOUT(opcode_t *cursor), ARGIN(const char *s))
 {
-    ASSERT_ARGS(PF_store_cstring);
+    ASSERT_ARGS(PF_store_cstring)
     strcpy((char *) cursor, s);
     return cursor + PF_size_cstring(s);
 }
@@ -883,7 +883,7 @@
 size_t
 PF_size_cstring(ARGIN(const char *s))
 {
-    ASSERT_ARGS(PF_size_cstring);
+    ASSERT_ARGS(PF_size_cstring)
     size_t str_len;
 
     PARROT_ASSERT(s);
@@ -904,7 +904,7 @@
 void
 PackFile_assign_transforms(ARGMOD(PackFile *pf))
 {
-    ASSERT_ARGS(PackFile_assign_transforms);
+    ASSERT_ARGS(PackFile_assign_transforms)
     const int need_endianize = pf->header->byteorder != PARROT_BIGENDIAN;
     const int need_wordsize  = pf->header->wordsize  != sizeof (opcode_t);
 

Modified: trunk/src/packout.c
==============================================================================
--- trunk/src/packout.c	(original)
+++ trunk/src/packout.c	Mon Jan  5 15:17:26 2009
@@ -41,7 +41,7 @@
 opcode_t
 PackFile_pack_size(PARROT_INTERP, ARGMOD(PackFile *self))
 {
-    ASSERT_ARGS(PackFile_pack_size);
+    ASSERT_ARGS(PackFile_pack_size)
     size_t size;
     size_t header_size = 0;
     PackFile_Directory * const dir = &self->directory;
@@ -85,7 +85,7 @@
 void
 PackFile_pack(PARROT_INTERP, ARGMOD(PackFile *self), ARGOUT(opcode_t *cursor))
 {
-    ASSERT_ARGS(PackFile_pack);
+    ASSERT_ARGS(PackFile_pack)
     opcode_t *ret;
 
     size_t size;
@@ -153,7 +153,7 @@
 size_t
 PackFile_ConstTable_pack_size(PARROT_INTERP, ARGIN(PackFile_Segment *seg))
 {
-    ASSERT_ARGS(PackFile_ConstTable_pack_size);
+    ASSERT_ARGS(PackFile_ConstTable_pack_size)
     opcode_t i;
     const PackFile_ConstTable* const self = (const PackFile_ConstTable *) seg;
     size_t size = 1;    /* const_count */
@@ -186,7 +186,7 @@
 PackFile_ConstTable_pack(PARROT_INTERP,
         ARGIN(PackFile_Segment *seg), ARGMOD(opcode_t *cursor))
 {
-    ASSERT_ARGS(PackFile_ConstTable_pack);
+    ASSERT_ARGS(PackFile_ConstTable_pack)
     const PackFile_ConstTable * const self = (const PackFile_ConstTable *)seg;
     opcode_t i;
 
@@ -214,7 +214,7 @@
 PackFile_find_in_const(PARROT_INTERP,
         ARGIN(const PackFile_ConstTable *ct), ARGIN(const PMC *key), int type)
 {
-    ASSERT_ARGS(PackFile_find_in_const);
+    ASSERT_ARGS(PackFile_find_in_const)
     int i;
     for (i = 0; i < ct->const_count; i++)
         if (type == PFC_STRING && ct->constants[i]->u.string ==
@@ -254,7 +254,7 @@
         ARGIN(const PackFile_ConstTable *const_table),
         ARGIN(const PackFile_Constant *self), ARGOUT(opcode_t *cursor))
 {
-    ASSERT_ARGS(PackFile_Constant_pack);
+    ASSERT_ARGS(PackFile_Constant_pack)
     PMC *key;
     size_t i;
     opcode_t slice_bits;

Modified: trunk/src/pbc_merge.c
==============================================================================
--- trunk/src/pbc_merge.c	(original)
+++ trunk/src/pbc_merge.c	Mon Jan  5 15:17:26 2009
@@ -240,7 +240,7 @@
 static PackFile*
 pbc_merge_loadpbc(PARROT_INTERP, ARGIN(const char *fullname))
 {
-    ASSERT_ARGS(pbc_merge_loadpbc);
+    ASSERT_ARGS(pbc_merge_loadpbc)
     INTVAL program_size, wanted;
     char *program_code;
     PackFile *pf;
@@ -332,7 +332,7 @@
 pbc_merge_bytecode(PARROT_INTERP, ARGMOD(pbc_merge_input **inputs),
                    int num_inputs, ARGMOD(PackFile *pf))
 {
-    ASSERT_ARGS(pbc_merge_bytecode);
+    ASSERT_ARGS(pbc_merge_bytecode)
     int i;
     opcode_t *bc = mem_allocate_typed(opcode_t);
     opcode_t cursor = 0;
@@ -397,7 +397,7 @@
 pbc_merge_constants(PARROT_INTERP, ARGMOD(pbc_merge_input **inputs),
                     int num_inputs, ARGMOD(PackFile *pf), ARGMOD(PackFile_ByteCode *bc))
 {
-    ASSERT_ARGS(pbc_merge_constants);
+    ASSERT_ARGS(pbc_merge_constants)
     int i, j;
     PackFile_Constant   **constants = mem_allocate_typed(PackFile_Constant *);
     opcode_t cursor = 0;
@@ -493,7 +493,7 @@
 pbc_merge_fixups(PARROT_INTERP, ARGIN(pbc_merge_input **inputs),
                  int num_inputs, ARGMOD(PackFile *pf), ARGMOD(PackFile_ByteCode *bc))
 {
-    ASSERT_ARGS(pbc_merge_fixups);
+    ASSERT_ARGS(pbc_merge_fixups)
     int i, j;
     PackFile_FixupTable *fixup_seg;
     PackFile_FixupEntry **fixups = mem_allocate_typed(PackFile_FixupEntry *);
@@ -589,7 +589,7 @@
 pbc_merge_debugs(PARROT_INTERP, ARGMOD(pbc_merge_input **inputs),
                  int num_inputs, ARGMOD(PackFile *pf), ARGMOD(PackFile_ByteCode *bc))
 {
-    ASSERT_ARGS(pbc_merge_debugs);
+    ASSERT_ARGS(pbc_merge_debugs)
     int i, j;
     PackFile_Debug *debug_seg;
     opcode_t *lines                  = mem_allocate_typed(opcode_t);
@@ -660,7 +660,7 @@
 pbc_merge_pic_index(PARROT_INTERP, ARGMOD(pbc_merge_input **inputs),
                  int num_inputs, ARGMOD(PackFile *pf), ARGMOD(PackFile_ByteCode *bc))
 {
-    ASSERT_ARGS(pbc_merge_pic_index);
+    ASSERT_ARGS(pbc_merge_pic_index)
     int i;
     PackFile_Segment *pic_index;
     size_t size;
@@ -713,7 +713,7 @@
 pbc_merge_ctpointers(PARROT_INTERP, ARGMOD(pbc_merge_input **inputs),
                      int num_inputs, ARGMOD(PackFile_ByteCode *bc))
 {
-    ASSERT_ARGS(pbc_merge_ctpointers);
+    ASSERT_ARGS(pbc_merge_ctpointers)
     int        cur_arg;
     opcode_t  *op_ptr;
     opcode_t  *ops       = bc->base.data;
@@ -796,7 +796,7 @@
 static PackFile*
 pbc_merge_begin(PARROT_INTERP, ARGMOD(pbc_merge_input **inputs), int num_inputs)
 {
-    ASSERT_ARGS(pbc_merge_begin);
+    ASSERT_ARGS(pbc_merge_begin)
     PackFile_ByteCode   *bc;
     PackFile_ConstTable *ct;
 
@@ -837,7 +837,7 @@
 static void
 pbc_merge_write(PARROT_INTERP, ARGMOD(PackFile *pf), ARGIN(const char *filename))
 {
-    ASSERT_ARGS(pbc_merge_write);
+    ASSERT_ARGS(pbc_merge_write)
     FILE     *fp;
 
     /* Get size of packfile we'll write. */

Modified: trunk/src/pic.c
==============================================================================
--- trunk/src/pic.c	(original)
+++ trunk/src/pic.c	Mon Jan  5 15:17:26 2009
@@ -257,7 +257,7 @@
 void
 parrot_PIC_alloc_store(ARGOUT(PackFile_ByteCode *cs), size_t n)
 {
-    ASSERT_ARGS(parrot_PIC_alloc_store);
+    ASSERT_ARGS(parrot_PIC_alloc_store)
     Parrot_PIC_store *store;
     size_t size;
 
@@ -295,7 +295,7 @@
 void
 parrot_PIC_destroy(ARGMOD(PackFile_ByteCode *cs))
 {
-    ASSERT_ARGS(parrot_PIC_destroy);
+    ASSERT_ARGS(parrot_PIC_destroy)
     Parrot_PIC_store *store = cs->pic_store;
 
     while (store) {
@@ -321,7 +321,7 @@
 int
 parrot_PIC_op_is_cached(int op_code)
 {
-    ASSERT_ARGS(parrot_PIC_op_is_cached);
+    ASSERT_ARGS(parrot_PIC_op_is_cached)
     switch (op_code) {
         case PARROT_OP_get_params_pc:
         case PARROT_OP_set_returns_pc:
@@ -348,7 +348,7 @@
 Parrot_MIC*
 parrot_PIC_alloc_mic(const PARROT_INTERP, size_t n)
 {
-    ASSERT_ARGS(parrot_PIC_alloc_mic);
+    ASSERT_ARGS(parrot_PIC_alloc_mic)
     Parrot_PIC_store * const store = interp->code->pic_store;
     PARROT_ASSERT(n < store->n_mics);
     return store->mic + n;
@@ -370,7 +370,7 @@
 Parrot_PIC*
 parrot_PIC_alloc_pic(PARROT_INTERP)
 {
-    ASSERT_ARGS(parrot_PIC_alloc_pic);
+    ASSERT_ARGS(parrot_PIC_alloc_pic)
     Parrot_PIC_store *store = interp->code->pic_store;
     Parrot_PIC_store *new_store;
 
@@ -415,7 +415,7 @@
 void *
 parrot_pic_opcode(PARROT_INTERP, INTVAL op)
 {
-    ASSERT_ARGS(parrot_pic_opcode);
+    ASSERT_ARGS(parrot_pic_opcode)
 #ifdef HAVE_COMPUTED_GOTO
     op_lib_t *cg_lib;
 #endif
@@ -445,7 +445,7 @@
 pass_int(SHIM_INTERP, ARGIN(const PMC *sig), ARGIN(const char *src_base),
         ARGIN(const void **src), ARGOUT(char *dest_base), ARGIN(void * const *dest))
 {
-    ASSERT_ARGS(pass_int);
+    ASSERT_ARGS(pass_int)
     int i;
     int n = SIG_ELEMS(sig);
 
@@ -470,7 +470,7 @@
 pass_num(SHIM_INTERP, ARGIN(const PMC *sig), ARGIN(const char *src_base),
         ARGIN(const void **src), ARGOUT(char *dest_base), ARGIN(void * const *dest))
 {
-    ASSERT_ARGS(pass_num);
+    ASSERT_ARGS(pass_num)
     int i;
     int n = SIG_ELEMS(sig);
 
@@ -495,7 +495,7 @@
 pass_str(PARROT_INTERP, ARGIN(const PMC *sig), ARGIN(const char *src_base),
         ARGIN(const void **src), ARGOUT(char *dest_base), ARGIN(void * const *dest))
 {
-    ASSERT_ARGS(pass_str);
+    ASSERT_ARGS(pass_str)
     int i;
     int n = SIG_ELEMS(sig);
 
@@ -521,7 +521,7 @@
 pass_pmc(SHIM_INTERP, ARGIN(const PMC *sig), ARGIN(const char *src_base),
         ARGIN(const void **src), ARGOUT(char *dest_base), ARGIN(void * const *dest))
 {
-    ASSERT_ARGS(pass_pmc);
+    ASSERT_ARGS(pass_pmc)
     int i;
     int n = SIG_ELEMS(sig);
 
@@ -546,7 +546,7 @@
 pass_mixed(PARROT_INTERP, ARGIN(const PMC *sig), ARGIN(const char *src_base),
         ARGIN(void * const *src), ARGOUT(char *dest_base), ARGIN(void * const *dest))
 {
-    ASSERT_ARGS(pass_mixed);
+    ASSERT_ARGS(pass_mixed)
     int i;
     INTVAL *bitp;
     int n = SIG_ELEMS(sig);
@@ -633,7 +633,7 @@
 parrot_pic_check_sig(ARGIN(const PMC *sig1), ARGIN(const PMC *sig2),
         ARGOUT(int *type))
 {
-    ASSERT_ARGS(parrot_pic_check_sig);
+    ASSERT_ARGS(parrot_pic_check_sig)
     int i, n, t0;
 
     ASSERT_SIG_PMC(sig1);
@@ -700,7 +700,7 @@
 static int
 is_pic_param(PARROT_INTERP, ARGIN(void **pc), ARGOUT(Parrot_MIC *mic), opcode_t op)
 {
-    ASSERT_ARGS(is_pic_param);
+    ASSERT_ARGS(is_pic_param)
     PMC                           *sig2;
     Parrot_Context                *caller_ctx;
     opcode_t                      *args;
@@ -784,7 +784,7 @@
 static int
 is_pic_func(PARROT_INTERP, ARGIN(void **pc), ARGOUT(Parrot_MIC *mic), int core_type)
 {
-    ASSERT_ARGS(is_pic_func);
+    ASSERT_ARGS(is_pic_func)
     /*
      * if we have these opcodes
      *
@@ -861,7 +861,7 @@
 void
 parrot_PIC_prederef(PARROT_INTERP, opcode_t op, ARGOUT(void **pc_pred), int core)
 {
-    ASSERT_ARGS(parrot_PIC_prederef);
+    ASSERT_ARGS(parrot_PIC_prederef)
     op_func_t * const prederef_op_func = interp->op_lib->op_func_table;
     opcode_t  * const cur_opcode       = (opcode_t *)pc_pred;
     Parrot_MIC       *mic              = NULL;
@@ -923,7 +923,7 @@
 static void
 parrot_pic_move(PARROT_INTERP, ARGMOD(Parrot_MIC *mic))
 {
-    ASSERT_ARGS(parrot_pic_move);
+    ASSERT_ARGS(parrot_pic_move)
     /* MIC slot is empty - use it */
     if (!mic->lru.u.type)
         return;
@@ -960,7 +960,7 @@
 parrot_pic_find_infix_v_pp(PARROT_INTERP, ARGIN(PMC *left), ARGIN(PMC *right),
                 ARGOUT(Parrot_MIC *mic), ARGOUT(opcode_t *cur_opcode))
 {
-    ASSERT_ARGS(parrot_pic_find_infix_v_pp);
+    ASSERT_ARGS(parrot_pic_find_infix_v_pp)
     /* unused; deprecated */
 }
 

Modified: trunk/src/pic_jit.c
==============================================================================
--- trunk/src/pic_jit.c	(original)
+++ trunk/src/pic_jit.c	Mon Jan  5 15:17:26 2009
@@ -167,7 +167,7 @@
 static opcode_t *
 pic_test_func(PARROT_INTERP, SHIM(INTVAL *sig_bits), ARGOUT(void **args))
 {
-    ASSERT_ARGS(pic_test_func);
+    ASSERT_ARGS(pic_test_func)
     INTVAL * const result = (INTVAL*) args[0];
     INTVAL   const i      = (INTVAL) args[1];
     INTVAL   const j      = (INTVAL) args[2];
@@ -194,7 +194,7 @@
 static int
 jit_can_compile_sub(PARROT_INTERP, ARGIN(const PMC *sub))
 {
-    ASSERT_ARGS(jit_can_compile_sub);
+    ASSERT_ARGS(jit_can_compile_sub)
     const jit_arch_info * const info = Parrot_jit_init(interp);
     const jit_arch_regs * const regs = info->regs + JIT_CODE_SUB_REGS_ONLY;
     INTVAL * const n_regs_used       = PMC_sub(sub)->n_regs_used;
@@ -238,7 +238,7 @@
 args_match_params(ARGIN(const PMC *sig_args), ARGIN(const PackFile_ByteCode *seg),
     ARGIN(const opcode_t *start))
 {
-    ASSERT_ARGS(args_match_params);
+    ASSERT_ARGS(args_match_params)
     const PMC *sig_params;
     int n, type;
 
@@ -287,7 +287,7 @@
 static int
 returns_match_results(ARGIN(const PMC *sig_ret), ARGIN(const PMC *sig_result))
 {
-    ASSERT_ARGS(returns_match_results);
+    ASSERT_ARGS(returns_match_results)
     int type;
     const int n = parrot_pic_check_sig(sig_ret, sig_result, &type);
 
@@ -326,7 +326,7 @@
 static int
 call_is_safe(ARGIN(const PMC *sub), ARGMOD(opcode_t **set_args))
 {
-    ASSERT_ARGS(call_is_safe);
+    ASSERT_ARGS(call_is_safe)
     PMC *called, *sig_results;
 
     opcode_t * pc        = *set_args;
@@ -379,7 +379,7 @@
         ARGIN(const PackFile_ByteCode *seg), ARGIN(opcode_t *pc),
         ARGIN(const opcode_t *end), ARGOUT(int *flags))
 {
-    ASSERT_ARGS(ops_jittable);
+    ASSERT_ARGS(ops_jittable)
     while (pc < end) {
         /* special opcodes which are handled, but not marked as JITtable */
         int i;
@@ -454,7 +454,7 @@
 parrot_pic_is_safe_to_jit(PARROT_INTERP, ARGIN(const PMC *sub), ARGIN(const PMC *sig_args),
         ARGIN(const PMC *sig_results), ARGOUT(int *flags))
 {
-    ASSERT_ARGS(parrot_pic_is_safe_to_jit);
+    ASSERT_ARGS(parrot_pic_is_safe_to_jit)
 #ifdef HAS_JIT
     opcode_t *base, *start, *end;
 
@@ -517,7 +517,7 @@
 funcptr_t
 parrot_pic_JIT_sub(PARROT_INTERP, ARGIN(const PMC *sub), int flags)
 {
-    ASSERT_ARGS(parrot_pic_JIT_sub);
+    ASSERT_ARGS(parrot_pic_JIT_sub)
 #ifdef HAS_JIT
 #  ifdef PIC_TEST
     UNUSED(interp);

Modified: trunk/src/pmc.c
==============================================================================
--- trunk/src/pmc.c	(original)
+++ trunk/src/pmc.c	Mon Jan  5 15:17:26 2009
@@ -83,7 +83,7 @@
 INTVAL
 PMC_is_null(SHIM_INTERP, ARGIN_NULLOK(const PMC *pmc))
 {
-    ASSERT_ARGS(PMC_is_null);
+    ASSERT_ARGS(PMC_is_null)
 #if PARROT_CATCH_NULL
     return pmc == PMCNULL || pmc == NULL;
 #else
@@ -110,7 +110,7 @@
 PMC *
 pmc_new(PARROT_INTERP, INTVAL base_type)
 {
-    ASSERT_ARGS(pmc_new);
+    ASSERT_ARGS(pmc_new)
     PARROT_ASSERT(interp->vtables[base_type]);
     {
         PMC *const classobj = interp->vtables[base_type]->pmc_class;
@@ -145,7 +145,7 @@
 pmc_reuse(PARROT_INTERP, ARGIN(PMC *pmc), INTVAL new_type,
           SHIM(UINTVAL flags))
 {
-    ASSERT_ARGS(pmc_reuse);
+    ASSERT_ARGS(pmc_reuse)
     VTABLE *new_vtable;
     INTVAL  has_ext, new_flags;
 
@@ -233,7 +233,7 @@
 static PMC *
 get_new_pmc_header(PARROT_INTERP, INTVAL base_type, UINTVAL flags)
 {
-    ASSERT_ARGS(get_new_pmc_header);
+    ASSERT_ARGS(get_new_pmc_header)
     PMC    *pmc;
     VTABLE *vtable = interp->vtables[base_type];
     UINTVAL vtable_flags;
@@ -333,7 +333,7 @@
 PMC *
 pmc_new_noinit(PARROT_INTERP, INTVAL base_type)
 {
-    ASSERT_ARGS(pmc_new_noinit);
+    ASSERT_ARGS(pmc_new_noinit)
     PMC *const classobj = interp->vtables[base_type]->pmc_class;
 
     if (!PMC_IS_NULL(classobj) && PObj_is_class_TEST(classobj))
@@ -358,7 +358,7 @@
 PMC *
 constant_pmc_new_noinit(PARROT_INTERP, INTVAL base_type)
 {
-    ASSERT_ARGS(constant_pmc_new_noinit);
+    ASSERT_ARGS(constant_pmc_new_noinit)
     return get_new_pmc_header(interp, base_type, PObj_constant_FLAG);
 }
 
@@ -378,7 +378,7 @@
 PMC *
 constant_pmc_new(PARROT_INTERP, INTVAL base_type)
 {
-    ASSERT_ARGS(constant_pmc_new);
+    ASSERT_ARGS(constant_pmc_new)
     PMC * const pmc = get_new_pmc_header(interp, base_type, PObj_constant_FLAG);
     VTABLE_init(interp, pmc);
     return pmc;
@@ -400,7 +400,7 @@
 PMC *
 pmc_new_init(PARROT_INTERP, INTVAL base_type, ARGOUT(PMC *init))
 {
-    ASSERT_ARGS(pmc_new_init);
+    ASSERT_ARGS(pmc_new_init)
     PMC *const classobj = interp->vtables[base_type]->pmc_class;
 
     if (!PMC_IS_NULL(classobj) && PObj_is_class_TEST(classobj))
@@ -429,7 +429,7 @@
 PMC *
 constant_pmc_new_init(PARROT_INTERP, INTVAL base_type, ARGIN_NULLOK(PMC *init))
 {
-    ASSERT_ARGS(constant_pmc_new_init);
+    ASSERT_ARGS(constant_pmc_new_init)
     PMC * const pmc = get_new_pmc_header(interp, base_type, PObj_constant_FLAG);
     VTABLE_init_pmc(interp, pmc, init);
     return pmc;
@@ -464,7 +464,7 @@
 PMC *
 temporary_pmc_new(PARROT_INTERP, INTVAL base_type)
 {
-    ASSERT_ARGS(temporary_pmc_new);
+    ASSERT_ARGS(temporary_pmc_new)
     PMC * const pmc = get_new_pmc_header(interp, base_type, PObj_constant_FLAG);
     VTABLE_init(interp, pmc);
     return pmc;
@@ -488,7 +488,7 @@
 pmc_free_to_pool(PARROT_INTERP, ARGMOD(PMC *pmc),
     ARGMOD(Small_Object_Pool *pool))
 {
-    ASSERT_ARGS(pmc_free_to_pool);
+    ASSERT_ARGS(pmc_free_to_pool)
     if (PObj_active_destroy_TEST(pmc))
         VTABLE_destroy(interp, pmc);
 
@@ -504,7 +504,7 @@
 void
 temporary_pmc_free(PARROT_INTERP, ARGMOD(PMC *pmc))
 {
-    ASSERT_ARGS(temporary_pmc_free);
+    ASSERT_ARGS(temporary_pmc_free)
     Small_Object_Pool *pool = interp->arena_base->constant_pmc_pool;
     pmc_free_to_pool(interp, pmc, pool);
 }
@@ -512,7 +512,7 @@
 static void
 pmc_free(PARROT_INTERP, ARGMOD(PMC *pmc))
 {
-    ASSERT_ARGS(pmc_free);
+    ASSERT_ARGS(pmc_free)
     Small_Object_Pool *pool = interp->arena_base->pmc_pool;
     pmc_free_to_pool(interp, pmc, pool);
 
@@ -522,7 +522,7 @@
 INTVAL
 get_new_vtable_index(PARROT_INTERP)
 {
-    ASSERT_ARGS(get_new_vtable_index);
+    ASSERT_ARGS(get_new_vtable_index)
     const INTVAL typeid = interp->n_vtable_max++;
 
     /* Have we overflowed the table? */
@@ -547,7 +547,7 @@
 INTVAL
 pmc_register(PARROT_INTERP, ARGIN(STRING *name))
 {
-    ASSERT_ARGS(pmc_register);
+    ASSERT_ARGS(pmc_register)
     /* If they're looking to register an existing class, return that
        class' type number */
     INTVAL type = pmc_type(interp, name);
@@ -583,7 +583,7 @@
 INTVAL
 pmc_type(PARROT_INTERP, ARGIN_NULLOK(STRING *name))
 {
-    ASSERT_ARGS(pmc_type);
+    ASSERT_ARGS(pmc_type)
     if (!name)
         return enum_type_undef;
     else {
@@ -617,7 +617,7 @@
 INTVAL
 pmc_type_p(PARROT_INTERP, ARGIN(PMC *name))
 {
-    ASSERT_ARGS(pmc_type_p);
+    ASSERT_ARGS(pmc_type_p)
     PMC * const classname_hash = interp->class_hash;
     PMC * const item           =
         (PMC *)VTABLE_get_pointer_keyed(interp, classname_hash, name);
@@ -645,7 +645,7 @@
 static PMC *
 create_class_pmc(PARROT_INTERP, INTVAL type)
 {
-    ASSERT_ARGS(create_class_pmc);
+    ASSERT_ARGS(create_class_pmc)
     /*
      * class interface - a PMC is its own class
      * put an instance of this PMC into class
@@ -694,7 +694,7 @@
 void
 Parrot_create_mro(PARROT_INTERP, INTVAL type)
 {
-    ASSERT_ARGS(Parrot_create_mro);
+    ASSERT_ARGS(Parrot_create_mro)
     PMC    *_class, *mro;
     VTABLE *vtable   = interp->vtables[type];
     PMC    *mro_list = vtable->mro;
@@ -765,7 +765,7 @@
 void
 dod_register_pmc(PARROT_INTERP, ARGIN(PMC *pmc))
 {
-    ASSERT_ARGS(dod_register_pmc);
+    ASSERT_ARGS(dod_register_pmc)
     /* Better not trigger a DOD run with a potentially unanchored PMC */
     Parrot_block_GC_mark(interp);
 
@@ -789,7 +789,7 @@
 void
 dod_unregister_pmc(PARROT_INTERP, ARGIN(PMC *pmc))
 {
-    ASSERT_ARGS(dod_unregister_pmc);
+    ASSERT_ARGS(dod_unregister_pmc)
     PARROT_ASSERT(interp->DOD_registry);
 
     VTABLE_delete_keyed(interp, interp->DOD_registry, pmc);

Modified: trunk/src/pmc_freeze.c
==============================================================================
--- trunk/src/pmc_freeze.c	(original)
+++ trunk/src/pmc_freeze.c	Mon Jan  5 15:17:26 2009
@@ -480,7 +480,7 @@
 static void
 str_append(PARROT_INTERP, ARGMOD(STRING *s), ARGIN(const void *b), size_t len)
 {
-    ASSERT_ARGS(str_append);
+    ASSERT_ARGS(str_append)
     const size_t used = s->bufused;
     const int need_free = (int)PObj_buflen(s) - used - len;
     /*
@@ -512,7 +512,7 @@
 static void
 push_ascii_integer(PARROT_INTERP, ARGIN(IMAGE_IO *io), INTVAL v)
 {
-    ASSERT_ARGS(push_ascii_integer);
+    ASSERT_ARGS(push_ascii_integer)
     char buffer[20];
     const size_t len = snprintf(buffer, sizeof (buffer), "%d ", (int) v);
     str_append(interp, io->image, buffer, len);
@@ -532,7 +532,7 @@
 static void
 push_ascii_number(PARROT_INTERP, ARGIN(const IMAGE_IO *io), FLOATVAL v)
 {
-    ASSERT_ARGS(push_ascii_number);
+    ASSERT_ARGS(push_ascii_number)
     char buffer[40];
     const size_t len = snprintf(buffer, sizeof (buffer), "%g ", (double) v);
     str_append(interp, io->image, buffer, len);
@@ -556,7 +556,7 @@
 static void
 push_ascii_string(PARROT_INTERP, ARGIN(IMAGE_IO *io), ARGIN(const STRING *s))
 {
-    ASSERT_ARGS(push_ascii_string);
+    ASSERT_ARGS(push_ascii_string)
     const UINTVAL length = string_length(interp, s);
     char * const buffer = (char *)malloc(4*length); /* XXX Why 4?  What does that mean? */
     char *cursor = buffer;
@@ -587,7 +587,7 @@
 static void
 push_ascii_pmc(PARROT_INTERP, ARGIN(IMAGE_IO *io), ARGIN(const PMC* v))
 {
-    ASSERT_ARGS(push_ascii_pmc);
+    ASSERT_ARGS(push_ascii_pmc)
     char buffer[20];
     const size_t len = snprintf(buffer, sizeof (buffer), "%p ", (const void *)v);
     str_append(interp, io->image, buffer, len);
@@ -606,7 +606,7 @@
 static INTVAL
 shift_ascii_integer(SHIM_INTERP, ARGIN(IMAGE_IO *io))
 {
-    ASSERT_ARGS(shift_ascii_integer);
+    ASSERT_ARGS(shift_ascii_integer)
     char * const start = (char*)io->image->strstart;
     char *p = start;
     const INTVAL i = strtoul(p, &p, 10);
@@ -632,7 +632,7 @@
 static FLOATVAL
 shift_ascii_number(SHIM_INTERP, ARGIN(IMAGE_IO *io))
 {
-    ASSERT_ARGS(shift_ascii_number);
+    ASSERT_ARGS(shift_ascii_number)
     char * const start = (char*)io->image->strstart;
     char *p = start;
     const FLOATVAL f = (FLOATVAL) strtod(p, &p);
@@ -660,7 +660,7 @@
 static STRING*
 shift_ascii_string(PARROT_INTERP, ARGIN(IMAGE_IO *io))
 {
-    ASSERT_ARGS(shift_ascii_string);
+    ASSERT_ARGS(shift_ascii_string)
     STRING *s;
 
     char * const start = (char*)io->image->strstart;
@@ -693,7 +693,7 @@
 static PMC*
 shift_ascii_pmc(SHIM_INTERP, ARGIN(IMAGE_IO *io))
 {
-    ASSERT_ARGS(shift_ascii_pmc);
+    ASSERT_ARGS(shift_ascii_pmc)
     char * const start = (char*)io->image->strstart;
     char *p = start;
     const unsigned long i = strtoul(p, &p, 16);
@@ -726,7 +726,7 @@
 static void
 op_check_size(PARROT_INTERP, ARGIN(STRING *s), size_t len)
 {
-    ASSERT_ARGS(op_check_size);
+    ASSERT_ARGS(op_check_size)
     const size_t used = s->bufused;
     const int need_free = (int)PObj_buflen(s) - used - len;
     /*
@@ -757,7 +757,7 @@
 static void
 op_append(PARROT_INTERP, ARGIN(STRING *s), opcode_t b, size_t len)
 {
-    ASSERT_ARGS(op_append);
+    ASSERT_ARGS(op_append)
     op_check_size(interp, s, len);
     *((opcode_t *)((ptrcast_t)s->strstart + s->bufused)) = b;
     s->bufused += len;
@@ -779,7 +779,7 @@
 static void
 push_opcode_integer(PARROT_INTERP, ARGIN(IMAGE_IO *io), INTVAL v)
 {
-    ASSERT_ARGS(push_opcode_integer);
+    ASSERT_ARGS(push_opcode_integer)
     PARROT_ASSERT(sizeof (opcode_t) == sizeof (INTVAL));
     op_append(interp, io->image, (opcode_t)v, sizeof (opcode_t));
 }
@@ -797,7 +797,7 @@
 static void
 push_opcode_number(PARROT_INTERP, ARGIN(IMAGE_IO *io), FLOATVAL v)
 {
-    ASSERT_ARGS(push_opcode_number);
+    ASSERT_ARGS(push_opcode_number)
     const size_t   len  = PF_size_number() * sizeof (opcode_t);
     STRING * const s    = io->image;
     const size_t   used = s->bufused;
@@ -824,7 +824,7 @@
 static void
 push_opcode_string(PARROT_INTERP, ARGIN(IMAGE_IO *io), ARGIN(STRING *v))
 {
-    ASSERT_ARGS(push_opcode_string);
+    ASSERT_ARGS(push_opcode_string)
     const size_t len = PF_size_string(v) * sizeof (opcode_t);
     STRING * const s = io->image;
     const size_t used = s->bufused;
@@ -851,7 +851,7 @@
 static void
 push_opcode_pmc(PARROT_INTERP, ARGIN(IMAGE_IO *io), ARGIN(PMC* v))
 {
-    ASSERT_ARGS(push_opcode_pmc);
+    ASSERT_ARGS(push_opcode_pmc)
     op_append(interp, io->image, (opcode_t)v, sizeof (opcode_t));
 }
 
@@ -871,7 +871,7 @@
 static INTVAL
 shift_opcode_integer(SHIM_INTERP, ARGIN(IMAGE_IO *io))
 {
-    ASSERT_ARGS(shift_opcode_integer);
+    ASSERT_ARGS(shift_opcode_integer)
     const char * const   start  = (char *)io->image->strstart;
     char               **opcode = &io->image->strstart;
     const INTVAL i              = PF_fetch_integer(io->pf,
@@ -900,7 +900,7 @@
 static PMC*
 shift_opcode_pmc(PARROT_INTERP, ARGIN(IMAGE_IO *io))
 {
-    ASSERT_ARGS(shift_opcode_pmc);
+    ASSERT_ARGS(shift_opcode_pmc)
     INTVAL i = shift_opcode_integer(interp, io);
     return (PMC *)i;
 }
@@ -918,7 +918,7 @@
 static FLOATVAL
 shift_opcode_number(SHIM_INTERP, ARGIN(IMAGE_IO *io))
 {
-    ASSERT_ARGS(shift_opcode_number);
+    ASSERT_ARGS(shift_opcode_number)
     const char * const   start  = (const char *)io->image->strstart;
     char               **opcode = &io->image->strstart;
     const FLOATVAL       f      = PF_fetch_number(io->pf,
@@ -945,7 +945,7 @@
 static STRING*
 shift_opcode_string(PARROT_INTERP, ARGIN(IMAGE_IO *io))
 {
-    ASSERT_ARGS(shift_opcode_string);
+    ASSERT_ARGS(shift_opcode_string)
     char * const   start  = (char*)io->image->strstart;
     char         **opcode = &io->image->strstart;
     STRING * const s      = PF_fetch_string(interp, io->pf,
@@ -976,7 +976,7 @@
 static void
 pmc_add_ext(PARROT_INTERP, ARGIN(PMC *pmc))
 {
-    ASSERT_ARGS(pmc_add_ext);
+    ASSERT_ARGS(pmc_add_ext)
     if (pmc->vtable->flags & VTABLE_PMC_NEEDS_EXT)
         add_pmc_ext(interp, pmc);
 }
@@ -994,7 +994,7 @@
 static void
 cleanup_next_for_GC_pool(ARGIN(Small_Object_Pool *pool))
 {
-    ASSERT_ARGS(cleanup_next_for_GC_pool);
+    ASSERT_ARGS(cleanup_next_for_GC_pool)
     Small_Object_Arena *arena;
 
     for (arena = pool->last_Arena; arena; arena = arena->prev) {
@@ -1024,7 +1024,7 @@
 static void
 cleanup_next_for_GC(PARROT_INTERP)
 {
-    ASSERT_ARGS(cleanup_next_for_GC);
+    ASSERT_ARGS(cleanup_next_for_GC)
     cleanup_next_for_GC_pool(interp->arena_base->pmc_pool);
     cleanup_next_for_GC_pool(interp->arena_base->constant_pmc_pool);
 }
@@ -1072,7 +1072,7 @@
 static void
 ft_init(PARROT_INTERP, ARGIN(visit_info *info))
 {
-    ASSERT_ARGS(ft_init);
+    ASSERT_ARGS(ft_init)
     STRING *s = info->image;
     PackFile *pf;
 
@@ -1130,7 +1130,7 @@
 static void
 todo_list_init(PARROT_INTERP, ARGOUT(visit_info *info))
 {
-    ASSERT_ARGS(todo_list_init);
+    ASSERT_ARGS(todo_list_init)
     info->visit_pmc_now = visit_todo_list;
     info->visit_pmc_later = add_pmc_todo_list;
     /* we must use PMCs here, so that they get marked properly */
@@ -1157,7 +1157,7 @@
 freeze_pmc(PARROT_INTERP, ARGIN_NULLOK(PMC *pmc), ARGIN(visit_info *info),
         int seen, UINTVAL id)
 {
-    ASSERT_ARGS(freeze_pmc);
+    ASSERT_ARGS(freeze_pmc)
     IMAGE_IO * const io = info->image_io;
     INTVAL type;
 
@@ -1216,7 +1216,7 @@
 thaw_pmc(PARROT_INTERP, ARGMOD(visit_info *info),
         ARGOUT(UINTVAL *id), ARGOUT(INTVAL *type))
 {
-    ASSERT_ARGS(thaw_pmc);
+    ASSERT_ARGS(thaw_pmc)
     PMC *n;
     IMAGE_IO * const io = info->image_io;
     int seen = 0;
@@ -1268,7 +1268,7 @@
 do_action(PARROT_INTERP, ARGIN_NULLOK(PMC *pmc), ARGIN(visit_info *info),
         int seen, UINTVAL id)
 {
-    ASSERT_ARGS(do_action);
+    ASSERT_ARGS(do_action)
     switch (info->what) {
         case VISIT_FREEZE_AT_DESTRUCT:
         case VISIT_FREEZE_NORMAL:
@@ -1298,7 +1298,7 @@
 thaw_create_pmc(PARROT_INTERP, ARGIN(const visit_info *info),
         INTVAL type)
 {
-    ASSERT_ARGS(thaw_create_pmc);
+    ASSERT_ARGS(thaw_create_pmc)
     PMC *pmc;
     switch (info->what) {
         case VISIT_THAW_NORMAL:
@@ -1329,7 +1329,7 @@
 static void
 do_thaw(PARROT_INTERP, ARGIN_NULLOK(PMC* pmc), ARGIN(visit_info *info))
 {
-    ASSERT_ARGS(do_thaw);
+    ASSERT_ARGS(do_thaw)
     UINTVAL id;
     INTVAL type;
     PMC ** pos;
@@ -1427,7 +1427,7 @@
 static UINTVAL
 id_from_pmc(PARROT_INTERP, ARGIN(PMC* pmc))
 {
-    ASSERT_ARGS(id_from_pmc);
+    ASSERT_ARGS(id_from_pmc)
     UINTVAL id = 1;     /* first PMC in first arena */
     Small_Object_Arena *arena;
     Small_Object_Pool *pool;
@@ -1473,7 +1473,7 @@
 static void
 add_pmc_next_for_GC(SHIM_INTERP, ARGIN(PMC *pmc), ARGOUT(visit_info *info))
 {
-    ASSERT_ARGS(add_pmc_next_for_GC);
+    ASSERT_ARGS(add_pmc_next_for_GC)
     if (pmc->pmc_ext) {
         PMC_next_for_GC(info->mark_ptr) = pmc;
         info->mark_ptr = PMC_next_for_GC(pmc) = pmc;
@@ -1498,7 +1498,7 @@
 next_for_GC_seen(PARROT_INTERP, ARGIN_NULLOK(PMC *pmc),
         ARGIN(visit_info *info), ARGOUT(UINTVAL *id))
 {
-    ASSERT_ARGS(next_for_GC_seen);
+    ASSERT_ARGS(next_for_GC_seen)
     int seen = 0;
 
     if (PMC_IS_NULL(pmc)) {
@@ -1539,7 +1539,7 @@
 static void
 add_pmc_todo_list(PARROT_INTERP, ARGIN_NULLOK(PMC *pmc), ARGIN(visit_info *info))
 {
-    ASSERT_ARGS(add_pmc_todo_list);
+    ASSERT_ARGS(add_pmc_todo_list)
     list_push(interp, (List *)PMC_data(info->todo), pmc, enum_type_PMC);
 }
 
@@ -1560,7 +1560,7 @@
 todo_list_seen(PARROT_INTERP, ARGIN(PMC *pmc), ARGMOD(visit_info *info),
         ARGOUT(UINTVAL *id))
 {
-    ASSERT_ARGS(todo_list_seen);
+    ASSERT_ARGS(todo_list_seen)
     HashBucket * const b =
         parrot_hash_get_bucket(interp, (Hash *)PMC_struct_val(info->seen), pmc);
 
@@ -1594,7 +1594,7 @@
 static void
 visit_next_for_GC(PARROT_INTERP, ARGIN(PMC* pmc), ARGIN(visit_info* info))
 {
-    ASSERT_ARGS(visit_next_for_GC);
+    ASSERT_ARGS(visit_next_for_GC)
     UINTVAL id;
     const int seen = next_for_GC_seen(interp, pmc, info, &id);
     UNUSED(seen);
@@ -1626,7 +1626,7 @@
 static void
 visit_todo_list(PARROT_INTERP, ARGIN_NULLOK(PMC* pmc), ARGIN(visit_info* info))
 {
-    ASSERT_ARGS(visit_todo_list);
+    ASSERT_ARGS(visit_todo_list)
     UINTVAL id;
     int seen;
 
@@ -1656,7 +1656,7 @@
 static void
 visit_todo_list_thaw(PARROT_INTERP, ARGIN_NULLOK(PMC* old), ARGIN(visit_info* info))
 {
-    ASSERT_ARGS(visit_todo_list_thaw);
+    ASSERT_ARGS(visit_todo_list_thaw)
     do_thaw(interp, old, info);
 }
 
@@ -1675,7 +1675,7 @@
 visit_loop_next_for_GC(PARROT_INTERP, ARGIN(PMC *current),
         ARGIN(visit_info *info))
 {
-    ASSERT_ARGS(visit_loop_next_for_GC);
+    ASSERT_ARGS(visit_loop_next_for_GC)
     visit_next_for_GC(interp, current, info);
     if (current->pmc_ext) {
         PMC *prev = NULL;
@@ -1703,7 +1703,7 @@
 visit_loop_todo_list(PARROT_INTERP, ARGIN_NULLOK(PMC *current),
         ARGIN(visit_info *info))
 {
-    ASSERT_ARGS(visit_loop_todo_list);
+    ASSERT_ARGS(visit_loop_todo_list)
     PMC        **list_item;
     List        *finish_list    = NULL;
     List * const todo           = (List *)PMC_data(info->todo);
@@ -1779,7 +1779,7 @@
 static void
 create_image(PARROT_INTERP, ARGIN_NULLOK(PMC *pmc), ARGMOD(visit_info *info))
 {
-    ASSERT_ARGS(create_image);
+    ASSERT_ARGS(create_image)
     STRING *array = CONST_STRING(interp, "array");
     STRING *hash  = CONST_STRING(interp, "hash");
     INTVAL  len;
@@ -1821,7 +1821,7 @@
 static PMC*
 run_thaw(PARROT_INTERP, ARGIN(STRING* image), visit_enum_type what)
 {
-    ASSERT_ARGS(run_thaw);
+    ASSERT_ARGS(run_thaw)
     visit_info info;
     int dod_block = 0;
     const UINTVAL bufused = image->bufused;
@@ -1897,7 +1897,7 @@
 STRING*
 Parrot_freeze_at_destruct(PARROT_INTERP, ARGIN(PMC* pmc))
 {
-    ASSERT_ARGS(Parrot_freeze_at_destruct);
+    ASSERT_ARGS(Parrot_freeze_at_destruct)
     visit_info info;
 
     Parrot_block_GC_mark(interp);
@@ -1934,9 +1934,9 @@
 STRING*
 Parrot_freeze(PARROT_INTERP, ARGIN(PMC* pmc))
 {
-    ASSERT_ARGS(Parrot_freeze);
+    ASSERT_ARGS(Parrot_freeze)
 #if FREEZE_USE_NEXT_FOR_GC
-    ASSERT_ARGS(Parrot_freeze);
+    ASSERT_ARGS(Parrot_freeze)
     /*
      * we could do a DOD run here before, to free resources
      */
@@ -1977,7 +1977,7 @@
 PMC*
 Parrot_thaw(PARROT_INTERP, ARGIN(STRING* image))
 {
-    ASSERT_ARGS(Parrot_thaw);
+    ASSERT_ARGS(Parrot_thaw)
     return run_thaw(interp, image, VISIT_THAW_NORMAL);
 }
 
@@ -1998,7 +1998,7 @@
 PMC*
 Parrot_thaw_constants(PARROT_INTERP, ARGIN(STRING* image))
 {
-    ASSERT_ARGS(Parrot_thaw_constants);
+    ASSERT_ARGS(Parrot_thaw_constants)
     return run_thaw(interp, image, VISIT_THAW_CONSTANTS);
 }
 
@@ -2020,7 +2020,7 @@
 PMC*
 Parrot_clone(PARROT_INTERP, ARGIN(PMC* pmc))
 {
-    ASSERT_ARGS(Parrot_clone);
+    ASSERT_ARGS(Parrot_clone)
     return VTABLE_clone(interp, pmc);
 }
 

Modified: trunk/src/runops_cores.c
==============================================================================
--- trunk/src/runops_cores.c	(original)
+++ trunk/src/runops_cores.c	Mon Jan  5 15:17:26 2009
@@ -61,7 +61,7 @@
 opcode_t *
 runops_fast_core(PARROT_INTERP, ARGIN(opcode_t *pc))
 {
-    ASSERT_ARGS(runops_fast_core);
+    ASSERT_ARGS(runops_fast_core)
     while (pc) {
         DO_OP(pc, interp);
     }
@@ -89,7 +89,7 @@
 opcode_t *
 runops_cgoto_core(PARROT_INTERP, ARGIN(opcode_t *pc))
 {
-    ASSERT_ARGS(runops_cgoto_core);
+    ASSERT_ARGS(runops_cgoto_core)
 #ifdef HAVE_COMPUTED_GOTO
     pc = cg_core(pc, interp);
     return pc;
@@ -128,7 +128,7 @@
 static opcode_t *
 runops_trace_core(PARROT_INTERP, ARGIN(opcode_t *pc))
 {
-    ASSERT_ARGS(runops_trace_core);
+    ASSERT_ARGS(runops_trace_core)
     static size_t dod, gc;
     Arenas * const arena_base = interp->arena_base;
     Interp *debugger;
@@ -209,7 +209,7 @@
 opcode_t *
 runops_slow_core(PARROT_INTERP, ARGIN(opcode_t *pc))
 {
-    ASSERT_ARGS(runops_slow_core);
+    ASSERT_ARGS(runops_slow_core)
 
     if (Interp_trace_TEST(interp, PARROT_TRACE_OPS_FLAG))
         return runops_trace_core(interp, pc);
@@ -249,7 +249,7 @@
 opcode_t *
 runops_gc_debug_core(PARROT_INTERP, ARGIN(opcode_t *pc))
 {
-    ASSERT_ARGS(runops_gc_debug_core);
+    ASSERT_ARGS(runops_gc_debug_core)
     while (pc) {
         if (pc < code_start || pc >= code_end)
             Parrot_ex_throw_from_c_args(interp, NULL, 1,
@@ -284,7 +284,7 @@
 opcode_t *
 runops_profile_core(PARROT_INTERP, ARGIN(opcode_t *pc))
 {
-    ASSERT_ARGS(runops_profile_core);
+    ASSERT_ARGS(runops_profile_core)
     RunProfile * const profile = interp->profile;
     const opcode_t     old_op  = profile->cur_op;
 
@@ -332,7 +332,7 @@
 opcode_t *
 runops_debugger_core(PARROT_INTERP, ARGIN(opcode_t *pc))
 {
-    ASSERT_ARGS(runops_debugger_core);
+    ASSERT_ARGS(runops_debugger_core)
     /*fprintf(stderr, "Enter runops_debugger_core\n");*/
 
     PARROT_ASSERT(interp->pdb);

Modified: trunk/src/scheduler.c
==============================================================================
--- trunk/src/scheduler.c	(original)
+++ trunk/src/scheduler.c	Mon Jan  5 15:17:26 2009
@@ -72,7 +72,7 @@
 void
 Parrot_cx_init_scheduler(PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_cx_init_scheduler);
+    ASSERT_ARGS(Parrot_cx_init_scheduler)
     if (!interp->parent_interpreter) {
         PMC *scheduler;
 
@@ -99,7 +99,7 @@
 void
 Parrot_cx_check_tasks(PARROT_INTERP, ARGMOD(PMC *scheduler))
 {
-    ASSERT_ARGS(Parrot_cx_check_tasks);
+    ASSERT_ARGS(Parrot_cx_check_tasks)
     if (SCHEDULER_wake_requested_TEST(scheduler))
         Parrot_cx_handle_tasks(interp, interp->scheduler);
 }
@@ -120,7 +120,7 @@
 void
 Parrot_cx_handle_tasks(PARROT_INTERP, ARGMOD(PMC *scheduler))
 {
-    ASSERT_ARGS(Parrot_cx_handle_tasks);
+    ASSERT_ARGS(Parrot_cx_handle_tasks)
     SCHEDULER_wake_requested_CLEAR(scheduler);
     Parrot_cx_refresh_task_list(interp, scheduler);
 
@@ -175,7 +175,7 @@
 void
 Parrot_cx_refresh_task_list(PARROT_INTERP, ARGMOD(PMC *scheduler))
 {
-    ASSERT_ARGS(Parrot_cx_refresh_task_list);
+    ASSERT_ARGS(Parrot_cx_refresh_task_list)
     scheduler_process_wait_list(interp, scheduler);
     scheduler_process_messages(interp, scheduler);
 
@@ -199,7 +199,7 @@
 void
 Parrot_cx_runloop_wake(PARROT_INTERP, ARGMOD(PMC *scheduler))
 {
-    ASSERT_ARGS(Parrot_cx_runloop_wake);
+    ASSERT_ARGS(Parrot_cx_runloop_wake)
     enable_event_checking(interp);
     SCHEDULER_wake_requested_SET(scheduler);
 }
@@ -219,7 +219,7 @@
 void
 Parrot_cx_runloop_end(PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_cx_runloop_end);
+    ASSERT_ARGS(Parrot_cx_runloop_end)
     SCHEDULER_terminate_requested_SET(interp->scheduler);
     Parrot_cx_handle_tasks(interp, interp->scheduler);
 }
@@ -239,7 +239,7 @@
 void
 Parrot_cx_schedule_task(PARROT_INTERP, ARGIN(PMC *task))
 {
-    ASSERT_ARGS(Parrot_cx_schedule_task);
+    ASSERT_ARGS(Parrot_cx_schedule_task)
     if (!interp->scheduler)
         Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_INVALID_OPERATION,
             "Scheduler was not initialized for this interpreter.\n");
@@ -263,7 +263,7 @@
 PMC *
 Parrot_cx_peek_task(PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_cx_peek_task);
+    ASSERT_ARGS(Parrot_cx_peek_task)
     if (!interp->scheduler)
         Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_INVALID_OPERATION,
             "Scheduler was not initialized for this interpreter.\n");
@@ -288,7 +288,7 @@
         ARGIN_NULLOK(STRING *type), FLOATVAL duration, FLOATVAL interval,
         INTVAL repeat, ARGIN_NULLOK(PMC *sub))
 {
-    ASSERT_ARGS(Parrot_cx_schedule_timer);
+    ASSERT_ARGS(Parrot_cx_schedule_timer)
     PMC * const timer = pmc_new(interp, enum_class_Timer);
 
     VTABLE_set_number_keyed_int(interp, timer, PARROT_TIMER_NSEC, duration);
@@ -321,7 +321,7 @@
 void
 Parrot_cx_schedule_repeat(PARROT_INTERP, ARGIN(PMC *task))
 {
-    ASSERT_ARGS(Parrot_cx_schedule_repeat);
+    ASSERT_ARGS(Parrot_cx_schedule_repeat)
     INTVAL repeat = VTABLE_get_integer_keyed_int(interp, task,
             PARROT_TIMER_REPEAT);
     FLOATVAL duration = VTABLE_get_number_keyed_int(interp, task,
@@ -353,7 +353,7 @@
 Parrot_cx_schedule_callback(PARROT_INTERP,
         ARGIN(PMC *user_data), ARGIN(char *ext_data))
 {
-    ASSERT_ARGS(Parrot_cx_schedule_callback);
+    ASSERT_ARGS(Parrot_cx_schedule_callback)
     PMC *callback = pmc_new(interp, enum_class_Task);
     Parrot_Task_attributes * const task_struct = PARROT_TASK(callback);
 
@@ -378,7 +378,7 @@
 void
 Parrot_cx_request_suspend_for_gc(PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_cx_request_suspend_for_gc);
+    ASSERT_ARGS(Parrot_cx_request_suspend_for_gc)
 #if CX_DEBUG
     fprintf(stderr, "requesting gc suspend [interp=%p]\n", interp);
 #endif
@@ -399,7 +399,7 @@
 void
 Parrot_cx_delete_task(PARROT_INTERP, ARGIN(PMC *task))
 {
-    ASSERT_ARGS(Parrot_cx_delete_task);
+    ASSERT_ARGS(Parrot_cx_delete_task)
     if (interp->scheduler) {
         const INTVAL tid = VTABLE_get_integer(interp, task);
         VTABLE_delete_keyed_int(interp, interp->scheduler, tid);
@@ -426,7 +426,7 @@
 PMC *
 Parrot_cx_delete_suspend_for_gc(PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_cx_delete_suspend_for_gc);
+    ASSERT_ARGS(Parrot_cx_delete_suspend_for_gc)
     if (interp->scheduler) {
         STRING *suspend_str = CONST_STRING(interp, "suspend_for_gc");
         Parrot_Scheduler_attributes * sched_struct = PARROT_SCHEDULER(interp->scheduler);
@@ -479,7 +479,7 @@
 void
 Parrot_cx_add_handler_local(PARROT_INTERP, ARGIN(PMC *handler))
 {
-    ASSERT_ARGS(Parrot_cx_add_handler_local);
+    ASSERT_ARGS(Parrot_cx_add_handler_local)
     if (PMC_IS_NULL(CONTEXT(interp)->handlers))
         CONTEXT(interp)->handlers = pmc_new(interp, enum_class_ResizablePMCArray);
 
@@ -502,7 +502,7 @@
 void
 Parrot_cx_delete_handler_local(PARROT_INTERP, ARGIN(STRING *handler_type))
 {
-    ASSERT_ARGS(Parrot_cx_delete_handler_local);
+    ASSERT_ARGS(Parrot_cx_delete_handler_local)
     PMC *handlers  = CONTEXT(interp)->handlers;
 
     if (PMC_IS_NULL(handlers))
@@ -571,7 +571,7 @@
 void
 Parrot_cx_add_handler(PARROT_INTERP, ARGIN(PMC *handler))
 {
-    ASSERT_ARGS(Parrot_cx_add_handler);
+    ASSERT_ARGS(Parrot_cx_add_handler)
     STRING *add_handler = CONST_STRING(interp, "add_handler");
     if (!interp->scheduler)
         Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_INVALID_OPERATION,
@@ -595,7 +595,7 @@
 void
 Parrot_cx_delete_handler_typed(PARROT_INTERP, ARGIN(STRING *handler_type))
 {
-    ASSERT_ARGS(Parrot_cx_delete_handler_typed);
+    ASSERT_ARGS(Parrot_cx_delete_handler_typed)
     if (!interp->scheduler)
         Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_INVALID_OPERATION,
             "Scheduler was not initialized for this interpreter.\n");
@@ -618,7 +618,7 @@
 INTVAL
 Parrot_cx_count_handlers_typed(PARROT_INTERP, ARGIN(STRING *handler_type))
 {
-    ASSERT_ARGS(Parrot_cx_count_handlers_typed);
+    ASSERT_ARGS(Parrot_cx_count_handlers_typed)
     INTVAL count = 0;
 
     if (!interp->scheduler)
@@ -653,7 +653,7 @@
 void
 Parrot_cx_send_message(PARROT_INTERP, ARGIN(STRING *messagetype), ARGIN_NULLOK(PMC *payload))
 {
-    ASSERT_ARGS(Parrot_cx_send_message);
+    ASSERT_ARGS(Parrot_cx_send_message)
     if (interp->scheduler) {
         Parrot_Scheduler_attributes * sched_struct = PARROT_SCHEDULER(interp->scheduler);
         PMC *message = pmc_new(interp, enum_class_SchedulerMessage);
@@ -694,7 +694,7 @@
 void
 Parrot_cx_broadcast_message(PARROT_INTERP, ARGIN(STRING *messagetype), ARGIN_NULLOK(PMC *data))
 {
-    ASSERT_ARGS(Parrot_cx_broadcast_message);
+    ASSERT_ARGS(Parrot_cx_broadcast_message)
     UINTVAL i;
     LOCK(interpreter_array_mutex);
     for (i = 0; i < n_interpreters; ++i) {
@@ -731,7 +731,7 @@
 PMC *
 Parrot_cx_find_handler_for_task(PARROT_INTERP, ARGIN(PMC *task))
 {
-    ASSERT_ARGS(Parrot_cx_find_handler_for_task);
+    ASSERT_ARGS(Parrot_cx_find_handler_for_task)
     PMC *handler = PMCNULL;
 #if CX_DEBUG
     fprintf(stderr, "searching for handler\n");
@@ -766,7 +766,7 @@
 PMC *
 Parrot_cx_find_handler_local(PARROT_INTERP, ARGIN(PMC *task))
 {
-    ASSERT_ARGS(Parrot_cx_find_handler_local);
+    ASSERT_ARGS(Parrot_cx_find_handler_local)
     Parrot_Context *context;
     PMC            *iter        = PMCNULL;
     STRING * const  handled_str = CONST_STRING(interp, "handled");
@@ -832,7 +832,7 @@
 void
 Parrot_cx_timer_invoke(PARROT_INTERP, ARGIN(PMC *timer))
 {
-    ASSERT_ARGS(Parrot_cx_timer_invoke);
+    ASSERT_ARGS(Parrot_cx_timer_invoke)
     Parrot_Timer_attributes * const timer_struct = PARROT_TIMER(timer);
 #if CX_DEBUG
     fprintf(stderr, "current timer time: %f, %f\n",
@@ -858,7 +858,7 @@
 void
 Parrot_cx_invoke_callback(PARROT_INTERP, ARGIN(PMC *callback))
 {
-    ASSERT_ARGS(Parrot_cx_invoke_callback);
+    ASSERT_ARGS(Parrot_cx_invoke_callback)
     Parrot_Task_attributes * const task_struct = PARROT_TASK(callback);
     if (!PMC_IS_NULL(task_struct->data)) {
         Parrot_run_callback(interp, task_struct->data,
@@ -893,7 +893,7 @@
 opcode_t *
 Parrot_cx_schedule_sleep(PARROT_INTERP, FLOATVAL time, ARGIN_NULLOK(opcode_t *next))
 {
-    ASSERT_ARGS(Parrot_cx_schedule_sleep);
+    ASSERT_ARGS(Parrot_cx_schedule_sleep)
 #if PARROT_HAS_THREADS
     Parrot_cond condition;
     Parrot_mutex lock;
@@ -950,7 +950,7 @@
 static void
 scheduler_process_wait_list(PARROT_INTERP, ARGMOD(PMC *scheduler))
 {
-    ASSERT_ARGS(scheduler_process_wait_list);
+    ASSERT_ARGS(scheduler_process_wait_list)
     Parrot_Scheduler_attributes * sched_struct = PARROT_SCHEDULER(scheduler);
     INTVAL num_tasks, index;
 
@@ -996,7 +996,7 @@
 static void
 scheduler_process_messages(PARROT_INTERP, ARGMOD(PMC *scheduler))
 {
-    ASSERT_ARGS(scheduler_process_messages);
+    ASSERT_ARGS(scheduler_process_messages)
     Parrot_Scheduler_attributes * sched_struct = PARROT_SCHEDULER(scheduler);
 
     PMC    *message;

Modified: trunk/src/spf_render.c
==============================================================================
--- trunk/src/spf_render.c	(original)
+++ trunk/src/spf_render.c	Mon Jan  5 15:17:26 2009
@@ -128,7 +128,7 @@
 handle_flags(PARROT_INTERP, ARGIN(const SpfInfo *info), ARGMOD(STRING *str),
         INTVAL is_int_type, ARGIN_NULLOK(STRING* prefix))
 {
-    ASSERT_ARGS(handle_flags);
+    ASSERT_ARGS(handle_flags)
     UINTVAL len = string_length(interp, str);
 
     if (is_int_type) {
@@ -235,7 +235,7 @@
 str_append_w_flags(PARROT_INTERP, ARGOUT(STRING *dest), ARGIN(const SpfInfo *info),
         ARGMOD(STRING *src), ARGIN_NULLOK(STRING *prefix))
 {
-    ASSERT_ARGS(str_append_w_flags);
+    ASSERT_ARGS(str_append_w_flags)
     src = handle_flags(interp, info, src, 1, prefix);
     dest = string_append(interp, dest, src);
     return dest;
@@ -256,7 +256,7 @@
 static void
 gen_sprintf_call(ARGOUT(char *out), ARGMOD(SpfInfo *info), int thingy)
 {
-    ASSERT_ARGS(gen_sprintf_call);
+    ASSERT_ARGS(gen_sprintf_call)
     int i    = 0;
     out[i++] = '%';
 
@@ -321,7 +321,7 @@
 Parrot_sprintf_format(PARROT_INTERP,
         ARGIN(STRING *pat), ARGIN(SPRINTF_OBJ *obj))
 {
-    ASSERT_ARGS(Parrot_sprintf_format);
+    ASSERT_ARGS(Parrot_sprintf_format)
     INTVAL i;
     INTVAL len     = 0;
     INTVAL old     = 0;

Modified: trunk/src/spf_vtable.c
==============================================================================
--- trunk/src/spf_vtable.c	(original)
+++ trunk/src/spf_vtable.c	Mon Jan  5 15:17:26 2009
@@ -177,7 +177,7 @@
 static STRING *
 getchr_va(PARROT_INTERP, SHIM(INTVAL size), ARGIN(SPRINTF_OBJ *obj))
 {
-    ASSERT_ARGS(getchr_va);
+    ASSERT_ARGS(getchr_va)
     va_list *arg = (va_list *)(obj->data);
 
     /* char promoted to int */
@@ -204,7 +204,7 @@
 static HUGEINTVAL
 getint_va(PARROT_INTERP, INTVAL size, ARGIN(SPRINTF_OBJ *obj))
 {
-    ASSERT_ARGS(getint_va);
+    ASSERT_ARGS(getint_va)
     va_list * const arg = (va_list *)(obj->data);
 
     switch (size) {
@@ -254,7 +254,7 @@
 static UHUGEINTVAL
 getuint_va(PARROT_INTERP, INTVAL size, ARGIN(SPRINTF_OBJ *obj))
 {
-    ASSERT_ARGS(getuint_va);
+    ASSERT_ARGS(getuint_va)
     va_list * const arg = (va_list *)(obj->data);
 
     switch (size) {
@@ -304,7 +304,7 @@
 static HUGEFLOATVAL
 getfloat_va(PARROT_INTERP, INTVAL size, ARGIN(SPRINTF_OBJ *obj))
 {
-    ASSERT_ARGS(getfloat_va);
+    ASSERT_ARGS(getfloat_va)
     va_list * const arg = (va_list *)(obj->data);
 
     switch (size) {
@@ -351,7 +351,7 @@
 static STRING *
 getstring_va(PARROT_INTERP, INTVAL size, ARGIN(SPRINTF_OBJ *obj))
 {
-    ASSERT_ARGS(getstring_va);
+    ASSERT_ARGS(getstring_va)
     va_list * const arg = (va_list *)(obj->data);
 
     switch (size) {
@@ -400,7 +400,7 @@
 static void *
 getptr_va(SHIM_INTERP, SHIM(INTVAL size), ARGIN(SPRINTF_OBJ *obj))
 {
-    ASSERT_ARGS(getptr_va);
+    ASSERT_ARGS(getptr_va)
     va_list * const arg = (va_list *)(obj->data);
 
     return (void *)va_arg(*arg, void *);
@@ -433,7 +433,7 @@
 static STRING *
 getchr_pmc(PARROT_INTERP, SHIM(INTVAL size), ARGMOD(SPRINTF_OBJ *obj))
 {
-    ASSERT_ARGS(getchr_pmc);
+    ASSERT_ARGS(getchr_pmc)
     STRING *s;
     PMC * const tmp = VTABLE_get_pmc_keyed_int(interp,
             ((PMC *)obj->data),
@@ -460,7 +460,7 @@
 static HUGEINTVAL
 getint_pmc(PARROT_INTERP, INTVAL size, ARGIN(SPRINTF_OBJ *obj))
 {
-    ASSERT_ARGS(getint_pmc);
+    ASSERT_ARGS(getint_pmc)
     HUGEINTVAL ret;
     PMC * const tmp = VTABLE_get_pmc_keyed_int(interp,
             ((PMC *)obj->data),
@@ -499,7 +499,7 @@
 static UHUGEINTVAL
 getuint_pmc(PARROT_INTERP, INTVAL size, ARGIN(SPRINTF_OBJ *obj))
 {
-    ASSERT_ARGS(getuint_pmc);
+    ASSERT_ARGS(getuint_pmc)
     UHUGEINTVAL ret;
     PMC * const tmp = VTABLE_get_pmc_keyed_int(interp,
             ((PMC *)obj->data),
@@ -538,7 +538,7 @@
 static HUGEFLOATVAL
 getfloat_pmc(PARROT_INTERP, INTVAL size, ARGIN(SPRINTF_OBJ *obj))
 {
-    ASSERT_ARGS(getfloat_pmc);
+    ASSERT_ARGS(getfloat_pmc)
     HUGEFLOATVAL ret;
     PMC * const tmp = VTABLE_get_pmc_keyed_int(interp,
             ((PMC *)obj->data),
@@ -575,7 +575,7 @@
 static STRING *
 getstring_pmc(PARROT_INTERP, SHIM(INTVAL size), ARGIN(SPRINTF_OBJ *obj))
 {
-    ASSERT_ARGS(getstring_pmc);
+    ASSERT_ARGS(getstring_pmc)
     STRING *s;
     PMC * const tmp = VTABLE_get_pmc_keyed_int(interp,
             ((PMC *)obj->data),
@@ -602,7 +602,7 @@
 static void *
 getptr_pmc(PARROT_INTERP, SHIM(INTVAL size), ARGIN(SPRINTF_OBJ *obj))
 {
-    ASSERT_ARGS(getptr_pmc);
+    ASSERT_ARGS(getptr_pmc)
     PMC * const tmp = VTABLE_get_pmc_keyed_int(interp,
             ((PMC *)obj->data), (obj->index));
     const INTVAL i  = VTABLE_get_integer(interp, tmp);

Modified: trunk/src/stacks.c
==============================================================================
--- trunk/src/stacks.c	(original)
+++ trunk/src/stacks.c	Mon Jan  5 15:17:26 2009
@@ -53,7 +53,7 @@
 void
 stack_system_init(SHIM_INTERP)
 {
-    ASSERT_ARGS(stack_system_init);
+    ASSERT_ARGS(stack_system_init)
 }
 
 /*
@@ -72,7 +72,7 @@
 Stack_Chunk_t *
 cst_new_stack_chunk(PARROT_INTERP, ARGIN(const Stack_Chunk_t *chunk))
 {
-    ASSERT_ARGS(cst_new_stack_chunk);
+    ASSERT_ARGS(cst_new_stack_chunk)
     Small_Object_Pool * const pool = chunk->pool;
     Stack_Chunk_t * const new_chunk = (Stack_Chunk_t *)pool->get_free_object(interp, pool);
 
@@ -102,7 +102,7 @@
 Stack_Chunk_t *
 new_stack(PARROT_INTERP, ARGIN(const char *name))
 {
-    ASSERT_ARGS(new_stack);
+    ASSERT_ARGS(new_stack)
     Small_Object_Pool * const pool = make_bufferlike_pool(interp, sizeof (Stack_Chunk_t));
     Stack_Chunk_t     * const chunk = (Stack_Chunk_t *)(pool->get_free_object)(interp, pool);
 
@@ -128,7 +128,7 @@
 void
 mark_stack(PARROT_INTERP, ARGMOD(Stack_Chunk_t *chunk))
 {
-    ASSERT_ARGS(mark_stack);
+    ASSERT_ARGS(mark_stack)
     for (; ; chunk = chunk->prev) {
         Stack_Entry_t  *entry;
 
@@ -158,7 +158,7 @@
 void
 stack_destroy(SHIM(Stack_Chunk_t *top))
 {
-    ASSERT_ARGS(stack_destroy);
+    ASSERT_ARGS(stack_destroy)
     /* GC does it all */
 }
 
@@ -177,7 +177,7 @@
 size_t
 stack_height(SHIM_INTERP, ARGIN(const Stack_Chunk_t *chunk))
 {
-    ASSERT_ARGS(stack_height);
+    ASSERT_ARGS(stack_height)
     size_t height = 0;
 
     for (; ; chunk = chunk->prev) {
@@ -209,7 +209,7 @@
 Stack_Entry_t *
 stack_entry(SHIM_INTERP, ARGIN(Stack_Chunk_t *stack), INTVAL depth)
 {
-    ASSERT_ARGS(stack_entry);
+    ASSERT_ARGS(stack_entry)
     Stack_Chunk_t *chunk;
     size_t         offset = (size_t)depth;
 
@@ -248,7 +248,7 @@
 Stack_Entry_t*
 stack_prepare_push(PARROT_INTERP, ARGMOD(Stack_Chunk_t **stack_p))
 {
-    ASSERT_ARGS(stack_prepare_push);
+    ASSERT_ARGS(stack_prepare_push)
     Stack_Chunk_t * const chunk     = *stack_p;
     Stack_Chunk_t * const new_chunk = cst_new_stack_chunk(interp, chunk);
 
@@ -278,7 +278,7 @@
 stack_push(PARROT_INTERP, ARGMOD(Stack_Chunk_t **stack_p),
            ARGIN(void *thing), Stack_entry_type type, NULLOK(Stack_cleanup_method cleanup))
 {
-    ASSERT_ARGS(stack_push);
+    ASSERT_ARGS(stack_push)
     Stack_Entry_t * const entry = (Stack_Entry_t *)stack_prepare_push(interp, stack_p);
 
     /* Remember the type */
@@ -321,7 +321,7 @@
 Stack_Entry_t*
 stack_prepare_pop(PARROT_INTERP, ARGMOD(Stack_Chunk_t **stack_p))
 {
-    ASSERT_ARGS(stack_prepare_pop);
+    ASSERT_ARGS(stack_prepare_pop)
     Stack_Chunk_t * const chunk = *stack_p;
 
     /* the first entry (initial top) refers to itself */
@@ -348,7 +348,7 @@
 stack_pop(PARROT_INTERP, ARGMOD(Stack_Chunk_t **stack_p),
           ARGOUT_NULLOK(void *where), Stack_entry_type type)
 {
-    ASSERT_ARGS(stack_pop);
+    ASSERT_ARGS(stack_pop)
     Stack_Chunk_t     *cur_chunk   = *stack_p;
     Stack_Entry_t * const entry    =
         (Stack_Entry_t *)stack_prepare_pop(interp, stack_p);
@@ -409,7 +409,7 @@
 void *
 pop_dest(PARROT_INTERP)
 {
-    ASSERT_ARGS(pop_dest);
+    ASSERT_ARGS(pop_dest)
     /* We don't mind the extra call, so we do this: (previous comment
      * said we *do* mind, but I say let the compiler decide) */
     void *dest;
@@ -435,7 +435,7 @@
 stack_peek(PARROT_INTERP, ARGIN(Stack_Chunk_t *stack_base),
            ARGMOD_NULLOK(Stack_entry_type *type))
 {
-    ASSERT_ARGS(stack_peek);
+    ASSERT_ARGS(stack_peek)
     const Stack_Entry_t * const entry = stack_entry(interp, stack_base, 0);
     if (entry == NULL)
         return NULL;
@@ -464,7 +464,7 @@
 Stack_entry_type
 get_entry_type(ARGIN(const Stack_Entry_t *entry))
 {
-    ASSERT_ARGS(get_entry_type);
+    ASSERT_ARGS(get_entry_type)
     return entry->entry_type;
 }
 
@@ -483,7 +483,7 @@
 void
 Parrot_dump_dynamic_environment(PARROT_INTERP, ARGIN(Stack_Chunk_t *dynamic_env))
 {
-    ASSERT_ARGS(Parrot_dump_dynamic_environment);
+    ASSERT_ARGS(Parrot_dump_dynamic_environment)
     int height = (int) stack_height(interp, dynamic_env);
 
     while (dynamic_env->prev != dynamic_env) {
@@ -530,7 +530,7 @@
 static void
 run_cleanup_action(PARROT_INTERP, ARGIN(Stack_Entry_t *e))
 {
-    ASSERT_ARGS(run_cleanup_action);
+    ASSERT_ARGS(run_cleanup_action)
     /*
      * this is called during normal stack_pop of the control
      * stack - run the action subroutine with an INTVAL arg of 0
@@ -553,7 +553,7 @@
 void
 Parrot_push_action(PARROT_INTERP, ARGIN(PMC *sub))
 {
-    ASSERT_ARGS(Parrot_push_action);
+    ASSERT_ARGS(Parrot_push_action)
     if (!VTABLE_isa(interp, sub, CONST_STRING(interp, "Sub")))
         Parrot_ex_throw_from_c_args(interp, NULL, 1,
             "Tried to push a non Sub PMC action");
@@ -576,7 +576,7 @@
 void
 Parrot_push_mark(PARROT_INTERP, INTVAL mark)
 {
-    ASSERT_ARGS(Parrot_push_mark);
+    ASSERT_ARGS(Parrot_push_mark)
     stack_push(interp, &interp->dynamic_env, &mark,
                STACK_ENTRY_MARK, STACK_CLEANUP_NULL);
 }
@@ -595,7 +595,7 @@
 void
 Parrot_pop_mark(PARROT_INTERP, INTVAL mark)
 {
-    ASSERT_ARGS(Parrot_pop_mark);
+    ASSERT_ARGS(Parrot_pop_mark)
     do {
         const Stack_Entry_t * const e
             = stack_entry(interp, interp->dynamic_env, 0);

Modified: trunk/src/stm/backend.c
==============================================================================
--- trunk/src/stm/backend.c	(original)
+++ trunk/src/stm/backend.c	Mon Jan  5 15:17:26 2009
@@ -264,7 +264,7 @@
 void
 Parrot_STM_destroy(PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_STM_destroy);
+    ASSERT_ARGS(Parrot_STM_destroy)
     STM_tx_log *log;
 
     if (!interp->thread_data || !interp->thread_data->stm_log)
@@ -293,7 +293,7 @@
 Parrot_STM_PMC_handle
 Parrot_STM_alloc(PARROT_INTERP, ARGIN_NULLOK(PMC *pmc))
 {
-    ASSERT_ARGS(Parrot_STM_alloc);
+    ASSERT_ARGS(Parrot_STM_alloc)
     Parrot_STM_PMC_handle_data *handle;
     Small_Object_Pool *ignored;
     STM_TRACE("Parrot_STM_alloc");
@@ -338,7 +338,7 @@
 Parrot_freeze_STM_PMC_handle(PARROT_INTERP, ARGMOD(IMAGE_IO *io),
             ARGIN(Parrot_STM_PMC_handle handle))
 {
-    ASSERT_ARGS(Parrot_freeze_STM_PMC_handle);
+    ASSERT_ARGS(Parrot_freeze_STM_PMC_handle)
     VTABLE_push_pmc(interp, io, (PMC*) handle);
 }
 
@@ -355,7 +355,7 @@
 Parrot_STM_PMC_handle
 Parrot_thaw_STM_PMC_handle(PARROT_INTERP, ARGIN(IMAGE_IO *io))
 {
-    ASSERT_ARGS(Parrot_thaw_STM_PMC_handle);
+    ASSERT_ARGS(Parrot_thaw_STM_PMC_handle)
     Parrot_STM_PMC_handle handle = (Parrot_STM_PMC_handle) VTABLE_shift_pmc(interp, io);
     return handle;
 }
@@ -376,7 +376,7 @@
 static STM_write_record *
 get_write(SHIM_INTERP, ARGIN(STM_tx_log *log), int i)
 {
-    ASSERT_ARGS(get_write);
+    ASSERT_ARGS(get_write)
     PARROT_ASSERT(i >= 0);
     PARROT_ASSERT(i <= log->last_write);
     return &log->writes[i];
@@ -397,7 +397,7 @@
 static STM_read_record *
 get_read(SHIM_INTERP, ARGIN(STM_tx_log *log), int i)
 {
-    ASSERT_ARGS(get_read);
+    ASSERT_ARGS(get_read)
     PARROT_ASSERT(i >= 0);
     PARROT_ASSERT(i <= log->last_read);
     return &log->reads[i];
@@ -424,7 +424,7 @@
 static STM_write_record *
 alloc_write(PARROT_INTERP, ARGMOD(STM_tx_log *log))
 {
-    ASSERT_ARGS(alloc_write);
+    ASSERT_ARGS(alloc_write)
     STM_write_record *write;
     const int         i = ++log->last_write;
 
@@ -455,7 +455,7 @@
 static STM_read_record *
 alloc_read(PARROT_INTERP, ARGMOD(STM_tx_log *log))
 {
-    ASSERT_ARGS(alloc_read);
+    ASSERT_ARGS(alloc_read)
     STM_read_record *read;
     const int i = ++log->last_read;
 
@@ -486,7 +486,7 @@
 static void *
 next_version(ARGIN(const void *old_version))
 {
-    ASSERT_ARGS(next_version);
+    ASSERT_ARGS(next_version)
     const UINTVAL v = PTR2UINTVAL(old_version) + 2;
 
     return UINTVAL2PTR(void *, v);
@@ -506,7 +506,7 @@
 static int
 is_version(ARGIN(const void *maybe_version))
 {
-    ASSERT_ARGS(is_version);
+    ASSERT_ARGS(is_version)
     const UINTVAL v = PTR2UINTVAL(maybe_version);
     return v & 1;
 }
@@ -526,7 +526,7 @@
 static STM_tx_log_sub *
 get_sublog(ARGIN(STM_tx_log *log), int i)
 {
-    ASSERT_ARGS(get_sublog);
+    ASSERT_ARGS(get_sublog)
     PARROT_ASSERT(i > 0);
     PARROT_ASSERT(i <= log->depth);
     return &log->inner[i - 1];
@@ -548,7 +548,7 @@
 static int
 is_aborted(ARGIN(STM_tx_log *log))
 {
-    ASSERT_ARGS(is_aborted);
+    ASSERT_ARGS(is_aborted)
     int i;
 
     for (i = 1; i <= log->depth; ++i) {
@@ -577,7 +577,7 @@
 void
 Parrot_STM_start_transaction(PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_STM_start_transaction);
+    ASSERT_ARGS(Parrot_STM_start_transaction)
     STM_tx_log     * const log = Parrot_STM_tx_log_get(interp);
     STM_tx_log_sub *       newsub;
 
@@ -616,7 +616,7 @@
 merge_transactions(PARROT_INTERP, ARGMOD(STM_tx_log *log),
         ARGIN(STM_tx_log_sub *outer), ARGIN(STM_tx_log_sub *inner), int always)
 {
-    ASSERT_ARGS(merge_transactions);
+    ASSERT_ARGS(merge_transactions)
     int i;
     int status;
     int need_abort = 0;
@@ -714,7 +714,7 @@
 static PMC *
 force_sharing(PARROT_INTERP, ARGIN_NULLOK(PMC *pmc))
 {
-    ASSERT_ARGS(force_sharing);
+    ASSERT_ARGS(force_sharing)
     PMC *ret;
 
     if (PMC_IS_NULL(pmc))
@@ -739,7 +739,7 @@
 static int
 get_read_valid_depth(PARROT_INTERP, ARGIN(STM_tx_log *log))
 {
-    ASSERT_ARGS(get_read_valid_depth);
+    ASSERT_ARGS(get_read_valid_depth)
     int i;
     int validp    = 1;
     int cur_depth = 1;
@@ -799,7 +799,7 @@
 static int
 do_real_commit(PARROT_INTERP, ARGIN(STM_tx_log *log))
 {
-    ASSERT_ARGS(do_real_commit);
+    ASSERT_ARGS(do_real_commit)
     int i;
     int successp;
     STM_tx_log_sub *inner;
@@ -875,7 +875,7 @@
 static void
 do_partial_abort(PARROT_INTERP, ARGIN(STM_tx_log *log), ARGIN(STM_tx_log_sub *inner))
 {
-    ASSERT_ARGS(do_partial_abort);
+    ASSERT_ARGS(do_partial_abort)
     int i;
 
     STM_TRACE_SAFE("partial abort");
@@ -913,7 +913,7 @@
 static void
 do_real_abort(PARROT_INTERP, ARGMOD(STM_tx_log *log), ARGIN(STM_tx_log_sub *inner))
 {
-    ASSERT_ARGS(do_real_abort);
+    ASSERT_ARGS(do_real_abort)
     STM_TRACE_SAFE("really aborting");
     do_partial_abort(interp, log, inner);
 
@@ -939,7 +939,7 @@
 static void
 replay_writes(PARROT_INTERP, ARGIN(STM_tx_log *log), int from, int to)
 {
-    ASSERT_ARGS(replay_writes);
+    ASSERT_ARGS(replay_writes)
     int i;
     int validp    = 1;
     int cur_depth = from;
@@ -996,7 +996,7 @@
 int
 Parrot_STM_commit(PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_STM_commit);
+    ASSERT_ARGS(Parrot_STM_commit)
     STM_tx_log     * const log = Parrot_STM_tx_log_get(interp);
     STM_tx_log_sub *cursub;
     int             successp;
@@ -1047,7 +1047,7 @@
 void
 Parrot_STM_abort(PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_STM_abort);
+    ASSERT_ARGS(Parrot_STM_abort)
     STM_tx_log     * const log = Parrot_STM_tx_log_get(interp);
     STM_tx_log_sub *cursub;
 
@@ -1080,7 +1080,7 @@
 static int
 setup_wait(PARROT_INTERP, ARGMOD(STM_tx_log *log))
 {
-    ASSERT_ARGS(setup_wait);
+    ASSERT_ARGS(setup_wait)
     int need_wait = 1;
     int i;
 
@@ -1150,7 +1150,7 @@
 void
 Parrot_STM_wait(PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_STM_wait);
+    ASSERT_ARGS(Parrot_STM_wait)
     STM_tx_log *log;
     int         need_wait;
 
@@ -1201,7 +1201,7 @@
 int
 Parrot_STM_validate(PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_STM_validate);
+    ASSERT_ARGS(Parrot_STM_validate)
     STM_tx_log_sub *inner;
     int             status;
     STM_tx_log     * const log = Parrot_STM_tx_log_get(interp);
@@ -1232,7 +1232,7 @@
 static void
 mark_write_record(PARROT_INTERP, ARGMOD(STM_write_record *write))
 {
-    ASSERT_ARGS(mark_write_record);
+    ASSERT_ARGS(mark_write_record)
     if (!PMC_IS_NULL(write->value))
         pobject_lives(interp, (PObj *) write->value);
 
@@ -1252,7 +1252,7 @@
 static void
 mark_read_record(PARROT_INTERP, ARGMOD(STM_read_record *read))
 {
-    ASSERT_ARGS(mark_read_record);
+    ASSERT_ARGS(mark_read_record)
     if (!PMC_IS_NULL(read->value))
         pobject_lives(interp, (PObj *) read->value);
 
@@ -1273,7 +1273,7 @@
 void
 Parrot_STM_mark_transaction(PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_STM_mark_transaction);
+    ASSERT_ARGS(Parrot_STM_mark_transaction)
     int         i;
     STM_tx_log *log;
 
@@ -1302,7 +1302,7 @@
 void
 Parrot_STM_mark_pmc_handle(PARROT_INTERP, Parrot_STM_PMC_handle handle)
 {
-    ASSERT_ARGS(Parrot_STM_mark_pmc_handle);
+    ASSERT_ARGS(Parrot_STM_mark_pmc_handle)
     PMC *value;
 
     if (!handle)
@@ -1334,7 +1334,7 @@
 int
 Parrot_STM_transaction_depth(PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_STM_transaction_depth);
+    ASSERT_ARGS(Parrot_STM_transaction_depth)
     const STM_tx_log * const log = Parrot_STM_tx_log_get(interp);
 
     return log->depth;
@@ -1359,7 +1359,7 @@
 static void *
 wait_for_version(PARROT_INTERP, ARGMOD(STM_tx_log *log), Parrot_STM_PMC_handle handle)
 {
-    ASSERT_ARGS(wait_for_version);
+    ASSERT_ARGS(wait_for_version)
     void                  *version;
     STM_tx_log_sub        *curlog     = NULL;
     Parrot_atomic_pointer *in_what    = &handle->owner_or_version;
@@ -1484,7 +1484,7 @@
 PMC *
 Parrot_STM_read(PARROT_INTERP, Parrot_STM_PMC_handle handle)
 {
-    ASSERT_ARGS(Parrot_STM_read);
+    ASSERT_ARGS(Parrot_STM_read)
     STM_write_record  *write;
     STM_read_record   *read;
     void              *check_version;
@@ -1569,7 +1569,7 @@
 static int
 safe_to_clone(SHIM_INTERP, ARGIN(const PMC *original))
 {
-    ASSERT_ARGS(safe_to_clone);
+    ASSERT_ARGS(safe_to_clone)
     if (original->vtable->base_type == enum_class_Integer
         ||  original->vtable->base_type == enum_class_Float
         ||  original->vtable->base_type == enum_class_BigInt
@@ -1596,7 +1596,7 @@
 static PMC *
 local_pmc_copy(PARROT_INTERP, ARGIN_NULLOK(PMC *original))
 {
-    ASSERT_ARGS(local_pmc_copy);
+    ASSERT_ARGS(local_pmc_copy)
     if (PMC_IS_NULL(original))
         return PMCNULL;
 
@@ -1628,7 +1628,7 @@
 static STM_write_record *
 find_write_record(PARROT_INTERP, Parrot_STM_PMC_handle handle, int overwrite_p)
 {
-    ASSERT_ARGS(find_write_record);
+    ASSERT_ARGS(find_write_record)
     /* RT#57680 FIXME check for read log or previous tx's write log */
     STM_tx_log_sub   *cursub;
     int               have_old_value = 0;
@@ -1780,7 +1780,7 @@
 PMC *
 Parrot_STM_begin_update(PARROT_INTERP, Parrot_STM_PMC_handle handle)
 {
-    ASSERT_ARGS(Parrot_STM_begin_update);
+    ASSERT_ARGS(Parrot_STM_begin_update)
     STM_write_record   *write;
     const STM_tx_log * const log = Parrot_STM_tx_log_get(interp);
 
@@ -1806,7 +1806,7 @@
 void
 Parrot_STM_write(PARROT_INTERP, Parrot_STM_PMC_handle handle, ARGIN_NULLOK(PMC* new_value))
 {
-    ASSERT_ARGS(Parrot_STM_write);
+    ASSERT_ARGS(Parrot_STM_write)
     /* XXX no transaction case */
     STM_write_record   *write;
     const STM_tx_log * const log = Parrot_STM_tx_log_get(interp);
@@ -1836,7 +1836,7 @@
 void *
 Parrot_STM_extract(PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_STM_extract);
+    ASSERT_ARGS(Parrot_STM_extract)
     STM_saved_tx_log  *saved;
     STM_tx_log_sub    *cursub;
     STM_tx_log * const log = Parrot_STM_tx_log_get(interp);
@@ -1878,7 +1878,7 @@
 void
 Parrot_STM_replay_extracted(PARROT_INTERP, ARGMOD_NULLOK(void *saved_log_data))
 {
-    ASSERT_ARGS(Parrot_STM_replay_extracted);
+    ASSERT_ARGS(Parrot_STM_replay_extracted)
     if (saved_log_data) {
         STM_saved_tx_log * const saved = (STM_saved_tx_log *)saved_log_data;
         STM_tx_log * const       log   = Parrot_STM_tx_log_get(interp);
@@ -1923,7 +1923,7 @@
 void
 Parrot_STM_mark_extracted(PARROT_INTERP, ARGMOD_NULLOK(void *saved_log_data))
 {
-    ASSERT_ARGS(Parrot_STM_mark_extracted);
+    ASSERT_ARGS(Parrot_STM_mark_extracted)
     if (saved_log_data) {
         STM_saved_tx_log * const saved = (STM_saved_tx_log *)saved_log_data;
         int i;
@@ -1949,7 +1949,7 @@
 void
 Parrot_STM_destroy_extracted(SHIM_INTERP, ARGMOD_NULLOK(void *saved_log_data))
 {
-    ASSERT_ARGS(Parrot_STM_destroy_extracted);
+    ASSERT_ARGS(Parrot_STM_destroy_extracted)
     if (saved_log_data) {
         STM_saved_tx_log * const saved = (STM_saved_tx_log *)saved_log_data;
 
@@ -1975,7 +1975,7 @@
 void
 Parrot_STM_dump_profile(PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_STM_dump_profile);
+    ASSERT_ARGS(Parrot_STM_dump_profile)
     STM_tx_log       *log;
     STM_profile_data *profile;
     INTVAL            i;
@@ -2029,7 +2029,7 @@
 void
 Parrot_STM_merge_profile(ARGOUT(Interp *d), ARGOUT(Interp *s))
 {
-    ASSERT_ARGS(Parrot_STM_merge_profile);
+    ASSERT_ARGS(Parrot_STM_merge_profile)
     INTVAL i;
 
     const STM_profile_date * const from = &PROFILE(Parrot_STM_tx_log_get(s));

Modified: trunk/src/stm/waitlist.c
==============================================================================
--- trunk/src/stm/waitlist.c	(original)
+++ trunk/src/stm/waitlist.c	Mon Jan  5 15:17:26 2009
@@ -126,7 +126,7 @@
 static struct waitlist_thread_data *
 get_thread(PARROT_INTERP)
 {
-    ASSERT_ARGS(get_thread);
+    ASSERT_ARGS(get_thread)
     STM_tx_log * const txlog = Parrot_STM_tx_log_get(interp);
 
     if (!txlog->waitlist_data) {
@@ -156,7 +156,7 @@
 static struct waitlist_thread_data *
 get_thread_noalloc(PARROT_INTERP)
 {
-    ASSERT_ARGS(get_thread_noalloc);
+    ASSERT_ARGS(get_thread_noalloc)
     const STM_tx_log * const txlog = Parrot_STM_tx_log_get(interp);
     return txlog->waitlist_data;
 }
@@ -176,7 +176,7 @@
 static struct waitlist_entry *
 alloc_entry(PARROT_INTERP)
 {
-    ASSERT_ARGS(alloc_entry);
+    ASSERT_ARGS(alloc_entry)
     size_t i;
 
     struct waitlist_thread_data * const thr = get_thread(interp);
@@ -218,7 +218,7 @@
 static void
 add_entry(ARGMOD(STM_waitlist *waitlist), ARGIN(struct waitlist_entry *entry))
 {
-    ASSERT_ARGS(add_entry);
+    ASSERT_ARGS(add_entry)
     int successp = -1;
     void *result;
     PARROT_ASSERT(entry->next == NULL);
@@ -248,7 +248,7 @@
 static int
 remove_first(ARGMOD(STM_waitlist *waitlist), ARGIN(struct waitlist_entry *expect_first))
 {
-    ASSERT_ARGS(remove_first);
+    ASSERT_ARGS(remove_first)
     int successp;
     PARROT_ATOMIC_PTR_CAS(successp, waitlist->first, expect_first,
                         expect_first->next);
@@ -274,7 +274,7 @@
 static void
 waitlist_remove(ARGMOD_NULLOK(STM_waitlist *waitlist), ARGIN(struct waitlist_entry *what))
 {
-    ASSERT_ARGS(waitlist_remove);
+    ASSERT_ARGS(waitlist_remove)
     struct waitlist_entry *cur;
     void *result;
 
@@ -333,7 +333,7 @@
 static void
 waitlist_remove_check(ARGMOD_NULLOK(STM_waitlist *waitlist), ARGIN(struct waitlist_entry *what))
 {
-    ASSERT_ARGS(waitlist_remove_check);
+    ASSERT_ARGS(waitlist_remove_check)
     struct waitlist_entry *cur;
 
     if (!waitlist)
@@ -362,7 +362,7 @@
 static void
 waitlist_signal_one(ARGMOD(struct waitlist_entry *who))
 {
-    ASSERT_ARGS(waitlist_signal_one);
+    ASSERT_ARGS(waitlist_signal_one)
     struct waitlist_thread_data *thread;
 
     thread = who->thread;
@@ -391,7 +391,7 @@
 static void
 waitlist_signal_all(ARGMOD(STM_waitlist *list))
 {
-    ASSERT_ARGS(waitlist_signal_all);
+    ASSERT_ARGS(waitlist_signal_all)
     int successp;
     struct waitlist_entry *cur;
     void *result;
@@ -438,7 +438,7 @@
 void
 Parrot_STM_waitlist_add_self(PARROT_INTERP, ARGMOD(STM_waitlist *waitlist))
 {
-    ASSERT_ARGS(Parrot_STM_waitlist_add_self);
+    ASSERT_ARGS(Parrot_STM_waitlist_add_self)
     struct waitlist_entry * const entry = alloc_entry(interp);
 
     entry->head = waitlist;
@@ -462,7 +462,7 @@
 void
 Parrot_STM_waitlist_signal(PARROT_INTERP, ARGMOD(STM_waitlist *waitlist))
 {
-    ASSERT_ARGS(Parrot_STM_waitlist_signal);
+    ASSERT_ARGS(Parrot_STM_waitlist_signal)
 #if WAITLIST_DEBUG
     fprintf(stderr, "%p: signal %p\n", interp, waitlist);
 #endif
@@ -482,7 +482,7 @@
 void
 Parrot_STM_waitlist_remove_all(PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_STM_waitlist_remove_all);
+    ASSERT_ARGS(Parrot_STM_waitlist_remove_all)
     struct waitlist_thread_data *thr;
     size_t i;
 #if WAITLIST_DEBUG
@@ -521,7 +521,7 @@
 void
 Parrot_STM_waitlist_wait(PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_STM_waitlist_wait);
+    ASSERT_ARGS(Parrot_STM_waitlist_wait)
     struct waitlist_thread_data *thr;
     thr = get_thread(interp);
     LOCK(thr->signal_mutex);
@@ -553,7 +553,7 @@
 void
 Parrot_STM_waitlist_init(PARROT_INTERP, ARGMOD(STM_waitlist *waitlist))
 {
-    ASSERT_ARGS(Parrot_STM_waitlist_init);
+    ASSERT_ARGS(Parrot_STM_waitlist_init)
     PARROT_ATOMIC_PTR_INIT(waitlist->first);
     PARROT_ATOMIC_PTR_SET(waitlist->first, NULL);
     MUTEX_INIT(waitlist->remove_mutex);
@@ -572,7 +572,7 @@
 void
 Parrot_STM_waitlist_destroy_thread(PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_STM_waitlist_destroy_thread);
+    ASSERT_ARGS(Parrot_STM_waitlist_destroy_thread)
     struct waitlist_thread_data *thr;
     size_t i;
 
@@ -605,7 +605,7 @@
 static STM_tx_log *
 Parrot_STM_tx_log_alloc(PARROT_INTERP, size_t size)
 {
-    ASSERT_ARGS(Parrot_STM_tx_log_alloc);
+    ASSERT_ARGS(Parrot_STM_tx_log_alloc)
     int                i;
     STM_tx_log * const log       = (STM_tx_log *)mem_sys_allocate_zeroed(size);
     interp->thread_data->stm_log = log;
@@ -650,7 +650,7 @@
 STM_tx_log *
 Parrot_STM_tx_log_get(PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_STM_tx_log_get);
+    ASSERT_ARGS(Parrot_STM_tx_log_get)
     STM_tx_log *log = interp->thread_data->stm_log;
 
     if (!log)

Modified: trunk/src/string.c
==============================================================================
--- trunk/src/string.c	(original)
+++ trunk/src/string.c	Mon Jan  5 15:17:26 2009
@@ -82,7 +82,7 @@
 void
 Parrot_unmake_COW(PARROT_INTERP, ARGMOD(STRING *s))
 {
-    ASSERT_ARGS(Parrot_unmake_COW);
+    ASSERT_ARGS(Parrot_unmake_COW)
 
     /* COW_FLAG | constant_FLAG | external_FLAG) */
     if (PObj_is_cowed_TESTALL(s)) {
@@ -136,7 +136,7 @@
 STRING *
 Parrot_make_COW_reference(PARROT_INTERP, ARGMOD(STRING *s))
 {
-    ASSERT_ARGS(Parrot_make_COW_reference);
+    ASSERT_ARGS(Parrot_make_COW_reference)
     STRING *d;
 
     if (PObj_constant_TEST(s)) {
@@ -188,7 +188,7 @@
 STRING *
 Parrot_reuse_COW_reference(SHIM_INTERP, ARGMOD(STRING *s), ARGOUT(STRING *d))
 {
-    ASSERT_ARGS(Parrot_reuse_COW_reference);
+    ASSERT_ARGS(Parrot_reuse_COW_reference)
 
     if (PObj_constant_TEST(s)) {
         PObj_COW_SET(s);
@@ -220,7 +220,7 @@
 STRING *
 string_set(PARROT_INTERP, ARGIN_NULLOK(STRING *dest), ARGMOD(STRING *src))
 {
-    ASSERT_ARGS(string_set);
+    ASSERT_ARGS(string_set)
     if (dest == src)
         return dest;
     if (dest) { /* && dest != src */
@@ -253,7 +253,7 @@
 void
 string_free(PARROT_INTERP, ARGIN(STRING *s))
 {
-    ASSERT_ARGS(string_free);
+    ASSERT_ARGS(string_free)
     if (!PObj_constant_TEST(s)) {
         Small_Object_Pool * const pool = interp->arena_base->string_header_pool;
         pool->add_free_object(interp, pool, s);
@@ -282,7 +282,7 @@
 void
 string_init(PARROT_INTERP)
 {
-    ASSERT_ARGS(string_init);
+    ASSERT_ARGS(string_init)
     Hash        *const_cstring_hash;
     size_t       i;
     const size_t n_parrot_cstrings =
@@ -343,7 +343,7 @@
 void
 string_deinit(PARROT_INTERP)
 {
-    ASSERT_ARGS(string_deinit);
+    ASSERT_ARGS(string_deinit)
     /* all are shared between interpreters */
     if (!interp->parent_interpreter) {
         mem_sys_free(interp->const_cstring_table);
@@ -370,7 +370,7 @@
 UINTVAL
 string_capacity(SHIM_INTERP, ARGIN(const STRING *s))
 {
-    ASSERT_ARGS(string_capacity);
+    ASSERT_ARGS(string_capacity)
 
     return ((ptrcast_t)PObj_bufstart(s) + PObj_buflen(s) -
             (ptrcast_t)s->strstart);
@@ -392,7 +392,7 @@
 string_make_empty(PARROT_INTERP,
     parrot_string_representation_t representation, UINTVAL capacity)
 {
-    ASSERT_ARGS(string_make_empty);
+    ASSERT_ARGS(string_make_empty)
     STRING * const s = new_string_header(interp, 0);
 
     /* TODO adapt string creation functions */
@@ -431,7 +431,7 @@
 string_rep_compatible(SHIM_INTERP,
     ARGIN(const STRING *a), ARGIN(const STRING *b), ARGOUT(const ENCODING **e))
 {
-    ASSERT_ARGS(string_rep_compatible);
+    ASSERT_ARGS(string_rep_compatible)
     if (a->encoding == b->encoding && a->charset == b->charset) {
         *e = a->encoding;
         return a->charset;
@@ -496,7 +496,7 @@
 string_concat(PARROT_INTERP, ARGIN_NULLOK(STRING *a),
             ARGIN_NULLOK(STRING *b), UINTVAL Uflags)
 {
-    ASSERT_ARGS(string_concat);
+    ASSERT_ARGS(string_concat)
     if (a != NULL && a->strlen != 0) {
         if (b != NULL && b->strlen != 0) {
             const ENCODING *enc;
@@ -543,7 +543,7 @@
 STRING *
 string_append(PARROT_INTERP, ARGMOD_NULLOK(STRING *a), ARGIN_NULLOK(STRING *b))
 {
-    ASSERT_ARGS(string_append);
+    ASSERT_ARGS(string_append)
     UINTVAL a_capacity;
     UINTVAL total_length;
     const CHARSET *cs;
@@ -622,7 +622,7 @@
 STRING *
 string_from_cstring(PARROT_INTERP, ARGIN_NULLOK(const char * const buffer), const UINTVAL len)
 {
-    ASSERT_ARGS(string_from_cstring);
+    ASSERT_ARGS(string_from_cstring)
     return string_make_direct(interp, buffer, len ? len :
             buffer ? strlen(buffer) : 0,
                               PARROT_DEFAULT_ENCODING, PARROT_DEFAULT_CHARSET,
@@ -648,7 +648,7 @@
 string_primary_encoding_for_representation(PARROT_INTERP,
     parrot_string_representation_t representation)
 {
-    ASSERT_ARGS(string_primary_encoding_for_representation);
+    ASSERT_ARGS(string_primary_encoding_for_representation)
     if (representation == enum_stringrep_one)
         return "ascii";
 
@@ -674,7 +674,7 @@
 STRING *
 const_string(PARROT_INTERP, ARGIN(const char *buffer))
 {
-    ASSERT_ARGS(const_string);
+    ASSERT_ARGS(const_string)
     DECL_CONST_CAST;
     STRING *s;
     Hash   * const cstring_cache = (Hash *)interp->const_cstring_hash;
@@ -728,7 +728,7 @@
 string_make(PARROT_INTERP, ARGIN_NULLOK(const char *buffer),
         UINTVAL len, ARGIN_NULLOK(const char *charset_name), UINTVAL flags)
 {
-    ASSERT_ARGS(string_make);
+    ASSERT_ARGS(string_make)
     const CHARSET  *charset;
 
     if (!charset_name)
@@ -764,7 +764,7 @@
 string_make_direct(PARROT_INTERP, ARGIN_NULLOK(const char *buffer), UINTVAL len,
         ARGIN(const ENCODING *encoding), ARGIN_NULLOK(const CHARSET *charset), UINTVAL flags)
 {
-    ASSERT_ARGS(string_make_direct);
+    ASSERT_ARGS(string_make_direct)
     DECL_CONST_CAST;
     STRING * const s = new_string_header(interp, flags);
     s->encoding      = encoding;
@@ -824,7 +824,7 @@
 STRING *
 string_grow(PARROT_INTERP, ARGMOD(STRING *s), UINTVAL addlen)
 {
-    ASSERT_ARGS(string_grow);
+    ASSERT_ARGS(string_grow)
     Parrot_unmake_COW(interp, s);
 
     /* Don't check buflen, if we are here, we already checked. */
@@ -855,7 +855,7 @@
 UINTVAL
 string_length(SHIM_INTERP, ARGIN(const STRING *s))
 {
-    ASSERT_ARGS(string_length);
+    ASSERT_ARGS(string_length)
 
     return s->strlen;
 }
@@ -881,7 +881,7 @@
 INTVAL
 string_index(PARROT_INTERP, ARGIN(const STRING *s), UINTVAL idx)
 {
-    ASSERT_ARGS(string_index);
+    ASSERT_ARGS(string_index)
     saneify_string(s);
     return (INTVAL)CHARSET_GET_CODEPOINT(interp, s, idx);
 }
@@ -905,7 +905,7 @@
 string_str_index(PARROT_INTERP, ARGIN(const STRING *s),
         ARGIN(const STRING *s2), INTVAL start)
 {
-    ASSERT_ARGS(string_str_index);
+    ASSERT_ARGS(string_str_index)
     STRING *src, *search;
     UINTVAL len;
     DECL_CONST_CAST;
@@ -947,7 +947,7 @@
 INTVAL
 string_ord(PARROT_INTERP, ARGIN_NULLOK(const STRING *s), INTVAL idx)
 {
-    ASSERT_ARGS(string_ord);
+    ASSERT_ARGS(string_ord)
     const UINTVAL len        = s ? string_length(interp, s) : 0;
     UINTVAL       true_index = (UINTVAL)idx;
 
@@ -990,7 +990,7 @@
 STRING *
 string_chr(PARROT_INTERP, UINTVAL character)
 {
-    ASSERT_ARGS(string_chr);
+    ASSERT_ARGS(string_chr)
     if (character > 0xff)
         return Parrot_unicode_charset_ptr->string_from_codepoint(interp,
                 character);
@@ -1021,7 +1021,7 @@
 STRING *
 string_copy(PARROT_INTERP, ARGMOD(STRING *s))
 {
-    ASSERT_ARGS(string_copy);
+    ASSERT_ARGS(string_copy)
     return Parrot_make_COW_reference(interp, s);
 }
 
@@ -1047,7 +1047,7 @@
 INTVAL
 string_compute_strlen(PARROT_INTERP, ARGMOD(STRING *s))
 {
-    ASSERT_ARGS(string_compute_strlen);
+    ASSERT_ARGS(string_compute_strlen)
 
     s->strlen = CHARSET_CODEPOINTS(interp, s);
     return s->strlen;
@@ -1070,7 +1070,7 @@
 INTVAL
 string_max_bytes(SHIM_INTERP, ARGIN(const STRING *s), UINTVAL nchars)
 {
-    ASSERT_ARGS(string_max_bytes);
+    ASSERT_ARGS(string_max_bytes)
     PARROT_ASSERT(s->encoding);
     return ENCODING_MAX_BYTES_PER_CODEPOINT(interp, s) * nchars;
 }
@@ -1094,7 +1094,7 @@
 string_repeat(PARROT_INTERP, ARGIN(const STRING *s),
     UINTVAL num, ARGOUT_NULLOK(STRING **d))
 {
-    ASSERT_ARGS(string_repeat);
+    ASSERT_ARGS(string_repeat)
     UINTVAL i;
 
     STRING * const dest = string_make_direct(interp, NULL,
@@ -1140,7 +1140,7 @@
         ARGIN_NULLOK(STRING *src), INTVAL offset, INTVAL length,
         ARGOUT_NULLOK(STRING **d), int replace_dest)
 {
-    ASSERT_ARGS(string_substr);
+    ASSERT_ARGS(string_substr)
     if (src == NULL)
         Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_SUBSTR_OUT_OF_STRING,
             "Cannot substr on a null string");
@@ -1223,7 +1223,7 @@
 string_replace(PARROT_INTERP, ARGIN(STRING *src),
     INTVAL offset, INTVAL length, ARGIN(STRING *rep), ARGOUT_NULLOK(STRING **d))
 {
-    ASSERT_ARGS(string_replace);
+    ASSERT_ARGS(string_replace)
     UINTVAL         start_byte, end_byte;
     INTVAL          diff;
     String_iter     iter;
@@ -1364,7 +1364,7 @@
 STRING *
 string_chopn(PARROT_INTERP, ARGMOD(STRING *s), INTVAL n)
 {
-    ASSERT_ARGS(string_chopn);
+    ASSERT_ARGS(string_chopn)
     STRING * const chopped = string_copy(interp, s);
     string_chopn_inplace(interp, chopped, n);
     return chopped;
@@ -1387,7 +1387,7 @@
 void
 string_chopn_inplace(PARROT_INTERP, ARGMOD(STRING *s), INTVAL n)
 {
-    ASSERT_ARGS(string_chopn_inplace);
+    ASSERT_ARGS(string_chopn_inplace)
     UINTVAL new_length, uchar_size;
 
     if (n < 0) {
@@ -1448,7 +1448,7 @@
 INTVAL
 string_compare(PARROT_INTERP, ARGIN_NULLOK(const STRING *s1), ARGIN_NULLOK(const STRING *s2))
 {
-    ASSERT_ARGS(string_compare);
+    ASSERT_ARGS(string_compare)
     if (!s2)
         return s1 && (s1->strlen != 0);
 
@@ -1481,7 +1481,7 @@
 INTVAL
 string_equal(PARROT_INTERP, ARGIN_NULLOK(const STRING *s1), ARGIN_NULLOK(const STRING *s2))
 {
-    ASSERT_ARGS(string_equal);
+    ASSERT_ARGS(string_equal)
     if ((s1 == s2) || (!s1 && !s2)) {
         return 0;
     }
@@ -1530,7 +1530,7 @@
 make_writable(PARROT_INTERP, ARGMOD(STRING **s),
     const size_t len, parrot_string_representation_t representation)
 {
-    ASSERT_ARGS(make_writable);
+    ASSERT_ARGS(make_writable)
     if (!*s)
         *s = string_make_empty(interp, representation, len);
     else if ((*s)->strlen < len)
@@ -1558,7 +1558,7 @@
 string_bitwise_and(PARROT_INTERP, ARGIN_NULLOK(const STRING *s1),
         ARGIN_NULLOK(const STRING *s2), ARGOUT_NULLOK(STRING **dest))
 {
-    ASSERT_ARGS(string_bitwise_and);
+    ASSERT_ARGS(string_bitwise_and)
     STRING *res;
     size_t  minlen;
 
@@ -1709,7 +1709,7 @@
 string_bitwise_or(PARROT_INTERP, ARGIN_NULLOK(const STRING *s1),
         ARGIN_NULLOK(const STRING *s2), ARGOUT_NULLOK(STRING **dest))
 {
-    ASSERT_ARGS(string_bitwise_or);
+    ASSERT_ARGS(string_bitwise_or)
     STRING *res;
     size_t  maxlen = 0;
 
@@ -1784,7 +1784,7 @@
 string_bitwise_xor(PARROT_INTERP, ARGIN_NULLOK(const STRING *s1),
         ARGIN_NULLOK(const STRING *s2), ARGOUT_NULLOK(STRING **dest))
 {
-    ASSERT_ARGS(string_bitwise_xor);
+    ASSERT_ARGS(string_bitwise_xor)
     STRING *res;
     size_t  maxlen = 0;
 
@@ -1870,7 +1870,7 @@
 string_bitwise_not(PARROT_INTERP, ARGIN_NULLOK(const STRING *s),
     ARGOUT_NULLOK(STRING **dest))
 {
-    ASSERT_ARGS(string_bitwise_not);
+    ASSERT_ARGS(string_bitwise_not)
     STRING *res;
     size_t  len;
 
@@ -1934,7 +1934,7 @@
 INTVAL
 string_bool(PARROT_INTERP, ARGIN_NULLOK(const STRING *s))
 {
-    ASSERT_ARGS(string_bool);
+    ASSERT_ARGS(string_bool)
     const INTVAL len = s ? string_length(interp, s) : 0;
 
     if (len == 0)
@@ -1970,7 +1970,7 @@
 STRING *
 string_printf(PARROT_INTERP, ARGIN(const char *format), ...)
 {
-    ASSERT_ARGS(string_printf);
+    ASSERT_ARGS(string_printf)
     STRING *output;
     va_list args;
 
@@ -2010,7 +2010,7 @@
 INTVAL
 string_to_int(SHIM_INTERP, ARGIN_NULLOK(const STRING *s))
 {
-    ASSERT_ARGS(string_to_int);
+    ASSERT_ARGS(string_to_int)
     if (s == NULL)
         return 0;
     {
@@ -2070,7 +2070,7 @@
 FLOATVAL
 string_to_num(PARROT_INTERP, ARGIN(const STRING *s))
 {
-    ASSERT_ARGS(string_to_num);
+    ASSERT_ARGS(string_to_num)
     FLOATVAL    f = 0.0;
     char       *cstr;
     const char *p;
@@ -2120,7 +2120,7 @@
 STRING *
 string_from_int(PARROT_INTERP, INTVAL i)
 {
-    ASSERT_ARGS(string_from_int);
+    ASSERT_ARGS(string_from_int)
     char buf[128];
     return int_to_str(interp, buf, (HUGEINTVAL)i, 10);
 }
@@ -2142,7 +2142,7 @@
 STRING *
 string_from_num(PARROT_INTERP, FLOATVAL f)
 {
-    ASSERT_ARGS(string_from_num);
+    ASSERT_ARGS(string_from_num)
     /* Too damn hard--hand it off to Parrot_sprintf, which'll probably
        use the system sprintf anyway, but has gigantic buffers that are
        awfully hard to overflow. */
@@ -2168,7 +2168,7 @@
 char *
 string_to_cstring(PARROT_INTERP, ARGIN_NULLOK(const STRING *s))
 {
-    ASSERT_ARGS(string_to_cstring);
+    ASSERT_ARGS(string_to_cstring)
     if (! s) {
         Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_UNEXPECTED_NULL,
             "Can't convert NULL string");
@@ -2196,7 +2196,7 @@
 char *
 string_to_cstring_nullable(SHIM_INTERP, ARGIN_NULLOK(const STRING *s))
 {
-    ASSERT_ARGS(string_to_cstring_nullable);
+    ASSERT_ARGS(string_to_cstring_nullable)
     if (!s)
         return NULL;
     else {
@@ -2225,7 +2225,7 @@
 void
 string_cstring_free(ARGIN_NULLOK(char *p))
 {
-    ASSERT_ARGS(string_cstring_free);
+    ASSERT_ARGS(string_cstring_free)
     mem_sys_free((void *)p);
 }
 
@@ -2244,7 +2244,7 @@
 void
 string_pin(PARROT_INTERP, ARGMOD(STRING *s))
 {
-    ASSERT_ARGS(string_pin);
+    ASSERT_ARGS(string_pin)
     char  *memory;
     size_t size;
 
@@ -2280,7 +2280,7 @@
 void
 string_unpin(PARROT_INTERP, ARGMOD(STRING *s))
 {
-    ASSERT_ARGS(string_unpin);
+    ASSERT_ARGS(string_unpin)
     void  *memory;
     size_t size;
 
@@ -2331,7 +2331,7 @@
 size_t
 string_hash(PARROT_INTERP, ARGMOD_NULLOK(STRING *s))
 {
-    ASSERT_ARGS(string_hash);
+    ASSERT_ARGS(string_hash)
     register size_t h;
     const UINTVAL seed = interp->hash_seed;
 
@@ -2367,7 +2367,7 @@
 STRING *
 string_escape_string(PARROT_INTERP, ARGIN_NULLOK(const STRING *src))
 {
-    ASSERT_ARGS(string_escape_string);
+    ASSERT_ARGS(string_escape_string)
     return string_escape_string_delimited(interp, src, (UINTVAL) ~0);
 }
 
@@ -2390,7 +2390,7 @@
 string_escape_string_delimited(PARROT_INTERP,
         ARGIN_NULLOK(const STRING *src), UINTVAL limit)
 {
-    ASSERT_ARGS(string_escape_string_delimited);
+    ASSERT_ARGS(string_escape_string_delimited)
     STRING *result, *hex;
     UINTVAL i, len, charlen;
     String_iter iter;
@@ -2524,7 +2524,7 @@
 string_unescape_cstring(PARROT_INTERP,
     ARGIN(const char *cstring), char delimiter, ARGIN_NULLOK(const char *enc_char))
 {
-    ASSERT_ARGS(string_unescape_cstring);
+    ASSERT_ARGS(string_unescape_cstring)
     size_t          clength = strlen(cstring);
     Parrot_UInt4    r;
     String_iter     iter;
@@ -2627,7 +2627,7 @@
 STRING *
 string_upcase(PARROT_INTERP, ARGIN_NULLOK(const STRING *s))
 {
-    ASSERT_ARGS(string_upcase);
+    ASSERT_ARGS(string_upcase)
     if (STRING_IS_NULL(s)) {
         Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_UNEXPECTED_NULL,
             "Can't upcase NULL string");
@@ -2655,7 +2655,7 @@
 void
 string_upcase_inplace(PARROT_INTERP, ARGMOD_NULLOK(STRING *s))
 {
-    ASSERT_ARGS(string_upcase_inplace);
+    ASSERT_ARGS(string_upcase_inplace)
     if (STRING_IS_NULL(s)) {
         Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_UNEXPECTED_NULL,
             "Can't upcase NULL string");
@@ -2684,7 +2684,7 @@
 STRING *
 string_downcase(PARROT_INTERP, ARGIN(const STRING *s))
 {
-    ASSERT_ARGS(string_downcase);
+    ASSERT_ARGS(string_downcase)
     DECL_CONST_CAST;
     STRING * const dest = string_copy(interp, PARROT_const_cast(STRING *, s));
     string_downcase_inplace(interp, dest);
@@ -2706,7 +2706,7 @@
 void
 string_downcase_inplace(PARROT_INTERP, ARGMOD(STRING *s))
 {
-    ASSERT_ARGS(string_downcase_inplace);
+    ASSERT_ARGS(string_downcase_inplace)
     /*
      * TODO get rid of all the inplace variants. We have for utf8:
      * * 1 string_copy from the non-incase variant
@@ -2735,7 +2735,7 @@
 STRING *
 string_titlecase(PARROT_INTERP, ARGIN(const STRING *s))
 {
-    ASSERT_ARGS(string_titlecase);
+    ASSERT_ARGS(string_titlecase)
     DECL_CONST_CAST;
     STRING * const dest = string_copy(interp, PARROT_const_cast(STRING *, s));
     string_titlecase_inplace(interp, dest);
@@ -2757,7 +2757,7 @@
 void
 string_titlecase_inplace(PARROT_INTERP, ARGMOD(STRING *s))
 {
-    ASSERT_ARGS(string_titlecase_inplace);
+    ASSERT_ARGS(string_titlecase_inplace)
     Parrot_unmake_COW(interp, s);
     CHARSET_TITLECASE(interp, s);
 }
@@ -2780,7 +2780,7 @@
 STRING *
 string_increment(PARROT_INTERP, ARGIN(const STRING *s))
 {
-    ASSERT_ARGS(string_increment);
+    ASSERT_ARGS(string_increment)
     UINTVAL o;
 
     if (string_length(interp, s) != 1)
@@ -2817,7 +2817,7 @@
 const char *
 Parrot_string_cstring(SHIM_INTERP, ARGIN(const STRING *str))
 {
-    ASSERT_ARGS(Parrot_string_cstring);
+    ASSERT_ARGS(Parrot_string_cstring)
     /* TODO handle NUL and friends */
     return str->strstart;
 }
@@ -2841,7 +2841,7 @@
 Parrot_string_is_cclass(PARROT_INTERP, INTVAL flags,
         ARGIN(const STRING *s), UINTVAL offset)
 {
-    ASSERT_ARGS(Parrot_string_is_cclass);
+    ASSERT_ARGS(Parrot_string_is_cclass)
     if (!string_length(interp, s))
         return 0;
 
@@ -2866,7 +2866,7 @@
 Parrot_string_find_cclass(PARROT_INTERP, INTVAL flags, ARGIN_NULLOK(STRING *s),
                           UINTVAL offset, UINTVAL count)
 {
-    ASSERT_ARGS(Parrot_string_find_cclass);
+    ASSERT_ARGS(Parrot_string_find_cclass)
     if (!s)
         return -1;
 
@@ -2892,7 +2892,7 @@
 Parrot_string_find_not_cclass(PARROT_INTERP, INTVAL flags,
     ARGIN_NULLOK(STRING *s), UINTVAL offset, UINTVAL count)
 {
-    ASSERT_ARGS(Parrot_string_find_not_cclass);
+    ASSERT_ARGS(Parrot_string_find_not_cclass)
     if (!s)
         return -1;
 
@@ -2918,7 +2918,7 @@
 Parrot_string_trans_charset(PARROT_INTERP, ARGMOD_NULLOK(STRING *src),
         INTVAL charset_nr, ARGOUT_NULLOK(STRING *dest))
 {
-    ASSERT_ARGS(Parrot_string_trans_charset);
+    ASSERT_ARGS(Parrot_string_trans_charset)
     const CHARSET *new_charset;
 
     if (!src)
@@ -2976,7 +2976,7 @@
 Parrot_string_trans_encoding(PARROT_INTERP, ARGIN_NULLOK(STRING *src),
         INTVAL encoding_nr, ARGOUT_NULLOK(STRING *dest))
 {
-    ASSERT_ARGS(Parrot_string_trans_encoding);
+    ASSERT_ARGS(Parrot_string_trans_encoding)
     const ENCODING *new_encoding;
 
     if (!src)
@@ -3026,7 +3026,7 @@
 STRING *
 string_compose(PARROT_INTERP, ARGIN_NULLOK(STRING *src))
 {
-    ASSERT_ARGS(string_compose);
+    ASSERT_ARGS(string_compose)
     if (!src)
         return NULL;
 
@@ -3054,7 +3054,7 @@
 STRING*
 string_join(PARROT_INTERP, ARGIN_NULLOK(STRING *j), ARGIN(PMC *ar))
 {
-    ASSERT_ARGS(string_join);
+    ASSERT_ARGS(string_join)
     STRING *res;
     STRING *s;
     const int ar_len = VTABLE_elements(interp, ar);
@@ -3094,7 +3094,7 @@
 PMC*
 string_split(PARROT_INTERP, ARGIN(STRING *delim), ARGIN(STRING *str))
 {
-    ASSERT_ARGS(string_split);
+    ASSERT_ARGS(string_split)
     PMC * const res  = pmc_new(interp, enum_class_ResizableStringArray);
     const int   slen = string_length(interp, str);
 
@@ -3166,7 +3166,7 @@
 Parrot_string_split(PARROT_INTERP,
     ARGIN_NULLOK(STRING *delim), ARGIN_NULLOK(STRING *str))
 {
-    ASSERT_ARGS(Parrot_string_split);
+    ASSERT_ARGS(Parrot_string_split)
     return (delim && str) ? string_split(interp, delim, str) : NULL;
 }
 
@@ -3192,7 +3192,7 @@
 uint_to_str(PARROT_INTERP, ARGOUT(char *tc), UHUGEINTVAL num,
     unsigned int base, int minus)
 {
-    ASSERT_ARGS(uint_to_str);
+    ASSERT_ARGS(uint_to_str)
     /* the buffer must be at least as long as this */
     char               *p    = tc + sizeof (UHUGEINTVAL)*8 + 1;
     const char * const  tail = p;
@@ -3235,7 +3235,7 @@
 STRING *
 int_to_str(PARROT_INTERP, ARGOUT(char *tc), HUGEINTVAL num, unsigned int base)
 {
-    ASSERT_ARGS(int_to_str);
+    ASSERT_ARGS(int_to_str)
     const int is_neg = (num < 0);
 
     if (is_neg)

Modified: trunk/src/string_primitives.c
==============================================================================
--- trunk/src/string_primitives.c	(original)
+++ trunk/src/string_primitives.c	Mon Jan  5 15:17:26 2009
@@ -46,7 +46,7 @@
 void
 string_set_data_directory(PARROT_INTERP, ARGIN(const char *dir))
 {
-    ASSERT_ARGS(string_set_data_directory);
+    ASSERT_ARGS(string_set_data_directory)
 #if PARROT_HAS_ICU
     u_setDataDirectory(dir);
 
@@ -84,7 +84,7 @@
 string_unescape_one(PARROT_INTERP, ARGMOD(UINTVAL *offset),
         ARGMOD(STRING *string))
 {
-    ASSERT_ARGS(string_unescape_one);
+    ASSERT_ARGS(string_unescape_one)
     UINTVAL workchar = 0;
     UINTVAL charcount = 0;
     const UINTVAL len = string_length(interp, string);
@@ -322,7 +322,7 @@
 INTVAL
 Parrot_char_digit_value(SHIM_INTERP, UINTVAL character)
 {
-    ASSERT_ARGS(Parrot_char_digit_value);
+    ASSERT_ARGS(Parrot_char_digit_value)
 #if PARROT_HAS_ICU
     return u_charDigitValue(character);
 #else
@@ -349,7 +349,7 @@
 char *
 str_dup(ARGIN(const char *old))
 {
-    ASSERT_ARGS(str_dup);
+    ASSERT_ARGS(str_dup)
     const size_t bytes = strlen(old) + 1;
     char * const copy = (char *)mem_sys_allocate(bytes);
     memcpy(copy, old, bytes);
@@ -376,7 +376,7 @@
 char *
 str_dup_remove_quotes(ARGIN(const char *old))
 {
-    ASSERT_ARGS(str_dup_remove_quotes);
+    ASSERT_ARGS(str_dup_remove_quotes)
     const size_t oldlen = strlen(old) + 1;
 
     /* 2 for the beginning and ending quote chars */

Modified: trunk/src/sub.c
==============================================================================
--- trunk/src/sub.c	(original)
+++ trunk/src/sub.c	Mon Jan  5 15:17:26 2009
@@ -40,7 +40,7 @@
 void
 mark_context_start(void)
 {
-    ASSERT_ARGS(mark_context_start);
+    ASSERT_ARGS(mark_context_start)
     if (++context_gc_mark == 0) context_gc_mark = 1;
 }
 
@@ -58,7 +58,7 @@
 void
 mark_context(PARROT_INTERP, ARGMOD(Parrot_Context* ctx))
 {
-    ASSERT_ARGS(mark_context);
+    ASSERT_ARGS(mark_context)
     PObj *obj;
     int   i;
 
@@ -137,7 +137,7 @@
 Parrot_sub *
 new_sub(PARROT_INTERP)
 {
-    ASSERT_ARGS(new_sub);
+    ASSERT_ARGS(new_sub)
     /* Using system memory until I figure out GC issues */
     Parrot_sub * const newsub = mem_allocate_zeroed_typed(Parrot_sub);
     newsub->seg               = interp->code;
@@ -161,7 +161,7 @@
 Parrot_sub *
 new_closure(PARROT_INTERP)
 {
-    ASSERT_ARGS(new_closure);
+    ASSERT_ARGS(new_closure)
     Parrot_sub * const newsub = new_sub(interp);
     return newsub;
 }
@@ -183,7 +183,7 @@
 Parrot_cont *
 new_continuation(PARROT_INTERP, ARGIN_NULLOK(const Parrot_cont *to))
 {
-    ASSERT_ARGS(new_continuation);
+    ASSERT_ARGS(new_continuation)
     Parrot_cont    * const cc     = mem_allocate_typed(Parrot_cont);
     Parrot_Context * const to_ctx = to ? to->to_ctx : CONTEXT(interp);
 
@@ -219,7 +219,7 @@
 Parrot_cont *
 new_ret_continuation(PARROT_INTERP)
 {
-    ASSERT_ARGS(new_ret_continuation);
+    ASSERT_ARGS(new_ret_continuation)
     Parrot_cont * const cc = mem_allocate_typed(Parrot_cont);
 
     cc->to_ctx          = CONTEXT(interp);
@@ -249,7 +249,7 @@
 Parrot_coro *
 new_coroutine(PARROT_INTERP)
 {
-    ASSERT_ARGS(new_coroutine);
+    ASSERT_ARGS(new_coroutine)
     Parrot_coro * const co = mem_allocate_zeroed_typed(Parrot_coro);
 
     co->seg                = interp->code;
@@ -276,7 +276,7 @@
 PMC *
 new_ret_continuation_pmc(PARROT_INTERP, ARGIN_NULLOK(opcode_t *address))
 {
-    ASSERT_ARGS(new_ret_continuation_pmc);
+    ASSERT_ARGS(new_ret_continuation_pmc)
     PMC* const continuation = pmc_new(interp, enum_class_RetContinuation);
     VTABLE_set_pointer(interp, continuation, address);
     return continuation;
@@ -295,7 +295,7 @@
 void
 invalidate_retc_context(PARROT_INTERP, ARGMOD(PMC *cont))
 {
-    ASSERT_ARGS(invalidate_retc_context);
+    ASSERT_ARGS(invalidate_retc_context)
     Parrot_Context *ctx = PMC_cont(cont)->from_ctx;
     cont = ctx->current_cont;
 
@@ -332,7 +332,7 @@
 STRING*
 Parrot_full_sub_name(PARROT_INTERP, ARGIN_NULLOK(PMC* sub))
 {
-    ASSERT_ARGS(Parrot_full_sub_name);
+    ASSERT_ARGS(Parrot_full_sub_name)
     if (sub && VTABLE_defined(interp, sub)) {
         Parrot_sub * const s = PMC_sub(sub);
 
@@ -399,7 +399,7 @@
 Parrot_Context_get_info(PARROT_INTERP, ARGIN(const Parrot_Context *ctx),
                     ARGOUT(Parrot_Context_info *info))
 {
-    ASSERT_ARGS(Parrot_Context_get_info);
+    ASSERT_ARGS(Parrot_Context_get_info)
     Parrot_sub *sub;
     DECL_CONST_CAST;
 
@@ -491,7 +491,7 @@
 STRING*
 Parrot_Context_infostr(PARROT_INTERP, ARGIN(const Parrot_Context *ctx))
 {
-    ASSERT_ARGS(Parrot_Context_infostr);
+    ASSERT_ARGS(Parrot_Context_infostr)
     Parrot_Context_info info;
     STRING             *res = NULL;
     const char * const  msg = (CONTEXT(interp) == ctx)
@@ -526,7 +526,7 @@
 PMC*
 Parrot_find_pad(PARROT_INTERP, ARGIN(STRING *lex_name), ARGIN(const Parrot_Context *ctx))
 {
-    ASSERT_ARGS(Parrot_find_pad);
+    ASSERT_ARGS(Parrot_find_pad)
     while (1) {
         PMC                    * const lex_pad = ctx->lex_pad;
         const Parrot_Context   * const outer   = ctx->outer_ctx;
@@ -567,7 +567,7 @@
 void
 Parrot_capture_lex(PARROT_INTERP, ARGMOD(PMC *sub_pmc))
 {
-    ASSERT_ARGS(Parrot_capture_lex);
+    ASSERT_ARGS(Parrot_capture_lex)
     Parrot_Context * const ctx      = CONTEXT(interp);
     Parrot_sub * const current_sub  = PMC_sub(ctx->current_sub);
     Parrot_sub * const sub          = PMC_sub(sub_pmc);
@@ -635,7 +635,7 @@
 PMC*
 parrot_new_closure(PARROT_INTERP, ARGIN(PMC *sub_pmc))
 {
-    ASSERT_ARGS(parrot_new_closure);
+    ASSERT_ARGS(parrot_new_closure)
     PMC        * const clos_pmc = VTABLE_clone(interp, sub_pmc);
     Parrot_capture_lex(interp, clos_pmc);
     return clos_pmc;
@@ -656,7 +656,7 @@
 Parrot_continuation_check(PARROT_INTERP, ARGIN(PMC *pmc),
     ARGIN(Parrot_cont *cc))
 {
-    ASSERT_ARGS(Parrot_continuation_check);
+    ASSERT_ARGS(Parrot_continuation_check)
     Parrot_Context *to_ctx       = cc->to_ctx;
     Parrot_Context *from_ctx     = CONTEXT(interp);
 
@@ -686,7 +686,7 @@
 Parrot_continuation_rewind_environment(PARROT_INTERP, SHIM(PMC *pmc),
         ARGIN(Parrot_cont *cc))
 {
-    ASSERT_ARGS(Parrot_continuation_rewind_environment);
+    ASSERT_ARGS(Parrot_continuation_rewind_environment)
     Parrot_Context * const to_ctx = cc->to_ctx;
 
     /* debug print before context is switched */

Modified: trunk/src/thread.c
==============================================================================
--- trunk/src/thread.c	(original)
+++ trunk/src/thread.c	Mon Jan  5 15:17:26 2009
@@ -169,7 +169,7 @@
 static PMC *
 make_local_copy(PARROT_INTERP, ARGIN(Parrot_Interp from), ARGIN(PMC *arg))
 {
-    ASSERT_ARGS(make_local_copy);
+    ASSERT_ARGS(make_local_copy)
     PMC            *ret_val;
     STRING * const  _sub       = interp->vtables[enum_class_Sub]->whoami;
     STRING * const  _multi_sub = interp->vtables[enum_class_MultiSub]->whoami;
@@ -226,7 +226,7 @@
 static Shared_gc_info *
 get_pool(PARROT_INTERP)
 {
-    ASSERT_ARGS(get_pool);
+    ASSERT_ARGS(get_pool)
     return shared_gc_info;
 }
 
@@ -244,7 +244,7 @@
 void
 pt_free_pool(PARROT_INTERP)
 {
-    ASSERT_ARGS(pt_free_pool);
+    ASSERT_ARGS(pt_free_pool)
     if (shared_gc_info) {
         COND_DESTROY(shared_gc_info->gc_cond);
         PARROT_ATOMIC_INT_DESTROY(shared_gc_info->gc_block_level);
@@ -267,7 +267,7 @@
 static PMC *
 make_local_args_copy(PARROT_INTERP, ARGIN(Parrot_Interp old_interp), ARGIN_NULLOK(PMC *args))
 {
-    ASSERT_ARGS(make_local_args_copy);
+    ASSERT_ARGS(make_local_args_copy)
     PMC   *ret_val;
     INTVAL old_size;
     INTVAL i;
@@ -311,7 +311,7 @@
 PMC *
 pt_shared_fixup(PARROT_INTERP, ARGMOD(PMC *pmc))
 {
-    ASSERT_ARGS(pt_shared_fixup);
+    ASSERT_ARGS(pt_shared_fixup)
     /* TODO this will need to change for thread pools
      * XXX should we have a separate interpreter for this?
      */
@@ -366,7 +366,7 @@
 static void
 pt_thread_signal(NOTNULL(Parrot_Interp self), PARROT_INTERP)
 {
-    ASSERT_ARGS(pt_thread_signal);
+    ASSERT_ARGS(pt_thread_signal)
     COND_SIGNAL(interp->thread_data->interp_cond);
 }
 
@@ -386,7 +386,7 @@
 void
 pt_thread_wait_with(PARROT_INTERP, ARGMOD(Parrot_mutex *mutex))
 {
-    ASSERT_ARGS(pt_thread_wait_with);
+    ASSERT_ARGS(pt_thread_wait_with)
     LOCK(interpreter_array_mutex);
     if (interp->thread_data->state & THREAD_STATE_SUSPEND_GC_REQUESTED) {
         interp->thread_data->state |= THREAD_STATE_SUSPENDED_GC;
@@ -440,7 +440,7 @@
 static void
 pt_thread_wait(PARROT_INTERP)
 {
-    ASSERT_ARGS(pt_thread_wait);
+    ASSERT_ARGS(pt_thread_wait)
     if (interp->thread_data->state & THREAD_STATE_SUSPEND_GC_REQUESTED) {
         interp->thread_data->state |= THREAD_STATE_SUSPENDED_GC;
         /* fprintf(stderr, "%p: pt_thread_wait, before sleep, doing GC run\n",
@@ -484,7 +484,7 @@
 static void*
 thread_func(ARGIN_NULLOK(void *arg))
 {
-    ASSERT_ARGS(thread_func);
+    ASSERT_ARGS(thread_func)
     Parrot_runloop   jump_point;
     int              lo_var_ptr;
     UINTVAL          tid;
@@ -574,7 +574,7 @@
 void
 pt_clone_code(Parrot_Interp d, Parrot_Interp s)
 {
-    ASSERT_ARGS(pt_clone_code);
+    ASSERT_ARGS(pt_clone_code)
     Parrot_block_GC_mark(d);
     Interp_flags_SET(d, PARROT_EXTERN_CODE_FLAG);
     d->code = NULL;
@@ -596,7 +596,7 @@
 pt_ns_clone(ARGOUT(Parrot_Interp d), ARGOUT(PMC *dest_ns),
             ARGIN(Parrot_Interp s), ARGIN(PMC *source_ns))
 {
-    ASSERT_ARGS(pt_ns_clone);
+    ASSERT_ARGS(pt_ns_clone)
     PMC * const iter = VTABLE_get_iter(s, source_ns);
     const INTVAL n   = VTABLE_elements(s, source_ns);
     INTVAL i;
@@ -645,7 +645,7 @@
 void
 pt_clone_globals(Parrot_Interp d, Parrot_Interp s)
 {
-    ASSERT_ARGS(pt_clone_globals);
+    ASSERT_ARGS(pt_clone_globals)
     Parrot_block_GC_mark(d);
     pt_ns_clone(d, d->root_namespace, s, s->root_namespace);
     Parrot_unblock_GC_mark(d);
@@ -664,7 +664,7 @@
 void
 pt_thread_prepare_for_run(Parrot_Interp d, Parrot_Interp s)
 {
-    ASSERT_ARGS(pt_thread_prepare_for_run);
+    ASSERT_ARGS(pt_thread_prepare_for_run)
     Parrot_setup_event_func_ptrs(d);
 }
 
@@ -694,7 +694,7 @@
 PMC *
 pt_transfer_sub(ARGOUT(Parrot_Interp d), ARGIN(Parrot_Interp s), ARGIN(PMC *sub))
 {
-    ASSERT_ARGS(pt_transfer_sub);
+    ASSERT_ARGS(pt_transfer_sub)
 #if defined THREAD_DEBUG && THREAD_DEBUG
     Parrot_io_eprintf(s, "copying over subroutine [%Ss]\n",
         Parrot_full_sub_name(s, sub));
@@ -718,7 +718,7 @@
 int
 pt_thread_run(PARROT_INTERP, ARGOUT(PMC *dest_interp), ARGIN(PMC *sub), ARGIN_NULLOK(PMC *arg))
 {
-    ASSERT_ARGS(pt_thread_run);
+    ASSERT_ARGS(pt_thread_run)
     PMC *old_dest_interp;
     PMC *parent;
     Interp * const interpreter = (Parrot_Interp)PMC_data(dest_interp);
@@ -803,7 +803,7 @@
 int
 pt_thread_run_1(PARROT_INTERP, ARGOUT(PMC* dest_interp), ARGIN(PMC* sub), ARGIN(PMC *arg))
 {
-    ASSERT_ARGS(pt_thread_run_1);
+    ASSERT_ARGS(pt_thread_run_1)
     interp->flags |= PARROT_THR_TYPE_1;
     return pt_thread_run(interp, dest_interp, sub, arg);
 }
@@ -822,7 +822,7 @@
 int
 pt_thread_run_2(PARROT_INTERP, ARGOUT(PMC* dest_interp), ARGIN(PMC* sub), ARGIN(PMC *arg))
 {
-    ASSERT_ARGS(pt_thread_run_2);
+    ASSERT_ARGS(pt_thread_run_2)
     interp->flags |= PARROT_THR_TYPE_2;
     return pt_thread_run(interp, dest_interp, sub, arg);
 }
@@ -841,7 +841,7 @@
 int
 pt_thread_run_3(PARROT_INTERP, ARGOUT(PMC* dest_interp), ARGIN(PMC* sub), ARGIN(PMC *arg))
 {
-    ASSERT_ARGS(pt_thread_run_3);
+    ASSERT_ARGS(pt_thread_run_3)
     interp->flags |= PARROT_THR_TYPE_3;
     return pt_thread_run(interp, dest_interp, sub, arg);
 }
@@ -859,7 +859,7 @@
 void
 pt_thread_yield(void)
 {
-    ASSERT_ARGS(pt_thread_yield);
+    ASSERT_ARGS(pt_thread_yield)
     YIELD;
 }
 
@@ -877,7 +877,7 @@
 static Parrot_Interp
 pt_check_tid(UINTVAL tid, ARGIN(const char *from))
 {
-    ASSERT_ARGS(pt_check_tid);
+    ASSERT_ARGS(pt_check_tid)
     if (tid >= n_interpreters) {
         UNLOCK(interpreter_array_mutex);
         exit_fatal(1, "%s: illegal thread tid %d", from, tid);
@@ -906,7 +906,7 @@
 static void
 mutex_unlock(ARGMOD(void *arg))
 {
-    ASSERT_ARGS(mutex_unlock);
+    ASSERT_ARGS(mutex_unlock)
     UNLOCK(*(Parrot_mutex *) arg);
 }
 
@@ -925,7 +925,7 @@
 static int
 is_suspended_for_gc(PARROT_INTERP)
 {
-    ASSERT_ARGS(is_suspended_for_gc);
+    ASSERT_ARGS(is_suspended_for_gc)
     if (!interp)
         return 1;
     else if (interp->thread_data->wants_shared_gc)
@@ -954,7 +954,7 @@
 static QUEUE_ENTRY *
 remove_queued_suspend_gc(PARROT_INTERP)
 {
-    ASSERT_ARGS(remove_queued_suspend_gc);
+    ASSERT_ARGS(remove_queued_suspend_gc)
     parrot_event *ev    = NULL;
     QUEUE        *queue = interp->task_queue;
     QUEUE_ENTRY  *prev  = NULL;
@@ -1009,7 +1009,7 @@
 static int
 pt_gc_count_threads(PARROT_INTERP)
 {
-    ASSERT_ARGS(pt_gc_count_threads);
+    ASSERT_ARGS(pt_gc_count_threads)
     UINTVAL i;
     int     count = 0;
 
@@ -1043,7 +1043,7 @@
 pt_gc_wait_for_stage(PARROT_INTERP, thread_gc_stage_enum from_stage,
             thread_gc_stage_enum to_stage)
 {
-    ASSERT_ARGS(pt_gc_wait_for_stage);
+    ASSERT_ARGS(pt_gc_wait_for_stage)
     Shared_gc_info * const info = shared_gc_info;
     int             thread_count;
 
@@ -1096,7 +1096,7 @@
 static void
 pt_gc_wakeup_check(PARROT_INTERP)
 {
-    ASSERT_ARGS(pt_gc_wakeup_check);
+    ASSERT_ARGS(pt_gc_wakeup_check)
     Shared_gc_info * const info = shared_gc_info;
     int             thread_count;
 
@@ -1128,7 +1128,7 @@
 static void
 pt_suspend_one_for_gc(PARROT_INTERP)
 {
-    ASSERT_ARGS(pt_suspend_one_for_gc);
+    ASSERT_ARGS(pt_suspend_one_for_gc)
     DEBUG_ONLY(fprintf(stderr, "suspend one: %p\n", interp));
     if (is_suspended_for_gc(interp)) {
         DEBUG_ONLY(fprintf(stderr, "ignoring already suspended\n"));
@@ -1160,7 +1160,7 @@
 static void
 pt_suspend_all_for_gc(PARROT_INTERP)
 {
-    ASSERT_ARGS(pt_suspend_all_for_gc);
+    ASSERT_ARGS(pt_suspend_all_for_gc)
     UINTVAL i;
 
     DEBUG_ONLY(fprintf(stderr, "suspend_all_for_gc [interp=%p]\n", interp));
@@ -1233,7 +1233,7 @@
 void
 pt_suspend_self_for_gc(PARROT_INTERP)
 {
-    ASSERT_ARGS(pt_suspend_self_for_gc);
+    ASSERT_ARGS(pt_suspend_self_for_gc)
     PARROT_ASSERT(interp);
     PARROT_ASSERT(!interp->arena_base->DOD_block_level);
     DEBUG_ONLY(fprintf(stderr, "%p: suspend_self_for_gc\n", interp));
@@ -1282,7 +1282,7 @@
 PMC*
 pt_thread_join(NOTNULL(Parrot_Interp parent), UINTVAL tid)
 {
-    ASSERT_ARGS(pt_thread_join);
+    ASSERT_ARGS(pt_thread_join)
     int           state;
     Parrot_Interp interp;
 
@@ -1393,7 +1393,7 @@
 void
 pt_join_threads(PARROT_INTERP)
 {
-    ASSERT_ARGS(pt_join_threads);
+    ASSERT_ARGS(pt_join_threads)
     size_t          i;
     pt_free_pool(interp);
 
@@ -1444,7 +1444,7 @@
 static Parrot_Interp
 detach(UINTVAL tid)
 {
-    ASSERT_ARGS(detach);
+    ASSERT_ARGS(detach)
     Parrot_Interp interp;
 
     LOCK(interpreter_array_mutex);
@@ -1481,7 +1481,7 @@
 void
 pt_thread_detach(UINTVAL tid)
 {
-    ASSERT_ARGS(pt_thread_detach);
+    ASSERT_ARGS(pt_thread_detach)
     (void) detach(tid);
 }
 
@@ -1498,7 +1498,7 @@
 void
 pt_thread_kill(UINTVAL tid)
 {
-    ASSERT_ARGS(pt_thread_kill);
+    ASSERT_ARGS(pt_thread_kill)
     PARROT_INTERP = detach(tid);
 
     /* schedule a terminate event for that interpreter */
@@ -1526,7 +1526,7 @@
 void
 pt_add_to_interpreters(PARROT_INTERP, ARGIN_NULLOK(Parrot_Interp new_interp))
 {
-    ASSERT_ARGS(pt_add_to_interpreters);
+    ASSERT_ARGS(pt_add_to_interpreters)
     size_t i;
     DEBUG_ONLY(fprintf(stderr, "interp = %p\n", interp));
 
@@ -1613,7 +1613,7 @@
 void
 pt_DOD_start_mark(PARROT_INTERP)
 {
-    ASSERT_ARGS(pt_DOD_start_mark);
+    ASSERT_ARGS(pt_DOD_start_mark)
     Shared_gc_info *info;
     int             block_level;
 
@@ -1691,7 +1691,7 @@
 void
 pt_DOD_mark_root_finished(PARROT_INTERP)
 {
-    ASSERT_ARGS(pt_DOD_mark_root_finished);
+    ASSERT_ARGS(pt_DOD_mark_root_finished)
     if (!running_threads)
         return;
     /*
@@ -1716,7 +1716,7 @@
 void
 pt_DOD_stop_mark(PARROT_INTERP)
 {
-    ASSERT_ARGS(pt_DOD_stop_mark);
+    ASSERT_ARGS(pt_DOD_stop_mark)
     if (!running_threads)
         return;
     /*
@@ -1759,7 +1759,7 @@
 void
 Parrot_shared_DOD_block(PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_shared_DOD_block);
+    ASSERT_ARGS(Parrot_shared_DOD_block)
     Shared_gc_info * const info = get_pool(interp);
 
     if (info) {
@@ -1783,7 +1783,7 @@
 void
 Parrot_shared_DOD_unblock(PARROT_INTERP)
 {
-    ASSERT_ARGS(Parrot_shared_DOD_unblock);
+    ASSERT_ARGS(Parrot_shared_DOD_unblock)
     Shared_gc_info * const info = get_pool(interp);
     if (info) {
         int level;

Modified: trunk/src/trace.c
==============================================================================
--- trunk/src/trace.c	(original)
+++ trunk/src/trace.c	Mon Jan  5 15:17:26 2009
@@ -56,7 +56,7 @@
 static STRING*
 trace_class_name(ARGIN(const PMC* pmc))
 {
-    ASSERT_ARGS(trace_class_name);
+    ASSERT_ARGS(trace_class_name)
     STRING *class_name;
     if (PObj_is_class_TEST(pmc)) {
         SLOTTYPE * const class_array = (SLOTTYPE *)PMC_data(pmc);
@@ -82,7 +82,7 @@
 void
 trace_pmc_dump(PARROT_INTERP, ARGIN_NULLOK(PMC *pmc))
 {
-    ASSERT_ARGS(trace_pmc_dump);
+    ASSERT_ARGS(trace_pmc_dump)
     Interp * const debugger = interp->debugger;
 
     if (!pmc) {
@@ -172,7 +172,7 @@
 int
 trace_key_dump(PARROT_INTERP, ARGIN(const PMC *key))
 {
-    ASSERT_ARGS(trace_key_dump);
+    ASSERT_ARGS(trace_key_dump)
     Interp * const debugger = interp->debugger;
 
     int len = Parrot_io_eprintf(debugger, "[");
@@ -255,7 +255,7 @@
         ARGIN(const opcode_t *code_start),
         ARGIN(const opcode_t *pc))
 {
-    ASSERT_ARGS(trace_op_dump);
+    ASSERT_ARGS(trace_op_dump)
     INTVAL s, n;
     int more = 0, var_args;
     Interp * const debugger = interp->debugger;
@@ -471,7 +471,7 @@
         ARGIN(const opcode_t *code_end),
         ARGIN_NULLOK(const opcode_t *pc))
 {
-    ASSERT_ARGS(trace_op);
+    ASSERT_ARGS(trace_op)
     if (!pc) {
         return;
     }

Modified: trunk/src/tsq.c
==============================================================================
--- trunk/src/tsq.c	(original)
+++ trunk/src/tsq.c	Mon Jan  5 15:17:26 2009
@@ -34,7 +34,7 @@
 QUEUE_ENTRY *
 pop_entry(ARGMOD(QUEUE *queue))
 {
-    ASSERT_ARGS(pop_entry);
+    ASSERT_ARGS(pop_entry)
     QUEUE_ENTRY *returnval;
     queue_lock(queue);
     returnval = nosync_pop_entry(queue);
@@ -59,7 +59,7 @@
 QUEUE_ENTRY *
 peek_entry(ARGIN(const QUEUE *queue))
 {
-    ASSERT_ARGS(peek_entry);
+    ASSERT_ARGS(peek_entry)
     return queue->head;
 }
 
@@ -79,7 +79,7 @@
 QUEUE_ENTRY *
 nosync_pop_entry(ARGMOD(QUEUE *queue))
 {
-    ASSERT_ARGS(nosync_pop_entry);
+    ASSERT_ARGS(nosync_pop_entry)
     QUEUE_ENTRY *returnval;
     if (!queue->head) {
         return NULL;
@@ -111,7 +111,7 @@
 QUEUE_ENTRY *
 wait_for_entry(ARGMOD(QUEUE *queue))
 {
-    ASSERT_ARGS(wait_for_entry);
+    ASSERT_ARGS(wait_for_entry)
     QUEUE_ENTRY *returnval;
 
     queue_lock(queue);
@@ -137,7 +137,7 @@
 void
 push_entry(ARGMOD(QUEUE *queue), ARGIN(QUEUE_ENTRY *entry))
 {
-    ASSERT_ARGS(push_entry);
+    ASSERT_ARGS(push_entry)
     queue_lock(queue);
     /* Is there something in the queue? */
     if (queue->tail) {
@@ -165,7 +165,7 @@
 void
 unshift_entry(ARGMOD(QUEUE *queue), ARGIN(QUEUE_ENTRY *entry))
 {
-    ASSERT_ARGS(unshift_entry);
+    ASSERT_ARGS(unshift_entry)
     QUEUE_ENTRY *cur;
 
     queue_lock(queue);
@@ -197,7 +197,7 @@
 void
 nosync_insert_entry(ARGMOD(QUEUE *queue), ARGIN(QUEUE_ENTRY *entry))
 {
-    ASSERT_ARGS(nosync_insert_entry);
+    ASSERT_ARGS(nosync_insert_entry)
     QUEUE_ENTRY *cur = queue->head;
     QUEUE_ENTRY *prev;
     parrot_event *event;
@@ -249,7 +249,7 @@
 void
 insert_entry(ARGMOD(QUEUE *queue), ARGIN(QUEUE_ENTRY *entry))
 {
-    ASSERT_ARGS(insert_entry);
+    ASSERT_ARGS(insert_entry)
     queue_lock(queue);
     nosync_insert_entry(queue, entry);
     queue_signal(queue);
@@ -269,7 +269,7 @@
 void
 queue_lock(ARGMOD(QUEUE *queue))
 {
-    ASSERT_ARGS(queue_lock);
+    ASSERT_ARGS(queue_lock)
     LOCK(queue->queue_mutex);
 }
 
@@ -286,7 +286,7 @@
 void
 queue_unlock(ARGMOD(QUEUE *queue))
 {
-    ASSERT_ARGS(queue_unlock);
+    ASSERT_ARGS(queue_unlock)
     UNLOCK(queue->queue_mutex);
 }
 
@@ -303,7 +303,7 @@
 void
 queue_broadcast(ARGMOD(QUEUE *queue))
 {
-    ASSERT_ARGS(queue_broadcast);
+    ASSERT_ARGS(queue_broadcast)
     COND_BROADCAST(queue->queue_condition);
 }
 
@@ -320,7 +320,7 @@
 void
 queue_signal(ARGMOD(QUEUE *queue))
 {
-    ASSERT_ARGS(queue_signal);
+    ASSERT_ARGS(queue_signal)
     COND_SIGNAL(queue->queue_condition);
 }
 
@@ -337,7 +337,7 @@
 void
 queue_wait(ARGMOD(QUEUE *queue))
 {
-    ASSERT_ARGS(queue_wait);
+    ASSERT_ARGS(queue_wait)
     COND_WAIT(queue->queue_condition, queue->queue_mutex);
 }
 
@@ -354,7 +354,7 @@
 void
 queue_timedwait(ARGMOD(QUEUE *queue), ARGIN(const struct timespec *abs_time))
 {
-    ASSERT_ARGS(queue_timedwait);
+    ASSERT_ARGS(queue_timedwait)
     COND_TIMED_WAIT(queue->queue_condition, queue->queue_mutex, abs_time);
 }
 
@@ -373,7 +373,7 @@
 QUEUE*
 queue_init(UINTVAL prio)
 {
-    ASSERT_ARGS(queue_init);
+    ASSERT_ARGS(queue_init)
     QUEUE * const queue = mem_allocate_typed(QUEUE);
 
     queue->head = queue->tail = NULL;
@@ -396,7 +396,7 @@
 void
 queue_destroy(ARGMOD(QUEUE *queue))
 {
-    ASSERT_ARGS(queue_destroy);
+    ASSERT_ARGS(queue_destroy)
     if (peek_entry(queue))
         exit_fatal(1, "Queue not empty on destroy");
 

Modified: trunk/src/utils.c
==============================================================================
--- trunk/src/utils.c	(original)
+++ trunk/src/utils.c	Mon Jan  5 15:17:26 2009
@@ -122,7 +122,7 @@
 INTVAL
 intval_mod(INTVAL i2, INTVAL i3)
 {
-    ASSERT_ARGS(intval_mod);
+    ASSERT_ARGS(intval_mod)
     INTVAL z = i3;
 
     if (z == 0)
@@ -169,7 +169,7 @@
 FLOATVAL
 floatval_mod(FLOATVAL n2, FLOATVAL n3)
 {
-    ASSERT_ARGS(floatval_mod);
+    ASSERT_ARGS(floatval_mod)
 #ifdef __LCC__
 
     /* Another workaround for buggy code generation in the lcc compiler-
@@ -236,7 +236,7 @@
 static void
 next_rand(_rand_buf X)
 {
-    ASSERT_ARGS(next_rand);
+    ASSERT_ARGS(next_rand)
     unsigned short lo, mid, hi;
     unsigned int t;
 
@@ -269,7 +269,7 @@
 static FLOATVAL
 _erand48(_rand_buf buf)
 {
-    ASSERT_ARGS(_erand48);
+    ASSERT_ARGS(_erand48)
     FLOATVAL r;
     next_rand(buf);
     r = ((buf[0] / 65536.0 + buf[1]) / 65536.0 + buf[2]) / 65536.0;
@@ -289,7 +289,7 @@
 static FLOATVAL
 _drand48(void)
 {
-    ASSERT_ARGS(_drand48);
+    ASSERT_ARGS(_drand48)
     return _erand48(last_rand);
 }
 
@@ -306,7 +306,7 @@
 static long
 _jrand48(_rand_buf buf)
 {
-    ASSERT_ARGS(_jrand48);
+    ASSERT_ARGS(_jrand48)
     long ret;
     next_rand(buf);
     ret = buf[2] << 16 | buf[1];
@@ -326,7 +326,7 @@
 static long
 _nrand48(_rand_buf buf)
 {
-    ASSERT_ARGS(_nrand48);
+    ASSERT_ARGS(_nrand48)
     return _jrand48(buf) & 0x7fffffff;
 }
 
@@ -343,7 +343,7 @@
 static long
 _lrand48(void)
 {
-    ASSERT_ARGS(_lrand48);
+    ASSERT_ARGS(_lrand48)
     return _nrand48(last_rand);
 }
 
@@ -360,7 +360,7 @@
 static long
 _mrand48(void)
 {
-    ASSERT_ARGS(_mrand48);
+    ASSERT_ARGS(_mrand48)
     return _jrand48(last_rand);
 }
 
@@ -378,7 +378,7 @@
 static void
 _srand48(long seed)
 {
-    ASSERT_ARGS(_srand48);
+    ASSERT_ARGS(_srand48)
     last_rand[0] = SEED_LO;
     last_rand[1] = (unsigned short)(seed & 0xffff);
     last_rand[2] = (unsigned short)((seed >> 16) & 0xffff);
@@ -423,7 +423,7 @@
 FLOATVAL
 Parrot_float_rand(INTVAL how_random)
 {
-    ASSERT_ARGS(Parrot_float_rand);
+    ASSERT_ARGS(Parrot_float_rand)
     UNUSED(how_random);
 
     return _drand48();          /* [0.0..1.0] */
@@ -445,7 +445,7 @@
 INTVAL
 Parrot_uint_rand(INTVAL how_random)
 {
-    ASSERT_ARGS(Parrot_uint_rand);
+    ASSERT_ARGS(Parrot_uint_rand)
     UNUSED(how_random);
 
     return _lrand48();          /* [0..2^31] */
@@ -467,7 +467,7 @@
 INTVAL
 Parrot_int_rand(INTVAL how_random)
 {
-    ASSERT_ARGS(Parrot_int_rand);
+    ASSERT_ARGS(Parrot_int_rand)
     UNUSED(how_random);
 
     return _mrand48();          /* [-2^31..2^31] */
@@ -489,7 +489,7 @@
 INTVAL
 Parrot_range_rand(INTVAL from, INTVAL to, INTVAL how_random)
 {
-    ASSERT_ARGS(Parrot_range_rand);
+    ASSERT_ARGS(Parrot_range_rand)
     return (INTVAL)(from + ((double)(to - from))
                      * Parrot_float_rand(how_random));
 }
@@ -508,7 +508,7 @@
 void
 Parrot_srand(INTVAL seed)
 {
-    ASSERT_ARGS(Parrot_srand);
+    ASSERT_ARGS(Parrot_srand)
     _srand48(seed);
 }
 
@@ -542,7 +542,7 @@
 PMC*
 tm_to_array(PARROT_INTERP, ARGIN(const struct tm *tm))
 {
-    ASSERT_ARGS(tm_to_array);
+    ASSERT_ARGS(tm_to_array)
     PMC * const Array = pmc_new(interp, enum_class_Array);
 
     VTABLE_set_integer_native(interp, Array, 9);
@@ -578,7 +578,7 @@
 Parrot_byte_index(SHIM_INTERP, ARGIN(const STRING *base),
         ARGIN(const STRING *search), UINTVAL start_offset)
 {
-    ASSERT_ARGS(Parrot_byte_index);
+    ASSERT_ARGS(Parrot_byte_index)
     const char * const str_start  = base->strstart;
     const INTVAL       str_len    = base->strlen;
     const char * const search_str = search->strstart;
@@ -626,7 +626,7 @@
 Parrot_byte_rindex(SHIM_INTERP, ARGIN(const STRING *base),
         ARGIN(const STRING *search), UINTVAL start_offset)
 {
-    ASSERT_ARGS(Parrot_byte_rindex);
+    ASSERT_ARGS(Parrot_byte_rindex)
     const INTVAL searchlen          = search->strlen;
     const char * const search_start = search->strstart;
     UINTVAL max_possible_offset     = (base->strlen - search->strlen);
@@ -674,7 +674,7 @@
 static void
 rec_climb_back_and_mark(int node_index, ARGIN(parrot_prm_context* c))
 {
-    ASSERT_ARGS(rec_climb_back_and_mark);
+    ASSERT_ARGS(rec_climb_back_and_mark)
     const int node = c->dest_regs[node_index];
     const int pred = c->src_regs[node_index];
     const int pred_index = c->reg_to_index[pred];
@@ -716,7 +716,7 @@
 static void
 process_cycle_without_exit(int node_index, ARGIN(parrot_prm_context* c))
 {
-    ASSERT_ARGS(process_cycle_without_exit);
+    ASSERT_ARGS(process_cycle_without_exit)
     const int pred = c->src_regs[node_index];
 
     /* let's try the alternate move function*/
@@ -799,7 +799,7 @@
         reg_move_func mov_alt,
         ARGIN(void *info))
 {
-    ASSERT_ARGS(Parrot_register_move);
+    ASSERT_ARGS(Parrot_register_move)
     int i;
     int max_reg       = 0;
     int* nb_succ      = NULL;
@@ -887,7 +887,7 @@
 static INTVAL
 COMPARE(PARROT_INTERP, ARGIN(void *a), ARGIN(void *b), ARGIN(PMC *cmp))
 {
-    ASSERT_ARGS(COMPARE);
+    ASSERT_ARGS(COMPARE)
     if (PMC_IS_NULL(cmp))
         return VTABLE_cmp(interp, (PMC *)a, (PMC *)b);
 
@@ -903,7 +903,7 @@
 void
 Parrot_quicksort(PARROT_INTERP, ARGMOD(void **data), UINTVAL n, ARGIN(PMC *cmp))
 {
-    ASSERT_ARGS(Parrot_quicksort);
+    ASSERT_ARGS(Parrot_quicksort)
     while (n > 1) {
         UINTVAL i, j, ln, rn;
         void *temp;

Modified: trunk/src/vtables.c
==============================================================================
--- trunk/src/vtables.c	(original)
+++ trunk/src/vtables.c	Mon Jan  5 15:17:26 2009
@@ -37,7 +37,7 @@
 VTABLE *
 Parrot_new_vtable(SHIM_INTERP)
 {
-    ASSERT_ARGS(Parrot_new_vtable);
+    ASSERT_ARGS(Parrot_new_vtable)
     return mem_allocate_zeroed_typed(VTABLE);
 }
 
@@ -57,7 +57,7 @@
 VTABLE *
 Parrot_clone_vtable(PARROT_INTERP, ARGIN(const VTABLE *base_vtable))
 {
-    ASSERT_ARGS(Parrot_clone_vtable);
+    ASSERT_ARGS(Parrot_clone_vtable)
     VTABLE * const new_vtable = mem_allocate_typed(VTABLE);
 
     STRUCT_COPY(new_vtable, base_vtable);
@@ -88,7 +88,7 @@
 void
 Parrot_destroy_vtable(PARROT_INTERP, ARGMOD(VTABLE *vtable))
 {
-    ASSERT_ARGS(Parrot_destroy_vtable);
+    ASSERT_ARGS(Parrot_destroy_vtable)
     /* We sometimes get a type number allocated without any corresponding
      * vtable. E.g. if you load perl_group, perlscalar is this way.  */
 
@@ -128,7 +128,7 @@
 void
 parrot_alloc_vtables(PARROT_INTERP)
 {
-    ASSERT_ARGS(parrot_alloc_vtables);
+    ASSERT_ARGS(parrot_alloc_vtables)
     interp->vtables          = mem_allocate_n_zeroed_typed(PARROT_MAX_CLASSES, VTABLE *);
     interp->n_vtable_max     = enum_class_core_max;
     interp->n_vtable_alloced = PARROT_MAX_CLASSES - 1;
@@ -147,7 +147,7 @@
 void
 parrot_realloc_vtables(PARROT_INTERP)
 {
-    ASSERT_ARGS(parrot_realloc_vtables);
+    ASSERT_ARGS(parrot_realloc_vtables)
     /* 16 bigger seems reasonable, though it's only a pointer
        table and we could get bigger without blowing much memory
        */
@@ -176,7 +176,7 @@
 void
 parrot_free_vtables(PARROT_INTERP)
 {
-    ASSERT_ARGS(parrot_free_vtables);
+    ASSERT_ARGS(parrot_free_vtables)
     int i;
 
     for (i = 1; i < interp->n_vtable_max; i++)
@@ -198,7 +198,7 @@
 void
 mark_vtables(PARROT_INTERP)
 {
-    ASSERT_ARGS(mark_vtables);
+    ASSERT_ARGS(mark_vtables)
     INTVAL i;
 
     for (i = 1; i < interp->n_vtable_max; i++) {

Modified: trunk/src/warnings.c
==============================================================================
--- trunk/src/warnings.c	(original)
+++ trunk/src/warnings.c	Mon Jan  5 15:17:26 2009
@@ -48,7 +48,7 @@
 void
 print_pbc_location(PARROT_INTERP)
 {
-    ASSERT_ARGS(print_pbc_location);
+    ASSERT_ARGS(print_pbc_location)
     Interp * const tracer = interp->debugger ? interp->debugger : interp;
     Parrot_io_eprintf(tracer, "%Ss\n",
             Parrot_Context_infostr(interp,
@@ -68,7 +68,7 @@
 static INTVAL
 print_warning(PARROT_INTERP, ARGIN_NULLOK(STRING *msg))
 {
-    ASSERT_ARGS(print_warning);
+    ASSERT_ARGS(print_warning)
     if (!msg)
         Parrot_io_puts(interp, Parrot_io_STDERR(interp), "Unknown warning\n");
     else {
@@ -105,7 +105,7 @@
 Parrot_warn(PARROT_INTERP, INTVAL warnclass,
             ARGIN(const char *message), ...)
 {
-    ASSERT_ARGS(Parrot_warn);
+    ASSERT_ARGS(Parrot_warn)
     if (!PARROT_WARNINGS_test(interp, warnclass))
         return 2;
     else {

Modified: trunk/t/codingstd/c_arg_assert.t
==============================================================================
--- trunk/t/codingstd/c_arg_assert.t	(original)
+++ trunk/t/codingstd/c_arg_assert.t	Mon Jan  5 15:17:26 2009
@@ -48,11 +48,11 @@
             if($line =~ /^#define ASSERT_ARGS_([_a-zA-Z0-9]+)\s/s) {
                 push(@defines, $1);
             }
-            if($line =~ /^\s+ASSERT_ARGS\(([_a-zA-Z0-9]+)\);/) {
+            if($line =~ /^\s+ASSERT_ARGS\(([_a-zA-Z0-9]+)\)$/) {
                 my $func = $1;
                 $usages{$func} = 1;
                 my $fulltext = join('',@lines);
-                if($fulltext !~ /\n\{\s*ASSERT_ARGS\($func\);/s) {
+                if($fulltext !~ /\n\{\s*ASSERT_ARGS\($func\)\n/s) {
                     push(@offsets, $func);
                 }
             }



nntp.perl.org: Perl Programming lists via nntp and http.
Comments to Ask Bjørn Hansen at ask@perl.org | Group listing | About