[svn:parrot] r49102 - in branches/gc_massacre/src: . pmc

[bacek at svn.parrot.org]

Author: bacek
Date: Fri Sep 17 23:46:36 2010
New Revision: 49102
URL: https://trac.parrot.org/parrot/changeset/49102

Log:
fix a unintended change resulted from hash_inlined merge

Merging hash_inlined_func branch reverted some previous commits.

Modified:
   branches/gc_massacre/src/oo.c
   branches/gc_massacre/src/pmc/stringbuilder.pmc

Modified: branches/gc_massacre/src/oo.c
==============================================================================
--- branches/gc_massacre/src/oo.c	Fri Sep 17 23:46:20 2010	(r49101)
+++ branches/gc_massacre/src/oo.c	Fri Sep 17 23:46:36 2010	(r49102)
@@ -260,13 +260,9 @@
          || base_type == enum_class_ResizableStringArray
          || base_type == enum_class_String)
             type = Parrot_pmc_get_type(interp, key);
-        else if (VTABLE_does(interp, key, CONST_STRING(interp, "string")) ||
-                base_type == enum_class_NameSpace)
-            type = Parrot_pmc_get_type_str(interp, VTABLE_get_string(interp, key));
         else
-            Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_INVALID_OPERATION,
-                    "can't get class from an instance of class '%Ss'", VTABLE_name(interp, key));
-
+            type = Parrot_pmc_get_type_str(interp, VTABLE_get_string(interp, key)); 
+            
         classobj = get_pmc_proxy(interp, type);
     }
 

Modified: branches/gc_massacre/src/pmc/stringbuilder.pmc
==============================================================================
--- branches/gc_massacre/src/pmc/stringbuilder.pmc	Fri Sep 17 23:46:20 2010	(r49101)
+++ branches/gc_massacre/src/pmc/stringbuilder.pmc	Fri Sep 17 23:46:36 2010	(r49102)
@@ -133,7 +133,7 @@
 */
 
     VTABLE STRING *get_string() {
-        STRING *buffer, *result;
+        STRING *buffer;
         GET_ATTR_buffer(INTERP, SELF, buffer);
         /* We need to build a new string because outside of StringBuilder
          * strings are immutable. */