Pass the 'data' callback after the 'op_info' flag when calling _wizard()

diff --git a/Magic.xs b/Magic.xs
index afb7713c62a12504ae16fc13737905367938dd93..062cdb30fe595b841a61d0bdb59d1a2a3a623908 100644 (file)
--- a/Magic.xs
+++ b/Magic.xs
@@ -1469,14 +1469,14 @@ CODE:
  Newx(t, 1, MGVTBL);
  Newx(w, 1, MGWIZ);
 
- VMG_SET_CB(ST(i++), data);
-
  cb = ST(i++);
  opinfo = SvOK(cb) ? SvUV(cb) : 0;
  w->opinfo = (U8) ((opinfo < 255) ? opinfo : 255);
  if (w->opinfo)
   vmg_op_info_init(w->opinfo);
 
+ VMG_SET_CB(ST(i++), data);
+
  VMG_SET_SVT_CB(ST(i++), get);
  VMG_SET_SVT_CB(ST(i++), set);
  VMG_SET_SVT_CB(ST(i++), len);

diff --git a/lib/Variable/Magic.pm b/lib/Variable/Magic.pm
index 3668432486cffb61f6e90ebfcf3a0700f8311dea..fd2c0ef6b3b73e7b3f3e186626a9b1fe9c0f211a 100644 (file)
--- a/lib/Variable/Magic.pm
+++ b/lib/Variable/Magic.pm
@@ -311,7 +311,7 @@ sub wizard {
 
  my %opts = @_;
 
- my @keys = qw<data op_info get set len clear free>;
+ my @keys = qw<op_info data get set len clear free>;
  push @keys, 'copy'  if MGf_COPY;
  push @keys, 'dup'   if MGf_DUP;
  push @keys, 'local' if MGf_LOCAL;