X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo%2FMouse.git;a=blobdiff_plain;f=xs-src%2FMouseAccessor.xs;h=2d26088477dd2bdd38d8e8f5fe5c7b4c8b6dfdab;hp=4dd16dd84aec8911988dcf3f61d27b1fd2517eda;hb=02bf7ed13ae5d43392767a38fe71e9606f1dba76;hpb=957474ad02b108cb465de4d314bb22b6f1ea5a9f

diff --git a/xs-src/MouseAccessor.xs b/xs-src/MouseAccessor.xs
index 4dd16dd..2d26088 100644
--- a/xs-src/MouseAccessor.xs
+++ b/xs-src/MouseAccessor.xs
@@ -245,37 +245,6 @@ mouse_simple_accessor_generate(pTHX_ const char* const fq_name, const char* cons
     return xsub;
 }
 
-XS(XS_Mouse_simple_accessor)
-{
-    dVAR; dXSARGS;
-    dMOUSE_self;
-    MAGIC* const mg = (MAGIC*)XSANY.any_ptr;
-    SV* value;
-
-    if(items == 1){ /* reader */
-        value = get_slot(self, MOUSE_mg_slot(mg));
-        if(!value) {
-            if(MOUSE_mg_ptr(mg)){
-                /* the default value must be a SV */
-                assert(MOUSE_mg_len(mg) == HEf_SVKEY);
-                value = (SV*)MOUSE_mg_ptr(mg);
-            }
-            else{
-                value = &PL_sv_undef;
-            }
-        }
-    }
-    else if(items == 2){ /* writer */
-         value = set_slot(self, MOUSE_mg_slot(mg), ST(1));
-    }
-    else {
-        croak("Expected exactly one or two argument for an accessor for '%"SVf"'", MOUSE_mg_slot(mg));
-    }
-
-    ST(0) = value;
-    XSRETURN(1);
-}
-
 XS(XS_Mouse_simple_reader)
 {
     dVAR; dXSARGS;
@@ -288,7 +257,18 @@ XS(XS_Mouse_simple_reader)
     }
 
     value = get_slot(self, MOUSE_mg_slot(mg));
-    ST(0) = value ? value : &PL_sv_undef;
+    if(!value) {
+        if(MOUSE_mg_ptr(mg)){
+            /* the default value must be a SV */
+            assert(MOUSE_mg_len(mg) == HEf_SVKEY);
+            value = (SV*)MOUSE_mg_ptr(mg);
+        }
+        else{
+            value = &PL_sv_undef;
+        }
+    }
+
+    ST(0) = value;
     XSRETURN(1);
 }
 
@@ -408,7 +388,7 @@ mouse_instance_weaken_slot(pTHX_ SV* const instance, SV* const slot) {
         sv_rvweaken(HeVAL(he));
     }
 }
-
+
 MODULE = Mouse::Meta::Method::Accessor::XS  PACKAGE = Mouse::Meta::Method::Accessor::XS
 
 PROTOTYPES:   DISABLE