develooper Front page | perl.cvs.parrot | Postings from December 2008

[svn:parrot] r34295 - in trunk: include/parrot src

From:
chromatic
Date:
December 23, 2008 13:43
Subject:
[svn:parrot] r34295 - in trunk: include/parrot src
Message ID:
20081223214315.A8CE8CBA12@x12.develooper.com
Author: chromatic
Date: Tue Dec 23 13:43:14 2008
New Revision: 34295

Modified:
   trunk/include/parrot/encoding.h
   trunk/src/encoding.c

Log:
[src] Fixed function decorations on unimplemented encoding functions to
demonstrate that they really do not return now.

Modified: trunk/include/parrot/encoding.h
==============================================================================
--- trunk/include/parrot/encoding.h	(original)
+++ trunk/include/parrot/encoding.h	Tue Dec 23 13:43:14 2008
@@ -111,6 +111,7 @@
         __attribute__nonnull__(2);
 
 PARROT_EXPORT
+PARROT_DOES_NOT_RETURN
 encoding_converter_t Parrot_find_encoding_converter(PARROT_INTERP,
     ARGIN(ENCODING *lhs),
     ARGIN(ENCODING *rhs))
@@ -124,8 +125,7 @@
 const ENCODING* Parrot_get_encoding(SHIM_INTERP, INTVAL number_of_encoding);
 
 PARROT_EXPORT
-PARROT_WARN_UNUSED_RESULT
-PARROT_CANNOT_RETURN_NULL
+PARROT_DOES_NOT_RETURN
 const ENCODING * Parrot_load_encoding(PARROT_INTERP,
     ARGIN(const char *encodingname))
         __attribute__nonnull__(1)

Modified: trunk/src/encoding.c
==============================================================================
--- trunk/src/encoding.c	(original)
+++ trunk/src/encoding.c	Tue Dec 23 13:43:14 2008
@@ -148,7 +148,7 @@
 =item C<const ENCODING * Parrot_load_encoding>
 
 Loads an encoding. Currently throws an exception because we cannot load
-encodings. See RT#58186.
+encodings. See RT #58186.
 
 =cut
 
@@ -156,11 +156,14 @@
 
 /* Yep, this needs to be a char * parameter -- it's tough to load in
    encodings and such for strings if we can't be sure we've got enough
-   info set up to actually build strings... */
+   info set up to actually build strings...
+
+    Also remember to use PARROT_WARN_UNUSED_RESULT and
+    PARROT_CANNOT_RETURN_NULL when this actually works.
+ */
 
 PARROT_EXPORT
-PARROT_WARN_UNUSED_RESULT
-PARROT_CANNOT_RETURN_NULL
+PARROT_DOES_NOT_RETURN
 const ENCODING *
 Parrot_load_encoding(PARROT_INTERP, ARGIN(const char *encodingname))
 {
@@ -418,13 +421,14 @@
 */
 
 PARROT_EXPORT
+PARROT_DOES_NOT_RETURN
 encoding_converter_t
 Parrot_find_encoding_converter(PARROT_INTERP, ARGIN(ENCODING *lhs), ARGIN(ENCODING *rhs))
 {
     UNUSED(lhs);
     UNUSED(rhs);
 
-    /* XXX Apparently unwritten RT#58188 */
+    /* XXX Apparently unwritten RT #58188 */
     Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_UNIMPLEMENTED,
         "Can't find encoding converters yet.");
 }



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