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

[bacek at svn.parrot.org]

Author: bacek
Date: Tue Jul 21 10:38:59 2009
New Revision: 40186
URL: https://trac.parrot.org/parrot/changeset/40186

Log:
[cage] Remove deprecated Parrot_get_namespace_autobase function

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

Modified: trunk/include/parrot/global.h
==============================================================================
--- trunk/include/parrot/global.h	Tue Jul 21 08:37:02 2009	(r40185)
+++ trunk/include/parrot/global.h	Tue Jul 21 10:38:59 2009	(r40186)
@@ -78,12 +78,6 @@
 PARROT_EXPORT
 PARROT_WARN_UNUSED_RESULT
 PARROT_CAN_RETURN_NULL
-PMC * Parrot_get_namespace_autobase(PARROT_INTERP, ARGIN_NULLOK(PMC *key))
-        __attribute__nonnull__(1);
-
-PARROT_EXPORT
-PARROT_WARN_UNUSED_RESULT
-PARROT_CAN_RETURN_NULL
 PMC * Parrot_get_namespace_keyed(PARROT_INTERP,
     ARGIN(PMC *base_ns),
     ARGIN_NULLOK(PMC *pmc_key))
@@ -174,8 +168,6 @@
     || PARROT_ASSERT_ARG(name)
 #define ASSERT_ARGS_Parrot_get_global __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp)
-#define ASSERT_ARGS_Parrot_get_namespace_autobase __attribute__unused__ int _ASSERT_ARGS_CHECK = \
-       PARROT_ASSERT_ARG(interp)
 #define ASSERT_ARGS_Parrot_get_namespace_keyed __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(base_ns)

Modified: trunk/src/global.c
==============================================================================
--- trunk/src/global.c	Tue Jul 21 08:37:02 2009	(r40185)
+++ trunk/src/global.c	Tue Jul 21 10:38:59 2009	(r40186)
@@ -389,35 +389,6 @@
 
 /*
 
-=item C<PMC * Parrot_get_namespace_autobase(PARROT_INTERP, PMC *key)>
-
-Find a namespace with the key C<key>, which may be a String, a Key, or an
-array of strings. If it is a String, then the lookup is relative to the
-current namespace. Otherwise, it is relative to the current HLL root
-namespace. Return the namespace, or NULL if not found.
-
-=cut
-
-*/
-
-PARROT_EXPORT
-PARROT_WARN_UNUSED_RESULT
-PARROT_CAN_RETURN_NULL
-PMC *
-Parrot_get_namespace_autobase(PARROT_INTERP, ARGIN_NULLOK(PMC *key))
-{
-    ASSERT_ARGS(Parrot_get_namespace_autobase)
-    PMC *base_ns;
-    if (VTABLE_isa(interp, key, CONST_STRING(interp, "String")))
-        base_ns = CONTEXT(interp)->current_namespace;
-    else
-        base_ns = VTABLE_get_pmc_keyed_int(interp, interp->HLL_namespace,
-            CONTEXT(interp)->current_HLL);
-    return Parrot_get_namespace_keyed(interp, base_ns, key);
-}
-
-/*
-
 =item C<PMC * Parrot_ns_get_name(PARROT_INTERP, PMC *_namespace)>
 
 Retrieve an array of names from a namespace object.