[svn:parrot] r48982 - in trunk/src: . pmc

[luben at svn.parrot.org]

Author: luben
Date: Mon Sep 13 20:50:02 2010
New Revision: 48982
URL: https://trac.parrot.org/parrot/changeset/48982

Log:
fix a unintended change resulted from hash_inlined merge

Merging hash_inlined_func branch reverted some previous commits.

Modified:
   trunk/src/oo.c
   trunk/src/pmc/stringbuilder.pmc

Modified: trunk/src/oo.c
==============================================================================
--- trunk/src/oo.c	Mon Sep 13 19:17:36 2010	(r48981)
+++ trunk/src/oo.c	Mon Sep 13 20:50:02 2010	(r48982)
@@ -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: trunk/src/pmc/stringbuilder.pmc
==============================================================================
--- trunk/src/pmc/stringbuilder.pmc	Mon Sep 13 19:17:36 2010	(r48981)
+++ trunk/src/pmc/stringbuilder.pmc	Mon Sep 13 20:50:02 2010	(r48982)
@@ -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. */