[svn:parrot] r46266 - in trunk: . include/parrot src/string

[coke at svn.parrot.org]

Author: coke
Date: Tue May  4 03:18:32 2010
New Revision: 46266
URL: https://trac.parrot.org/parrot/changeset/46266

Log:
"rename STRING_is_null to Parrot_str_is_null"
... except Parrot_str_is_null already existed, so just delete the old (dupe) oneCloses TT #1585.

Modified:
   trunk/DEPRECATED.pod
   trunk/include/parrot/string_funcs.h
   trunk/src/string/api.c

Modified: trunk/DEPRECATED.pod
==============================================================================
--- trunk/DEPRECATED.pod	Tue May  4 02:45:24 2010	(r46265)
+++ trunk/DEPRECATED.pod	Tue May  4 03:18:32 2010	(r46266)
@@ -281,12 +281,6 @@
 
 L<https://trac.parrot.org/parrot/ticket/1584>
 
-=item STRING_is_null function [eligible in 2.4]
-
-renamed to Parrot_str_is_null
-
-L<https://trac.parrot.org/parrot/ticket/1585>
-
 =item Parrot_string_* [eligible in 2.4]
 
 rename Parrot_string_cstring to Parrot_str_cstring

Modified: trunk/include/parrot/string_funcs.h
==============================================================================
--- trunk/include/parrot/string_funcs.h	Tue May  4 02:45:24 2010	(r46265)
+++ trunk/include/parrot/string_funcs.h	Tue May  4 03:18:32 2010	(r46266)
@@ -399,11 +399,6 @@
         __attribute__nonnull__(2);
 
 PARROT_EXPORT
-PARROT_HOT
-PARROT_PURE_FUNCTION
-INTVAL STRING_is_null(SHIM_INTERP, ARGIN_NULLOK(const STRING *s));
-
-PARROT_EXPORT
 PARROT_WARN_UNUSED_RESULT
 PARROT_CANNOT_RETURN_NULL
 STRING * string_make(PARROT_INTERP,
@@ -597,7 +592,6 @@
 #define ASSERT_ARGS_string_increment __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
        PARROT_ASSERT_ARG(interp) \
     , PARROT_ASSERT_ARG(s))
-#define ASSERT_ARGS_STRING_is_null __attribute__unused__ int _ASSERT_ARGS_CHECK = (0)
 #define ASSERT_ARGS_string_make __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
        PARROT_ASSERT_ARG(interp))
 #define ASSERT_ARGS_string_make_from_charset __attribute__unused__ int _ASSERT_ARGS_CHECK = (\

Modified: trunk/src/string/api.c
==============================================================================
--- trunk/src/string/api.c	Tue May  4 02:45:24 2010	(r46265)
+++ trunk/src/string/api.c	Tue May  4 03:18:32 2010	(r46266)
@@ -85,26 +85,6 @@
 
 /*
 
-=item C<INTVAL STRING_is_null(PARROT_INTERP, const STRING *s)>
-
-Tests if the given STRING is STRINGNULL.
-
-=cut
-
-*/
-
-PARROT_EXPORT
-PARROT_HOT
-PARROT_PURE_FUNCTION
-INTVAL
-STRING_is_null(SHIM_INTERP, ARGIN_NULLOK(const STRING *s))
-{
-    ASSERT_ARGS(STRING_is_null)
-    return STRING_IS_NULL(s);
-}
-
-/*
-
 =back
 
 =head2 Basic String Functions