Make the logic easier to follow.

[gitmo/Class-MOP.git] / mop.c

diff --git a/mop.c b/mop.c
index 25358f8..19b90bc 100644 (file)
--- a/mop.c
+++ b/mop.c
@@ -243,10 +243,22 @@ mop_prehash_keys ()
     }
 }
 
-SV *
-mop_simple_reader (SV *self, mop_prehashed_key_t key)
+XS(mop_xs_simple_reader)
 {
+#ifdef dVAR
+    dVAR; dXSARGS;
+#else
+    dXSARGS;
+#endif
     register HE *he;
+    mop_prehashed_key_t key = CvXSUBANY(cv).any_i32;
+    SV *self;
+
+    if (items != 1) {
+        croak("expected exactly one argument");
+    }
+
+    self = ST(0);
 
     if (!SvROK(self)) {
         croak("can't call %s as a class method", prehashed_keys[key].name);
@@ -256,27 +268,13 @@ mop_simple_reader (SV *self, mop_prehashed_key_t key)
         croak("object is not a hashref");
     }
 
-    if (!(he = hv_fetch_ent((HV *)SvRV(self), prehashed_keys[key].key, 0, prehashed_keys[key].hash))) {
-        return &PL_sv_undef;
+    if ((he = hv_fetch_ent((HV *)SvRV(self), prehashed_keys[key].key, 0, prehashed_keys[key].hash))) {
+        ST(0) = HeVAL(he);
     }
-
-    return SvREFCNT_inc(HeVAL(he));
-}
-
-XS(mop_xs_simple_reader)
-{
-#ifdef dVAR
-    dVAR; dXSARGS;
-#else
-    dXSARGS;
-#endif
-
-    if (items != 1) {
-        croak("expected exactly one argument");
+    else {
+        ST(0) = &PL_sv_undef;
     }
 
-    ST(0) = mop_simple_reader (ST(0), CvXSUBANY(cv).any_i32);
-    sv_2mortal(ST(0));
     XSRETURN(1);
 }