[svn:parrot] r47710 - in trunk: include/parrot src src/pmc

[NotFound at svn.parrot.org]

Author: NotFound
Date: Sat Jun 19 12:35:49 2010
New Revision: 47710
URL: https://trac.parrot.org/parrot/changeset/47710

Log:
kill unuseful function key_set_pmc and replaces its usage in key.pmc with an exception with an updated message, TT #1683

Modified:
   trunk/include/parrot/key.h
   trunk/src/key.c
   trunk/src/pmc/key.pmc

Modified: trunk/include/parrot/key.h
==============================================================================
--- trunk/include/parrot/key.h	Sat Jun 19 12:15:16 2010	(r47709)
+++ trunk/include/parrot/key.h	Sat Jun 19 12:35:49 2010	(r47710)
@@ -125,13 +125,6 @@
         FUNC_MODIFIES(*key);
 
 PARROT_EXPORT
-void key_set_pmc(PARROT_INTERP, ARGMOD(PMC *key), ARGIN(PMC *value))
-        __attribute__nonnull__(1)
-        __attribute__nonnull__(2)
-        __attribute__nonnull__(3)
-        FUNC_MODIFIES(*key);
-
-PARROT_EXPORT
 void key_set_register(PARROT_INTERP,
     ARGMOD(PMC *key),
     INTVAL value,
@@ -201,10 +194,6 @@
 #define ASSERT_ARGS_key_set_number __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
        PARROT_ASSERT_ARG(interp) \
     , PARROT_ASSERT_ARG(key))
-#define ASSERT_ARGS_key_set_pmc __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
-       PARROT_ASSERT_ARG(interp) \
-    , PARROT_ASSERT_ARG(key) \
-    , PARROT_ASSERT_ARG(value))
 #define ASSERT_ARGS_key_set_register __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
        PARROT_ASSERT_ARG(interp) \
     , PARROT_ASSERT_ARG(key))

Modified: trunk/src/key.c
==============================================================================
--- trunk/src/key.c	Sat Jun 19 12:15:16 2010	(r47709)
+++ trunk/src/key.c	Sat Jun 19 12:35:49 2010	(r47710)
@@ -238,33 +238,6 @@
     return;
 }
 
-
-/*
-
-=item C<void key_set_pmc(PARROT_INTERP, PMC *key, PMC *value)>
-
-Set the PMC C<value> in C<key>.
-
-=cut
-
-*/
-
-PARROT_EXPORT
-void
-key_set_pmc(PARROT_INTERP, ARGMOD(PMC *key), ARGIN(PMC *value))
-{
-    ASSERT_ARGS(key_set_pmc)
-    PObj_get_FLAGS(key) &= ~KEY_type_FLAGS;
-    PObj_get_FLAGS(key) |=  KEY_pmc_FLAG;
-
-    /*
-     * XXX leo
-     * what for is this indirection?
-     */
-    Parrot_ex_throw_from_c_args(interp, NULL, 1, "this is broken - see slice.pmc");
-}
-
-
 /*
 
 =item C<INTVAL key_type(PARROT_INTERP, const PMC *key)>

Modified: trunk/src/pmc/key.pmc
==============================================================================
--- trunk/src/pmc/key.pmc	Sat Jun 19 12:15:16 2010	(r47709)
+++ trunk/src/pmc/key.pmc	Sat Jun 19 12:35:49 2010	(r47710)
@@ -78,11 +78,8 @@
                 break;
               case KEY_pmc_FLAG:
               case KEY_pmc_FLAG | KEY_register_FLAG:
-                {
-                    PMC * const p = key_pmc(INTERP, key);
-                    key_set_pmc(INTERP, dkey, VTABLE_clone(INTERP, p));
-                }
-                break;
+                Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_UNIMPLEMENTED,
+                        "this is broken - see TT #1683");
               default:
                 break;
             }
@@ -223,7 +220,8 @@
 */
 
     VTABLE void set_pmc(PMC *value) {
-        key_set_pmc(INTERP, SELF, value);
+        Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_UNIMPLEMENTED,
+                "this is broken - see TT #1683");
     }
 
 /*