struct thread now stored in an SV and uses '~'-magic for access.

[p5sagit/p5-mst-13.2.git] / typemap

diff --git a/typemap b/typemap
index 6ef6036..a9a5bd8 100644 (file)
--- a/typemap
+++ b/typemap
@@ -1,23 +1,22 @@
-Thread         T_IVOBJ
+Thread         T_XSOBJ
 
 INPUT
-T_IVOBJ
-       if (sv_isobject($arg)) {
-           $var = ($type) SvIV((SV*)SvRV($arg));
+T_XSOBJ
+       STMT_START {
+           MAGIC *mg;
+           SV *sv = ($arg);
+
+           if (!sv_isobject(sv))
+               croak(\"$var is not an object\");
+           if (!SvRMAGICAL(sv) || !(mg = mg_find(sv, '~')))
+               croak(\"$arg is a counterfeit ${ntype} object\");
+           $var = ($type) SvPVX(mg->mg_obj);
            DEBUG_L(PerlIO_printf(PerlIO_stderr(),
-                                 \"XSUB ${func_name}: 0x%lx\\n\",
-                                 (unsigned long)$var););
-       }
-       else
-           croak(\"$var is not an object\")
+                                 \"XSUB ${func_name}: %p\\n\", $var);)
+       } STMT_END
 T_IVREF
        if (SvROK($arg))
            $var = ($type) SvIV((SV*)SvRV($arg));
        else
            croak(\"$var is not a reference\")
 
-OUTPUT
-T_IVOBJ        
-       sv_setref_iv($arg, \"${ntype}\", (IV)($var));
-       DEBUG_L(PerlIO_printf(PerlIO_stderr(), \"XSUB $func_name: 0x%lx\\n\",
-                             (unsigned long)$var););