Update for new keydata interface.
[catacomb-perl] / typemap
diff --git a/typemap b/typemap
index a4f6297..f394c73 100644 (file)
--- a/typemap
+++ b/typemap
@@ -46,7 +46,7 @@ MP_Prime_Gen_JumpStepper *    T_CATSTRUCT
 MP_Prime_Gen_RabinTester *     T_CATSTRUCT
 
 Key_File *                     T_CATSTRUCT
-Key_DataImpl *                 T_CATSTRUCT
+Key_Data *                     T_KEYDATA
 Key_AttrIter *                 T_CATSTRUCT
 Key_StructIter *               T_CATSTRUCT
 Key_FileIter *                 T_CATSTRUCT
@@ -76,6 +76,8 @@ T_GCALG
        $var = ptrfromsv($arg, \"${my $ntt = $ntype; $ntt =~ s/^gc(.*)Ptr$/Catacomb::\u$1Class/; \$ntt}\", \"$var\")
 T_KEYSZ
        $var = ptrfromsv($arg, \"Catacomb::KeySize\", \"$var\")
+T_KEYDATA
+       $var = ptrfromsv($arg, \"${my $ntt = $ntype; $ntt =~ s/^(.*)Ptr$/Catacomb::$1/; $ntt =~ s/_/::/g; \$ntt}\", \"$var\")
 T_PGENPROC
        if (sv_derived_from($arg, \"Catacomb::MP::Prime::Gen::Proc\"))
          $var = $arg;
@@ -111,3 +113,5 @@ T_PGENPROC
        $arg = $var;
 T_KEYERR
        $arg = keyerr($var);
+T_KEYDATA
+       ptrtosv(&$arg, $var, keydata_type($var));