[svn:parrot] r35663 - in trunk: src t/codingstd

Author: infinoid
Date: Fri Jan 16 20:47:44 2009
New Revision: 35663

Modified:
   trunk/src/packdump.c
   trunk/t/codingstd/c_arg_assert.t

Log:
[codingstd] There doesn't seem to be a codingstd test requiring a
function's opening curly brace to be on its own line.  Thus, the
regex in c_arg_assert is too strict.  Relax it to allow a newline
*or* a space before the opening curly.

Modified: trunk/src/packdump.c
==============================================================================
--- trunk/src/packdump.c	(original)
+++ trunk/src/packdump.c	Fri Jan 16 20:47:44 2009
@@ -119,11 +119,11 @@
     "is_object"
 };
 
-static void
-pobj_flag_dump(PARROT_INTERP, ARGIN_NULLOK(long flags))
 /* Given a word of flags, generate a dump line of the whole word in hex,
  * followed by individual bits.
  */
+static void
+pobj_flag_dump(PARROT_INTERP, ARGIN_NULLOK(long flags))
 {
     ASSERT_ARGS(pobj_flag_dump)
     INTVAL idx = 0;

Modified: trunk/t/codingstd/c_arg_assert.t
==============================================================================
--- trunk/t/codingstd/c_arg_assert.t	(original)
+++ trunk/t/codingstd/c_arg_assert.t	Fri Jan 16 20:47:44 2009
@@ -56,7 +56,7 @@
                 $usages{$func} = 1;
 
                 # The ASSERT_ARGS macro needs to follow an opening curly bracket
-                if ($fulltext !~ m/\n\{\s*ASSERT_ARGS\($func\)\n/s) {
+                if ($fulltext !~ m/\)(?:\n| )\{\s*ASSERT_ARGS\($func\)\n/s) {
                     push @misplaced, [$func, $path];
                 }
             }