Author: chromatic
Date: Sat Jun 2 15:40:43 2007
New Revision: 18768
Modified:
trunk/include/parrot/string_funcs.h
trunk/tools/build/headerize.pl
Log:
[Tools] Fix the headerizer program not to commit egregious coding standard
violations.
Also remove a the coding standard violations added in r18767.
Modified: trunk/include/parrot/string_funcs.h
==============================================================================
--- trunk/include/parrot/string_funcs.h (original)
+++ trunk/include/parrot/string_funcs.h Sat Jun 2 15:40:43 2007
@@ -21,295 +21,295 @@
/* HEADERIZER BEGIN: src/string.c */
PARROT_API STRING * Parrot_make_COW_reference( Interp *interp,
- STRING *s /*NULLOK*/ );
+ STRING *s /*NULLOK*/ );
PARROT_API STRING* Parrot_reuse_COW_reference( Interp *interp,
- STRING *s /*NULLOK*/,
- STRING *d /*NN*/ );
+ STRING *s /*NULLOK*/,
+ STRING *d /*NN*/ );
PARROT_API const char * Parrot_string_cstring( Interp *interp,
- const STRING *str /*NN*/ );
+ const STRING *str /*NN*/ );
PARROT_API INTVAL Parrot_string_find_cclass( Interp *interp,
- INTVAL flags,
- STRING *s,
- UINTVAL offset,
- UINTVAL count );
+ INTVAL flags,
+ STRING *s,
+ UINTVAL offset,
+ UINTVAL count );
PARROT_API INTVAL Parrot_string_find_not_cclass( Interp *interp,
- INTVAL flags,
- STRING *s,
- UINTVAL offset,
- UINTVAL count );
+ INTVAL flags,
+ STRING *s,
+ UINTVAL offset,
+ UINTVAL count );
PARROT_API INTVAL Parrot_string_is_cclass( Interp *interp,
- INTVAL flags,
- STRING *s,
- UINTVAL offset );
+ INTVAL flags,
+ STRING *s,
+ UINTVAL offset );
PARROT_API STRING* Parrot_string_trans_charset( Interp *interp,
- STRING *src,
- INTVAL charset_nr,
- STRING *dest );
+ STRING *src,
+ INTVAL charset_nr,
+ STRING *dest );
PARROT_API STRING* Parrot_string_trans_encoding( Interp *interp,
- STRING *src,
- INTVAL encoding_nr,
- STRING *dest );
+ STRING *src,
+ INTVAL encoding_nr,
+ STRING *dest );
PARROT_API void Parrot_unmake_COW( Interp *interp,
- STRING *s /*NN*/ );
+ STRING *s /*NN*/ );
PARROT_API STRING * const_string( Interp *interp,
- const char *buffer /*NN*/ );
+ const char *buffer /*NN*/ );
PARROT_API STRING * int_to_str( Interp *interp,
- char *tc /*NN*/,
- HUGEINTVAL num,
- char base );
+ char *tc /*NN*/,
+ HUGEINTVAL num,
+ char base );
PARROT_API STRING * string_append( Interp *interp,
- STRING *a /*NULLOK*/,
- STRING *b /*NULLOK*/ );
+ STRING *a /*NULLOK*/,
+ STRING *b /*NULLOK*/ );
PARROT_API STRING * string_bitwise_and( Interp *interp,
- STRING *s1,
- STRING *s2,
- STRING **dest );
+ STRING *s1,
+ STRING *s2,
+ STRING **dest );
PARROT_API STRING * string_bitwise_not( Interp *interp,
- STRING *s,
- STRING **dest );
+ STRING *s,
+ STRING **dest );
PARROT_API STRING * string_bitwise_or( Interp *interp,
- STRING *s1,
- STRING *s2,
- STRING **dest );
+ STRING *s1,
+ STRING *s2,
+ STRING **dest );
PARROT_API STRING * string_bitwise_xor( Interp *interp,
- STRING *s1,
- STRING *s2,
- STRING **dest );
+ STRING *s1,
+ STRING *s2,
+ STRING **dest );
PARROT_API INTVAL string_bool( Interp *interp,
- const STRING *s );
+ const STRING *s );
PARROT_API UINTVAL string_capacity( Interp *interp,
- const STRING *s /*NN*/ );
+ const STRING *s /*NN*/ );
PARROT_API STRING * string_chopn( Interp *interp,
- STRING *s,
- INTVAL n,
- int in_place );
+ STRING *s,
+ INTVAL n,
+ int in_place );
PARROT_API STRING * string_chr( Interp *interp,
- UINTVAL character );
+ UINTVAL character );
PARROT_API INTVAL string_compare( Interp *interp,
- const STRING *s1,
- const STRING *s2 );
+ const STRING *s1,
+ const STRING *s2 );
PARROT_API STRING * string_compose( Interp *interp,
- STRING *src );
+ STRING *src );
PARROT_API INTVAL string_compute_strlen( Interp *interp,
- STRING *s /*NN*/ );
+ STRING *s /*NN*/ );
PARROT_API STRING * string_concat( Interp *interp,
- STRING *a /*NULLOK*/,
- STRING *b /*NULLOK*/,
- UINTVAL Uflags );
+ STRING *a /*NULLOK*/,
+ STRING *b /*NULLOK*/,
+ UINTVAL Uflags );
PARROT_API STRING * string_copy( Interp *interp,
- STRING *s /*NULLOK*/ );
+ STRING *s /*NULLOK*/ );
PARROT_API void string_cstring_free( char *p );
PARROT_API void string_deinit( Parrot_Interp interp );
PARROT_API STRING * string_downcase( Interp *interp,
- const STRING *s );
+ const STRING *s );
PARROT_API void string_downcase_inplace( Interp *interp,
- STRING *s );
+ STRING *s );
PARROT_API INTVAL string_equal( Interp *interp,
- const STRING *s1,
- const STRING *s2 );
+ const STRING *s1,
+ const STRING *s2 );
PARROT_API STRING * string_escape_string( Interp *interp,
- const STRING *src );
+ const STRING *src );
PARROT_API STRING * string_escape_string_delimited( Interp *interp,
- const STRING *src,
- UINTVAL limit );
+ const STRING *src,
+ UINTVAL limit );
PARROT_API STRING * string_from_const_cstring( Interp *interp,
- const char *buffer,
- UINTVAL len );
+ const char *buffer,
+ UINTVAL len );
PARROT_API STRING * string_from_cstring( Interp *interp,
- const char *buffer /*NULLOK*/,
- UINTVAL len );
+ const char *buffer /*NULLOK*/,
+ UINTVAL len );
PARROT_API STRING * string_from_int( Interp *interp,
- INTVAL i );
+ INTVAL i );
PARROT_API STRING * string_from_num( Interp *interp,
- FLOATVAL f );
+ FLOATVAL f );
PARROT_API STRING * string_grow( Interp * interp,
- STRING * s /*NN*/,
- INTVAL addlen );
+ STRING * s /*NN*/,
+ INTVAL addlen );
PARROT_API size_t string_hash( Interp *interp,
- STRING *s,
- size_t seed );
+ STRING *s,
+ size_t seed );
PARROT_API STRING * string_increment( Interp *interp,
- const STRING *s );
+ const STRING *s );
PARROT_API INTVAL string_index( Interp *interp,
- const STRING *s,
- UINTVAL idx );
+ const STRING *s,
+ UINTVAL idx );
PARROT_API void string_init( Parrot_Interp interp );
PARROT_API STRING* string_join( Interp *interp,
- STRING *j,
- PMC *ar );
+ STRING *j,
+ PMC *ar );
PARROT_API UINTVAL string_length( Interp *interp,
- const STRING *s /*NULLOK*/ );
+ const STRING *s /*NULLOK*/ );
PARROT_API STRING * string_make( Interp *interp,
- const char *buffer /*NN*/,
- UINTVAL len,
- const char *charset_name /*NN*/,
- UINTVAL flags );
+ const char *buffer /*NN*/,
+ UINTVAL len,
+ const char *charset_name /*NN*/,
+ UINTVAL flags );
PARROT_API STRING * string_make_direct( Interp *interp,
- const char *buffer /*NULLOK*/,
- UINTVAL len,
- ENCODING *encoding,
- CHARSET *charset,
- UINTVAL flags );
+ const char *buffer /*NULLOK*/,
+ UINTVAL len,
+ ENCODING *encoding,
+ CHARSET *charset,
+ UINTVAL flags );
PARROT_API STRING * string_make_empty( Interp *interp,
- parrot_string_representation_t representation,
- UINTVAL capacity );
+ parrot_string_representation_t representation,
+ UINTVAL capacity );
PARROT_API INTVAL string_max_bytes( Interp *interp,
- const STRING *s,
- INTVAL nchars );
+ const STRING *s,
+ INTVAL nchars );
PARROT_API STRING* string_nprintf( Interp *interp,
- STRING *dest,
- INTVAL bytelen,
- const char *format,
- ... );
+ STRING *dest,
+ INTVAL bytelen,
+ const char *format,
+ ... );
PARROT_API INTVAL string_ord( Interp *interp,
- const STRING *s,
- INTVAL idx );
+ const STRING *s,
+ INTVAL idx );
PARROT_API void string_pin( Interp *interp,
- STRING * s );
+ STRING * s );
PARROT_API const char* string_primary_encoding_for_representation( Interp
*interp,
- parrot_string_representation_t representation );
+ parrot_string_representation_t representation );
PARROT_API STRING* string_printf( Interp *interp,
- const char *format,
- ... );
+ const char *format,
+ ... );
PARROT_API CHARSET * string_rep_compatible( Interp *interp,
- const STRING *a /*NN*/,
- const STRING *b /*NN*/,
- ENCODING **e /*NN*/ );
+ const STRING *a /*NN*/,
+ const STRING *b /*NN*/,
+ ENCODING **e /*NN*/ );
PARROT_API STRING * string_repeat( Interp *interp,
- const STRING *s,
- UINTVAL num,
- STRING **d );
+ const STRING *s,
+ UINTVAL num,
+ STRING **d );
PARROT_API STRING * string_replace( Interp *interp,
- STRING *src /*NULLOK*/,
- INTVAL offset,
- INTVAL length,
- STRING *rep /*NULLOK*/,
- STRING **d );
+ STRING *src /*NULLOK*/,
+ INTVAL offset,
+ INTVAL length,
+ STRING *rep /*NULLOK*/,
+ STRING **d );
PARROT_API STRING * string_set( Interp *interp,
- STRING *dest /*NULLOK*/,
- STRING *src /*NULLOK*/ );
+ STRING *dest /*NULLOK*/,
+ STRING *src /*NULLOK*/ );
PARROT_API PMC* string_split( Interp *interp,
- STRING *delim,
- STRING *str );
+ STRING *delim,
+ STRING *str );
PARROT_API INTVAL string_str_index( Interp *interp,
- const STRING *s,
- const STRING *s2,
- INTVAL start );
+ const STRING *s,
+ const STRING *s2,
+ INTVAL start );
PARROT_API STRING * string_substr( Interp *interp,
- STRING *src,
- INTVAL offset,
- INTVAL length,
- STRING **d,
- int replace_dest );
+ STRING *src,
+ INTVAL offset,
+ INTVAL length,
+ STRING **d,
+ int replace_dest );
PARROT_API STRING * string_titlecase( Interp *interp,
- const STRING *s );
+ const STRING *s );
PARROT_API void string_titlecase_inplace( Interp *interp,
- STRING *s );
+ STRING *s );
PARROT_API char * string_to_cstring( Interp *interp,
- const STRING * const s /* NULLOK */ );
+ const STRING * const s /* NULLOK */ );
PARROT_API INTVAL string_to_int( Interp *interp,
- const STRING *s );
+ const STRING *s );
PARROT_API FLOATVAL string_to_num( Interp *interp,
- const STRING *s );
+ const STRING *s );
PARROT_API STRING * string_unescape_cstring( Interp *interp,
- const char *cstring,
- char delimiter,
- const char *enc_char );
+ const char *cstring,
+ char delimiter,
+ const char *enc_char );
PARROT_API void string_unpin( Interp *interp,
- STRING * s );
+ STRING * s );
PARROT_API STRING * string_upcase( Interp *interp,
- const STRING *s );
+ const STRING *s );
PARROT_API void string_upcase_inplace( Interp *interp,
- STRING *s );
+ STRING *s );
PARROT_API STRING* uint_to_str( Interp *interp,
- char *tc /*NN*/,
- UHUGEINTVAL num,
- char base,
- int minus );
+ char *tc /*NN*/,
+ UHUGEINTVAL num,
+ char base,
+ int minus );
/* HEADERIZER END: src/string.c */
/* HEADERIZER BEGIN: src/string_primitives.c */
PARROT_API UINTVAL Parrot_char_digit_value( Interp *interp,
- UINTVAL character );
+ UINTVAL character );
PARROT_API void string_fill_from_buffer( Interp *interp,
- const void *buffer,
- UINTVAL len,
- const char *encoding_name,
- STRING *s );
+ const void *buffer,
+ UINTVAL len,
+ const char *encoding_name,
+ STRING *s );
PARROT_API void string_set_data_directory( const char *dir );
PARROT_API Parrot_UInt4 string_unescape_one( Interp *interp,
- UINTVAL *offset,
- STRING *string );
+ UINTVAL *offset,
+ STRING *string );
/* HEADERIZER END: src/string_primitives.c */
#endif /* PARROT_IN_CORE */
Modified: trunk/tools/build/headerize.pl
==============================================================================
--- trunk/tools/build/headerize.pl (original)
+++ trunk/tools/build/headerize.pl Sat Jun 2 15:40:43 2007
@@ -162,7 +162,7 @@
push( @decls,
sprintf "PARROT_API %s %s( %s );\n",
- $ret_type, $funcname, join( ",\n\t", @args ),
+ $ret_type, $funcname, join( ",\n ", @args ),
);
}
