[svn:parrot] r43614 - in trunk: docs include/parrot src

[coke at svn.parrot.org]

Author: coke
Date: Wed Jan 27 03:32:26 2010
New Revision: 43614
URL: https://trac.parrot.org/parrot/changeset/43614

Log:
remove deprecated Parrot_call_method_ret_int (TT #1145)

Modified:
   trunk/docs/embed.pod
   trunk/include/parrot/extend.h
   trunk/src/extend.c

Modified: trunk/docs/embed.pod
==============================================================================
--- trunk/docs/embed.pod	Wed Jan 27 03:29:24 2010	(r43613)
+++ trunk/docs/embed.pod	Wed Jan 27 03:32:26 2010	(r43614)
@@ -603,8 +603,6 @@
 
 =item [DEPRECATED] C<Parrot_call_method>
 
-=item [DEPRECATED] C<Parrot_call_method_ret_int>
-
 =item [DEPRECATED] C<Parrot_call_sub>
 
 =item [DEPRECATED] C<Parrot_call_sub_ret_float>

Modified: trunk/include/parrot/extend.h
==============================================================================
--- trunk/include/parrot/extend.h	Wed Jan 27 03:29:24 2010	(r43613)
+++ trunk/include/parrot/extend.h	Wed Jan 27 03:32:26 2010	(r43614)
@@ -74,16 +74,6 @@
         __attribute__nonnull__(5);
 
 PARROT_EXPORT
-Parrot_Int Parrot_call_method_ret_int(PARROT_INTERP,
-    Parrot_PMC sub_pmc,
-    Parrot_PMC obj,
-    Parrot_String method,
-    ARGIN(const char *signature),
-    ...)
-        __attribute__nonnull__(1)
-        __attribute__nonnull__(5);
-
-PARROT_EXPORT
 PARROT_WARN_UNUSED_RESULT
 PARROT_CAN_RETURN_NULL
 void * Parrot_call_sub(PARROT_INTERP,
@@ -445,9 +435,6 @@
 #define ASSERT_ARGS_Parrot_call_method __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
        PARROT_ASSERT_ARG(interp) \
     , PARROT_ASSERT_ARG(signature))
-#define ASSERT_ARGS_Parrot_call_method_ret_int __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
-       PARROT_ASSERT_ARG(interp) \
-    , PARROT_ASSERT_ARG(signature))
 #define ASSERT_ARGS_Parrot_call_sub __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
        PARROT_ASSERT_ARG(interp) \
     , PARROT_ASSERT_ARG(signature))

Modified: trunk/src/extend.c
==============================================================================
--- trunk/src/extend.c	Wed Jan 27 03:29:24 2010	(r43613)
+++ trunk/src/extend.c	Wed Jan 27 03:32:26 2010	(r43614)
@@ -1280,50 +1280,6 @@
 
 /*
 
-=item C<Parrot_Int Parrot_call_method_ret_int(PARROT_INTERP, Parrot_PMC sub_pmc,
-Parrot_PMC obj, Parrot_String method, const char *signature, ...)>
-
-Call the parrot subroutine C<sub> as a method on PMC object C<obj>. The method
-should have the name C<method> as a Parrot_string, and should have a function
-signature C<signature>. Any arguments to the method can be passed at the end
-as a variadic argument list.
-
-=cut
-
-*/
-
-PARROT_EXPORT
-Parrot_Int
-Parrot_call_method_ret_int(PARROT_INTERP, Parrot_PMC sub_pmc,
-        Parrot_PMC obj, Parrot_String method, ARGIN(const char *signature), ...)
-{
-    ASSERT_ARGS(Parrot_call_method_ret_int)
-    va_list args;
-    PMC  *sig_object;
-    Parrot_Int result = 0;
-    char  return_sig = signature[0];
-    char *arg_sig = (char*)malloc(strlen(signature)+2);
-    Parrot_sub *sub;
-    arg_sig[0] = 'P';
-    arg_sig[1] = 'i';
-    arg_sig[2] = 0;
-    strcat(arg_sig, signature);
-
-    va_start(args, signature);
-    sig_object = Parrot_pcc_build_sig_object_from_varargs(interp, obj, arg_sig, args);
-    va_end(args);
-    free(arg_sig);
-
-    Parrot_pcc_append_result(interp, sig_object, Parrot_str_new_constant(interp, "I"), &result);
-    PMC_get_sub(interp, sub_pmc, sub);
-    Parrot_pcc_set_constants(interp, CURRENT_CONTEXT(interp), sub->seg->const_table->constants);
-    Parrot_pcc_invoke_from_sig_object(interp, sub_pmc, sig_object);
-
-    return result;
-}
-
-/*
-
 =item C<Parrot_Int Parrot_get_intreg(PARROT_INTERP, Parrot_Int regnum)>
 
 Return the value of an integer register.