[svn:parrot] r42268 - trunk/src

NotFound at svn.parrot.org NotFound at svn.parrot.org
Thu Nov 5 12:53:25 UTC 2009


Author: NotFound
Date: Thu Nov  5 12:53:25 2009
New Revision: 42268
URL: https://trac.parrot.org/parrot/changeset/42268

Log:
fix a strict C violation introduced in r42267, ttbot++

Modified:
   trunk/src/oo.c

Modified: trunk/src/oo.c
==============================================================================
--- trunk/src/oo.c	Thu Nov  5 12:39:45 2009	(r42267)
+++ trunk/src/oo.c	Thu Nov  5 12:53:25 2009	(r42268)
@@ -401,19 +401,21 @@
 
     if (STRING_IS_NULL(name))
         return PMCNULL;
+    else {
 
-    /* First check in current HLL namespace */
-    PMC * const hll_ns = VTABLE_get_pmc_keyed_int(interp, interp->HLL_namespace,
-                           Parrot_pcc_get_HLL(interp, CURRENT_CONTEXT(interp)));
-    PMC * const ns     = Parrot_get_namespace_keyed_str(interp, hll_ns, name);
-    PMC * const _class = PMC_IS_NULL(ns)
-                       ? PMCNULL : VTABLE_get_class(interp, ns);
-
-    /* If not found, check for a PMC */
-    if (PMC_IS_NULL(_class))
-        return get_pmc_proxy(interp, pmc_type(interp, name));
-    else
-        return _class;
+        /* First check in current HLL namespace */
+        PMC * const hll_ns = VTABLE_get_pmc_keyed_int(interp, interp->HLL_namespace,
+                               Parrot_pcc_get_HLL(interp, CURRENT_CONTEXT(interp)));
+        PMC * const ns     = Parrot_get_namespace_keyed_str(interp, hll_ns, name);
+        PMC * const _class = PMC_IS_NULL(ns)
+                           ? PMCNULL : VTABLE_get_class(interp, ns);
+
+        /* If not found, check for a PMC */
+        if (PMC_IS_NULL(_class))
+            return get_pmc_proxy(interp, pmc_type(interp, name));
+        else
+            return _class;
+    }
 }
 
 


More information about the parrot-commits mailing list