[svn:parrot] r35010 - trunk/compilers/imcc

Author: infinoid
Date: Mon Jan  5 16:00:25 2009
New Revision: 35010

Modified:
   trunk/compilers/imcc/imcc.y
   trunk/compilers/imcc/imcparser.c

Log:
[cage] Remove trailing semicolons from ASSERT_ARGS tags in imcc.y.
Also, tag the untagged IMCC_itcall_sub() function with ASSERT_ARGS.

Modified: trunk/compilers/imcc/imcc.y
==============================================================================
--- trunk/compilers/imcc/imcc.y	(original)
+++ trunk/compilers/imcc/imcc.y	Mon Jan  5 16:00:25 2009
@@ -343,7 +343,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;
@@ -377,7 +377,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;
@@ -432,7 +432,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;
@@ -490,7 +490,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)
@@ -509,7 +509,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;
 }
@@ -518,7 +518,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;
@@ -534,7 +534,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;
 
@@ -546,7 +546,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;
@@ -567,7 +567,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);
 }
@@ -581,7 +581,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);
@@ -598,7 +598,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);
 }
@@ -607,7 +607,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;
@@ -628,7 +628,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);
@@ -644,7 +644,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;
 
@@ -654,6 +654,7 @@
 void
 IMCC_itcall_sub(PARROT_INTERP, ARGIN(SymReg *sub))
 {
+    ASSERT_ARGS(IMCC_itcall_sub)
     IMCC_INFO(interp)->cur_call->pcc_sub->sub = sub;
     if (IMCC_INFO(interp)->cur_obj) {
         if (IMCC_INFO(interp)->cur_obj->set != 'P')
@@ -670,7 +671,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];
@@ -691,7 +692,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;
@@ -710,7 +711,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;
@@ -723,7 +724,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;
 
@@ -735,7 +736,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;
 
@@ -747,7 +748,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;
 
@@ -759,7 +760,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");
@@ -770,7 +771,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/imcparser.c
==============================================================================
--- trunk/compilers/imcc/imcparser.c	(original)
+++ trunk/compilers/imcc/imcparser.c	Mon Jan  5 16:00:25 2009
@@ -978,6 +978,7 @@
 void
 IMCC_itcall_sub(PARROT_INTERP, ARGIN(SymReg *sub))
 {
+    ASSERT_ARGS(IMCC_itcall_sub)
     IMCC_INFO(interp)->cur_call->pcc_sub->sub = sub;
     if (IMCC_INFO(interp)->cur_obj) {
         if (IMCC_INFO(interp)->cur_obj->set != 'P')

• [svn:parrot] r35010 - trunk/compilers/imcc by infinoid