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

Author: tewk
Date: Sat Jan 17 04:06:05 2009
New Revision: 35674

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

Log:
remove Parrot_class_lookup*

Modified: trunk/include/parrot/oo.h
==============================================================================
--- trunk/include/parrot/oo.h	(original)
+++ trunk/include/parrot/oo.h	Sat Jan 17 04:06:05 2009
@@ -57,13 +57,6 @@
 /* Don't modify between HEADERIZER BEGIN / HEADERIZER END.  Your changes will be lost. */
 
 PARROT_EXPORT
-PARROT_CAN_RETURN_NULL
-PARROT_WARN_UNUSED_RESULT
-PMC * Parrot_class_lookup(PARROT_INTERP, ARGIN(STRING *class_name))
-        __attribute__nonnull__(1)
-        __attribute__nonnull__(2);
-
-PARROT_EXPORT
 void Parrot_ComposeRole(PARROT_INTERP,
     ARGIN(PMC *role),
     ARGIN(PMC *exclude),
@@ -154,12 +147,6 @@
 void mark_object_cache(PARROT_INTERP)
         __attribute__nonnull__(1);
 
-PARROT_CAN_RETURN_NULL
-PARROT_WARN_UNUSED_RESULT
-PMC * Parrot_class_lookup_p(PARROT_INTERP, ARGIN(PMC *class_name))
-        __attribute__nonnull__(1)
-        __attribute__nonnull__(2);
-
 void Parrot_oo_extract_methods_from_namespace(PARROT_INTERP,
     ARGIN(PMC *self),
     ARGIN(PMC *ns))
@@ -204,9 +191,6 @@
         __attribute__nonnull__(2)
         __attribute__nonnull__(3);
 
-#define ASSERT_ARGS_Parrot_class_lookup __attribute__unused__ int _ASSERT_ARGS_CHECK = \
-       PARROT_ASSERT_ARG(interp) \
-    || PARROT_ASSERT_ARG(class_name)
 #define ASSERT_ARGS_Parrot_ComposeRole __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(role) \
@@ -248,9 +232,6 @@
        PARROT_ASSERT_ARG(interp)
 #define ASSERT_ARGS_mark_object_cache __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp)
-#define ASSERT_ARGS_Parrot_class_lookup_p __attribute__unused__ int _ASSERT_ARGS_CHECK = \
-       PARROT_ASSERT_ARG(interp) \
-    || PARROT_ASSERT_ARG(class_name)
 #define ASSERT_ARGS_Parrot_oo_extract_methods_from_namespace \
      __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \

Modified: trunk/src/oo.c
==============================================================================
--- trunk/src/oo.c	(original)
+++ trunk/src/oo.c	Sat Jan 17 04:06:05 2009
@@ -460,66 +460,6 @@
     return Parrot_mmd_func_names[idx];
 }
 
-
-/*
-
-=item C<PMC * Parrot_class_lookup>
-
-Looks for the class named C<class_name> and returns it if it exists.
-Otherwise it returns C<PMCNULL>.
-
-=cut
-
-*/
-
-PARROT_EXPORT
-PARROT_CAN_RETURN_NULL
-PARROT_WARN_UNUSED_RESULT
-PMC *
-Parrot_class_lookup(PARROT_INTERP, ARGIN(STRING *class_name))
-{
-    ASSERT_ARGS(Parrot_class_lookup)
-    const INTVAL type = pmc_type(interp, class_name);
-    PMC         *pmc;
-
-    if (type <= 0)
-        return PMCNULL;
-
-    pmc = interp->vtables[type]->pmc_class;
-    PARROT_ASSERT(pmc);
-    return pmc;
-}
-
-
-/*
-
-=item C<PMC * Parrot_class_lookup_p>
-
-Looks for the class named C<class_name> and returns it if it exists.
-Otherwise it returns C<PMCNULL>.
-
-=cut
-
-*/
-
-PARROT_CAN_RETURN_NULL
-PARROT_WARN_UNUSED_RESULT
-PMC *
-Parrot_class_lookup_p(PARROT_INTERP, ARGIN(PMC *class_name))
-{
-    ASSERT_ARGS(Parrot_class_lookup_p)
-    const INTVAL type = pmc_type_p(interp, class_name);
-    PMC         *pmc;
-
-    if (type <= 0)
-        return PMCNULL;
-
-    pmc = interp->vtables[type]->pmc_class;
-    PARROT_ASSERT(pmc);
-    return pmc;
-}
-
-
 /*
 
 =item C<static INTVAL fail_if_type_exists>